From: Adrian Bunk With the release of gcc 4.0 being only a few months away and people already tring compiling with it, it's time for adding a compiler-gcc4.h . This patch contains the following changes: - remove compiler-gcc+.h - compiler-gcc4.h: new file based on a corrected compiler-gcc+.h - compiler.h: include compiler-gcc4.h for gcc 4 - compiler.h: #error for gcc > 4 - compiler-gcc3.h: remove __compiler_offsetof (there will never be a gcc 3.5) small indention corrections I've tested the compilation with both gcc 3.4.4 and a recent gcc 4.0 snapshot from Debian experimental. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- /dev/null | 16 ---------------- 25-akpm/include/linux/compiler-gcc3.h | 10 ++++------ 25-akpm/include/linux/compiler-gcc4.h | 16 ++++++++++++++++ 25-akpm/include/linux/compiler.h | 6 ++++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff -puN include/linux/compiler-gcc3.h~add-compiler-gcc4h include/linux/compiler-gcc3.h --- 25/include/linux/compiler-gcc3.h~add-compiler-gcc4h 2005-02-05 17:00:19.000000000 -0800 +++ 25-akpm/include/linux/compiler-gcc3.h 2005-02-05 17:00:19.000000000 -0800 @@ -10,7 +10,7 @@ #endif #if __GNUC_MINOR__ > 0 -# define __deprecated __attribute__((deprecated)) +# define __deprecated __attribute__((deprecated)) #endif #if __GNUC_MINOR__ >= 3 @@ -23,12 +23,10 @@ #define __attribute_const__ __attribute__((__const__)) #if __GNUC_MINOR__ >= 1 -#define noinline __attribute__((noinline)) +#define noinline __attribute__((noinline)) #endif + #if __GNUC_MINOR__ >= 4 -#define __must_check __attribute__((warn_unused_result)) +#define __must_check __attribute__((warn_unused_result)) #endif -#if __GNUC_MINOR__ >= 5 -#define __compiler_offsetof(a,b) __builtin_offsetof(a,b) -#endif diff -puN /dev/null include/linux/compiler-gcc4.h --- /dev/null 2003-09-15 06:40:47.000000000 -0700 +++ 25-akpm/include/linux/compiler-gcc4.h 2005-02-05 17:00:19.000000000 -0800 @@ -0,0 +1,16 @@ +/* Never include this file directly. Include instead. */ + +/* These definitions are for GCC v4.x. */ +#include + +#define inline inline __attribute__((always_inline)) +#define __inline__ __inline__ __attribute__((always_inline)) +#define __inline __inline __attribute__((always_inline)) +#define __deprecated __attribute__((deprecated)) +#define __attribute_used__ __attribute__((__used__)) +#define __attribute_pure__ __attribute__((pure)) +#define __attribute_const__ __attribute__((__const__)) +#define noinline __attribute__((noinline)) +#define __must_check __attribute__((warn_unused_result)) +#define __compiler_offsetof(a,b) __builtin_offsetof(a,b) + diff -L include/linux/compiler-gcc+.h -puN include/linux/compiler-gcc+.h~add-compiler-gcc4h /dev/null --- 25/include/linux/compiler-gcc+.h +++ /dev/null 2003-09-15 06:40:47.000000000 -0700 @@ -1,16 +0,0 @@ -/* Never include this file directly. Include instead. */ - -/* - * These definitions are for Ueber-GCC: always newer than the latest - * version and hence sporting everything plus a kitchen-sink. - */ -#include - -#define inline inline __attribute__((always_inline)) -#define __inline__ __inline__ __attribute__((always_inline)) -#define __inline __inline __attribute__((always_inline)) -#define __deprecated __attribute__((deprecated)) -#define __attribute_used__ __attribute__((__used__)) -#define __attribute_pure__ __attribute__((pure)) -#define __attribute_const__ __attribute__((__const__)) -#define __must_check __attribute__((warn_unused_result)) diff -puN include/linux/compiler.h~add-compiler-gcc4h include/linux/compiler.h --- 25/include/linux/compiler.h~add-compiler-gcc4h 2005-02-05 17:00:19.000000000 -0800 +++ 25-akpm/include/linux/compiler.h 2005-02-05 17:00:19.000000000 -0800 @@ -34,8 +34,10 @@ extern void __chk_io_ptr(void __iomem *) #ifdef __KERNEL__ -#if __GNUC__ > 3 -# include /* catch-all for GCC 4, 5, etc. */ +#if __GNUC__ > 4 +#error no compiler-gcc.h file for this gcc version +#elif __GNUC__ == 4 +# include #elif __GNUC__ == 3 # include #elif __GNUC__ == 2 _