[2/2] libgloss: drop $(INCLUDES) when using $(AS)

Message ID 20231204070307.21360-2-vapier@gentoo.org
State New
Headers
Series [1/2] Revert "Fix libgloss/newlib build to conditionally use top include dir" |

Commit Message

Mike Frysinger Dec. 4, 2023, 7:03 a.m. UTC
  Since $(AS) is the assembler, passing it a list of preprocessor include
flags doesn't make much sense.  The files aren't preprocessed which means
`#include` lines aren't respected, and while it would affect `.include`
usage, we never use that, and it's extremely unlikely to change.  Plus,
it's extremely unlikely we'd have .s files in common places to include vs
contained entirely within a specific arch dir, and at that point, it can
be included directly (with no flags), or the arch can add the unique set
of include paths that it needs for itself.
---
 libgloss/config/default.mh    | 2 +-
 libgloss/config/ppc.mh        | 2 +-
 libgloss/epiphany/Makefile.in | 2 +-
 libgloss/hp74x/Makefile.in    | 2 +-
 libgloss/pru/Makefile.in      | 2 +-
 libgloss/spu/Makefile.in      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
  

Patch

diff --git a/libgloss/config/default.mh b/libgloss/config/default.mh
index 81f0920f97a8..64dc02f05c64 100644
--- a/libgloss/config/default.mh
+++ b/libgloss/config/default.mh
@@ -14,7 +14,7 @@  AR_FLAGS = rc
 .C.o:
 	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-	$(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+	$(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.
diff --git a/libgloss/config/ppc.mh b/libgloss/config/ppc.mh
index a3d157bb8fd7..d1bfd7588e55 100644
--- a/libgloss/config/ppc.mh
+++ b/libgloss/config/ppc.mh
@@ -18,7 +18,7 @@  AR_FLAGS = qc
 .C.o:
 	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS_MRELOCATABLE) -O2 $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-	$(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+	$(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.
diff --git a/libgloss/epiphany/Makefile.in b/libgloss/epiphany/Makefile.in
index 6cf55e25e69e..6670b79a08f1 100644
--- a/libgloss/epiphany/Makefile.in
+++ b/libgloss/epiphany/Makefile.in
@@ -105,7 +105,7 @@  AR_FLAGS = qc
 .S.o:
 	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-	$(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+	$(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.
diff --git a/libgloss/hp74x/Makefile.in b/libgloss/hp74x/Makefile.in
index 12c51bf3bee7..0167e1c62ee3 100644
--- a/libgloss/hp74x/Makefile.in
+++ b/libgloss/hp74x/Makefile.in
@@ -117,7 +117,7 @@  install:
 
 .s.o:
 	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
-#	$(AS) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
+#	$(AS) $(CFLAGS_FOR_TARGET) -c $<
 
 .SUFFIXES: .S .c .o .s .lif
 #
diff --git a/libgloss/pru/Makefile.in b/libgloss/pru/Makefile.in
index 7a2f290a827c..fc5905a5eaf4 100644
--- a/libgloss/pru/Makefile.in
+++ b/libgloss/pru/Makefile.in
@@ -89,7 +89,7 @@  LDFLAGS_FOR_TARGET = ${MULTILIB}
 .C.o:
 	$(CC) $(CFLAGS_FOR_TARGET) -Os $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-	$(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+	$(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.
diff --git a/libgloss/spu/Makefile.in b/libgloss/spu/Makefile.in
index bc8768baf183..4be0783b9873 100644
--- a/libgloss/spu/Makefile.in
+++ b/libgloss/spu/Makefile.in
@@ -95,7 +95,7 @@  AR_FLAGS = qc
 .C.o:
 	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-	$(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+	$(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.