about summary refs log tree commit diff
path: root/elf/Makefile
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2011-01-13 16:21:55 -0500
committerUlrich Drepper <drepper@gmail.com>2011-01-13 16:21:55 -0500
commit68dc949774cb651d53541df4abdc60327f7e096b (patch)
treea1385c2904cb736cca63ce8de24bdaf345b4a0bc /elf/Makefile
parent8cf8ce1702c354a8266e3cfa6ab54c2467d1873f (diff)
downloadglibc-68dc949774cb651d53541df4abdc60327f7e096b.tar.gz
glibc-68dc949774cb651d53541df4abdc60327f7e096b.tar.xz
glibc-68dc949774cb651d53541df4abdc60327f7e096b.zip
Fix check-execstack test
Diffstat (limited to 'elf/Makefile')
-rw-r--r--elf/Makefile18
1 files changed, 10 insertions, 8 deletions
diff --git a/elf/Makefile b/elf/Makefile
index bba6493084..da9af8be44 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -898,15 +898,17 @@ check-textrel-CFLAGS = -O -Wall -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
 $(objpfx)check-textrel: check-textrel.c
 	$(native-compile)
 
-check-execstack-CFLAGS = -O -Wall -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -std=gnu99
-# Perform the same operation as $(native-compile) but add the sysdeps
-# directories as header search locations.
-$(objpfx)check-execstack: check-execstack.c
+check-execstack-CFLAGS = -O -Wall -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -std=gnu99 \
+			 $(objpfx:%/=-I%)
+$(objpfx)check-execstack: check-execstack.c $(objpfx)check-execstack.h
+	$(native-compile)
+$(objpfx)check-execstack.h: $(first-word $(wildcard $(sysdirs:%=%/stackinfo.h)))
 	$(make-target-directory)
-	$(patsubst %/,cd % &&,$(objpfx)) \
-	$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \
-	$(addprefix -I$(shell pwd)/,$(sysdirs)) -I$(shell pwd) \
-	$(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(@F)
+	{ echo '#include <stackinfo.h>'; echo '@@@DEFAULT_STACK_PERMS@@@'; } | \
+	$(CC) $(CFLAGS) $(CPPFLAGS) -E -x c-header - | \
+	sed -n -e 's/^@@@\(.*\)@@@/#define DEFAULT_STACK_PERMS \1/p' > $@T
+	mv -f $@T $@
+generated += check-execstack.h
 
 check-localplt-CFLAGS = -O -Wall -D_GNU_SOURCE -std=gnu99
 $(objpfx)check-localplt: check-localplt.c