[PATCH] PPC libgcc compatibility
Franz Sirl
Franz.Sirl-kernel@lauterbach.com
Mon May 20 10:49:00 GMT 2002
On Monday 20 May 2002 19:23, Ulrich Drepper wrote:
> On Mon, 2002-05-20 at 10:16, Franz Sirl wrote:
> > You can remove them if you want, they are unused now.
>
> Please send a complete patch.
OK, here it is.
Franz.
-------------- next part --------------
Index: sysdeps/powerpc/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- sysdeps/powerpc/Makefile 15 May 2002 03:58:08 -0000 1.16
+++ sysdeps/powerpc/Makefile 20 May 2002 15:19:13 -0000
@@ -37,8 +37,8 @@ CFLAGS-gmon-start.o = -G0
endif
ifeq (yes,$(build-shared))
# Compatibility
-sysdep_routines += divdi3 cmpdi2 shdi3 fixdfdi fixsfdi
-shared-only-routines += divdi3 cmpdi2 shdi3 fixdfdi fixsfdi
+sysdep_routines += divdi3 libgcc-compat
+shared-only-routines += divdi3 libgcc-compat
endif
endif
--- /dev/null Thu Jan 1 01:00:00 1970
+++ sysdeps/powerpc/libgcc-compat.c Mon May 20 16:55:45 2002
@@ -0,0 +1,113 @@
+/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+
+#include <stdint.h>
+#include <shlib-compat.h>
+
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2_6)
+
+extern int64_t __ashldi3 (int64_t, int32_t);
+int64_t INTUSE (__ashldi3) (int64_t u, int32_t b)
+{
+ return __ashldi3 (u, b);
+}
+symbol_version (INTUSE (__ashldi3), __ashldi3, GLIBC_2.0);
+
+
+extern int64_t __ashrdi3 (int64_t, int32_t);
+int64_t INTUSE (__ashrdi3) (int64_t u, int32_t b)
+{
+ return __ashrdi3 (u, b);
+}
+symbol_version (INTUSE (__ashrdi3), __ashrdi3, GLIBC_2.0);
+
+
+extern int64_t __lshrdi3 (int64_t, int32_t);
+int64_t INTUSE (__lshrdi3) (int64_t u, int32_t b)
+{
+ return __lshrdi3 (u, b);
+}
+symbol_version (INTUSE (__lshrdi3), __lshrdi3, GLIBC_2.0);
+
+
+extern int32_t __cmpdi2 (int64_t, int64_t);
+int32_t INTUSE (__cmpdi2) (int64_t u, int64_t v)
+{
+ return __cmpdi2 (u, v);
+}
+symbol_version (INTUSE (__cmpdi2), __cmpdi2, GLIBC_2.0);
+
+
+extern int32_t __ucmpdi2 (int64_t, int64_t);
+int32_t INTUSE (__ucmpdi2) (int64_t u, int64_t v)
+{
+ return __ucmpdi2 (u, v);
+}
+symbol_version (INTUSE (__ucmpdi2), __ucmpdi2, GLIBC_2.0);
+
+
+extern int64_t __fixdfdi (double);
+int64_t INTUSE (__fixdfdi) (double d)
+{
+ return __fixdfdi (d);
+}
+symbol_version (INTUSE (__fixdfdi), __fixdfdi, GLIBC_2.0);
+
+
+extern int64_t __fixunsdfdi (double);
+int64_t INTUSE (__fixunsdfdi) (double d)
+{
+ return __fixunsdfdi (d);
+}
+symbol_version (INTUSE (__fixunsdfdi), __fixunsdfdi, GLIBC_2.0);
+
+
+extern int64_t __fixsfdi (float);
+int64_t INTUSE (__fixsfdi) (float d)
+{
+ return __fixsfdi (d);
+}
+symbol_version (INTUSE (__fixsfdi), __fixsfdi, GLIBC_2.0);
+
+
+extern int64_t __fixunssfdi (float);
+int64_t INTUSE (__fixunssfdi) (float d)
+{
+ return __fixunssfdi (d);
+}
+symbol_version (INTUSE (__fixunssfdi), __fixunssfdi, GLIBC_2.0);
+
+
+extern double __floatdidf (int64_t);
+double INTUSE (__floatdidf) (int64_t u)
+{
+ return __floatdidf (u);
+}
+symbol_version (INTUSE (__floatdidf), __floatdidf, GLIBC_2.0);
+
+
+extern float __floatdisf (int64_t);
+float INTUSE (__floatdisf) (int64_t u)
+{
+ return __floatdisf (u);
+}
+symbol_version (INTUSE (__floatdisf), __floatdisf, GLIBC_2.0);
+
+#endif
Index: sysdeps/wordsize-32/cmpdi2.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/wordsize-32/cmpdi2.c,v
retrieving revision 1.3
diff -u -p -r1.3 cmpdi2.c
--- sysdeps/wordsize-32/cmpdi2.c 15 May 2002 04:15:55 -0000 1.3
+++ sysdeps/wordsize-32/cmpdi2.c 20 May 2002 17:42:20 -0000
@@ -1,95 +0,0 @@
-/* 64-bit integer comparison.
- Copyright (C) 1989, 1992-2001, 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <endian.h>
-#include <stdlib.h>
-#include <bits/wordsize.h>
-#include <shlib-compat.h>
-
-#if __WORDSIZE != 32
-# error This is for 32-bit targets only
-#endif
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2_6)
-
-typedef unsigned int UQItype __attribute__ ((mode (QI)));
-typedef int SItype __attribute__ ((mode (SI)));
-typedef unsigned int USItype __attribute__ ((mode (SI)));
-typedef int DItype __attribute__ ((mode (DI)));
-typedef unsigned int UDItype __attribute__ ((mode (DI)));
-#define Wtype SItype
-#define HWtype SItype
-#define DWtype DItype
-#define UWtype USItype
-#define UHWtype USItype
-#define UDWtype UDItype
-#define W_TYPE_SIZE 32
-
-#include <stdlib/longlong.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-struct DWstruct { Wtype high, low;};
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-struct DWstruct { Wtype low, high;};
-#else
-#error Unhandled endianity
-#endif
-typedef union { struct DWstruct s; DWtype ll; } DWunion;
-
-
-Wtype
-___cmpdi2 (DWtype a, DWtype b)
-{
- DWunion au, bu;
-
- au.ll = a, bu.ll = b;
-
- if (au.s.high < bu.s.high)
- return 0;
- else if (au.s.high > bu.s.high)
- return 2;
- if ((UWtype) au.s.low < (UWtype) bu.s.low)
- return 0;
- else if ((UWtype) au.s.low > (UWtype) bu.s.low)
- return 2;
- return 1;
-}
-symbol_version (___cmpdi2, __cmpdi2, GLIBC_2.0);
-
-
-Wtype
-___ucmpdi2 (DWtype a, DWtype b)
-{
- DWunion au, bu;
-
- au.ll = a, bu.ll = b;
-
- if ((UWtype) au.s.high < (UWtype) bu.s.high)
- return 0;
- else if ((UWtype) au.s.high > (UWtype) bu.s.high)
- return 2;
- if ((UWtype) au.s.low < (UWtype) bu.s.low)
- return 0;
- else if ((UWtype) au.s.low > (UWtype) bu.s.low)
- return 2;
- return 1;
-}
-symbol_version (___ucmpdi2, __ucmpdi2, GLIBC_2.0);
-
-#endif
Index: sysdeps/wordsize-32/fixdfdi.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/wordsize-32/fixdfdi.c,v
retrieving revision 1.1
diff -u -p -r1.1 fixdfdi.c
--- sysdeps/wordsize-32/fixdfdi.c 15 May 2002 04:27:02 -0000 1.1
+++ sysdeps/wordsize-32/fixdfdi.c 20 May 2002 17:42:20 -0000
@@ -1,98 +0,0 @@
-/* Convert double to 64-bit int.
- Copyright (C) 1989, 1992-2001, 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <endian.h>
-#include <stdlib.h>
-#include <bits/wordsize.h>
-#include <shlib-compat.h>
-
-#if __WORDSIZE != 32
-# error This is for 32-bit targets only
-#endif
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2_6)
-
-typedef unsigned int UQItype __attribute__ ((mode (QI)));
-typedef int SItype __attribute__ ((mode (SI)));
-typedef unsigned int USItype __attribute__ ((mode (SI)));
-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)));
-#define Wtype SItype
-#define HWtype SItype
-#define DWtype DItype
-#define UWtype USItype
-#define UHWtype USItype
-#define UDWtype UDItype
-#define W_TYPE_SIZE 32
-
-#include <stdlib/longlong.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-struct DWstruct { Wtype high, low;};
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-struct DWstruct { Wtype low, high;};
-#else
-#error Unhandled endianity
-#endif
-typedef union { struct DWstruct s; DWtype ll; } DWunion;
-
-#define WORD_SIZE __WORDSIZE
-#define HIGH_WORD_COEFF (((UDWtype) 1) << WORD_SIZE)
-
-DWtype
-___fixunsdfdi (DFtype a)
-{
- DFtype b;
- UDWtype v;
-
- if (a < 0)
- return 0;
-
- /* Compute high word of result, as a flonum. */
- b = (a / HIGH_WORD_COEFF);
- /* Convert that to fixed (but not to DWtype!),
- and shift it into the high word. */
- v = (UWtype) b;
- v <<= WORD_SIZE;
- /* Remove high part from the DFtype, leaving the low part as flonum. */
- a -= (DFtype)v;
- /* Convert that to fixed (but not to DWtype!) 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 -= (UWtype) (- a);
- else
- v += (UWtype) a;
- return v;
-}
-symbol_version (___fixunsdfdi, __fixunsdfdi, GLIBC_2.0);
-
-
-DWtype
-___fixdfdi (DFtype a)
-{
- if (a < 0)
- return - __fixunsdfdi (-a);
- return __fixunsdfdi (a);
-}
-symbol_version (___fixdfdi, __fixdfdi, GLIBC_2.0);
-
-#endif
Index: sysdeps/wordsize-32/fixsfdi.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/wordsize-32/fixsfdi.c,v
retrieving revision 1.1
diff -u -p -r1.1 fixsfdi.c
--- sysdeps/wordsize-32/fixsfdi.c 15 May 2002 04:24:31 -0000 1.1
+++ sysdeps/wordsize-32/fixsfdi.c 20 May 2002 17:42:20 -0000
@@ -1,102 +0,0 @@
-/* Convert float to 64-bit int.
- Copyright (C) 1989, 1992-2001, 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <endian.h>
-#include <stdlib.h>
-#include <bits/wordsize.h>
-#include <shlib-compat.h>
-
-#if __WORDSIZE != 32
-# error This is for 32-bit targets only
-#endif
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2_6)
-
-typedef unsigned int UQItype __attribute__ ((mode (QI)));
-typedef int SItype __attribute__ ((mode (SI)));
-typedef unsigned int USItype __attribute__ ((mode (SI)));
-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)));
-#define Wtype SItype
-#define HWtype SItype
-#define DWtype DItype
-#define UWtype USItype
-#define UHWtype USItype
-#define UDWtype UDItype
-#define W_TYPE_SIZE 32
-
-#include <stdlib/longlong.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-struct DWstruct { Wtype high, low;};
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-struct DWstruct { Wtype low, high;};
-#else
-#error Unhandled endianity
-#endif
-typedef union { struct DWstruct s; DWtype ll; } DWunion;
-
-
-#define WORD_SIZE __WORDSIZE
-#define HIGH_WORD_COEFF (((UDWtype) 1) << WORD_SIZE)
-
-
-DWtype
-___fixunssfDI (SFtype original_a)
-{
- /* Convert the SFtype to a DFtype, because that is surely not going
- to lose any bits. Some day someone else can write a faster version
- that avoids converting to DFtype, and verify it really works right. */
- DFtype a = original_a;
- DFtype b;
- UDWtype v;
-
- if (a < 0)
- return 0;
-
- /* Compute high word of result, as a flonum. */
- b = (a / HIGH_WORD_COEFF);
- /* Convert that to fixed (but not to DWtype!),
- and shift it into the high word. */
- v = (UWtype) b;
- v <<= WORD_SIZE;
- /* Remove high part from the DFtype, leaving the low part as flonum. */
- a -= (DFtype) v;
- /* Convert that to fixed (but not to DWtype!) 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 -= (UWtype) (- a);
- else
- v += (UWtype) a;
- return v;
-}
-symbol_version (___fixunssfDI, __fixunssfDI, GLIBC_2.0);
-
-
-DWtype
-___fixsfdi (SFtype a)
-{
- if (a < 0)
- return - __fixunssfDI (-a);
- return __fixunssfDI (a);
-}
-symbol_version (___fixsfdi, __fixsfdi, GLIBC_2.0);
Index: sysdeps/wordsize-32/shdi3.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/wordsize-32/shdi3.c,v
retrieving revision 1.2
diff -u -p -r1.2 shdi3.c
--- sysdeps/wordsize-32/shdi3.c 15 May 2002 04:21:34 -0000 1.2
+++ sysdeps/wordsize-32/shdi3.c 20 May 2002 17:42:20 -0000
@@ -1,150 +0,0 @@
-/* 64-bit integer shifting.
- Copyright (C) 1989, 1992-2001, 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <endian.h>
-#include <stdlib.h>
-#include <bits/wordsize.h>
-#include <shlib-compat.h>
-
-#if __WORDSIZE != 32
-# error This is for 32-bit targets only
-#endif
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2_6)
-
-typedef unsigned int UQItype __attribute__ ((mode (QI)));
-typedef int SItype __attribute__ ((mode (SI)));
-typedef unsigned int USItype __attribute__ ((mode (SI)));
-typedef int DItype __attribute__ ((mode (DI)));
-typedef unsigned int UDItype __attribute__ ((mode (DI)));
-#define Wtype SItype
-#define HWtype SItype
-#define DWtype DItype
-#define UWtype USItype
-#define UHWtype USItype
-#define UDWtype UDItype
-#define W_TYPE_SIZE 32
-#define BITS_PER_UNIT 8
-
-#include <stdlib/longlong.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-struct DWstruct { Wtype high, low;};
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-struct DWstruct { Wtype low, high;};
-#else
-#error Unhandled endianity
-#endif
-typedef union { struct DWstruct s; DWtype ll; } DWunion;
-
-
-DWtype
-___lshrdi3 (DWtype u, Wtype b)
-{
- DWunion w;
- Wtype bm;
- DWunion uu;
-
- if (b == 0)
- return u;
-
- uu.ll = u;
-
- bm = (sizeof (Wtype) * BITS_PER_UNIT) - b;
- if (bm <= 0)
- {
- w.s.high = 0;
- w.s.low = (UWtype) uu.s.high >> -bm;
- }
- else
- {
- UWtype carries = (UWtype) uu.s.high << bm;
-
- w.s.high = (UWtype) uu.s.high >> b;
- w.s.low = ((UWtype) uu.s.low >> b) | carries;
- }
-
- return w.ll;
-}
-symbol_version (___lshrdi3, __lshrdi3, GLIBC_2.0);
-
-
-DWtype
-___ashldi3 (DWtype u, Wtype b)
-{
- DWunion w;
- Wtype bm;
- DWunion uu;
-
- if (b == 0)
- return u;
-
- uu.ll = u;
-
- bm = (sizeof (Wtype) * BITS_PER_UNIT) - b;
- if (bm <= 0)
- {
- w.s.low = 0;
- w.s.high = (UWtype) uu.s.low << -bm;
- }
- else
- {
- UWtype carries = (UWtype) uu.s.low >> bm;
-
- w.s.low = (UWtype) uu.s.low << b;
- w.s.high = ((UWtype) uu.s.high << b) | carries;
- }
-
- return w.ll;
-}
-symbol_version (___ashldi3, __ashldi3, GLIBC_2.0);
-
-
-DWtype
-___ashrdi3 (DWtype u, Wtype b)
-{
- DWunion w;
- Wtype bm;
- DWunion uu;
-
- if (b == 0)
- return u;
-
- uu.ll = u;
-
- bm = (sizeof (Wtype) * BITS_PER_UNIT) - b;
- if (bm <= 0)
- {
- /* w.s.high = 1..1 or 0..0 */
- w.s.high = uu.s.high >> (sizeof (Wtype) * BITS_PER_UNIT - 1);
- w.s.low = uu.s.high >> -bm;
- }
- else
- {
- UWtype carries = (UWtype) uu.s.high << bm;
-
- w.s.high = uu.s.high >> b;
- w.s.low = ((UWtype) uu.s.low >> b) | carries;
- }
-
- return w.ll;
-}
-symbol_version (___ashrdi3, __ashrdi3, GLIBC_2.0);
-
-#endif
More information about the Libc-alpha
mailing list