From daf75146de07303ea0c5ad700ec5ef703ec114a1 Mon Sep 17 00:00:00 2001 From: Guy Martin Date: Thu, 21 Nov 2013 13:23:16 -0500 Subject: Don't use broken DL_AUTO_FUNCTION_ADDRESS() On hppa and ia64, the macro DL_AUTO_FUNCTION_ADDRESS() uses the variable fptr[2] in it's own scope. The content of fptr[] is thus undefined right after the macro exits. Newer gcc's (>= 4.7) reuse the stack space of this variable triggering a segmentation fault in dl-init.c:69. To fix this we rewrite the macros to make the call directly to init and fini without needing to pass back a constructed function pointer. --- elf/dl-close.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'elf/dl-close.c') diff --git a/elf/dl-close.c b/elf/dl-close.c index fe3014cca3..407926bade 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -274,9 +274,8 @@ _dl_close_worker (struct link_map *map) /* Next try the old-style destructor. */ if (imap->l_info[DT_FINI] != NULL) - (*(void (*) (void)) DL_DT_FINI_ADDRESS - (imap, ((void *) imap->l_addr - + imap->l_info[DT_FINI]->d_un.d_ptr))) (); + DL_CALL_DT_FINI (imap, ((void *) imap->l_addr + + imap->l_info[DT_FINI]->d_un.d_ptr)); } #ifdef SHARED -- cgit v1.2.3