diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-11-04 21:34:36 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-11-04 21:34:36 +0000 |
| commit | 9f9f27248bf464b465fd4f05112a5b479503e83a (patch) | |
| tree | 8d8626657682b3c7ad50a202a64b298ab4ee910d /sysdeps/i386 | |
| parent | e3a0002094417b331993f46064924862b17811c0 (diff) | |
| download | glibc-9f9f27248bf464b465fd4f05112a5b479503e83a.tar.gz glibc-9f9f27248bf464b465fd4f05112a5b479503e83a.tar.xz glibc-9f9f27248bf464b465fd4f05112a5b479503e83a.zip | |
Remove miscellaneous GCC >= 4.7 version conditionals.
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.
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/sysdep.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h index bde11bf26f..7c8d30a027 100644 --- a/sysdeps/i386/sysdep.h +++ b/sysdeps/i386/sysdep.h @@ -30,17 +30,9 @@ #endif #ifdef __ASSEMBLER__ -# if __GNUC_PREREQ (4, 7) -# define GET_PC_THUNK(reg) __x86.get_pc_thunk.reg -# else -# define GET_PC_THUNK(reg) __i686.get_pc_thunk.reg -# endif +# define GET_PC_THUNK(reg) __x86.get_pc_thunk.reg #else -# if __GNUC_PREREQ (4, 7) -# define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg -# else -# define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg -# endif +# define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg #endif #ifdef __ASSEMBLER__ |