mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-12 16:07: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>
39 lines
955 B
C
39 lines
955 B
C
/*
|
|
* U-boot - delay.h Routines for introducing delays
|
|
*
|
|
* Copyright (c) 2005-2007 Analog Devices Inc.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef _BLACKFIN_DELAY_H
|
|
#define _BLACKFIN_DELAY_H
|
|
|
|
/*
|
|
* Changes made by akbar.hussain@Lineo.com, for BLACKFIN
|
|
* Copyright (C) 1994 Hamish Macdonald
|
|
*
|
|
* Delay routines, using a pre-computed "loops_per_second" value.
|
|
*/
|
|
|
|
static __inline__ void __delay(unsigned long loops)
|
|
{
|
|
__asm__ __volatile__("1:\t%0 += -1;\n\t"
|
|
"cc = %0 == 0;\n\t"
|
|
"if ! cc jump 1b;\n":"=d"(loops)
|
|
:"0"(loops));
|
|
}
|
|
|
|
/*
|
|
* Use only for very small delays ( < 1 msec). Should probably use a
|
|
* lookup table, really, as the multiplications take much too long with
|
|
* short delays. This is a "reasonable" implementation, though (and the
|
|
* first constant multiplications gets optimized away if the delay is
|
|
* a constant)
|
|
*/
|
|
static __inline__ void __udelay(unsigned long usecs)
|
|
{
|
|
__delay(usecs);
|
|
}
|
|
|
|
#endif
|