From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 29 Dec 2009 16:56:18 +0000 (+0000)
Subject: Removed dependency of include/pub_tool_basics.h on config.h.
X-Git-Tag: svn/VALGRIND_3_6_0~445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74246448f44f1ad4479d0219a18b38afc045bb8e;p=thirdparty%2Fvalgrind.git

Removed dependency of include/pub_tool_basics.h on config.h.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10972
---

diff --git a/configure.in b/configure.in
index 1e978289f9..0a44463aec 100644
--- a/configure.in
+++ b/configure.in
@@ -1378,24 +1378,6 @@ AC_MSG_RESULT([no])
 CFLAGS=$safe_CFLAGS
 
 
-# does this compiler support __builtin_expect?
-AC_MSG_CHECKING([if gcc supports __builtin_expect])
-
-AC_TRY_LINK(, [
-return __builtin_expect(1, 1) ? 1 : 0
-],
-[
-ac_have_builtin_expect=yes
-AC_MSG_RESULT([yes])
-], [
-ac_have_builtin_expect=no
-AC_MSG_RESULT([no])
-])
-if test x$ac_have_builtin_expect = xyes ; then
-  AC_DEFINE(HAVE_BUILTIN_EXPECT, 1, [Define to 1 if gcc supports __builtin_expect.])
-fi
-
-
 # does the ppc assembler support "mtocrf" et al?
 AC_MSG_CHECKING([if ppc32/64 as supports mtocrf/mfocrf])
 
diff --git a/coregrind/m_aspacemgr/aspacemgr-common.c b/coregrind/m_aspacemgr/aspacemgr-common.c
index b8a7dd8b97..16642fb22c 100644
--- a/coregrind/m_aspacemgr/aspacemgr-common.c
+++ b/coregrind/m_aspacemgr/aspacemgr-common.c
@@ -37,6 +37,7 @@
    ************************************************************* */
 
 #include "priv_aspacemgr.h"
+#include "config.h"
 
 
 /*-----------------------------------------------------------------*/
diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index 53ed143a2d..0df6230d29 100644
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -40,6 +40,7 @@
    ************************************************************* */
 
 #include "priv_aspacemgr.h"
+#include "config.h"
 
 
 /* Note: many of the exported functions implemented below are
diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index de7a3062cd..ca247fbdbe 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -62,6 +62,8 @@
 #include "priv_types_n_macros.h"
 #include "priv_syswrap-generic.h"
 
+#include "config.h"
+
 
 /* Returns True iff address range is something the client can
    plausibly mess with: all of it is either already belongs to the
diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
index c95597c9ba..8c17cc784b 100644
--- a/helgrind/hg_intercepts.c
+++ b/helgrind/hg_intercepts.c
@@ -56,6 +56,7 @@
 #include "pub_tool_redir.h"
 #include "valgrind.h"
 #include "helgrind.h"
+#include "config.h"
 
 #define TRACE_PTH_FNS 0
 #define TRACE_QT4_FNS 0
diff --git a/include/pub_tool_basics.h b/include/pub_tool_basics.h
index b2bf08ea5f..8aa1c4b26c 100644
--- a/include/pub_tool_basics.h
+++ b/include/pub_tool_basics.h
@@ -49,9 +49,6 @@
 // For varargs types
 #include <stdarg.h>
 
-/* For HAVE_BUILTIN_EXPECT */
-#include "config.h"
-
 
 /* ---------------------------------------------------------------------
    symbol prefixing
@@ -318,7 +315,7 @@ static inline Bool sr_EQ ( SysRes sr1, SysRes sr2 ) {
 #define VG_BUGS_TO "www.valgrind.org"
 
 /* Branch prediction hints. */
-#if HAVE_BUILTIN_EXPECT
+#if 1 /*HAVE_BUILTIN_EXPECT*/
 #  define LIKELY(x)   __builtin_expect(!!(x), 1)
 #  define UNLIKELY(x) __builtin_expect((x), 0)
 #else