ld/testsuite/

	* ld-elf/eh1.d: Add explicit --64 to as options, and explicit
	-melf_x86_64 and -Ttext to ld options, so we don't assume every
	x86_64-*-* target uses --64 (vs --x32) by default or has the
	same address space layout.
	* ld-elf/eh2.d: Likewise.
	* ld-elf/eh3.d: Likewise.
	* ld-elf/eh4.d: Likewise.
	* ld-elf/elf.exp: For target *-*-nacl*, use options_regsub(ld) to
	map -melf_x86_64 to -melf_x86_64_nacl.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index e6aafbc..122924c 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-09  Roland McGrath  <mcgrathr@google.com>
+
+       * ld-elf/eh1.d: Add explicit --64 to as options, and explicit
+       -melf_x86_64 and -Ttext to ld options, so we don't assume every
+       x86_64-*-* target uses --64 (vs --x32) by default or has the
+       same address space layout.
+       * ld-elf/eh2.d: Likewise.
+       * ld-elf/eh3.d: Likewise.
+       * ld-elf/eh4.d: Likewise.
+       * ld-elf/elf.exp: For target *-*-nacl*, use options_regsub(ld) to
+       map -melf_x86_64 to -melf_x86_64_nacl.
+
 2012-04-07  David S. Miller  <davem@davemloft.net>
 
        * ld-sparc/tlssunbin32.rd: Fix regexp.

diff --git a/ld/testsuite/ld-elf/eh1.d b/ld/testsuite/ld-elf/eh1.d
index f0874f7..4455b0d 100644 (file)
--- a/ld/testsuite/ld-elf/eh1.d
+++ b/ld/testsuite/ld-elf/eh1.d
@@ -1,6 +1,7 @@
 #source: eh1.s
 #source: eh1a.s
-#ld:
+#as: --64
+#ld: -melf_x86_64 -Ttext 0x400078
 #readelf: -wf
 #target: x86_64-*-*
 

diff --git a/ld/testsuite/ld-elf/eh2.d b/ld/testsuite/ld-elf/eh2.d
index 1a05d7f..c5b5a73 100644 (file)
--- a/ld/testsuite/ld-elf/eh2.d
+++ b/ld/testsuite/ld-elf/eh2.d
@@ -1,6 +1,7 @@
 #source: eh1.s
 #source: eh2a.s
-#ld:
+#as: --64
+#ld: -melf_x86_64 -Ttext 0x400078
 #readelf: -wf
 #target: x86_64-*-*
 

diff --git a/ld/testsuite/ld-elf/eh3.d b/ld/testsuite/ld-elf/eh3.d
index 1f76b8c..b3bd756 100644 (file)
--- a/ld/testsuite/ld-elf/eh3.d
+++ b/ld/testsuite/ld-elf/eh3.d
@@ -1,6 +1,7 @@
 #source: eh3.s
 #source: eh3a.s
-#ld:
+#as: --64
+#ld: -melf_x86_64 -Ttext 0x400078
 #readelf: -wf
 #target: x86_64-*-*
 

diff --git a/ld/testsuite/ld-elf/eh4.d b/ld/testsuite/ld-elf/eh4.d
index b8f9865..ad4b008 100644 (file)
--- a/ld/testsuite/ld-elf/eh4.d
+++ b/ld/testsuite/ld-elf/eh4.d
@@ -1,6 +1,7 @@
 #source: eh4.s
 #source: eh4a.s
-#ld: -shared
+#as: --64
+#ld: -melf_x86_64 -shared -Ttext 0x400
 #readelf: -wf
 #target: x86_64-*-*
 

diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index e2050fc..e40078a 100644 (file)
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -37,6 +37,13 @@ if { [istarget alpha*-*-* ] } {
     set LDFLAGS "$LDFLAGS -Ttext-segment 0x1000000"
 }
 
+if { [istarget "*-*-nacl*"] } {
+    # The eh[1-4] cases are written to expect ELFCLASS64 layout on x86-64.
+    # But the target default is ELFCLASS32.  So the cases explicitly use
+    # -melf_x86_64 to select that, but NaCl needs a different emulation name.
+    set options_regsub(ld) {-melf_x86_64 -melf_x86_64_nacl}
+}
+
 if { [is_remote host] } then {
     remote_download host merge.ld
 }