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