aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2016-12-03 00:34:27 +1000
committerNathan Rossi <nathan@nathanrossi.com>2016-12-03 00:57:17 +1000
commit60dd4df4490429254649cbb641f13790e0c26e80 (patch)
tree0f461d952d1e3529d7c8d636550e1eab3c898453
parentb9f9f5f56e80b5679540dcdadce2929e9833bcda (diff)
downloadmeta-xilinx-60dd4df4490429254649cbb641f13790e0c26e80.tar.gz
meta-xilinx-60dd4df4490429254649cbb641f13790e0c26e80.tar.bz2
meta-xilinx-60dd4df4490429254649cbb641f13790e0c26e80.zip
u-boot-xlnx_2016.07: Remove obsolete compiler-gcc6.h patch
This patch is unused, and not required as U-Boot has updated to handle newer GCC compilers without the need for a separate header. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx/0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch92
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx_2016.07.bb2
2 files changed, 0 insertions, 94 deletions
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch b/recipes-bsp/u-boot/u-boot-xlnx/0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch
deleted file mode 100644
index de4b7492..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 27097b226f9b54a433e92dd5591bf48b830a8d77 Mon Sep 17 00:00:00 2001
-From: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-Date: Wed, 22 Jun 2016 02:34:32 -0700
-Subject: [PATCH] compiler-gcc6.h: Fix u-boot issue for gcc6
-
-Fix the u-boot compilation error while using gcc6
-include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No
-such file or directory
-
-This is a temporary fix, till u-boot-xlnx gets updated to latest revision
-
-Upstream-Status: Inappropriate
-Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
----
- 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.1.4
-
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2016.07.bb b/recipes-bsp/u-boot/u-boot-xlnx_2016.07.bb
index 118fed8c..f91ad765 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx_2016.07.bb
+++ b/recipes-bsp/u-boot/u-boot-xlnx_2016.07.bb
@@ -8,8 +8,6 @@ PV = "v2016.07-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:"
-SRC_URI_append = " file://0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch"
-
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c"