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

9bad11b9 · Nickolai Zeldovich · f6455ee3 · 9bad11b9 · 9bad11b9
--- a/Makefile
+++ b/Makefile
@@ -51,15 +51,10 @@ $(O)/%.o: %.c
 	$(Q)mkdir -p $(@D)
 	$(Q)$(CC) $(CFLAGS) -c -o $@ $<

-$(O)/%.S: %.cc
+$(O)/%.o: %.cc
 	@echo "  CXX    $@"
 	$(Q)mkdir -p $(@D)
-	$(Q)$(CXX) $(CXXFLAGS) -S -o $@ $<
-
-$(O)/%.o: $(O)/%.S
-	@echo "  AS     $@"
-	$(Q)mkdir -p $(@D)
-	$(Q)$(CC) $(ASFLAGS) -c -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $<

 $(O)/%.o: %.S
 	@echo "  CC     $@"
@@ -75,7 +70,7 @@ $(O)/fs.img: $(O)/tools/mkfs README $(UPROGS)
 	@echo "  MKFS   $@"
 	$(Q)$(O)/tools/mkfs $@ README $(UPROGS)

-.PRECIOUS: $(O)/%.o $(O)/%.S
+.PRECIOUS: $(O)/%.o
 .PHONY: clean qemu gdb rsync

 ##

--- a/lib/Makefrag
+++ b/lib/Makefrag
-$(O)/lib/%.S: CFLAGS:=$(CFLAGS) -DXV6_USER
-$(O)/lib/%.S: CXXFLAGS:=$(CXXFLAGS) -DXV6_USER
+$(O)/lib/%.o: CFLAGS:=$(CFLAGS) -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 \
       threads.o crt.o wqlib.o wquser.o perf.o wqalloc.o rt.o