Author: nbd Date: 2015-09-27 19:29:48 +0200 (Sun, 27 Sep 2015) New Revision: 47062
Added: trunk/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch Log: uml: fix build with gcc 5 Signed-off-by: Felix Fietkau <[email protected]> Added: trunk/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch =================================================================== --- trunk/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch (rev 0) +++ trunk/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch 2015-09-27 17:29:48 UTC (rev 47062) @@ -0,0 +1,44 @@ +From: Richard Weinberger <[email protected]> +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 <[email protected]> +Signed-off-by: Richard Weinberger <[email protected]> +--- + +--- 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) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
