summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2018-09-05 12:43:34 -0400
committerRich Felker <dalias@aerifal.cx>2018-09-05 14:05:14 -0400
commit9b95fd0944e4206949e90633c3fed088202810ec (patch)
tree4af9c66139abfef78854aca3200f836153727c23 /arch
parent2de29bc994029b903a366b8a4a9f8c3c3ee2be90 (diff)
downloadmusl-9b95fd0944e4206949e90633c3fed088202810ec.tar.gz
define and use internal macros for hidden visibility, weak refs
this cleans up what had become widespread direct inline use of "GNU C" style attributes directly in the source, and lowers the barrier to increased use of hidden visibility, which will be useful to recovering some of the efficiency lost when the protected visibility hack was dropped in commit dc2f368e565c37728b0d620380b849c3a1ddd78f, especially on archs where the PLT ABI is costly.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/atomic_arch.h5
-rw-r--r--arch/arm/pthread_arch.h2
-rw-r--r--arch/mips/syscall_arch.h3
-rw-r--r--arch/mipsn32/syscall_arch.h3
-rw-r--r--arch/sh/atomic_arch.h4
5 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/atomic_arch.h b/arch/arm/atomic_arch.h
index 62458b45..e427836a 100644
--- a/arch/arm/atomic_arch.h
+++ b/arch/arm/atomic_arch.h
@@ -1,11 +1,12 @@
+#include "libc.h"
+
#if __ARM_ARCH_4__ || __ARM_ARCH_4T__ || __ARM_ARCH == 4
#define BLX "mov lr,pc\n\tbx"
#else
#define BLX "blx"
#endif
-extern uintptr_t __attribute__((__visibility__("hidden")))
- __a_cas_ptr, __a_barrier_ptr;
+extern hidden uintptr_t __a_cas_ptr, __a_barrier_ptr;
#if ((__ARM_ARCH_6__ || __ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
|| __ARM_ARCH_6T2__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h
index 8f2ae8f8..5c6aff28 100644
--- a/arch/arm/pthread_arch.h
+++ b/arch/arm/pthread_arch.h
@@ -18,7 +18,7 @@ static inline pthread_t __pthread_self()
static inline pthread_t __pthread_self()
{
- extern uintptr_t __attribute__((__visibility__("hidden"))) __a_gettp_ptr;
+ extern hidden uintptr_t __a_gettp_ptr;
register uintptr_t p __asm__("r0");
__asm__ __volatile__ ( BLX " %1" : "=r"(p) : "r"(__a_gettp_ptr) : "cc", "lr" );
return (void *)(p-sizeof(struct pthread));
diff --git a/arch/mips/syscall_arch.h b/arch/mips/syscall_arch.h
index 666f413f..01de67b8 100644
--- a/arch/mips/syscall_arch.h
+++ b/arch/mips/syscall_arch.h
@@ -3,8 +3,7 @@
((union { long long ll; long l[2]; }){ .ll = x }).l[1]
#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
-__attribute__((visibility("hidden")))
-long (__syscall)(long, ...);
+hidden long (__syscall)(long, ...);
#define SYSCALL_RLIM_INFINITY (-1UL/2)
diff --git a/arch/mipsn32/syscall_arch.h b/arch/mipsn32/syscall_arch.h
index 93a026f6..f6a1fbae 100644
--- a/arch/mipsn32/syscall_arch.h
+++ b/arch/mipsn32/syscall_arch.h
@@ -1,8 +1,7 @@
#define __SYSCALL_LL_E(x) (x)
#define __SYSCALL_LL_O(x) (x)
-__attribute__((visibility("hidden")))
-long (__syscall)(long, ...);
+hidden long (__syscall)(long, ...);
#define SYSCALL_RLIM_INFINITY (-1UL/2)
diff --git a/arch/sh/atomic_arch.h b/arch/sh/atomic_arch.h
index d48a7651..0a4d0c11 100644
--- a/arch/sh/atomic_arch.h
+++ b/arch/sh/atomic_arch.h
@@ -1,3 +1,5 @@
+#include "libc.h"
+
#if defined(__SH4A__)
#define a_ll a_ll
@@ -30,7 +32,7 @@ static inline void a_barrier()
#else
#define a_cas a_cas
-__attribute__((__visibility__("hidden"))) extern const void *__sh_cas_ptr;
+extern hidden const void *__sh_cas_ptr;
static inline int a_cas(volatile int *p, int t, int s)
{
register int r1 __asm__("r1");