diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-i386.h | 2 | ||||
| -rw-r--r-- | gas/configure.tgt | 5 |
3 files changed, 12 insertions, 1 deletions
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 <mcgrathr@google.com> + + * 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 <matthew.gretton-dann@arm.com> * 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* | \ |