[meta-fsl-arm][PATCH] u-boot-ls: support gcc5

* [meta-fsl-arm][PATCH] u-boot-ls: support gcc5
@ 2015-10-29  9:21 b40290
  2015-10-29 10:50 ` Otavio Salvador
  0 siblings, 1 reply; 3+ messages in thread
From: b40290 @ 2015-10-29  9:21 UTC (permalink / raw)
  To: meta-freescale

From: Chunrong Guo <B40290@freescale.com>

 Fixed the following build errors with gcc5:
 |error: linux/compiler-gcc5.h: No such file or directory

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 .../u-boot-ls1/0001-uboot-support-gcc5.patch       | 90 ++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-ls1_2015.01.bb           |  1 +
 2 files changed, 91 insertions(+)
 create mode 100644 recipes-bsp/u-boot/u-boot-ls1/0001-uboot-support-gcc5.patch

diff --git a/recipes-bsp/u-boot/u-boot-ls1/0001-uboot-support-gcc5.patch b/recipes-bsp/u-boot/u-boot-ls1/0001-uboot-support-gcc5.patch
new file mode 100644
index 0000000..c269df0
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ls1/0001-uboot-support-gcc5.patch
@@ -0,0 +1,90 @@
+From 3afcde1104f3fa9102911467929d5752eff484aa Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <B40290@freescale.com>
+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 <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.
++ *
++ * (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/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
index 0a1fb80..5b1e566 100644
--- a/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
 
 SRCBRANCH = "master"
 SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
+SRC_URI += "file://0001-uboot-support-gcc5.patch "
 SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
 
 LOCALVERSION ?= "+ls1"
-- 
1.9.2



^ permalink raw reply related	[flat|nested] 3+ messages in thread