From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 4 May 2009 06:12:37 +0000 (+0000)
Subject: Merge r9754 (#includes tweak) from the DARWIN branch.  Also remove a
X-Git-Tag: svn/VALGRIND_3_5_0~723
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e15c2feeae9bfa7632ce98a58e9b00dc3758538;p=thirdparty%2Fvalgrind.git

Merge r9754 (#includes tweak) from the DARWIN branch.  Also remove a
Darwin-specific code snippet that crept in from a previous commit.



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

diff --git a/coregrind/m_aspacemgr/aspacemgr-common.c b/coregrind/m_aspacemgr/aspacemgr-common.c
index 601539e1ef..dd1238e52c 100644
--- a/coregrind/m_aspacemgr/aspacemgr-common.c
+++ b/coregrind/m_aspacemgr/aspacemgr-common.c
@@ -306,17 +306,6 @@ Bool ML_(am_resolve_filename) ( Int fd, /*OUT*/HChar* buf, Int nbuf )
    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
diff --git a/coregrind/m_ume/priv_ume.h b/coregrind/m_ume/priv_ume.h
index 2ac41899e8..ce5f09046c 100644
--- a/coregrind/m_ume/priv_ume.h
+++ b/coregrind/m_ume/priv_ume.h
@@ -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)
diff --git a/coregrind/pub_core_ume.h b/coregrind/pub_core_ume.h
index 2a16e2e1b2..cf7b1ad333 100644
--- a/coregrind/pub_core_ume.h
+++ b/coregrind/pub_core_ume.h
@@ -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                                        ---*/
 /*------------------------------------------------------------*/