diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-08-19 00:51:07 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-08-19 00:51:07 +0000 |
| commit | 9536661c6e8045f810cd227a7d676eaff19bf1b8 (patch) | |
| tree | dd4a9d56bff7fe5eea84bf076bf0ab3ab4911b80 | |
| parent | ccb729df47188874401c655dda8d47b55cddd3b7 (diff) | |
| download | glibc-9536661c6e8045f810cd227a7d676eaff19bf1b8.tar.gz glibc-9536661c6e8045f810cd227a7d676eaff19bf1b8.tar.xz glibc-9536661c6e8045f810cd227a7d676eaff19bf1b8.zip | |
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.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | elf/Makefile | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index da9a3e0851..7b8181eb44 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 71a18a1ec4..e791901498 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 |