[RS6000] Use LIB2_SIDITI_CONV_FUNCS in place of ppc64-fp.c

This patch retires ppc64-fp.c in favour of using
"LIB2_SIDITI_CONV_FUNCS = yes", which is a lot better solution than
having a copy of selected libgcc2.c functions.

	* config/rs6000/t-ppc64-fp (LIB2ADD): Delete.
	(LIB2_SIDITI_CONV_FUNCS): Define.
	* config/rs6000/ppc64-fp.c: Delete file.

diff --git a/libgcc/config/rs6000/ppc64-fp.c b/libgcc/config/rs6000/ppc64-fp.c
deleted file mode 100644 (file)
index 9ca3c71..0000000
--- a/libgcc/config/rs6000/ppc64-fp.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* Functions needed for soft-float on powerpc64-linux, copied from
-   libgcc2.c with macros expanded to force the use of specific types.
- 
-   Copyright (C) 1989-2020 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 3, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-Under Section 7 of GPL version 3, you are granted additional
-permissions described in the GCC Runtime Library Exception, version
-3.1, as published by the Free Software Foundation.
-
-You should have received a copy of the GNU General Public License and
-a copy of the GCC Runtime Library Exception along with this program;
-see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-<http://www.gnu.org/licenses/>.  */
-
-#if defined(__powerpc64__) || defined (__64BIT__) || defined(__ppc64__)
-#define TMODES
-#include "fp-bit.h"
-
-extern DItype __fixtfdi (TFtype);
-extern DItype __fixdfdi (DFtype);
-extern DItype __fixsfdi (SFtype);
-extern USItype __fixunsdfsi (DFtype);
-extern USItype __fixunssfsi (SFtype);
-extern TFtype __floatditf (DItype);
-extern TFtype __floatunditf (UDItype);
-extern DFtype __floatdidf (DItype);
-extern DFtype __floatundidf (UDItype);
-extern SFtype __floatdisf (DItype);
-extern SFtype __floatundisf (UDItype);
-extern DItype __fixunstfdi (TFtype);
-
-static DItype local_fixunssfdi (SFtype);
-static DItype local_fixunsdfdi (DFtype);
-
-DItype
-__fixtfdi (TFtype a)
-{
-  if (a < 0)
-    return - __fixunstfdi (-a);
-  return __fixunstfdi (a);
-}
-
-DItype
-__fixdfdi (DFtype a)
-{
-  if (a < 0)
-    return - local_fixunsdfdi (-a);
-  return local_fixunsdfdi (a);
-}
-
-DItype
-__fixsfdi (SFtype a)
-{
-  if (a < 0)
-    return - local_fixunssfdi (-a);
-  return local_fixunssfdi (a);
-}
-
-USItype
-__fixunsdfsi (DFtype a)
-{
-  if (a >= - (DFtype) (- ((SItype)(((USItype)1 << ((4 * 8) - 1)) - 1)) - 1))
-    return (SItype) (a + (- ((SItype)(((USItype)1 << ((4 * 8) - 1)) - 1)) - 1))
-                       - (- ((SItype)(((USItype)1 << ((4 * 8) - 1)) - 1)) - 1);
-  return (SItype) a;
-}
-
-USItype
-__fixunssfsi (SFtype a)
-{
-  if (a >= - (SFtype) (- ((SItype)(((USItype)1 << ((4 * 8) - 1)) - 1)) - 1))
-    return (SItype) (a + (- ((SItype)(((USItype)1 << ((4 * 8) - 1)) - 1)) - 1))
-                       - (- ((SItype)(((USItype)1 << ((4 * 8) - 1)) - 1)) - 1);
-  return (SItype) a;
-}
-
-TFtype
-__floatditf (DItype u)
-{
-  DFtype dh, dl;
-
-  dh = (SItype) (u >> (sizeof (SItype) * 8));
-  dh *= 2.0 * (((UDItype) 1) << ((sizeof (SItype) * 8) - 1));
-  dl = (USItype) (u & ((((UDItype) 1) << (sizeof (SItype) * 8)) - 1));
-
-  return (TFtype) dh + (TFtype) dl;
-}
-
-TFtype
-__floatunditf (UDItype u)
-{
-  DFtype dh, dl;
-
-  dh = (USItype) (u >> (sizeof (SItype) * 8));
-  dh *= 2.0 * (((UDItype) 1) << ((sizeof (SItype) * 8) - 1));
-  dl = (USItype) (u & ((((UDItype) 1) << (sizeof (SItype) * 8)) - 1));
-
-  return (TFtype) dh + (TFtype) dl;
-}
-
-DFtype
-__floatdidf (DItype u)
-{
-  DFtype d;
-
-  d = (SItype) (u >> (sizeof (SItype) * 8));
-  d *= 2.0 * (((UDItype) 1) << ((sizeof (SItype) * 8) - 1));
-  d += (USItype) (u & ((((UDItype) 1) << (sizeof (SItype) * 8)) - 1));
-
-  return d;
-}
-
-DFtype
-__floatundidf (UDItype u)
-{
-  DFtype d;
-
-  d = (USItype) (u >> (sizeof (SItype) * 8));
-  d *= 2.0 * (((UDItype) 1) << ((sizeof (SItype) * 8) - 1));
-  d += (USItype) (u & ((((UDItype) 1) << (sizeof (SItype) * 8)) - 1));
-
-  return d;
-}
-
-SFtype
-__floatdisf (DItype u)
-{
-  DFtype f;
-
-  if (53 < (sizeof (DItype) * 8)
-      && 53 > ((sizeof (DItype) * 8) - 53 + 24))
-    {
-      if (! (- ((DItype) 1 << 53) < u
-             && u < ((DItype) 1 << 53)))
-        {
-          if ((UDItype) u & (((UDItype) 1 << ((sizeof (DItype) * 8) - 53)) - 1))
-            {
-              u &= ~ (((UDItype) 1 << ((sizeof (DItype) * 8) - 53)) - 1);
-              u |= ((UDItype) 1 << ((sizeof (DItype) * 8) - 53));
-            }
-        }
-    }
-  f = (SItype) (u >> (sizeof (SItype) * 8));
-  f *= 2.0 * (((UDItype) 1) << ((sizeof (SItype) * 8) - 1));
-  f += (USItype) (u & ((((UDItype) 1) << (sizeof (SItype) * 8)) - 1));
-
-  return (SFtype) f;
-}
-
-SFtype
-__floatundisf (UDItype u)
-{
-  DFtype f;
-
-  if (53 < (sizeof (DItype) * 8)
-      && 53 > ((sizeof (DItype) * 8) - 53 + 24))
-    {
-      if (u >= ((UDItype) 1 << 53))
-        {
-          if ((UDItype) u & (((UDItype) 1 << ((sizeof (DItype) * 8) - 53)) - 1))
-            {
-              u &= ~ (((UDItype) 1 << ((sizeof (DItype) * 8) - 53)) - 1);
-              u |= ((UDItype) 1 << ((sizeof (DItype) * 8) - 53));
-            }
-        }
-    }
-  f = (USItype) (u >> (sizeof (SItype) * 8));
-  f *= 2.0 * (((UDItype) 1) << ((sizeof (SItype) * 8) - 1));
-  f += (USItype) (u & ((((UDItype) 1) << (sizeof (SItype) * 8)) - 1));
-
-  return (SFtype) f;
-}
-
-DItype
-__fixunstfdi (TFtype a)
-{
-  if (a < 0)
-    return 0;
-
-  /* Compute high word of result, as a flonum.  */
-  const TFtype b = (a / (((UDItype) 1) << (sizeof (SItype) * 8)));
-  /* Convert that to fixed (but not to DItype!),
-     and shift it into the high word.  */
-  UDItype v = (USItype) b;
-  v <<= (sizeof (SItype) * 8);
-  /* Remove high part from the TFtype, leaving the low part as flonum.  */
-  a -= (TFtype) v;
-  /* Convert that to fixed (but not to DItype!) and add it in.
-     Sometimes A comes out negative.  This is significant, since
-     A has more bits than a long int does.  */
-  if (a < 0)
-    v -= (USItype) (-a);
-  else
-    v += (USItype) a;
-  return v;
-}
-
-/* This version is needed to prevent recursion; fixunsdfdi in libgcc
-   calls fixdfdi, which in turn calls calls fixunsdfdi.  */
-
-static DItype
-local_fixunsdfdi (DFtype a)
-{
-  USItype hi, lo;
-
-  hi = a / (((UDItype) 1) << (sizeof (SItype) * 8));
-  lo = (a - ((DFtype) hi) * (((UDItype) 1) << (sizeof (SItype) * 8)));
-  return ((UDItype) hi << (sizeof (SItype) * 8)) | lo;
-}
-
-/* This version is needed to prevent recursion; fixunssfdi in libgcc
-   calls fixsfdi, which in turn calls calls fixunssfdi.  */
-
-static DItype
-local_fixunssfdi (SFtype original_a)
-{
-  DFtype a = original_a;
-  USItype hi, lo;
-
-  hi = a / (((UDItype) 1) << (sizeof (SItype) * 8));
-  lo = (a - ((DFtype) hi) * (((UDItype) 1) << (sizeof (SItype) * 8)));
-  return ((UDItype) hi << (sizeof (SItype) * 8)) | lo;
-}
-
-#endif /* __powerpc64__ */

diff --git a/libgcc/config/rs6000/t-ppc64-fp b/libgcc/config/rs6000/t-ppc64-fp
index 26d1730..999679f 100644 (file)
--- a/libgcc/config/rs6000/t-ppc64-fp
+++ b/libgcc/config/rs6000/t-ppc64-fp
@@ -1,2 +1 @@
-# Can be used unconditionally, wrapped in __powerpc64__ || __64BIT__ __ppc64__.
-LIB2ADD += $(srcdir)/config/rs6000/ppc64-fp.c
+LIB2_SIDITI_CONV_FUNCS = yes