From 481d402ab03e163e180d2650fae13704858f8d81 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Fri, 3 Dec 2010 07:45:22 +0000 Subject: Apparently OS X 10.4 doesn't have __crashreporter_info__. Try to fix building on the wayback machine. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120801 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/PrettyStackTrace.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/Support') diff --git a/lib/Support/PrettyStackTrace.cpp b/lib/Support/PrettyStackTrace.cpp index 2f46b9e..cd7c097 100644 --- a/lib/Support/PrettyStackTrace.cpp +++ b/lib/Support/PrettyStackTrace.cpp @@ -55,7 +55,7 @@ static void PrintCurStackTrace(raw_ostream &OS) { } // Integrate with crash reporter libraries. -#if defined (__APPLE__) && defined (HAVE_CRASHREPORTERCLIENT_H) +#if defined (__APPLE__) && 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" { @@ -64,7 +64,7 @@ struct crashreporter_annotations_t gCRAnnotations __attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0 }; } -#elif defined (__APPLE__) +#elif defined (__APPLE__) && HAVE_CRASHREPORTER_INFO static const char *__crashreporter_info__ = 0; asm(".desc ___crashreporter_info__, 0x10"); #endif @@ -86,11 +86,11 @@ static void CrashHandler(void *) { } if (!TmpStr.empty()) { -#ifndef HAVE_CRASHREPORTERCLIENT_H - __crashreporter_info__ = strdup(std::string(TmpStr.str()).c_str()); -#else +#ifdef HAVE_CRASHREPORTERCLIENT_H // Cast to void to avoid warning. (void)CRSetCrashLogMessage(std::string(TmpStr.str()).c_str()); +#elif HAVE_CRASHREPORTER_INFO + __crashreporter_info__ = strdup(std::string(TmpStr.str()).c_str()); #endif errs() << TmpStr.str(); } -- cgit v1.1