diff options
| -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 |