diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/bitbake.conf | 12 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch | 91 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot_2015.01.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross.inc | 1 |
5 files changed, 104 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b086cc9..60624e2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -485,10 +485,10 @@ PATCHRESOLVE = 'user' # Build flags and options. ################################################################## -export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE} -Wno-nonnull-compare -Wno-misleading-indentation -Wno-shift-negative-value -Wno-unused-const-variable -Wno-unused-but-set-variable" -BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR} -Wno-nonnull-compare -Wno-misleading-indentation -Wno-shift-negative-value -Wno-unused-const-variable -Wno-unused-but-set-variable" +export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE} -Wno-nonnull-compare -Wno-misleading-indentation -Wno-shift-negative-value -Wno-unused-const-variable -Wno-unused-but-set-variable -Wno-format-nonliteral -Wno-switch" +BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR} -Wno-nonnull-compare -Wno-misleading-indentation -Wno-shift-negative-value -Wno-unused-const-variable -Wno-unused-but-set-variable -Wno-format-nonliteral -Wno-switch" export CPPFLAGS = "${TARGET_CPPFLAGS}" -export TARGET_CPPFLAGS = "-Wno-nonnull-compare -Wno-misleading-indentation -Wno-shift-negative-value -Wno-unused-const-variable -Wno-unused-but-set-variable" +export TARGET_CPPFLAGS = "-Wno-nonnull-compare -Wno-misleading-indentation -Wno-shift-negative-value -Wno-unused-const-variable -Wno-unused-but-set-variable -Wno-format-nonliteral -Wno-switch" #export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}" export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" @@ -496,9 +496,9 @@ BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}" export CFLAGS = "${TARGET_CFLAGS}" export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}" -export BUILD_CXXFLAGS = "${BUILD_CFLAGS}" -export CXXFLAGS = "${TARGET_CXXFLAGS}" -export TARGET_CXXFLAGS = "${TARGET_CFLAGS}" +export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -Wno-literal-suffix" +export CXXFLAGS = "${TARGET_CXXFLAGS} -Wno-literal-suffix" +export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -Wno-literal-suffix" export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ -L${STAGING_BASE_LIBDIR_NATIVE} \ diff --git a/meta/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch b/meta/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch new file mode 100644 index 0000000..18c5e74 --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch @@ -0,0 +1,91 @@ +From 07373b2e477ae61f9f6a0e2eff41be3276d92923 Mon Sep 17 00:00:00 2001 +From: yocto <yocto@yocto.org> +Date: Thu, 2 Jun 2016 03:21:51 -0500 +Subject: [PATCH] fix build error under gcc6 + +Fix the following error: +| ../include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No such file or directory +| #include gcc_header(__GNUC__) + +Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> + +Upstream-Status: Pending +--- + include/linux/compiler-gcc6.h | 65 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 65 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..c8c5659 +--- /dev/null ++++ b/include/linux/compiler-gcc6.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.5.0 + diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb index 7735288..0e5a55c 100644 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb @@ -16,6 +16,9 @@ SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ file://gcc5.patch \ " +SRC_URI += "file://fix-build-error-under-gcc6.patch \ +" + S = "${WORKDIR}/git" EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' diff --git a/meta/recipes-bsp/u-boot/u-boot_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb index 3a21224..7f027fe 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2015.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb @@ -6,6 +6,9 @@ DEPENDS += "dtc-native" # We use the revision in order to avoid having to fetch it from the repo during parse SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368" +SRC_URI += "file://fix-build-error-under-gcc6.patch \ +" + PV = "v2015.01+git${SRCPV}" EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline" diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 9792950..7832fdd 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -34,6 +34,7 @@ ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" do_compile () { export CC="${BUILD_CC}" + export TARGET_CXXFLAGS="${TARGET_CXXFLAGS} -Wno-literal-suffix" export AR_FOR_TARGET="${TARGET_SYS}-ar" export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib" export LD_FOR_TARGET="${TARGET_SYS}-ld" |
