The kernel headers generate the a header name from the compiler version, linux/compiler-gcc5.h, which does not exist in older kernels. This causes an error with GCC 5. We import from upstream, the patch that added the file.
Signed-off-by: Bob Ham <bob....@collabora.com> --- .../0001-kernel-add-support-for-gcc-5.patch | 104 +++++++++++++++++++++ .../linux/linux-samsung-i9300_git.bb | 1 + 2 files changed, 105 insertions(+) create mode 100644 meta-samsung/recipes-kernel/linux/linux-samsung-i9300/0001-kernel-add-support-for-gcc-5.patch diff --git a/meta-samsung/recipes-kernel/linux/linux-samsung-i9300/0001-kernel-add-support-for-gcc-5.patch b/meta-samsung/recipes-kernel/linux/linux-samsung-i9300/0001-kernel-add-support-for-gcc-5.patch new file mode 100644 index 0000000..57e3fa9 --- /dev/null +++ b/meta-samsung/recipes-kernel/linux/linux-samsung-i9300/0001-kernel-add-support-for-gcc-5.patch @@ -0,0 +1,104 @@ +From 71458cfc782eafe4b27656e078d379a34e472adf Mon Sep 17 00:00:00 2001 +From: Sasha Levin <sasha.le...@oracle.com> +Date: Mon, 13 Oct 2014 15:51:05 -0700 +Subject: [PATCH] kernel: add support for gcc 5 + +We're missing include/linux/compiler-gcc5.h which is required now +because gcc branched off to v5 in trunk. + +Just copy the relevant bits out of include/linux/compiler-gcc4.h, +no new code is added as of now. + +This fixes a build error when using gcc 5. + +Signed-off-by: Sasha Levin <sasha.le...@oracle.com> +Cc: <sta...@vger.kernel.org> +Signed-off-by: Andrew Morton <a...@linux-foundation.org> +Signed-off-by: Linus Torvalds <torva...@linux-foundation.org> + +This patch was extracted from the upstream Linux git repository: +git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git +with commit id 71458cfc782eafe4b27656e078d379a34e472adf. + +Signed-off-by: Bob Ham <bob....@collabora.com> + +--- + include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 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..cdd1cc2 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -0,0 +1,66 @@ ++#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. ++ * 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.1.4 + diff --git a/meta-samsung/recipes-kernel/linux/linux-samsung-i9300_git.bb b/meta-samsung/recipes-kernel/linux/linux-samsung-i9300_git.bb index 90b768f..36c691e 100644 --- a/meta-samsung/recipes-kernel/linux/linux-samsung-i9300_git.bb +++ b/meta-samsung/recipes-kernel/linux/linux-samsung-i9300_git.bb @@ -14,6 +14,7 @@ SRC_URI = " \ git://github.com/CyanogenMod/android_kernel_samsung_smdk4412.git;protocol=git;branch=cm-13.0 \ file://battery-quiet.patch \ file://watchdog-quiet.patch \ + file://0001-kernel-add-support-for-gcc-5.patch \ " S = "${WORKDIR}/git" -- 2.1.4 _______________________________________________ Shr-devel mailing list Shr-devel@lists.shr-project.org http://lists.shr-project.org/mailman/listinfo/shr-devel
