Add $(tests-execstack-$(have-z-execstack)) after defined [BZ #22998]

Message ID 20180324140909.GA36469@intel.com
State New
Headers show
Series
  • Add $(tests-execstack-$(have-z-execstack)) after defined [BZ #22998]
Related show

Commit Message

H.J. Lu March 24, 2018, 2:09 p.m.
When $(tests-execstack-$(have-z-execstack)) is added to tests before
it is defined, it is empty.  This patch adds it to tests after it is
defined.

OK for master?

H.J.
---
	[BZ #22998]
	* elf/Makefile (tests): Add $(tests-execstack-$(have-z-execstack))
	after it is defined.
---
 elf/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Andreas Schwab March 24, 2018, 3:22 p.m. | #1
On Mär 24 2018, "H.J. Lu" <hongjiu.lu@intel.com> wrote:

> 	[BZ #22998]
> 	* elf/Makefile (tests): Add $(tests-execstack-$(have-z-execstack))
> 	after it is defined.

Ok.

Andreas.

Patch

diff --git a/elf/Makefile b/elf/Makefile
index 9bdb9220c7..59bcca5046 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -174,7 +174,7 @@  tests += restest1 preloadtest loadfail multiload origtest resolvfail \
 	 tst-tls4 tst-tls5 \
 	 tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 tst-tls15 \
 	 tst-tls16 tst-tls17 tst-tls18 tst-tls19 tst-tls-dlinfo \
-	 tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
+	 tst-align tst-align2 \
 	 tst-dlmodcount tst-dlopenrpath tst-deep1 \
 	 tst-dlmopen1 tst-dlmopen3 \
 	 unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
@@ -202,6 +202,7 @@  ifneq ($(selinux-enabled),1)
 tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
 endif
 endif
+tests += $(tests-execstack-$(have-z-execstack))
 ifeq ($(run-built-tests),yes)
 tests-special += $(objpfx)tst-leaks1-mem.out \
 		 $(objpfx)tst-leaks1-static-mem.out $(objpfx)noload-mem.out \