From 584544f9bf4aec6eef00cc9c783504574b475d09 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 12 Jul 2016 03:45:38 +0000 Subject: [PATCH] drop no longer needed gcc6 patch, re-adjust dir name --- ...o-compiler-gcc6.h-as-a-beginning-of-.patch | 87 ------------------- uboot-tools.spec | 3 +- 2 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch diff --git a/copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch b/copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch deleted file mode 100644 index 5b64636..0000000 --- a/copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 47bcc5136fe4e9f5bcc352395a723a8e4ac1aef7 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 3 Feb 2016 09:08:39 +0000 -Subject: [PATCH] Copy gcc5 over to compiler-gcc6.h as a beginning of support - -Add initial support for gcc6 by taking a copy of compiler-gcc5.h - -Signed-off-by: Peter Robinson ---- - 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..622117b ---- /dev/null -+++ b/include/linux/compiler-gcc6.h -@@ -0,0 +1,65 @@ -+#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] -+ -+ 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.5.0 - diff --git a/uboot-tools.spec b/uboot-tools.spec index cbec041..4270905 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -12,7 +12,6 @@ Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candida Source1: armv7-boards Source2: armv8-boards -Patch1: copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch Patch2: add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch Patch3: port-utilite-to-distro-generic-boot-commands.patch Patch4: mvebu-enable-generic-distro-boot-config.patch @@ -55,7 +54,7 @@ u-boot bootloader binaries for armv7 boards %endif %prep -%setup -q -n u-boot%{version}%{?candidate:-%{candidate}} +%setup -q -n u-boot-%{version}%{?candidate:-%{candidate}} git init git config --global gc.auto 0