bfd/
authorRoland McGrath <roland@gnu.org>
Mon, 26 Aug 2013 22:18:07 +0000 (22:18 +0000)
committerRoland McGrath <roland@gnu.org>
Mon, 26 Aug 2013 22:18:07 +0000 (22:18 +0000)
commit1098fd41ac4a8efe7ed5a96487e89f53ff79165d
tree335e249d045a56d407f6e7f051bc7e433c0fd20c
parent887badb310f11f59df2f6833a6bd0b219ba225a0
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.
16 files changed:
bfd/ChangeLog
bfd/archures.c
bfd/bfd-in2.h
bfd/cpu-i386.c
ld/ChangeLog
ld/emulparams/elf32_x86_64_nacl.sh
ld/emulparams/elf_i386_nacl.sh
ld/emulparams/elf_x86_64_nacl.sh
ld/testsuite/ChangeLog
ld/testsuite/ld-x86-64/ia32-2.d
ld/testsuite/ld-x86-64/ia32-3.d
ld/testsuite/ld-x86-64/ilp32-2.d
ld/testsuite/ld-x86-64/ilp32-3.d
ld/testsuite/ld-x86-64/lp64-2.d
ld/testsuite/ld-x86-64/lp64-3.d
ld/testsuite/ld-x86-64/x86-64.exp