Author: hhinnant
Date: Tue Jan 24 13:58:25 2012
New Revision: 148851
URL: http://llvm.org/viewvc/llvm-project?rev=148851&view=rev
Log:
CrashReporterClient.h is back, but this time protected with __has_include.
Thanks for the suggestion Doug. The use is consistent with how the same header
is used in llvm/lib/Support/PrettyStackTrace.cpp (though there autoconfig is
used instead of __has_include).
Removed:
libcxxabi/trunk/src/abort_message.c
Modified:
libcxxabi/trunk/src/abort_message.cpp
libcxxabi/trunk/src/abort_message.h
Removed: libcxxabi/trunk/src/abort_message.c
URL:
http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/abort_message.c?rev=148850&view=auto
==============================================================================
--- libcxxabi/trunk/src/abort_message.c (original)
+++ libcxxabi/trunk/src/abort_message.c (removed)
@@ -1,48 +0,0 @@
-//===-------------------------- abort_message.c
---------------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#if __APPLE__
- #include <Availability.h>
- #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- #include <CrashReporterClient.h>
- #endif
-#endif
-
-#include "abort_message.h"
-
-__attribute__((visibility("hidden")))
-void abort_message(const char* format, ...)
-{
- // write message to stderr
-#if __APPLE__
- fprintf(stderr, "libc++abi.dylib: ");
-#endif
- va_list list;
- va_start(list, format);
- vfprintf(stderr, format, list);
- va_end(list);
- fprintf(stderr, "\n");
-
-#if __APPLE__ && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
- // record message in crash report
- char* buffer;
- va_list list2;
- va_start(list2, format);
- vasprintf(&buffer, format, list2);
- va_end(list2);
- CRSetCrashLogMessage(buffer);
-#endif
-
- abort();
-}
-
Modified: libcxxabi/trunk/src/abort_message.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/abort_message.cpp?rev=148851&r1=148850&r2=148851&view=diff
==============================================================================
--- libcxxabi/trunk/src/abort_message.cpp (original)
+++ libcxxabi/trunk/src/abort_message.cpp Tue Jan 24 13:58:25 2012
@@ -1,4 +1,4 @@
-//===-------------------------- abort_message.c
---------------------------===//
+//===------------------------- abort_message.cpp
--------------------------===//
//
// The LLVM Compiler Infrastructure
//
@@ -12,7 +12,24 @@
#include <stdarg.h>
#include "abort_message.h"
-__attribute__((visibility("hidden")))
+#if __APPLE__
+# 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
+
+__attribute__((visibility("hidden"), noreturn))
void abort_message(const char* format, ...)
{
// write message to stderr
@@ -24,6 +41,16 @@
vfprintf(stderr, format, list);
va_end(list);
fprintf(stderr, "\n");
+
+#if __APPLE__ && HAVE_CRASHREPORTERCLIENT_H
+ // record message in crash report
+ char* buffer;
+ va_list list2;
+ va_start(list2, format);
+ vasprintf(&buffer, format, list2);
+ va_end(list2);
+ CRSetCrashLogMessage(buffer);
+#endif
+
abort();
}
-
Modified: libcxxabi/trunk/src/abort_message.h
URL:
http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/abort_message.h?rev=148851&r1=148850&r2=148851&view=diff
==============================================================================
--- libcxxabi/trunk/src/abort_message.h (original)
+++ libcxxabi/trunk/src/abort_message.h Tue Jan 24 13:58:25 2012
@@ -12,11 +12,11 @@
#include "cxxabi.h"
-#ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
#endif
-extern LIBCXXABI_NORETURN
+__attribute__((visibility("hidden"), noreturn))
void abort_message(const char* format, ...)
__attribute__((format(printf, 1, 2)));
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
