This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
Community source repository for glibc add-on ports branch, master, updated. glibc-2.11-27-g2423dc2
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Dec 2009 18:03:47 -0000
- Subject: Community source repository for glibc add-on ports branch, master, updated. glibc-2.11-27-g2423dc2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Community source repository for glibc add-on ports".
The branch, master has been updated
via 2423dc241af7be26cd91d34459da239f81a70f84 (commit)
from 8ef2c3b0f7f77ee6c7d20517aded3c0c52857911 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc-ports.git;a=commitdiff;h=2423dc241af7be26cd91d34459da239f81a70f84
commit 2423dc241af7be26cd91d34459da239f81a70f84
Author: Thomas Schwinge <thomas@codesourcery.com>
Date: Wed Dec 16 18:02:51 2009 +0000
Move ARM EABI mcount into a separate .S file.
diff --git a/ChangeLog.arm b/ChangeLog.arm
index 03bfd34..db1e93c 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,12 @@
+2009-12-16 Thomas Schwinge <thomas@codesourcery.com>
+
+ * sysdeps/arm/eabi/Makefile [gmon] (sysdep_routines): Add arm-mcount.
+ * sysdeps/arm/eabi/machine-gmon.h (mcount_internal): Define to
+ `__mcount_internal'.
+ (MCOUNT (__gnu_mcount_nc), OLD_MCOUNT (_mcount), mcount): Move to...
+ * sysdeps/arm/eabi/arm-mcount.S: ... this new file as __gnu_mcount_nc,
+ _mcount, and mcount, respectively.
+
2009-12-15 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Redefine O_SYNC and
diff --git a/sysdeps/arm/eabi/Makefile b/sysdeps/arm/eabi/Makefile
index 05aede6..20572d4 100644
--- a/sysdeps/arm/eabi/Makefile
+++ b/sysdeps/arm/eabi/Makefile
@@ -12,6 +12,10 @@ static-only-routines += $(aeabi_constants)
gen-as-const-headers += rtld-global-offsets.sym
endif
+ifeq ($(subdir),gmon)
+sysdep_routines += arm-mcount
+endif
+
ifeq ($(subdir),debug)
CFLAGS-backtrace.c += -funwind-tables
endif
diff --git a/sysdeps/arm/eabi/machine-gmon.h b/sysdeps/arm/eabi/arm-mcount.S
similarity index 50%
copy from sysdeps/arm/eabi/machine-gmon.h
copy to sysdeps/arm/eabi/arm-mcount.S
index 189a9a3..2aa50b7 100644
--- a/sysdeps/arm/eabi/machine-gmon.h
+++ b/sysdeps/arm/eabi/arm-mcount.S
@@ -1,5 +1,5 @@
-/* Machine-dependent definitions for profiling support. ARM EABI version.
- Copyright (C) 2008 Free Software Foundation, Inc.
+/* Implementation of profiling support. ARM EABI version.
+ Copyright (C) 2008, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,14 +17,17 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-/* GCC for the ARM cannot compile __builtin_return_address(N) for N != 0,
- so we must use an assembly stub. */
+/* Don't call mcount when calling mcount... */
+#undef PROF
#include <sysdep.h>
-static void mcount_internal (u_long frompc, u_long selfpc) __attribute_used__;
-#define _MCOUNT_DECL(frompc, selfpc) \
-static void mcount_internal (u_long frompc, u_long selfpc)
+
+#ifdef __thumb2__
+ .thumb
+ .syntax unified
+#endif
+
/* Use an assembly stub with a special ABI. The calling lr has been
pushed to the stack (which will be misaligned). We should preserve
@@ -39,61 +42,42 @@ func:
push {lr}
bl __gnu_mount_nc
<function body>
- */
+*/
+ENTRY(__gnu_mcount_nc)
+ push {r0, r1, r2, r3, lr}
+ bic r1, lr, #1
+ ldr r0, [sp, #20]
+ bl __mcount_internal
+ pop {r0, r1, r2, r3, ip, lr}
+ bx ip
+END(__gnu_mcount_nc)
-#define MCOUNT \
-void __attribute__((__naked__)) __gnu_mcount_nc(void) \
-{ \
- asm ("push {r0, r1, r2, r3, lr}\n\t" \
- "bic r1, lr, #1\n\t" \
- "ldr r0, [sp, #20]\n\t" \
- "bl mcount_internal\n\t" \
- "pop {r0, r1, r2, r3, ip, lr}\n\t" \
- "bx ip"); \
-} \
-OLD_MCOUNT
/* Provide old mcount for backwards compatibility. This requires
code be compiled with APCS frame pointers. */
-#ifndef NO_UNDERSCORES
-/* The asm symbols for C functions are `_function'.
- The canonical name for the counter function is `mcount', no _. */
-void _mcount (void) asm ("mcount");
+ENTRY(_mcount)
+ stmdb sp!, {r0, r1, r2, r3, fp, lr}
+#ifdef __thumb2__
+ movs r0, fp
+ ittt ne
+ ldrne r0, [r0, #-4]
#else
-/* The canonical name for the function is `_mcount' in both C and asm,
- but some old asm code might assume it's `mcount'. */
-void _mcount (void);
-weak_alias (_mcount, mcount)
+ movs fp, fp
+ ldrne r0, [fp, #-4]
#endif
-
+ movnes r1, lr
+ blne __mcount_internal
#ifdef __thumb2__
-
-#define OLD_MCOUNT \
-void __attribute__((__naked__)) _mcount (void) \
-{ \
- __asm__("push {r0, r1, r2, r3, fp, lr};" \
- "movs r0, fp;" \
- "ittt ne;" \
- "ldrne r0, [r0, #-4];" \
- "movsne r1, lr;" \
- "blne mcount_internal;" \
- "pop {r0, r1, r2, r3, fp, pc}"); \
-}
-
+ ldmia sp!, {r0, r1, r2, r3, fp, pc}
#else
-
-#define OLD_MCOUNT \
-void __attribute__((__naked__)) _mcount (void) \
-{ \
- __asm__("stmdb sp!, {r0, r1, r2, r3, fp, lr};" \
- "movs fp, fp;" \
- "ldrne r0, [fp, #-4];" \
- "movnes r1, lr;" \
- "blne mcount_internal;" \
- "ldmia sp!, {r0, r1, r2, r3, fp, lr};" \
- "bx lr"); \
-}
-
+ ldmia sp!, {r0, r1, r2, r3, fp, lr}
+ bx lr
#endif
+END(_mcount)
+
+/* The canonical name for the function is `_mcount' in both C and asm,
+ but some old asm code might assume it's `mcount'. */
+#undef mcount
+weak_alias (_mcount, mcount)
diff --git a/sysdeps/arm/eabi/machine-gmon.h b/sysdeps/arm/eabi/machine-gmon.h
index 189a9a3..aca23c9 100644
--- a/sysdeps/arm/eabi/machine-gmon.h
+++ b/sysdeps/arm/eabi/machine-gmon.h
@@ -1,5 +1,5 @@
/* Machine-dependent definitions for profiling support. ARM EABI version.
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,83 +17,18 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <sysdep.h>
+
/* GCC for the ARM cannot compile __builtin_return_address(N) for N != 0,
so we must use an assembly stub. */
-#include <sysdep.h>
-static void mcount_internal (u_long frompc, u_long selfpc) __attribute_used__;
+/* We must not pollute the global namespace. */
+#define mcount_internal __mcount_internal
+extern void mcount_internal (u_long frompc, u_long selfpc) internal_function;
#define _MCOUNT_DECL(frompc, selfpc) \
-static void mcount_internal (u_long frompc, u_long selfpc)
-
-/* Use an assembly stub with a special ABI. The calling lr has been
- pushed to the stack (which will be misaligned). We should preserve
- all registers except ip and pop a word off the stack.
-
- NOTE: This assumes mcount_internal does not clobber any non-core
- (coprocessor) registers. Currently this is true, but may require
- additional attention in the future.
-
- The calling sequence looks something like:
-func:
- push {lr}
- bl __gnu_mount_nc
- <function body>
- */
-
-
-#define MCOUNT \
-void __attribute__((__naked__)) __gnu_mcount_nc(void) \
-{ \
- asm ("push {r0, r1, r2, r3, lr}\n\t" \
- "bic r1, lr, #1\n\t" \
- "ldr r0, [sp, #20]\n\t" \
- "bl mcount_internal\n\t" \
- "pop {r0, r1, r2, r3, ip, lr}\n\t" \
- "bx ip"); \
-} \
-OLD_MCOUNT
-
-/* Provide old mcount for backwards compatibility. This requires
- code be compiled with APCS frame pointers. */
-
-#ifndef NO_UNDERSCORES
-/* The asm symbols for C functions are `_function'.
- The canonical name for the counter function is `mcount', no _. */
-void _mcount (void) asm ("mcount");
-#else
-/* The canonical name for the function is `_mcount' in both C and asm,
- but some old asm code might assume it's `mcount'. */
-void _mcount (void);
-weak_alias (_mcount, mcount)
-#endif
-
-#ifdef __thumb2__
-
-#define OLD_MCOUNT \
-void __attribute__((__naked__)) _mcount (void) \
-{ \
- __asm__("push {r0, r1, r2, r3, fp, lr};" \
- "movs r0, fp;" \
- "ittt ne;" \
- "ldrne r0, [r0, #-4];" \
- "movsne r1, lr;" \
- "blne mcount_internal;" \
- "pop {r0, r1, r2, r3, fp, pc}"); \
-}
-
-#else
+ void internal_function mcount_internal (u_long frompc, u_long selfpc)
-#define OLD_MCOUNT \
-void __attribute__((__naked__)) _mcount (void) \
-{ \
- __asm__("stmdb sp!, {r0, r1, r2, r3, fp, lr};" \
- "movs fp, fp;" \
- "ldrne r0, [fp, #-4];" \
- "movnes r1, lr;" \
- "blne mcount_internal;" \
- "ldmia sp!, {r0, r1, r2, r3, fp, lr};" \
- "bx lr"); \
-}
-#endif
+/* Define MCOUNT as empty since we have the implementation in another file. */
+#define MCOUNT
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.arm | 9 ++
sysdeps/arm/eabi/Makefile | 4 +
sysdeps/arm/eabi/{machine-gmon.h => arm-mcount.S} | 92 +++++++++------------
sysdeps/arm/eabi/machine-gmon.h | 83 ++-----------------
4 files changed, 60 insertions(+), 128 deletions(-)
copy sysdeps/arm/eabi/{machine-gmon.h => arm-mcount.S} (50%)
hooks/post-receive
--
Community source repository for glibc add-on ports