|
From: <sv...@va...> - 2016-11-04 03:43:41
|
Author: rhyskidd
Date: Fri Nov 4 03:43:28 2016
New Revision: 16116
Log:
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));
^
Modified:
trunk/coregrind/m_syswrap/syswrap-generic.c
Modified: trunk/coregrind/m_syswrap/syswrap-generic.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-generic.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c Fri Nov 4 03:43:28 2016
@@ -4129,6 +4129,8 @@
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 @@
#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 @@
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));
}
|