diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2010-10-30 17:32:40 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2010-10-30 17:32:40 +0000 |
commit | 4ab36ba72652a843093dca8ce4f7bec493d8654c (patch) | |
tree | ce5f7e638283a751eb6e36d722cad22471dfbfa6 | |
parent | e490b5c29eb73f15d7500b9e3daa4841de1fd14c (diff) | |
download | bcm5719-llvm-4ab36ba72652a843093dca8ce4f7bec493d8654c.tar.gz bcm5719-llvm-4ab36ba72652a843093dca8ce4f7bec493d8654c.zip |
Turns out that we may end up calling dladdr on GetExecutablePath, give it external linkage to make sure the lookup works on all platforms.
llvm-svn: 117813
-rw-r--r-- | clang/examples/clang-interpreter/main.cpp | 2 | ||||
-rw-r--r-- | clang/tools/driver/driver.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/clang/examples/clang-interpreter/main.cpp b/clang/examples/clang-interpreter/main.cpp index b274efa8b03..2866c44c3c9 100644 --- a/clang/examples/clang-interpreter/main.cpp +++ b/clang/examples/clang-interpreter/main.cpp @@ -32,7 +32,7 @@ using namespace clang; using namespace clang::driver; -static llvm::sys::Path GetExecutablePath(const char *Argv0) { +llvm::sys::Path GetExecutablePath(const char *Argv0) { // This just needs to be some symbol in the binary; C++ doesn't // allow taking the address of ::main however. void *MainAddr = (void*) (intptr_t) GetExecutablePath; diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp index 0bd0c60946f..c1172817ed9 100644 --- a/clang/tools/driver/driver.cpp +++ b/clang/tools/driver/driver.cpp @@ -36,8 +36,7 @@ using namespace clang; using namespace clang::driver; -static llvm::sys::Path GetExecutablePath(const char *Argv0, - bool CanonicalPrefixes) { +llvm::sys::Path GetExecutablePath(const char *Argv0, bool CanonicalPrefixes) { if (!CanonicalPrefixes) return llvm::sys::Path(Argv0); |