diff --git a/kernel/Makefile b/kernel/Makefile index b5b9a0f..61e1217 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -10,7 +10,7 @@ LDSCRIPT = make/$(ARCH)/linker.ld CFLAGS ?= -Og -g CFLAGS := $(CFLAGS) $(ARCH_CFLAGS) \ - -Wall -Wextra -pedantic -Wno-language-extension-token -std=gnu11 -I../ext -Isrc -fPIE + -Wall -Wextra -pedantic -std=gnu11 -I../ext -Isrc -fPIE LDFLAGS := $(LDFLAGS) -T $(LDSCRIPT) @@ -31,13 +31,11 @@ $(ARCHES): bin/$(TARGET)-$(ARCH): $(OBJ) @mkdir -p $(@D) - @echo Linking $@ $(LD) $(LDFLAGS) $(OBJ) -o $@ obj/$(ARCH)/%.c.o: src/%.c $(HFILES) $(ARCHHEADERS) @mkdir -p $(@D) - @echo $(CC) $< - @$(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ clean: rm -rf bin obj zig-cache diff --git a/kernel/make/x86/make.config b/kernel/make/x86/make.config index 42427fb..ad80381 100644 --- a/kernel/make/x86/make.config +++ b/kernel/make/x86/make.config @@ -9,5 +9,4 @@ NASMFLAGS := -Isrc obj/$(ARCH)/%.nasm.o: src/%.nasm $(ARCHHEADERS) @mkdir -p $(@D) - @echo nasm $< - @$(NASM) $(NASMFLAGS) $< -o $@ \ No newline at end of file + $(NASM) $(NASMFLAGS) $< -o $@ \ No newline at end of file diff --git a/kernel/src/arch/x86/bochs.c b/kernel/src/arch/x86/bochs.c index dcff4aa..450fb46 100644 --- a/kernel/src/arch/x86/bochs.c +++ b/kernel/src/arch/x86/bochs.c @@ -1,3 +1,3 @@ void breakpoint() { - asm volatile ("xchgw %bx, %bx"); + __asm__ volatile ("xchgw %bx, %bx"); } diff --git a/kernel/src/arch/x86/ops.c b/kernel/src/arch/x86/ops.c index ffa61d2..c893697 100644 --- a/kernel/src/arch/x86/ops.c +++ b/kernel/src/arch/x86/ops.c @@ -1,9 +1,9 @@ #include void halt_catch_fire() { - asm volatile ("cli"); + __asm__ volatile ("cli"); while(1) { - asm volatile ("hlt"); + __asm__ volatile ("hlt"); puts("INTERRUPTED!"); }; }