Blame valgrind-3.5.0-config_h.patch
|
Jakub Jelinek |
7d17c1 |
--- valgrind-3.5.0/include/pub_tool_basics.h.jj 2009-08-19 09:37:08.000000000 -0400
|
|
Jakub Jelinek |
7d17c1 |
+++ valgrind-3.5.0/include/pub_tool_basics.h 2010-04-09 06:10:59.047422000 -0400
|
|
Jakub Jelinek |
7d17c1 |
@@ -49,10 +49,6 @@
|
|
Jakub Jelinek |
7d17c1 |
// For varargs types
|
|
Jakub Jelinek |
7d17c1 |
#include <stdarg.h>
|
|
Jakub Jelinek |
7d17c1 |
|
|
Jakub Jelinek |
7d17c1 |
-/* For HAVE_BUILTIN_EXPECT */
|
|
Jakub Jelinek |
7d17c1 |
-#include "config.h"
|
|
Jakub Jelinek |
7d17c1 |
-
|
|
Jakub Jelinek |
7d17c1 |
-
|
|
Jakub Jelinek |
7d17c1 |
/* ---------------------------------------------------------------------
|
|
Jakub Jelinek |
7d17c1 |
symbol prefixing
|
|
Jakub Jelinek |
7d17c1 |
------------------------------------------------------------------ */
|
|
Jakub Jelinek |
7d17c1 |
@@ -315,7 +311,7 @@ static inline Bool sr_EQ ( SysRes sr1, S
|
|
Jakub Jelinek |
7d17c1 |
#define VG_BUGS_TO "www.valgrind.org"
|
|
Jakub Jelinek |
7d17c1 |
|
|
Jakub Jelinek |
7d17c1 |
/* Branch prediction hints. */
|
|
Jakub Jelinek |
7d17c1 |
-#if HAVE_BUILTIN_EXPECT
|
|
Jakub Jelinek |
7d17c1 |
+#if defined(__GNUC__) && (__GNUC__ >= 3)
|
|
Jakub Jelinek |
7d17c1 |
# define LIKELY(x) __builtin_expect(!!(x), 1)
|
|
Jakub Jelinek |
7d17c1 |
# define UNLIKELY(x) __builtin_expect((x), 0)
|
|
Jakub Jelinek |
7d17c1 |
#else
|