|
From: <sv...@va...> - 2009-08-28 16:25:35
|
Author: bart
Date: 2009-08-28 17:25:20 +0100 (Fri, 28 Aug 2009)
New Revision: 10877
Log:
Merged r10859:10860 and r10862:10868 from the trunk to the 3.5 branch. These changes fix bug #204843 and hence re-enable cross-compilation.
Modified:
branches/VALGRIND_3_5_BRANCH/
branches/VALGRIND_3_5_BRANCH/configure.in
branches/VALGRIND_3_5_BRANCH/coregrind/m_aspacemgr/aspacemgr-linux.c
branches/VALGRIND_3_5_BRANCH/coregrind/m_main.c
branches/VALGRIND_3_5_BRANCH/coregrind/m_syswrap/syswrap-generic.c
Property changes on: branches/VALGRIND_3_5_BRANCH
___________________________________________________________________
Name: svn:mergeinfo
-
Modified: branches/VALGRIND_3_5_BRANCH/configure.in
===================================================================
--- branches/VALGRIND_3_5_BRANCH/configure.in 2009-08-27 23:22:39 UTC (rev 10876)
+++ branches/VALGRIND_3_5_BRANCH/configure.in 2009-08-28 16:25:20 UTC (rev 10877)
@@ -1470,14 +1470,6 @@
#----------------------------------------------------------------------------
-# Check for /proc filesystem
-#----------------------------------------------------------------------------
-AC_CHECK_FILES(/proc/self/fd /proc/self/exe /proc/self/maps,
- [ AC_DEFINE([HAVE_PROC], 1, [can use /proc filesystem]) ],
- [])
-
-
-#----------------------------------------------------------------------------
# Checks for C header files.
#----------------------------------------------------------------------------
Modified: branches/VALGRIND_3_5_BRANCH/coregrind/m_aspacemgr/aspacemgr-linux.c
===================================================================
--- branches/VALGRIND_3_5_BRANCH/coregrind/m_aspacemgr/aspacemgr-linux.c 2009-08-27 23:22:39 UTC (rev 10876)
+++ branches/VALGRIND_3_5_BRANCH/coregrind/m_aspacemgr/aspacemgr-linux.c 2009-08-28 16:25:20 UTC (rev 10877)
@@ -2986,7 +2986,7 @@
#endif // HAVE_MREMAP
-#if HAVE_PROC
+#if defined(VGO_linux)
/*-----------------------------------------------------------------*/
/*--- ---*/
@@ -3493,7 +3493,7 @@
return !css_overflowed;
}
-#endif // HAVE_PROC
+#endif // defined(VGO_linux)
#endif // defined(VGO_linux) || defined(VGO_darwin)
Modified: branches/VALGRIND_3_5_BRANCH/coregrind/m_main.c
===================================================================
--- branches/VALGRIND_3_5_BRANCH/coregrind/m_main.c 2009-08-27 23:22:39 UTC (rev 10876)
+++ branches/VALGRIND_3_5_BRANCH/coregrind/m_main.c 2009-08-28 16:25:20 UTC (rev 10877)
@@ -1802,7 +1802,7 @@
// when it tries to open /proc/<pid>/cmdline for itself.
// p: setup file descriptors
//--------------------------------------------------------------
-#if !HAVE_PROC
+#if !defined(VGO_linux)
// client shouldn't be using /proc!
VG_(cl_cmdline_fd) = -1;
#else
Modified: branches/VALGRIND_3_5_BRANCH/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- branches/VALGRIND_3_5_BRANCH/coregrind/m_syswrap/syswrap-generic.c 2009-08-27 23:22:39 UTC (rev 10876)
+++ branches/VALGRIND_3_5_BRANCH/coregrind/m_syswrap/syswrap-generic.c 2009-08-28 16:25:20 UTC (rev 10877)
@@ -3526,7 +3526,7 @@
}
PRE_MEM_RASCIIZ( "open(filename)", ARG1 );
-#if HAVE_PROC
+#if defined(VGO_linux)
/* Handle the case where the open is of /proc/self/cmdline or
/proc/<pid>/cmdline, and just give it a copy of the fd for the
fake file we cooked up at startup (in m_main). Also, seek the
@@ -3551,7 +3551,7 @@
return;
}
}
-#endif // HAVE_PROC
+#endif // defined(VGO_linux)
/* Otherwise handle normally */
*flags |= SfMayBlock;
@@ -3674,7 +3674,7 @@
PRE_MEM_WRITE( "readlink(buf)", ARG2,ARG3 );
{
-#if HAVE_PROC
+#if defined(VGO_linux)
/*
* Handle the case where readlink is looking at /proc/self/exe or
* /proc/<pid>/exe.
@@ -3690,7 +3690,7 @@
SET_STATUS_from_SysRes( VG_(do_syscall3)(saved, (UWord)name,
ARG2, ARG3));
} else
-#endif // HAVE_PROC
+#endif // defined(VGO_linux)
{
/* Normal case */
SET_STATUS_from_SysRes( VG_(do_syscall3)(saved, ARG1, ARG2, ARG3));
|