From 64b384e1e821cedccefa24f6d5bb82d353546ca1 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 6 Nov 2013 14:47:05 -0800 Subject: 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. --- binutils/ChangeLog | 5 +++++ binutils/objdump.c | 2 ++ 2 files changed, 7 insertions(+) (limited to 'binutils') diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 457f0b0..1ab6e0d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2013-11-07 Roland McGrath + + * 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-30 Alan Modra * readelf.c (get_ppc_dynamic_type): Replace PPC_TLSOPT with PPC_OPT. diff --git a/binutils/objdump.c b/binutils/objdump.c index 37962cb..0098ae7 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -2394,8 +2394,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; -- cgit v1.1