Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 16 Aug 2015 10:35:47 -0700 |
| 4 | Subject: [PATCH] use static inlines as the external inline definition has |
| 5 | changed with gcc5 |
| 6 | |
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 8 | --- |
| 9 | Upstream-Status: Pending |
| 10 | |
| 11 | src/miniacc.h | 24 ++++++++---------------- |
| 12 | 1 file changed, 8 insertions(+), 16 deletions(-) |
| 13 | |
| 14 | diff --git a/src/miniacc.h b/src/miniacc.h |
| 15 | index 09e6f0c..cae98d1 100644 |
| 16 | --- a/src/miniacc.h |
| 17 | +++ b/src/miniacc.h |
| 18 | @@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); |
| 19 | #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) |
| 20 | #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) |
| 21 | #if !defined(ACC_UA_GET_LE16) |
| 22 | -extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); |
| 23 | -extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { |
| 24 | +static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { |
| 25 | __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; |
| 26 | unsigned long v; |
| 27 | __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); |
| 28 | @@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const |
| 29 | #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) |
| 30 | #endif |
| 31 | #if !defined(ACC_UA_SET_LE16) |
| 32 | -extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); |
| 33 | -extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { |
| 34 | +static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { |
| 35 | __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; |
| 36 | __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); |
| 37 | } |
| 38 | @@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi |
| 39 | #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) |
| 40 | #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) |
| 41 | #if !defined(ACC_UA_GET_LE32) |
| 42 | -extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); |
| 43 | -extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { |
| 44 | +static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { |
| 45 | __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; |
| 46 | unsigned long v; |
| 47 | __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); |
| 48 | @@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const |
| 49 | #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) |
| 50 | #endif |
| 51 | #if !defined(ACC_UA_SET_LE32) |
| 52 | -extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); |
| 53 | -extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { |
| 54 | +static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { |
| 55 | __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; |
| 56 | __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); |
| 57 | } |
| 58 | @@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); |
| 59 | #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) |
| 60 | #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) |
| 61 | #if !defined(ACC_UA_GET_LE16) |
| 62 | -extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); |
| 63 | -extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { |
| 64 | +static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { |
| 65 | __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; |
| 66 | unsigned long v; |
| 67 | __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); |
| 68 | @@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const |
| 69 | #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) |
| 70 | #endif |
| 71 | #if !defined(ACC_UA_SET_LE16) |
| 72 | -extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); |
| 73 | -extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { |
| 74 | +static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { |
| 75 | __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; |
| 76 | __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); |
| 77 | } |
| 78 | @@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi |
| 79 | #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) |
| 80 | #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) |
| 81 | #if !defined(ACC_UA_GET_LE32) |
| 82 | -extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); |
| 83 | -extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { |
| 84 | +static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { |
| 85 | __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; |
| 86 | unsigned long v; |
| 87 | __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); |
| 88 | @@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const |
| 89 | #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) |
| 90 | #endif |
| 91 | #if !defined(ACC_UA_SET_LE32) |
| 92 | -extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); |
| 93 | -extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { |
| 94 | +static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { |
| 95 | __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; |
| 96 | __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); |
| 97 | } |
| 98 | -- |
| 99 | 2.5.0 |
| 100 | |