Set CPU type in BFD backend for x86_64-nacl* and i?86-nacl* targets
authorRoland McGrath <mcgrathr@google.com>
Wed, 6 Nov 2013 22:47:05 +0000 (14:47 -0800)
committerRoland McGrath <mcgrathr@google.com>
Thu, 7 Nov 2013 18:00:32 +0000 (10:00 -0800)
commit64b384e1e821cedccefa24f6d5bb82d353546ca1
tree3cea205679e69281b5bd339f9f505da76ea415b5
parentd40af490aad3df00a8ee52db589480d6ac5fdfd5
Set CPU type in BFD backend for x86_64-nacl* and i?86-nacl* targets

bfd/
* archures.c (bfd_mach_i386_nacl): Fix definition so it doesn't
collide with bfd_mach_l1om.
* bfd-in2.h: Regenerate.

* elf32-i386.c (elf32_i386_nacl_elf_object_p): New function.
(elf_backend_object_p): Use that in elf32-i386-nacl definition.
* elf64-x86-64.c (elf64_x86_64_nacl_elf_object_p): New function.
(elf_backend_object_p): Use that in elf64-x86-64-nacl definition.
(elf32_x86_64_nacl_elf_object_p): New function.
(elf_backend_object_p): Use that in elf32-x86-64-nacl definition.

binutils/
* objdump.c (dump_dwarf): Grok bfd_mach_x86_64_nacl and
bfd_mach_x64_32_nacl as equivalent to bfd_mach_x86_64.

ld/testsuite/
* ld-x86-64/x86-64.exp (mixed1, mixed2): Loosen error string match
so it accepts "i386:nacl" in place of "i386".
* 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.
13 files changed:
bfd/ChangeLog
bfd/archures.c
bfd/bfd-in2.h
bfd/elf32-i386.c
bfd/elf64-x86-64.c
binutils/ChangeLog
binutils/objdump.c
ld/testsuite/ChangeLog
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