From 57625129e196ccef576bac0ed2b6d8e8b84688ed Mon Sep 17 00:00:00 2001
From: Isaac David <isacdaavid@isacdaavid.info>
Date: Fri, 9 Jun 2017 19:57:38 -0500
Subject: libre-testing/uboot4extlinux-udoo: tack gcc7 patch onto previous
 commit

---
 .../0002-kernel-add-support-for-gcc-7.patch        | 68 ++++++++++++++++++++++
 libre-testing/uboot4extlinux-udoo/PKGBUILD         |  3 +
 2 files changed, 71 insertions(+)
 create mode 100644 libre-testing/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-7.patch

(limited to 'libre-testing')

diff --git a/libre-testing/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-7.patch b/libre-testing/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-7.patch
new file mode 100644
index 000000000..ca59b159a
--- /dev/null
+++ b/libre-testing/uboot4extlinux-udoo/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 <linux/compiler-gcc7.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]
++
++   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-udoo/PKGBUILD b/libre-testing/uboot4extlinux-udoo/PKGBUILD
index 95b71e4b6..c3c19009b 100644
--- a/libre-testing/uboot4extlinux-udoo/PKGBUILD
+++ b/libre-testing/uboot4extlinux-udoo/PKGBUILD
@@ -16,15 +16,18 @@ backup=(boot/extlinux/extlinux.conf)
 install=${pkgname}.install
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2"
         '0001-parabola-arm-modifications.patch'
+        '0002-kernel-add-support-for-gcc-7.patch'
         'extlinux.conf')
 sha256sums=('45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8'
             '5a93f489208f0f2e9415779770827024e24ca717438c0998499b59b59cd6189d'
+            '9e80aa27cccdb07b03d56a970f247c91d586d0b936868c076c20acc2e68a3968'
             '1bb0cb3eac527182dcec2cecc128056610cce443eea8e57b0da3eb37e69623ea')
 
 prepare() {
   cd u-boot-${pkgver/rc/-rc}
 
   patch -Np1 -i ../0001-parabola-arm-modifications.patch
+  patch -Np1 -i ../0002-kernel-add-support-for-gcc-7.patch
 }
 
 build() {
-- 
cgit v1.2.3