1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/lib/muldi3.c b/arch/arm/lib/muldi3.c
index 44d611b1cfdb..5b649fa9e2f7 100644
--- a/arch/arm/lib/muldi3.c
+++ b/arch/arm/lib/muldi3.c
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA.  */
 #include "gcclib.h"
 #define umul_ppmm(xh, xl, a, b) \
-{register USItype __t0, __t1, __t2;                                     \
+{register u32 __t0, __t1, __t2;                                     \
  __asm__ ("%@ Inlined umul_ppmm                                        \n\
        mov     %2, %5, lsr #16                                         \n\
        mov     %0, %6, lsr #16                                         \n\
@@ -46,11 +46,11 @@ Boston, MA 02111-1307, USA.  */
        addcs   %0, %0, #65536                                          \n\
        adds    %1, %1, %3, lsl #16                                     \n\
        adc     %0, %0, %3, lsr #16"                                    \
-           : "=&r" ((USItype) (xh)),                                    \
+           : "=&r" ((u32) (xh)),                                    \
-             "=r" ((USItype) (xl)),                                     \
+             "=r" ((u32) (xl)),                                     \
             "=&r" (__t0), "=&r" (__t1), "=r" (__t2)                    \
-           : "r" ((USItype) (a)),                                       \
+           : "r" ((u32) (a)),                                       \
-             "r" ((USItype) (b)));}
+             "r" ((u32) (b)));}
 #define __umulsidi3(u, v) \
@@ -59,8 +59,8 @@ Boston, MA 02111-1307, USA.  */
    __w.ll; })
-DItype
+s64
-__muldi3 (DItype u, DItype v)
+__muldi3 (s64 u, s64 v)
 {
  DIunion w;
  DIunion uu, vv;
@@ -69,8 +69,8 @@ __muldi3 (DItype u, DItype v)
  vv.ll = v;
  w.ll = __umulsidi3 (uu.s.low, vv.s.low);
-  w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
+  w.s.high += ((u32) uu.s.low * (u32) vv.s.high
-               + (USItype) uu.s.high * (USItype) vv.s.low);
+               + (u32) uu.s.high * (u32) vv.s.low);
  return w.ll;
 }

diff --git a/arch/arm/lib/muldi3.c b/arch/arm/lib/muldi3.c index 44d611b1cfdb..5b649fa9e2f7 100644 --- a/arch/arm/lib/muldi3.c +++ b/arch/arm/lib/muldi3.c
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA. */
32	#include "gcclib.h"	32	#include "gcclib.h"
33		33
34	#define umul_ppmm(xh, xl, a, b) \	34	#define umul_ppmm(xh, xl, a, b) \
35	{register USItype __t0, __t1, __t2; \	35	{register u32 __t0, __t1, __t2; \
36	__asm__ ("%@ Inlined umul_ppmm \n\	36	__asm__ ("%@ Inlined umul_ppmm \n\
37	mov %2, %5, lsr #16 \n\	37	mov %2, %5, lsr #16 \n\
38	mov %0, %6, lsr #16 \n\	38	mov %0, %6, lsr #16 \n\
@@ -46,11 +46,11 @@ Boston, MA 02111-1307, USA. */
46	addcs %0, %0, #65536 \n\	46	addcs %0, %0, #65536 \n\
47	adds %1, %1, %3, lsl #16 \n\	47	adds %1, %1, %3, lsl #16 \n\
48	adc %0, %0, %3, lsr #16" \	48	adc %0, %0, %3, lsr #16" \
49	: "=&r" ((USItype) (xh)), \	49	: "=&r" ((u32) (xh)), \
50	"=r" ((USItype) (xl)), \	50	"=r" ((u32) (xl)), \
51	"=&r" (__t0), "=&r" (__t1), "=r" (__t2) \	51	"=&r" (__t0), "=&r" (__t1), "=r" (__t2) \
52	: "r" ((USItype) (a)), \	52	: "r" ((u32) (a)), \
53	"r" ((USItype) (b)));}	53	"r" ((u32) (b)));}
54		54
55		55
56	#define __umulsidi3(u, v) \	56	#define __umulsidi3(u, v) \
@@ -59,8 +59,8 @@ Boston, MA 02111-1307, USA. */
59	__w.ll; })	59	__w.ll; })
60		60
61		61
62	DItype	62	s64
63	__muldi3 (DItype u, DItype v)	63	__muldi3 (s64 u, s64 v)
64	{	64	{
65	DIunion w;	65	DIunion w;
66	DIunion uu, vv;	66	DIunion uu, vv;
@@ -69,8 +69,8 @@ __muldi3 (DItype u, DItype v)
69	vv.ll = v;	69	vv.ll = v;
70		70
71	w.ll = __umulsidi3 (uu.s.low, vv.s.low);	71	w.ll = __umulsidi3 (uu.s.low, vv.s.low);
72	w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high	72	w.s.high += ((u32) uu.s.low * (u32) vv.s.high
73	+ (USItype) uu.s.high * (USItype) vv.s.low);	73	+ (u32) uu.s.high * (u32) vv.s.low);
74		74
75	return w.ll;	75	return w.ll;
76	}	76	}