about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-04-22 02:53:41 -0400
committerRich Felker <dalias@aerifal.cx>2015-04-22 02:53:41 -0400
commitf203b3511f4715695ee932049944c4922d5d3025 (patch)
treec2779c9c15d352326f996648d87f79bf4fb9f1c3
parent3e827b7e68eda9813055a544d240c20d025c77c9 (diff)
downloadmusl-f203b3511f4715695ee932049944c4922d5d3025.tar.gz
musl-f203b3511f4715695ee932049944c4922d5d3025.tar.xz
musl-f203b3511f4715695ee932049944c4922d5d3025.zip
fix inconsistent visibility for __hwcap and __sysinfo symbols
these are used as hidden by asm files (and such use is the whole
reason they exist), but their actual definitions were not hidden.
-rw-r--r--src/env/__libc_start_main.c3
-rw-r--r--src/internal/libc.h5
2 files changed, 3 insertions, 5 deletions
diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c
index 10e55909..f6f3b14a 100644
--- a/src/env/__libc_start_main.c
+++ b/src/env/__libc_start_main.c
@@ -20,9 +20,6 @@ weak_alias(dummy1, __init_ssp);
 
 #define AUX_CNT 38
 
-extern size_t __hwcap, __sysinfo;
-extern char *__progname, *__progname_full;
-
 #ifndef SHARED
 static
 #endif
diff --git a/src/internal/libc.h b/src/internal/libc.h
index 00d1b41a..51ee1860 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -28,8 +28,6 @@ struct __libc {
 	struct __locale_struct global_locale;
 };
 
-extern size_t __hwcap;
-
 #ifndef PAGE_SIZE
 #define PAGE_SIZE libc.page_size
 #endif
@@ -43,6 +41,9 @@ extern size_t __hwcap;
 extern struct __libc __libc ATTR_LIBC_VISIBILITY;
 #define libc __libc
 
+extern size_t __hwcap ATTR_LIBC_VISIBILITY;
+extern size_t __sysinfo ATTR_LIBC_VISIBILITY;
+extern char *__progname, *__progname_full;
 
 /* Designed to avoid any overhead in non-threaded processes */
 void __lock(volatile int *) ATTR_LIBC_VISIBILITY;