update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / drd / drd_bitmap.h

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/drd_bitmap.h b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/drd_bitmap.h
index f903945c0c0c4472c98f05d208f533635e748076..85bb767b0404ca9ac9c131bf64db6ef80f7d6c3e 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/drd_bitmap.h
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/drd_bitmap.h
@@ -1,8 +1,8 @@
-/* -*- mode: C; c-basic-offset: 3; -*- */
+/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
-  Copyright (C) 2006-2010 Bart Van Assche <bart.vanassche@gmail.com>.
+  Copyright (C) 2006-2011 Bart Van Assche <bvanassche@acm.org>.
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -31,6 +31,9 @@
 #include "pub_tool_basics.h"
 #include "pub_tool_oset.h"
 #include "pub_tool_libcbase.h"
+#ifdef ENABLE_DRD_CONSISTENCY_CHECKS
+#include "pub_tool_libcassert.h"
+#endif
 
 
 /* Bitmap representation. A bitmap is a data structure in which two bits are
@@ -136,7 +139,7 @@ Addr make_address(const UWord a1, const UWord a0)
 /** Log2 of BITS_PER_UWORD. */
 #if defined(VGA_x86) || defined(VGA_ppc32) || defined(VGA_arm)
 #define BITS_PER_BITS_PER_UWORD 5
-#elif defined(VGA_amd64) || defined(VGA_ppc64)
+#elif defined(VGA_amd64) || defined(VGA_ppc64) || defined(VGA_s390x)
 #define BITS_PER_BITS_PER_UWORD 6
 #else
 #error Unknown platform.