Don't use INTDEF for powerpc32 compat symbols (bug 14132)

Message ID Pine.LNX.4.64.1410231658161.23533@digraph.polyomino.org.uk
State Committed
Headers

Commit Message

Joseph Myers Oct. 23, 2014, 4:59 p.m. UTC
  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.

2014-10-23  Joseph Myers  <joseph@codesourcery.com>

	[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.
  

Comments

Carlos O'Donell Oct. 23, 2014, 7 p.m. UTC | #1
On 10/23/2014 12:59 PM, Joseph S. Myers wrote:
> 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.
> 
> 2014-10-23  Joseph Myers  <joseph@codesourcery.com>
> 
> 	[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.

Looks good to me.

c.
  

Patch

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