update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / include / pub_tool_basics.h

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/pub_tool_basics.h b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/pub_tool_basics.h
index b55456771b0799e694b74029d873342cc9cb0985..87e29866c07d268a091ab3d1e802e05385010887 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/pub_tool_basics.h
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/pub_tool_basics.h
@@ -323,7 +323,7 @@ static inline Bool sr_EQ ( SysRes sr1, SysRes sr2 ) {
 
 #if defined(VGA_x86) || defined(VGA_amd64) || defined (VGA_arm)
 #  define VG_LITTLEENDIAN 1
-#elif defined(VGA_ppc32) || defined(VGA_ppc64)
+#elif defined(VGA_ppc32) || defined(VGA_ppc64) || defined(VGA_s390x)
 #  define VG_BIGENDIAN 1
 #else
 #  error Unknown arch
@@ -333,7 +333,7 @@ static inline Bool sr_EQ ( SysRes sr1, SysRes sr2 ) {
 #if defined(VGA_x86)
 #  define VG_REGPARM(n)            __attribute__((regparm(n)))
 #elif defined(VGA_amd64) || defined(VGA_ppc32) \
-      || defined(VGA_ppc64) || defined(VGA_arm)
+      || defined(VGA_ppc64) || defined(VGA_arm) || defined(VGA_s390x)
 #  define VG_REGPARM(n)            /* */
 #else
 #  error Unknown arch
@@ -347,9 +347,9 @@ static inline Bool sr_EQ ( SysRes sr1, SysRes sr2 ) {
 #define VG_BUGS_TO "www.valgrind.org"
 
 /* Branch prediction hints. */
-#if 1 /*HAVE_BUILTIN_EXPECT*/
+#if defined(__GNUC__)
 #  define LIKELY(x)   __builtin_expect(!!(x), 1)
-#  define UNLIKELY(x) __builtin_expect((x), 0)
+#  define UNLIKELY(x) __builtin_expect(!!(x), 0)
 #else
 #  define LIKELY(x)   (x)
 #  define UNLIKELY(x) (x)