aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-06-18 16:29:25 -0700
committerRoland McGrath <roland@hack.frob.com>2013-06-18 16:29:25 -0700
commitbfcacbdec0ea80b12b23f89572c29b87624e76ec (patch)
treeb71d5e6d4248905a1999ad3b51d7c79827fba9af
parent02a809d2cd341eece48b83821a192cb9f565e69a (diff)
downloadglibc-bfcacbdec0ea80b12b23f89572c29b87624e76ec.tar
glibc-bfcacbdec0ea80b12b23f89572c29b87624e76ec.tar.gz
glibc-bfcacbdec0ea80b12b23f89572c29b87624e76ec.tar.bz2
glibc-bfcacbdec0ea80b12b23f89572c29b87624e76ec.zip
Use rtld-CPPFLAGS in rtld-%.os rules for generated sources.
-rw-r--r--ChangeLog6
-rw-r--r--elf/rtld-Rules34
2 files changed, 28 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ba955a775..5fa4885c5d 100644
--- 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 f11dbe079a..1aa00060b8 100644
--- 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.