 @@ -1608,35 +1608,39 @@ NAME (TYPE x, int m)
 #define CONCAT2(A,B)	_CONCAT2(A,B)
 #define _CONCAT2(A,B)	A##B
 /* All of these would be present in a full C99 implementation of <math.h>
    and <complex.h>.  Our problem is that only a few systems have such full
    implementations.  Further, libgcc_s.so isn't currently linked against
    libm.so, and even for systems that do provide full C99, the extra overhead
    of all programs using libgcc having to link against libm.  So avoid it.  */
 #define isnan(x)	__builtin_expect ((x) != (x), 0)
 #define isfinite(x)	__builtin_expect (!isnan((x) - (x)), 1)
 #define isinf(x)	__builtin_expect (!isnan(x) & !isfinite(x), 0)
 #if TARGET_FLOAT_FORMAT == IEEE_FLOAT_FORMAT
 #define INFINITY	CONCAT2(__builtin_inf, CEXT) ()
 #endif
 #define I		1i
 /* Helpers to make the following code slightly less gross.  */
 #define COPYSIGN	CONCAT2(__builtin_copysign, CEXT)
 #define FABS		CONCAT2(__builtin_fabs, CEXT)
 /* Verify that MTYPE matches up with CEXT.  */
 #ifdef INFINITY
 extern void *compile_type_assert[sizeof(INFINITY) == sizeof(MTYPE) ? 1 : -1];
 #endif
 /* Ensure that we've lost any extra precision.  */
 #if NOTRUNC
 # define TRUNC(x)
 #else
 # define TRUNC(x)	__asm__ ("" : "=m"(x) : "m"(x))
 #endif
 #if defined(L_mulsc3) || defined(L_muldc3) \
     || defined(L_mulxc3) || defined(L_multc3)
 CTYPE
 CONCAT3(__mul,MODE,3) (MTYPE a, MTYPE b, MTYPE c, MTYPE d)
 @@ -1646,26 +1650,27 @@ CONCAT3(__mul,MODE,3) (MTYPE a, MTYPE b,
   ac = a * c;
   bd = b * d;
   ad = a * d;
   bc = b * c;
   TRUNC (ac);
   TRUNC (bd);
   TRUNC (ad);
   TRUNC (bc);
   x = ac - bd;
   y = ad + bc;
 #ifdef INFINITY
   if (isnan (x) && isnan (y))
+    {
       /* Recover infinities that computed as NaN + iNaN.  */
       _Bool recalc = 0;
       if (isinf (a) || isinf (b))
+	{
 	  /* z is infinite.  "Box" the infinity and change NaNs in
 	     the other factor to 0.  */
 	  a = COPYSIGN (isinf (a) ? 1 : 0, a);
 	  b = COPYSIGN (isinf (b) ? 1 : 0, b);
 	  if (isnan (c)) c = COPYSIGN (0, c);
 	  if (isnan (d)) d = COPYSIGN (0, d);
           recalc = 1;
 @@ -1687,26 +1692,27 @@ CONCAT3(__mul,MODE,3) (MTYPE a, MTYPE b,
 	  /* Recover infinities from overflow by changing NaNs to 0.  */
 	  if (isnan (a)) a = COPYSIGN (0, a);
 	  if (isnan (b)) b = COPYSIGN (0, b);
 	  if (isnan (c)) c = COPYSIGN (0, c);
 	  if (isnan (d)) d = COPYSIGN (0, d);
 	  recalc = 1;
+	}
       if (recalc)
+	{
 	  x = INFINITY * (a * c - b * d);
 	  y = INFINITY * (a * d + b * c);
+	}
+    }
 #endif
   return x + I * y;
+}
 #endif /* complex multiply */
 #if defined(L_divsc3) || defined(L_divdc3) \
     || defined(L_divxc3) || defined(L_divtc3)
 CTYPE
 CONCAT3(__div,MODE,3) (MTYPE a, MTYPE b, MTYPE c, MTYPE d)
+{
   MTYPE denom, ratio, x, y;
 @@ -1721,53 +1727,55 @@ CONCAT3(__div,MODE,3) (MTYPE a, MTYPE b,
       x = ((a * ratio) + b) / denom;
       y = ((b * ratio) - a) / denom;
+    }
   else
+    {
       ratio = d / c;
       denom = (d * ratio) + c;
       x = ((b * ratio) + a) / denom;
       y = (b - (a * ratio)) / denom;
+    }
   /* Recover infinities and zeros that computed as NaN+iNaN; the only cases
      are nonzero/zero, infinite/finite, and finite/infinite.  */
 #ifdef INFINITY
   if (isnan (x) && isnan (y))
+    {
       if (c == 0.0 && d == 0.0 && (!isnan (a) || !isnan (b)))
+	{
 	  x = COPYSIGN (INFINITY, c) * a;
 	  y = COPYSIGN (INFINITY, c) * b;
+	}
       else if ((isinf (a) || isinf (b)) && isfinite (c) && isfinite (d))
+	{
 	  a = COPYSIGN (isinf (a) ? 1 : 0, a);
 	  b = COPYSIGN (isinf (b) ? 1 : 0, b);
 	  x = INFINITY * (a * c + b * d);
 	  y = INFINITY * (b * c - a * d);
+	}
       else if ((isinf (c) || isinf (d)) && isfinite (a) && isfinite (b))
+	{
 	  c = COPYSIGN (isinf (c) ? 1 : 0, c);
 	  d = COPYSIGN (isinf (d) ? 1 : 0, d);
 	  x = 0.0 * (a * c + b * d);
 	  y = 0.0 * (b * c - a * d);
+	}
+    }
 #endif
   return x + I * y;
+}
 #endif /* complex divide */
 #undef INFINITY
 #endif /* all complex float routines */
 /* From here on down, the routines use normal data types.  */
 #define SItype bogus_type
 #define USItype bogus_type
 #define DItype bogus_type
 #define UDItype bogus_type
 #define SFtype bogus_type
 #define DFtype bogus_type
 #undef Wtype
 #undef UWtype
 #undef HWtype

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.inc,v 1.13 2008/09/18 12:20:19 skrll Exp $
+#	$NetBSD: Makefile.inc,v 1.14 2009/10/01 20:07:09 martin Exp $
 .if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk) && ${MKGCC} != "no"
 .include "${.CURDIR}/../arch/${MACHINE_ARCH}.mk"
 .endif
 DIST=		${NETBSDSRCDIR}/gnu/dist/gcc4
 GNUHOSTDIST=	${DIST}
 GCCARCH=	${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
 GCCARCHLIBGCC=	${NETBSDSRCDIR}/gnu/lib/libgcc4/arch/${MACHINE_ARCH}
 GCCARCHXX=	${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH}
 GCPPFLAGS=	${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES}
 CPPFLAGS+=	-I${.CURDIR} -I${GCCARCHLIBGCC}
 @@ -17,30 +17,28 @@ CPPFLAGS+=	-I${G_EXTRA_HEADERS:M/*:H:u}
 CPPFLAGS+=	-I${DIST}/gcc/cp -I${DIST}/gcc/config -I${GCCARCHXX} -I.
 # This is copied from gcc/mklibgcc.in:$lib2funcs
 LIB2FUNCS_ALL=	_muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
         _cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \
         _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi \
         _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf _clear_cache \
         _enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \
         _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \
         _ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \
         _popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \
         _powixf2 _powitf2 \
 .if ${MACHINE_ARCH} != "vax"
 LIB2FUNCS_ALL+=	\
 	_mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 _divxc3 _divtc3
 .endif
 LIB2FUNCS_SHORT:=${LIB2FUNCS_ALL}
 LIB2_DIVMOD_FUNCS:=${G_LIB2_DIVMOD_FUNCS}
 .for f in ${G_LIB1ASMFUNCS}; do
 LIB2FUNCS_SHORT:=${LIB2FUNCS_SHORT:N${f}}
 LIB2_DIVMOD_FUNCS:=${LIB2_DIVMOD_FUNCS:N${f}}
 .endfor
 LIB2FUNCS=	${LIB2FUNCS_SHORT:=.c}
 LIB2FUNCS_ST=	${G_LIB2FUNCS_ST:=.c}
 LIB2DIVMOD=	${LIB2_DIVMOD_FUNCS:=.c}
 LIB2_EH=	${G_LIB2ADDEH:M*.c:T}
 .if !empty(G_LIB1ASMFUNCS)