AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-05 09:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ARM __GNUC_PREREQ(4,4) conditionals.

Browse Source 
This patch removes conditionals in ARM code on __GNUC_PREREQ(4,4),
which were already obsolete even before the move from 4.4 to 4.6 as
minimum GCC version for building glibc.

Tested for ARM that installed shared libraries are unchanged by this
patch.

	* sysdeps/arm/sysdep.h [PROF && __GNUC_PREREQ(4,4)] (CALL_MCOUNT):
	Make definition conditional only on [PROF].
	[PROF && !__GNUC_PREREQ(4,4)] (CALL_MCOUNT): Remove conditional
	definition.
	[__GNUC_PREREQ(4,4)] (mcount): Make definition unconditional.
	[!__GNUC_PREREQ(4,4)] (mcount): Remove conditional definition.
This commit is contained in:
Joseph Myers 2014-11-14 18:39:33 +00:00
parent a473381208
commit 6a0dd472f4
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2014-11-14 Joseph Myers <joseph@codesourcery.com> 2014-11-14 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/sysdep.h [PROF && __GNUC_PREREQ(4,4)] (CALL_MCOUNT):
Make definition conditional only on [PROF].
[PROF && !__GNUC_PREREQ(4,4)] (CALL_MCOUNT): Remove conditional
definition.
[__GNUC_PREREQ(4,4)] (mcount): Make definition unconditional.
[!__GNUC_PREREQ(4,4)] (mcount): Remove conditional definition.
* signal/signal.h (__sigpause): Only declare if [__USE_XOPEN && * signal/signal.h (__sigpause): Only declare if [__USE_XOPEN &&
!__GNUC__]. !__GNUC__].
* include/signal.h (__sigpause): Move declaration above call to * include/signal.h (__sigpause): Move declaration above call to

17
sysdeps/arm/sysdep.h
View File

@ -109,8 +109,7 @@
/* If compiled for profiling, call `mcount' at the start of each function. */ /* If compiled for profiling, call `mcount' at the start of each function. */
#ifdef PROF #ifdef PROF
/* Call __gnu_mcount_nc if GCC >= 4.4. */ /* Call __gnu_mcount_nc (GCC >= 4.4). */
#if __GNUC_PREREQ(4,4)
#define CALL_MCOUNT \ #define CALL_MCOUNT \
push {lr}; \ push {lr}; \
cfi_adjust_cfa_offset (4); \ cfi_adjust_cfa_offset (4); \
@ -118,16 +117,6 @@
bl PLTJMP(mcount); \ bl PLTJMP(mcount); \
cfi_adjust_cfa_offset (-4); \ cfi_adjust_cfa_offset (-4); \
cfi_restore (lr) cfi_restore (lr)
#else /* else call _mcount */
#define CALL_MCOUNT \
push {lr}; \
cfi_adjust_cfa_offset (4); \
cfi_rel_offset (lr, 0); \
bl PLTJMP(mcount); \
pops {lr}; \
cfi_adjust_cfa_offset (-4); \
cfi_restore (lr)
#endif
#else #else
#define CALL_MCOUNT /* Do nothing. */ #define CALL_MCOUNT /* Do nothing. */
#endif #endif
@ -136,11 +125,7 @@
on this system, the asm identifier `syscall_error' intrudes on the on this system, the asm identifier `syscall_error' intrudes on the
C name space. Make sure we use an innocuous name. */ C name space. Make sure we use an innocuous name. */
#define syscall_error __syscall_error #define syscall_error __syscall_error
#if __GNUC_PREREQ(4,4)
#define mcount __gnu_mcount_nc #define mcount __gnu_mcount_nc
#else
#define mcount _mcount
#endif
/* Tag_ABI_align8_preserved: This code preserves 8-byte /* Tag_ABI_align8_preserved: This code preserves 8-byte
alignment in any callee. */ alignment in any callee. */