Merge branch 'jn/make-assembly-in-right-directory' into maint

diff --git a/Makefile b/Makefile
index 67d761e83adad8e3332b22fbe753e0cdb81b1a83..3019b01d50e2c268fb520344ea24cdecd41f4805 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2209,7 +2209,7 @@ $(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs)
 endif
 
 %.s: %.c GIT-CFLAGS FORCE
-       $(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+       $(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
 
 ifdef USE_COMPUTED_HEADER_DEPENDENCIES
 # Take advantage of gcc's on-the-fly dependency generation