From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16099 invoked by alias); 30 Oct 2002 07:22:14 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 16054 invoked from network); 30 Oct 2002 07:22:13 -0000 Received: from unknown (HELO deimos.hpl.hp.com) (192.6.19.190) by sources.redhat.com with SMTP; 30 Oct 2002 07:22:13 -0000 Received: from hplms2.hpl.hp.com (hplms2.hpl.hp.com [15.0.152.33]) by deimos.hpl.hp.com (8.9.3 (PHNE_24419)/HPL-PA Relay) with ESMTP id XAA15822 for ; Tue, 29 Oct 2002 23:22:13 -0800 (PST) Received: from napali.hpl.hp.com (napali.hpl.hp.com [15.4.89.123]) by hplms2.hpl.hp.com (8.10.2/8.10.2 HPL-PA Hub) with ESMTP id g9U7MC104198 for ; Tue, 29 Oct 2002 23:22:12 -0800 (PST) Received: from napali.hpl.hp.com (napali [127.0.0.1]) by napali.hpl.hp.com (8.12.3/8.12.3/Debian -4) with ESMTP id g9U7MCHW000822; Tue, 29 Oct 2002 23:22:12 -0800 Received: (from davidm@localhost) by napali.hpl.hp.com (8.12.3/8.12.3/Debian -4) id g9U7MCXs000818; Tue, 29 Oct 2002 23:22:12 -0800 Date: Wed, 30 Oct 2002 07:00:00 -0000 From: David Mosberger Message-Id: <200210300722.g9U7MCXs000818@napali.hpl.hp.com> To: libc-hacker@sources.redhat.com cc: davidm@napali.hpl.hp.com Subject: [PATCH] move __gmon_start__ call out of .init section Reply-to: davidm@hpl.hp.com X-SW-Source: 2002-10/txt/msg00108.txt.bz2 The patch below changes the ia64 initfini.c such that the call to __gmon_start__ is done via the .init_array section (if available). The idea here is to keep the .init/.fini empty (apart from prologue/epilogue) so as to ensure that the unwind info is always correct. Note: this patch should be applied _after_ HJ's init_array fixes as otherwise gmon startup would fail for profiled binaries. Thanks, --david 2002-10-29 David Mosberger * sysdeps/ia64/elf/initfini.c [HAVE_INITFINI_ARRAY] (gmon_initializer): New function. (.init prologue): If HAVE_INITFINI_ARRAY is true, don't call __gmon_start__ here. Call it from gmon_initializer() instead. Index: sysdeps/ia64/elf/initfini.c =================================================================== RCS file: /cvs/glibc/libc/sysdeps/ia64/elf/initfini.c,v retrieving revision 1.3 diff -u -r1.3 initfini.c --- sysdeps/ia64/elf/sysdeps/ia64/elf/initfini.c 25 Aug 2002 00:34:23 -0000 1.3 +++ sysdeps/ia64/elf/sysdeps/ia64/elf/initfini.c 30 Oct 2002 04:37:13 -0000 @@ -27,81 +27,110 @@ * 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\ - .section .init\n\ - .align 16\n\ - .global _init#\n\ - .proc _init#\n\ -_init:\n\ - alloc r34 = ar.pfs, 0, 3, 0, 0\n\ - mov r32 = r12\n\ - mov r33 = b0\n\ - adds r12 = -16, r12\n\ - addl r14 = @ltoff(@fptr(__gmon_start__#)), gp\n\ - ;;\n\ - ld8 r15 = [r14]\n\ - ;;\n\ - cmp.eq p6, p7 = 0, r15\n\ - (p6) br.cond.dptk .L5\n\ -\n\ -/* we could use r35 to save gp, but we use the stack since that's what\n\ - * all the other init routines will do --davidm 00/04/05 */\n\ - st8 [r12] = gp, -16\n\ - br.call.sptk.many b0 = __gmon_start__# ;;\n\ - adds r12 = 16, r12\n\ - ;;\n\ - ld8 gp = [r12]\n\ - ;;\n\ -.L5:\n\ - .align 16\n\ - .endp _init#\n\ -\n\ -/*@_init_PROLOG_ENDS*/\n\ -\n\ -/*@_init_EPILOG_BEGINS*/\n\ - .section .init\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\ - .align 16\n\ - .global _fini#\n\ - .proc _fini#\n\ -_fini:\n\ - alloc r34 = ar.pfs, 0, 3, 0, 0\n\ - mov r32 = r12\n\ - mov r33 = b0\n\ - adds r12 = -16, r12\n\ - ;;\n\ - .align 16\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\ - 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\ - .weak __gmon_start__#\n\ -"); +__asm__ ("\n\n" +"#include \"defs.h\"\n" +"\n" +"/*@HEADER_ENDS*/\n" +"\n" +"/*@_init_PROLOG_BEGINS*/\n"); + +#ifdef HAVE_INITFINI_ARRAY + +/* 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 +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"); + +#endif + +__asm__ (".section .init\n" +" .align 16\n" +" .global _init#\n" +" .proc _init#\n" +"_init:\n" +" alloc r34 = ar.pfs, 0, 3, 0, 0\n" +" mov r32 = r12\n" +" mov r33 = b0\n" +" adds r12 = -16, r12\n" +#ifdef HAVE_INITFINI_ARRAY + " ;;\n" /* see gmon_initializer() below */ +#else +" .weak __gmon_start__#\n" +" addl r14 = @ltoff(@fptr(__gmon_start__#)), gp\n" +" ;;\n" +" ld8 r15 = [r14]\n" +" ;;\n" +" cmp.eq p6, p7 = 0, r15\n" +" (p6) br.cond.dptk .L5\n" +"\n" +"/* we could use r35 to save gp, but we use the stack since that's what\n" +" * all the other init routines will do --davidm 00/04/05 */\n" +" st8 [r12] = gp, -16\n" +" br.call.sptk.many b0 = __gmon_start__# ;;\n" +" adds r12 = 16, r12\n" +" ;;\n" +" ld8 gp = [r12]\n" +" ;;\n" +".L5:\n" +#endif +" .align 16\n" +" .endp _init#\n" +"\n" +"/*@_init_PROLOG_ENDS*/\n" +"\n" +"/*@_init_EPILOG_BEGINS*/\n" +" .section .init\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" +" .align 16\n" +" .global _fini#\n" +" .proc _fini#\n" +"_fini:\n" +" alloc r34 = ar.pfs, 0, 3, 0, 0\n" +" mov r32 = r12\n" +" mov r33 = b0\n" +" adds r12 = -16, r12\n" +" ;;\n" +" .align 16\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" +" 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" +);