From b5c0bc73d0e80703aa6f16a306b081b7487e5cf3 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 27 Sep 2015 17:29:48 +0000 Subject: uml: fix build with gcc 5 Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47062 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...001-um-Remove-copy-paste-code-from-init.h.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch (limited to 'target/linux/uml') 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 +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 +Signed-off-by: Richard Weinberger +--- + +--- 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 +-#endif ++ + /* These are for everybody (although not all archs will actually + discard it in modules) */ + #define __init __section(.init.text) -- cgit v1.2.3