
The __mcf5200__ has been replaced by __mcoldfire__ in Peter Barada's
Coldfire support for binutils 2.13/2.14. This patch supports both
the new and the old symbol in arch/m68knommu.

Patch submitted by Bernardo Innocenti <bernie@develer.com>

Applies as-is to linux-2.5.73-uc0

diff -ru linux-2.5.70-uc0/arch/m68knommu/lib/divsi3.S linux-2.5.x/arch/m68knommu/lib/divsi3.S
--- linux-2.5.70-uc0/arch/m68knommu/lib/divsi3.S	2003-05-27 03:00:41.000000000 +0200
+++ linux-2.5.x/arch/m68knommu/lib/divsi3.S	2003-06-27 19:53:38.000000000 +0200
@@ -97,7 +97,7 @@
 	movel	sp@(12), d1	/* d1 = divisor */
 	jpl	L1
 	negl	d1
-#ifndef __mcf5200__
+#if !(defined(__mcf5200__) || defined(__mcoldfire__))
 	negb	d2		/* change sign because divisor <0  */
 #else
 	negl	d2		/* change sign because divisor <0  */
@@ -105,7 +105,7 @@
 L1:	movel	sp@(8), d0	/* d0 = dividend */
 	jpl	L2
 	negl	d0
-#ifndef __mcf5200__
+#if !(defined(__mcf5200__) || defined(__mcoldfire__))
 	negb	d2
 #else
 	negl	d2
diff -ru linux-2.5.70-uc0/arch/m68knommu/lib/modsi3.S linux-2.5.x/arch/m68knommu/lib/modsi3.S
--- linux-2.5.70-uc0/arch/m68knommu/lib/modsi3.S	2003-05-27 03:00:21.000000000 +0200
+++ linux-2.5.x/arch/m68knommu/lib/modsi3.S	2003-06-27 19:53:56.000000000 +0200
@@ -98,7 +98,7 @@
 	jbsr	SYM (__divsi3)
 	addql	IMM (8), sp
 	movel	sp@(8), d1	/* d1 = divisor */
-#ifndef __mcf5200__
+#if !(defined(__mcf5200__) || defined(__mcoldfire__))
 	movel	d1, sp@-
 	movel	d0, sp@-
 	jbsr	SYM (__mulsi3)	/* d0 = (a/b)*b */
diff -ru linux-2.5.70-uc0/arch/m68knommu/lib/mulsi3.S linux-2.5.x/arch/m68knommu/lib/mulsi3.S
--- linux-2.5.70-uc0/arch/m68knommu/lib/mulsi3.S	2003-05-27 03:01:00.000000000 +0200
+++ linux-2.5.x/arch/m68knommu/lib/mulsi3.S	2003-06-27 19:31:17.000000000 +0200
@@ -95,7 +95,7 @@
 	muluw	sp@(10), d0	/* x0*y1 */
 	movew	sp@(6), d1	/* x1 -> d1 */
 	muluw	sp@(8), d1	/* x1*y0 */
-#ifndef __mcf5200__
+#if !(defined(__mcf5200__) || defined(__mcoldfire__))
 	addw	d1, d0
 #else
 	addl	d1, d0
diff -ru linux-2.5.70-uc0/arch/m68knommu/lib/udivsi3.S linux-2.5.x/arch/m68knommu/lib/udivsi3.S
--- linux-2.5.70-uc0/arch/m68knommu/lib/udivsi3.S	2003-05-27 03:00:56.000000000 +0200
+++ linux-2.5.x/arch/m68knommu/lib/udivsi3.S	2003-06-27 19:54:38.000000000 +0200
@@ -91,7 +91,7 @@
 	.proc
 	.globl	SYM (__udivsi3)
 SYM (__udivsi3):
-#ifndef __mcf5200__
+#if !(defined(__mcf5200__) || defined(__mcoldfire__))
 	movel	d2, sp@-
 	movel	sp@(12), d1	/* d1 = divisor */
 	movel	sp@(8), d0	/* d0 = dividend */
@@ -136,7 +136,7 @@
 L6:	movel	sp@+, d2
 	rts
 
-#else /* __mcf5200__ */
+#else /* __mcf5200__ || __mcoldfire__ */
 
 /* Coldfire implementation of non-restoring division algorithm from
    Hennessy & Patterson, Appendix A. */
@@ -158,5 +158,5 @@
 	moveml	sp@,d2-d4	| restore data registers
 	unlk	a6		| and return
 	rts
-#endif /* __mcf5200__ */
+#endif /* __mcf5200__ || __mcoldfire__ */
 
diff -ru linux-2.5.70-uc0/arch/m68knommu/lib/umodsi3.S linux-2.5.x/arch/m68knommu/lib/umodsi3.S
--- linux-2.5.70-uc0/arch/m68knommu/lib/umodsi3.S	2003-05-27 03:00:46.000000000 +0200
+++ linux-2.5.x/arch/m68knommu/lib/umodsi3.S	2003-06-27 19:54:57.000000000 +0200
@@ -98,7 +98,7 @@
 	jbsr	SYM (__udivsi3)
 	addql	IMM (8), sp
 	movel	sp@(8), d1	/* d1 = divisor */
-#ifndef __mcf5200__
+#if !(defined(__mcf5200__) || defined(__mcoldfire__))
 	movel	d1, sp@-
 	movel	d0, sp@-
 	jbsr	SYM (__mulsi3)	/* d0 = (a/b)*b */
