This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
[PATCH 08/21] ia64: initfini.c -> crt{i,n}.S split
This was done mostly by looking at the processed crt{i,n}.S files in
glibc-2.15, and then added the required update for using in either
csu/ or nptl/.
Seems to work -- when an earlier version didn't call the initializers,
many tests (pthread related) failed.
CC: areg.melik-adamyan@intel.com
CC: hongjiu.lu@intel.com
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-04-17 Mike Frysinger <vapier@gentoo.org>
* sysdeps/ia64/crti.S: New file.
* sysdeps/ia64/crtn.S: Likewise.
* sysdeps/ia64/elf/initfini.c: Delete.
* sysdeps/unix/sysv/linux/ia64/nptl/pt-initfini.c: Likewise.
---
sysdeps/ia64/crti.S | 161 +++++++++++++++++++++++
sysdeps/ia64/crtn.S | 69 ++++++++++
sysdeps/ia64/elf/initfini.c | 151 ---------------------
sysdeps/unix/sysv/linux/ia64/nptl/pt-initfini.c | 50 -------
4 files changed, 230 insertions(+), 201 deletions(-)
create mode 100644 sysdeps/ia64/crti.S
create mode 100644 sysdeps/ia64/crtn.S
delete mode 100644 sysdeps/ia64/elf/initfini.c
delete mode 100644 sysdeps/unix/sysv/linux/ia64/nptl/pt-initfini.c
diff --git a/sysdeps/ia64/crti.S b/sysdeps/ia64/crti.S
new file mode 100644
index 0000000..003f7be
--- /dev/null
+++ b/sysdeps/ia64/crti.S
@@ -0,0 +1,161 @@
+/* Special .init and .fini section support for IA64.
+ Copyright (C) 2000-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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ In addition to the permissions in the GNU Lesser General Public
+ License, the Free Software Foundation gives you unlimited
+ permission to link the compiled version of this file with other
+ programs, and to distribute those programs without any restriction
+ coming from the use of this file. (The GNU Lesser General Public
+ License restrictions do apply in other respects; for example, they
+ cover modification of the file, and distribution when not linked
+ into another program.)
+
+ Note that people who make modified versions of this file are not
+ obligated to grant this special exception for their modified
+ versions; it is their choice whether to do so. The GNU Lesser
+ General Public License gives permission to release a modified
+ version without this exception; this exception also makes it
+ possible to release a modified version which carries forward this
+ exception.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+/* 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. */
+
+#include <libc-symbols.h>
+#include <sysdep.h>
+#undef ret
+
+#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 we have working .init_array support, we want to keep the .init
+ section empty (apart from the mandatory prologue/epilogue. This
+ ensures that the default unwind conventions (return-pointer in b0,
+ frame state in ar.pfs, etc.) will do the Right Thing. To ensure
+ an empty .init section, we register gmon_initializer() via the
+ .init_array.
+
+ --davidm 02/10/29 */
+
+#if PREINIT_FUNCTION_WEAK
+/* This blob of assembly code is one simple C function:
+
+static void
+__attribute__ ((used))
+gmon_initializer (void)
+{
+ extern void weak_function __gmon_start__ (void);
+
+ if (__gmon_start__)
+ (*__gmon_start__)();
+}
+ */
+ .text
+ .align 64
+ .hidden __crti_preinit_func_array__
+ .proc __crti_preinit_func_array__#
+__crti_preinit_func_array__:
+ .prologue 12, 32
+ .mmi
+ .save ar.pfs, r33
+ alloc r33 = ar.pfs, 0, 3, 0, 0
+ addl r14 = @ltoff(@fptr(PREINIT_FUNCTION#)), gp
+ .save rp, r32
+ mov r32 = b0
+ .mmi
+ mov r34 = r1
+ .body
+ ;;
+ ld8 r14 = [r14]
+ nop 0
+ ;;
+ .mib
+ cmp.eq p6, p7 = 0, r14
+ nop 0
+ (p6) br.cond.spnt .L1
+ ;;
+ .mib
+ nop 0
+ nop 0
+ br.call.sptk.many b0 = PREINIT_FUNCTION#
+ ;;
+ .mmi
+ mov r1 = r34
+ nop 0
+ nop 0
+.L1:
+ .mii
+ nop 0
+ mov ar.pfs = r33
+ nop 0
+ ;;
+ .mib
+ nop 0
+ mov b0 = r32
+ br.ret.sptk.many b0
+ .endp __crti_preinit_func_array__#
+# undef PREINIT_FUNCTION
+# define PREINIT_FUNCTION __crti_preinit_func_array__
+#endif
+ .section .init_array, "aw"
+ data8 @fptr(PREINIT_FUNCTION)
+
+ .section .init,"ax",@progbits
+ .global _init#
+ .proc _init#
+_init:
+ .prologue
+ .save ar.pfs, r34
+ alloc r34 = ar.pfs, 0, 3, 0, 0
+ .vframe r32
+ mov r32 = r12
+ .save rp, r33
+ mov r33 = b0
+ .body
+ adds r12 = -16, r12
+ ;; /* see gmon_initializer() above */
+ .endp _init#
+
+ .section .fini,"ax",@progbits
+ .global _fini#
+ .proc _fini#
+_fini:
+ .prologue
+ .save ar.pfs, r34
+ alloc r34 = ar.pfs, 0, 3, 0, 0
+ .vframe r32
+ mov r32 = r12
+ .save rp, r33
+ mov r33 = b0
+ .body
+ adds r12 = -16, r12
+ ;;
+ .endp _fini#
diff --git a/sysdeps/ia64/crtn.S b/sysdeps/ia64/crtn.S
new file mode 100644
index 0000000..89b44d1
--- /dev/null
+++ b/sysdeps/ia64/crtn.S
@@ -0,0 +1,69 @@
+/* Special .init and .fini section support for ARM.
+ Copyright (C) 2000-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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ In addition to the permissions in the GNU Lesser General Public
+ License, the Free Software Foundation gives you unlimited
+ permission to link the compiled version of this file with other
+ programs, and to distribute those programs without any restriction
+ coming from the use of this file. (The GNU Lesser General Public
+ License restrictions do apply in other respects; for example, they
+ cover modification of the file, and distribution when not linked
+ into another program.)
+
+ Note that people who make modified versions of this file are not
+ obligated to grant this special exception for their modified
+ versions; it is their choice whether to do so. The GNU Lesser
+ General Public License gives permission to release a modified
+ version without this exception; this exception also makes it
+ possible to release a modified version which carries forward this
+ exception.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <sysdep.h>
+#undef ret
+
+/* crtn.S puts function epilogues in the .init and .fini sections
+ corresponding to the prologues in crti.S. */
+
+ .section .init,"ax",@progbits
+ .proc _init#
+_init:
+ .prologue
+ .save ar.pfs, r34
+ .vframe r32
+ .save rp, r33
+ .body
+ .regstk 0,2,0,0
+ mov r12 = r32
+ mov ar.pfs = r34
+ mov b0 = r33
+ br.ret.sptk.many b0
+ .endp _init#
+
+ .section .fini,"ax",@progbits
+ .proc _fini#
+_fini:
+ .prologue
+ .save ar.pfs, r34
+ .vframe r32
+ .save rp, r33
+ .body
+ mov r12 = r32
+ mov ar.pfs = r34
+ mov b0 = r33
+ br.ret.sptk.many b0
+ .endp _fini#
diff --git a/sysdeps/ia64/elf/initfini.c b/sysdeps/ia64/elf/initfini.c
deleted file mode 100644
index 3cae895..0000000
--- a/sysdeps/ia64/elf/initfini.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Special .init and .fini section support for ia64.
- Copyright (C) 2000, 2002, 2003, 2005 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- In addition to the permissions in the GNU Lesser General Public
- License, the Free Software Foundation gives you unlimited
- permission to link the compiled version of this file with other
- programs, and to distribute those programs without any restriction
- coming from the use of this file. (The GNU Lesser General Public
- License restrictions do apply in other respects; for example, they
- cover modification of the file, and distribution when not linked
- into another program.)
-
- Note that people who make modified versions of this file are not
- obligated to grant this special exception for their modified
- versions; it is their choice whether to do so. The GNU Lesser
- General Public License gives permission to release a modified
- version without this exception; this exception also makes it
- possible to release a modified version which carries forward this
- exception.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-/* This file is compiled into assembly code which is then munged by a sed
- script into two files: crti.s and crtn.s.
-
- * 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.
-
- * crtn.s puts the corresponding function epilogues
- in the .init and .fini sections. */
-
-__asm__ ("\n\n"
-"#include \"defs.h\"\n"
-"\n"
-"/*@HEADER_ENDS*/\n"
-"\n"
-"/*@_init_PROLOG_BEGINS*/\n");
-
-
-/* If we have working .init_array support, we want to keep the .init
- section empty (apart from the mandatory prologue/epilogue. This
- ensures that the default unwind conventions (return-pointer in b0,
- frame state in ar.pfs, etc.) will do the Right Thing. To ensure
- an empty .init section, we register gmon_initializer() via the
- .init_array.
-
- --davidm 02/10/29 */
-
-static void
-__attribute__ ((used))
-gmon_initializer (void)
-{
- extern void weak_function __gmon_start__ (void);
-
- if (__gmon_start__)
- (*__gmon_start__)();
-}
-
-__asm__ (".section .init_array, \"aw\"\n"
- "\tdata8 @fptr(gmon_initializer)\n");
-
-
-__asm__ (".section .init\n"
-" .global _init#\n"
-" .proc _init#\n"
-"_init:\n"
-" .prologue\n"
-" .save ar.pfs, r34\n"
-" alloc r34 = ar.pfs, 0, 3, 0, 0\n"
-" .vframe r32\n"
-" mov r32 = r12\n"
-" .save rp, r33\n"
-" mov r33 = b0\n"
-" .body\n"
-" adds r12 = -16, r12\n"
-" ;;\n" /* see gmon_initializer() above */
-" .endp _init#\n"
-"\n"
-"/*@_init_PROLOG_ENDS*/\n"
-"\n"
-"/*@_init_EPILOG_BEGINS*/\n"
-" .section .init\n"
-" .proc _init#\n"
-"_init:\n"
-" .prologue\n"
-" .save ar.pfs, r34\n"
-" .vframe r32\n"
-" .save rp, r33\n"
-" .body\n"
-" .regstk 0,2,0,0\n"
-" mov r12 = r32\n"
-" mov ar.pfs = r34\n"
-" mov b0 = r33\n"
-" br.ret.sptk.many b0\n"
-" .endp _init#\n"
-"/*@_init_EPILOG_ENDS*/\n"
-"\n"
-"/*@_fini_PROLOG_BEGINS*/\n"
-" .section .fini\n"
-" .global _fini#\n"
-" .proc _fini#\n"
-"_fini:\n"
-" .prologue\n"
-" .save ar.pfs, r34\n"
-" alloc r34 = ar.pfs, 0, 3, 0, 0\n"
-" .vframe r32\n"
-" mov r32 = r12\n"
-" .save rp, r33\n"
-" mov r33 = b0\n"
-" .body\n"
-" adds r12 = -16, r12\n"
-" ;;\n"
-" .endp _fini#\n"
-"\n"
-"/*@_fini_PROLOG_ENDS*/\n"
-" br.call.sptk.many b0 = i_am_not_a_leaf# ;;\n"
-" ;;\n"
-"\n"
-"/*@_fini_EPILOG_BEGINS*/\n"
-" .section .fini\n"
-" .proc _fini#\n"
-"_fini:\n"
-" .prologue\n"
-" .save ar.pfs, r34\n"
-" .vframe r32\n"
-" .save rp, r33\n"
-" .body\n"
-" mov r12 = r32\n"
-" mov ar.pfs = r34\n"
-" mov b0 = r33\n"
-" br.ret.sptk.many b0\n"
-" .endp _fini#\n"
-"\n"
-"/*@_fini_EPILOG_ENDS*/\n"
-"\n"
-"/*@TRAILER_BEGINS*/\n"
-);
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/pt-initfini.c b/sysdeps/unix/sysv/linux/ia64/nptl/pt-initfini.c
deleted file mode 100644
index b6d2cec..0000000
--- a/sysdeps/unix/sysv/linux/ia64/nptl/pt-initfini.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Special .init and .fini section support for ia64. NPTL version.
- Copyright (C) 2000, 2001, 2002, 2003, 2005 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 modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- In addition to the permissions in the GNU Lesser General Public
- License, the Free Software Foundation gives you unlimited
- permission to link the compiled version of this file with other
- programs, and to distribute those programs without any restriction
- coming from the use of this file. (The Lesser General Public
- License restrictions do apply in other respects; for example, they
- cover modification of the file, and distribution when not linked
- into another program.)
-
- The GNU C Library is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* This file is compiled into assembly code which is then munged by a sed
- script into two files: crti.s and crtn.s.
-
- * 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.
-
- * crtn.s puts the corresponding function epilogues
- in the .init and .fini sections. */
-
-#include <stddef.h>
-
-
-__asm__ ("\n\
-#include \"defs.h\"\n\
-\n\
-/*@HEADER_ENDS*/\n\
-\n\
-/*@_init_PROLOG_BEGINS*/\n\
- .xdata8 \".init_array\",@fptr(__pthread_initialize_minimal_internal)\n\
-/*@_init_PROLOG_ENDS*/\n\
-");
--
1.7.8.5