diff options
| author | Roland McGrath <roland@gnu.org> | 2013-08-26 22:18:07 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2013-08-26 22:18:07 +0000 |
| commit | 1098fd41ac4a8efe7ed5a96487e89f53ff79165d (patch) | |
| tree | 335e249d045a56d407f6e7f051bc7e433c0fd20c /ld/testsuite/ld-x86-64/lp64-2.d | |
| parent | 887badb310f11f59df2f6833a6bd0b219ba225a0 (diff) | |
| download | gdb-1098fd41ac4a8efe7ed5a96487e89f53ff79165d.zip gdb-1098fd41ac4a8efe7ed5a96487e89f53ff79165d.tar.gz gdb-1098fd41ac4a8efe7ed5a96487e89f53ff79165d.tar.bz2 | |
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.
Diffstat (limited to 'ld/testsuite/ld-x86-64/lp64-2.d')
| -rw-r--r-- | ld/testsuite/ld-x86-64/lp64-2.d | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ld/testsuite/ld-x86-64/lp64-2.d b/ld/testsuite/ld-x86-64/lp64-2.d index fde3202..7515881 100644 --- a/ld/testsuite/ld-x86-64/lp64-2.d +++ b/ld/testsuite/ld-x86-64/lp64-2.d @@ -1,4 +1,4 @@ #source: dummy.s #as: --64 #ld: -m elf_x86_64 tmpdir/start64.o tmpdir/foo32.o -#error: .*i386 architecture of input file `tmpdir/foo32.o' is incompatible with i386:x86-64 output +#error: .*i386 architecture of input file `tmpdir/foo32.o' is incompatible with i386:x86-64.* output |