Re: [PATCH 2/2] compiler/gcc6: add support for GCC 6

["Martin Liška" <mliska@suse.cz>]

[-- Attachment #1: Type: text/plain, Size: 2785 bytes --]

On 04/14/2015 11:25 AM, Martin Liška wrote:
> Because GCC trunk version has switched to GCC 6.x, new header file
> is needed.
>
> Signed-off-by: Martin Liska  <mliska@suse.cz>
> ---
>   include/linux/compiler-gcc6.h | 55 +++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 55 insertions(+)
>   create mode 100644 include/linux/compiler-gcc6.h
>
> diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h
> new file mode 100644
> index 0000000..208767a
> --- /dev/null
> +++ b/include/linux/compiler-gcc6.h
> @@ -0,0 +1,55 @@
> +#ifndef __LINUX_COMPILER_H
> +#error "Please don't include <linux/compiler-gcc6.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]
> +
> +   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.
> + */
> +#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))
> +
> +/*
> + * 'asm goto' miscompilation is fixed in GCC 5.x version:
> + *
> + *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
> + */
> +#define asm_volatile_goto(x...)    do { asm goto(x); } 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 */
> +
> +#define KASAN_ABI_VERSION 4

Hello.

v2 of the patch where I made a copy of compiler-gcc6.h from compiler-gcc5.h.

Thanks,
Martin

[-- Attachment #2: 0002-compiler-gcc6-add-support-for-GCC-6.patch --]
[-- Type: text/x-patch, Size: 2827 bytes --]

From 2163ba712ed9e2305d8f3fad704b201d70edd3d8 Mon Sep 17 00:00:00 2001
From: mliska <mliska@suse.cz>
Date: Wed, 15 Apr 2015 10:56:43 +0200
Subject: [PATCH 2/2] compiler/gcc6: add support for GCC 6

Because GCC trunk version has switched to GCC 6.x, new header file is needed.

Signed-off-by: Martin Liska  <mliska@suse.cz>
---
 include/linux/compiler-gcc6.h | 59 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 include/linux/compiler-gcc6.h

diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h
new file mode 100644
index 0000000..ba064fa
--- /dev/null
+++ b/include/linux/compiler-gcc6.h
@@ -0,0 +1,59 @@
+#ifndef __LINUX_COMPILER_H
+#error "Please don't include <linux/compiler-gcc6.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]
+
+   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.
+ */
+#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.
+ *
+ * (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 */
+
+#define KASAN_ABI_VERSION 4
-- 
2.1.4