about summary refs log tree commit diff
diff options
context:
space:
mode:
authorZong Li <zong@andestech.com>2018-10-25 13:08:24 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-10-25 13:08:24 +0200
commit41432ebe15b4263866d560a9242fb08d2146fde5 (patch)
tree4fe5441d875113123b64fd8da7948642916df1c9
parentd026efea0f4b9c4c6c8dadd4c61c1a12148792fc (diff)
downloadglibc-41432ebe15b4263866d560a9242fb08d2146fde5.tar.gz
glibc-41432ebe15b4263866d560a9242fb08d2146fde5.tar.xz
glibc-41432ebe15b4263866d560a9242fb08d2146fde5.zip
elf: Fix the ld flags not be applied to tst-execstack-mod.so
The Makefile variable name lacked the file extension (.so).  As a
result, tst-execstack-mod.so was not linked with the -z execstack
flag.
-rw-r--r--ChangeLog5
-rw-r--r--elf/Makefile2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a4063bd0e..0e4069ce4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-25  Zong Li  <zong@andestech.com>
+
+	* elf/Makefile (LDFLAGS-tst-execstack-mod.so): Change variable
+	name by adding the file extension (.so).
+
 2018-10-25  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* sysdeps/mach/hurd/i386/Makefile [$(subdir) = conform]
diff --git a/elf/Makefile b/elf/Makefile
index 455ec730fc..e86874492e 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1012,7 +1012,7 @@ $(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
+LDFLAGS-tst-execstack-mod.so = -Wl,-z,execstack
 
 $(objpfx)tst-execstack-needed: $(objpfx)tst-execstack-mod.so
 LDFLAGS-tst-execstack-needed = -Wl,-z,noexecstack