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 | 51f29083284824906ca1bdb559154cc5042c0fc2 (patch) | |
| tree | e9ed990a07d956bab0c61de56eaba0451b434265 /llvm/lib/Support/PrettyStackTrace.cpp | |
| parent | f3b2db68c6c717ed09865883845705fe94852598 (diff) | |
| download | bcm5719-llvm-51f29083284824906ca1bdb559154cc5042c0fc2.tar.gz bcm5719-llvm-51f29083284824906ca1bdb559154cc5042c0fc2.zip | |
Pull in the libCrashReporterClient.a information with a warning comment.
Remove library check and regenerate configure.
llvm-svn: 107028
Diffstat (limited to 'llvm/lib/Support/PrettyStackTrace.cpp')
| -rw-r--r-- | llvm/lib/Support/PrettyStackTrace.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/llvm/lib/Support/PrettyStackTrace.cpp b/llvm/lib/Support/PrettyStackTrace.cpp index e01c491fb3a..2fecce38453 100644 --- a/llvm/lib/Support/PrettyStackTrace.cpp +++ b/llvm/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 |
