diff options
| author | Nick Kledzik <kledzik@apple.com> | 2012-03-14 01:16:14 +0000 |
|---|---|---|
| committer | Nick Kledzik <kledzik@apple.com> | 2012-03-14 01:16:14 +0000 |
| commit | 37cb6555f0017b9f49ae44b9970cb62eef16ca69 (patch) | |
| tree | bbb3fe1c1a46d826352d9e00345c0e19abe504d6 | |
| parent | 78b505b0656ae1a8b0a7ecf2eaecf510e631d088 (diff) | |
| download | bcm5719-llvm-37cb6555f0017b9f49ae44b9970cb62eef16ca69.tar.gz bcm5719-llvm-37cb6555f0017b9f49ae44b9970cb62eef16ca69.zip | |
fix crash log magic
llvm-svn: 152693
| -rwxr-xr-x | libcxxabi/lib/buildit | 4 | ||||
| -rw-r--r-- | libcxxabi/src/abort_message.cpp | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/libcxxabi/lib/buildit b/libcxxabi/lib/buildit index a3c2488f645..75a7028ab7b 100755 --- a/libcxxabi/lib/buildit +++ b/libcxxabi/lib/buildit @@ -53,6 +53,10 @@ case $TRIPLE in -compatibility_version 1 \ -install_name /usr/lib/libc++abi.dylib \ -lSystem" + if [ -f "${SDKROOT}/usr/local/lib/libCrashReporterClient.a" ] + then + LDSHARED_FLAGS+=" -lCrashReporterClient" + fi ;; *-*-mingw*) # FIXME: removing libgcc and libsupc++ dependencies means porting libcxxrt and LLVM/compiler-rt diff --git a/libcxxabi/src/abort_message.cpp b/libcxxabi/src/abort_message.cpp index 7beb86b5bbd..3da4ef67002 100644 --- a/libcxxabi/src/abort_message.cpp +++ b/libcxxabi/src/abort_message.cpp @@ -18,16 +18,6 @@ # if defined(__has_include) && __has_include(<CrashReporterClient.h>) # define HAVE_CRASHREPORTERCLIENT_H 1 # include <CrashReporterClient.h> - - // If any clients of llvm try to link to libCrashReporterClient.a themselves, - // only one crash info struct will be used. - extern "C" { - CRASH_REPORTER_CLIENT_HIDDEN - struct crashreporter_annotations_t gCRAnnotations - __attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) - = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0 }; - } - # endif #endif |
