From: Rhys Kidd <rhyskidd@gmail.com>
Date: Fri, 4 Nov 2016 03:43:28 +0000 (+0000)
Subject: Fix compile error on macOS introduced in r16111. n-i-bz.
X-Git-Tag: svn/VALGRIND_3_13_0~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccc8f80b4fff2460e34b754899c8cd1bbd407638;p=thirdparty%2Fvalgrind.git

Fix compile error on macOS introduced in r16111. n-i-bz.

m_syswrap/syswrap-generic.c:4148:26: error: use of undeclared identifier 'PID_EXEPATH'
      VG_(sprintf)(name, PID_EXEPATH, VG_(getpid)());
                         ^
m_syswrap/syswrap-generic.c:4150:56: error: use of undeclared identifier 'SELF_EXEPATH'
          && (VG_STREQ(arg1s, name) || VG_STREQ(arg1s, SELF_EXEPATH))) {
                                                       ^
m_syswrap/syswrap-generic.c:4150:56: error: use of undeclared identifier 'SELF_EXEPATH'
m_syswrap/syswrap-generic.c:4151:29: error: use of undeclared identifier 'SELF_EXEFD'
         VG_(sprintf)(name, SELF_EXEFD, VG_(cl_exec_fd));
                            ^

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16116
---

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 7460464fa9..6ef6a90d04 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -4129,6 +4129,8 @@ PRE(sys_readlink)
    PRE_MEM_WRITE( "readlink(buf)", ARG2,ARG3 );
 
 
+   {
+#if defined(VGO_linux) || defined(VGO_solaris)
 #if defined(VGO_linux)
 #define PID_EXEPATH  "/proc/%d/exe"
 #define SELF_EXEPATH "/proc/self/exe"
@@ -4138,7 +4140,6 @@ PRE(sys_readlink)
 #define SELF_EXEPATH "/proc/self/path/a.out"
 #define SELF_EXEFD   "/proc/self/path/%d"
 #endif
-   {
       /*
        * Handle the case where readlink is looking at /proc/self/exe or
        * /proc/<pid>/exe, or equivalent on Solaris.
@@ -4151,7 +4152,9 @@ PRE(sys_readlink)
          VG_(sprintf)(name, SELF_EXEFD, VG_(cl_exec_fd));
          SET_STATUS_from_SysRes( VG_(do_syscall3)(saved, (UWord)name, 
                                                          ARG2, ARG3));
-      } else {
+      } else
+#endif
+      {
          /* Normal case */
          SET_STATUS_from_SysRes( VG_(do_syscall3)(saved, ARG1, ARG2, ARG3));
       }