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.
This commit is contained in:
Roland McGrath 2012-04-09 16:28:34 +00:00
parent d324f6d66b
commit 7cf492ee5a
6 changed files with 27 additions and 4 deletions

View File

@ -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.

View File

@ -1,6 +1,7 @@
#source: eh1.s
#source: eh1a.s
#ld:
#as: --64
#ld: -melf_x86_64 -Ttext 0x400078
#readelf: -wf
#target: x86_64-*-*

View File

@ -1,6 +1,7 @@
#source: eh1.s
#source: eh2a.s
#ld:
#as: --64
#ld: -melf_x86_64 -Ttext 0x400078
#readelf: -wf
#target: x86_64-*-*

View File

@ -1,6 +1,7 @@
#source: eh3.s
#source: eh3a.s
#ld:
#as: --64
#ld: -melf_x86_64 -Ttext 0x400078
#readelf: -wf
#target: x86_64-*-*

View File

@ -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-*-*

View File

@ -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
}