d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvm: use elf_aux_info to get executable's path, if available

Browse Source 
Obtained from:	LLVM a0a38b81ea
MFC with:	r354692
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2019-11-14 15:10:01 +00:00
parent 3eb70a09f4
commit 4916bb44b0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354707
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/llvm/lib/Support/Unix/Path.inc
View File

@ -39,8 +39,13 @@
#include <sys/attr.h>
#include <copyfile.h>
#elif defined(__FreeBSD__)
#include <osreldate.h>
#if __FreeBSD_version >= 1300057
#include <sys/auxv.h>
#else
#include <machine/elf.h>
extern char **environ;
#endif
#elif defined(__DragonFly__)
#include <sys/mount.h>
#endif
@ -192,10 +197,17 @@ std::string getMainExecutable(const char *argv0, void *MainAddr) {
// sysctl may not return the desired path if there are multiple hardlinks
// to the file.
char exe_path[PATH_MAX];
#if __FreeBSD_version >= 1300057
if (elf_aux_info(AT_EXECPATH, exe_path, sizeof(exe_path)) == 0)
return exe_path;
#else
// elf_aux_info(AT_EXECPATH, ... is not available on older FreeBSD. Fall
// back to finding the ELF auxiliary vectors after the processes's
// environment.
char **p = ::environ;
while (*p++ != 0)
;
// ELF auxiliary vectors immediately follow the process's environment.
// Iterate through auxiliary vectors for AT_EXECPATH.
for (;;) {
switch (*(uintptr_t *)p++) {
case AT_EXECPATH:
@ -205,6 +217,7 @@ std::string getMainExecutable(const char *argv0, void *MainAddr) {
}
p++;
}
#endif
// Fall back to argv[0] if auxiliary vectors are not available.
if (getprogpath(exe_path, argv0) != NULL)
return exe_path;