[libcxx-commits] [libcxx] r358988 - [libc++] Remove redundant conditionals for Apple platforms

[Louis Dionne via libcxx-commits]

Author: ldionne
Date: Tue Apr 23 07:05:04 2019
New Revision: 358988

URL: http://llvm.org/viewvc/llvm-project?rev=358988&view=rev
Log:
[libc++] Remove redundant conditionals for Apple platforms

Summary:
In a bunch of places, we used to check whether LIBCXX_BUILDING_LIBCXXABI
is defined OR we're building for an Apple platform. This used to
be necessary in a time when Apple's build script did NOT define
LIBCXX_BUILDING_LIBCXXABI. However this is not relevant anymore
since Apple's build does define LIBCXX_BUILDING_LIBCXXABI.

Reviewers: EricWF

Subscribers: christof, jkorous, dexonsmith, libcxx-commits

Tags: #libc

Differential Revision: https://reviews.llvm.org/D60842

Modified:
    libcxx/trunk/src/exception.cpp
    libcxx/trunk/src/support/runtime/stdexcept_default.ipp
    libcxx/trunk/src/typeinfo.cpp

Modified: libcxx/trunk/src/exception.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/exception.cpp?rev=358988&r1=358987&r2=358988&view=diff
==============================================================================
--- libcxx/trunk/src/exception.cpp (original)
+++ libcxx/trunk/src/exception.cpp Tue Apr 23 07:05:04 2019
@@ -10,8 +10,7 @@
 #include "new"
 #include "typeinfo"
 
-#if defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI) || \
-  (defined(__APPLE__) && !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY))
+#if defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI)
   #include <cxxabi.h>
   using namespace __cxxabiv1;
   #define HAVE_DEPENDENT_EH_ABI 1

Modified: libcxx/trunk/src/support/runtime/stdexcept_default.ipp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/support/runtime/stdexcept_default.ipp?rev=358988&r1=358987&r2=358988&view=diff
==============================================================================
--- libcxx/trunk/src/support/runtime/stdexcept_default.ipp (original)
+++ libcxx/trunk/src/support/runtime/stdexcept_default.ipp Tue Apr 23 07:05:04 2019
@@ -10,8 +10,7 @@
 
 /* For _LIBCPPABI_VERSION */
 #if !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) &&                           \
-    (defined(LIBCXX_BUILDING_LIBCXXABI) || defined(__APPLE__) ||               \
-     defined(LIBCXXRT))
+    (defined(LIBCXX_BUILDING_LIBCXXABI) || defined(LIBCXXRT))
 #include <cxxabi.h>
 #endif
 

Modified: libcxx/trunk/src/typeinfo.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/typeinfo.cpp?rev=358988&r1=358987&r2=358988&view=diff
==============================================================================
--- libcxx/trunk/src/typeinfo.cpp (original)
+++ libcxx/trunk/src/typeinfo.cpp Tue Apr 23 07:05:04 2019
@@ -45,11 +45,11 @@ size_t std::type_info::hash_code() const
 }
 #endif // _LIBCPP_ABI_MICROSOFT
 
-// FIXME: Remove __APPLE__ default here once buildit is gone.
 // FIXME: Remove the _LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY configuration.
-#if (!defined(LIBCXX_BUILDING_LIBCXXABI) && !defined(LIBCXXRT) &&              \
-     !defined(__GLIBCXX__) && !defined(__APPLE__) &&                           \
-     !defined(_LIBCPP_ABI_VCRUNTIME)) ||   \
+#if (!defined(LIBCXX_BUILDING_LIBCXXABI) &&               \
+     !defined(LIBCXXRT) &&                                \
+     !defined(__GLIBCXX__) &&                             \
+     !defined(_LIBCPP_ABI_VCRUNTIME)) ||                  \
     defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY)
 std::type_info::~type_info()
 {