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