2010/12/29 Jeff Johnson <j...@rpm5.org>: > RPM Package Manager, CVS Repository > http://rpm5.org/cvs/ > ____________________________________________________________________________ > > Server: rpm5.org Name: Jeff Johnson > Root: /v/rpm/cvs Email: ...@rpm5.org > Module: rpm Date: 29-Dec-2010 17:33:54 > Branch: HEAD Handle: 2010122916335201 > > Modified files: > rpm CHANGES > rpm/lib rpmrc.c > rpm/rpmio librpmio.vers lookup3.c > > Log: > - revert lookup3.c+valgrind because gcc version dependent. Uhm, not really, although I forgot to commit changes to debug.h which have a conditional gcc specific optimization (see below).
You also reverted a fix for the broken #ifdef VALGRIND vs #ifdef WITH_VALGRIND btw. --- debug.h 2010-01-17 13:16:30.000000000 +0100 +++ /home/peroyvind/RPM/rpm5/BUILD/rpm-5.3.7/debug.h 2010-12-25 21:10:45.763314086 +0100 @@ -28,6 +28,15 @@ #include <valgrind/helgrind.h> #include <valgrind/drd.h> +/* If we're using GCC, use __builtin_expect() to reduce overhead of + the valgrind checks */ +#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__) +# define UNLIKELY(value) __builtin_expect((value), 0) +#else +# define UNLIKELY(value) (value) +#endif + +extern int _running_on_valgrind; #else #define VALGRIND_CREATE_MEMPOOL(pool, rzB, is_zeroed) ______________________________________________________________________ RPM Package Manager http://rpm5.org Developer Communication List rpm-devel@rpm5.org
