diff options
| author | Roland McGrath <roland@gnu.org> | 2013-08-26 22:18:05 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2013-08-26 22:18:05 +0000 |
| commit | 44723cd9e4f5843e1ac828530e830995ec7da1b1 (patch) | |
| tree | 9b8cfacff45da42c81a21115c549ad4003caa0d4 /ld/emulparams | |
| parent | 5c79b11db972441a103aa6e573b8444a54dcf334 (diff) | |
| download | binutils-redhat-44723cd9e4f5843e1ac828530e830995ec7da1b1.tar.gz | |
bfd/
* archures.c (bfd_mach_i386_nacl, bfd_mach_i386_i386_nacl): New macros.
(bfd_mach_x86_64_nacl, bfd_mach_x64_32_nacl): New macros.
* cpu-i386.c (bfd_arch_i386_onebyte_nop_fill): New function.
(bfd_i386_nacl_arch): New variable.
(bfd_x86_64_nacl_arch, bfd_x64_32_nacl_arch): New variables.
(bfd_x64_32_arch_intel_syntax): Link them into the list.
* bfd-in2.h: Regenerate.
ld/
* emulparams/elf_i386_nacl.sh (ARCH): Set to i386:nacl.
* emulparams/elf_x86_64_nacl.sh (ARCH): Set to i386:x86-64:nacl.
* emulparams/elf32_x86_64_nacl.sh (ARCH): Set to i386:x64-32:nacl.
ld/testsuite/
* ld-x86-64/x86-64.exp (Mixed x86_64 and i386 input test 1):
Loosen string match to admit i386:x86-64*.
(Mixed x86_64 and i386 input test 2): Likewise.
* ld-x86-64/ilp32-2.d: Likewise.
* ld-x86-64/ilp32-3.d: Likewise.
* ld-x86-64/lp64-2.d: Likewise.
* ld-x86-64/lp64-3.d: Likewise.
* ld-x86-64/ia32-2.d: Likewise, and i386.* too.
* ld-x86-64/ia32-3.d: Likewise.
Diffstat (limited to 'ld/emulparams')
| -rw-r--r-- | ld/emulparams/elf32_x86_64_nacl.sh | 1 | ||||
| -rw-r--r-- | ld/emulparams/elf_i386_nacl.sh | 1 | ||||
| -rw-r--r-- | ld/emulparams/elf_x86_64_nacl.sh | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/ld/emulparams/elf32_x86_64_nacl.sh b/ld/emulparams/elf32_x86_64_nacl.sh index 4570ef98f2..ea98b287b2 100644 --- a/ld/emulparams/elf32_x86_64_nacl.sh +++ b/ld/emulparams/elf32_x86_64_nacl.sh @@ -1,3 +1,4 @@ . ${srcdir}/emulparams/elf32_x86_64.sh . ${srcdir}/emulparams/elf_nacl.sh OUTPUT_FORMAT="elf32-x86-64-nacl" +ARCH="i386:x64-32:nacl" # The :nacl just means one-byte nops for code fill. diff --git a/ld/emulparams/elf_i386_nacl.sh b/ld/emulparams/elf_i386_nacl.sh index 81992d7584..294f7f5aba 100644 --- a/ld/emulparams/elf_i386_nacl.sh +++ b/ld/emulparams/elf_i386_nacl.sh @@ -1,3 +1,4 @@ . ${srcdir}/emulparams/elf_i386.sh . ${srcdir}/emulparams/elf_nacl.sh OUTPUT_FORMAT="elf32-i386-nacl" +ARCH="i386:nacl" # The :nacl just means one-byte nops for code fill. diff --git a/ld/emulparams/elf_x86_64_nacl.sh b/ld/emulparams/elf_x86_64_nacl.sh index 7c79eee2c6..a6966bdaf3 100644 --- a/ld/emulparams/elf_x86_64_nacl.sh +++ b/ld/emulparams/elf_x86_64_nacl.sh @@ -1,3 +1,4 @@ . ${srcdir}/emulparams/elf_x86_64.sh . ${srcdir}/emulparams/elf_nacl.sh OUTPUT_FORMAT="elf64-x86-64-nacl" +ARCH="i386:x86-64:nacl" # The :nacl just means one-byte nops for code fill. |