From 8059fb196eecc90ab0dc7ecabd913690d08baee9 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 16 Mar 2012 23:19:47 +0000 Subject: bfd/ 2012-03-16 Roland McGrath * config.bfd: Handle x86_64-*-nacl*. * elf64-x86-64.c (bfd_elf64_x86_64_nacl_vec): New backend vector stanza. (bfd_elf32_x86_64_nacl_vec): Likewise. * targets.c: Support them. * configure.in: Likewise. * configure: Regenerated. gas/ 2012-03-16 Roland McGrath * config/tc-i386.h [TE_NACL] (ELF_TARGET_FORMAT32, ELF_TARGET_FORMAT64): Define for this case. * configure.tgt (i386-*-nacl*): If ${cpu} is x86_64*, default to x32. --- gas/ChangeLog | 6 ++++++ gas/config/tc-i386.h | 2 ++ gas/configure.tgt | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'gas') diff --git a/gas/ChangeLog b/gas/ChangeLog index 1238255..9209d4d 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2012-03-16 Roland McGrath + + * config/tc-i386.h [TE_NACL] (ELF_TARGET_FORMAT32, ELF_TARGET_FORMAT64): + Define for this case. + * configure.tgt (i386-*-nacl*): If ${cpu} is x86_64*, default to x32. + 2012-03-16 Matthew Gretton-Dann * config/tc-arm.c (aeabi_set_public_attributes): Correct diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h index 599d0bf..51c6cb6 100644 --- a/gas/config/tc-i386.h +++ b/gas/config/tc-i386.h @@ -63,6 +63,8 @@ extern unsigned long i386_mach (void); #define ELF_TARGET_FORMAT "elf32-i386-vxworks" #elif defined (TE_NACL) #define ELF_TARGET_FORMAT "elf32-i386-nacl" +#define ELF_TARGET_FORMAT32 "elf32-x86-64-nacl" +#define ELF_TARGET_FORMAT64 "elf64-x86-64-nacl" #endif #ifdef TE_SOLARIS diff --git a/gas/configure.tgt b/gas/configure.tgt index 06fb6ca..99a276f 100644 --- a/gas/configure.tgt +++ b/gas/configure.tgt @@ -183,7 +183,10 @@ case ${generic_target} in i386-*-elf) fmt=elf ;; i386-*-kaos*) fmt=elf ;; i386-*-bsd*) fmt=aout em=386bsd ;; - i386-*-nacl*) fmt=elf em=nacl ;; + i386-*-nacl*) fmt=elf em=nacl + case ${cpu} in + x86_64*) arch=x86_64:32 ;; + esac ;; i386-*-netbsd0.8) fmt=aout em=386bsd ;; i386-*-netbsdpe*) fmt=coff em=pe ;; i386-*-netbsd*-gnu* | \ -- cgit v1.1