diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-11-02 11:37:13 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-11-02 11:37:13 +0100 |
| commit | 5cecfeb5b23f78274afdeae97da3b3cd6772bf97 (patch) | |
| tree | 1ab1c014452e8d7b8d4912f1d0a8f4d54a72a72a | |
| parent | 8da86356d9fc6180bc325c03aed4e20fb03be8ba (diff) | |
| download | os_skeleton-5cecfeb5b23f78274afdeae97da3b3cd6772bf97.zip os_skeleton-5cecfeb5b23f78274afdeae97da3b3cd6772bf97.tar.gz | |
remove ugly trailing spaces
| -rw-r--r-- | kernel/kernel.c | 2 | ||||
| -rw-r--r-- | kernel/kernel.ld | 4 | ||||
| -rw-r--r-- | kernel/makefile | 6 | ||||
| -rw-r--r-- | makefile | 5 |
4 files changed, 8 insertions, 9 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index d01eada..c084dd6 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -4,7 +4,7 @@ void mainKernel(){ #ifdef TEST // MODE TEST - smiley(); + smiley(); #else //MODE NORMAL diff --git a/kernel/kernel.ld b/kernel/kernel.ld index da9e019..5a4566f 100644 --- a/kernel/kernel.ld +++ b/kernel/kernel.ld @@ -15,12 +15,12 @@ SECTIONS { .text ALIGN(4K) : /* code */ { - *(.text*) + *(.text*) } .rodata ALIGN(4K) : /* read-only data */ { - *(.rodata*) + *(.rodata*) } .data ALIGN(4K) : /* initialized data */ diff --git a/kernel/makefile b/kernel/makefile index 0173172..c579016 100644 --- a/kernel/makefile +++ b/kernel/makefile @@ -11,14 +11,14 @@ kernel.o: kernel.c kernel_asm.o kernel_asm.o: kernel_asm.s nasm -f elf32 $< -bootloader.o: bootloader.s +bootloader.o: bootloader.s nasm -f elf32 bootloader.s -gdt.o: gdt.c gdt.h +gdt.o: gdt.c gdt.h gcc -std=gnu99 -m32 -fno-builtin -ffreestanding -Wall -Wextra -c gdt.c gdt_asm.o: gdt_asm.s nasm -f elf32 $< clean: - rm -f *.o
\ No newline at end of file + rm -f *.o @@ -1,6 +1,6 @@ all: run -run: create_iso +run: create_iso qemu-system-i386 -hda mini_kernel/mini_kernel.iso create_iso: cpy @@ -9,7 +9,6 @@ create_iso: cpy cpy: cp grub/grub.cfg mini_kernel/ cp kernel/kernel.elf mini_kernel/ - + clean: rm mini_kernel/*.iso mini_kernel/*.cfg mini_kernel/*.elf -
\ No newline at end of file |