From fb7128c25e50fd4e98721397c0e7ff4dbf8a4af8 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Mon, 29 Oct 2018 17:55:26 +0000 Subject: [PATCH] Make the .ctors, .dtors, and .jcr markers as static. They shouldn't be accessible from out of the files they are defined in. MFC with: r339738 Sponsored by: DARPA, AFRL --- lib/csu/common/crtbegin.c | 6 +++--- lib/csu/common/crtend.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c index c5fd6fe57d34..bd51fec3d5c5 100644 --- a/lib/csu/common/crtbegin.c +++ b/lib/csu/common/crtbegin.c @@ -45,10 +45,10 @@ void *__dso_handle = 0; #ifdef HAVE_CTORS static void __do_global_dtors_aux(void) __used; -crt_func __CTOR_LIST__[] __section(".ctors") __hidden = { +static crt_func __CTOR_LIST__[] __section(".ctors") = { (crt_func)-1 }; -crt_func __DTOR_LIST__[] __section(".dtors") __hidden = { +static crt_func __DTOR_LIST__[] __section(".dtors") = { (crt_func)-1 }; @@ -81,7 +81,7 @@ asm ( extern void _Jv_RegisterClasses(void *) __weak_symbol; static void register_classes(void) __used; -crt_func __JCR_LIST__[] __section(".jcr") __used __hidden = { }; +static crt_func __JCR_LIST__[] __section(".jcr") __used = { }; #ifndef CTORS_CONSTRUCTORS __attribute__((constructor)) diff --git a/lib/csu/common/crtend.c b/lib/csu/common/crtend.c index 15eccb98e6cf..f37cf4e16c0d 100644 --- a/lib/csu/common/crtend.c +++ b/lib/csu/common/crtend.c @@ -35,10 +35,10 @@ typedef void (*crt_func)(void); */ static void __do_global_ctors_aux(void) __used; -crt_func __CTOR_END__[] __section(".ctors") __used __hidden = { +static crt_func __CTOR_END__[] __section(".ctors") __used = { (crt_func)0 }; -crt_func __DTOR_END__[] __section(".dtors") __used __hidden = { +static crt_func __DTOR_END__[] __section(".dtors") __used = { (crt_func)0 };