about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-08-19 00:51:07 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-08-19 00:51:07 +0000
commit9536661c6e8045f810cd227a7d676eaff19bf1b8 (patch)
treedd4a9d56bff7fe5eea84bf076bf0ab3ab4911b80 /elf
parentccb729df47188874401c655dda8d47b55cddd3b7 (diff)
downloadglibc-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.
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile1
1 files changed, 1 insertions, 0 deletions
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