reenable normal Makefile echoing
This commit is contained in:
parent
7d257b014a
commit
61c5386355
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -9,5 +9,4 @@ NASMFLAGS := -Isrc
|
|||
|
||||
obj/$(ARCH)/%.nasm.o: src/%.nasm $(ARCHHEADERS)
|
||||
@mkdir -p $(@D)
|
||||
@echo nasm $<
|
||||
@$(NASM) $(NASMFLAGS) $< -o $@
|
||||
$(NASM) $(NASMFLAGS) $< -o $@
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
void breakpoint() {
|
||||
asm volatile ("xchgw %bx, %bx");
|
||||
__asm__ volatile ("xchgw %bx, %bx");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
|
||||
#include <print/print.h>
|
||||
void halt_catch_fire() {
|
||||
asm volatile ("cli");
|
||||
__asm__ volatile ("cli");
|
||||
while(1) {
|
||||
asm volatile ("hlt");
|
||||
__asm__ volatile ("hlt");
|
||||
puts("INTERRUPTED!");
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue