[tip:perf/core] tools: Make "__always_inline" just "inline" on Android

From: tip-bot for Arnaldo Carvalho de Melo
Date: Sat Jul 16 2016 - 16:44:16 EST


Commit-ID: 8c98abff43616a2a9c208189f86d32cefafbe708
Gitweb: http://git.kernel.org/tip/8c98abff43616a2a9c208189f86d32cefafbe708
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
AuthorDate: Thu, 14 Jul 2016 12:03:04 -0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Thu, 14 Jul 2016 12:03:04 -0300

tools: Make "__always_inline" just "inline" on Android

As the gcc there is producing tons of:

"warning: always_inline function might not be inlinable"

At least on android-ndk-r12/platforms/android-24/arch-arm, so, for the
time being, use this big hammer.

Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: Chris Phlipot <cphlipot0@xxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-97l3eg3fnk5shmo4rsyyvj2t@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/include/linux/compiler.h | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
index fa7208a..e33fc1d 100644
--- a/tools/include/linux/compiler.h
+++ b/tools/include/linux/compiler.h
@@ -9,6 +9,17 @@
# define __always_inline inline __attribute__((always_inline))
#endif

+#ifdef __ANDROID__
+/*
+ * FIXME: Big hammer to get rid of tons of:
+ * "warning: always_inline function might not be inlinable"
+ *
+ * At least on android-ndk-r12/platforms/android-24/arch-arm
+ */
+#undef __always_inline
+#define __always_inline inline
+#endif
+
#define __user

#ifndef __attribute_const__