summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
13a3a30)
- Also made separate build counts for each arch
- changed the OBJDUMP variable to DISASM to allow better interoperability
-include arch/$(ARCHDIR)/Makefile
-include arch/$(ARCHDIR)/Makefile
--include Makefile.BuildNum
+-include Makefile.BuildNum.$(ARCH)
$(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
@echo --- LD -o $(BIN)
@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) -Map ../Map.$(ARCH).txt
$(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
@echo --- LD -o $(BIN)
@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) -Map ../Map.$(ARCH).txt
- @objdump $(BIN) -D -S > $(BIN).dsm
+ $(DISASM) $(BIN) > $(BIN).dsm
@wc -l $(SRCFILES) include/*.h > LineCounts.$(ARCH).txt
@wc -l $(SRCFILES) include/*.h > LineCounts.$(ARCH).txt
- @echo BUILD_NUM = `calc $(BUILD_NUM)+1` > Makefile.BuildNum
+ @echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum.$(ARCH)
%.ao.$(ARCH): %.asm Makefile
@echo --- NASM -o $@
%.ao.$(ARCH): %.asm Makefile
@echo --- NASM -o $@
CC := gcc
LD := ld
AS := nasm
CC := gcc
LD := ld
AS := nasm
RM := @rm -f
STRIP := strip
MKDIR := mkdir
RM := @rm -f
STRIP := strip
MKDIR := mkdir
CC = x86_64-linux-gnu-gcc
LD = ld
CC = x86_64-linux-gnu-gcc
LD = ld
+DISASM = objdump -d -M x86-64
KERNEL_CFLAGS = -mcmodel=large -nostdlib
KERNEL_CFLAGS = -mcmodel=large -nostdlib
@echo --- $(LD) -o $@
# $(LD) -T $(ACESSDIR)/Modules/link.ld --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ)
@$(LD) --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ)
@echo --- $(LD) -o $@
# $(LD) -T $(ACESSDIR)/Modules/link.ld --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ)
@$(LD) --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ)
- @$(OBJDUMP) -d $(BIN) > $(BIN).dsm
+ @$(DISASM) $(BIN) > $(BIN).dsm
else
$(BIN): %.xo.$(ARCH): $(OBJ)
@echo --- $(LD) -o $@
else
$(BIN): %.xo.$(ARCH): $(OBJ)
@echo --- $(LD) -o $@