-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Bent Vangli wrote:

> Suggestion: A better test should be included to not select 
> valgrind on 64 bit systemes, or better - valgrind should be
> rewritten to be 64 bit compliant.

apparently valgrind will work on AMD64 boxes but that support
has not been released yet.  For now I've followed your first
suggestion.  Try this patch and let know.  Works on the SuSE
opteron box I was testing on.

Thanks.



cheers, jerry
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFC2CxCIR7qMdg1EfYRApBrAJ0eDA92zNRROMpQs3kQYcSdr6WCYgCg7axp
TURa+WHHsjfwH/VL6cTUnQc=
=R4k2
-----END PGP SIGNATURE-----
Index: configure.in
===================================================================
--- configure.in        (revision 8501)
+++ configure.in        (working copy)
@@ -752,6 +752,18 @@
 # subdirectory of headers.
 AC_CHECK_HEADERS(valgrind.h valgrind/valgrind.h valgrind/memcheck.h)
 
+/* check for linux on amd64 since valgrind is not quite there yet */
+case "$host_os" in
+       *linux*)
+               case "$UNAME_P" in
+                       *x86_64*)
+                               AC_DEFINE(HAVE_64BIT_LINUX,1,[Whether we are 
running on 64bit linux])
+                               ;;
+               esac
+               ;;
+esac
+
+
 #
 # HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
 # This causes configure to fail to detect it. Check for shadow separately on 
HPUX.
Index: include/includes.h
===================================================================
--- include/includes.h  (revision 8501)
+++ include/includes.h  (working copy)
@@ -507,6 +507,8 @@
 #include <aio.h>
 #endif
 
+/* skip valgrind headers on 64bit AMD boxes */
+#ifndef HAVE_64BIT_LINUX
 /* Special macros that are no-ops except when run under Valgrind on
  * x86.  They've moved a little bit from valgrind 1.0.4 to 1.9.4 */
 #if HAVE_VALGRIND_MEMCHECK_H
@@ -515,6 +517,7 @@
 #elif HAVE_VALGRIND_H
 #include <valgrind.h>
 #endif
+#endif
 
 /* If we have --enable-developer and the valgrind header is present,
  * then we're OK to use it.  Set a macro so this logic can be done only
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba

Reply via email to