From: Eric Christopher Date: Mon, 28 Jun 2010 18:33:48 +0000 (+0000) Subject: Fix thinko. X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7d59a9766c1a48ea359e8014f9e7e7d01a57b593;p=oota-llvm.git Fix thinko. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107042 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Support/PrettyStackTrace.cpp b/lib/Support/PrettyStackTrace.cpp index 2fecce38453..a99ab2f30df 100644 --- a/lib/Support/PrettyStackTrace.cpp +++ b/lib/Support/PrettyStackTrace.cpp @@ -58,11 +58,13 @@ static void PrintCurStackTrace(raw_ostream &OS) { #if defined (__APPLE__) && defined (HAVE_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 }; -#else if defined (__APPLE__) + = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0 }; +} +#elif defined (__APPLE__) static const char *__crashreporter_info__ = 0; asm(".desc ___crashreporter_info__, 0x10"); #endif