From a63182bc739fa2ef86861a939898717e04cb7153 Mon Sep 17 00:00:00 2001 From: Isaac David Date: Fri, 9 Jun 2017 15:44:53 -0500 Subject: libre-testing/uboot4extlinux-*: new versions and configs also patch old u-boot tarballs to build with gcc7 --- .../0002-kernel-add-support-for-gcc-7.patch | 68 ++++++++++++++++++++++ libre-testing/uboot4extlinux-wandboard/PKGBUILD | 12 ++-- .../uboot4extlinux-wandboard.install | 5 +- 3 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 libre-testing/uboot4extlinux-wandboard/0002-kernel-add-support-for-gcc-7.patch (limited to 'libre-testing/uboot4extlinux-wandboard') diff --git a/libre-testing/uboot4extlinux-wandboard/0002-kernel-add-support-for-gcc-7.patch b/libre-testing/uboot4extlinux-wandboard/0002-kernel-add-support-for-gcc-7.patch new file mode 100644 index 000000000..ca59b159a --- /dev/null +++ b/libre-testing/uboot4extlinux-wandboard/0002-kernel-add-support-for-gcc-7.patch @@ -0,0 +1,68 @@ +diff --git a/include/linux/compiler-gcc7.h b/include/linux/compiler-gcc7.h +new file mode 100644 +index 0000000..ba064fa +--- /dev/null ++++ b/include/linux/compiler-gcc7.h +@@ -0,0 +1,59 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include directly, include 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] ++ ++ 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. ++ */ ++#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 */ ++ ++#define KASAN_ABI_VERSION 4 +-- +2.1.4 + diff --git a/libre-testing/uboot4extlinux-wandboard/PKGBUILD b/libre-testing/uboot4extlinux-wandboard/PKGBUILD index 453b5871c..152695610 100644 --- a/libre-testing/uboot4extlinux-wandboard/PKGBUILD +++ b/libre-testing/uboot4extlinux-wandboard/PKGBUILD @@ -1,7 +1,6 @@ # U-Boot: Wandboard -# Maintainer: André Silva - -buildarch=4 +# Maintainer: Isaac David +# Contributor: André Silva pkgname=uboot4extlinux-wandboard pkgver=2015.10 @@ -15,21 +14,24 @@ conflicts=('uboot-wandboard' 'uboot4grub-wandboard') install=${pkgname}.install source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" '0001-parabola-arm-modifications.patch' + '0002-kernel-add-support-for-gcc-7.patch' 'extlinux.conf') sha256sums=('bdc68d5f9455ad933b059c735d983f2c8b6b552dafb062e5ff1444f623021955' 'a49c942b3cd676ce3550d0f2cdb80086b5df0f74c669b11ba2420ebfc878dc8c' + '9e80aa27cccdb07b03d56a970f247c91d586d0b936868c076c20acc2e68a3968' 'bcd32af67d56a13600142219ab8f8c2e1296a90223ad7f4594617d02023155ab') prepare() { cd u-boot-${pkgver} patch -Np1 -i ../0001-parabola-arm-modifications.patch + patch -Np1 -i ../0002-kernel-add-support-for-gcc-7.patch } build() { cd u-boot-${pkgver} - + unset LDFLAGS - + make distclean make wandboard_defconfig make diff --git a/libre-testing/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install b/libre-testing/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install index ddfb5c83f..65196758e 100644 --- a/libre-testing/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install +++ b/libre-testing/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install @@ -1,5 +1,5 @@ extlinux_warning() { - echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /boot/extlinux/extlinux.conf" + echo "==> WARNING: Remember to set up your kernels in /boot/extlinux/extlinux.conf" } flash_uboot() { @@ -17,13 +17,10 @@ flash_uboot() { extlinux_warning } -## arg 1: the new package version post_install() { flash_uboot } -## arg 1: the new package version -## arg 2: the old package version post_upgrade() { flash_uboot } -- cgit v1.2.3