From e5a56da89a23f2fbf95f32b980a18919168c3821 Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Fri, 25 Aug 2017 14:02:26 +0200 Subject: [PATCH] - fix mkimage build on older distris that still use gcc5 --- archive-patches/u-boot-support-gcc5.patch | 90 +++++++++++++++++++++++ make/bootstrap.mk | 1 + 2 files changed, 91 insertions(+) create mode 100644 archive-patches/u-boot-support-gcc5.patch diff --git a/archive-patches/u-boot-support-gcc5.patch b/archive-patches/u-boot-support-gcc5.patch new file mode 100644 index 00000000..c269df06 --- /dev/null +++ b/archive-patches/u-boot-support-gcc5.patch @@ -0,0 +1,90 @@ +From 3afcde1104f3fa9102911467929d5752eff484aa Mon Sep 17 00:00:00 2001 +From: Chunrong Guo +Date: Thu, 29 Oct 2015 03:18:58 -0500 +Subject: [PATCH] uboot : support gcc5 + + +Fixed the following build errors with gcc5: + |error: linux/compiler-gcc5.h: No such file or directory + +Upstream-Status: Pending + +--- + include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 65 insertions(+) + create mode 100644 include/linux/compiler-gcc5.h + +diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h +new file mode 100644 +index 0000000..c8c5659 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -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 */ +-- +2.3.3 + diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 50dbb82c..2e3e5364 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -141,6 +141,7 @@ $(HOSTPREFIX)/bin/mkimage: $(ARCHIVE)/u-boot-2015.01.tar.bz2 | $(HOSTPREFIX)/bin $(UNTAR)/u-boot-2015.01.tar.bz2 pushd $(BUILD_TMP)/u-boot-2015.01 && \ $(PATCH)/u-boot-fix-build-error-under-gcc6.patch && \ + $(PATCH)/u-boot-support-gcc5.patch && \ $(PATCH)/u-boot-rsa-Fix-build-with-OpenSSL-1.1.x.patch && \ $(MAKE) defconfig && \ $(MAKE) silentoldconfig && \