[libcxx-commits] [libcxx] Revert "[libc++] Remove workaround which allows setting _LIBCPP_OVERR… (PR #117779)

[Nico Weber via libcxx-commits]

https://github.com/nico created https://github.com/llvm/llvm-project/pull/117779

…IDABLE_FUNC_VIS externally (#113139)"

This reverts commit 2e686d6d17c4cc7608510a856055e6ca79fcb917.

See https://github.com/llvm/llvm-project/issues/117571

>From ff46ff167acce7ffd32491e7114a6ba0e39cd96f Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis at chromium.org>
Date: Tue, 26 Nov 2024 15:11:54 -0500
Subject: [PATCH] Revert "[libc++] Remove workaround which allows setting
 _LIBCPP_OVERRIDABLE_FUNC_VIS externally (#113139)"

This reverts commit 2e686d6d17c4cc7608510a856055e6ca79fcb917.

See https://github.com/llvm/llvm-project/issues/117571
---
 libcxx/include/__config | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libcxx/include/__config b/libcxx/include/__config
index 9db00cd0c9fb93..fe01b58b8e6274 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -402,7 +402,11 @@ typedef __char32_t char32_t;
 #    define _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_VISIBILITY("default")
 #    define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS _LIBCPP_VISIBILITY("default")
 #    define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
-#    define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_VISIBILITY("default")
+
+// TODO: Make this a proper customization point or remove the option to override it.
+#    ifndef _LIBCPP_OVERRIDABLE_FUNC_VIS
+#      define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_VISIBILITY("default")
+#    endif
 
 #    if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
 // The inline should be removed once PR32114 is resolved