From 15f9c5dfaf999cfc53080b6ab2422935a6becf8e Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 23 Oct 2014 21:43:41 +0000 Subject: [PATCH] Don't use INTDEF for powerpc32 compat symbols (bug 14132). Continuing the removal of the obsolete INTDEF / INTUSE mechanism, this patch removes the use of INTUSE to rename symbols in sysdeps/powerpc/powerpc32/libgcc-compat.S. As the names in question are purely internal to this particular object and not used anywhere else, it doesn't matter at all whether __*_v_glibc20 or __*_internal is used, so this patch just removes the macros in question. Tested for powerpc32 that stripped installed shared libraries are unchanged by this patch. [BZ #14132] * sysdeps/powerpc/powerpc32/libgcc-compat.S (__ashldi3_v_glibc20): Remove macro definition. (__ashrdi3_v_glibc20): Likewise. (__lshrdi3_v_glibc20): Likewise. (__cmpdi2_v_glibc20): Likewise. (__ucmpdi2_v_glibc20): Likewise. [!_SOFT_FLOAT && !__NO_FPRS__] (__fixdfdi_v_glibc20): Likewise. [!_SOFT_FLOAT && !__NO_FPRS__] (__fixsfdi_v_glibc20): Likewise. [!_SOFT_FLOAT && !__NO_FPRS__] (__fixunsdfdi_v_glibc20): Likewise. [!_SOFT_FLOAT && !__NO_FPRS__] (__fixunssfdi_v_glibc20): Likewise. [!_SOFT_FLOAT && !__NO_FPRS__] (__floatdidf_v_glibc20): Likewise. [!_SOFT_FLOAT && !__NO_FPRS__] (__floatdisf_v_glibc20): Likewise. --- ChangeLog | 16 ++++++++++++++++ sysdeps/powerpc/powerpc32/libgcc-compat.S | 14 -------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7eca45..1d05492 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2014-10-23 Joseph Myers + + [BZ #14132] + * sysdeps/powerpc/powerpc32/libgcc-compat.S (__ashldi3_v_glibc20): + Remove macro definition. + (__ashrdi3_v_glibc20): Likewise. + (__lshrdi3_v_glibc20): Likewise. + (__cmpdi2_v_glibc20): Likewise. + (__ucmpdi2_v_glibc20): Likewise. + [!_SOFT_FLOAT && !__NO_FPRS__] (__fixdfdi_v_glibc20): Likewise. + [!_SOFT_FLOAT && !__NO_FPRS__] (__fixsfdi_v_glibc20): Likewise. + [!_SOFT_FLOAT && !__NO_FPRS__] (__fixunsdfdi_v_glibc20): Likewise. + [!_SOFT_FLOAT && !__NO_FPRS__] (__fixunssfdi_v_glibc20): Likewise. + [!_SOFT_FLOAT && !__NO_FPRS__] (__floatdidf_v_glibc20): Likewise. + [!_SOFT_FLOAT && !__NO_FPRS__] (__floatdisf_v_glibc20): Likewise. + 2014-10-22 Roland McGrath * inet/netgroup.h (struct name_list): Use C99 [] syntax rather than diff --git a/sysdeps/powerpc/powerpc32/libgcc-compat.S b/sysdeps/powerpc/powerpc32/libgcc-compat.S index b9a000c..026b464 100644 --- a/sysdeps/powerpc/powerpc32/libgcc-compat.S +++ b/sysdeps/powerpc/powerpc32/libgcc-compat.S @@ -22,20 +22,6 @@ #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2_6) -#define __ashldi3_v_glibc20 INTUSE (__ashldi3) -#define __ashrdi3_v_glibc20 INTUSE (__ashrdi3) -#define __lshrdi3_v_glibc20 INTUSE (__lshrdi3) -#define __cmpdi2_v_glibc20 INTUSE (__cmpdi2) -#define __ucmpdi2_v_glibc20 INTUSE (__ucmpdi2) -#if !defined _SOFT_FLOAT && !defined __NO_FPRS__ -# define __fixdfdi_v_glibc20 INTUSE (__fixdfdi) -# define __fixsfdi_v_glibc20 INTUSE (__fixsfdi) -# define __fixunsdfdi_v_glibc20 INTUSE (__fixunsdfdi) -# define __fixunssfdi_v_glibc20 INTUSE (__fixunssfdi) -# define __floatdidf_v_glibc20 INTUSE (__floatdidf) -# define __floatdisf_v_glibc20 INTUSE (__floatdisf) -#endif - .symver __ashldi3_v_glibc20,__ashldi3@GLIBC_2.0 .symver __ashrdi3_v_glibc20,__ashrdi3@GLIBC_2.0 .symver __lshrdi3_v_glibc20,__lshrdi3@GLIBC_2.0 -- 2.7.4