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.22-92-g9536661


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  9536661c6e8045f810cd227a7d676eaff19bf1b8 (commit)
      from  ccb729df47188874401c655dda8d47b55cddd3b7 (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=9536661c6e8045f810cd227a7d676eaff19bf1b8

commit 9536661c6e8045f810cd227a7d676eaff19bf1b8
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Aug 19 00:51:07 2015 +0000

    Fix -Wundef warnings in elf/tst-execstack.c.
    
    To remove -Wno-error=undef, we need to fix the remaining cases where
    there are -Wundef warnings in the testsuite.  One of those places is
    in elf/tst-execstack.c.
    
    tst-execstack.c tests USE_PTHREADS with #if.  nptl/tst-execstack.c
    defines USE_PTHREADS to 1 before including ../elf/tst-execstack.c,
    while elf/tst-execstack.c, when compiled directly, leaves it
    undefined.
    
    This patch adds a setting of CPPFLAGS-tst-execstack.c to
    elf/Makefile.  An alternative approach would be to rename
    tst-execstack.c to tst-execstack-main.c and have two different
    tst-execstack.c files include it, each with an appropriate
    USE_PTHREADS #define.
    
    Tested for x86_64.
    
    	* elf/Makefile [$(have-z-execstack) = yes]
    	(CPPFLAGS-tst-execstack.c): New variable.

diff --git a/ChangeLog b/ChangeLog
index da9a3e0..7b8181e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-08-19  Joseph Myers  <joseph@codesourcery.com>
 
+	* elf/Makefile [$(have-z-execstack) = yes]
+	(CPPFLAGS-tst-execstack.c): New variable.
+
 	* login/tst-utmp.c [_HAVE_UT_TYPE || defined UTMPX]: Change
 	conditional to [defined UTMPX || _HAVE_UT_TYPE].
 	[_HAVE_UT_TV || defined UTMPX]: Change conditional to [defined
diff --git a/elf/Makefile b/elf/Makefile
index 71a18a1..e791901 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -874,6 +874,7 @@ endif
 ifeq ($(have-z-execstack),yes)
 $(objpfx)tst-execstack: $(libdl)
 $(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so
+CPPFLAGS-tst-execstack.c = -DUSE_PTHREADS=0
 LDFLAGS-tst-execstack = -Wl,-z,noexecstack
 LDFLAGS-tst-execstack-mod = -Wl,-z,execstack
 

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

Summary of changes:
 ChangeLog    |    3 +++
 elf/Makefile |    1 +
 2 files changed, 4 insertions(+), 0 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]