Fix build with GCC:
- GCC doesn't support #pragma mark, only Apple GCC and clang. Wrap the pragma mark's in #if 0 to make gcc ignore them but xcode still see them.
- Wrap a bunch of "#pragma clang" lines in #ifdef __clang__.
- Pacify gcc's -Wparenthesis in a case where it's quite reasonable.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@231344 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/src/cxa_demangle.cpp b/src/cxa_demangle.cpp
index 2d07686..1344f43 100644
--- a/src/cxa_demangle.cpp
+++ b/src/cxa_demangle.cpp
@@ -4711,7 +4711,7 @@
std::size_t
align_up(std::size_t n) noexcept
- {return n + (alignment-1) & ~(alignment-1);}
+ {return (n + (alignment-1)) & ~(alignment-1);}
bool
pointer_in_buffer(char* p) noexcept
diff --git a/src/cxa_vector.cpp b/src/cxa_vector.cpp
index 3c9b535..c0d806f 100644
--- a/src/cxa_vector.cpp
+++ b/src/cxa_vector.cpp
@@ -17,7 +17,9 @@
namespace __cxxabiv1 {
+#if 0
#pragma mark --Helper routines and classes --
+#endif
namespace {
inline static size_t __get_element_count ( void *p ) {
@@ -102,7 +104,9 @@
};
}
+#if 0
#pragma mark --Externally visible routines--
+#endif
extern "C" {
diff --git a/src/private_typeinfo.cpp b/src/private_typeinfo.cpp
index 821796f..d410dab 100644
--- a/src/private_typeinfo.cpp
+++ b/src/private_typeinfo.cpp
@@ -219,8 +219,10 @@
return is_equal(this, thrown_type, false);
}
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+#endif
// Handles bullets 1 and 2
bool
@@ -246,7 +248,9 @@
return false;
}
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
void
__class_type_info::process_found_base_class(__dynamic_cast_info* info,
@@ -351,8 +355,10 @@
is_equal(thrown_type, &typeid(std::nullptr_t), false);
}
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+#endif
// Handles bullets 1, 3 and 4
// NOTE: It might not be safe to adjust the pointer if it is not not a pointer
@@ -403,13 +409,17 @@
return false;
}
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
#pragma GCC visibility pop
#pragma GCC visibility push(default)
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+#endif
// __dynamic_cast
@@ -578,7 +588,9 @@
return const_cast<void*>(dst_ptr);
}
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
#pragma GCC visibility pop
#pragma GCC visibility push(hidden)