Merged r10859:10860 and r10862:10868 from the trunk to the 3.5 branch. These changes...

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_5_BRANCH@10877

diff --git a/configure.in b/configure.in
index c45a9f00da530d88d2bc0818eb2e77affa989021..9e1f6bd951335eb61a575dacd38c405c15fbee25 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1469,14 +1469,6 @@ AC_DEFINE([HAVE_TLS], 1, [can use __thread to define thread-local variables])
 fi
 
 
-#----------------------------------------------------------------------------
-# 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.
 #----------------------------------------------------------------------------

diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index 8580b19e05e5eb32f644d6dc50d7dbcb92477889..53ed143a2dc06faa545cc0b1e1da014e1ee887d0 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -2986,7 +2986,7 @@ Bool VG_(am_relocate_nooverlap_client)( /*OUT*/Bool* need_discard,
 #endif // HAVE_MREMAP
 
 
-#if HAVE_PROC
+#if defined(VGO_linux)
 
 /*-----------------------------------------------------------------*/
 /*---                                                           ---*/
@@ -3493,7 +3493,7 @@ Bool VG_(get_changed_segments)(
    return !css_overflowed;
 }
 
-#endif // HAVE_PROC
+#endif // defined(VGO_linux)
 
 
 #endif // defined(VGO_linux) || defined(VGO_darwin)

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 216ce548f7584f54622e155726fb6d64bcb6f391..190569c86b4f014e6d9f4f0452c5cd13fb998bdb 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1802,7 +1802,7 @@ Int valgrind_main ( Int argc, HChar **argv, HChar **envp )
    // 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

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 6332859a4230bb82450bcc0cee4e60428966e254..5f66535600af1cff40aafb6d3a6c125469b574b8 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -3526,7 +3526,7 @@ PRE(sys_open)
    }
    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 @@ PRE(sys_open)
          return;
       }
    }
-#endif // HAVE_PROC
+#endif // defined(VGO_linux)
 
    /* Otherwise handle normally */
    *flags |= SfMayBlock;
@@ -3674,7 +3674,7 @@ PRE(sys_readlink)
    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 @@ PRE(sys_readlink)
          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));