univ.i:

Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510) innobase/include/univ.i: Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510)

univ.i:
Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510) innobase/include/univ.i: Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510)
99bea6a7 · unknown · d24ce05d · 99bea6a7
Commit 99bea6a7 authored Aug 17, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

innobase/include/univ.i innobase/include/univ.i +1 -1

No files found.
--- a/innobase/include/univ.i
+++ b/innobase/include/univ.i
@@ -244,7 +244,7 @@ contains the sum of the following flag and the locally stored len. */
 #define UNIV_EXTERN_STORAGE_FIELD (UNIV_SQL_NULL - UNIV_PAGE_SIZE)

 /* Some macros to improve branch prediction and reduce cache misses */
-#if defined(__GNUC__) && (__GNUC__ > 2)
+#if defined(__GNUC__) && (__GNUC__ > 2) && ! defined(__INTEL_COMPILER)
 /* Tell the compiler that 'expr' probably evaluates to 'constant'. */
 # define UNIV_EXPECT(expr,constant) __builtin_expect(expr, constant)
 /* Tell the compiler that a pointer is likely to be NULL */