Merge pull request #6940 from hughbe/crash-client-hidden

Remove CRASH_REPORTER_CLIENT_HIDDEN in favour of equivilent LLVM macro
apple · Jan 21, 2017 · 230b502 · 230b502
2 parents 28a87e6 + 4e55214
commit 230b502
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/include/swift/Runtime/Debug.h b/include/swift/Runtime/Debug.h
@@ -25,7 +25,6 @@
 
 #ifdef SWIFT_HAVE_CRASHREPORTERCLIENT
 
-#define CRASH_REPORTER_CLIENT_HIDDEN __attribute__((visibility("hidden")))
 #define CRASHREPORTER_ANNOTATIONS_VERSION 5
 #define CRASHREPORTER_ANNOTATIONS_SECTION "__crash_info"
 
@@ -41,7 +40,7 @@ struct crashreporter_annotations_t {
 };
 
 extern "C" {
-CRASH_REPORTER_CLIENT_HIDDEN
+LLVM_LIBRARY_VISIBILITY
 extern struct crashreporter_annotations_t gCRAnnotations;
 }
 

diff --git a/stdlib/public/runtime/Errors.cpp b/stdlib/public/runtime/Errors.cpp
@@ -152,7 +152,7 @@ static void dumpStackTraceEntry(unsigned index, void *framePC) {
 // The layout of this struct is CrashReporter ABI, so there are no ABI concerns
 // here.
 extern "C" {
-CRASH_REPORTER_CLIENT_HIDDEN
+LLVM_LIBRARY_VISIBILITY
 struct crashreporter_annotations_t gCRAnnotations
 __attribute__((__section__("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) = {
     CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0, 0};