|
From: <sv...@va...> - 2009-05-04 06:12:39
|
Author: njn
Date: 2009-05-04 07:12:37 +0100 (Mon, 04 May 2009)
New Revision: 9756
Log:
Merge r9754 (#includes tweak) from the DARWIN branch. Also remove a
Darwin-specific code snippet that crept in from a previous commit.
Modified:
trunk/coregrind/m_aspacemgr/aspacemgr-common.c
trunk/coregrind/m_ume/priv_ume.h
trunk/coregrind/pub_core_ume.h
Modified: trunk/coregrind/m_aspacemgr/aspacemgr-common.c
===================================================================
--- trunk/coregrind/m_aspacemgr/aspacemgr-common.c 2009-05-04 06:09:56 UTC (rev 9755)
+++ trunk/coregrind/m_aspacemgr/aspacemgr-common.c 2009-05-04 06:12:37 UTC (rev 9756)
@@ -306,17 +306,6 @@
I_die_here; /* maybe just return False? */
return False;
-#elif defined(VGO_darwin)
- HChar tmp[VKI_MAXPATHLEN+1];
- if (0 == ML_(am_fcntl)(fd, VKI_F_GETPATH, (UWord)tmp)) {
- if (nbuf > 0) {
- VG_(strncpy)( buf, tmp, nbuf < sizeof(tmp) ? nbuf : sizeof(tmp) );
- buf[nbuf-1] = 0;
- }
- if (tmp[0] == '/') return True;
- }
- return False;
-
# else
# error Unknown OS
# endif
Modified: trunk/coregrind/m_ume/priv_ume.h
===================================================================
--- trunk/coregrind/m_ume/priv_ume.h 2009-05-04 06:09:56 UTC (rev 9755)
+++ trunk/coregrind/m_ume/priv_ume.h 2009-05-04 06:12:37 UTC (rev 9756)
@@ -30,17 +30,6 @@
#ifndef __PRIV_UME_H
#define __PRIV_UME_H
-#if defined(VGO_linux)
-# define HAVE_ELF
-# define HAVE_SCRIPT
-
-#elif defined(VGO_aix5)
-// The AIX port doesn't use UME.
-
-#else
-#error unknown architecture
-#endif
-
extern int VG_(do_exec_inner)(const HChar *exe, ExeInfo *info);
#if defined(HAVE_ELF)
Modified: trunk/coregrind/pub_core_ume.h
===================================================================
--- trunk/coregrind/pub_core_ume.h 2009-05-04 06:09:56 UTC (rev 9755)
+++ trunk/coregrind/pub_core_ume.h 2009-05-04 06:12:37 UTC (rev 9756)
@@ -36,6 +36,17 @@
// and exec'ing.
//--------------------------------------------------------------------
+#if defined(VGO_linux)
+# define HAVE_ELF
+# define HAVE_SCRIPT
+
+#elif defined(VGO_aix5)
+// The AIX port doesn't use UME.
+
+#else
+#error unknown architecture
+#endif
+
/*------------------------------------------------------------*/
/*--- Loading files ---*/
/*------------------------------------------------------------*/
|