This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.15-1099-gfed806c


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  fed806c3af7b6421e17ac50f8129dbe4fd693e4a (commit)
      from  3091725976856160a5427b03a9586af534b63750 (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fed806c3af7b6421e17ac50f8129dbe4fd693e4a

commit fed806c3af7b6421e17ac50f8129dbe4fd693e4a
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sun May 6 18:37:57 2012 -0400

    tests: move -D_FORTIFY_SOURCE to CPPFLAGS
    
    The -D_FORTIFY_SOURCE flags are being added to the test-specific CFLAGS
    values when they should be the test-specific CPPFLAGS values.  Otherwise
    the values don't override the user-specified CPPFLAGS and might end up
    breaking the tests.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index c9bd9b4..4d71f26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-05-31  Mike Frysinger  <vapier@gentoo.org>
+
+	* debug/Makefile (CFLAGS-tst-longjmp_chk.c): Delete
+	-D_FORTIFY_SOURCE=1.
+	(CPPFLAGS-tst-longjmp_chk.c): Define.
+	(CFLAGS-tst-longjmp_chk2.c): Delete -D_FORTIFY_SOURCE=1.
+	(CPPFLAGS-tst-longjmp_chk2.c): Define.
+	* wcsmbs/Makefile (CPPFLAGS-tst-wchar-h.c): Rename from
+	CFLAGS-tst-wchar-h.c.
+
 2012-05-31  Marek Polacek  <polacek@redhat.com>
 
 	[BZ #14132]
diff --git a/debug/Makefile b/debug/Makefile
index fb8c285..4c01a66 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -79,10 +79,14 @@ CFLAGS-pread_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-pread64_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-recv_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-recvfrom_chk.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-tst-longjmp_chk.c = -fexceptions -fasynchronous-unwind-tables \
-			   -D_FORTIFY_SOURCE=1
-CFLAGS-tst-longjmp_chk2.c = -fexceptions -fasynchronous-unwind-tables \
-			    -D_FORTIFY_SOURCE=1
+
+# Need to make sure the settings here override what configure might have
+# set up for us, so keep the CFLAGS/CPPFLAGS split logical as the order is:
+# <user CFLAGS> <test CFLAGS> <user CPPFLAGS> <test CPPFLAGS>
+CFLAGS-tst-longjmp_chk.c = -fexceptions -fasynchronous-unwind-tables
+CPPFLAGS-tst-longjmp_chk.c = -D_FORTIFY_SOURCE=1
+CFLAGS-tst-longjmp_chk2.c = -fexceptions -fasynchronous-unwind-tables
+CPPFLAGS-tst-longjmp_chk2.c = -D_FORTIFY_SOURCE=1
 
 # We know these tests have problems with format strings, this is what
 # we are testing.  Disable that warning.
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 99d3d28..983fd76 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -66,7 +66,7 @@ CFLAGS-wcstoull_l.c = $(strtox-CFLAGS)
 CFLAGS-wcstod_l.c = $(strtox-CFLAGS)
 CFLAGS-wcstold_l.c = $(strtox-CFLAGS)
 CFLAGS-wcstof_l.c = $(strtox-CFLAGS)
-CFLAGS-tst-wchar-h.c = -D_FORTIFY_SOURCE=2
+CPPFLAGS-tst-wchar-h.c = -D_FORTIFY_SOURCE=2
 
 CFLAGS-isoc99_wscanf.c += $(exceptions)
 CFLAGS-isoc99_fwscanf.c += $(exceptions)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |   10 ++++++++++
 debug/Makefile  |   12 ++++++++----
 wcsmbs/Makefile |    2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]