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:00:32 -0800 |
| commit | 64b384e1e821cedccefa24f6d5bb82d353546ca1 (patch) | |
| tree | 3cea205679e69281b5bd339f9f505da76ea415b5 /ld/testsuite/ld-x86-64/ilp32-2.d | |
| parent | d40af490aad3df00a8ee52db589480d6ac5fdfd5 (diff) | |
| download | binutils-gdb-64b384e1e821cedccefa24f6d5bb82d353546ca1.tar.gz | |
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.
Diffstat (limited to 'ld/testsuite/ld-x86-64/ilp32-2.d')
| -rw-r--r-- | ld/testsuite/ld-x86-64/ilp32-2.d | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ld/testsuite/ld-x86-64/ilp32-2.d b/ld/testsuite/ld-x86-64/ilp32-2.d index 65b5298457b..fde3e8af498 100644 --- a/ld/testsuite/ld-x86-64/ilp32-2.d +++ b/ld/testsuite/ld-x86-64/ilp32-2.d @@ -1,4 +1,4 @@ #source: dummy.s #as: --x32 #ld: -m elf32_x86_64 tmpdir/startx32.o tmpdir/foo32.o -#error: .*i386 architecture of input file `tmpdir/foo32.o' is incompatible with i386:x64-32.* output +#error: .*i386(:.+)? architecture of input file `tmpdir/foo32.o' is incompatible with i386:x64-32.* output |