64035ac463
Prepare for better device categorization by moving everything to testing subdir first. [skip-ci]: chicken-egg problem: passing pmaports CI depends on pmbootstrap MR depends on this MR Related: postmarketos#16
114 lines
4.1 KiB
Diff
114 lines
4.1 KiB
Diff
From e824d45043efd49607f66c89c921b07c1523bf9e Mon Sep 17 00:00:00 2001
|
|
From: Marco Franceschetti <vonfritz1@gmail.com>
|
|
Date: Sun, 13 Mar 2016 09:44:54 +0100
|
|
Subject: [PATCH] Fix compile errors with gcc5
|
|
|
|
---
|
|
arch/arm/include/asm/ftrace.h | 2 +-
|
|
arch/arm/kernel/return_address.c | 5 --
|
|
include/linux/compiler-gcc5.h | 66 ++++++++++++++++++++++
|
|
7 files changed, 79 insertions(+), 18 deletions(-)
|
|
create mode 100644 include/linux/compiler-gcc5.h
|
|
|
|
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
|
|
index f89515adac6..2bb8cac28b9 100644
|
|
--- a/arch/arm/include/asm/ftrace.h
|
|
+++ b/arch/arm/include/asm/ftrace.h
|
|
@@ -45,7 +45,7 @@ void *return_address(unsigned int);
|
|
|
|
#else
|
|
|
|
-extern inline void *return_address(unsigned int level)
|
|
+static inline void *return_address(unsigned int level)
|
|
{
|
|
return NULL;
|
|
}
|
|
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
|
|
index 2f8f523cece..a3b587ffc14 100755
|
|
--- a/arch/arm/kernel/return_address.c
|
|
+++ b/arch/arm/kernel/return_address.c
|
|
@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
|
|
//#warning "TODO: return_address should use unwind tables"
|
|
//#endif
|
|
|
|
-void *return_address(unsigned int level)
|
|
-{
|
|
- return NULL;
|
|
-}
|
|
-
|
|
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
|
|
|
|
EXPORT_SYMBOL_GPL(return_address);
|
|
|
|
diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
|
|
new file mode 100644
|
|
index 00000000000..cdd1cc202d5
|
|
--- /dev/null
|
|
+++ b/include/linux/compiler-gcc5.h
|
|
@@ -0,0 +1,66 @@
|
|
+#ifndef __LINUX_COMPILER_H
|
|
+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
|
|
+#endif
|
|
+
|
|
+#define __used __attribute__((__used__))
|
|
+#define __must_check __attribute__((warn_unused_result))
|
|
+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
|
|
+
|
|
+/* Mark functions as cold. gcc will assume any path leading to a call
|
|
+ to them will be unlikely. This means a lot of manual unlikely()s
|
|
+ are unnecessary now for any paths leading to the usual suspects
|
|
+ like BUG(), printk(), panic() etc. [but let's keep them for now for
|
|
+ older compilers]
|
|
+
|
|
+ Early snapshots of gcc 4.3 don't support this and we can't detect this
|
|
+ in the preprocessor, but we can live with this because they're unreleased.
|
|
+ Maketime probing would be overkill here.
|
|
+
|
|
+ gcc also has a __attribute__((__hot__)) to move hot functions into
|
|
+ a special section, but I don't see any sense in this right now in
|
|
+ the kernel context */
|
|
+#define __cold __attribute__((__cold__))
|
|
+
|
|
+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
|
|
+
|
|
+#ifndef __CHECKER__
|
|
+# define __compiletime_warning(message) __attribute__((warning(message)))
|
|
+# define __compiletime_error(message) __attribute__((error(message)))
|
|
+#endif /* __CHECKER__ */
|
|
+
|
|
+/*
|
|
+ * Mark a position in code as unreachable. This can be used to
|
|
+ * suppress control flow warnings after asm blocks that transfer
|
|
+ * control elsewhere.
|
|
+ *
|
|
+ * Early snapshots of gcc 4.5 don't support this and we can't detect
|
|
+ * this in the preprocessor, but we can live with this because they're
|
|
+ * unreleased. Really, we need to have autoconf for the kernel.
|
|
+ */
|
|
+#define unreachable() __builtin_unreachable()
|
|
+
|
|
+/* Mark a function definition as prohibited from being cloned. */
|
|
+#define __noclone __attribute__((__noclone__))
|
|
+
|
|
+/*
|
|
+ * Tell the optimizer that something else uses this function or variable.
|
|
+ */
|
|
+#define __visible __attribute__((externally_visible))
|
|
+
|
|
+/*
|
|
+ * GCC 'asm goto' miscompiles certain code sequences:
|
|
+ *
|
|
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
|
|
+ *
|
|
+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
|
|
+ * Fixed in GCC 4.8.2 and later versions.
|
|
+ *
|
|
+ * (asm goto is automatically volatile - the naming reflects this.)
|
|
+ */
|
|
+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
|
|
+
|
|
+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
|
|
+#define __HAVE_BUILTIN_BSWAP32__
|
|
+#define __HAVE_BUILTIN_BSWAP64__
|
|
+#define __HAVE_BUILTIN_BSWAP16__
|
|
+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
|