]> git.sur5r.net Git - u-boot/commit
Replace "extern inline" with "static inline"
authorMåns Rullgård <mans@mansr.com>
Fri, 6 Nov 2015 12:44:01 +0000 (12:44 +0000)
committerTom Rini <trini@konsulko.com>
Mon, 9 Nov 2015 23:19:40 +0000 (18:19 -0500)
commit44d0677a90f82eb2b01dd5150ca8e0115453d7d3
tree8969401f9071502bcae5a86323aacaf79ce1217e
parente490ad25eb3dc4f075ed33b4b00b1f97071fcf3d
Replace "extern inline" with "static inline"

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>
14 files changed:
arch/blackfin/include/asm/delay.h
arch/m68k/include/asm/bitops.h
arch/m68k/include/asm/byteorder.h
arch/m68k/include/asm/io.h
arch/powerpc/include/asm/atomic.h
arch/powerpc/include/asm/bitops.h
arch/powerpc/include/asm/byteorder.h
arch/powerpc/include/asm/io.h
arch/powerpc/include/asm/iopin_8260.h
arch/powerpc/include/asm/iopin_8xx.h
arch/sparc/include/asm/irq.h
arch/sparc/include/asm/psr.h
arch/sparc/include/asm/srmmu.h
include/mpc8260.h