From 41e1179afb9e314ff0905f90cbededc1d1fd8422 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Sun, 9 Apr 2017 20:01:24 -0400 Subject: [PATCH] u-boot-sunxi: gcc6 fix Fix the following build error when compiling u-boot-sunxi with gcc6: linux/compiler-gcc6.h: No such file or directory Signed-off-by: Trevor Woerner --- recipes-bsp/u-boot/u-boot-sunxi.bb | 1 + .../u-boot/u-boot-sunxi/0003-gcc6-fixes.patch | 69 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 recipes-bsp/u-boot/u-boot-sunxi/0003-gcc6-fixes.patch diff --git a/recipes-bsp/u-boot/u-boot-sunxi.bb b/recipes-bsp/u-boot/u-boot-sunxi.bb index 2ce5a32..e5e63ec 100644 --- a/recipes-bsp/u-boot/u-boot-sunxi.bb +++ b/recipes-bsp/u-boot/u-boot-sunxi.bb @@ -21,6 +21,7 @@ UBOOT_MACHINE_meleg = "Mele_A1000G_config" SRC_URI = " \ git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \ file://0002-gcc5-fixes.patch \ + file://0003-gcc6-fixes.patch \ " PE = "1" diff --git a/recipes-bsp/u-boot/u-boot-sunxi/0003-gcc6-fixes.patch b/recipes-bsp/u-boot/u-boot-sunxi/0003-gcc6-fixes.patch new file mode 100644 index 0000000..83df96b --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-sunxi/0003-gcc6-fixes.patch @@ -0,0 +1,69 @@ +diff -urN git-ORIG/include/linux/compiler-gcc6.h git/include/linux/compiler-gcc6.h +--- git-ORIG/include/linux/compiler-gcc6.h 1969-12-31 19:00:00.000000000 -0500 ++++ git/include/linux/compiler-gcc6.h 2017-04-09 19:50:16.920945874 -0400 +@@ -0,0 +1,65 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include directly, include 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. ++ * ++ * (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 */