svn commit: r354692 - head/contrib/llvm/lib/Support/Unix

[Ed Maste]

Author: emaste
Date: Wed Nov 13 21:02:18 2019
New Revision: 354692
URL: https://svnweb.freebsd.org/changeset/base/354692

Log:
  llvm: use AT_EXECPATH from ELF auxiliary vectors for getExecutablePath
  
  /proc/curproc/file and the KERN_PROC_PATHNAME sysctl may not return the
  desired path if there are multiple hardlinks to the file.
  
  PR:		241932
  Tested by:	ler
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/contrib/llvm/lib/Support/Unix/Path.inc

Modified: head/contrib/llvm/lib/Support/Unix/Path.inc
==============================================================================
--- head/contrib/llvm/lib/Support/Unix/Path.inc	Wed Nov 13 20:32:23 2019	(r354691)
+++ head/contrib/llvm/lib/Support/Unix/Path.inc	Wed Nov 13 21:02:18 2019	(r354692)
@@ -38,6 +38,9 @@
 #include <mach-o/dyld.h>
 #include <sys/attr.h>
 #include <copyfile.h>
+#elif defined(__FreeBSD__)
+#include <machine/elf.h>
+extern char **environ;
 #elif defined(__DragonFly__)
 #include <sys/mount.h>
 #endif
@@ -183,13 +186,32 @@ std::string getMainExecutable(const char *argv0, void 
     if (realpath(exe_path, link_path))
       return link_path;
   }
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ||   \
-    defined(__minix) || defined(__DragonFly__) ||                              \
-    defined(__FreeBSD_kernel__) || defined(_AIX)
+#elif defined(__FreeBSD__)
+  // On FreeBSD if the exec path specified in ELF auxiliary vectors is
+  // preferred, if available.  /proc/curproc/file and the KERN_PROC_PATHNAME
+  // sysctl may not return the desired path if there are multiple hardlinks
+  // to the file.
+  char exe_path[PATH_MAX];
+  char **p = ::environ;
+  while (*p++ != 0)
+    ;
+  // ELF auxiliary vectors immediately follow the process's environment.
+  for (;;) {
+    switch (*(uintptr_t *)p++) {
+    case AT_EXECPATH:
+      return *p;
+    case AT_NULL:
+      break;
+    }
+    p++;
+  }
+  // Fall back to argv[0] if auxiliary vectors are not available.
+  if (getprogpath(exe_path, argv0) != NULL)
+    return exe_path;
+#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__minix) || \
+    defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(_AIX)
   StringRef curproc("/proc/curproc/file");
   char exe_path[PATH_MAX];
-  // /proc is not mounted by default under FreeBSD, but gives more accurate
-  // information than argv[0] when it is.
   if (sys::fs::exists(curproc)) {
     ssize_t len = readlink(curproc.str().c_str(), exe_path, sizeof(exe_path));
     if (len > 0) {