This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.17-829-gbfcacbd
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Jun 2013 23:31:27 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-829-gbfcacbd
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via bfcacbdec0ea80b12b23f89572c29b87624e76ec (commit)
from 02a809d2cd341eece48b83821a192cb9f565e69a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=bfcacbdec0ea80b12b23f89572c29b87624e76ec
commit bfcacbdec0ea80b12b23f89572c29b87624e76ec
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue Jun 18 16:29:25 2013 -0700
Use rtld-CPPFLAGS in rtld-%.os rules for generated sources.
diff --git a/ChangeLog b/ChangeLog
index 8ba955a..5fa4885 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 f11dbe0..1aa0006 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.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
elf/rtld-Rules | 34 ++++++++++++++++++++++------------
2 files changed, 28 insertions(+), 12 deletions(-)
hooks/post-receive
--
GNU C Library master sources