diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-01-11 08:32:51 +0100 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-01-11 08:32:51 +0100 |
| commit | 7173942e670234a898d10675d874f206ad5b6df0 (patch) | |
| tree | 23cc9c275cd48d412cc29ce8006d6bedf3a43906 /meta-sota/recipes-bsp | |
| parent | 5593f3575bdf12c8fc03fdca366427aa72042216 (diff) | |
Fix build of u-boot with gcc6 on morty
Add header file for gcc6 to u-boot.
Change-Id: Idc5b95f2b41a7c0468b5b07883bcf11d4b48b164
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
++ * 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.
++ * Fixed in GCC 4.8.2 and later versions.
++ *
++ * (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.6.6
+
diff --git a/meta-sota/recipes-bsp/u-boot/u-boot-ota_2015.07.bb b/meta-sota/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
index ab5d403..dfa0631 100644
--- a/meta-sota/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
+++ b/meta-sota/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
index ab5d403..dfa0631 100644
--- a/meta-sota/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
+++ b/meta-sota/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
@@ -10,8 +10,9 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
SRCREV = "baba2f57e8f4ed3fa67fe213d22da0de5e00f204"
SRC_URI += "file://0001-Set-up-environment-for-OSTree-integration.patch \
- file://0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch \
- "
+ file://0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch \
+ file://0001-fixup-build-with-gcc6.patch \
+ "
PV = "v2015.07+git${SRCPV}"