3 files changed, 28 insertions, 0 deletions
diff --git a/include/llvm/System/Path.h b/include/llvm/System/Path.h
index ee860e8..c2a1bbc 100644
--- a/include/llvm/System/Path.h
+++ b/include/llvm/System/Path.h
@@ -161,6 +161,10 @@ namespace sys {
       /// @returns The dynamic link library suffix for the current platform.
       /// @brief Return the dynamic link library suffix.
       static std::string GetDLLSuffix();
+    
+      /// GetMainExecutable - Return the path to the main executable, given the
+      /// value of argv[0] from program startup and the address of main itself.
+      static Path GetMainExecutable(const char *argv0, void *MainAddr);
 
       /// This is one of the very few ways in which a path can be constructed
       /// with a syntactically invalid name. The only *legal* invalid name is an
diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index c8bdd08..8e76b54 100644
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -47,6 +47,10 @@
 # endif
 #endif
 
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
 // Put in a hack for Cygwin which falsely reports that the mkdtemp function
 // is available when it is not.
 #ifdef __CYGWIN__
@@ -244,6 +248,20 @@ Path::GetCurrentDirectory() {
   return Path(pathname);
 }
 
+/// GetMainExecutable - Return the path to the main executable, given the
+/// value of argv[0] from program startup.
+Path Path::GetMainExecutable(const char *argv0, void *MainAddr) {
+  // Use dladdr to get executable path if available.
+#ifdef HAVE_DLFCN_H
+  Dl_info DLInfo;
+  int err = dladdr(MainAddr, &DLInfo);
+  if (err != 0)
+    return Path(std::string(DLInfo.dli_fname));
+#endif
+  return Path();
+}
+
+
 std::string
 Path::getBasename() const {
   // Find the last slash
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index ee3f622..0499e61 100644
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -214,6 +214,12 @@ Path::GetCurrentDirectory() {
   return Path(pathname);  
 }
 
+/// GetMainExecutable - Return the path to the main executable, given the
+/// value of argv[0] from program startup.
+Path Path::GetMainExecutable(const char *argv0, void *MainAddr) {
+  return Path();
+}
+
 
 // FIXME: the above set of functions don't map to Windows very well.