d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

csu: Fix dynamiclib/init_test:jcr_test on !HAVE_CTORS archs

Browse Source 
.jcr still needs a 0-entry added in crtend, even on !HAVE_CTORS archs, as
we're still getting .jcr sections added -- presumably due to the reference
in crtbegin. Without this terminal, the .jcr section (without data) overlaps
with the next section and register_classes in crtbegin will be examining the
wrong item.

PR:		241439
Reviewed by:	andrew
Differential Revision:	https://reviews.freebsd.org/D22132
This commit is contained in:
Kyle Evans 2019-11-08 14:28:39 +00:00
parent de15a85eb0
commit 20cb0deaa2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/csu/common/crtend.c
View File

@ -26,9 +26,14 @@ __FBSDID("$FreeBSD$");
#include "crt.h" #include "crt.h"
#ifdef HAVE_CTORS
typedef void (*crt_func)(void); typedef void (*crt_func)(void);
static crt_func __JCR_LIST__[] __section(".jcr") __used = {
(crt_func)0
};
#ifdef HAVE_CTORS
/* /*
* On some architectures and toolchains we may need to call the .ctors. * On some architectures and toolchains we may need to call the .ctors.
* These are called in the reverse order they are in the ELF file. * These are called in the reverse order they are in the ELF file.
@ -41,9 +46,6 @@ static crt_func __CTOR_END__[] __section(".ctors") __used = {
static crt_func __DTOR_END__[] __section(".dtors") __used = { static crt_func __DTOR_END__[] __section(".dtors") __used = {
(crt_func)0 (crt_func)0
}; };
static crt_func __JCR_LIST__[] __section(".jcr") __used = {
(crt_func)0
};
static void static void
__do_global_ctors_aux(void) __do_global_ctors_aux(void)