Always run mpx3 and mpx4 tests in 64-bit

	* ld-x86-64/mpx.exp: Always run mpx3 and mpx4 tests in 64-bit.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index a8dce51..e09af2b 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,20 +1,23 @@
+2014-11-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * ld-x86-64/mpx.exp: Always run mpx3 and mpx4 tests in 64-bit.
+
 2014-11-18  Igor Zamyatin  <igor.zamyatin@intel.com>
 
-       * testsuite/ld-x86-64/bnd-ifunc-1.d: Add bndplt option.
-       * testsuite/ld-x86-64/bnd-ifunc-2.d: Likewise.
-       * testsuite/ld-x86-64/bnd-plt-1.d: Likewise.  Update dissassembly
-       sections.
-       * testsuite/ld-x86-64/mpx.exp: Handle mpx3 and mpx4 tests.
-       * testsuite/ld-x86-64/mpx1a.rd: Remove _BND from relocation name.
-       * testsuite/ld-x86-64/mpx1c.rd: Likewise.
-       * testsuite/ld-x86-64/mpx2a.rd: Likewise.
-       * testsuite/ld-x86-64/mpx2c.rd: Likewise.
-       * testsuite/ld-x86-64/mpx3.dd: New file.
-       * testsuite/ld-x86-64/mpx3a.s: Likewise.
-       * testsuite/ld-x86-64/mpx3b.s: Likewise.
-       * testsuite/ld-x86-64/mpx4.dd: Likewise.
-       * testsuite/ld-x86-64/mpx4a.s: Likewise.
-       * testsuite/ld-x86-64/mpx4b.s: Likewise.
+       * ld-x86-64/bnd-ifunc-1.d: Add bndplt option.
+       * ld-x86-64/bnd-ifunc-2.d: Likewise.
+       * ld-x86-64/bnd-plt-1.d: Likewise.  Update dissassembly sections.
+       * ld-x86-64/mpx.exp: Handle mpx3 and mpx4 tests.
+       * ld-x86-64/mpx1a.rd: Remove _BND from relocation name.
+       * ld-x86-64/mpx1c.rd: Likewise.
+       * ld-x86-64/mpx2a.rd: Likewise.
+       * ld-x86-64/mpx2c.rd: Likewise.
+       * ld-x86-64/mpx3.dd: New file.
+       * ld-x86-64/mpx3a.s: Likewise.
+       * ld-x86-64/mpx3b.s: Likewise.
+       * ld-x86-64/mpx4.dd: Likewise.
+       * ld-x86-64/mpx4a.s: Likewise.
+       * ld-x86-64/mpx4b.s: Likewise.
 
 2014-11-10  Matthew Fortune  <matthew.fortune@imgtec.com>
 

diff --git a/ld/testsuite/ld-x86-64/mpx.exp b/ld/testsuite/ld-x86-64/mpx.exp
index 2650b3a..bdf9593 100644 (file)
--- a/ld/testsuite/ld-x86-64/mpx.exp
+++ b/ld/testsuite/ld-x86-64/mpx.exp
@@ -76,16 +76,16 @@ set run_tests {
 
 run_ld_link_tests {
     {"Build libcall.so"
-     "-shared -z bndplt" "" ""
+     "-m elf_x86_64 -shared -z bndplt" "" "--64"
      {mpx3b.s} {} "libcall.so"}
     {"Build mpx3"
-     "tmpdir/libcall.so -z bndplt" "" ""
+     "-m elf_x86_64 -z bndplt tmpdir/libcall.so" "" "--64"
      {mpx3a.s} {{objdump -dw mpx3.dd}} "mpx3"}
     {"Build libcall1.so"
-     "-shared -z bndplt" "" ""
+     "-m elf_x86_64 -shared -z bndplt" "" "--64"
      {mpx4b.s} {} "libcall1.so"}
     {"Build mpx4"
-     "tmpdir/libcall1.so -z bndplt" "" ""
+     "-m elf_x86_64 -z bndplt tmpdir/libcall1.so" "" "--64"
      {mpx4a.s} {{objdump -dw mpx4.dd}} "mpx4"}
 }