summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-10-05 16:08:11 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-10-05 16:08:33 -0300
commitab67594f01dd9fe9cf2a0798b629b974c7651844 (patch)
treea8fd13052a22476942a0688182462083023228d5
parent008f5ec220ad8de000f1e5fbf13605930c8fbe9a (diff)
downloadabslibre-ab67594f01dd9fe9cf2a0798b629b974c7651844.tar.gz
abslibre-ab67594f01dd9fe9cf2a0798b629b974c7651844.tar.bz2
abslibre-ab67594f01dd9fe9cf2a0798b629b974c7651844.zip
uboot-trimslice-linux-libre: add support for gcc 5
-rw-r--r--libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch97
-rw-r--r--libre/uboot-trimslice-linux-libre/PKGBUILD12
2 files changed, 107 insertions, 2 deletions
diff --git a/libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch b/libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch
new file mode 100644
index 000000000..30718c561
--- /dev/null
+++ b/libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch
@@ -0,0 +1,97 @@
+From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sasha.levin@oracle.com>
+Date: Mon, 13 Oct 2014 15:51:05 -0700
+Subject: [PATCH 2/6] 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.levin@oracle.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ 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.4.4
+
diff --git a/libre/uboot-trimslice-linux-libre/PKGBUILD b/libre/uboot-trimslice-linux-libre/PKGBUILD
index 30626c406..b35cfe06e 100644
--- a/libre/uboot-trimslice-linux-libre/PKGBUILD
+++ b/libre/uboot-trimslice-linux-libre/PKGBUILD
@@ -17,10 +17,18 @@ replaces=('uboot-trimslice')
license=('GPL')
source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
"git+https://github.com/NVIDIA/cbootimage-configs.git"
- "boot.txt")
+ "boot.txt"
+ "0002-kernel-add-support-for-gcc-5.patch")
md5sums=('3ddcaee2f05b7c464778112ec83664b5'
'SKIP'
- '9374fbadb4b4c1298ea050ad4ea79f46')
+ '9374fbadb4b4c1298ea050ad4ea79f46'
+ '721a46867e189d8dedc6b6f86a536a34')
+
+prepare() {
+ cd u-boot-${pkgver}
+
+ patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch
+}
build() {
cd u-boot-${pkgver}