Module Name:    src
Committed By:   matt
Date:           Fri Jul 19 16:23:10 UTC 2013

Modified Files:
        src/external/gpl3/gcc/dist/gcc: config.gcc configure configure.ac

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/configure
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.17 src/external/gpl3/gcc/dist/gcc/config.gcc:1.18
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.17	Thu Apr 18 09:11:13 2013
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Fri Jul 19 16:23:10 2013
@@ -326,6 +326,10 @@ hppa*-*-*)
 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 @@ m68k-*-elf* | fido-*-elf*)
 	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 @@ if test x$with_cpu = x ; then
     frv550-*-*linux*)
       with_cpu=fr550
       ;;
+    m5200-*-*|m5407-*-*)
+      with_cpu=${default_cf_cpu}
+      ;;
     m68k*-*-*)
       case "$with_arch" in
 	"cf")
@@ -3150,7 +3164,7 @@ case "${target}" in
 		esac
 		;;
 
-	fido-*-* | m68k*-*-*)
+	fido-*-* | m68k*-*-* | m5200-*-* | m5407-*-*)
 		supported_defaults="arch cpu"
 		case "$with_arch" in
 		"" | "m68k"| "cf")

Index: src/external/gpl3/gcc/dist/gcc/configure
diff -u src/external/gpl3/gcc/dist/gcc/configure:1.4 src/external/gpl3/gcc/dist/gcc/configure:1.5
--- src/external/gpl3/gcc/dist/gcc/configure:1.4	Tue Sep 18 07:04:41 2012
+++ src/external/gpl3/gcc/dist/gcc/configure	Fri Jul 19 16:23:10 2013
@@ -22188,7 +22188,7 @@ x:
 	tls_first_minor=16
 	tls_as_opt='-32 --fatal-warnings'
 	;;
-  m68k-*-*)
+  m68k-*-*|m5407-*-*)
     conftest_s='
 	.section .tdata,"awT",@progbits
 x:
@@ -24300,7 +24300,7 @@ case "$target" in
   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*-*-*)

Index: src/external/gpl3/gcc/dist/gcc/configure.ac
diff -u src/external/gpl3/gcc/dist/gcc/configure.ac:1.3 src/external/gpl3/gcc/dist/gcc/configure.ac:1.4
--- src/external/gpl3/gcc/dist/gcc/configure.ac:1.3	Tue Jun 21 07:39:18 2011
+++ src/external/gpl3/gcc/dist/gcc/configure.ac	Fri Jul 19 16:23:10 2013
@@ -2769,7 +2769,7 @@ x:
 	tls_first_minor=16
 	tls_as_opt='-32 --fatal-warnings'
 	;;
-  m68k-*-*)
+  m68k-*-* | m5407-*-*)
     conftest_s='
 	.section .tdata,"awT",@progbits
 x:
@@ -3689,7 +3689,7 @@ case "$target" in
   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*-*-*)

Reply via email to