summaryrefslogtreecommitdiff
path: root/include/linux/compiler.h
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2003-11-18 08:16:16 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2003-11-18 08:16:16 -0800
commit82120e6a823bcbb4681ef0fc22bc5ab50dcfb5ff (patch)
tree2db768d3ec3c57d8ae08f1d665826f6efeeebe1e /include/linux/compiler.h
parenta9bca0184042b03b80a0514d015f20b9425eeea9 (diff)
[PATCH] init.h needs to include compiler.h
From: Jun Sun <jsun@mvista.com> It is needed for all those "__attribute_used__" etc to be valid. Also, it seems that when compiling a file ending in ".S", gcc-2.95.3 does not expand __GNUC__ at all. This causes the compiler version check to fail when building vsyscall.S. So add __ASSEMBLY__ wrappers in there.
Diffstat (limited to 'include/linux/compiler.h')
-rw-r--r--include/linux/compiler.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 528641f69043..d67b1dfb698a 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -9,6 +9,7 @@
# define __kernel
#endif
+#ifndef __ASSEMBLY__
#if __GNUC__ > 3
# include <linux/compiler-gcc+.h> /* catch-all for GCC 4, 5, etc. */
#elif __GNUC__ == 3
@@ -18,6 +19,7 @@
#else
# error Sorry, your compiler is too old/not recognized.
#endif
+#endif
/* Intel compiler defines __GNUC__. So we will overwrite implementations
* coming from above header files here