diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-09-27 17:29:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-27 17:29:48 +0000 |
| commit | 82791e92ce66a6fd89ee2f3f3c6a0e3e6a4b2335 (patch) | |
| tree | a8bb39874ce1e5f1c34e8ce8c10644f5d675c893 | |
| parent | 110a74dd71eaab04865568ee293f98db4fea7e08 (diff) | |
| download | upstream-82791e92ce66a6fd89ee2f3f3c6a0e3e6a4b2335.tar.gz upstream-82791e92ce66a6fd89ee2f3f3c6a0e3e6a4b2335.tar.bz2 upstream-82791e92ce66a6fd89ee2f3f3c6a0e3e6a4b2335.zip | |
uml: fix build with gcc 5
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47062
| -rw-r--r-- | target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch b/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch new file mode 100644 index 0000000000..a68c4b606c --- /dev/null +++ b/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch @@ -0,0 +1,44 @@ +From: Richard Weinberger <richard@nod.at> +Date: Sun, 31 May 2015 22:15:58 +0200 +Subject: [PATCH] um: Remove copy&paste code from init.h + +As we got rid of the __KERNEL__ abuse, we can directly +include linux/compiler.h now. +This also allows gcc 5 to build UML. + +Reported-by: Hans-Werner Hilse <hwhilse@gmail.com> +Signed-off-by: Richard Weinberger <richard@nod.at> +--- + +--- a/arch/um/include/shared/init.h ++++ b/arch/um/include/shared/init.h +@@ -40,28 +40,8 @@ + typedef int (*initcall_t)(void); + typedef void (*exitcall_t)(void); + +-#ifndef __KERNEL__ +-#ifndef __section +-# define __section(S) __attribute__ ((__section__(#S))) +-#endif +- +-#if __GNUC__ == 3 +- +-#if __GNUC_MINOR__ >= 3 +-# define __used __attribute__((__used__)) +-#else +-# define __used __attribute__((__unused__)) +-#endif +- +-#else +-#if __GNUC__ == 4 +-# define __used __attribute__((__used__)) +-#endif +-#endif +- +-#else + #include <linux/compiler.h> +-#endif ++ + /* These are for everybody (although not all archs will actually + discard it in modules) */ + #define __init __section(.init.text) |