|
|
a08542 |
From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001
|
|
|
a08542 |
From: Khem Raj <raj.khem@gmail.com>
|
|
|
a08542 |
Date: Sun, 16 Aug 2015 10:35:47 -0700
|
|
|
a08542 |
Subject: [PATCH] use static inlines as the external inline definition has
|
|
|
a08542 |
changed with gcc5
|
|
|
a08542 |
|
|
|
a08542 |
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
a08542 |
---
|
|
|
a08542 |
Upstream-Status: Pending
|
|
|
a08542 |
|
|
|
a08542 |
src/miniacc.h | 24 ++++++++----------------
|
|
|
a08542 |
1 file changed, 8 insertions(+), 16 deletions(-)
|
|
|
a08542 |
|
|
|
a08542 |
diff --git a/src/miniacc.h b/src/miniacc.h
|
|
|
a08542 |
index 09e6f0c..cae98d1 100644
|
|
|
a08542 |
--- a/src/miniacc.h
|
|
|
a08542 |
+++ b/src/miniacc.h
|
|
|
a08542 |
@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
|
|
|
a08542 |
#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
|
|
|
a08542 |
#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
|
|
|
a08542 |
#if !defined(ACC_UA_GET_LE16)
|
|
|
a08542 |
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
|
|
|
a08542 |
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
|
|
|
a08542 |
+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
|
|
|
a08542 |
__acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
|
|
|
a08542 |
unsigned long v;
|
|
|
a08542 |
__asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
|
|
|
a08542 |
@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const
|
|
|
a08542 |
#define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p)
|
|
|
a08542 |
#endif
|
|
|
a08542 |
#if !defined(ACC_UA_SET_LE16)
|
|
|
a08542 |
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
|
|
|
a08542 |
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
|
|
|
a08542 |
+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
|
|
|
a08542 |
__acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
|
|
|
a08542 |
__asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
|
|
|
a08542 |
}
|
|
|
a08542 |
@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
|
|
|
a08542 |
#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
|
|
|
a08542 |
#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
|
|
|
a08542 |
#if !defined(ACC_UA_GET_LE32)
|
|
|
a08542 |
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
|
|
|
a08542 |
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
|
|
|
a08542 |
+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
|
|
|
a08542 |
__acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
|
|
|
a08542 |
unsigned long v;
|
|
|
a08542 |
__asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
|
|
|
a08542 |
@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const
|
|
|
a08542 |
#define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p)
|
|
|
a08542 |
#endif
|
|
|
a08542 |
#if !defined(ACC_UA_SET_LE32)
|
|
|
a08542 |
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
|
|
|
a08542 |
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
|
|
|
a08542 |
+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
|
|
|
a08542 |
__acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
|
|
|
a08542 |
__asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
|
|
|
a08542 |
}
|
|
|
a08542 |
@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
|
|
|
a08542 |
#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
|
|
|
a08542 |
#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
|
|
|
a08542 |
#if !defined(ACC_UA_GET_LE16)
|
|
|
a08542 |
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
|
|
|
a08542 |
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
|
|
|
a08542 |
+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
|
|
|
a08542 |
__acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
|
|
|
a08542 |
unsigned long v;
|
|
|
a08542 |
__asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
|
|
|
a08542 |
@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const
|
|
|
a08542 |
#define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p)
|
|
|
a08542 |
#endif
|
|
|
a08542 |
#if !defined(ACC_UA_SET_LE16)
|
|
|
a08542 |
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
|
|
|
a08542 |
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
|
|
|
a08542 |
+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
|
|
|
a08542 |
__acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
|
|
|
a08542 |
__asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
|
|
|
a08542 |
}
|
|
|
a08542 |
@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
|
|
|
a08542 |
#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
|
|
|
a08542 |
#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
|
|
|
a08542 |
#if !defined(ACC_UA_GET_LE32)
|
|
|
a08542 |
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
|
|
|
a08542 |
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
|
|
|
a08542 |
+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
|
|
|
a08542 |
__acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
|
|
|
a08542 |
unsigned long v;
|
|
|
a08542 |
__asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
|
|
|
a08542 |
@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const
|
|
|
a08542 |
#define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p)
|
|
|
a08542 |
#endif
|
|
|
a08542 |
#if !defined(ACC_UA_SET_LE32)
|
|
|
a08542 |
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
|
|
|
a08542 |
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
|
|
|
a08542 |
+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
|
|
|
a08542 |
__acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
|
|
|
a08542 |
__asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
|
|
|
a08542 |
}
|
|
|
a08542 |
--
|
|
|
a08542 |
2.5.0
|
|
|
a08542 |
|