diff options
| author | Eric Christopher <echristo@apple.com> | 2010-06-28 18:25:51 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2010-06-28 18:25:51 +0000 |
| commit | 4411fbe25e9625ca4dd7c94aebc7ffd70b0e5beb (patch) | |
| tree | fcfd6d300bb12adef3fa32e364c7213225364ecf /lib/Support/PrettyStackTrace.cpp | |
| parent | 4a1cad673c5bf0812099c6c8f551fe6af967c2b3 (diff) | |
| download | llvm-4411fbe25e9625ca4dd7c94aebc7ffd70b0e5beb.tar.gz llvm-4411fbe25e9625ca4dd7c94aebc7ffd70b0e5beb.tar.bz2 llvm-4411fbe25e9625ca4dd7c94aebc7ffd70b0e5beb.tar.xz | |
Pull in the libCrashReporterClient.a information with a warning comment.
Remove library check and regenerate configure.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107028 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/PrettyStackTrace.cpp')
| -rw-r--r-- | lib/Support/PrettyStackTrace.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/Support/PrettyStackTrace.cpp b/lib/Support/PrettyStackTrace.cpp index e01c491fb3..2fecce3845 100644 --- a/lib/Support/PrettyStackTrace.cpp +++ b/lib/Support/PrettyStackTrace.cpp @@ -54,8 +54,15 @@ static void PrintCurStackTrace(raw_ostream &OS) { OS.flush(); } -// Integrate with crash reporter. -#if defined (__APPLE__) && !defined (HAVE_CRASHREPORTERCLIENT_H) +// Integrate with crash reporter libraries. +#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. +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__) static const char *__crashreporter_info__ = 0; asm(".desc ___crashreporter_info__, 0x10"); #endif |