[src/trunk]: src/external/gpl3/gcc/dist/gcc Configury changes to match tuple ...

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

details:   https://anonhg.NetBSD.org/src/rev/66261e6cd3b9
branches:  trunk
changeset: 788785:66261e6cd3b9
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jul 19 16:23:10 2013 +0000

description:
Configury changes to match tuple of m5407--netbsdelf as a variant of
m68k--netbself but with a coldfire cpu (m5475).  Fix m68010 to actually
properly default to m68010.

diffstat:

 external/gpl3/gcc/dist/gcc/config.gcc   |  24 +++++++++++++++++++-----
 external/gpl3/gcc/dist/gcc/configure    |   4 ++--
 external/gpl3/gcc/dist/gcc/configure.ac |   4 ++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diffs (108 lines):

diff -r 30911ae1358d -r 66261e6cd3b9 external/gpl3/gcc/dist/gcc/config.gcc
--- a/external/gpl3/gcc/dist/gcc/config.gcc     Fri Jul 19 16:01:33 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/config.gcc     Fri Jul 19 16:23:10 2013 +0000
@@ -326,6 +326,10 @@
 m32r*-*-*)
         cpu_type=m32r
         ;;
+m5200-*-*|m5407-*-*)
+       cpu_type=m68k
+       extra_headers=math-68881.h
+       ;;
 m680[012]0-*-*)
        cpu_type=m68k
        extra_headers=math-68881.h
@@ -1659,21 +1663,28 @@
        esac
        extra_parts="crtbegin.o crtend.o"
        ;;
-m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
+m68010-*-netbsdelf* | m68k-*-netbsdelf* | m5407-*-netbsdelf*)
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
        tm_defines="${tm_defines} MOTOROLA=1 USE_GAS=1"
        default_cf_cpu=5475
+       default_m68k_cpu=68020
        case ${target} in
+       m5407*)
+               with_arch=${with_arch:-cf}
+               target_cpu_default="mcf5475"
+#              target="`echo ${target} | sed 's/m68kcf/m68k/'`"
+               ;;
        m68010*)
-               target_cpu_default="0"
+               target_cpu_default="m68010"
                tmake_file="m68k/t-m68kelf m68k/t-m68010-netbsd"
                default_m68k_cpu=68010
+               tmake_file="${tmake_file} m68k/t-floatlib"
                ;;
        *)
-               default_m68k_cpu=68020
+               with_arch=${with_arch:-m68k}
+               tmake_file="${tmake_file} m68k/t-floatlib"
                ;;
        esac
-       tmake_file="${tmake_file} m68k/t-floatlib"
        ;;
 m68k*-*-openbsd*)
        default_m68k_cpu=68020
@@ -2895,6 +2906,9 @@
     frv550-*-*linux*)
       with_cpu=fr550
       ;;
+    m5200-*-*|m5407-*-*)
+      with_cpu=${default_cf_cpu}
+      ;;
     m68k*-*-*)
       case "$with_arch" in
        "cf")
@@ -3150,7 +3164,7 @@
                esac
                ;;
 
-       fido-*-* | m68k*-*-*)
+       fido-*-* | m68k*-*-* | m5200-*-* | m5407-*-*)
                supported_defaults="arch cpu"
                case "$with_arch" in
                "" | "m68k"| "cf")
diff -r 30911ae1358d -r 66261e6cd3b9 external/gpl3/gcc/dist/gcc/configure
--- a/external/gpl3/gcc/dist/gcc/configure      Fri Jul 19 16:01:33 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/configure      Fri Jul 19 16:23:10 2013 +0000
@@ -22188,7 +22188,7 @@
        tls_first_minor=16
        tls_as_opt='-32 --fatal-warnings'
        ;;
-  m68k-*-*)
+  m68k-*-*|m5407-*-*)
     conftest_s='
        .section .tdata,"awT",@progbits
 x:
@@ -24300,7 +24300,7 @@
   i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
   | x86_64*-*-* | hppa*-*-* | arm*-*-* \
   | xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \
-  | spu-*-* | fido*-*-* | m32c-*-*)
+  | spu-*-* | fido*-*-* | m32c-*-* | m5407-*-*)
     insn="nop"
     ;;
   ia64*-*-* | s390*-*-*)
diff -r 30911ae1358d -r 66261e6cd3b9 external/gpl3/gcc/dist/gcc/configure.ac
--- a/external/gpl3/gcc/dist/gcc/configure.ac   Fri Jul 19 16:01:33 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/configure.ac   Fri Jul 19 16:23:10 2013 +0000
@@ -2769,7 +2769,7 @@
        tls_first_minor=16
        tls_as_opt='-32 --fatal-warnings'
        ;;
-  m68k-*-*)
+  m68k-*-* | m5407-*-*)
     conftest_s='
        .section .tdata,"awT",@progbits
 x:
@@ -3689,7 +3689,7 @@
   i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
   | x86_64*-*-* | hppa*-*-* | arm*-*-* \
   | xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \
-  | spu-*-* | fido*-*-* | m32c-*-*)
+  | spu-*-* | fido*-*-* | m32c-*-* | m5407-*-*)
     insn="nop"
     ;;
   ia64*-*-* | s390*-*-*)