about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-07-15 08:27:19 -0700
committerUlrich Drepper <drepper@redhat.com>2009-07-15 08:27:19 -0700
commit59cbcac015cdd446c346cfd2c2ada3f94ef540b2 (patch)
tree1b4234c3a24793c07d71e96fc9bdf73288707c43
parentb0ecde3a63fd3e987137aa9eb76da3b556b14559 (diff)
downloadglibc-59cbcac015cdd446c346cfd2c2ada3f94ef540b2.tar.gz
glibc-59cbcac015cdd446c346cfd2c2ada3f94ef540b2.tar.xz
glibc-59cbcac015cdd446c346cfd2c2ada3f94ef540b2.zip
Fix build issue with modules for audit test on machines != x86-64.
-rw-r--r--ChangeLog5
-rw-r--r--elf/Makefile8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e90d19fc78..bece41b7a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-07-07  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* elf/Makefile: Don't build modules for tst-audit4 and tst-audit5
+	for anything but x86-64 targets.
+
+2009-07-07  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* config.h.in: Add HAVE_AVX_SUPPORT entry.
 	* config.make.in: Add config-cflags-avx entry.
 	* configure.in: Substitute libc_cv_cc_avx.
diff --git a/elf/Makefile b/elf/Makefile
index e4b977e9e3..21d131ec92 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -239,9 +239,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 \
-		tst-auditmod4a tst-auditmod4b \
-		tst-auditmod5a tst-auditmod5b \
 		unload3mod1 unload3mod2 unload3mod3 unload3mod4 \
 		unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
 		unload6mod1 unload6mod2 unload6mod3 \
@@ -255,6 +252,11 @@ endif
 ifeq (yesyes,$(have-fpie)$(build-shared))
 modules-names += tst-piemod1
 endif
+ifeq (x86_64,$(config-machine))
+modules-names += tst-auditmod3a tst-auditmod3b \
+		tst-auditmod4a tst-auditmod4b \
+		tst-auditmod5a tst-auditmod5b
+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.