aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage/patches/080-remove_compiler_check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-04-14 23:00:12 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-04-18 23:59:32 +0200
commitb13e981d72c14ba4c39f85f0d24a8f7947a1b2c4 (patch)
tree71760edb1ae1c3c1d704461e405d6fced0c4e206 /tools/mkimage/patches/080-remove_compiler_check.patch
parent68150d3125447a40cf103aeefd9bcb6c874e6769 (diff)
downloadupstream-b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4.tar.gz
upstream-b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4.tar.bz2
upstream-b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4.zip
tools/mkimage: update to version 2018.03
This activates support for fit images and some other new mkimage features. Some of the patches were applied upstream and could be removed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'tools/mkimage/patches/080-remove_compiler_check.patch')
-rw-r--r--tools/mkimage/patches/080-remove_compiler_check.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/mkimage/patches/080-remove_compiler_check.patch b/tools/mkimage/patches/080-remove_compiler_check.patch
index 3e71ad5b07..5e0792f25f 100644
--- a/tools/mkimage/patches/080-remove_compiler_check.patch
+++ b/tools/mkimage/patches/080-remove_compiler_check.patch
@@ -1,8 +1,8 @@
---- a/include/linux/compiler-gcc4.h
-+++ b/include/linux/compiler-gcc4.h
-@@ -2,13 +2,6 @@
- #error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead."
- #endif
+--- a/include/linux/compiler-gcc.h
++++ b/include/linux/compiler-gcc.h
+@@ -146,13 +146,6 @@
+
+ #if GCC_VERSION >= 40000
-/* GCC 4.1.[01] miscompiles __weak */
-#ifdef __KERNEL__
@@ -12,5 +12,5 @@
-#endif
-
#define __used __attribute__((__used__))
- #define __must_check __attribute__((warn_unused_result))
- #define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
+ #define __compiler_offsetof(a, b) \
+ __builtin_offsetof(a, b)