mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-11 13:56:30 +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>
91 lines
2.2 KiB
C
91 lines
2.2 KiB
C
/*
|
|
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
|
|
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef _M68K_BYTEORDER_H
|
|
#define _M68K_BYTEORDER_H
|
|
|
|
#include <asm/types.h>
|
|
|
|
#ifdef __GNUC__
|
|
#define __sw16(x) \
|
|
((__u16)( \
|
|
(((__u16)(x) & (__u16)0x00ffU) << 8) | \
|
|
(((__u16)(x) & (__u16)0xff00U) >> 8) ))
|
|
#define __sw32(x) \
|
|
((__u32)( \
|
|
(((__u32)(x)) << 24) | \
|
|
(((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \
|
|
(((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \
|
|
(((__u32)(x)) >> 24) ))
|
|
|
|
static __inline__ unsigned ld_le16(const volatile unsigned short *addr)
|
|
{
|
|
unsigned result = *addr;
|
|
return __sw16(result);
|
|
}
|
|
|
|
static __inline__ void st_le16(volatile unsigned short *addr,
|
|
const unsigned val)
|
|
{
|
|
*addr = __sw16(val);
|
|
}
|
|
|
|
static __inline__ unsigned ld_le32(const volatile unsigned *addr)
|
|
{
|
|
unsigned result = *addr;
|
|
return __sw32(result);
|
|
}
|
|
|
|
static __inline__ void st_le32(volatile unsigned *addr, const unsigned val)
|
|
{
|
|
*addr = __sw32(val);
|
|
}
|
|
|
|
#if 0
|
|
/* alas, egcs sounds like it has a bug in this code that doesn't use the
|
|
inline asm correctly, and can cause file corruption. Until I hear that
|
|
it's fixed, I can live without the extra speed. I hope. */
|
|
#if !(__GNUC__ >= 2 && __GNUC_MINOR__ >= 90)
|
|
#if 0
|
|
# define __arch_swab16(x) ld_le16(&x)
|
|
# define __arch_swab32(x) ld_le32(&x)
|
|
#else
|
|
static __inline__ __attribute__ ((const))
|
|
__u16 ___arch__swab16(__u16 value)
|
|
{
|
|
return __sw16(value);
|
|
}
|
|
|
|
static __inline__ __attribute__ ((const))
|
|
__u32 ___arch__swab32(__u32 value)
|
|
{
|
|
return __sw32(value);
|
|
}
|
|
|
|
#define __arch__swab32(x) ___arch__swab32(x)
|
|
#define __arch__swab16(x) ___arch__swab16(x)
|
|
#endif /* 0 */
|
|
|
|
#endif
|
|
|
|
/* The same, but returns converted value from the location pointer by addr. */
|
|
#define __arch__swab16p(addr) ld_le16(addr)
|
|
#define __arch__swab32p(addr) ld_le32(addr)
|
|
|
|
/* The same, but do the conversion in situ, ie. put the value back to addr. */
|
|
#define __arch__swab16s(addr) st_le16(addr,*addr)
|
|
#define __arch__swab32s(addr) st_le32(addr,*addr)
|
|
#endif
|
|
|
|
#endif /* __GNUC__ */
|
|
|
|
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|
#define __BYTEORDER_HAS_U64__
|
|
#endif
|
|
#include <linux/byteorder/big_endian.h>
|
|
|
|
#endif /* _M68K_BYTEORDER_H */
|