diff options
| author | Omair Javaid <omair.javaid@linaro.org> | 2017-02-02 01:17:49 +0000 |
|---|---|---|
| committer | Omair Javaid <omair.javaid@linaro.org> | 2017-02-02 01:17:49 +0000 |
| commit | f5d560bc84ca0203ad5a1d8f4586fcaf5e18fc6c (patch) | |
| tree | e5c19d9f27c2b6fde9fb3e3b8d0a962fe65001bc /llvm/lib/Support/Unix | |
| parent | 9255b91a2b6a4b87b981ef5e9fa67ffabe155736 (diff) | |
| download | bcm5719-llvm-f5d560bc84ca0203ad5a1d8f4586fcaf5e18fc6c.tar.gz bcm5719-llvm-f5d560bc84ca0203ad5a1d8f4586fcaf5e18fc6c.zip | |
Fix LLDB Android AArch64 GCC debug info build
Committing after fixing suggested changes and tested release/debug builds on
x86_64-linux and arm/aarch64 builds.
Differential revision: https://reviews.llvm.org/D29042
llvm-svn: 293850
Diffstat (limited to 'llvm/lib/Support/Unix')
| -rw-r--r-- | llvm/lib/Support/Unix/Path.inc | 2 | ||||
| -rw-r--r-- | llvm/lib/Support/Unix/Signals.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc index ecc9a2ea8e2..10e21af5371 100644 --- a/llvm/lib/Support/Unix/Path.inc +++ b/llvm/lib/Support/Unix/Path.inc @@ -180,7 +180,7 @@ std::string getMainExecutable(const char *argv0, void *MainAddr) { if (getprogpath(exe_path, argv0)) return exe_path; } -#elif defined(HAVE_DLFCN_H) +#elif defined(HAVE_DLFCN_H) && defined(HAVE_DLADDR) // Use dladdr to get executable path if available. Dl_info DLInfo; int err = dladdr(MainAddr, &DLInfo); diff --git a/llvm/lib/Support/Unix/Signals.inc b/llvm/lib/Support/Unix/Signals.inc index 9752b70644c..081b2fe33a6 100644 --- a/llvm/lib/Support/Unix/Signals.inc +++ b/llvm/lib/Support/Unix/Signals.inc @@ -412,7 +412,7 @@ void llvm::sys::PrintStackTrace(raw_ostream &OS) { if (printSymbolizedStackTrace(Argv0, StackTrace, depth, OS)) return; -#if HAVE_DLFCN_H && __GNUG__ && !defined(__CYGWIN__) +#if HAVE_DLFCN_H && HAVE_DLADDR int width = 0; for (int i = 0; i < depth; ++i) { Dl_info dlinfo; |
