[llvm] ae6b0ed - [gn build] Port b5270ba20dc3

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2023-06-29T21:36:16-07:00
New Revision: ae6b0edfaca74469f3da56db7498fb3d25f61229

URL: https://github.com/llvm/llvm-project/commit/ae6b0edfaca74469f3da56db7498fb3d25f61229
DIFF: https://github.com/llvm/llvm-project/commit/ae6b0edfaca74469f3da56db7498fb3d25f61229.diff

LOG: [gn build] Port b5270ba20dc3

Added: 
    

Modified: 
    llvm/utils/gn/secondary/libcxx/config.gni
    llvm/utils/gn/secondary/libcxx/include/BUILD.gn
    llvm/utils/gn/secondary/libcxx/src/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/libcxx/config.gni b/llvm/utils/gn/secondary/libcxx/config.gni
index 7bb7fb70ea88ea..9e49db1dcc8cea 100644
--- a/llvm/utils/gn/secondary/libcxx/config.gni
+++ b/llvm/utils/gn/secondary/libcxx/config.gni
@@ -4,7 +4,4 @@ declare_args() {
 
   # libc++ inline ABI namespace. Defaults to __n, where n is the ABI version.
   libcxx_abi_namespace = ""
-
-  # Whether to support libc++ opt-in debug mode via _LIBCPP_ENABLE_DEBUG_MODE.
-  libcxx_enable_debug_mode = false
 }

diff  --git a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
index eebfddc280636b..486046fcd3902c 100644
--- a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
@@ -49,11 +49,6 @@ if (current_toolchain == default_toolchain) {
     } else {
       values += [ "_LIBCPP_ABI_NAMESPACE=__" + libcxx_abi_version ]
     }
-    if (libcxx_enable_debug_mode) {
-      values += [ "_LIBCPP_ENABLE_DEBUG_MODE=1" ]
-    } else {
-      values += [ "_LIBCPP_ENABLE_DEBUG_MODE=" ]
-    }
   }
 
   write_cmake_config("write_modulemap") {
@@ -400,7 +395,6 @@ if (current_toolchain == default_toolchain) {
       "__coroutine/coroutine_traits.h",
       "__coroutine/noop_coroutine_handle.h",
       "__coroutine/trivial_awaitables.h",
-      "__debug",
       "__debug_utils/randomize_range.h",
       "__debug_utils/strict_weak_ordering_check.h",
       "__exception/exception.h",

diff  --git a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
index 50ffd388a0d0f1..8a18922c4b4bc2 100644
--- a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
@@ -195,12 +195,6 @@ if (target_os == "zos") {
     "support/ibm/xlocale_zos.cpp",
   ]
 }
-if (libcxx_enable_debug_mode) {
-  cxx_sources += [
-    "debug.cpp",
-    "legacy_debug_handler.cpp",
-  ]
-}
 if (libcxx_enable_filesystem) {
   cxx_sources += [
     "filesystem/directory_entry.cpp",