[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/arm Can't use TARGET_AAPCS...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d403f1349ab
branches:  trunk
changeset: 784568:8d403f1349ab
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Feb 02 05:04:25 2013 +0000

description:
Can't use TARGET_AAPCS_BASED since it's not setup by the time
SUBTARGET_CPU_DEFAULT is invoked so use ARM_DEFAULT_ABI instead).

diffstat:

 external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 9e5ea4172843 -r 8d403f1349ab external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h
--- a/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h        Sat Feb 02 02:08:37 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h        Sat Feb 02 05:04:25 2013 +0000
@@ -29,7 +29,8 @@
    SUBTARGET_CPU_DEFAULT to achieve this.  */
 
 #define SUBTARGET_CPU_DEFAULT \
-       (TARGET_AAPCS_BASED ? TARGET_CPU_arm926ejs : TARGET_CPU_arm6)
+       (ARM_DEFAULT_ABI != ARM_ABI_APCS && ARM_DEFAULT_ABI != ARM_ABI_ATPCS \
+           ? TARGET_CPU_arm926ejs : TARGET_CPU_arm6)
 
 /* This defaults us to little-endian.  */
 #ifndef TARGET_ENDIAN_DEFAULT