[cfe-commits] [libcxxabi] r152693 - in /libcxxabi/trunk: lib/buildit src/abort_message.cpp

[Nick Kledzik]

Author: kledzik
Date: Tue Mar 13 20:16:14 2012
New Revision: 152693

URL: http://llvm.org/viewvc/llvm-project?rev=152693&view=rev
Log:
fix crash log magic

Modified:
    libcxxabi/trunk/lib/buildit
    libcxxabi/trunk/src/abort_message.cpp

Modified: libcxxabi/trunk/lib/buildit
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/lib/buildit?rev=152693&r1=152692&r2=152693&view=diff
==============================================================================
--- libcxxabi/trunk/lib/buildit (original)
+++ libcxxabi/trunk/lib/buildit Tue Mar 13 20:16:14 2012
@@ -53,6 +53,10 @@
         -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

Modified: libcxxabi/trunk/src/abort_message.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/abort_message.cpp?rev=152693&r1=152692&r2=152693&view=diff
==============================================================================
--- libcxxabi/trunk/src/abort_message.cpp (original)
+++ libcxxabi/trunk/src/abort_message.cpp Tue Mar 13 20:16:14 2012
@@ -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