Fix build issue with modules for audit test on machines != x86-64.

(cherry picked from commit 59cbcac015cdd446c346cfd2c2ada3f94ef540b2,
removed tst-audit4, tst-audit5 references)

diff --git a/ChangeLog b/ChangeLog
index f39fc4735ddd40078b161e9247f390240737c7b7..064475eeb6b0e861f613c453a2638465afcc85c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf/Makefile: Don't build modules for tst-audit3 for anything
+       but x86-64 targets.
+
 2009-07-10  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/sys/epoll.h: Fix comment.

diff --git a/elf/Makefile b/elf/Makefile
index c99bf93f65d28e548eff9e74b2ec747bd8eda6bf..b2b5a6538e9ddcd251b950b15514fbfd6a59e0f2 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -217,7 +217,6 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
                $(modules-execstack-$(have-z-execstack)) \
                tst-dlopenrpathmod tst-deep1mod1 tst-deep1mod2 tst-deep1mod3 \
                tst-dlmopen1mod tst-auditmod1 \
-               tst-auditmod3a tst-auditmod3b \
                unload3mod1 unload3mod2 unload3mod3 unload3mod4 \
                unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
                unload6mod1 unload6mod2 unload6mod3 \
@@ -229,6 +228,9 @@ endif
 ifeq (yesyes,$(have-fpie)$(build-shared))
 modules-names += tst-piemod1
 endif
+ifeq (x86_64,$(config-machine))
+modules-names += tst-auditmod3a tst-auditmod3b
+endif
 modules-execstack-yes = tst-execstack-mod
 extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))
 # We need this variable to be sure the test modules get the right CPPFLAGS.