lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Remove miscellaneous GCC >= 4.7 version conditionals.

Browse Source 
This patch removes miscellaneous __GNUC_PREREQ (4, 7) conditionals
that are now dead.

Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).

	* sysdeps/arm/atomic-machine.h
	[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
	Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
	[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
	Remove conditional code.
	[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
	Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
	* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
	Change conditional to [__ASSEMBLER__].
	[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
	[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
	[!__ASSEMBLER__].
	[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
	code.
	* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
	conditional macro definitions.
	(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
	(__arch_compare_and_exchange_val_16_acq): Likewise.
	(__arch_compare_and_exchange_val_32_acq): Likewise.
	(atomic_exchange_and_add): Likewise.
	(atomic_add): Likewise.
	(atomic_add_negative): Likewise.
	(atomic_add_zero): Likewise.
	(atomic_bit_set): Likewise.
	(atomic_bit_test_set): Likewise.
	* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
	code unconditional.
	[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
This commit is contained in:
Joseph Myers
2015-11-04 21:34:36 +00:00
parent e3a0002094
commit 9f9f27248b
5 changed files with 54 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ChangeLog
View File

@ -1,5 +1,34 @@
2015-11-04 Joseph Myers <joseph@codesourcery.com> 2015-11-04 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/atomic-machine.h
[__GNUC_PREREQ (4, 7) && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
[__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 && !__GNUC_PREREQ (4, 7)]:
Remove conditional code.
[!__GNUC_PREREQ (4, 7) || !__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]:
Change conditional to [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4].
* sysdeps/i386/sysdep.h [__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]:
Change conditional to [__ASSEMBLER__].
[__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional code.
[!__ASSEMBLER__ && __GNUC_PREREQ (4, 7)]: Change conditional to
[!__ASSEMBLER__].
[!__ASSEMBLER__ && !__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/unix/sysv/linux/sh/atomic-machine.h (rNOSP): Remove
conditional macro definitions.
(__arch_compare_and_exchange_val_8_acq): Use "u" instead of rNOSP.
(__arch_compare_and_exchange_val_16_acq): Likewise.
(__arch_compare_and_exchange_val_32_acq): Likewise.
(atomic_exchange_and_add): Likewise.
(atomic_add): Likewise.
(atomic_add_negative): Likewise.
(atomic_add_zero): Likewise.
(atomic_bit_set): Likewise.
(atomic_bit_test_set): Likewise.
* sysdeps/x86_64/atomic-machine.h [__GNUC_PREREQ (4, 7)]: Make
code unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
* math/test-math-errno.h: New file. * math/test-math-errno.h: New file.
* math/test-math-inline.h (TEST_INLINE): Define to 1 instead of * math/test-math-inline.h (TEST_INLINE): Define to 1 instead of
empty. empty.

8
sysdeps/arm/atomic-machine.h
View File

@ -53,7 +53,7 @@ void __arm_link_error (void);
/* Use the atomic builtins provided by GCC in case the backend provides /* Use the atomic builtins provided by GCC in case the backend provides
a pattern to do this efficiently. */ a pattern to do this efficiently. */
#if __GNUC_PREREQ (4, 7) && defined __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 #ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
# define atomic_exchange_acq(mem, value) \ # define atomic_exchange_acq(mem, value) \
__atomic_val_bysize (__arch_exchange, int, mem, value, __ATOMIC_ACQUIRE) __atomic_val_bysize (__arch_exchange, int, mem, value, __ATOMIC_ACQUIRE)
@ -131,16 +131,12 @@ void __arm_link_error (void);
# define __arch_compare_and_exchange_val_64_int(mem, newval, oldval, model) \ # define __arch_compare_and_exchange_val_64_int(mem, newval, oldval, model) \
({__arm_link_error (); oldval; }) ({__arm_link_error (); oldval; })
#elif defined __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
/* Atomic compare and exchange. */
# define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \
__sync_val_compare_and_swap ((mem), (oldval), (newval))
#else #else
# define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ # define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \
__arm_assisted_compare_and_exchange_val_32_acq ((mem), (newval), (oldval)) __arm_assisted_compare_and_exchange_val_32_acq ((mem), (newval), (oldval))
#endif #endif
#if !__GNUC_PREREQ (4, 7) || !defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
/* We don't support atomic operations on any non-word types. /* We don't support atomic operations on any non-word types.
So make them link errors. */ So make them link errors. */
# define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \ # define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \

12
sysdeps/i386/sysdep.h
View File

@ -30,17 +30,9 @@
#endif #endif
#ifdef __ASSEMBLER__ #ifdef __ASSEMBLER__
# if __GNUC_PREREQ (4, 7) # define GET_PC_THUNK(reg) __x86.get_pc_thunk.reg
# define GET_PC_THUNK(reg) __x86.get_pc_thunk.reg
# else
# define GET_PC_THUNK(reg) __i686.get_pc_thunk.reg
# endif
#else #else
# if __GNUC_PREREQ (4, 7) # define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg
# define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg
# else
# define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg
# endif
#endif #endif
#ifdef __ASSEMBLER__ #ifdef __ASSEMBLER__

48
sysdeps/unix/sysv/linux/sh/atomic-machine.h
View File

@ -67,12 +67,6 @@ typedef uintmax_t uatomic_max_t;
r1: saved stack pointer r1: saved stack pointer
*/ */
#if __GNUC_PREREQ (4, 7)
# define rNOSP "u"
#else
# define rNOSP "r"
#endif
#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \ #define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
({ __typeof (*(mem)) __result; \ ({ __typeof (*(mem)) __result; \
__asm __volatile ("\ __asm __volatile ("\
@ -85,7 +79,7 @@ typedef uintmax_t uatomic_max_t;
bf 1f\n\ bf 1f\n\
mov.b %2,@%1\n\ mov.b %2,@%1\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: "=&r" (__result) : rNOSP (mem), rNOSP (newval), rNOSP (oldval) \ : "=&r" (__result) : "u" (mem), "u" (newval), "u" (oldval) \
: "r0", "r1", "t", "memory"); \ : "r0", "r1", "t", "memory"); \
__result; }) __result; })
@ -102,7 +96,7 @@ typedef uintmax_t uatomic_max_t;
bf 1f\n\ bf 1f\n\
mov.w %2,@%1\n\ mov.w %2,@%1\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: "=&r" (__result) : rNOSP (mem), rNOSP (newval), rNOSP (oldval) \ : "=&r" (__result) : "u" (mem), "u" (newval), "u" (oldval) \
: "r0", "r1", "t", "memory"); \ : "r0", "r1", "t", "memory"); \
__result; }) __result; })
@ -118,7 +112,7 @@ typedef uintmax_t uatomic_max_t;
bf 1f\n\ bf 1f\n\
mov.l %2,@%1\n\ mov.l %2,@%1\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: "=&r" (__result) : rNOSP (mem), rNOSP (newval), rNOSP (oldval) \ : "=&r" (__result) : "u" (mem), "u" (newval), "u" (oldval) \
: "r0", "r1", "t", "memory"); \ : "r0", "r1", "t", "memory"); \
__result; }) __result; })
@ -143,7 +137,7 @@ typedef uintmax_t uatomic_max_t;
add %0,r2\n\ add %0,r2\n\
mov.b r2,@%2\n\ mov.b r2,@%2\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: "=&r" (__result), "=&r" (__tmp) : rNOSP (mem), "1" (__value) \ : "=&r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
: "r0", "r1", "r2", "memory"); \ : "r0", "r1", "r2", "memory"); \
else if (sizeof (*(mem)) == 2) \ else if (sizeof (*(mem)) == 2) \
__asm __volatile ("\ __asm __volatile ("\
@ -156,7 +150,7 @@ typedef uintmax_t uatomic_max_t;
add %0,r2\n\ add %0,r2\n\
mov.w r2,@%2\n\ mov.w r2,@%2\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: "=&r" (__result), "=&r" (__tmp) : rNOSP (mem), "1" (__value) \ : "=&r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
: "r0", "r1", "r2", "memory"); \ : "r0", "r1", "r2", "memory"); \
else if (sizeof (*(mem)) == 4) \ else if (sizeof (*(mem)) == 4) \
__asm __volatile ("\ __asm __volatile ("\
@ -169,7 +163,7 @@ typedef uintmax_t uatomic_max_t;
add %0,r2\n\ add %0,r2\n\
mov.l r2,@%2\n\ mov.l r2,@%2\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: "=&r" (__result), "=&r" (__tmp) : rNOSP (mem), "1" (__value) \ : "=&r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
: "r0", "r1", "r2", "memory"); \ : "r0", "r1", "r2", "memory"); \
else \ else \
{ \ { \
@ -194,7 +188,7 @@ typedef uintmax_t uatomic_max_t;
add %0,r2\n\ add %0,r2\n\
mov.b r2,@%1\n\ mov.b r2,@%1\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: "=&r" (__tmp) : rNOSP (mem), "0" (__value) \ : "=&r" (__tmp) : "u" (mem), "0" (__value) \
: "r0", "r1", "r2", "memory"); \ : "r0", "r1", "r2", "memory"); \
else if (sizeof (*(mem)) == 2) \ else if (sizeof (*(mem)) == 2) \
__asm __volatile ("\ __asm __volatile ("\
@ -206,7 +200,7 @@ typedef uintmax_t uatomic_max_t;
add %0,r2\n\ add %0,r2\n\
mov.w r2,@%1\n\ mov.w r2,@%1\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: "=&r" (__tmp) : rNOSP (mem), "0" (__value) \ : "=&r" (__tmp) : "u" (mem), "0" (__value) \
: "r0", "r1", "r2", "memory"); \ : "r0", "r1", "r2", "memory"); \
else if (sizeof (*(mem)) == 4) \ else if (sizeof (*(mem)) == 4) \
__asm __volatile ("\ __asm __volatile ("\
@ -218,7 +212,7 @@ typedef uintmax_t uatomic_max_t;
add %0,r2\n\ add %0,r2\n\
mov.l r2,@%1\n\ mov.l r2,@%1\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: "=&r" (__tmp) : rNOSP (mem), "0" (__value) \ : "=&r" (__tmp) : "u" (mem), "0" (__value) \
: "r0", "r1", "r2", "memory"); \ : "r0", "r1", "r2", "memory"); \
else \ else \
{ \ { \
@ -247,7 +241,7 @@ typedef uintmax_t uatomic_max_t;
1: mov r1,r15\n\ 1: mov r1,r15\n\
shal r2\n\ shal r2\n\
movt %0"\ movt %0"\
: "=r" (__result), "=&r" (__tmp) : rNOSP (mem), "1" (__value) \ : "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
: "r0", "r1", "r2", "t", "memory"); \ : "r0", "r1", "r2", "t", "memory"); \
else if (sizeof (*(mem)) == 2) \ else if (sizeof (*(mem)) == 2) \
__asm __volatile ("\ __asm __volatile ("\
@ -261,7 +255,7 @@ typedef uintmax_t uatomic_max_t;
1: mov r1,r15\n\ 1: mov r1,r15\n\
shal r2\n\ shal r2\n\
movt %0"\ movt %0"\
: "=r" (__result), "=&r" (__tmp) : rNOSP (mem), "1" (__value) \ : "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
: "r0", "r1", "r2", "t", "memory"); \ : "r0", "r1", "r2", "t", "memory"); \
else if (sizeof (*(mem)) == 4) \ else if (sizeof (*(mem)) == 4) \
__asm __volatile ("\ __asm __volatile ("\
@ -275,7 +269,7 @@ typedef uintmax_t uatomic_max_t;
1: mov r1,r15\n\ 1: mov r1,r15\n\
shal r2\n\ shal r2\n\
movt %0"\ movt %0"\
: "=r" (__result), "=&r" (__tmp) : rNOSP (mem), "1" (__value) \ : "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
: "r0", "r1", "r2", "t", "memory"); \ : "r0", "r1", "r2", "t", "memory"); \
else \ else \
abort (); \ abort (); \
@ -296,7 +290,7 @@ typedef uintmax_t uatomic_max_t;
1: mov r1,r15\n\ 1: mov r1,r15\n\
tst r2,r2\n\ tst r2,r2\n\
movt %0"\ movt %0"\
: "=r" (__result), "=&r" (__tmp) : rNOSP (mem), "1" (__value) \ : "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
: "r0", "r1", "r2", "t", "memory"); \ : "r0", "r1", "r2", "t", "memory"); \
else if (sizeof (*(mem)) == 2) \ else if (sizeof (*(mem)) == 2) \
__asm __volatile ("\ __asm __volatile ("\
@ -310,7 +304,7 @@ typedef uintmax_t uatomic_max_t;
1: mov r1,r15\n\ 1: mov r1,r15\n\
tst r2,r2\n\ tst r2,r2\n\
movt %0"\ movt %0"\
: "=r" (__result), "=&r" (__tmp) : rNOSP (mem), "1" (__value) \ : "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
: "r0", "r1", "r2", "t", "memory"); \ : "r0", "r1", "r2", "t", "memory"); \
else if (sizeof (*(mem)) == 4) \ else if (sizeof (*(mem)) == 4) \
__asm __volatile ("\ __asm __volatile ("\
@ -324,7 +318,7 @@ typedef uintmax_t uatomic_max_t;
1: mov r1,r15\n\ 1: mov r1,r15\n\
tst r2,r2\n\ tst r2,r2\n\
movt %0"\ movt %0"\
: "=r" (__result), "=&r" (__tmp) : rNOSP (mem), "1" (__value) \ : "=r" (__result), "=&r" (__tmp) : "u" (mem), "1" (__value) \
: "r0", "r1", "r2", "t", "memory"); \ : "r0", "r1", "r2", "t", "memory"); \
else \ else \
abort (); \ abort (); \
@ -345,7 +339,7 @@ typedef uintmax_t uatomic_max_t;
or %1,r2\n\ or %1,r2\n\
mov.b r2,@%0\n\ mov.b r2,@%0\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: : rNOSP (mem), rNOSP (__mask) \ : : "u" (mem), "u" (__mask) \
: "r0", "r1", "r2", "memory"); \ : "r0", "r1", "r2", "memory"); \
else if (sizeof (*(mem)) == 2) \ else if (sizeof (*(mem)) == 2) \
__asm __volatile ("\ __asm __volatile ("\
@ -357,7 +351,7 @@ typedef uintmax_t uatomic_max_t;
or %1,r2\n\ or %1,r2\n\
mov.w r2,@%0\n\ mov.w r2,@%0\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: : rNOSP (mem), rNOSP (__mask) \ : : "u" (mem), "u" (__mask) \
: "r0", "r1", "r2", "memory"); \ : "r0", "r1", "r2", "memory"); \
else if (sizeof (*(mem)) == 4) \ else if (sizeof (*(mem)) == 4) \
__asm __volatile ("\ __asm __volatile ("\
@ -369,7 +363,7 @@ typedef uintmax_t uatomic_max_t;
or %1,r2\n\ or %1,r2\n\
mov.l r2,@%0\n\ mov.l r2,@%0\n\
1: mov r1,r15"\ 1: mov r1,r15"\
: : rNOSP (mem), rNOSP (__mask) \ : : "u" (mem), "u" (__mask) \
: "r0", "r1", "r2", "memory"); \ : "r0", "r1", "r2", "memory"); \
else \ else \
abort (); \ abort (); \
@ -391,7 +385,7 @@ typedef uintmax_t uatomic_max_t;
1: mov r1,r15\n\ 1: mov r1,r15\n\
and r3,%0"\ and r3,%0"\
: "=&r" (__result), "=&r" (__mask) \ : "=&r" (__result), "=&r" (__mask) \
: rNOSP (mem), "0" (__result), "1" (__mask) \ : "u" (mem), "0" (__result), "1" (__mask) \
: "r0", "r1", "r2", "r3", "memory"); \ : "r0", "r1", "r2", "r3", "memory"); \
else if (sizeof (*(mem)) == 2) \ else if (sizeof (*(mem)) == 2) \
__asm __volatile ("\ __asm __volatile ("\
@ -406,7 +400,7 @@ typedef uintmax_t uatomic_max_t;
1: mov r1,r15\n\ 1: mov r1,r15\n\
and r3,%0"\ and r3,%0"\
: "=&r" (__result), "=&r" (__mask) \ : "=&r" (__result), "=&r" (__mask) \
: rNOSP (mem), "0" (__result), "1" (__mask) \ : "u" (mem), "0" (__result), "1" (__mask) \
: "r0", "r1", "r2", "r3", "memory"); \ : "r0", "r1", "r2", "r3", "memory"); \
else if (sizeof (*(mem)) == 4) \ else if (sizeof (*(mem)) == 4) \
__asm __volatile ("\ __asm __volatile ("\
@ -421,7 +415,7 @@ typedef uintmax_t uatomic_max_t;
1: mov r1,r15\n\ 1: mov r1,r15\n\
and r3,%0"\ and r3,%0"\
: "=&r" (__result), "=&r" (__mask) \ : "=&r" (__result), "=&r" (__mask) \
: rNOSP (mem), "0" (__result), "1" (__mask) \ : "u" (mem), "0" (__result), "1" (__mask) \
: "r0", "r1", "r2", "r3", "memory"); \ : "r0", "r1", "r2", "r3", "memory"); \
else \ else \
abort (); \ abort (); \

4
sysdeps/x86_64/atomic-machine.h
View File

@ -56,11 +56,7 @@ typedef uintmax_t uatomic_max_t;
#endif #endif
#define __HAVE_64B_ATOMICS 1 #define __HAVE_64B_ATOMICS 1
#if __GNUC_PREREQ (4, 7)
#define USE_ATOMIC_COMPILER_BUILTINS 1 #define USE_ATOMIC_COMPILER_BUILTINS 1
#else
#define USE_ATOMIC_COMPILER_BUILTINS 0
#endif
#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \ #define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
__sync_val_compare_and_swap (mem, oldval, newval) __sync_val_compare_and_swap (mem, oldval, newval)