mirror of https://gitee.com/openkylin/qemu.git
build: Don't redefine 'inline'
Actively redefining 'inline' is wrong for C++, where gcc has an
extension 'inline namespace' which fails to compile if the
keyword 'inline' is replaced by a macro expansion. This will
matter once we start to include "qemu/osdep.h" first from C++
files, depending also on whether the system headers are new
enough to be using the gcc extension.
But rather than just guard things by __cplusplus, let's look at
the overall picture. Commit df2542c737
in 2007 defined 'inline'
to the gcc attribute __always_inline__, with the rationale "To
avoid discarded inlining bug". But compilers have improved since
then, and we are probably better off trusting the compiler rather
than trying to force its hand.
So just nuke our craziness.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1455043788-28112-1-git-send-email-eblake@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
80b5d6bfc1
commit
888ea96aae
|
@ -77,18 +77,6 @@
|
|||
#define typeof_field(type, field) typeof(((type *)0)->field)
|
||||
#define type_check(t1,t2) ((t1*)0 - (t2*)0)
|
||||
|
||||
#ifndef always_inline
|
||||
#if !((__GNUC__ < 3) || defined(__APPLE__))
|
||||
#ifdef __OPTIMIZE__
|
||||
#undef inline
|
||||
#define inline __attribute__ (( always_inline )) __inline__
|
||||
#endif
|
||||
#endif
|
||||
#else
|
||||
#undef inline
|
||||
#define inline always_inline
|
||||
#endif
|
||||
|
||||
#define QEMU_BUILD_BUG_ON(x) \
|
||||
typedef char glue(qemu_build_bug_on__,__LINE__)[(x)?-1:1] __attribute__((unused));
|
||||
|
||||
|
|
Loading…
Reference in New Issue