summaryrefslogtreecommitdiff
path: root/include/linux/compiler-gcc4.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-02 09:23:03 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-02 09:23:03 -0800
commitf153b82121b0366fe0e5f9553545cce237335175 (patch)
treecba4b60e9129fbcdfc254386954f0f17dba0c15d /include/linux/compiler-gcc4.h
parentb58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff)
downloadlinux-3.10-f153b82121b0366fe0e5f9553545cce237335175.tar.gz
linux-3.10-f153b82121b0366fe0e5f9553545cce237335175.tar.bz2
linux-3.10-f153b82121b0366fe0e5f9553545cce237335175.zip
Sanitize gcc version header includes
- include the gcc version-dependent header files from the generic gcc header file, rather than the other way around (iow: don't make the non-gcc header file have to know about gcc versions) - don't include compiler-gcc4.h for gcc 5 (for whenever it gets released). That's just confusing and made us do odd things in the gcc4 header file (testing that we really had version 4!) - generate the name from the __GNUC__ version directly, rather than having a mess of #if conditionals. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/compiler-gcc4.h')
-rw-r--r--include/linux/compiler-gcc4.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 974f5b7bb20..aa426214331 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -2,9 +2,6 @@
#error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead."
#endif
-/* These definitions are for GCC v4.x. */
-#include <linux/compiler-gcc.h>
-
#define __used __attribute__((__used__))
#define __must_check __attribute__((warn_unused_result))
#define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
@@ -16,7 +13,7 @@
*/
#define uninitialized_var(x) x = x
-#if !(__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+#if __GNUC_MINOR__ >= 3
/* Mark functions as cold. gcc will assume any path leading to a call
to them will be unlikely. This means a lot of manual unlikely()s
are unnecessary now for any paths leading to the usual suspects