提交 9bad11b9 创建 作者: Nickolai Zeldovich's avatar Nickolai Zeldovich

revert the plan to keep around .S files, since it loses .d depfiles

上级 f6455ee3
...@@ -51,15 +51,10 @@ $(O)/%.o: %.c ...@@ -51,15 +51,10 @@ $(O)/%.o: %.c
$(Q)mkdir -p $(@D) $(Q)mkdir -p $(@D)
$(Q)$(CC) $(CFLAGS) -c -o $@ $< $(Q)$(CC) $(CFLAGS) -c -o $@ $<
$(O)/%.S: %.cc $(O)/%.o: %.cc
@echo " CXX $@" @echo " CXX $@"
$(Q)mkdir -p $(@D) $(Q)mkdir -p $(@D)
$(Q)$(CXX) $(CXXFLAGS) -S -o $@ $< $(Q)$(CXX) $(CXXFLAGS) -c -o $@ $<
$(O)/%.o: $(O)/%.S
@echo " AS $@"
$(Q)mkdir -p $(@D)
$(Q)$(CC) $(ASFLAGS) -c -o $@ $<
$(O)/%.o: %.S $(O)/%.o: %.S
@echo " CC $@" @echo " CC $@"
...@@ -75,7 +70,7 @@ $(O)/fs.img: $(O)/tools/mkfs README $(UPROGS) ...@@ -75,7 +70,7 @@ $(O)/fs.img: $(O)/tools/mkfs README $(UPROGS)
@echo " MKFS $@" @echo " MKFS $@"
$(Q)$(O)/tools/mkfs $@ README $(UPROGS) $(Q)$(O)/tools/mkfs $@ README $(UPROGS)
.PRECIOUS: $(O)/%.o $(O)/%.S .PRECIOUS: $(O)/%.o
.PHONY: clean qemu gdb rsync .PHONY: clean qemu gdb rsync
## ##
......
$(O)/lib/%.S: CFLAGS:=$(CFLAGS) -DXV6_USER $(O)/lib/%.o: CFLAGS:=$(CFLAGS) -DXV6_USER
$(O)/lib/%.S: CXXFLAGS:=$(CXXFLAGS) -DXV6_USER $(O)/lib/%.o: CXXFLAGS:=$(CXXFLAGS) -DXV6_USER
ULIB = ulib.o usys.o printf.o umalloc.o uthread.o fmt.o stream.o ipc.o \ ULIB = ulib.o usys.o printf.o umalloc.o uthread.o fmt.o stream.o ipc.o \
threads.o crt.o wqlib.o wquser.o perf.o wqalloc.o rt.o threads.o crt.o wqlib.o wquser.o perf.o wqalloc.o rt.o
......
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论