Community source repository for glibc add-on ports branch, master, updated. glibc-2.15-36-g92e4706

[jsm28 at sourceware dot org]

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  92e47068b33040b59efdbedfbeedab1cba1e1e62 (commit)
      from  06285c87857a33930a8e3c4b1ca5226b28130864 (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=92e47068b33040b59efdbedfbeedab1cba1e1e62

commit 92e47068b33040b59efdbedfbeedab1cba1e1e62
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Feb 8 23:35:36 2012 +0000

    Convert ARM to crti.S/crtn.S.

diff --git a/ChangeLog.arm b/ChangeLog.arm
index 62531a4..75c8f54 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,11 @@
+2012-02-08  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/arm/crti.S, sysdeps/arm/crtn.S: New files, based on
+	compiler output for sysdeps/generic/initfini.c.
+	* sysdeps/arm/initfini.c: Remove file.
+	* sysdeps/arm/eabi/Makefile (CFLAGS-initfini.s)
+	(CFLAGS-pt-initfini.s): Remove variables.
+
 2012-01-08  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/arm/eabi/bits/fenv.h: Use const instead of __const.
diff --git a/sysdeps/arm/initfini.c b/sysdeps/arm/crti.S
similarity index 57%
copy from sysdeps/arm/initfini.c
copy to sysdeps/arm/crti.S
index 659ee91..facb1e6 100644
--- a/sysdeps/arm/initfini.c
+++ b/sysdeps/arm/crti.S
@@ -1,5 +1,5 @@
-/* Special .init and .fini section support.  ARM version.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+/* Special .init and .fini section support for ARM.
+   Copyright (C) 1995-2012 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
@@ -34,9 +34,61 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* Prevent this function from being inlined.  Otherwise half of its
-   constant pool will end up in crti and the other half in crtn.  */
+/* crti.S puts a function prologue at the beginning of the .init and
+   .fini sections and defines global symbols for those addresses, so
+   they can be called as functions.  The symbols _init and _fini are
+   magic and cause the linker to emit DT_INIT and DT_FINI.  */
 
-static void call_gmon_start (void) __attribute__((noinline));
+#include <libc-symbols.h>
+#include <sysdep.h>
 
-#include <sysdeps/generic/initfini.c>
+#ifndef PREINIT_FUNCTION
+# define PREINIT_FUNCTION __gmon_start__
+#endif
+
+#ifndef PREINIT_FUNCTION_WEAK
+# define PREINIT_FUNCTION_WEAK 1
+#endif
+
+#if PREINIT_FUNCTION_WEAK
+	weak_extern (PREINIT_FUNCTION)
+#else
+	.hidden PREINIT_FUNCTION
+#endif
+
+#if PREINIT_FUNCTION_WEAK
+	.p2align 2
+	.type call_weak_fn, %function
+call_weak_fn:
+	ldr r3, .LGOT
+	ldr r2, .LGOT+4
+.LPIC:
+	add r3, pc, r3
+	ldr r2, [r3, r2]
+	cmp r2, #0
+	bxeq lr
+	b PREINIT_FUNCTION
+	.p2align 2
+.LGOT:
+	.word _GLOBAL_OFFSET_TABLE_-(.LPIC+8)
+	.word PREINIT_FUNCTION(GOT)
+#endif
+
+	.section .init,"ax",%progbits
+	.p2align 2
+	.globl _init
+	.type _init, %function
+_init:
+	stmfd sp!, {r3, lr}
+#if PREINIT_FUNCTION_WEAK
+	bl call_weak_fn
+#else
+	bl PREINIT_FUNCTION
+#endif
+
+	.section .fini,"ax",%progbits
+	.p2align 2
+	.globl _fini
+	.type _fini, %function
+_fini:
+	stmfd sp!, {r3, lr}
diff --git a/sysdeps/arm/initfini.c b/sysdeps/arm/crtn.S
similarity index 78%
rename from sysdeps/arm/initfini.c
rename to sysdeps/arm/crtn.S
index 659ee91..18be5cc 100644
--- a/sysdeps/arm/initfini.c
+++ b/sysdeps/arm/crtn.S
@@ -1,5 +1,5 @@
-/* Special .init and .fini section support.  ARM version.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+/* Special .init and .fini section support for ARM.
+   Copyright (C) 1995-2012 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
@@ -34,9 +34,23 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* Prevent this function from being inlined.  Otherwise half of its
-   constant pool will end up in crti and the other half in crtn.  */
-
-static void call_gmon_start (void) __attribute__((noinline));
-
-#include <sysdeps/generic/initfini.c>
+#include <sysdep.h>
+
+/* crtn.S puts function epilogues in the .init and .fini sections
+   corresponding to the prologues in crti.S. */
+
+	.section .init,"ax",%progbits
+#ifdef __ARM_ARCH_4T__
+	ldmfd sp!, {r3, lr}
+	bx lr
+#else
+	ldmfd sp!, {r3, pc}
+#endif
+
+	.section .fini,"ax",%progbits
+#ifdef __ARM_ARCH_4T__
+	ldmfd sp!, {r3, lr}
+	bx lr
+#else
+	ldmfd sp!, {r3, pc}
+#endif
diff --git a/sysdeps/arm/eabi/Makefile b/sysdeps/arm/eabi/Makefile
index 20572d4..025465a 100644
--- a/sysdeps/arm/eabi/Makefile
+++ b/sysdeps/arm/eabi/Makefile
@@ -3,7 +3,6 @@ aeabi_constants = aeabi_lcsts aeabi_sighandlers aeabi_math
 aeabi_routines = aeabi_assert aeabi_localeconv aeabi_errno_addr \
 	aeabi_mb_cur_max aeabi_atexit aeabi_memclr aeabi_memcpy \
 	aeabi_memmove aeabi_memset
-CFLAGS-initfini.s += -fno-asynchronous-unwind-tables -fno-unwind-tables
 
 sysdep_routines += $(aeabi_constants) $(aeabi_routines)
 static-only-routines += $(aeabi_constants)
@@ -29,7 +28,3 @@ endif
 ifeq ($(subdir),math)
 $(objpfx)libm.so: $(elfobjdir)/ld.so
 endif
-
-ifeq ($(subdir),nptl)
-CFLAGS-pt-initfini.s += -fno-asynchronous-unwind-tables -fno-unwind-tables
-endif

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog.arm                      |    8 +++++
 sysdeps/{m68k => arm}/crti.S       |   53 +++++++++++++++++++++--------------
 sysdeps/arm/{initfini.c => crtn.S} |   30 +++++++++++++++-----
 sysdeps/arm/eabi/Makefile          |    5 ---
 4 files changed, 62 insertions(+), 34 deletions(-)
 copy sysdeps/{m68k => arm}/crti.S (78%)
 rename sysdeps/arm/{initfini.c => crtn.S} (78%)


hooks/post-receive
-- 
Community source repository for glibc add-on ports