Skip to content

Commit 306ed3a

Browse files
committed
[libc++abi][NFC] Remove some cruft from <__cxxabi_config.h>
1 parent dda30e1 commit 306ed3a

File tree

1 file changed

+1
-23
lines changed

1 file changed

+1
-23
lines changed

libcxxabi/include/__cxxabi_config.h

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,13 @@
1414
#define _LIBCXXABI_ARM_EHABI
1515
#endif
1616

17-
#if !defined(__has_attribute)
18-
#define __has_attribute(_attribute_) 0
19-
#endif
20-
2117
#if defined(__clang__)
2218
# define _LIBCXXABI_COMPILER_CLANG
2319
# ifndef __apple_build_version__
2420
# define _LIBCXXABI_CLANG_VER (__clang_major__ * 100 + __clang_minor__)
2521
# endif
2622
#elif defined(__GNUC__)
2723
# define _LIBCXXABI_COMPILER_GCC
28-
#elif defined(_MSC_VER)
29-
# define _LIBCXXABI_COMPILER_MSVC
30-
#elif defined(__IBMCPP__)
31-
# define _LIBCXXABI_COMPILER_IBM
3224
#endif
3325

3426
#if defined(_WIN32)
@@ -66,17 +58,7 @@
6658
#endif
6759
#endif
6860

69-
#if defined(_LIBCXXABI_COMPILER_MSVC)
70-
#define _LIBCXXABI_WEAK
71-
#else
7261
#define _LIBCXXABI_WEAK __attribute__((__weak__))
73-
#endif
74-
75-
#if defined(__clang__)
76-
#define _LIBCXXABI_COMPILER_CLANG
77-
#elif defined(__GNUC__)
78-
#define _LIBCXXABI_COMPILER_GCC
79-
#endif
8062

8163
#if __has_attribute(__no_sanitize__) && defined(_LIBCXXABI_COMPILER_CLANG)
8264
#define _LIBCXXABI_NO_CFI __attribute__((__no_sanitize__("cfi")))
@@ -89,11 +71,7 @@
8971
# define _LIBCXXABI_GUARD_ABI_ARM
9072
#endif
9173

92-
#if defined(_LIBCXXABI_COMPILER_CLANG)
93-
# if !__has_feature(cxx_exceptions)
94-
# define _LIBCXXABI_NO_EXCEPTIONS
95-
# endif
96-
#elif defined(_LIBCXXABI_COMPILER_GCC) && !defined(__EXCEPTIONS)
74+
#if !defined(__cpp_exceptions) || __cpp_exceptions < 199711L
9775
# define _LIBCXXABI_NO_EXCEPTIONS
9876
#endif
9977

0 commit comments

Comments
 (0)