diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 15:54:59 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 15:54:59 -0800 |
commit | 2f4401a79e96917f78876c3e09b8d31754a26f70 (patch) | |
tree | 8ac45e1d7b302a9f0aaa7e9b9e74aff01965a93d /system/lib/libcxxabi/src/abort_message.cpp | |
parent | 2c8c19f60585d4e8cb78af119faba664a35e2268 (diff) | |
parent | 160cc728e0839e441897d951fa61020bc2176717 (diff) |
Merge branch 'incoming'
Diffstat (limited to 'system/lib/libcxxabi/src/abort_message.cpp')
-rw-r--r-- | system/lib/libcxxabi/src/abort_message.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/system/lib/libcxxabi/src/abort_message.cpp b/system/lib/libcxxabi/src/abort_message.cpp index 7beb86b5..3da4ef67 100644 --- a/system/lib/libcxxabi/src/abort_message.cpp +++ b/system/lib/libcxxabi/src/abort_message.cpp @@ -18,16 +18,6 @@ # 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 |