[libc-commits] [libc] Revert "[libc] Migrate to using LIBC_NAMESPACE_DECL for namespace declaration" (PR #98593)

Fri Jul 12 00:12:31 PDT 2024

llvmbot wrote:



@llvm/pr-subscribers-libc

@llvm/pr-subscribers-backend-amdgpu

Author: Mehdi Amini (joker-eph)

<details>
<summary>Changes</summary>

Reverts llvm/llvm-project#98075

bots are broken

---

Patch is 1.51 MiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/98593.diff


2327 Files Affected:

- (modified) libc/benchmarks/LibcDefaultImplementations.cpp (+2-3) 
- (modified) libc/benchmarks/LibcMemoryBenchmarkMain.cpp (+2-3) 
- (modified) libc/benchmarks/automemcpy/lib/CodeGen.cpp (+2-3) 
- (modified) libc/benchmarks/automemcpy/unittests/CodeGenTest.cpp (+2-3) 
- (modified) libc/benchmarks/gpu/BenchmarkLogger.cpp (+2-3) 
- (modified) libc/benchmarks/gpu/BenchmarkLogger.h (+2-4) 
- (modified) libc/benchmarks/gpu/LibcGpuBenchmark.cpp (+2-3) 
- (modified) libc/benchmarks/gpu/LibcGpuBenchmark.h (+2-3) 
- (modified) libc/benchmarks/gpu/timing/amdgpu/timing.h (+2-2) 
- (modified) libc/benchmarks/gpu/timing/nvptx/timing.h (+2-2) 
- (modified) libc/cmake/modules/LLVMLibCObjectRules.cmake (+5-5) 
- (modified) libc/config/linux/app.h (+2-3) 
- (modified) libc/docs/dev/clang_tidy_checks.rst (+7-7) 
- (modified) libc/fuzzing/__support/hashtable_fuzz.cpp (+2-3) 
- (modified) libc/src/__support/CPP/algorithm.h (+2-3) 
- (modified) libc/src/__support/CPP/array.h (+2-3) 
- (modified) libc/src/__support/CPP/atomic.h (+2-3) 
- (modified) libc/src/__support/CPP/bit.h (+2-5) 
- (modified) libc/src/__support/CPP/bitset.h (+2-5) 
- (modified) libc/src/__support/CPP/cstddef.h (+2-5) 
- (modified) libc/src/__support/CPP/expected.h (+2-5) 
- (modified) libc/src/__support/CPP/functional.h (+2-3) 
- (modified) libc/src/__support/CPP/iterator.h (+2-3) 
- (modified) libc/src/__support/CPP/limits.h (+2-3) 
- (modified) libc/src/__support/CPP/mutex.h (+2-4) 
- (modified) libc/src/__support/CPP/new.h (+2-3) 
- (modified) libc/src/__support/CPP/optional.h (+2-3) 
- (modified) libc/src/__support/CPP/span.h (+2-5) 
- (modified) libc/src/__support/CPP/string.h (+2-3) 
- (modified) libc/src/__support/CPP/string_view.h (+2-3) 
- (modified) libc/src/__support/CPP/stringstream.h (+2-3) 
- (modified) libc/src/__support/CPP/type_traits/add_lvalue_reference.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/add_pointer.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/add_rvalue_reference.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/aligned_storage.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/always_false.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/bool_constant.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/conditional.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/decay.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/enable_if.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/false_type.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/integral_constant.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/invoke.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/invoke_result.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_arithmetic.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_array.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_base_of.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_class.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_const.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_constant_evaluated.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_convertible.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_destructible.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_enum.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_fixed_point.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_floating_point.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_function.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_integral.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_lvalue_reference.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_member_pointer.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_null_pointer.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_object.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_pointer.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_reference.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_rvalue_reference.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_same.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_scalar.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_signed.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_trivially_constructible.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_trivially_copyable.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_trivially_destructible.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_union.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_unsigned.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/is_void.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/make_signed.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/make_unsigned.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/remove_all_extents.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/remove_cv.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/remove_cvref.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/remove_extent.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/remove_reference.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/true_type.h (+2-5) 
- (modified) libc/src/__support/CPP/type_traits/type_identity.h (+2-6) 
- (modified) libc/src/__support/CPP/type_traits/void_t.h (+2-5) 
- (modified) libc/src/__support/CPP/utility/declval.h (+2-5) 
- (modified) libc/src/__support/CPP/utility/forward.h (+2-5) 
- (modified) libc/src/__support/CPP/utility/in_place.h (+2-5) 
- (modified) libc/src/__support/CPP/utility/integer_sequence.h (+2-5) 
- (modified) libc/src/__support/CPP/utility/move.h (+2-5) 
- (modified) libc/src/__support/FPUtil/BasicOperations.h (+2-3) 
- (modified) libc/src/__support/FPUtil/DivisionAndRemainderOperations.h (+2-3) 
- (modified) libc/src/__support/FPUtil/FEnvImpl.h (+4-9) 
- (modified) libc/src/__support/FPUtil/FMA.h (+2-3) 
- (modified) libc/src/__support/FPUtil/FPBits.h (+2-3) 
- (modified) libc/src/__support/FPUtil/Hypot.h (+2-3) 
- (modified) libc/src/__support/FPUtil/ManipulationFunctions.h (+2-3) 
- (modified) libc/src/__support/FPUtil/NearestIntegerOperations.h (+2-3) 
- (modified) libc/src/__support/FPUtil/NormalFloat.h (+2-3) 
- (modified) libc/src/__support/FPUtil/PolyEval.h (+2-3) 
- (modified) libc/src/__support/FPUtil/aarch64/FEnvImpl.h (+2-3) 
- (modified) libc/src/__support/FPUtil/aarch64/fenv_darwin_impl.h (+2-3) 
- (modified) libc/src/__support/FPUtil/aarch64/nearest_integer.h (+2-3) 
- (modified) libc/src/__support/FPUtil/aarch64/sqrt.h (+2-3) 
- (modified) libc/src/__support/FPUtil/arm/FEnvImpl.h (+2-3) 
- (modified) libc/src/__support/FPUtil/double_double.h (+2-5) 
- (modified) libc/src/__support/FPUtil/dyadic_float.h (+2-5) 
- (modified) libc/src/__support/FPUtil/except_value_utils.h (+2-3) 
- (modified) libc/src/__support/FPUtil/fpbits_str.h (+2-3) 
- (modified) libc/src/__support/FPUtil/generic/FMA.h (+2-3) 
- (modified) libc/src/__support/FPUtil/generic/FMod.h (+2-3) 
- (modified) libc/src/__support/FPUtil/generic/README.md (+2-2) 
- (modified) libc/src/__support/FPUtil/generic/add_sub.h (+2-5) 
- (modified) libc/src/__support/FPUtil/generic/div.h (+2-5) 
- (modified) libc/src/__support/FPUtil/generic/sqrt.h (+2-3) 
- (modified) libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h (+2-3) 
- (modified) libc/src/__support/FPUtil/multiply_add.h (+4-5) 
- (modified) libc/src/__support/FPUtil/nearest_integer.h (+4-5) 
- (modified) libc/src/__support/FPUtil/riscv/FEnvImpl.h (+2-2) 
- (modified) libc/src/__support/FPUtil/riscv/sqrt.h (+2-3) 
- (modified) libc/src/__support/FPUtil/rounding_mode.h (+2-5) 
- (modified) libc/src/__support/FPUtil/triple_double.h (+2-6) 
- (modified) libc/src/__support/FPUtil/x86_64/FEnvImpl.h (+2-3) 
- (modified) libc/src/__support/FPUtil/x86_64/NextAfterLongDouble.h (+2-3) 
- (modified) libc/src/__support/FPUtil/x86_64/NextUpDownLongDouble.h (+2-5) 
- (modified) libc/src/__support/FPUtil/x86_64/nearest_integer.h (+2-3) 
- (modified) libc/src/__support/FPUtil/x86_64/sqrt.h (+2-3) 
- (modified) libc/src/__support/File/dir.cpp (+2-3) 
- (modified) libc/src/__support/File/dir.h (+2-3) 
- (modified) libc/src/__support/File/file.cpp (+2-3) 
- (modified) libc/src/__support/File/file.h (+2-3) 
- (modified) libc/src/__support/File/linux/dir.cpp (+2-3) 
- (modified) libc/src/__support/File/linux/file.cpp (+3-4) 
- (modified) libc/src/__support/File/linux/file.h (+2-3) 
- (modified) libc/src/__support/File/linux/lseekImpl.h (+2-3) 
- (modified) libc/src/__support/File/linux/stderr.cpp (+2-3) 
- (modified) libc/src/__support/File/linux/stdin.cpp (+2-3) 
- (modified) libc/src/__support/File/linux/stdout.cpp (+2-3) 
- (modified) libc/src/__support/GPU/allocator.cpp (+2-3) 
- (modified) libc/src/__support/GPU/allocator.h (+2-3) 
- (modified) libc/src/__support/GPU/amdgpu/utils.h (+2-2) 
- (modified) libc/src/__support/GPU/generic/utils.h (+2-3) 
- (modified) libc/src/__support/GPU/nvptx/utils.h (+2-3) 
- (modified) libc/src/__support/GPU/utils.h (+2-3) 
- (modified) libc/src/__support/HashTable/bitmask.h (+2-3) 
- (modified) libc/src/__support/HashTable/generic/bitmask_impl.inc (+2-3) 
- (modified) libc/src/__support/HashTable/randomness.h (+2-3) 
- (modified) libc/src/__support/HashTable/sse2/bitmask_impl.inc (+2-5) 
- (modified) libc/src/__support/HashTable/table.h (+2-3) 
- (modified) libc/src/__support/OSUtil/baremetal/exit.cpp (+2-5) 
- (modified) libc/src/__support/OSUtil/baremetal/io.cpp (+2-3) 
- (modified) libc/src/__support/OSUtil/baremetal/io.h (+2-3) 
- (modified) libc/src/__support/OSUtil/darwin/arm/syscall.h (+2-3) 
- (modified) libc/src/__support/OSUtil/darwin/io.h (+2-3) 
- (modified) libc/src/__support/OSUtil/darwin/syscall.h (+2-3) 
- (modified) libc/src/__support/OSUtil/exit.h (+2-6) 
- (modified) libc/src/__support/OSUtil/fcntl.h (+2-6) 
- (modified) libc/src/__support/OSUtil/fuchsia/io.h (+2-3) 
- (modified) libc/src/__support/OSUtil/gpu/exit.cpp (+2-5) 
- (modified) libc/src/__support/OSUtil/gpu/io.cpp (+2-3) 
- (modified) libc/src/__support/OSUtil/gpu/io.h (+2-3) 
- (modified) libc/src/__support/OSUtil/linux/aarch64/syscall.h (+2-3) 
- (modified) libc/src/__support/OSUtil/linux/arm/syscall.h (+2-3) 
- (modified) libc/src/__support/OSUtil/linux/exit.cpp (+2-5) 
- (modified) libc/src/__support/OSUtil/linux/fcntl.cpp (+2-5) 
- (modified) libc/src/__support/OSUtil/linux/io.h (+2-3) 
- (modified) libc/src/__support/OSUtil/linux/riscv/syscall.h (+2-3) 
- (modified) libc/src/__support/OSUtil/linux/syscall.h (+2-3) 
- (modified) libc/src/__support/OSUtil/linux/x86_64/syscall.h (+2-3) 
- (modified) libc/src/__support/RPC/rpc.h (+2-3) 
- (modified) libc/src/__support/RPC/rpc_client.cpp (+2-3) 
- (modified) libc/src/__support/RPC/rpc_client.h (+2-3) 
- (modified) libc/src/__support/RPC/rpc_util.h (+2-3) 
- (modified) libc/src/__support/StringUtil/error_to_string.cpp (+2-3) 
- (modified) libc/src/__support/StringUtil/error_to_string.h (+2-3) 
- (modified) libc/src/__support/StringUtil/message_mapper.h (+2-3) 
- (modified) libc/src/__support/StringUtil/signal_to_string.cpp (+2-3) 
- (modified) libc/src/__support/StringUtil/signal_to_string.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/linux_extension_errors.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/linux_extension_signals.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/linux_platform_errors.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/linux_platform_signals.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/minimal_platform_errors.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/minimal_platform_signals.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/posix_errors.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/posix_signals.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/signal_table.h (+2-5) 
- (modified) libc/src/__support/StringUtil/tables/stdc_errors.h (+2-3) 
- (modified) libc/src/__support/StringUtil/tables/stdc_signals.h (+2-3) 
- (modified) libc/src/__support/arg_list.h (+2-3) 
- (modified) libc/src/__support/big_int.h (+2-3) 
- (modified) libc/src/__support/block.h (+2-3) 
- (modified) libc/src/__support/blockstore.h (+2-3) 
- (modified) libc/src/__support/c_string.h (+2-3) 
- (modified) libc/src/__support/char_vector.h (+2-3) 
- (modified) libc/src/__support/common.h (+2-3) 
- (modified) libc/src/__support/ctype_utils.h (+2-3) 
- (modified) libc/src/__support/detailed_powers_of_ten.h (+2-3) 
- (modified) libc/src/__support/endian.h (+2-3) 
- (modified) libc/src/__support/error_or.h (+2-3) 
- (modified) libc/src/__support/fixed_point/fx_bits.h (+2-5) 
- (modified) libc/src/__support/fixed_point/fx_rep.h (+2-5) 
- (modified) libc/src/__support/fixed_point/sqrt.h (+2-5) 
- (modified) libc/src/__support/fixedvector.h (+2-3) 
- (modified) libc/src/__support/float_to_string.h (+2-3) 
- (modified) libc/src/__support/freelist.h (+2-3) 
- (modified) libc/src/__support/freelist_heap.h (+2-3) 
- (modified) libc/src/__support/hash.h (+2-3) 
- (modified) libc/src/__support/high_precision_decimal.h (+2-3) 
- (modified) libc/src/__support/integer_literals.h (+2-3) 
- (modified) libc/src/__support/integer_operations.h (+2-3) 
- (modified) libc/src/__support/integer_to_string.h (+2-3) 
- (modified) libc/src/__support/intrusive_list.h (+2-3) 
- (modified) libc/src/__support/libc_assert.h (+2-3) 
- (modified) libc/src/__support/macros/config.h (-1) 
- (modified) libc/src/__support/macros/optimization.h (+2-5) 
- (modified) libc/src/__support/math_extras.h (+2-3) 
- (modified) libc/src/__support/memory_size.h (+2-3) 
- (modified) libc/src/__support/number_pair.h (+2-3) 
- (modified) libc/src/__support/str_to_float.h (+2-3) 
- (modified) libc/src/__support/str_to_integer.h (+2-3) 
- (modified) libc/src/__support/str_to_num_result.h (+2-3) 
- (modified) libc/src/__support/threads/CndVar.h (+2-3) 
- (modified) libc/src/__support/threads/callonce.h (+2-3) 
- (modified) libc/src/__support/threads/fork_callbacks.cpp (+2-3) 
- (modified) libc/src/__support/threads/fork_callbacks.h (+2-4) 
- (modified) libc/src/__support/threads/gpu/mutex.h (+2-3) 
- (modified) libc/src/__support/threads/linux/CndVar.cpp (+2-3) 
- (modified) libc/src/__support/threads/linux/callonce.cpp (+2-3) 
- (modified) libc/src/__support/threads/linux/callonce.h (+2-3) 
- (modified) libc/src/__support/threads/linux/futex_utils.h (+2-3) 
- (modified) libc/src/__support/threads/linux/futex_word.h (+2-3) 
- (modified) libc/src/__support/threads/linux/mutex.h (+2-3) 
- (modified) libc/src/__support/threads/linux/raw_mutex.h (+2-3) 
- (modified) libc/src/__support/threads/linux/rwlock.h (+2-3) 
- (modified) libc/src/__support/threads/linux/thread.cpp (+2-3) 
- (modified) libc/src/__support/threads/mutex_common.h (+2-4) 
- (modified) libc/src/__support/threads/sleep.h (+2-3) 
- (modified) libc/src/__support/threads/thread.cpp (+2-3) 
- (modified) libc/src/__support/threads/thread.h (+2-3) 
- (modified) libc/src/__support/time/linux/abs_timeout.h (+2-3) 
- (modified) libc/src/__support/time/linux/clock_conversion.h (+2-3) 
- (modified) libc/src/__support/time/linux/clock_gettime.h (+2-3) 
- (modified) libc/src/__support/time/linux/monotonicity.h (+2-3) 
- (modified) libc/src/__support/time/units.h (+2-3) 
- (modified) libc/src/__support/wctype_utils.h (+2-3) 
- (modified) libc/src/assert/__assert_fail.h (+2-3) 
- (modified) libc/src/assert/generic/__assert_fail.cpp (+2-3) 
- (modified) libc/src/assert/gpu/__assert_fail.cpp (+2-3) 
- (modified) libc/src/ctype/isalnum.cpp (+2-3) 
- (modified) libc/src/ctype/isalnum.h (+2-4) 
- (modified) libc/src/ctype/isalpha.cpp (+2-3) 
- (modified) libc/src/ctype/isalpha.h (+2-4) 
- (modified) libc/src/ctype/isascii.cpp (+2-3) 
- (modified) libc/src/ctype/isascii.h (+2-3) 
- (modified) libc/src/ctype/isblank.cpp (+2-3) 
- (modified) libc/src/ctype/isblank.h (+2-4) 
- (modified) libc/src/ctype/iscntrl.cpp (+2-3) 
- (modified) libc/src/ctype/iscntrl.h (+2-4) 
- (modified) libc/src/ctype/isdigit.cpp (+2-3) 
- (modified) libc/src/ctype/isdigit.h (+2-4) 
- (modified) libc/src/ctype/isgraph.cpp (+2-3) 
- (modified) libc/src/ctype/isgraph.h (+2-4) 
- (modified) libc/src/ctype/islower.cpp (+2-3) 
- (modified) libc/src/ctype/islower.h (+2-4) 
- (modified) libc/src/ctype/isprint.cpp (+2-3) 
- (modified) libc/src/ctype/isprint.h (+2-4) 
- (modified) libc/src/ctype/ispunct.cpp (+2-3) 
- (modified) libc/src/ctype/ispunct.h (+2-4) 
- (modified) libc/src/ctype/isspace.cpp (+2-3) 
- (modified) libc/src/ctype/isspace.h (+2-4) 
- (modified) libc/src/ctype/isupper.cpp (+2-3) 
- (modified) libc/src/ctype/isupper.h (+2-4) 
- (modified) libc/src/ctype/isxdigit.cpp (+2-3) 
- (modified) libc/src/ctype/isxdigit.h (+2-4) 
- (modified) libc/src/ctype/toascii.cpp (+2-3) 
- (modified) libc/src/ctype/toascii.h (+2-4) 
- (modified) libc/src/ctype/tolower.cpp (+2-3) 
- (modified) libc/src/ctype/tolower.h (+2-4) 
- (modified) libc/src/ctype/toupper.cpp (+2-3) 
- (modified) libc/src/ctype/toupper.h (+2-4) 
- (modified) libc/src/dirent/closedir.cpp (+2-3) 
- (modified) libc/src/dirent/closedir.h (+2-3) 
- (modified) libc/src/dirent/dirfd.cpp (+2-3) 
- (modified) libc/src/dirent/dirfd.h (+2-3) 
- (modified) libc/src/dirent/opendir.cpp (+2-3) 
- (modified) libc/src/dirent/opendir.h (+2-3) 
- (modified) libc/src/dirent/readdir.cpp (+2-3) 
- (modified) libc/src/dirent/readdir.h (+2-3) 
- (modified) libc/src/dlfcn/dlclose.cpp (+2-3) 
- (modified) libc/src/dlfcn/dlclose.h (+2-4) 
- (modified) libc/src/dlfcn/dlerror.cpp (+2-3) 
- (modified) libc/src/dlfcn/dlerror.h (+2-4) 
- (modified) libc/src/dlfcn/dlopen.cpp (+2-3) 
- (modified) libc/src/dlfcn/dlopen.h (+2-4) 
- (modified) libc/src/dlfcn/dlsym.cpp (+2-3) 
- (modified) libc/src/dlfcn/dlsym.h (+2-4) 
- (modified) libc/src/errno/libc_errno.cpp (+2-3) 
- (modified) libc/src/errno/libc_errno.h (+2-3) 
- (modified) libc/src/fcntl/creat.h (+2-3) 
- (modified) libc/src/fcntl/fcntl.h (+2-4) 
- (modified) libc/src/fcntl/linux/creat.cpp (+2-3) 
- (modified) libc/src/fcntl/linux/fcntl.cpp (+2-3) 
- (modified) libc/src/fcntl/linux/open.cpp (+2-3) 
- (modified) libc/src/fcntl/linux/openat.cpp (+2-3) 
- (modified) libc/src/fcntl/open.h (+2-3) 
- (modified) libc/src/fcntl/openat.h (+2-3) 
- (modified) libc/src/fenv/feclearexcept.cpp (+2-3) 
- (modified) libc/src/fenv/feclearexcept.h (+2-4) 
- (modified) libc/src/fenv/fedisableexcept.cpp (+2-3) 
- (modified) libc/src/fenv/fedisableexcept.h (+2-4) 
- (modified) libc/src/fenv/feenableexcept.cpp (+2-3) 
- (modified) libc/src/fenv/feenableexcept.h (+2-4) 
- (modified) libc/src/fenv/fegetenv.cpp (+2-3) 
- (modified) libc/src/fenv/fegetenv.h (+2-3) 
- (modified) libc/src/fenv/fegetexcept.cpp (+2-3) 
- (modified) libc/src/fenv/fegetexcept.h (+2-4) 
- (modified) libc/src/fenv/fegetexceptflag.cpp (+2-3) 
- (modified) libc/src/fenv/fegetexceptflag.h (+2-3) 
- (modified) libc/src/fenv/fegetround.cpp (+2-3) 
- (modified) libc/src/fenv/fegetround.h (+2-4) 
- (modified) libc/src/fenv/feholdexcept.cpp (+2-3) 
- (modified) libc/src/fenv/feholdexcept.h (+2-3) 
- (modified) libc/src/fenv/feraiseexcept.cpp (+2-3) 
- (modified) libc/src/fenv/feraiseexcept.h (+2-4) 
- (modified) libc/src/fenv/fesetenv.cpp (+2-3) 
- (modified) libc/src/fenv/fesetenv.h (+2-3) 
- (modified) libc/src/fenv/fesetexcept.cpp (+2-3) 
- (modified) libc/src/fenv/fesetexcept.h (+2-4) 
- (modified) libc/src/fenv/fesetexceptflag.cpp (+2-3) 
- (modified) libc/src/fenv/fesetexceptflag.h (+2-3) 
- (modified) libc/src/fenv/fesetround.cpp (+2-3) 
- (modified) libc/src/fenv/fesetround.h (+2-4) 
- (modified) libc/src/fenv/fetestexcept.cpp (+2-3) 
- (modified) libc/src/fenv/fetestexcept.h (+2-4) 
- (modified) libc/src/fenv/fetestexceptflag.cpp (+2-3) 
- (modified) libc/src/fenv/fetestexceptflag.h (+2-3) 
- (modified) libc/src/fenv/feupdateenv.cpp (+2-3) 
- (modified) libc/src/fenv/feupdateenv.h (+2-3) 
- (modified) libc/src/gpu/rpc_fprintf.cpp (+2-3) 
- (modified) libc/src/gpu/rpc_fprintf.h (+2-3) 
- (modified) libc/src/gpu/rpc_host_call.cpp (+2-3) 
- (modified) libc/src/gpu/rpc_host_call.h (+2-3) 
- (modified) libc/src/inttypes/imaxabs.cpp (+2-3) 
- (modified) libc/src/inttypes/imaxabs.h (+2-3) 
- (modified) libc/src/inttypes/imaxdiv.cpp (+2-3) 


``````````diff

diff --git a/libc/benchmarks/LibcDefaultImplementations.cpp b/libc/benchmarks/LibcDefaultImplementations.cpp
index 1ff940afcc44f..c50ae00ffa105 100644
--- a/libc/benchmarks/LibcDefaultImplementations.cpp
+++ b/libc/benchmarks/LibcDefaultImplementations.cpp
@@ -1,9 +1,8 @@
 #include "LibcFunctionPrototypes.h"
-#include "src/__support/macros/config.h"
 #include "llvm/ADT/ArrayRef.h"
 #include <cstddef>
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 
 extern void *memcpy(void *__restrict, const void *__restrict, size_t);
 extern void *memmove(void *, const void *, size_t);
@@ -12,7 +11,7 @@ extern void bzero(void *, size_t);
 extern int memcmp(const void *, const void *, size_t);
 extern int bcmp(const void *, const void *, size_t);
 
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 // List of implementations to test.
 
diff --git a/libc/benchmarks/LibcMemoryBenchmarkMain.cpp b/libc/benchmarks/LibcMemoryBenchmarkMain.cpp
index c042b29cad98e..bc6fd8b38cb6d 100644
--- a/libc/benchmarks/LibcMemoryBenchmarkMain.cpp
+++ b/libc/benchmarks/LibcMemoryBenchmarkMain.cpp
@@ -10,7 +10,6 @@
 #include "LibcBenchmark.h"
 #include "LibcMemoryBenchmark.h"
 #include "MemorySizeDistributions.h"
-#include "src/__support/macros/config.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileSystem.h"
@@ -22,7 +21,7 @@
 #include <cstring>
 #include <unistd.h>
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 
 extern void *memcpy(void *__restrict, const void *__restrict, size_t);
 extern void *memmove(void *, const void *, size_t);
@@ -31,7 +30,7 @@ extern void bzero(void *, size_t);
 extern int memcmp(const void *, const void *, size_t);
 extern int bcmp(const void *, const void *, size_t);
 
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 namespace llvm {
 namespace libc_benchmarks {
diff --git a/libc/benchmarks/automemcpy/lib/CodeGen.cpp b/libc/benchmarks/automemcpy/lib/CodeGen.cpp
index d1336eaf31f34..3837bd97d9f9a 100644
--- a/libc/benchmarks/automemcpy/lib/CodeGen.cpp
+++ b/libc/benchmarks/automemcpy/lib/CodeGen.cpp
@@ -36,7 +36,6 @@
 // function at the end of the file.
 
 #include "automemcpy/CodeGen.h"
-#include "src/__support/macros/config.h"
 #include <cassert>
 #include <llvm/ADT/STLExtras.h>
 #include <llvm/ADT/StringSet.h>
@@ -543,11 +542,11 @@ static void Serialize(raw_ostream &Stream,
   Stream << "using llvm::libc_benchmarks::MemmoveConfiguration;\n";
   Stream << "using llvm::libc_benchmarks::MemsetConfiguration;\n";
   Stream << "\n";
-  Stream << "namespace LIBC_NAMESPACE_DECL {\n";
+  Stream << "namespace LIBC_NAMESPACE {\n";
   Stream << "\n";
   codegen::functions::Serialize(Stream, Descriptors);
   Stream << "\n";
-  Stream << "} // namespace LIBC_NAMESPACE_DECL\n";
+  Stream << "} // namespace LIBC_NAMESPACE\n";
   Stream << "\n";
   Stream << "namespace llvm {\n";
   Stream << "namespace automemcpy {\n";
diff --git a/libc/benchmarks/automemcpy/unittests/CodeGenTest.cpp b/libc/benchmarks/automemcpy/unittests/CodeGenTest.cpp
index 17bc189fa3f12..5084b1d67dcd5 100644
--- a/libc/benchmarks/automemcpy/unittests/CodeGenTest.cpp
+++ b/libc/benchmarks/automemcpy/unittests/CodeGenTest.cpp
@@ -8,7 +8,6 @@
 
 #include "automemcpy/CodeGen.h"
 #include "automemcpy/RandomFunctionGenerator.h"
-#include "src/__support/macros/config.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include <optional>
@@ -64,7 +63,7 @@ using llvm::libc_benchmarks::MemcpyConfiguration;
 using llvm::libc_benchmarks::MemmoveConfiguration;
 using llvm::libc_benchmarks::MemsetConfiguration;
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 
 static void memcpy_0xE00E29EE73994E2B(char *__restrict dst, const char *__restrict src, size_t size) {
   using namespace LIBC_NAMESPACE::x86;
@@ -135,7 +134,7 @@ static void bzero_0x475977492C218AD4(char * dst, size_t size) {
   return splat_set<Align<_32,Arg::Dst>::Then<Loop<_32>>>(dst, 0, size);
 }
 
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 namespace llvm {
 namespace automemcpy {
diff --git a/libc/benchmarks/gpu/BenchmarkLogger.cpp b/libc/benchmarks/gpu/BenchmarkLogger.cpp
index 0d644fa3c37bc..2e7e8e7600fdb 100644
--- a/libc/benchmarks/gpu/BenchmarkLogger.cpp
+++ b/libc/benchmarks/gpu/BenchmarkLogger.cpp
@@ -3,13 +3,12 @@
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/OSUtil/io.h"               // write_to_stderr
 #include "src/__support/big_int.h"                 // is_big_int
-#include "src/__support/macros/config.h"
 #include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
 #include "src/__support/uint128.h"
 
 #include <stdint.h>
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 namespace benchmarks {
 
 // cpp::string_view specialization
@@ -95,4 +94,4 @@ template BenchmarkLogger &BenchmarkLogger::operator<< <UInt<320>>(UInt<320>);
 BenchmarkLogger log;
 
 } // namespace benchmarks
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/benchmarks/gpu/BenchmarkLogger.h b/libc/benchmarks/gpu/BenchmarkLogger.h
index 2b22aba085f86..332ff1439e6f5 100644
--- a/libc/benchmarks/gpu/BenchmarkLogger.h
+++ b/libc/benchmarks/gpu/BenchmarkLogger.h
@@ -9,9 +9,7 @@
 #ifndef LLVM_LIBC_BENCHMARKS_GPU_BENCHMARKLOGGER_H
 #define LLVM_LIBC_BENCHMARKS_GPU_BENCHMARKLOGGER_H
 
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 namespace benchmarks {
 
 // A class to log to standard output in the context of hermetic tests.
@@ -24,6 +22,6 @@ struct BenchmarkLogger {
 extern BenchmarkLogger log;
 
 } // namespace benchmarks
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 #endif /* LLVM_LIBC_BENCHMARKS_GPU_BENCHMARKLOGGER_H */
diff --git a/libc/benchmarks/gpu/LibcGpuBenchmark.cpp b/libc/benchmarks/gpu/LibcGpuBenchmark.cpp
index 1c1ba7639d0b1..3dd83cef6d4df 100644
--- a/libc/benchmarks/gpu/LibcGpuBenchmark.cpp
+++ b/libc/benchmarks/gpu/LibcGpuBenchmark.cpp
@@ -5,10 +5,9 @@
 #include "src/__support/FPUtil/sqrt.h"
 #include "src/__support/GPU/utils.h"
 #include "src/__support/fixedvector.h"
-#include "src/__support/macros/config.h"
 #include "src/time/gpu/time_utils.h"
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 namespace benchmarks {
 
 FixedVector<Benchmark *, 64> benchmarks;
@@ -136,4 +135,4 @@ BenchmarkResult benchmark(const BenchmarkOptions &options,
 };
 
 } // namespace benchmarks
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/benchmarks/gpu/LibcGpuBenchmark.h b/libc/benchmarks/gpu/LibcGpuBenchmark.h
index 26cb0fd30bc1c..ffc858911b1c0 100644
--- a/libc/benchmarks/gpu/LibcGpuBenchmark.h
+++ b/libc/benchmarks/gpu/LibcGpuBenchmark.h
@@ -6,12 +6,11 @@
 #include "src/__support/CPP/functional.h"
 #include "src/__support/CPP/limits.h"
 #include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
 #include "src/time/clock.h"
 
 #include <stdint.h>
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 
 namespace benchmarks {
 
@@ -100,7 +99,7 @@ class Benchmark {
   const cpp::string_view get_name() const { return name; }
 };
 } // namespace benchmarks
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 #define BENCHMARK(SuiteName, TestName, Func)                                   \
   LIBC_NAMESPACE::benchmarks::Benchmark SuiteName##_##TestName##_Instance(     \
diff --git a/libc/benchmarks/gpu/timing/amdgpu/timing.h b/libc/benchmarks/gpu/timing/amdgpu/timing.h
index 9b40f9282b16b..1eecb2acd2136 100644
--- a/libc/benchmarks/gpu/timing/amdgpu/timing.h
+++ b/libc/benchmarks/gpu/timing/amdgpu/timing.h
@@ -25,7 +25,7 @@
   else                                                                         \
     asm("" ::"v"(VARIABLE))
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 
 // Returns the overhead associated with calling the profiling region. This
 // allows us to substract the constant-time overhead from the latency to
@@ -107,6 +107,6 @@ template <typename F, typename T1, typename T2>
   return stop - start;
 }
 
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 #endif // LLVM_LIBC_UTILS_GPU_TIMING_AMDGPU
diff --git a/libc/benchmarks/gpu/timing/nvptx/timing.h b/libc/benchmarks/gpu/timing/nvptx/timing.h
index d141b08d4c922..d3851a764c43d 100644
--- a/libc/benchmarks/gpu/timing/nvptx/timing.h
+++ b/libc/benchmarks/gpu/timing/nvptx/timing.h
@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 
 // Returns the overhead associated with calling the profiling region. This
 // allows us to substract the constant-time overhead from the latency to
@@ -94,6 +94,6 @@ static LIBC_INLINE uint64_t latency(F f, T1 t1, T2 t2) {
 
   return stop - start;
 }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 #endif // LLVM_LIBC_UTILS_GPU_TIMING_NVPTX
diff --git a/libc/cmake/modules/LLVMLibCObjectRules.cmake b/libc/cmake/modules/LLVMLibCObjectRules.cmake
index 0b092e94ca8a1..1f80e7f4e57c1 100644
--- a/libc/cmake/modules/LLVMLibCObjectRules.cmake
+++ b/libc/cmake/modules/LLVMLibCObjectRules.cmake
@@ -93,11 +93,11 @@ function(create_object_library fq_target_name)
     endif()
   endif()
 
-  list(APPEND fq_deps_list libc.src.__support.macros.config)
-  list(REMOVE_DUPLICATES fq_deps_list)
-  add_dependencies(${fq_target_name} ${fq_deps_list})
-  # Add deps as link libraries to inherit interface compile and link options.
-  target_link_libraries(${fq_target_name} PUBLIC ${fq_deps_list})
+  if(fq_deps_list)
+    add_dependencies(${fq_target_name} ${fq_deps_list})
+    # Add deps as link libraries to inherit interface compile and link options.
+    target_link_libraries(${fq_target_name} PUBLIC ${fq_deps_list})
+  endif()
 
   set_target_properties(
     ${fq_target_name}
diff --git a/libc/config/linux/app.h b/libc/config/linux/app.h
index 188d34816454b..2a3b1560817b8 100644
--- a/libc/config/linux/app.h
+++ b/libc/config/linux/app.h
@@ -9,12 +9,11 @@
 #ifndef LLVM_LIBC_CONFIG_LINUX_APP_H
 #define LLVM_LIBC_CONFIG_LINUX_APP_H
 
-#include "src/__support/macros/config.h"
 #include "src/__support/macros/properties/architectures.h"
 
 #include <stdint.h>
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 
 // Data structure to capture properties of the linux/ELF TLS image.
 struct TLSImage {
@@ -105,6 +104,6 @@ void cleanup_tls(uintptr_t tls_addr, uintptr_t tls_size);
 // Set the thread pointer for the current thread.
 bool set_thread_ptr(uintptr_t val);
 
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 #endif // LLVM_LIBC_CONFIG_LINUX_APP_H
diff --git a/libc/docs/dev/clang_tidy_checks.rst b/libc/docs/dev/clang_tidy_checks.rst
index 91d415a2e0d47..198d8f16d1cd7 100644
--- a/libc/docs/dev/clang_tidy_checks.rst
+++ b/libc/docs/dev/clang_tidy_checks.rst
@@ -36,17 +36,17 @@ implementation-in-namespace
 ---------------------------
 
 It is part of our implementation standards that all implementation pieces live
-under the ``LIBC_NAMESPACE_DECL`` namespace. This prevents pollution of the
-global namespace. Without a formal check to ensure this, an implementation
-might compile and pass unit tests, but not produce a usable libc function.
+under the ``LIBC_NAMESPACE`` namespace. This prevents pollution of the global
+namespace. Without a formal check to ensure this, an implementation might
+compile and pass unit tests, but not produce a usable libc function.
 
 This check that ensures any function call resolves to a function within the
-``LIBC_NAMESPACE_DECL`` namespace.
+``LIBC_NAMESPACE`` namespace.
 
 .. code-block:: c++
 
     // Correct: implementation inside the correct namespace.
-    namespace LIBC_NAMESPACE_DECL {
+    namespace LIBC_NAMESPACE {
         void LLVM_LIBC_ENTRYPOINT(strcpy)(char *dest, const char *src) {}
         // Namespaces within LIBC_NAMESPACE namespace are allowed.
         namespace inner{
@@ -87,7 +87,7 @@ are always external and can be intercepted.
 
 .. code-block:: c++
 
-    namespace LIBC_NAMESPACE_DECL {
+    namespace LIBC_NAMESPACE {
 
     // Allow calls with the fully qualified name.
     LIBC_NAMESPACE::strlen("hello");
@@ -104,4 +104,4 @@ are always external and can be intercepted.
     // Allow calling into specific global functions (explained above)
     ::malloc(10);
 
-    } // namespace LIBC_NAMESPACE_DECL
+    } // namespace LIBC_NAMESPACE
diff --git a/libc/fuzzing/__support/hashtable_fuzz.cpp b/libc/fuzzing/__support/hashtable_fuzz.cpp
index 7d61e106c9c4a..07f1057714114 100644
--- a/libc/fuzzing/__support/hashtable_fuzz.cpp
+++ b/libc/fuzzing/__support/hashtable_fuzz.cpp
@@ -12,9 +12,8 @@
 #include "include/llvm-libc-types/ENTRY.h"
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/HashTable/table.h"
-#include "src/__support/macros/config.h"
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 
 // A fuzzing payload starts with
 // - uint16_t: initial capacity for table A
@@ -180,4 +179,4 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
   return 0;
 }
 
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/CPP/algorithm.h b/libc/src/__support/CPP/algorithm.h
index f5dc9067409eb..5120fa0daae17 100644
--- a/libc/src/__support/CPP/algorithm.h
+++ b/libc/src/__support/CPP/algorithm.h
@@ -13,9 +13,8 @@
 #define LLVM_LIBC_SRC___SUPPORT_CPP_ALGORITHM_H
 
 #include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 namespace cpp {
 
 template <class T> LIBC_INLINE constexpr const T &max(const T &a, const T &b) {
@@ -42,6 +41,6 @@ LIBC_INLINE constexpr bool all_of(InputIt first, InputIt last, UnaryPred p) {
 }
 
 } // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 #endif // LLVM_LIBC_SRC___SUPPORT_CPP_ALGORITHM_H
diff --git a/libc/src/__support/CPP/array.h b/libc/src/__support/CPP/array.h
index db0a986b71205..4e69ba003e800 100644
--- a/libc/src/__support/CPP/array.h
+++ b/libc/src/__support/CPP/array.h
@@ -11,10 +11,9 @@
 
 #include "src/__support/CPP/iterator.h" // reverse_iterator
 #include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
 #include <stddef.h> // For size_t.
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 namespace cpp {
 
 template <class T, size_t N> struct array {
@@ -75,6 +74,6 @@ template <class T, size_t N> struct array {
 };
 
 } // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 #endif // LLVM_LIBC_SRC___SUPPORT_CPP_ARRAY_H
diff --git a/libc/src/__support/CPP/atomic.h b/libc/src/__support/CPP/atomic.h
index 72e7f2adde6a4..e273d998c0702 100644
--- a/libc/src/__support/CPP/atomic.h
+++ b/libc/src/__support/CPP/atomic.h
@@ -10,12 +10,11 @@
 #define LLVM_LIBC_SRC___SUPPORT_CPP_ATOMIC_H
 
 #include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
 #include "src/__support/macros/properties/architectures.h"
 
 #include "type_traits.h"
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 namespace cpp {
 
 enum class MemoryOrder : int {
@@ -212,6 +211,6 @@ LIBC_INLINE void atomic_signal_fence([[maybe_unused]] MemoryOrder mem_ord) {
 }
 
 } // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 #endif // LLVM_LIBC_SRC___SUPPORT_CPP_ATOMIC_H
diff --git a/libc/src/__support/CPP/bit.h b/libc/src/__support/CPP/bit.h
index adcd0472747d0..4aea066d26ab0 100644
--- a/libc/src/__support/CPP/bit.h
+++ b/libc/src/__support/CPP/bit.h
@@ -14,13 +14,11 @@
 #include "src/__support/CPP/limits.h" // numeric_limits
 #include "src/__support/CPP/type_traits.h"
 #include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
 #include "src/__support/macros/sanitizer.h"
 
 #include <stdint.h>
 
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
 
 #if __has_builtin(__builtin_memcpy_inline)
 #define LLVM_LIBC_HAS_BUILTIN_MEMCPY_INLINE
@@ -292,7 +290,6 @@ ADD_SPECIALIZATION(unsigned long long, __builtin_popcountll)
 #endif // __builtin_popcountg
 #undef ADD_SPECIALIZATION
 
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
 
 #endif // LLVM_LIBC_SRC___SUPPORT_CPP_BIT_H
diff --git a/libc/src/__support/CPP/bitset.h b/libc/src/__support/CPP/bitset.h
index db193f414abd2..30a7fa796cb4b 100644
--- a/libc/src/__support/CPP/bitset.h
+++ b/libc/src/__support/CPP/bitset.h
@@ -10,11 +10,9 @@
 #define LLVM_LIBC_SRC___SUPPORT_CPP_BITSET_H
 
 #include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
 #include <stddef.h> // For size_t.
 
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
 
 template <size_t NumberOfBits> struct bitset {
   static_assert(NumberOfBits != 0,
@@ -88,7 +86,6 @@ template <size_t NumberOfBits> struct bitset {
   size_t Data[NUMBER_OF_UNITS] = {0};
 };
 
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
 
 #endif // LLVM_LIBC_SRC___SUPPORT_CPP_BITSET_H
diff --git a/libc/src/__support/CPP/cstddef.h b/libc/src/__support/CPP/cstddef.h
index ed6c9d03362f4..1da51fd253fb5 100644
--- a/libc/src/__support/CPP/cstddef.h
+++ b/libc/src/__support/CPP/cstddef.h
@@ -10,11 +10,9 @@
 #define LLVM_LIBC_SRC___SUPPORT_CPP_CSTDDEF_H
 
 #include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
 #include "type_traits.h" // For enable_if_t, is_integral_v.
 
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
 
 enum class byte : unsigned char {};
 
@@ -68,7 +66,6 @@ to_integer(byte b) noexcept {
   return static_cast<IntegerType>(b);
 }
 
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
 
 #endif // LLVM_LIBC_SRC___SUPPORT_CPP_CSTDDEF_H
diff --git a/libc/src/__support/CPP/expected.h b/libc/src/__support/CPP/expected.h
index 8a93091f0ebfb..c35f0a1dc5369 100644
--- a/libc/src/__support/CPP/expected.h
+++ b/libc/src/__support/CPP/expected.h
@@ -10,10 +10,8 @@
 #define LLVM_LIBC_SRC___SUPPORT_CPP_EXPECTED_H
 
 #include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
 
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
 
 // This is used to hold an unexpected value so that a different constructor is
 // selected.
@@ -54,7 +52,6 @@ template <class T, class E> class expected {
   LIBC_INLINE constexpr const T *operator->() const { return &exp; }
 };
 
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
 
 #endif // LLVM_LIBC_SRC___SUPPORT_CPP_EXPECTED_H
diff --git a/libc/src/__support/CPP/functional.h b/libc/src/__support/CPP/functional.h
index 50cfa256b6682..16283a264e657 100644
--- a/libc/src/__support/CPP/functional.h
+++ b/libc/src/__support/CPP/functional.h
@@ -17,11 +17,10 @@
 #include "src/__support/CPP/type_traits/remove_reference.h"
 #include "src/__support/CPP/utility/forward.h"
 #include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
 
 #include <stdint.h>
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 namespace cpp {
 
 /// A function type adapted from LLVM's function_ref.
@@ -66,6 +65,6 @@ template <typename Ret, typename... Params> class function<Ret(Params...)> {
 };
 
 } // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
 
 #endif // LLVM_LIBC_SRC___SUPPORT_CPP_FUNCTIONAL_H
diff --git a/libc/src/__support/CPP/iterator.h b/libc/src/__support/CPP/iterator.h
index 168a269731822..b0fd5c9f22ae0 100644
--- a/libc/src/__support/CPP/iterator.h
+++ b/libc/src/__support/CPP/iterator.h
@@ -13,9 +13,8 @@
 #include "src/__support/CPP/type_traits/is_convertible.h"
 #include "src/__support/CPP/type_traits/is_same.h"
 #include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
 
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
 namespace cpp {
 
 template <typename T> struct iterator_traits;
@@ -94,6 +93,6 @@ template <typename Iter> class reverse_iterator {
 };
 
 } // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LI...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/98593
