[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r13230 - in /branches/eglibc-2_12/ports: ChangeLog.arm sysdeps/arm/sysdep.h
- To: commits@xxxxxxxxxx
- Subject: [commits] r13230 - in /branches/eglibc-2_12/ports: ChangeLog.arm sysdeps/arm/sysdep.h
- From: joseph@xxxxxxxxxx
- Date: Mon, 21 Mar 2011 17:53:45 -0000
Author: joseph
Date: Mon Mar 21 10:53:45 2011
New Revision: 13230
Log:
Merge changes between r12754 and r13229 from /fsf/glibc-2_12-branch.
Modified:
branches/eglibc-2_12/ports/ChangeLog.arm
branches/eglibc-2_12/ports/sysdeps/arm/sysdep.h
Modified: branches/eglibc-2_12/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_12/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_12/ports/ChangeLog.arm Mon Mar 21 10:53:45 2011
@@ -1,3 +1,10 @@
+2011-02-16 Manjunath Matti <manjunath81@xxxxxxxxx>
+
+ * sysdeps/arm/sysdep.h (CALL_MCOUNT): Use __gnu_mcount_nc
+ interface for EABI with GCC 4.4 or later.
+ (mcount): Define to __gnu_mcount_nc for EABI with GCC 4.4 or
+ later.
+
2010-05-21 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S: New.
Modified: branches/eglibc-2_12/ports/sysdeps/arm/sysdep.h
==============================================================================
--- branches/eglibc-2_12/ports/sysdeps/arm/sysdep.h (original)
+++ branches/eglibc-2_12/ports/sysdeps/arm/sysdep.h Mon Mar 21 10:53:45 2011
@@ -18,6 +18,7 @@
02111-1307 USA. */
#include <sysdeps/generic/sysdep.h>
+#include <features.h>
#if (!defined (__ARM_ARCH_2__) && !defined (__ARM_ARCH_3__) \
&& !defined (__ARM_ARCH_3M__) && !defined (__ARM_ARCH_4__))
@@ -92,6 +93,16 @@
/* If compiled for profiling, call `mcount' at the start of each function. */
#ifdef PROF
+/* Call __gnu_mcount_nc if GCC >= 4.4 and abi = EABI. */
+#if __GNUC_PREREQ(4,4) && defined(__ARM_EABI__)
+#define CALL_MCOUNT \
+ str lr,[sp, #-4]!; \
+ 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 \
str lr,[sp, #-4]!; \
cfi_adjust_cfa_offset (4); \
@@ -100,6 +111,7 @@
ldr lr, [sp], #4; \
cfi_adjust_cfa_offset (-4); \
cfi_restore (lr)
+#endif
#else
#define CALL_MCOUNT /* Do nothing. */
#endif
@@ -109,7 +121,11 @@
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) && defined(__ARM_EABI__)
+#define mcount __gnu_mcount_nc
+#else
#define mcount _mcount
+#endif
#endif
#if defined(__ARM_EABI__)