From ed656b4065ae8b948e67a865c0964f24e90c5133 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 14 Feb 2012 13:50:44 +0100 Subject: [PATCH] Provide crt[in].S for x86-64. --- ChangeLog | 6 ++ sysdeps/x86_64/{elf/initfini.c => crti.S} | 113 ++++++++-------------- sysdeps/x86_64/crtn.S | 45 +++++++++ 3 files changed, 94 insertions(+), 70 deletions(-) rename sysdeps/x86_64/{elf/initfini.c => crti.S} (53%) create mode 100644 sysdeps/x86_64/crtn.S diff --git a/ChangeLog b/ChangeLog index f7101a6e04..cb191b603d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-02-14 Marek Polacek + + * sysdeps/x86_64/crti.S: New file. + * sysdeps/x86_64/crtn.S: New file. + * sysdeps/x86_64/elf/initfini.c: Remove file. + 2012-02-13 Joseph Myers * sysdeps/unix/sysv/linux/bits/inotify.h: New file. diff --git a/sysdeps/x86_64/elf/initfini.c b/sysdeps/x86_64/crti.S similarity index 53% rename from sysdeps/x86_64/elf/initfini.c rename to sysdeps/x86_64/crti.S index 44523b2322..3067219403 100644 --- a/sysdeps/x86_64/elf/initfini.c +++ b/sysdeps/x86_64/crti.S @@ -1,5 +1,5 @@ /* Special .init and .fini section support for x86-64. - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 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 @@ -33,75 +33,48 @@ License along with the GNU C Library; if not, see . */ -/* 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. The symbols _init and _fini are + magic and cause the linker to emit DT_INIT and DT_FINI. */ - * 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. +#include +#include - * crtn.s puts the corresponding function epilogues - in the .init and .fini sections. */ +#ifndef PREINIT_FUNCTION +# define PREINIT_FUNCTION __gmon_start__ +#endif -__asm__ ("\n\ -#include \"defs.h\"\n\ -\n\ -/*@HEADER_ENDS*/\n\ -\n\ -/*@_init_PROLOG_BEGINS*/\n\ - .align 4\n\ - .type call_gmon_start,@function\n\ -call_gmon_start:\n\ - subq $8, %rsp\n\ - movq __gmon_start__@GOTPCREL(%rip), %rax\n\ - testq %rax, %rax\n\ - je .L22\n\ - call *%rax\n\ -.L22:\n\ - addq $8, %rsp\n\ - ret\n\ -\n\ - .section .init\n\ - .align 4\n\ -.globl _init\n\ - .type _init,@function\n\ -_init:\n\ - subq $8, %rsp\n\ - call call_gmon_start\n\ - ALIGN\n\ - END_INIT\n\ -\n\ -/*@_init_PROLOG_ENDS*/\n\ -\n\ -/*@_init_EPILOG_BEGINS*/\n\ - .section .init\n\ - addq $8, %rsp\n\ - ret\n\ - END_INIT\n\ -\n\ -/*@_init_EPILOG_ENDS*/\n\ -\n\ -/*@_fini_PROLOG_BEGINS*/\n\ - .section .fini\n\ - .align 4\n\ -.globl _fini\n\ - .type _fini,@function\n\ -_fini:\n\ - subq $8, %rsp\n\ - ALIGN\n\ - END_FINI\n\ -\n\ -/*@_fini_PROLOG_ENDS*/\n\ - call i_am_not_a_leaf@PLT\n\ -\n\ -/*@_fini_EPILOG_BEGINS*/\n\ - .section .fini\n\ - addq $8, %rsp\n\ - ret\n\ - END_FINI\n\ -\n\ -/*@_fini_EPILOG_ENDS*/\n\ -\n\ -/*@TRAILER_BEGINS*/\n\ - .weak __gmon_start__\n\ -"); +#ifndef PREINIT_FUNCTION_WEAK +# define PREINIT_FUNCTION_WEAK 1 +#endif + +#if PREINIT_FUNCTION_WEAK + weak_extern (PREINIT_FUNCTION) +#else + .hidden PREINIT_FUNCTION +#endif + + .section .init,"ax",@progbits + .p2align 2 + .globl _init + .type _init, @function +_init: + /* Maintain 16-byte stack alignment for called functions. */ + subq $8, %rsp +#if PREINIT_FUNCTION_WEAK + movq PREINIT_FUNCTION@GOTPCREL(%rip), %rax + testq %rax, %rax + je .Lno_weak_fn + call PREINIT_FUNCTION@PLT +.Lno_weak_fn: +#else + call PREINIT_FUNCTION +#endif + + .section .fini,"ax",@progbits + .p2align 2 + .globl _fini + .type _fini, @function +_fini: + subq $8, %rsp diff --git a/sysdeps/x86_64/crtn.S b/sysdeps/x86_64/crtn.S new file mode 100644 index 0000000000..e6f27245f1 --- /dev/null +++ b/sysdeps/x86_64/crtn.S @@ -0,0 +1,45 @@ +/* Special .init and .fini section support for x86-64. + Copyright (C) 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 + . */ + +/* crtn.S puts function epilogues in the .init and .fini sections + corresponding to the prologues in crti.S. */ + + .section .init,"ax",@progbits + addq $8, %rsp + ret + + .section .fini,"ax",@progbits + addq $8, %rsp + ret