sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

r8510: Don't include the valgrind headers on 64bit linux systems.

Browse Source 
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.
This commit is contained in:
Gerald Carter 2005-07-15 21:36:00 +00:00 committed by Gerald (Jerry) Carter
parent 1993e409a5
commit 318fe7ba00
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/configure.in
View File

@ -752,6 +752,18 @@ CPPFLAGS="$old_CPPFLAGS"
# 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.

3
source/include/includes.h
View File

@ -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