diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-03-07 17:52:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-07 17:52:24 -0800 |
| commit | 6740e938fe4eb30563c6fb040b3321ad7e546b61 (patch) | |
| tree | d881d800f534b203771289fa79b9e4a2a8b29be7 /include/linux/compiler.h | |
| parent | bcba0212905d6b08fa33f7215bd1c41bb86317ab (diff) | |
[PATCH] add compiler-gcc4.h
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 <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 0fd06b029847..b475fd608115 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -34,8 +34,10 @@ extern void __chk_io_ptr(void __iomem *); #ifdef __KERNEL__ -#if __GNUC__ > 3 -# include <linux/compiler-gcc+.h> /* catch-all for GCC 4, 5, etc. */ +#if __GNUC__ > 4 +#error no compiler-gcc.h file for this gcc version +#elif __GNUC__ == 4 +# include <linux/compiler-gcc4.h> #elif __GNUC__ == 3 # include <linux/compiler-gcc3.h> #elif __GNUC__ == 2 |