Skip to content

Commit

Permalink
Remove ARM __GNUC_PREREQ(4,4) conditionals.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Joseph Myers committed Nov 14, 2014
1 parent a473381 commit 6a0dd47
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
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 &&
!__GNUC__].
* include/signal.h (__sigpause): Move declaration above call to
Expand Down
17 changes: 1 addition & 16 deletions sysdeps/arm/sysdep.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,25 +109,14 @@

/* If compiled for profiling, call `mcount' at the start of each function. */
#ifdef PROF
/* Call __gnu_mcount_nc if GCC >= 4.4. */
#if __GNUC_PREREQ(4,4)
/* Call __gnu_mcount_nc (GCC >= 4.4). */
#define CALL_MCOUNT \
push {lr}; \
cfi_adjust_cfa_offset (4); \
cfi_rel_offset (lr, 0); \
bl PLTJMP(mcount); \
cfi_adjust_cfa_offset (-4); \
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
#define CALL_MCOUNT /* Do nothing. */
#endif
Expand All @@ -136,11 +125,7 @@
on this system, the asm identifier `syscall_error' intrudes on the
C name space. Make sure we use an innocuous name. */
#define syscall_error __syscall_error
#if __GNUC_PREREQ(4,4)
#define mcount __gnu_mcount_nc
#else
#define mcount _mcount
#endif

/* Tag_ABI_align8_preserved: This code preserves 8-byte
alignment in any callee. */
Expand Down

0 comments on commit 6a0dd47

Please sign in to comment.