buildroot
Public
Source
committed dc30db3cf1fxxxxxxxxxx-#error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead."From 21be6b635320321216dde9201fa57a3aed60ee12 Mon Sep 17 00:00:00 2001From: Joe Perches <joe@perches.com>Date: Thu, 25 Jun 2015 15:01:02 -0700Subject: [PATCH] compiler-gcc: integrate the various compiler-gcc[345].h filesAs gcc major version numbers are going to advance rather rapidly in thefuture, there's no real value in separate files for each compilerversion.Deduplicate some of the macros #defined in each file too.Neaten comments using normal kernel commenting style.Signed-off-by: Joe Perches <joe@perches.com>Cc: Andi Kleen <andi@firstfloor.org>Cc: Michal Marek <mmarek@suse.cz>Cc: Segher Boessenkool <segher@kernel.crashing.org>Cc: Sasha Levin <levinsasha928@gmail.com>Cc: Anton Blanchard <anton@samba.org>Cc: Alan Modra <amodra@gmail.com>Signed-off-by: Andrew Morton <akpm@linux-foundation.org>Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>(cherry picked from commit cb984d101b30eb7478d32df56a0023e4603cba7f)Signed-off-by: Peter Korsgaard <peter@korsgaard.com>--- include/linux/compiler-gcc.h | 120 ++++++++++++++++++++++++++++++++++++++++-- include/linux/compiler-gcc3.h | 23 -------- include/linux/compiler-gcc4.h | 88 ------------------------------- include/linux/compiler-gcc5.h | 66 ----------------------- 4 files changed, 116 insertions(+), 181 deletions(-) delete mode 100644 include/linux/compiler-gcc3.h delete mode 100644 include/linux/compiler-gcc4.h delete mode 100644 include/linux/compiler-gcc5.hdiff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.hindex 24545cd90a25..0c5d746850c2 100644--- a/include/linux/compiler-gcc.h+++ b/include/linux/compiler-gcc.h@@ -97,10 +97,122 @@ #define __maybe_unused __attribute__((unused)) #define __always_unused __attribute__((unused))-#define __gcc_header(x) #x-#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)-#define gcc_header(x) _gcc_header(x)-#include gcc_header(__GNUC__)+/* gcc version specific checks */++#if GCC_VERSION < 30200+# error Sorry, your compiler is too old - please upgrade it.+#endif++#if GCC_VERSION < 30300+# define __used __attribute__((__unused__))+#else+# define __used __attribute__((__used__))+#endif++#ifdef CONFIG_GCOV_KERNEL+# if GCC_VERSION < 30400+# error "GCOV profiling support for gcc versions below 3.4 not included"+# endif /* __GNUC_MINOR__ */+#endif /* CONFIG_GCOV_KERNEL */++#if GCC_VERSION >= 30400+#define __must_check __attribute__((warn_unused_result))+#endif++#if GCC_VERSION >= 40000++/* GCC 4.1.[01] miscompiles __weak */+#ifdef __KERNEL__+# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101+# error Your version of gcc miscompiles the __weak directive+# endif+#endif++#define __used __attribute__((__used__))+#define __compiler_offsetof(a, b) \+ __builtin_offsetof(a, b)++#if GCC_VERSION >= 40100 && GCC_VERSION < 40600+# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)+#endif++#if GCC_VERSION >= 40300+/* 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]+ *