diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-05-01 19:53:00 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-05-01 19:53:12 +0200 |
| commit | cac739a1998ad50ce3ca433d563d1802a55931e8 (patch) | |
| tree | 6b35673f8ab665c6e99392f70e1e6f4da0de112b /src | |
| parent | 08ab6eb8e5be78d6362fccb95cdf825cd977d934 (diff) | |
| download | abaos-cac739a1998ad50ce3ca433d563d1802a55931e8.tar.gz abaos-cac739a1998ad50ce3ca433d563d1802a55931e8.tar.bz2 | |
some playing around with linker flags
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/kernel.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index ec9e466..c983fb6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -14,7 +14,7 @@ boot.bin: boot.asm gdt.asm stage1_functions.asm stage2_functions.asm switch_mode nasm boot.asm -f bin -o boot.bin kernel.bin: kernel.o vga.o string.o - $(LD) -o kernel.bin -Ttext 0x8000 -m elf_i386 --oformat binary \ + $(LD) -o kernel.bin -n -Ttext 0x8000 --oformat binary \ kernel.o vga.o string.o kernel.o: kernel.c diff --git a/src/kernel.c b/src/kernel.c index 1692259..de14d8f 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -12,7 +12,8 @@ void entry( void ) // again volatile? const results in garbage on clang volatile char msg[] = "ABAOS"; vga_put_string_at( &vga, 0, 0, (const char *)msg ); - //~ vga_put_string_at( &vga, 0, 0, "ABAOS" ); + // doesn't work + vga_put_string_at( &vga, 0, 1, "ABAOS2" ); // clang 4.0.0 needs volatile otherwise it takes a random value // from the register in the second vga_put_char_at below??! |