Author: jerry Date: 2005-07-15 21:36:00 +0000 (Fri, 15 Jul 2005) New Revision: 8510
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8510 Log: Don't include the valgrind headers on 64bit linux systems. Several incarnations of gcc bork with Compiling dynconfig.c /tmp/ccXd94O5.s: Assembler messages: /tmp/ccXd94O5.s:1202: Error: suffix or operands invalid for `mov' /tmp/ccXd94O5.s:1289: Error: suffix or operands invalid for `mov'` Thanks to Bent Vangli for the the leg work and suggestions. Modified: branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/include/includes.h trunk/source/configure.in trunk/source/include/includes.h Changeset: Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2005-07-15 20:24:19 UTC (rev 8509) +++ branches/SAMBA_3_0/source/configure.in 2005-07-15 21:36:00 UTC (rev 8510) @@ -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. Modified: branches/SAMBA_3_0/source/include/includes.h =================================================================== --- branches/SAMBA_3_0/source/include/includes.h 2005-07-15 20:24:19 UTC (rev 8509) +++ branches/SAMBA_3_0/source/include/includes.h 2005-07-15 21:36:00 UTC (rev 8510) @@ -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 Modified: trunk/source/configure.in =================================================================== --- trunk/source/configure.in 2005-07-15 20:24:19 UTC (rev 8509) +++ trunk/source/configure.in 2005-07-15 21:36:00 UTC (rev 8510) @@ -753,6 +753,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. Modified: trunk/source/include/includes.h =================================================================== --- trunk/source/include/includes.h 2005-07-15 20:24:19 UTC (rev 8509) +++ trunk/source/include/includes.h 2005-07-15 21:36:00 UTC (rev 8510) @@ -508,6 +508,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 @@ -516,6 +518,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
