mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-06 05:04:26 +00:00
44d0677a90
A number of headers define functions as "extern inline" which is causing problems with gcc5. The reason is that starting with version 5.1, gcc defaults to the standard C99 semantics for the inline keyword. Under the traditional GNU inline semantics, an "extern inline" function would never create an external definition, the same as inline *without* extern in C99. In C99, and "extern inline" definition is simply an external definition with an inline hint. In short, the meanings of inline with and without extern are swapped between GNU and C99. The upshot is that all these definitions in header files create an external definition wherever those headers are included, resulting in multiple definition errors at link time. Changing all these functions to "static inline" fixes the problem since this works as desired in all gcc versions. Although the semantics are slightly different (a static inline definition may result in an actual function being emitted), it works as intended in practice. This patch also removes extern prototype declarations for the changed functions where they existed. Signed-off-by: Mans Rullgard <mans@mansr.com>
93 lines
1.8 KiB
C
93 lines
1.8 KiB
C
/*
|
|
* PowerPC atomic operations
|
|
*/
|
|
|
|
#ifndef _ASM_PPC_ATOMIC_H_
|
|
#define _ASM_PPC_ATOMIC_H_
|
|
|
|
#ifdef CONFIG_SMP
|
|
typedef struct { volatile int counter; } atomic_t;
|
|
#else
|
|
typedef struct { int counter; } atomic_t;
|
|
#endif
|
|
|
|
#define ATOMIC_INIT(i) { (i) }
|
|
|
|
#define atomic_read(v) ((v)->counter)
|
|
#define atomic_set(v,i) (((v)->counter) = (i))
|
|
|
|
extern void atomic_clear_mask(unsigned long mask, unsigned long *addr);
|
|
extern void atomic_set_mask(unsigned long mask, unsigned long *addr);
|
|
|
|
static __inline__ int atomic_add_return(int a, atomic_t *v)
|
|
{
|
|
int t;
|
|
|
|
__asm__ __volatile__("\n\
|
|
1: lwarx %0,0,%3\n\
|
|
add %0,%2,%0\n\
|
|
stwcx. %0,0,%3\n\
|
|
bne- 1b"
|
|
: "=&r" (t), "=m" (*v)
|
|
: "r" (a), "r" (v), "m" (*v)
|
|
: "cc");
|
|
|
|
return t;
|
|
}
|
|
|
|
static __inline__ int atomic_sub_return(int a, atomic_t *v)
|
|
{
|
|
int t;
|
|
|
|
__asm__ __volatile__("\n\
|
|
1: lwarx %0,0,%3\n\
|
|
subf %0,%2,%0\n\
|
|
stwcx. %0,0,%3\n\
|
|
bne- 1b"
|
|
: "=&r" (t), "=m" (*v)
|
|
: "r" (a), "r" (v), "m" (*v)
|
|
: "cc");
|
|
|
|
return t;
|
|
}
|
|
|
|
static __inline__ int atomic_inc_return(atomic_t *v)
|
|
{
|
|
int t;
|
|
|
|
__asm__ __volatile__("\n\
|
|
1: lwarx %0,0,%2\n\
|
|
addic %0,%0,1\n\
|
|
stwcx. %0,0,%2\n\
|
|
bne- 1b"
|
|
: "=&r" (t), "=m" (*v)
|
|
: "r" (v), "m" (*v)
|
|
: "cc");
|
|
|
|
return t;
|
|
}
|
|
|
|
static __inline__ int atomic_dec_return(atomic_t *v)
|
|
{
|
|
int t;
|
|
|
|
__asm__ __volatile__("\n\
|
|
1: lwarx %0,0,%2\n\
|
|
addic %0,%0,-1\n\
|
|
stwcx. %0,0,%2\n\
|
|
bne 1b"
|
|
: "=&r" (t), "=m" (*v)
|
|
: "r" (v), "m" (*v)
|
|
: "cc");
|
|
|
|
return t;
|
|
}
|
|
|
|
#define atomic_add(a, v) ((void) atomic_add_return((a), (v)))
|
|
#define atomic_sub(a, v) ((void) atomic_sub_return((a), (v)))
|
|
#define atomic_sub_and_test(a, v) (atomic_sub_return((a), (v)) == 0)
|
|
#define atomic_inc(v) ((void) atomic_inc_return((v)))
|
|
#define atomic_dec(v) ((void) atomic_dec_return((v)))
|
|
#define atomic_dec_and_test(v) (atomic_dec_return((v)) == 0)
|
|
|
|
#endif /* _ASM_PPC_ATOMIC_H_ */
|