@@ -631,7 +631,7 @@ index 79ccd64..ae3bfb0 100644
631631 Solaris,
632632 UEFI,
633633diff --git llvm-clean/llvm/lib/Support/Unix/Path.inc llvm-workdir/llvm/lib/Support/Unix/Path.inc
634- index e2aece4..72a6259 100644
634+ index e2aece4..54741ac 100644
635635--- llvm-clean/llvm/lib/Support/Unix/Path.inc
636636+++ llvm-workdir/llvm/lib/Support/Unix/Path.inc
637637@@ -74,7 +74,8 @@ extern char **environ;
@@ -653,7 +653,26 @@ index e2aece4..72a6259 100644
653653 #if defined(HAVE_LINUX_MAGIC_H)
654654 #include <linux/magic.h>
655655 #else
656- @@ -472,7 +473,7 @@ std::error_code remove(const Twine &path, bool IgnoreNonExisting) {
656+ @@ -129,7 +130,7 @@ const file_t kInvalidFile = -1;
657+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
658+ defined(__minix) || defined(__FreeBSD_kernel__) || defined(__linux__) || \
659+ defined(__CYGWIN__) || defined(__DragonFly__) || defined(_AIX) || \
660+ - defined(__GNU__) || (defined(__sun__) && defined(__svr4__))
661+ + defined(__GNU__) || (defined(__sun__) && defined(__svr4__)) || defined(__aero__)
662+ static int test_dir(char ret[PATH_MAX], const char *dir, const char *bin) {
663+ struct stat sb;
664+ char fullpath[PATH_MAX];
665+ @@ -250,7 +251,8 @@ std::string getMainExecutable(const char *argv0, void *MainAddr) {
666+ // If we don't have procfs mounted, fall back to argv[0]
667+ if (getprogpath(exe_path, argv0) != NULL)
668+ return exe_path;
669+ - #elif defined(__linux__) || defined(__CYGWIN__) || defined(__gnu_hurd__)
670+ + #elif defined(__linux__) || defined(__CYGWIN__) || defined(__gnu_hurd__) || \
671+ + defined(__aero__)
672+ char exe_path[PATH_MAX];
673+ const char *aPath = "/proc/self/exe";
674+ if (sys::fs::exists(aPath)) {
675+ @@ -472,7 +474,7 @@ std::error_code remove(const Twine &path, bool IgnoreNonExisting) {
657676 }
658677
659678 static bool is_local_impl(struct STATVFS &Vfs) {
0 commit comments