[libc++abi][NFC] Remove some cruft from <__cxxabi_config.h> #164578
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-libcxxabi Author: Nikolas Klauser (philnik777) ChangesIn Full diff: https://github.com/llvm/llvm-project/pull/164578.diff 1 Files Affected:
diff --git a/libcxxabi/include/__cxxabi_config.h b/libcxxabi/include/__cxxabi_config.h
index f5101dbc9e599..e4fd845b1fb35 100644
--- a/libcxxabi/include/__cxxabi_config.h
+++ b/libcxxabi/include/__cxxabi_config.h
@@ -14,10 +14,6 @@
#define _LIBCXXABI_ARM_EHABI
#endif
-#if !defined(__has_attribute)
-#define __has_attribute(_attribute_) 0
-#endif
-
#if defined(__clang__)
# define _LIBCXXABI_COMPILER_CLANG
# ifndef __apple_build_version__
@@ -25,10 +21,6 @@
# endif
#elif defined(__GNUC__)
# define _LIBCXXABI_COMPILER_GCC
-#elif defined(_MSC_VER)
-# define _LIBCXXABI_COMPILER_MSVC
-#elif defined(__IBMCPP__)
-# define _LIBCXXABI_COMPILER_IBM
#endif
#if defined(_WIN32)
@@ -66,17 +58,7 @@
#endif
#endif
-#if defined(_LIBCXXABI_COMPILER_MSVC)
-#define _LIBCXXABI_WEAK
-#else
#define _LIBCXXABI_WEAK __attribute__((__weak__))
-#endif
-
-#if defined(__clang__)
-#define _LIBCXXABI_COMPILER_CLANG
-#elif defined(__GNUC__)
-#define _LIBCXXABI_COMPILER_GCC
-#endif
#if __has_attribute(__no_sanitize__) && defined(_LIBCXXABI_COMPILER_CLANG)
#define _LIBCXXABI_NO_CFI __attribute__((__no_sanitize__("cfi")))
@@ -89,11 +71,7 @@
# define _LIBCXXABI_GUARD_ABI_ARM
#endif
-#if defined(_LIBCXXABI_COMPILER_CLANG)
-# if !__has_feature(cxx_exceptions)
-# define _LIBCXXABI_NO_EXCEPTIONS
-# endif
-#elif defined(_LIBCXXABI_COMPILER_GCC) && !defined(__EXCEPTIONS)
+#if !defined(__cpp_exceptions) || __cpp_exceptions < 199711L
# define _LIBCXXABI_NO_EXCEPTIONS
#endif
|
ldionne
reviewed
Oct 24, 2025
| #endif | ||
| #endif | ||
|
|
||
| #if defined(_LIBCXXABI_COMPILER_MSVC) |
There was a problem hiding this comment.
I assume this is unused because we don't support MSVC?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In
<__cxxabi_config.h>there were a few things still around which aren't ever actually used. This removes some of that cruft.