|
From: Julian S. <js...@ac...> - 2009-12-31 13:06:59
|
I must say I don't think this is a good idea. For one thing it now requires us to #include config.h everywhere we need it, whereas before, inclusion of pub_tool_basics.h was enough. This for example causes Memcheck to not start up on openSUSE 11.0 x86_64, since the GLIBC_2_x symbols are no longer visible in m_redir.c. More seriously, it means that the installation tree (still) lacks a config.h which matches/describes how the installed libraries and executables were built. Perhaps a better solution would be to revert this and to install config.h too. J On Tuesday 29 December 2009, sv...@va... wrote: > Author: bart > Date: 2009-12-29 16:56:18 +0000 (Tue, 29 Dec 2009) > New Revision: 10972 > > Log: > Removed dependency of include/pub_tool_basics.h on config.h. > > > Modified: > trunk/configure.in > trunk/coregrind/m_aspacemgr/aspacemgr-common.c > trunk/coregrind/m_aspacemgr/aspacemgr-linux.c > trunk/coregrind/m_syswrap/syswrap-generic.c > trunk/helgrind/hg_intercepts.c > trunk/include/pub_tool_basics.h > > > Modified: trunk/configure.in > =================================================================== > --- trunk/configure.in 2009-12-29 15:08:14 UTC (rev 10971) > +++ trunk/configure.in 2009-12-29 16:56:18 UTC (rev 10972) > @@ -1378,24 +1378,6 @@ > 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]) > > > Modified: trunk/coregrind/m_aspacemgr/aspacemgr-common.c > =================================================================== > --- trunk/coregrind/m_aspacemgr/aspacemgr-common.c 2009-12-29 15:08:14 UTC > (rev 10971) +++ trunk/coregrind/m_aspacemgr/aspacemgr-common.c 2009-12-29 > 16:56:18 UTC (rev 10972) @@ -37,6 +37,7 @@ > ************************************************************* */ > > #include "priv_aspacemgr.h" > +#include "config.h" > > > /*-----------------------------------------------------------------*/ > > Modified: trunk/coregrind/m_aspacemgr/aspacemgr-linux.c > =================================================================== > --- trunk/coregrind/m_aspacemgr/aspacemgr-linux.c 2009-12-29 15:08:14 UTC > (rev 10971) +++ trunk/coregrind/m_aspacemgr/aspacemgr-linux.c 2009-12-29 > 16:56:18 UTC (rev 10972) @@ -40,6 +40,7 @@ > ************************************************************* */ > > #include "priv_aspacemgr.h" > +#include "config.h" > > > /* Note: many of the exported functions implemented below are > > Modified: trunk/coregrind/m_syswrap/syswrap-generic.c > =================================================================== > --- trunk/coregrind/m_syswrap/syswrap-generic.c 2009-12-29 15:08:14 UTC > (rev 10971) +++ trunk/coregrind/m_syswrap/syswrap-generic.c 2009-12-29 > 16:56:18 UTC (rev 10972) @@ -62,7 +62,9 @@ > #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 > client or is free or a reservation. */ > > Modified: trunk/helgrind/hg_intercepts.c > =================================================================== > --- trunk/helgrind/hg_intercepts.c 2009-12-29 15:08:14 UTC (rev 10971) > +++ trunk/helgrind/hg_intercepts.c 2009-12-29 16:56:18 UTC (rev 10972) > @@ -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 > > Modified: trunk/include/pub_tool_basics.h > =================================================================== > --- trunk/include/pub_tool_basics.h 2009-12-29 15:08:14 UTC (rev 10971) > +++ trunk/include/pub_tool_basics.h 2009-12-29 16:56:18 UTC (rev 10972) > @@ -49,10 +49,7 @@ > // For varargs types > #include <stdarg.h> > > -/* For HAVE_BUILTIN_EXPECT */ > -#include "config.h" > > - > /* --------------------------------------------------------------------- > symbol prefixing > ------------------------------------------------------------------ */ > @@ -318,7 +315,7 @@ > #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 > > > --------------------------------------------------------------------------- >--- This SF.Net email is sponsored by the Verizon Developer Community > Take advantage of Verizon's best-in-class app development support > A streamlined, 14 day to market process makes app distribution fast and > easy Join now and get one step closer to millions of Verizon customers > http://p.sf.net/sfu/verizon-dev2dev > _______________________________________________ > Valgrind-developers mailing list > Val...@li... > https://lists.sourceforge.net/lists/listinfo/valgrind-developers |