diff options
| author | Roland McGrath <mcgrathr@google.com> | 2013-11-06 14:47:05 -0800 |
|---|---|---|
| committer | Roland McGrath <mcgrathr@google.com> | 2013-11-07 10:02:27 -0800 |
| commit | 268121417c4844cbb1d533cd5e0a2e273442d718 (patch) | |
| tree | 3f2c6bb11c71881515312e3732d4e631b91226e9 /binutils | |
| parent | 588f35c9cf6a64722aba60993a26dda12ee33db6 (diff) | |
| download | ppe42-binutils-268121417c4844cbb1d533cd5e0a2e273442d718.tar.gz ppe42-binutils-268121417c4844cbb1d533cd5e0a2e273442d718.zip | |
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.
(cherry picked from commit 64b384e1e821cedccefa24f6d5bb82d353546ca1)
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/objdump.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index a8ddd22f79..bc1ace9d50 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2013-11-07 Roland McGrath <mcgrathr@google.com> + + * objdump.c (dump_dwarf): Grok bfd_mach_x86_64_nacl and + bfd_mach_x64_32_nacl as equivalent to bfd_mach_x86_64. + 2013-10-31 Nick Clifton <nickc@redhat.com> * nm.c (display_rel_file): Treat bfd_error_no_symbols as diff --git a/binutils/objdump.c b/binutils/objdump.c index 89efc155fb..cfd08e935c 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -2395,8 +2395,10 @@ dump_dwarf (bfd *abfd) { case bfd_mach_x86_64: case bfd_mach_x86_64_intel_syntax: + case bfd_mach_x86_64_nacl: case bfd_mach_x64_32: case bfd_mach_x64_32_intel_syntax: + case bfd_mach_x64_32_nacl: init_dwarf_regnames_x86_64 (); break; |
