diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-22 02:56:41 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-22 02:56:41 +0000 |
| commit | a1055d384d75c28f09a47c2d8628bc330f892955 (patch) | |
| tree | 0608d52a3294ad6f51294acf0cc1b07adf835f30 /libc/nptl/Makefile | |
| parent | f71e9a28759c1f5d6e8dc0baced440e72507b433 (diff) | |
| download | eglibc2-a1055d384d75c28f09a47c2d8628bc330f892955.tar.gz | |
Merge changes between r24941 and r25087 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@25088 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl/Makefile')
| -rw-r--r-- | libc/nptl/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libc/nptl/Makefile b/libc/nptl/Makefile index e07559ed2..2cd0ce3ad 100644 --- a/libc/nptl/Makefile +++ b/libc/nptl/Makefile @@ -307,7 +307,7 @@ tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \ tst-oncex3 tst-oncex4 endif ifeq ($(build-shared),yes) -tests += tst-atfork2 tst-tls3 tst-tls4 tst-tls5 tst-_res1 tst-fini1 \ +tests += tst-atfork2 tst-tls3 tst-tls4 tst-tls5 tst-tls7 tst-_res1 tst-fini1 \ tst-stackguard1 tests-nolibpthread += tst-fini1 ifeq ($(have-z-execstack),yes) @@ -318,7 +318,8 @@ endif modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \ tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \ tst-tls5modd tst-tls5mode tst-tls5modf \ - tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod + tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod \ + tst-tls7mod extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o test-extras += $(modules-names) tst-cleanup4aux test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) @@ -332,6 +333,7 @@ tst-tls5modc.so-no-z-defs = yes tst-tls5modd.so-no-z-defs = yes tst-tls5mode.so-no-z-defs = yes tst-tls5modf.so-no-z-defs = yes +tst-tls7mod.so-no-z-defs = yes ifeq ($(build-shared),yes) # Build all the modules even when not actually running test programs. @@ -494,6 +496,12 @@ $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) LDFLAGS-tst-tls5 = $(no-as-needed) LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so +# ensure free(malloc()) isn't optimized out +CFLAGS-tst-tls7.c = -fno-builtin-malloc -fno-builtin-free +$(objpfx)tst-tls7: $(libdl) $(shared-thread-library) +$(objpfx)tst-tls7.out: $(objpfx)tst-tls7mod.so +$(objpfx)tst-tls7mod.so: $(shared-thread-library) + ifeq ($(build-shared),yes) ifeq ($(run-built-tests),yes) tests: $(objpfx)tst-tls6.out |