Use rtld-CPPFLAGS in rtld-%.os rules for generated sources.

diff --git a/ChangeLog b/ChangeLog
index 8ba955a775987ee9b79a17a3daabb154e1dbf3bf..5fa4885c5d7656da00de963b793be1fdfa65290e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-18  Roland McGrath  <roland@hack.frob.com>
+
+       * elf/rtld-Rules (rtld-compile-command.S): New variable.
+       (rtld-compile-command.s, rtld-compile-command.c): New variables.
+       ($(objpfx)rtld-%.os rules): Use them.
+
 2013-06-17  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        * nptl/sysdeps/powerpc/tls.h (tcbhead_t): Add Event-Based Branch

diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index f11dbe079ae291512bf3ee7dc9e3acdfb2b04189..1aa00060b87dc0a8afe496e5712977d33da386b0 100644 (file)
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -88,29 +88,39 @@ else
 # Some other subdir's Makefile has provided all its normal rules,
 # and we just provide some additional definitions.
 
+rtld-compile-command.S = $(compile-command.S) $(rtld-CPPFLAGS)
+rtld-compile-command.s = $(compile-command.s) $(rtld-CPPFLAGS)
+rtld-compile-command.c = $(compile-command.c) $(rtld-CPPFLAGS)
+
 # These are the basic compilation rules corresponding to the Makerules ones.
 # The sysd-rules generated makefile already defines pattern rules for rtld-%
 # targets built from sysdeps source files.
 $(objpfx)rtld-%.os: rtld-%.S $(before-compile)
-       $(compile-command.S) $(rtld-CPPFLAGS)
+       $(rtld-compile-command.S)
 $(objpfx)rtld-%.os: rtld-%.s $(before-compile)
-       $(compile-command.s) $(rtld-CPPFLAGS)
+       $(rtld-compile-command.s)
 $(objpfx)rtld-%.os: rtld-%.c $(before-compile)
-       $(compile-command.c) $(rtld-CPPFLAGS)
+       $(rtld-compile-command.c)
 $(objpfx)rtld-%.os: %.S $(before-compile)
-       $(compile-command.S) $(rtld-CPPFLAGS)
+       $(rtld-compile-command.S)
 $(objpfx)rtld-%.os: %.s $(before-compile)
-       $(compile-command.s) $(rtld-CPPFLAGS)
+       $(rtld-compile-command.s)
 $(objpfx)rtld-%.os: %.c $(before-compile)
-       $(compile-command.c) $(rtld-CPPFLAGS)
+       $(rtld-compile-command.c)
 
 # The rules for generated source files.
-$(objpfx)rtld-%.os: $(objpfx)rtld-%.S $(before-compile); $(compile-command.S)
-$(objpfx)rtld-%.os: $(objpfx)rtld-%.s $(before-compile); $(compile-command.s)
-$(objpfx)rtld-%.os: $(objpfx)rtld-%.c $(before-compile); $(compile-command.c)
-$(objpfx)rtld-%.os: $(objpfx)%.S $(before-compile); $(compile-command.S)
-$(objpfx)rtld-%.os: $(objpfx)%.s $(before-compile); $(compile-command.s)
-$(objpfx)rtld-%.os: $(objpfx)%.c $(before-compile); $(compile-command.c)
+$(objpfx)rtld-%.os: $(objpfx)rtld-%.S $(before-compile)
+       $(rtld-compile-command.S)
+$(objpfx)rtld-%.os: $(objpfx)rtld-%.s $(before-compile)
+       $(rtld-compile-command.s)
+$(objpfx)rtld-%.os: $(objpfx)rtld-%.c $(before-compile)
+       $(rtld-compile-command.c)
+$(objpfx)rtld-%.os: $(objpfx)%.S $(before-compile)
+       $(rtld-compile-command.S)
+$(objpfx)rtld-%.os: $(objpfx)%.s $(before-compile)
+       $(rtld-compile-command.s)
+$(objpfx)rtld-%.os: $(objpfx)%.c $(before-compile)
+       $(rtld-compile-command.c)
 
 # The command line setting of rtld-modules (see above) tells us
 # what we need to build, and that tells us what dependency files we need.