From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/8936 Path: news.gmane.org!not-for-mail From: Szabolcs Nagy Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH 2/2] add preinit_array support Date: Sun, 29 Nov 2015 16:33:22 +0100 Message-ID: <20151129153322.GO23362@port70.net> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1448811228 7187 80.91.229.3 (29 Nov 2015 15:33:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 29 Nov 2015 15:33:48 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-8949-gllmg-musl=m.gmane.org@lists.openwall.com Sun Nov 29 16:33:40 2015 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1a33yp-0006QD-UE for gllmg-musl@m.gmane.org; Sun, 29 Nov 2015 16:33:36 +0100 Original-Received: (qmail 3580 invoked by uid 550); 29 Nov 2015 15:33:38 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 3462 invoked from network); 29 Nov 2015 15:33:34 -0000 Mail-Followup-To: musl@lists.openwall.com Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Xref: news.gmane.org gmane.linux.lib.musl.general:8936 Archived-At: handle DT_PREINIT_ARRAY{SZ} in case of dynamic linking and __preinit_array_{start,end} in case of static linking. redefined DYN_CNT because 32 is not enough for DT_PREINIT_ARRAY. --- src/env/__libc_start_main.c | 5 +++++ src/ldso/dynlink.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c index f9c7ca5..d4cc0ef 100644 --- a/src/env/__libc_start_main.c +++ b/src/env/__libc_start_main.c @@ -12,6 +12,9 @@ static void dummy(void) {} weak_alias(dummy, _init); __attribute__((__weak__, __visibility__("hidden"))) +extern void (*const __preinit_array_start[])(void), (*const __preinit_array_end[])(void); + +__attribute__((__weak__, __visibility__("hidden"))) extern void (*const __init_array_start[])(void), (*const __init_array_end[])(void); static void dummy1(void *p) {} @@ -57,6 +60,8 @@ static void libc_start_init(void) { void (*const *f)(void); _init(); + for (f=__preinit_array_start; f<__preinit_array_end; f++) + (*f)(); for (f=__init_array_start; f<__init_array_end; f++) (*f)(); } diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 93e7d67..623818a 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -135,11 +135,14 @@ static struct fdpic_dummy_loadmap app_dummy_loadmap; struct debug *_dl_debug_addr = &debug; __attribute__((__visibility__("hidden"))) -void (*const __init_array_start)(void)=0, (*const __fini_array_start)(void)=0; +void (*const __init_array_start)(void)=0, (*const __fini_array_start)(void)=0, +(*const __preinit_array_start)(void)=0; __attribute__((__visibility__("hidden"))) -extern void (*const __init_array_end)(void), (*const __fini_array_end)(void); +extern void (*const __init_array_end)(void), (*const __fini_array_end)(void), +(*const __preinit_array_end)(void); +weak_alias(__preinit_array_start, __preinit_array_end); weak_alias(__init_array_start, __init_array_end); weak_alias(__fini_array_start, __fini_array_end); @@ -1229,6 +1232,11 @@ static void do_init_fini(struct dso *p) if ((dyn[0] & (1<