(convert_to_integer): Don't add a NOP_EXPR in cases where we can

[gcc.git] / gcc / libgcc2.c

diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index 8c70133dd895e69fadaa2d72cac6daa227255612..8a136c696f426aeebb63708522a94a6a6627f69b 100644 (file)
--- a/gcc/libgcc2.c
+++ b/gcc/libgcc2.c
@@ -28,7 +28,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    compiled for the target, and hence definitions concerning only the host
    do not apply.  */
 
-#include "tm.h"
+#include "tconfig.h"
 #ifndef L_trampoline
 #include "gstddef.h"
 #endif
@@ -54,8 +54,12 @@ typedef               int DItype     __attribute__ ((mode (DI)));
 typedef unsigned int UDItype   __attribute__ ((mode (DI)));
 typedef        float SFtype    __attribute__ ((mode (SF)));
 typedef                float DFtype    __attribute__ ((mode (DF)));
+#if 0
 typedef                float XFtype    __attribute__ ((mode (XF)));
+#endif
+#if LONG_DOUBLE_TYPE_SIZE == 128
 typedef                float TFtype    __attribute__ ((mode (TF)));
+#endif
 
 /* Make sure that we don't accidentaly use any normal C language built-in
    type names in the first part of this file.  Instead we want to use *only*
@@ -92,7 +96,7 @@ typedef union
   DItype ll;
 } DIunion;
 
-#if defined (L_udivmoddi4) || defined (L_muldi3) || defined (L_udiv_using_sdiv)
+#if defined (L_udivmoddi4) || defined (L_muldi3) || defined (L_udiv_w_sdiv)
 
 #include "longlong.h"
 
@@ -269,9 +273,9 @@ __muldi3 (u, v)
 }
 #endif
 \f
-#ifdef L_udiv_using_sdiv
+#ifdef L_udiv_w_sdiv
 USItype
-__udiv_using_sdiv (rp, a1, a0, d)
+__udiv_w_sdiv (rp, a1, a0, d)
      USItype *rp, a1, a0, d;
 {
   USItype q, r;
@@ -1491,7 +1495,7 @@ __do_global_dtors ()
 #ifdef DO_GLOBAL_DTORS_BODY
   DO_GLOBAL_DTORS_BODY;
 #else
-  unsigned nptrs = (unsigned) __DTOR_LIST__[0];
+  unsigned nptrs = (unsigned HOST_WIDE_INT) __DTOR_LIST__[0];
   unsigned i;
 
   /* Some systems place the number of pointers