[libc-commits] [libc] Revert "[libc] Migrate to using LIBC_NAMESPACE_DECL for namespace declaration" (PR #98593)
Mehdi Amini via libc-commits
libc-commits at lists.llvm.org
Fri Jul 12 00:11:45 PDT 2024
https://github.com/joker-eph created https://github.com/llvm/llvm-project/pull/98593
Reverts llvm/llvm-project#98075
bots are broken
>From a65394178d3524b6022b74103f18d5c3522fea15 Mon Sep 17 00:00:00 2001
From: Mehdi Amini <joker.eph at gmail.com>
Date: Fri, 12 Jul 2024 09:11:17 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"[libc]=20Migrate=20to=20using=20LIBC?=
=?UTF-8?q?=5FNAMESPACE=5FDECL=20for=20namespace=20declaration=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 3f30effe1bd81fa1b039218a9bfe79c3b03fafad.
---
libc/benchmarks/LibcDefaultImplementations.cpp | 5 ++---
libc/benchmarks/LibcMemoryBenchmarkMain.cpp | 5 ++---
libc/benchmarks/automemcpy/lib/CodeGen.cpp | 5 ++---
.../automemcpy/unittests/CodeGenTest.cpp | 5 ++---
libc/benchmarks/gpu/BenchmarkLogger.cpp | 5 ++---
libc/benchmarks/gpu/BenchmarkLogger.h | 6 ++----
libc/benchmarks/gpu/LibcGpuBenchmark.cpp | 5 ++---
libc/benchmarks/gpu/LibcGpuBenchmark.h | 5 ++---
libc/benchmarks/gpu/timing/amdgpu/timing.h | 4 ++--
libc/benchmarks/gpu/timing/nvptx/timing.h | 4 ++--
libc/cmake/modules/LLVMLibCObjectRules.cmake | 10 +++++-----
libc/config/linux/app.h | 5 ++---
libc/docs/dev/clang_tidy_checks.rst | 14 +++++++-------
libc/fuzzing/__support/hashtable_fuzz.cpp | 5 ++---
libc/src/__support/CPP/algorithm.h | 5 ++---
libc/src/__support/CPP/array.h | 5 ++---
libc/src/__support/CPP/atomic.h | 5 ++---
libc/src/__support/CPP/bit.h | 7 ++-----
libc/src/__support/CPP/bitset.h | 7 ++-----
libc/src/__support/CPP/cstddef.h | 7 ++-----
libc/src/__support/CPP/expected.h | 7 ++-----
libc/src/__support/CPP/functional.h | 5 ++---
libc/src/__support/CPP/iterator.h | 5 ++---
libc/src/__support/CPP/limits.h | 5 ++---
libc/src/__support/CPP/mutex.h | 6 ++----
libc/src/__support/CPP/new.h | 5 ++---
libc/src/__support/CPP/optional.h | 5 ++---
libc/src/__support/CPP/span.h | 7 ++-----
libc/src/__support/CPP/string.h | 5 ++---
libc/src/__support/CPP/string_view.h | 5 ++---
libc/src/__support/CPP/stringstream.h | 5 ++---
.../CPP/type_traits/add_lvalue_reference.h | 7 ++-----
libc/src/__support/CPP/type_traits/add_pointer.h | 7 ++-----
.../CPP/type_traits/add_rvalue_reference.h | 7 ++-----
.../__support/CPP/type_traits/aligned_storage.h | 7 ++-----
.../src/__support/CPP/type_traits/always_false.h | 7 ++-----
.../__support/CPP/type_traits/bool_constant.h | 7 ++-----
libc/src/__support/CPP/type_traits/conditional.h | 7 ++-----
libc/src/__support/CPP/type_traits/decay.h | 7 ++-----
libc/src/__support/CPP/type_traits/enable_if.h | 7 ++-----
libc/src/__support/CPP/type_traits/false_type.h | 7 ++-----
.../CPP/type_traits/integral_constant.h | 7 ++-----
libc/src/__support/CPP/type_traits/invoke.h | 7 ++-----
.../__support/CPP/type_traits/invoke_result.h | 7 ++-----
.../__support/CPP/type_traits/is_arithmetic.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_array.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_base_of.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_class.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_const.h | 7 ++-----
.../CPP/type_traits/is_constant_evaluated.h | 7 ++-----
.../__support/CPP/type_traits/is_convertible.h | 7 ++-----
.../__support/CPP/type_traits/is_destructible.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_enum.h | 7 ++-----
.../__support/CPP/type_traits/is_fixed_point.h | 7 ++-----
.../CPP/type_traits/is_floating_point.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_function.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_integral.h | 7 ++-----
.../CPP/type_traits/is_lvalue_reference.h | 7 ++-----
.../CPP/type_traits/is_member_pointer.h | 7 ++-----
.../__support/CPP/type_traits/is_null_pointer.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_object.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_pointer.h | 7 ++-----
.../src/__support/CPP/type_traits/is_reference.h | 7 ++-----
.../CPP/type_traits/is_rvalue_reference.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_same.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_scalar.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_signed.h | 7 ++-----
.../CPP/type_traits/is_trivially_constructible.h | 7 ++-----
.../CPP/type_traits/is_trivially_copyable.h | 7 ++-----
.../CPP/type_traits/is_trivially_destructible.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_union.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_unsigned.h | 7 ++-----
libc/src/__support/CPP/type_traits/is_void.h | 7 ++-----
libc/src/__support/CPP/type_traits/make_signed.h | 7 ++-----
.../__support/CPP/type_traits/make_unsigned.h | 7 ++-----
.../CPP/type_traits/remove_all_extents.h | 7 ++-----
libc/src/__support/CPP/type_traits/remove_cv.h | 7 ++-----
.../src/__support/CPP/type_traits/remove_cvref.h | 7 ++-----
.../__support/CPP/type_traits/remove_extent.h | 7 ++-----
.../__support/CPP/type_traits/remove_reference.h | 7 ++-----
libc/src/__support/CPP/type_traits/true_type.h | 7 ++-----
.../__support/CPP/type_traits/type_identity.h | 8 ++------
libc/src/__support/CPP/type_traits/void_t.h | 7 ++-----
libc/src/__support/CPP/utility/declval.h | 7 ++-----
libc/src/__support/CPP/utility/forward.h | 7 ++-----
libc/src/__support/CPP/utility/in_place.h | 7 ++-----
.../src/__support/CPP/utility/integer_sequence.h | 7 ++-----
libc/src/__support/CPP/utility/move.h | 7 ++-----
libc/src/__support/FPUtil/BasicOperations.h | 5 ++---
.../FPUtil/DivisionAndRemainderOperations.h | 5 ++---
libc/src/__support/FPUtil/FEnvImpl.h | 13 ++++---------
libc/src/__support/FPUtil/FMA.h | 5 ++---
libc/src/__support/FPUtil/FPBits.h | 5 ++---
libc/src/__support/FPUtil/Hypot.h | 5 ++---
.../src/__support/FPUtil/ManipulationFunctions.h | 5 ++---
.../__support/FPUtil/NearestIntegerOperations.h | 5 ++---
libc/src/__support/FPUtil/NormalFloat.h | 5 ++---
libc/src/__support/FPUtil/PolyEval.h | 5 ++---
libc/src/__support/FPUtil/aarch64/FEnvImpl.h | 5 ++---
.../__support/FPUtil/aarch64/fenv_darwin_impl.h | 5 ++---
.../__support/FPUtil/aarch64/nearest_integer.h | 5 ++---
libc/src/__support/FPUtil/aarch64/sqrt.h | 5 ++---
libc/src/__support/FPUtil/arm/FEnvImpl.h | 5 ++---
libc/src/__support/FPUtil/double_double.h | 7 ++-----
libc/src/__support/FPUtil/dyadic_float.h | 7 ++-----
libc/src/__support/FPUtil/except_value_utils.h | 5 ++---
libc/src/__support/FPUtil/fpbits_str.h | 5 ++---
libc/src/__support/FPUtil/generic/FMA.h | 5 ++---
libc/src/__support/FPUtil/generic/FMod.h | 5 ++---
libc/src/__support/FPUtil/generic/README.md | 4 ++--
libc/src/__support/FPUtil/generic/add_sub.h | 7 ++-----
libc/src/__support/FPUtil/generic/div.h | 7 ++-----
libc/src/__support/FPUtil/generic/sqrt.h | 5 ++---
.../FPUtil/generic/sqrt_80_bit_long_double.h | 5 ++---
libc/src/__support/FPUtil/multiply_add.h | 9 ++++-----
libc/src/__support/FPUtil/nearest_integer.h | 9 ++++-----
libc/src/__support/FPUtil/riscv/FEnvImpl.h | 4 ++--
libc/src/__support/FPUtil/riscv/sqrt.h | 5 ++---
libc/src/__support/FPUtil/rounding_mode.h | 7 ++-----
libc/src/__support/FPUtil/triple_double.h | 8 ++------
libc/src/__support/FPUtil/x86_64/FEnvImpl.h | 5 ++---
.../FPUtil/x86_64/NextAfterLongDouble.h | 5 ++---
.../FPUtil/x86_64/NextUpDownLongDouble.h | 7 ++-----
.../__support/FPUtil/x86_64/nearest_integer.h | 5 ++---
libc/src/__support/FPUtil/x86_64/sqrt.h | 5 ++---
libc/src/__support/File/dir.cpp | 5 ++---
libc/src/__support/File/dir.h | 5 ++---
libc/src/__support/File/file.cpp | 5 ++---
libc/src/__support/File/file.h | 5 ++---
libc/src/__support/File/linux/dir.cpp | 5 ++---
libc/src/__support/File/linux/file.cpp | 7 +++----
libc/src/__support/File/linux/file.h | 5 ++---
libc/src/__support/File/linux/lseekImpl.h | 5 ++---
libc/src/__support/File/linux/stderr.cpp | 5 ++---
libc/src/__support/File/linux/stdin.cpp | 5 ++---
libc/src/__support/File/linux/stdout.cpp | 5 ++---
libc/src/__support/GPU/allocator.cpp | 5 ++---
libc/src/__support/GPU/allocator.h | 5 ++---
libc/src/__support/GPU/amdgpu/utils.h | 4 ++--
libc/src/__support/GPU/generic/utils.h | 5 ++---
libc/src/__support/GPU/nvptx/utils.h | 5 ++---
libc/src/__support/GPU/utils.h | 5 ++---
libc/src/__support/HashTable/bitmask.h | 5 ++---
.../__support/HashTable/generic/bitmask_impl.inc | 5 ++---
libc/src/__support/HashTable/randomness.h | 5 ++---
.../__support/HashTable/sse2/bitmask_impl.inc | 7 ++-----
libc/src/__support/HashTable/table.h | 5 ++---
libc/src/__support/OSUtil/baremetal/exit.cpp | 7 ++-----
libc/src/__support/OSUtil/baremetal/io.cpp | 5 ++---
libc/src/__support/OSUtil/baremetal/io.h | 5 ++---
libc/src/__support/OSUtil/darwin/arm/syscall.h | 5 ++---
libc/src/__support/OSUtil/darwin/io.h | 5 ++---
libc/src/__support/OSUtil/darwin/syscall.h | 5 ++---
libc/src/__support/OSUtil/exit.h | 8 ++------
libc/src/__support/OSUtil/fcntl.h | 8 ++------
libc/src/__support/OSUtil/fuchsia/io.h | 5 ++---
libc/src/__support/OSUtil/gpu/exit.cpp | 7 ++-----
libc/src/__support/OSUtil/gpu/io.cpp | 5 ++---
libc/src/__support/OSUtil/gpu/io.h | 5 ++---
.../src/__support/OSUtil/linux/aarch64/syscall.h | 5 ++---
libc/src/__support/OSUtil/linux/arm/syscall.h | 5 ++---
libc/src/__support/OSUtil/linux/exit.cpp | 7 ++-----
libc/src/__support/OSUtil/linux/fcntl.cpp | 7 ++-----
libc/src/__support/OSUtil/linux/io.h | 5 ++---
libc/src/__support/OSUtil/linux/riscv/syscall.h | 5 ++---
libc/src/__support/OSUtil/linux/syscall.h | 5 ++---
libc/src/__support/OSUtil/linux/x86_64/syscall.h | 5 ++---
libc/src/__support/RPC/rpc.h | 5 ++---
libc/src/__support/RPC/rpc_client.cpp | 5 ++---
libc/src/__support/RPC/rpc_client.h | 5 ++---
libc/src/__support/RPC/rpc_util.h | 5 ++---
.../src/__support/StringUtil/error_to_string.cpp | 5 ++---
libc/src/__support/StringUtil/error_to_string.h | 5 ++---
libc/src/__support/StringUtil/message_mapper.h | 5 ++---
.../__support/StringUtil/signal_to_string.cpp | 5 ++---
libc/src/__support/StringUtil/signal_to_string.h | 5 ++---
.../StringUtil/tables/linux_extension_errors.h | 5 ++---
.../StringUtil/tables/linux_extension_signals.h | 5 ++---
.../StringUtil/tables/linux_platform_errors.h | 5 ++---
.../StringUtil/tables/linux_platform_signals.h | 5 ++---
.../StringUtil/tables/minimal_platform_errors.h | 5 ++---
.../StringUtil/tables/minimal_platform_signals.h | 5 ++---
.../__support/StringUtil/tables/posix_errors.h | 5 ++---
.../__support/StringUtil/tables/posix_signals.h | 5 ++---
.../__support/StringUtil/tables/signal_table.h | 7 ++-----
.../__support/StringUtil/tables/stdc_errors.h | 5 ++---
.../__support/StringUtil/tables/stdc_signals.h | 5 ++---
libc/src/__support/arg_list.h | 5 ++---
libc/src/__support/big_int.h | 5 ++---
libc/src/__support/block.h | 5 ++---
libc/src/__support/blockstore.h | 5 ++---
libc/src/__support/c_string.h | 5 ++---
libc/src/__support/char_vector.h | 5 ++---
libc/src/__support/common.h | 5 ++---
libc/src/__support/ctype_utils.h | 5 ++---
libc/src/__support/detailed_powers_of_ten.h | 5 ++---
libc/src/__support/endian.h | 5 ++---
libc/src/__support/error_or.h | 5 ++---
libc/src/__support/fixed_point/fx_bits.h | 7 ++-----
libc/src/__support/fixed_point/fx_rep.h | 7 ++-----
libc/src/__support/fixed_point/sqrt.h | 7 ++-----
libc/src/__support/fixedvector.h | 5 ++---
libc/src/__support/float_to_string.h | 5 ++---
libc/src/__support/freelist.h | 5 ++---
libc/src/__support/freelist_heap.h | 5 ++---
libc/src/__support/hash.h | 5 ++---
libc/src/__support/high_precision_decimal.h | 5 ++---
libc/src/__support/integer_literals.h | 5 ++---
libc/src/__support/integer_operations.h | 5 ++---
libc/src/__support/integer_to_string.h | 5 ++---
libc/src/__support/intrusive_list.h | 5 ++---
libc/src/__support/libc_assert.h | 5 ++---
libc/src/__support/macros/config.h | 1 -
libc/src/__support/macros/optimization.h | 7 ++-----
libc/src/__support/math_extras.h | 5 ++---
libc/src/__support/memory_size.h | 5 ++---
libc/src/__support/number_pair.h | 5 ++---
libc/src/__support/str_to_float.h | 5 ++---
libc/src/__support/str_to_integer.h | 5 ++---
libc/src/__support/str_to_num_result.h | 5 ++---
libc/src/__support/threads/CndVar.h | 5 ++---
libc/src/__support/threads/callonce.h | 5 ++---
libc/src/__support/threads/fork_callbacks.cpp | 5 ++---
libc/src/__support/threads/fork_callbacks.h | 6 ++----
libc/src/__support/threads/gpu/mutex.h | 5 ++---
libc/src/__support/threads/linux/CndVar.cpp | 5 ++---
libc/src/__support/threads/linux/callonce.cpp | 5 ++---
libc/src/__support/threads/linux/callonce.h | 5 ++---
libc/src/__support/threads/linux/futex_utils.h | 5 ++---
libc/src/__support/threads/linux/futex_word.h | 5 ++---
libc/src/__support/threads/linux/mutex.h | 5 ++---
libc/src/__support/threads/linux/raw_mutex.h | 5 ++---
libc/src/__support/threads/linux/rwlock.h | 5 ++---
libc/src/__support/threads/linux/thread.cpp | 5 ++---
libc/src/__support/threads/mutex_common.h | 6 ++----
libc/src/__support/threads/sleep.h | 5 ++---
libc/src/__support/threads/thread.cpp | 5 ++---
libc/src/__support/threads/thread.h | 5 ++---
libc/src/__support/time/linux/abs_timeout.h | 5 ++---
libc/src/__support/time/linux/clock_conversion.h | 5 ++---
libc/src/__support/time/linux/clock_gettime.h | 5 ++---
libc/src/__support/time/linux/monotonicity.h | 5 ++---
libc/src/__support/time/units.h | 5 ++---
libc/src/__support/wctype_utils.h | 5 ++---
libc/src/assert/__assert_fail.h | 5 ++---
libc/src/assert/generic/__assert_fail.cpp | 5 ++---
libc/src/assert/gpu/__assert_fail.cpp | 5 ++---
libc/src/ctype/isalnum.cpp | 5 ++---
libc/src/ctype/isalnum.h | 6 ++----
libc/src/ctype/isalpha.cpp | 5 ++---
libc/src/ctype/isalpha.h | 6 ++----
libc/src/ctype/isascii.cpp | 5 ++---
libc/src/ctype/isascii.h | 5 ++---
libc/src/ctype/isblank.cpp | 5 ++---
libc/src/ctype/isblank.h | 6 ++----
libc/src/ctype/iscntrl.cpp | 5 ++---
libc/src/ctype/iscntrl.h | 6 ++----
libc/src/ctype/isdigit.cpp | 5 ++---
libc/src/ctype/isdigit.h | 6 ++----
libc/src/ctype/isgraph.cpp | 5 ++---
libc/src/ctype/isgraph.h | 6 ++----
libc/src/ctype/islower.cpp | 5 ++---
libc/src/ctype/islower.h | 6 ++----
libc/src/ctype/isprint.cpp | 5 ++---
libc/src/ctype/isprint.h | 6 ++----
libc/src/ctype/ispunct.cpp | 5 ++---
libc/src/ctype/ispunct.h | 6 ++----
libc/src/ctype/isspace.cpp | 5 ++---
libc/src/ctype/isspace.h | 6 ++----
libc/src/ctype/isupper.cpp | 5 ++---
libc/src/ctype/isupper.h | 6 ++----
libc/src/ctype/isxdigit.cpp | 5 ++---
libc/src/ctype/isxdigit.h | 6 ++----
libc/src/ctype/toascii.cpp | 5 ++---
libc/src/ctype/toascii.h | 6 ++----
libc/src/ctype/tolower.cpp | 5 ++---
libc/src/ctype/tolower.h | 6 ++----
libc/src/ctype/toupper.cpp | 5 ++---
libc/src/ctype/toupper.h | 6 ++----
libc/src/dirent/closedir.cpp | 5 ++---
libc/src/dirent/closedir.h | 5 ++---
libc/src/dirent/dirfd.cpp | 5 ++---
libc/src/dirent/dirfd.h | 5 ++---
libc/src/dirent/opendir.cpp | 5 ++---
libc/src/dirent/opendir.h | 5 ++---
libc/src/dirent/readdir.cpp | 5 ++---
libc/src/dirent/readdir.h | 5 ++---
libc/src/dlfcn/dlclose.cpp | 5 ++---
libc/src/dlfcn/dlclose.h | 6 ++----
libc/src/dlfcn/dlerror.cpp | 5 ++---
libc/src/dlfcn/dlerror.h | 6 ++----
libc/src/dlfcn/dlopen.cpp | 5 ++---
libc/src/dlfcn/dlopen.h | 6 ++----
libc/src/dlfcn/dlsym.cpp | 5 ++---
libc/src/dlfcn/dlsym.h | 6 ++----
libc/src/errno/libc_errno.cpp | 5 ++---
libc/src/errno/libc_errno.h | 5 ++---
libc/src/fcntl/creat.h | 5 ++---
libc/src/fcntl/fcntl.h | 6 ++----
libc/src/fcntl/linux/creat.cpp | 5 ++---
libc/src/fcntl/linux/fcntl.cpp | 5 ++---
libc/src/fcntl/linux/open.cpp | 5 ++---
libc/src/fcntl/linux/openat.cpp | 5 ++---
libc/src/fcntl/open.h | 5 ++---
libc/src/fcntl/openat.h | 5 ++---
libc/src/fenv/feclearexcept.cpp | 5 ++---
libc/src/fenv/feclearexcept.h | 6 ++----
libc/src/fenv/fedisableexcept.cpp | 5 ++---
libc/src/fenv/fedisableexcept.h | 6 ++----
libc/src/fenv/feenableexcept.cpp | 5 ++---
libc/src/fenv/feenableexcept.h | 6 ++----
libc/src/fenv/fegetenv.cpp | 5 ++---
libc/src/fenv/fegetenv.h | 5 ++---
libc/src/fenv/fegetexcept.cpp | 5 ++---
libc/src/fenv/fegetexcept.h | 6 ++----
libc/src/fenv/fegetexceptflag.cpp | 5 ++---
libc/src/fenv/fegetexceptflag.h | 5 ++---
libc/src/fenv/fegetround.cpp | 5 ++---
libc/src/fenv/fegetround.h | 6 ++----
libc/src/fenv/feholdexcept.cpp | 5 ++---
libc/src/fenv/feholdexcept.h | 5 ++---
libc/src/fenv/feraiseexcept.cpp | 5 ++---
libc/src/fenv/feraiseexcept.h | 6 ++----
libc/src/fenv/fesetenv.cpp | 5 ++---
libc/src/fenv/fesetenv.h | 5 ++---
libc/src/fenv/fesetexcept.cpp | 5 ++---
libc/src/fenv/fesetexcept.h | 6 ++----
libc/src/fenv/fesetexceptflag.cpp | 5 ++---
libc/src/fenv/fesetexceptflag.h | 5 ++---
libc/src/fenv/fesetround.cpp | 5 ++---
libc/src/fenv/fesetround.h | 6 ++----
libc/src/fenv/fetestexcept.cpp | 5 ++---
libc/src/fenv/fetestexcept.h | 6 ++----
libc/src/fenv/fetestexceptflag.cpp | 5 ++---
libc/src/fenv/fetestexceptflag.h | 5 ++---
libc/src/fenv/feupdateenv.cpp | 5 ++---
libc/src/fenv/feupdateenv.h | 5 ++---
libc/src/gpu/rpc_fprintf.cpp | 5 ++---
libc/src/gpu/rpc_fprintf.h | 5 ++---
libc/src/gpu/rpc_host_call.cpp | 5 ++---
libc/src/gpu/rpc_host_call.h | 5 ++---
libc/src/inttypes/imaxabs.cpp | 5 ++---
libc/src/inttypes/imaxabs.h | 5 ++---
libc/src/inttypes/imaxdiv.cpp | 5 ++---
libc/src/inttypes/imaxdiv.h | 5 ++---
libc/src/inttypes/strtoimax.cpp | 5 ++---
libc/src/inttypes/strtoimax.h | 5 ++---
libc/src/inttypes/strtoumax.cpp | 5 ++---
libc/src/inttypes/strtoumax.h | 5 ++---
libc/src/math/aarch64/ceil.cpp | 5 ++---
libc/src/math/aarch64/ceilf.cpp | 5 ++---
libc/src/math/aarch64/floor.cpp | 5 ++---
libc/src/math/aarch64/floorf.cpp | 5 ++---
libc/src/math/aarch64/round.cpp | 5 ++---
libc/src/math/aarch64/roundf.cpp | 5 ++---
libc/src/math/aarch64/trunc.cpp | 5 ++---
libc/src/math/aarch64/truncf.cpp | 5 ++---
libc/src/math/acos.h | 6 ++----
libc/src/math/acosf.h | 6 ++----
libc/src/math/acosh.h | 6 ++----
libc/src/math/acoshf.h | 6 ++----
libc/src/math/amdgpu/acos.cpp | 5 ++---
libc/src/math/amdgpu/acosf.cpp | 5 ++---
libc/src/math/amdgpu/acosh.cpp | 5 ++---
libc/src/math/amdgpu/acoshf.cpp | 5 ++---
libc/src/math/amdgpu/asin.cpp | 5 ++---
libc/src/math/amdgpu/asinf.cpp | 5 ++---
libc/src/math/amdgpu/asinh.cpp | 5 ++---
libc/src/math/amdgpu/asinhf.cpp | 5 ++---
libc/src/math/amdgpu/atan.cpp | 5 ++---
libc/src/math/amdgpu/atan2.cpp | 5 ++---
libc/src/math/amdgpu/atan2f.cpp | 5 ++---
libc/src/math/amdgpu/atanf.cpp | 5 ++---
libc/src/math/amdgpu/atanh.cpp | 5 ++---
libc/src/math/amdgpu/atanhf.cpp | 5 ++---
libc/src/math/amdgpu/ceil.cpp | 5 ++---
libc/src/math/amdgpu/ceilf.cpp | 5 ++---
libc/src/math/amdgpu/copysign.cpp | 5 ++---
libc/src/math/amdgpu/copysignf.cpp | 5 ++---
libc/src/math/amdgpu/cos.cpp | 5 ++---
libc/src/math/amdgpu/cosf.cpp | 5 ++---
libc/src/math/amdgpu/cosh.cpp | 5 ++---
libc/src/math/amdgpu/coshf.cpp | 5 ++---
libc/src/math/amdgpu/declarations.h | 5 ++---
libc/src/math/amdgpu/erf.cpp | 5 ++---
libc/src/math/amdgpu/erff.cpp | 5 ++---
libc/src/math/amdgpu/exp.cpp | 5 ++---
libc/src/math/amdgpu/exp10.cpp | 5 ++---
libc/src/math/amdgpu/exp10f.cpp | 5 ++---
libc/src/math/amdgpu/exp2.cpp | 5 ++---
libc/src/math/amdgpu/exp2f.cpp | 5 ++---
libc/src/math/amdgpu/expf.cpp | 5 ++---
libc/src/math/amdgpu/expm1.cpp | 5 ++---
libc/src/math/amdgpu/expm1f.cpp | 5 ++---
libc/src/math/amdgpu/fabs.cpp | 5 ++---
libc/src/math/amdgpu/fabsf.cpp | 5 ++---
libc/src/math/amdgpu/fdim.cpp | 5 ++---
libc/src/math/amdgpu/fdimf.cpp | 5 ++---
libc/src/math/amdgpu/floor.cpp | 5 ++---
libc/src/math/amdgpu/floorf.cpp | 5 ++---
libc/src/math/amdgpu/fma.cpp | 5 ++---
libc/src/math/amdgpu/fmaf.cpp | 5 ++---
libc/src/math/amdgpu/fmax.cpp | 5 ++---
libc/src/math/amdgpu/fmaxf.cpp | 5 ++---
libc/src/math/amdgpu/fmin.cpp | 5 ++---
libc/src/math/amdgpu/fminf.cpp | 5 ++---
libc/src/math/amdgpu/fmod.cpp | 5 ++---
libc/src/math/amdgpu/fmodf.cpp | 5 ++---
libc/src/math/amdgpu/frexp.cpp | 5 ++---
libc/src/math/amdgpu/frexpf.cpp | 5 ++---
libc/src/math/amdgpu/hypot.cpp | 5 ++---
libc/src/math/amdgpu/hypotf.cpp | 5 ++---
libc/src/math/amdgpu/ilogb.cpp | 5 ++---
libc/src/math/amdgpu/ilogbf.cpp | 5 ++---
libc/src/math/amdgpu/ldexp.cpp | 5 ++---
libc/src/math/amdgpu/ldexpf.cpp | 5 ++---
libc/src/math/amdgpu/llrint.cpp | 5 ++---
libc/src/math/amdgpu/llrintf.cpp | 5 ++---
libc/src/math/amdgpu/log.cpp | 5 ++---
libc/src/math/amdgpu/log10.cpp | 5 ++---
libc/src/math/amdgpu/log10f.cpp | 5 ++---
libc/src/math/amdgpu/log1p.cpp | 5 ++---
libc/src/math/amdgpu/log1pf.cpp | 5 ++---
libc/src/math/amdgpu/log2.cpp | 5 ++---
libc/src/math/amdgpu/log2f.cpp | 5 ++---
libc/src/math/amdgpu/logb.cpp | 5 ++---
libc/src/math/amdgpu/logbf.cpp | 5 ++---
libc/src/math/amdgpu/logf.cpp | 5 ++---
libc/src/math/amdgpu/lrint.cpp | 5 ++---
libc/src/math/amdgpu/lrintf.cpp | 5 ++---
libc/src/math/amdgpu/nearbyint.cpp | 5 ++---
libc/src/math/amdgpu/nearbyintf.cpp | 5 ++---
libc/src/math/amdgpu/nextafter.cpp | 5 ++---
libc/src/math/amdgpu/nextafterf.cpp | 5 ++---
libc/src/math/amdgpu/platform.h | 5 ++---
libc/src/math/amdgpu/pow.cpp | 5 ++---
libc/src/math/amdgpu/powf.cpp | 5 ++---
libc/src/math/amdgpu/powi.cpp | 5 ++---
libc/src/math/amdgpu/powif.cpp | 5 ++---
libc/src/math/amdgpu/remainder.cpp | 5 ++---
libc/src/math/amdgpu/remainderf.cpp | 5 ++---
libc/src/math/amdgpu/remquo.cpp | 5 ++---
libc/src/math/amdgpu/remquof.cpp | 5 ++---
libc/src/math/amdgpu/rint.cpp | 5 ++---
libc/src/math/amdgpu/rintf.cpp | 5 ++---
libc/src/math/amdgpu/round.cpp | 5 ++---
libc/src/math/amdgpu/roundf.cpp | 5 ++---
libc/src/math/amdgpu/scalbn.cpp | 5 ++---
libc/src/math/amdgpu/scalbnf.cpp | 5 ++---
libc/src/math/amdgpu/sin.cpp | 5 ++---
libc/src/math/amdgpu/sincos.cpp | 5 ++---
libc/src/math/amdgpu/sincosf.cpp | 5 ++---
libc/src/math/amdgpu/sinf.cpp | 5 ++---
libc/src/math/amdgpu/sinh.cpp | 5 ++---
libc/src/math/amdgpu/sinhf.cpp | 5 ++---
libc/src/math/amdgpu/sqrt.cpp | 5 ++---
libc/src/math/amdgpu/sqrtf.cpp | 5 ++---
libc/src/math/amdgpu/tan.cpp | 5 ++---
libc/src/math/amdgpu/tanf.cpp | 5 ++---
libc/src/math/amdgpu/tanh.cpp | 5 ++---
libc/src/math/amdgpu/tanhf.cpp | 5 ++---
libc/src/math/amdgpu/tgamma.cpp | 5 ++---
libc/src/math/amdgpu/tgammaf.cpp | 5 ++---
libc/src/math/amdgpu/trunc.cpp | 5 ++---
libc/src/math/amdgpu/truncf.cpp | 5 ++---
libc/src/math/asin.h | 6 ++----
libc/src/math/asinf.h | 6 ++----
libc/src/math/asinh.h | 6 ++----
libc/src/math/asinhf.h | 6 ++----
libc/src/math/atan.h | 6 ++----
libc/src/math/atan2.h | 6 ++----
libc/src/math/atan2f.h | 6 ++----
libc/src/math/atanf.h | 6 ++----
libc/src/math/atanh.h | 6 ++----
libc/src/math/atanhf.h | 6 ++----
libc/src/math/canonicalize.h | 6 ++----
libc/src/math/canonicalizef.h | 6 ++----
libc/src/math/canonicalizef128.h | 5 ++---
libc/src/math/canonicalizef16.h | 5 ++---
libc/src/math/canonicalizel.h | 6 ++----
libc/src/math/cbrtf.h | 6 ++----
libc/src/math/ceil.h | 6 ++----
libc/src/math/ceilf.h | 6 ++----
libc/src/math/ceilf128.h | 5 ++---
libc/src/math/ceilf16.h | 5 ++---
libc/src/math/ceill.h | 6 ++----
libc/src/math/copysign.h | 6 ++----
libc/src/math/copysignf.h | 6 ++----
libc/src/math/copysignf128.h | 5 ++---
libc/src/math/copysignf16.h | 5 ++---
libc/src/math/copysignl.h | 6 ++----
libc/src/math/cos.h | 6 ++----
libc/src/math/cosf.h | 6 ++----
libc/src/math/cosh.h | 6 ++----
libc/src/math/coshf.h | 6 ++----
libc/src/math/cospif.h | 6 ++----
libc/src/math/erf.h | 6 ++----
libc/src/math/erff.h | 6 ++----
libc/src/math/exp.h | 6 ++----
libc/src/math/exp10.h | 6 ++----
libc/src/math/exp10f.h | 6 ++----
libc/src/math/exp2.h | 6 ++----
libc/src/math/exp2f.h | 6 ++----
libc/src/math/exp2m1f.h | 6 ++----
libc/src/math/expf.h | 6 ++----
libc/src/math/expm1.h | 6 ++----
libc/src/math/expm1f.h | 6 ++----
libc/src/math/f16add.h | 5 ++---
libc/src/math/f16addf.h | 5 ++---
libc/src/math/f16addf128.h | 5 ++---
libc/src/math/f16addl.h | 5 ++---
libc/src/math/f16div.h | 5 ++---
libc/src/math/f16divf.h | 5 ++---
libc/src/math/f16divf128.h | 5 ++---
libc/src/math/f16divl.h | 5 ++---
libc/src/math/f16fma.h | 5 ++---
libc/src/math/f16fmaf.h | 5 ++---
libc/src/math/f16fmaf128.h | 5 ++---
libc/src/math/f16fmal.h | 5 ++---
libc/src/math/f16sqrt.h | 5 ++---
libc/src/math/f16sqrtf.h | 5 ++---
libc/src/math/f16sqrtf128.h | 5 ++---
libc/src/math/f16sqrtl.h | 5 ++---
libc/src/math/f16sub.h | 5 ++---
libc/src/math/f16subf.h | 5 ++---
libc/src/math/f16subf128.h | 5 ++---
libc/src/math/f16subl.h | 5 ++---
libc/src/math/fabs.h | 6 ++----
libc/src/math/fabsf.h | 6 ++----
libc/src/math/fabsf128.h | 5 ++---
libc/src/math/fabsf16.h | 5 ++---
libc/src/math/fabsl.h | 6 ++----
libc/src/math/fdim.h | 6 ++----
libc/src/math/fdimf.h | 6 ++----
libc/src/math/fdimf128.h | 5 ++---
libc/src/math/fdimf16.h | 5 ++---
libc/src/math/fdiml.h | 6 ++----
libc/src/math/floor.h | 6 ++----
libc/src/math/floorf.h | 6 ++----
libc/src/math/floorf128.h | 5 ++---
libc/src/math/floorf16.h | 5 ++---
libc/src/math/floorl.h | 6 ++----
libc/src/math/fma.h | 6 ++----
libc/src/math/fmaf.h | 6 ++----
libc/src/math/fmax.h | 6 ++----
libc/src/math/fmaxf.h | 6 ++----
libc/src/math/fmaxf128.h | 5 ++---
libc/src/math/fmaxf16.h | 5 ++---
libc/src/math/fmaximum.h | 6 ++----
libc/src/math/fmaximum_mag.h | 6 ++----
libc/src/math/fmaximum_mag_num.h | 6 ++----
libc/src/math/fmaximum_mag_numf.h | 6 ++----
libc/src/math/fmaximum_mag_numf128.h | 5 ++---
libc/src/math/fmaximum_mag_numf16.h | 5 ++---
libc/src/math/fmaximum_mag_numl.h | 6 ++----
libc/src/math/fmaximum_magf.h | 6 ++----
libc/src/math/fmaximum_magf128.h | 5 ++---
libc/src/math/fmaximum_magf16.h | 5 ++---
libc/src/math/fmaximum_magl.h | 6 ++----
libc/src/math/fmaximum_num.h | 6 ++----
libc/src/math/fmaximum_numf.h | 6 ++----
libc/src/math/fmaximum_numf128.h | 5 ++---
libc/src/math/fmaximum_numf16.h | 5 ++---
libc/src/math/fmaximum_numl.h | 6 ++----
libc/src/math/fmaximumf.h | 6 ++----
libc/src/math/fmaximumf128.h | 5 ++---
libc/src/math/fmaximumf16.h | 5 ++---
libc/src/math/fmaximuml.h | 6 ++----
libc/src/math/fmaxl.h | 6 ++----
libc/src/math/fmin.h | 6 ++----
libc/src/math/fminf.h | 6 ++----
libc/src/math/fminf128.h | 5 ++---
libc/src/math/fminf16.h | 5 ++---
libc/src/math/fminimum.h | 6 ++----
libc/src/math/fminimum_mag.h | 6 ++----
libc/src/math/fminimum_mag_num.h | 6 ++----
libc/src/math/fminimum_mag_numf.h | 6 ++----
libc/src/math/fminimum_mag_numf128.h | 5 ++---
libc/src/math/fminimum_mag_numf16.h | 5 ++---
libc/src/math/fminimum_mag_numl.h | 6 ++----
libc/src/math/fminimum_magf.h | 6 ++----
libc/src/math/fminimum_magf128.h | 5 ++---
libc/src/math/fminimum_magf16.h | 5 ++---
libc/src/math/fminimum_magl.h | 6 ++----
libc/src/math/fminimum_num.h | 6 ++----
libc/src/math/fminimum_numf.h | 6 ++----
libc/src/math/fminimum_numf128.h | 5 ++---
libc/src/math/fminimum_numf16.h | 5 ++---
libc/src/math/fminimum_numl.h | 6 ++----
libc/src/math/fminimumf.h | 6 ++----
libc/src/math/fminimumf128.h | 5 ++---
libc/src/math/fminimumf16.h | 5 ++---
libc/src/math/fminimuml.h | 6 ++----
libc/src/math/fminl.h | 6 ++----
libc/src/math/fmod.h | 6 ++----
libc/src/math/fmodf.h | 6 ++----
libc/src/math/fmodf128.h | 5 ++---
libc/src/math/fmodf16.h | 5 ++---
libc/src/math/fmodl.h | 6 ++----
libc/src/math/fmul.h | 6 ++----
libc/src/math/frexp.h | 6 ++----
libc/src/math/frexpf.h | 6 ++----
libc/src/math/frexpf128.h | 5 ++---
libc/src/math/frexpf16.h | 5 ++---
libc/src/math/frexpl.h | 6 ++----
libc/src/math/fromfp.h | 6 ++----
libc/src/math/fromfpf.h | 6 ++----
libc/src/math/fromfpf128.h | 5 ++---
libc/src/math/fromfpf16.h | 5 ++---
libc/src/math/fromfpl.h | 6 ++----
libc/src/math/fromfpx.h | 6 ++----
libc/src/math/fromfpxf.h | 6 ++----
libc/src/math/fromfpxf128.h | 5 ++---
libc/src/math/fromfpxf16.h | 5 ++---
libc/src/math/fromfpxl.h | 6 ++----
libc/src/math/generic/acosf.cpp | 5 ++---
libc/src/math/generic/acoshf.cpp | 5 ++---
libc/src/math/generic/asinf.cpp | 5 ++---
libc/src/math/generic/asinhf.cpp | 5 ++---
libc/src/math/generic/atan2f.cpp | 5 ++---
libc/src/math/generic/atanf.cpp | 5 ++---
libc/src/math/generic/atanhf.cpp | 5 ++---
libc/src/math/generic/canonicalize.cpp | 5 ++---
libc/src/math/generic/canonicalizef.cpp | 5 ++---
libc/src/math/generic/canonicalizef128.cpp | 5 ++---
libc/src/math/generic/canonicalizef16.cpp | 5 ++---
libc/src/math/generic/canonicalizel.cpp | 5 ++---
libc/src/math/generic/cbrtf.cpp | 5 ++---
libc/src/math/generic/ceil.cpp | 5 ++---
libc/src/math/generic/ceilf.cpp | 5 ++---
libc/src/math/generic/ceilf128.cpp | 5 ++---
libc/src/math/generic/ceilf16.cpp | 5 ++---
libc/src/math/generic/ceill.cpp | 5 ++---
libc/src/math/generic/common_constants.cpp | 5 ++---
libc/src/math/generic/common_constants.h | 5 ++---
libc/src/math/generic/copysign.cpp | 5 ++---
libc/src/math/generic/copysignf.cpp | 5 ++---
libc/src/math/generic/copysignf128.cpp | 5 ++---
libc/src/math/generic/copysignf16.cpp | 5 ++---
libc/src/math/generic/copysignl.cpp | 5 ++---
libc/src/math/generic/cos.cpp | 5 ++---
libc/src/math/generic/cosf.cpp | 5 ++---
libc/src/math/generic/coshf.cpp | 5 ++---
libc/src/math/generic/cospif.cpp | 5 ++---
libc/src/math/generic/erff.cpp | 5 ++---
libc/src/math/generic/exp.cpp | 5 ++---
libc/src/math/generic/exp10.cpp | 5 ++---
libc/src/math/generic/exp10f.cpp | 5 ++---
libc/src/math/generic/exp10f_impl.h | 7 ++-----
libc/src/math/generic/exp2.cpp | 5 ++---
libc/src/math/generic/exp2f.cpp | 5 ++---
libc/src/math/generic/exp2f_impl.h | 7 ++-----
libc/src/math/generic/exp2m1f.cpp | 5 ++---
libc/src/math/generic/exp_utils.cpp | 5 ++---
libc/src/math/generic/exp_utils.h | 5 ++---
libc/src/math/generic/expf.cpp | 5 ++---
libc/src/math/generic/explogxf.cpp | 5 ++---
libc/src/math/generic/explogxf.h | 5 ++---
libc/src/math/generic/expm1.cpp | 5 ++---
libc/src/math/generic/expm1f.cpp | 5 ++---
libc/src/math/generic/f16add.cpp | 5 ++---
libc/src/math/generic/f16addf.cpp | 5 ++---
libc/src/math/generic/f16addf128.cpp | 5 ++---
libc/src/math/generic/f16addl.cpp | 5 ++---
libc/src/math/generic/f16div.cpp | 5 ++---
libc/src/math/generic/f16divf.cpp | 5 ++---
libc/src/math/generic/f16divf128.cpp | 5 ++---
libc/src/math/generic/f16divl.cpp | 5 ++---
libc/src/math/generic/f16fma.cpp | 5 ++---
libc/src/math/generic/f16fmaf.cpp | 5 ++---
libc/src/math/generic/f16fmaf128.cpp | 5 ++---
libc/src/math/generic/f16fmal.cpp | 5 ++---
libc/src/math/generic/f16sqrt.cpp | 5 ++---
libc/src/math/generic/f16sqrtf.cpp | 5 ++---
libc/src/math/generic/f16sqrtf128.cpp | 5 ++---
libc/src/math/generic/f16sqrtl.cpp | 5 ++---
libc/src/math/generic/f16sub.cpp | 5 ++---
libc/src/math/generic/f16subf.cpp | 5 ++---
libc/src/math/generic/f16subf128.cpp | 5 ++---
libc/src/math/generic/f16subl.cpp | 5 ++---
libc/src/math/generic/fabs.cpp | 5 ++---
libc/src/math/generic/fabsf.cpp | 5 ++---
libc/src/math/generic/fabsf128.cpp | 5 ++---
libc/src/math/generic/fabsf16.cpp | 5 ++---
libc/src/math/generic/fabsl.cpp | 5 ++---
libc/src/math/generic/fdim.cpp | 5 ++---
libc/src/math/generic/fdimf.cpp | 5 ++---
libc/src/math/generic/fdimf128.cpp | 5 ++---
libc/src/math/generic/fdimf16.cpp | 5 ++---
libc/src/math/generic/fdiml.cpp | 5 ++---
libc/src/math/generic/floor.cpp | 5 ++---
libc/src/math/generic/floorf.cpp | 5 ++---
libc/src/math/generic/floorf128.cpp | 5 ++---
libc/src/math/generic/floorf16.cpp | 5 ++---
libc/src/math/generic/floorl.cpp | 5 ++---
libc/src/math/generic/fma.cpp | 5 ++---
libc/src/math/generic/fmaf.cpp | 5 ++---
libc/src/math/generic/fmax.cpp | 5 ++---
libc/src/math/generic/fmaxf.cpp | 5 ++---
libc/src/math/generic/fmaxf128.cpp | 5 ++---
libc/src/math/generic/fmaxf16.cpp | 5 ++---
libc/src/math/generic/fmaximum.cpp | 5 ++---
libc/src/math/generic/fmaximum_mag.cpp | 5 ++---
libc/src/math/generic/fmaximum_mag_num.cpp | 5 ++---
libc/src/math/generic/fmaximum_mag_numf.cpp | 5 ++---
libc/src/math/generic/fmaximum_mag_numf128.cpp | 5 ++---
libc/src/math/generic/fmaximum_mag_numf16.cpp | 5 ++---
libc/src/math/generic/fmaximum_mag_numl.cpp | 5 ++---
libc/src/math/generic/fmaximum_magf.cpp | 5 ++---
libc/src/math/generic/fmaximum_magf128.cpp | 5 ++---
libc/src/math/generic/fmaximum_magf16.cpp | 5 ++---
libc/src/math/generic/fmaximum_magl.cpp | 5 ++---
libc/src/math/generic/fmaximum_num.cpp | 5 ++---
libc/src/math/generic/fmaximum_numf.cpp | 5 ++---
libc/src/math/generic/fmaximum_numf128.cpp | 5 ++---
libc/src/math/generic/fmaximum_numf16.cpp | 5 ++---
libc/src/math/generic/fmaximum_numl.cpp | 5 ++---
libc/src/math/generic/fmaximumf.cpp | 5 ++---
libc/src/math/generic/fmaximumf128.cpp | 5 ++---
libc/src/math/generic/fmaximumf16.cpp | 5 ++---
libc/src/math/generic/fmaximuml.cpp | 5 ++---
libc/src/math/generic/fmaxl.cpp | 5 ++---
libc/src/math/generic/fmin.cpp | 5 ++---
libc/src/math/generic/fminf.cpp | 5 ++---
libc/src/math/generic/fminf128.cpp | 5 ++---
libc/src/math/generic/fminf16.cpp | 5 ++---
libc/src/math/generic/fminimum.cpp | 5 ++---
libc/src/math/generic/fminimum_mag.cpp | 5 ++---
libc/src/math/generic/fminimum_mag_num.cpp | 5 ++---
libc/src/math/generic/fminimum_mag_numf.cpp | 5 ++---
libc/src/math/generic/fminimum_mag_numf128.cpp | 5 ++---
libc/src/math/generic/fminimum_mag_numf16.cpp | 5 ++---
libc/src/math/generic/fminimum_mag_numl.cpp | 5 ++---
libc/src/math/generic/fminimum_magf.cpp | 5 ++---
libc/src/math/generic/fminimum_magf128.cpp | 5 ++---
libc/src/math/generic/fminimum_magf16.cpp | 5 ++---
libc/src/math/generic/fminimum_magl.cpp | 5 ++---
libc/src/math/generic/fminimum_num.cpp | 5 ++---
libc/src/math/generic/fminimum_numf.cpp | 5 ++---
libc/src/math/generic/fminimum_numf128.cpp | 5 ++---
libc/src/math/generic/fminimum_numf16.cpp | 5 ++---
libc/src/math/generic/fminimum_numl.cpp | 5 ++---
libc/src/math/generic/fminimumf.cpp | 5 ++---
libc/src/math/generic/fminimumf128.cpp | 5 ++---
libc/src/math/generic/fminimumf16.cpp | 5 ++---
libc/src/math/generic/fminimuml.cpp | 5 ++---
libc/src/math/generic/fminl.cpp | 5 ++---
libc/src/math/generic/fmod.cpp | 5 ++---
libc/src/math/generic/fmodf.cpp | 5 ++---
libc/src/math/generic/fmodf128.cpp | 5 ++---
libc/src/math/generic/fmodf16.cpp | 5 ++---
libc/src/math/generic/fmodl.cpp | 5 ++---
libc/src/math/generic/fmul.cpp | 5 ++---
libc/src/math/generic/frexp.cpp | 5 ++---
libc/src/math/generic/frexpf.cpp | 5 ++---
libc/src/math/generic/frexpf128.cpp | 5 ++---
libc/src/math/generic/frexpf16.cpp | 5 ++---
libc/src/math/generic/frexpl.cpp | 5 ++---
libc/src/math/generic/fromfp.cpp | 5 ++---
libc/src/math/generic/fromfpf.cpp | 5 ++---
libc/src/math/generic/fromfpf128.cpp | 5 ++---
libc/src/math/generic/fromfpf16.cpp | 5 ++---
libc/src/math/generic/fromfpl.cpp | 5 ++---
libc/src/math/generic/fromfpx.cpp | 5 ++---
libc/src/math/generic/fromfpxf.cpp | 5 ++---
libc/src/math/generic/fromfpxf128.cpp | 5 ++---
libc/src/math/generic/fromfpxf16.cpp | 5 ++---
libc/src/math/generic/fromfpxl.cpp | 5 ++---
libc/src/math/generic/getpayloadf16.cpp | 5 ++---
libc/src/math/generic/hypot.cpp | 5 ++---
libc/src/math/generic/hypotf.cpp | 5 ++---
libc/src/math/generic/ilogb.cpp | 5 ++---
libc/src/math/generic/ilogbf.cpp | 5 ++---
libc/src/math/generic/ilogbf128.cpp | 5 ++---
libc/src/math/generic/ilogbf16.cpp | 5 ++---
libc/src/math/generic/ilogbl.cpp | 5 ++---
libc/src/math/generic/inv_trigf_utils.cpp | 5 ++---
libc/src/math/generic/inv_trigf_utils.h | 5 ++---
libc/src/math/generic/isnan.cpp | 5 ++---
libc/src/math/generic/isnanf.cpp | 5 ++---
libc/src/math/generic/isnanl.cpp | 5 ++---
libc/src/math/generic/ldexp.cpp | 5 ++---
libc/src/math/generic/ldexpf.cpp | 5 ++---
libc/src/math/generic/ldexpf128.cpp | 5 ++---
libc/src/math/generic/ldexpf16.cpp | 5 ++---
libc/src/math/generic/ldexpl.cpp | 5 ++---
libc/src/math/generic/llogb.cpp | 5 ++---
libc/src/math/generic/llogbf.cpp | 5 ++---
libc/src/math/generic/llogbf128.cpp | 5 ++---
libc/src/math/generic/llogbf16.cpp | 5 ++---
libc/src/math/generic/llogbl.cpp | 5 ++---
libc/src/math/generic/llrint.cpp | 5 ++---
libc/src/math/generic/llrintf.cpp | 5 ++---
libc/src/math/generic/llrintf128.cpp | 5 ++---
libc/src/math/generic/llrintf16.cpp | 5 ++---
libc/src/math/generic/llrintl.cpp | 5 ++---
libc/src/math/generic/llround.cpp | 5 ++---
libc/src/math/generic/llroundf.cpp | 5 ++---
libc/src/math/generic/llroundf128.cpp | 5 ++---
libc/src/math/generic/llroundf16.cpp | 5 ++---
libc/src/math/generic/llroundl.cpp | 5 ++---
libc/src/math/generic/log.cpp | 5 ++---
libc/src/math/generic/log10.cpp | 5 ++---
libc/src/math/generic/log10f.cpp | 5 ++---
libc/src/math/generic/log1p.cpp | 5 ++---
libc/src/math/generic/log1pf.cpp | 5 ++---
libc/src/math/generic/log2.cpp | 5 ++---
libc/src/math/generic/log2f.cpp | 5 ++---
libc/src/math/generic/log_range_reduction.h | 5 ++---
libc/src/math/generic/logb.cpp | 5 ++---
libc/src/math/generic/logbf.cpp | 5 ++---
libc/src/math/generic/logbf128.cpp | 5 ++---
libc/src/math/generic/logbf16.cpp | 5 ++---
libc/src/math/generic/logbl.cpp | 5 ++---
libc/src/math/generic/logf.cpp | 5 ++---
libc/src/math/generic/lrint.cpp | 5 ++---
libc/src/math/generic/lrintf.cpp | 5 ++---
libc/src/math/generic/lrintf128.cpp | 5 ++---
libc/src/math/generic/lrintf16.cpp | 5 ++---
libc/src/math/generic/lrintl.cpp | 5 ++---
libc/src/math/generic/lround.cpp | 5 ++---
libc/src/math/generic/lroundf.cpp | 5 ++---
libc/src/math/generic/lroundf128.cpp | 5 ++---
libc/src/math/generic/lroundf16.cpp | 5 ++---
libc/src/math/generic/lroundl.cpp | 5 ++---
libc/src/math/generic/modf.cpp | 5 ++---
libc/src/math/generic/modff.cpp | 5 ++---
libc/src/math/generic/modff128.cpp | 5 ++---
libc/src/math/generic/modff16.cpp | 5 ++---
libc/src/math/generic/modfl.cpp | 5 ++---
libc/src/math/generic/nan.cpp | 5 ++---
libc/src/math/generic/nanf.cpp | 5 ++---
libc/src/math/generic/nanf128.cpp | 5 ++---
libc/src/math/generic/nanf16.cpp | 5 ++---
libc/src/math/generic/nanl.cpp | 5 ++---
libc/src/math/generic/nearbyint.cpp | 5 ++---
libc/src/math/generic/nearbyintf.cpp | 5 ++---
libc/src/math/generic/nearbyintf128.cpp | 5 ++---
libc/src/math/generic/nearbyintf16.cpp | 5 ++---
libc/src/math/generic/nearbyintl.cpp | 5 ++---
libc/src/math/generic/nextafter.cpp | 5 ++---
libc/src/math/generic/nextafterf.cpp | 5 ++---
libc/src/math/generic/nextafterf128.cpp | 5 ++---
libc/src/math/generic/nextafterf16.cpp | 5 ++---
libc/src/math/generic/nextafterl.cpp | 5 ++---
libc/src/math/generic/nextdown.cpp | 5 ++---
libc/src/math/generic/nextdownf.cpp | 5 ++---
libc/src/math/generic/nextdownf128.cpp | 5 ++---
libc/src/math/generic/nextdownf16.cpp | 5 ++---
libc/src/math/generic/nextdownl.cpp | 5 ++---
libc/src/math/generic/nexttoward.cpp | 5 ++---
libc/src/math/generic/nexttowardf.cpp | 5 ++---
libc/src/math/generic/nexttowardf16.cpp | 5 ++---
libc/src/math/generic/nexttowardl.cpp | 5 ++---
libc/src/math/generic/nextup.cpp | 5 ++---
libc/src/math/generic/nextupf.cpp | 5 ++---
libc/src/math/generic/nextupf128.cpp | 5 ++---
libc/src/math/generic/nextupf16.cpp | 5 ++---
libc/src/math/generic/nextupl.cpp | 5 ++---
libc/src/math/generic/powf.cpp | 5 ++---
libc/src/math/generic/range_reduction.h | 5 ++---
.../math/generic/range_reduction_double_common.h | 5 ++---
.../math/generic/range_reduction_double_fma.h | 5 ++---
.../math/generic/range_reduction_double_nofma.h | 5 ++---
libc/src/math/generic/range_reduction_fma.h | 5 ++---
libc/src/math/generic/remainder.cpp | 5 ++---
libc/src/math/generic/remainderf.cpp | 5 ++---
libc/src/math/generic/remainderf16.cpp | 5 ++---
libc/src/math/generic/remainderl.cpp | 5 ++---
libc/src/math/generic/remquo.cpp | 5 ++---
libc/src/math/generic/remquof.cpp | 5 ++---
libc/src/math/generic/remquof128.cpp | 5 ++---
libc/src/math/generic/remquof16.cpp | 5 ++---
libc/src/math/generic/remquol.cpp | 5 ++---
libc/src/math/generic/rint.cpp | 5 ++---
libc/src/math/generic/rintf.cpp | 5 ++---
libc/src/math/generic/rintf128.cpp | 5 ++---
libc/src/math/generic/rintf16.cpp | 5 ++---
libc/src/math/generic/rintl.cpp | 5 ++---
libc/src/math/generic/round.cpp | 5 ++---
libc/src/math/generic/roundeven.cpp | 5 ++---
libc/src/math/generic/roundevenf.cpp | 5 ++---
libc/src/math/generic/roundevenf128.cpp | 5 ++---
libc/src/math/generic/roundevenf16.cpp | 5 ++---
libc/src/math/generic/roundevenl.cpp | 5 ++---
libc/src/math/generic/roundf.cpp | 5 ++---
libc/src/math/generic/roundf128.cpp | 5 ++---
libc/src/math/generic/roundf16.cpp | 5 ++---
libc/src/math/generic/roundl.cpp | 5 ++---
libc/src/math/generic/scalblnf16.cpp | 5 ++---
libc/src/math/generic/scalbn.cpp | 5 ++---
libc/src/math/generic/scalbnf.cpp | 5 ++---
libc/src/math/generic/scalbnf128.cpp | 5 ++---
libc/src/math/generic/scalbnf16.cpp | 5 ++---
libc/src/math/generic/scalbnl.cpp | 5 ++---
libc/src/math/generic/setpayloadf16.cpp | 5 ++---
libc/src/math/generic/setpayloadsigf16.cpp | 5 ++---
libc/src/math/generic/sin.cpp | 5 ++---
libc/src/math/generic/sincos.cpp | 5 ++---
libc/src/math/generic/sincos_eval.h | 5 ++---
libc/src/math/generic/sincosf.cpp | 5 ++---
libc/src/math/generic/sincosf_utils.h | 5 ++---
libc/src/math/generic/sinf.cpp | 5 ++---
libc/src/math/generic/sinhf.cpp | 5 ++---
libc/src/math/generic/sinpif.cpp | 5 ++---
libc/src/math/generic/sqrt.cpp | 5 ++---
libc/src/math/generic/sqrtf.cpp | 5 ++---
libc/src/math/generic/sqrtf128.cpp | 5 ++---
libc/src/math/generic/sqrtl.cpp | 5 ++---
libc/src/math/generic/tan.cpp | 5 ++---
libc/src/math/generic/tanf.cpp | 5 ++---
libc/src/math/generic/tanhf.cpp | 5 ++---
libc/src/math/generic/totalorderf16.cpp | 5 ++---
libc/src/math/generic/totalordermagf16.cpp | 5 ++---
libc/src/math/generic/trunc.cpp | 5 ++---
libc/src/math/generic/truncf.cpp | 5 ++---
libc/src/math/generic/truncf128.cpp | 5 ++---
libc/src/math/generic/truncf16.cpp | 5 ++---
libc/src/math/generic/truncl.cpp | 5 ++---
libc/src/math/generic/ufromfp.cpp | 5 ++---
libc/src/math/generic/ufromfpf.cpp | 5 ++---
libc/src/math/generic/ufromfpf128.cpp | 5 ++---
libc/src/math/generic/ufromfpf16.cpp | 5 ++---
libc/src/math/generic/ufromfpl.cpp | 5 ++---
libc/src/math/generic/ufromfpx.cpp | 5 ++---
libc/src/math/generic/ufromfpxf.cpp | 5 ++---
libc/src/math/generic/ufromfpxf128.cpp | 5 ++---
libc/src/math/generic/ufromfpxf16.cpp | 5 ++---
libc/src/math/generic/ufromfpxl.cpp | 5 ++---
libc/src/math/getpayloadf16.h | 5 ++---
libc/src/math/hypot.h | 6 ++----
libc/src/math/hypotf.h | 6 ++----
libc/src/math/ilogb.h | 6 ++----
libc/src/math/ilogbf.h | 6 ++----
libc/src/math/ilogbf128.h | 5 ++---
libc/src/math/ilogbf16.h | 5 ++---
libc/src/math/ilogbl.h | 6 ++----
libc/src/math/isnan.h | 6 ++----
libc/src/math/isnanf.h | 6 ++----
libc/src/math/isnanl.h | 6 ++----
libc/src/math/ldexp.h | 6 ++----
libc/src/math/ldexpf.h | 6 ++----
libc/src/math/ldexpf128.h | 5 ++---
libc/src/math/ldexpf16.h | 5 ++---
libc/src/math/ldexpl.h | 6 ++----
libc/src/math/llogb.h | 5 ++---
libc/src/math/llogbf.h | 5 ++---
libc/src/math/llogbf128.h | 5 ++---
libc/src/math/llogbf16.h | 5 ++---
libc/src/math/llogbl.h | 5 ++---
libc/src/math/llrint.h | 6 ++----
libc/src/math/llrintf.h | 6 ++----
libc/src/math/llrintf128.h | 5 ++---
libc/src/math/llrintf16.h | 5 ++---
libc/src/math/llrintl.h | 6 ++----
libc/src/math/llround.h | 6 ++----
libc/src/math/llroundf.h | 6 ++----
libc/src/math/llroundf128.h | 5 ++---
libc/src/math/llroundf16.h | 5 ++---
libc/src/math/llroundl.h | 6 ++----
libc/src/math/log.h | 6 ++----
libc/src/math/log10.h | 6 ++----
libc/src/math/log10f.h | 6 ++----
libc/src/math/log1p.h | 6 ++----
libc/src/math/log1pf.h | 6 ++----
libc/src/math/log2.h | 6 ++----
libc/src/math/log2f.h | 6 ++----
libc/src/math/logb.h | 6 ++----
libc/src/math/logbf.h | 6 ++----
libc/src/math/logbf128.h | 5 ++---
libc/src/math/logbf16.h | 5 ++---
libc/src/math/logbl.h | 6 ++----
libc/src/math/logf.h | 6 ++----
libc/src/math/lrint.h | 6 ++----
libc/src/math/lrintf.h | 6 ++----
libc/src/math/lrintf128.h | 5 ++---
libc/src/math/lrintf16.h | 5 ++---
libc/src/math/lrintl.h | 6 ++----
libc/src/math/lround.h | 6 ++----
libc/src/math/lroundf.h | 6 ++----
libc/src/math/lroundf128.h | 5 ++---
libc/src/math/lroundf16.h | 5 ++---
libc/src/math/lroundl.h | 6 ++----
libc/src/math/modf.h | 6 ++----
libc/src/math/modff.h | 6 ++----
libc/src/math/modff128.h | 5 ++---
libc/src/math/modff16.h | 5 ++---
libc/src/math/modfl.h | 6 ++----
libc/src/math/nan.h | 6 ++----
libc/src/math/nanf.h | 6 ++----
libc/src/math/nanf128.h | 5 ++---
libc/src/math/nanf16.h | 5 ++---
libc/src/math/nanl.h | 6 ++----
libc/src/math/nearbyint.h | 6 ++----
libc/src/math/nearbyintf.h | 6 ++----
libc/src/math/nearbyintf128.h | 5 ++---
libc/src/math/nearbyintf16.h | 5 ++---
libc/src/math/nearbyintl.h | 6 ++----
libc/src/math/nextafter.h | 6 ++----
libc/src/math/nextafterf.h | 6 ++----
libc/src/math/nextafterf128.h | 5 ++---
libc/src/math/nextafterf16.h | 5 ++---
libc/src/math/nextafterl.h | 6 ++----
libc/src/math/nextdown.h | 6 ++----
libc/src/math/nextdownf.h | 6 ++----
libc/src/math/nextdownf128.h | 5 ++---
libc/src/math/nextdownf16.h | 5 ++---
libc/src/math/nextdownl.h | 6 ++----
libc/src/math/nexttoward.h | 6 ++----
libc/src/math/nexttowardf.h | 6 ++----
libc/src/math/nexttowardf16.h | 5 ++---
libc/src/math/nexttowardl.h | 6 ++----
libc/src/math/nextup.h | 6 ++----
libc/src/math/nextupf.h | 6 ++----
libc/src/math/nextupf128.h | 5 ++---
libc/src/math/nextupf16.h | 5 ++---
libc/src/math/nextupl.h | 6 ++----
libc/src/math/nvptx/acos.cpp | 5 ++---
libc/src/math/nvptx/acosf.cpp | 5 ++---
libc/src/math/nvptx/acosh.cpp | 5 ++---
libc/src/math/nvptx/acoshf.cpp | 5 ++---
libc/src/math/nvptx/asin.cpp | 5 ++---
libc/src/math/nvptx/asinf.cpp | 5 ++---
libc/src/math/nvptx/asinh.cpp | 5 ++---
libc/src/math/nvptx/asinhf.cpp | 5 ++---
libc/src/math/nvptx/atan.cpp | 5 ++---
libc/src/math/nvptx/atan2.cpp | 5 ++---
libc/src/math/nvptx/atan2f.cpp | 5 ++---
libc/src/math/nvptx/atanf.cpp | 5 ++---
libc/src/math/nvptx/atanh.cpp | 5 ++---
libc/src/math/nvptx/atanhf.cpp | 5 ++---
libc/src/math/nvptx/ceil.cpp | 5 ++---
libc/src/math/nvptx/ceilf.cpp | 5 ++---
libc/src/math/nvptx/copysign.cpp | 5 ++---
libc/src/math/nvptx/copysignf.cpp | 5 ++---
libc/src/math/nvptx/cos.cpp | 5 ++---
libc/src/math/nvptx/cosf.cpp | 5 ++---
libc/src/math/nvptx/cosh.cpp | 5 ++---
libc/src/math/nvptx/coshf.cpp | 5 ++---
libc/src/math/nvptx/declarations.h | 6 ++----
libc/src/math/nvptx/erf.cpp | 5 ++---
libc/src/math/nvptx/erff.cpp | 5 ++---
libc/src/math/nvptx/exp.cpp | 5 ++---
libc/src/math/nvptx/exp10.cpp | 5 ++---
libc/src/math/nvptx/exp10f.cpp | 5 ++---
libc/src/math/nvptx/exp2.cpp | 5 ++---
libc/src/math/nvptx/exp2f.cpp | 5 ++---
libc/src/math/nvptx/expf.cpp | 5 ++---
libc/src/math/nvptx/expm1.cpp | 5 ++---
libc/src/math/nvptx/expm1f.cpp | 5 ++---
libc/src/math/nvptx/fabs.cpp | 5 ++---
libc/src/math/nvptx/fabsf.cpp | 5 ++---
libc/src/math/nvptx/fdim.cpp | 5 ++---
libc/src/math/nvptx/fdimf.cpp | 5 ++---
libc/src/math/nvptx/floor.cpp | 5 ++---
libc/src/math/nvptx/floorf.cpp | 5 ++---
libc/src/math/nvptx/fma.cpp | 5 ++---
libc/src/math/nvptx/fmaf.cpp | 5 ++---
libc/src/math/nvptx/fmax.cpp | 5 ++---
libc/src/math/nvptx/fmaxf.cpp | 5 ++---
libc/src/math/nvptx/fmin.cpp | 5 ++---
libc/src/math/nvptx/fminf.cpp | 5 ++---
libc/src/math/nvptx/fmod.cpp | 5 ++---
libc/src/math/nvptx/fmodf.cpp | 5 ++---
libc/src/math/nvptx/frexp.cpp | 5 ++---
libc/src/math/nvptx/frexpf.cpp | 5 ++---
libc/src/math/nvptx/hypot.cpp | 5 ++---
libc/src/math/nvptx/hypotf.cpp | 5 ++---
libc/src/math/nvptx/ilogb.cpp | 5 ++---
libc/src/math/nvptx/ilogbf.cpp | 5 ++---
libc/src/math/nvptx/ldexp.cpp | 5 ++---
libc/src/math/nvptx/ldexpf.cpp | 5 ++---
libc/src/math/nvptx/llrint.cpp | 5 ++---
libc/src/math/nvptx/llrintf.cpp | 5 ++---
libc/src/math/nvptx/log.cpp | 5 ++---
libc/src/math/nvptx/log10.cpp | 5 ++---
libc/src/math/nvptx/log10f.cpp | 5 ++---
libc/src/math/nvptx/log1p.cpp | 5 ++---
libc/src/math/nvptx/log1pf.cpp | 5 ++---
libc/src/math/nvptx/log2.cpp | 5 ++---
libc/src/math/nvptx/log2f.cpp | 5 ++---
libc/src/math/nvptx/logb.cpp | 5 ++---
libc/src/math/nvptx/logbf.cpp | 5 ++---
libc/src/math/nvptx/logf.cpp | 5 ++---
libc/src/math/nvptx/lrint.cpp | 5 ++---
libc/src/math/nvptx/lrintf.cpp | 5 ++---
libc/src/math/nvptx/nearbyint.cpp | 5 ++---
libc/src/math/nvptx/nearbyintf.cpp | 5 ++---
libc/src/math/nvptx/nextafter.cpp | 5 ++---
libc/src/math/nvptx/nextafterf.cpp | 5 ++---
libc/src/math/nvptx/nvptx.h | 5 ++---
libc/src/math/nvptx/pow.cpp | 5 ++---
libc/src/math/nvptx/powf.cpp | 5 ++---
libc/src/math/nvptx/powi.cpp | 5 ++---
libc/src/math/nvptx/powif.cpp | 5 ++---
libc/src/math/nvptx/remainder.cpp | 5 ++---
libc/src/math/nvptx/remainderf.cpp | 5 ++---
libc/src/math/nvptx/remquo.cpp | 5 ++---
libc/src/math/nvptx/remquof.cpp | 5 ++---
libc/src/math/nvptx/rint.cpp | 5 ++---
libc/src/math/nvptx/rintf.cpp | 5 ++---
libc/src/math/nvptx/round.cpp | 5 ++---
libc/src/math/nvptx/roundf.cpp | 5 ++---
libc/src/math/nvptx/scalbn.cpp | 5 ++---
libc/src/math/nvptx/scalbnf.cpp | 5 ++---
libc/src/math/nvptx/sin.cpp | 5 ++---
libc/src/math/nvptx/sincos.cpp | 5 ++---
libc/src/math/nvptx/sincosf.cpp | 5 ++---
libc/src/math/nvptx/sinf.cpp | 5 ++---
libc/src/math/nvptx/sinh.cpp | 5 ++---
libc/src/math/nvptx/sinhf.cpp | 5 ++---
libc/src/math/nvptx/sqrt.cpp | 5 ++---
libc/src/math/nvptx/sqrtf.cpp | 5 ++---
libc/src/math/nvptx/tan.cpp | 5 ++---
libc/src/math/nvptx/tanf.cpp | 5 ++---
libc/src/math/nvptx/tanh.cpp | 5 ++---
libc/src/math/nvptx/tanhf.cpp | 5 ++---
libc/src/math/nvptx/tgamma.cpp | 5 ++---
libc/src/math/nvptx/tgammaf.cpp | 5 ++---
libc/src/math/nvptx/trunc.cpp | 5 ++---
libc/src/math/nvptx/truncf.cpp | 5 ++---
libc/src/math/pow.h | 6 ++----
libc/src/math/powf.h | 6 ++----
libc/src/math/powi.h | 6 ++----
libc/src/math/powif.h | 6 ++----
libc/src/math/remainder.h | 6 ++----
libc/src/math/remainderf.h | 6 ++----
libc/src/math/remainderf16.h | 5 ++---
libc/src/math/remainderl.h | 6 ++----
libc/src/math/remquo.h | 6 ++----
libc/src/math/remquof.h | 6 ++----
libc/src/math/remquof128.h | 5 ++---
libc/src/math/remquof16.h | 5 ++---
libc/src/math/remquol.h | 6 ++----
libc/src/math/rint.h | 6 ++----
libc/src/math/rintf.h | 6 ++----
libc/src/math/rintf128.h | 5 ++---
libc/src/math/rintf16.h | 5 ++---
libc/src/math/rintl.h | 6 ++----
libc/src/math/round.h | 6 ++----
libc/src/math/roundeven.h | 6 ++----
libc/src/math/roundevenf.h | 6 ++----
libc/src/math/roundevenf128.h | 5 ++---
libc/src/math/roundevenf16.h | 5 ++---
libc/src/math/roundevenl.h | 6 ++----
libc/src/math/roundf.h | 6 ++----
libc/src/math/roundf128.h | 5 ++---
libc/src/math/roundf16.h | 5 ++---
libc/src/math/roundl.h | 6 ++----
libc/src/math/scalblnf16.h | 5 ++---
libc/src/math/scalbn.h | 6 ++----
libc/src/math/scalbnf.h | 6 ++----
libc/src/math/scalbnf128.h | 5 ++---
libc/src/math/scalbnf16.h | 5 ++---
libc/src/math/scalbnl.h | 6 ++----
libc/src/math/setpayloadf16.h | 5 ++---
libc/src/math/setpayloadsigf16.h | 5 ++---
libc/src/math/sin.h | 6 ++----
libc/src/math/sincos.h | 6 ++----
libc/src/math/sincosf.h | 6 ++----
libc/src/math/sinf.h | 6 ++----
libc/src/math/sinh.h | 6 ++----
libc/src/math/sinhf.h | 6 ++----
libc/src/math/sinpif.h | 6 ++----
libc/src/math/sqrt.h | 6 ++----
libc/src/math/sqrtf.h | 6 ++----
libc/src/math/sqrtf128.h | 5 ++---
libc/src/math/sqrtl.h | 6 ++----
libc/src/math/tan.h | 6 ++----
libc/src/math/tanf.h | 6 ++----
libc/src/math/tanh.h | 6 ++----
libc/src/math/tanhf.h | 6 ++----
libc/src/math/tgamma.h | 6 ++----
libc/src/math/tgammaf.h | 6 ++----
libc/src/math/totalorderf16.h | 5 ++---
libc/src/math/totalordermagf16.h | 5 ++---
libc/src/math/trunc.h | 6 ++----
libc/src/math/truncf.h | 6 ++----
libc/src/math/truncf128.h | 5 ++---
libc/src/math/truncf16.h | 5 ++---
libc/src/math/truncl.h | 6 ++----
libc/src/math/ufromfp.h | 6 ++----
libc/src/math/ufromfpf.h | 6 ++----
libc/src/math/ufromfpf128.h | 5 ++---
libc/src/math/ufromfpf16.h | 5 ++---
libc/src/math/ufromfpl.h | 6 ++----
libc/src/math/ufromfpx.h | 6 ++----
libc/src/math/ufromfpxf.h | 6 ++----
libc/src/math/ufromfpxf128.h | 5 ++---
libc/src/math/ufromfpxf16.h | 5 ++---
libc/src/math/ufromfpxl.h | 6 ++----
libc/src/network/htonl.cpp | 5 ++---
libc/src/network/htonl.h | 5 ++---
libc/src/network/htons.cpp | 5 ++---
libc/src/network/htons.h | 5 ++---
libc/src/network/ntohl.cpp | 5 ++---
libc/src/network/ntohl.h | 5 ++---
libc/src/network/ntohs.cpp | 5 ++---
libc/src/network/ntohs.h | 5 ++---
libc/src/pthread/pthread_atfork.cpp | 5 ++---
libc/src/pthread/pthread_atfork.h | 5 ++---
libc/src/pthread/pthread_attr_destroy.cpp | 5 ++---
libc/src/pthread/pthread_attr_destroy.h | 5 ++---
libc/src/pthread/pthread_attr_getdetachstate.cpp | 5 ++---
libc/src/pthread/pthread_attr_getdetachstate.h | 5 ++---
libc/src/pthread/pthread_attr_getguardsize.cpp | 5 ++---
libc/src/pthread/pthread_attr_getguardsize.h | 5 ++---
libc/src/pthread/pthread_attr_getstack.cpp | 5 ++---
libc/src/pthread/pthread_attr_getstack.h | 5 ++---
libc/src/pthread/pthread_attr_getstacksize.cpp | 5 ++---
libc/src/pthread/pthread_attr_getstacksize.h | 5 ++---
libc/src/pthread/pthread_attr_init.cpp | 5 ++---
libc/src/pthread/pthread_attr_init.h | 5 ++---
libc/src/pthread/pthread_attr_setdetachstate.cpp | 5 ++---
libc/src/pthread/pthread_attr_setdetachstate.h | 5 ++---
libc/src/pthread/pthread_attr_setguardsize.cpp | 5 ++---
libc/src/pthread/pthread_attr_setguardsize.h | 5 ++---
libc/src/pthread/pthread_attr_setstack.cpp | 5 ++---
libc/src/pthread/pthread_attr_setstack.h | 5 ++---
libc/src/pthread/pthread_attr_setstacksize.cpp | 5 ++---
libc/src/pthread/pthread_attr_setstacksize.h | 5 ++---
libc/src/pthread/pthread_condattr_destroy.cpp | 5 ++---
libc/src/pthread/pthread_condattr_destroy.h | 5 ++---
libc/src/pthread/pthread_condattr_getclock.cpp | 5 ++---
libc/src/pthread/pthread_condattr_getclock.h | 5 ++---
libc/src/pthread/pthread_condattr_getpshared.cpp | 5 ++---
libc/src/pthread/pthread_condattr_getpshared.h | 5 ++---
libc/src/pthread/pthread_condattr_init.cpp | 5 ++---
libc/src/pthread/pthread_condattr_init.h | 5 ++---
libc/src/pthread/pthread_condattr_setclock.cpp | 5 ++---
libc/src/pthread/pthread_condattr_setclock.h | 5 ++---
libc/src/pthread/pthread_condattr_setpshared.cpp | 5 ++---
libc/src/pthread/pthread_condattr_setpshared.h | 5 ++---
libc/src/pthread/pthread_create.cpp | 5 ++---
libc/src/pthread/pthread_create.h | 5 ++---
libc/src/pthread/pthread_detach.cpp | 5 ++---
libc/src/pthread/pthread_detach.h | 5 ++---
libc/src/pthread/pthread_equal.cpp | 5 ++---
libc/src/pthread/pthread_equal.h | 5 ++---
libc/src/pthread/pthread_exit.cpp | 5 ++---
libc/src/pthread/pthread_exit.h | 5 ++---
libc/src/pthread/pthread_getname_np.cpp | 5 ++---
libc/src/pthread/pthread_getname_np.h | 5 ++---
libc/src/pthread/pthread_getspecific.cpp | 5 ++---
libc/src/pthread/pthread_getspecific.h | 5 ++---
libc/src/pthread/pthread_join.cpp | 5 ++---
libc/src/pthread/pthread_join.h | 5 ++---
libc/src/pthread/pthread_key_create.cpp | 5 ++---
libc/src/pthread/pthread_key_create.h | 5 ++---
libc/src/pthread/pthread_key_delete.cpp | 5 ++---
libc/src/pthread/pthread_key_delete.h | 5 ++---
libc/src/pthread/pthread_mutex_destroy.cpp | 5 ++---
libc/src/pthread/pthread_mutex_destroy.h | 5 ++---
libc/src/pthread/pthread_mutex_init.cpp | 5 ++---
libc/src/pthread/pthread_mutex_init.h | 5 ++---
libc/src/pthread/pthread_mutex_lock.cpp | 5 ++---
libc/src/pthread/pthread_mutex_lock.h | 5 ++---
libc/src/pthread/pthread_mutex_unlock.cpp | 5 ++---
libc/src/pthread/pthread_mutex_unlock.h | 5 ++---
libc/src/pthread/pthread_mutexattr.h | 5 ++---
libc/src/pthread/pthread_mutexattr_destroy.cpp | 5 ++---
libc/src/pthread/pthread_mutexattr_destroy.h | 5 ++---
.../src/pthread/pthread_mutexattr_getpshared.cpp | 5 ++---
libc/src/pthread/pthread_mutexattr_getpshared.h | 5 ++---
libc/src/pthread/pthread_mutexattr_getrobust.cpp | 5 ++---
libc/src/pthread/pthread_mutexattr_getrobust.h | 5 ++---
libc/src/pthread/pthread_mutexattr_gettype.cpp | 5 ++---
libc/src/pthread/pthread_mutexattr_gettype.h | 5 ++---
libc/src/pthread/pthread_mutexattr_init.cpp | 5 ++---
libc/src/pthread/pthread_mutexattr_init.h | 5 ++---
.../src/pthread/pthread_mutexattr_setpshared.cpp | 5 ++---
libc/src/pthread/pthread_mutexattr_setpshared.h | 5 ++---
libc/src/pthread/pthread_mutexattr_setrobust.cpp | 5 ++---
libc/src/pthread/pthread_mutexattr_setrobust.h | 5 ++---
libc/src/pthread/pthread_mutexattr_settype.cpp | 5 ++---
libc/src/pthread/pthread_mutexattr_settype.h | 5 ++---
libc/src/pthread/pthread_once.cpp | 5 ++---
libc/src/pthread/pthread_once.h | 5 ++---
libc/src/pthread/pthread_rwlock_destroy.cpp | 5 ++---
libc/src/pthread/pthread_rwlock_destroy.h | 5 ++---
libc/src/pthread/pthread_rwlock_init.cpp | 5 ++---
libc/src/pthread/pthread_rwlock_init.h | 5 ++---
libc/src/pthread/pthread_rwlock_rdlock.cpp | 5 ++---
libc/src/pthread/pthread_rwlock_rdlock.h | 5 ++---
libc/src/pthread/pthread_rwlock_timedrdlock.cpp | 5 ++---
libc/src/pthread/pthread_rwlock_timedrdlock.h | 5 ++---
libc/src/pthread/pthread_rwlock_timedwrlock.cpp | 5 ++---
libc/src/pthread/pthread_rwlock_timedwrlock.h | 5 ++---
libc/src/pthread/pthread_rwlock_tryrdlock.cpp | 5 ++---
libc/src/pthread/pthread_rwlock_tryrdlock.h | 5 ++---
libc/src/pthread/pthread_rwlock_trywrlock.cpp | 5 ++---
libc/src/pthread/pthread_rwlock_trywrlock.h | 5 ++---
libc/src/pthread/pthread_rwlock_unlock.cpp | 5 ++---
libc/src/pthread/pthread_rwlock_unlock.h | 5 ++---
libc/src/pthread/pthread_rwlock_wrlock.cpp | 5 ++---
libc/src/pthread/pthread_rwlock_wrlock.h | 5 ++---
libc/src/pthread/pthread_rwlockattr_destroy.cpp | 5 ++---
libc/src/pthread/pthread_rwlockattr_destroy.h | 5 ++---
.../pthread/pthread_rwlockattr_getkind_np.cpp | 5 ++---
libc/src/pthread/pthread_rwlockattr_getkind_np.h | 5 ++---
.../pthread/pthread_rwlockattr_getpshared.cpp | 5 ++---
libc/src/pthread/pthread_rwlockattr_getpshared.h | 5 ++---
libc/src/pthread/pthread_rwlockattr_init.cpp | 5 ++---
libc/src/pthread/pthread_rwlockattr_init.h | 5 ++---
.../pthread/pthread_rwlockattr_setkind_np.cpp | 5 ++---
libc/src/pthread/pthread_rwlockattr_setkind_np.h | 5 ++---
.../pthread/pthread_rwlockattr_setpshared.cpp | 5 ++---
libc/src/pthread/pthread_rwlockattr_setpshared.h | 5 ++---
libc/src/pthread/pthread_self.cpp | 5 ++---
libc/src/pthread/pthread_self.h | 5 ++---
libc/src/pthread/pthread_setname_np.cpp | 5 ++---
libc/src/pthread/pthread_setname_np.h | 5 ++---
libc/src/pthread/pthread_setspecific.cpp | 5 ++---
libc/src/pthread/pthread_setspecific.h | 5 ++---
libc/src/sched/linux/sched_get_priority_max.cpp | 5 ++---
libc/src/sched/linux/sched_get_priority_min.cpp | 5 ++---
libc/src/sched/linux/sched_getaffinity.cpp | 5 ++---
libc/src/sched/linux/sched_getcpucount.cpp | 5 ++---
libc/src/sched/linux/sched_getparam.cpp | 5 ++---
libc/src/sched/linux/sched_getscheduler.cpp | 5 ++---
libc/src/sched/linux/sched_rr_get_interval.cpp | 5 ++---
libc/src/sched/linux/sched_setaffinity.cpp | 5 ++---
libc/src/sched/linux/sched_setparam.cpp | 5 ++---
libc/src/sched/linux/sched_setscheduler.cpp | 5 ++---
libc/src/sched/linux/sched_yield.cpp | 5 ++---
libc/src/sched/sched_get_priority_max.h | 6 ++----
libc/src/sched/sched_get_priority_min.h | 6 ++----
libc/src/sched/sched_getaffinity.h | 5 ++---
libc/src/sched/sched_getcpucount.h | 5 ++---
libc/src/sched/sched_getparam.h | 5 ++---
libc/src/sched/sched_getscheduler.h | 5 ++---
libc/src/sched/sched_rr_get_interval.h | 5 ++---
libc/src/sched/sched_setaffinity.h | 5 ++---
libc/src/sched/sched_setparam.h | 5 ++---
libc/src/sched/sched_setscheduler.h | 5 ++---
libc/src/sched/sched_yield.h | 6 ++----
libc/src/search/hcreate.cpp | 5 ++---
libc/src/search/hcreate.h | 5 ++---
libc/src/search/hcreate_r.cpp | 5 ++---
libc/src/search/hcreate_r.h | 5 ++---
libc/src/search/hdestroy.cpp | 5 ++---
libc/src/search/hdestroy.h | 5 ++---
libc/src/search/hdestroy_r.cpp | 5 ++---
libc/src/search/hdestroy_r.h | 5 ++---
libc/src/search/hsearch.cpp | 5 ++---
libc/src/search/hsearch.h | 5 ++---
libc/src/search/hsearch/global.cpp | 6 ++----
libc/src/search/hsearch/global.h | 6 ++----
libc/src/search/hsearch_r.cpp | 5 ++---
libc/src/search/hsearch_r.h | 5 ++---
libc/src/search/insque.cpp | 5 ++---
libc/src/search/insque.h | 5 ++---
libc/src/search/remque.cpp | 5 ++---
libc/src/search/remque.h | 5 ++---
libc/src/setjmp/arm/longjmp.cpp | 5 ++---
libc/src/setjmp/arm/setjmp.cpp | 5 ++---
libc/src/setjmp/longjmp.h | 5 ++---
libc/src/setjmp/riscv/longjmp.cpp | 5 ++---
libc/src/setjmp/riscv/setjmp.cpp | 5 ++---
libc/src/setjmp/setjmp_impl.h | 5 ++---
libc/src/setjmp/x86_64/longjmp.cpp | 5 ++---
libc/src/setjmp/x86_64/setjmp.cpp | 5 ++---
libc/src/signal/kill.h | 5 ++---
libc/src/signal/linux/__restore.cpp | 5 ++---
libc/src/signal/linux/kill.cpp | 5 ++---
libc/src/signal/linux/raise.cpp | 5 ++---
libc/src/signal/linux/sigaction.cpp | 5 ++---
libc/src/signal/linux/sigaddset.cpp | 5 ++---
libc/src/signal/linux/sigaltstack.cpp | 5 ++---
libc/src/signal/linux/sigdelset.cpp | 5 ++---
libc/src/signal/linux/sigemptyset.cpp | 5 ++---
libc/src/signal/linux/sigfillset.cpp | 5 ++---
libc/src/signal/linux/signal.cpp | 5 ++---
libc/src/signal/linux/signal_utils.h | 5 ++---
libc/src/signal/linux/sigprocmask.cpp | 5 ++---
libc/src/signal/raise.h | 5 ++---
libc/src/signal/sigaction.h | 5 ++---
libc/src/signal/sigaddset.h | 5 ++---
libc/src/signal/sigaltstack.h | 5 ++---
libc/src/signal/sigdelset.h | 5 ++---
libc/src/signal/sigemptyset.h | 5 ++---
libc/src/signal/sigfillset.h | 5 ++---
libc/src/signal/signal.h | 5 ++---
libc/src/signal/sigprocmask.h | 5 ++---
libc/src/spawn/file_actions.h | 5 ++---
libc/src/spawn/linux/posix_spawn.cpp | 5 ++---
libc/src/spawn/posix_spawn.h | 5 ++---
.../spawn/posix_spawn_file_actions_addclose.cpp | 5 ++---
.../spawn/posix_spawn_file_actions_addclose.h | 5 ++---
.../spawn/posix_spawn_file_actions_adddup2.cpp | 5 ++---
.../src/spawn/posix_spawn_file_actions_adddup2.h | 5 ++---
.../spawn/posix_spawn_file_actions_addopen.cpp | 5 ++---
.../src/spawn/posix_spawn_file_actions_addopen.h | 5 ++---
.../spawn/posix_spawn_file_actions_destroy.cpp | 5 ++---
.../src/spawn/posix_spawn_file_actions_destroy.h | 5 ++---
libc/src/spawn/posix_spawn_file_actions_init.cpp | 5 ++---
libc/src/spawn/posix_spawn_file_actions_init.h | 5 ++---
libc/src/stdbit/stdc_bit_ceil_uc.cpp | 5 ++---
libc/src/stdbit/stdc_bit_ceil_uc.h | 6 ++----
libc/src/stdbit/stdc_bit_ceil_ui.cpp | 5 ++---
libc/src/stdbit/stdc_bit_ceil_ui.h | 6 ++----
libc/src/stdbit/stdc_bit_ceil_ul.cpp | 5 ++---
libc/src/stdbit/stdc_bit_ceil_ul.h | 6 ++----
libc/src/stdbit/stdc_bit_ceil_ull.cpp | 5 ++---
libc/src/stdbit/stdc_bit_ceil_ull.h | 6 ++----
libc/src/stdbit/stdc_bit_ceil_us.cpp | 5 ++---
libc/src/stdbit/stdc_bit_ceil_us.h | 6 ++----
libc/src/stdbit/stdc_bit_floor_uc.cpp | 5 ++---
libc/src/stdbit/stdc_bit_floor_uc.h | 6 ++----
libc/src/stdbit/stdc_bit_floor_ui.cpp | 5 ++---
libc/src/stdbit/stdc_bit_floor_ui.h | 6 ++----
libc/src/stdbit/stdc_bit_floor_ul.cpp | 5 ++---
libc/src/stdbit/stdc_bit_floor_ul.h | 6 ++----
libc/src/stdbit/stdc_bit_floor_ull.cpp | 5 ++---
libc/src/stdbit/stdc_bit_floor_ull.h | 6 ++----
libc/src/stdbit/stdc_bit_floor_us.cpp | 5 ++---
libc/src/stdbit/stdc_bit_floor_us.h | 6 ++----
libc/src/stdbit/stdc_bit_width_uc.cpp | 5 ++---
libc/src/stdbit/stdc_bit_width_uc.h | 6 ++----
libc/src/stdbit/stdc_bit_width_ui.cpp | 5 ++---
libc/src/stdbit/stdc_bit_width_ui.h | 6 ++----
libc/src/stdbit/stdc_bit_width_ul.cpp | 5 ++---
libc/src/stdbit/stdc_bit_width_ul.h | 6 ++----
libc/src/stdbit/stdc_bit_width_ull.cpp | 5 ++---
libc/src/stdbit/stdc_bit_width_ull.h | 6 ++----
libc/src/stdbit/stdc_bit_width_us.cpp | 5 ++---
libc/src/stdbit/stdc_bit_width_us.h | 6 ++----
libc/src/stdbit/stdc_count_ones_uc.cpp | 5 ++---
libc/src/stdbit/stdc_count_ones_uc.h | 6 ++----
libc/src/stdbit/stdc_count_ones_ui.cpp | 5 ++---
libc/src/stdbit/stdc_count_ones_ui.h | 6 ++----
libc/src/stdbit/stdc_count_ones_ul.cpp | 5 ++---
libc/src/stdbit/stdc_count_ones_ul.h | 6 ++----
libc/src/stdbit/stdc_count_ones_ull.cpp | 5 ++---
libc/src/stdbit/stdc_count_ones_ull.h | 6 ++----
libc/src/stdbit/stdc_count_ones_us.cpp | 5 ++---
libc/src/stdbit/stdc_count_ones_us.h | 6 ++----
libc/src/stdbit/stdc_count_zeros_uc.cpp | 5 ++---
libc/src/stdbit/stdc_count_zeros_uc.h | 6 ++----
libc/src/stdbit/stdc_count_zeros_ui.cpp | 5 ++---
libc/src/stdbit/stdc_count_zeros_ui.h | 6 ++----
libc/src/stdbit/stdc_count_zeros_ul.cpp | 5 ++---
libc/src/stdbit/stdc_count_zeros_ul.h | 6 ++----
libc/src/stdbit/stdc_count_zeros_ull.cpp | 5 ++---
libc/src/stdbit/stdc_count_zeros_ull.h | 6 ++----
libc/src/stdbit/stdc_count_zeros_us.cpp | 5 ++---
libc/src/stdbit/stdc_count_zeros_us.h | 6 ++----
libc/src/stdbit/stdc_first_leading_one_uc.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_one_uc.h | 6 ++----
libc/src/stdbit/stdc_first_leading_one_ui.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_one_ui.h | 6 ++----
libc/src/stdbit/stdc_first_leading_one_ul.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_one_ul.h | 6 ++----
libc/src/stdbit/stdc_first_leading_one_ull.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_one_ull.h | 6 ++----
libc/src/stdbit/stdc_first_leading_one_us.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_one_us.h | 6 ++----
libc/src/stdbit/stdc_first_leading_zero_uc.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_zero_uc.h | 6 ++----
libc/src/stdbit/stdc_first_leading_zero_ui.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_zero_ui.h | 6 ++----
libc/src/stdbit/stdc_first_leading_zero_ul.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_zero_ul.h | 6 ++----
libc/src/stdbit/stdc_first_leading_zero_ull.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_zero_ull.h | 6 ++----
libc/src/stdbit/stdc_first_leading_zero_us.cpp | 5 ++---
libc/src/stdbit/stdc_first_leading_zero_us.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_one_uc.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_one_uc.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_one_ui.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_one_ui.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_one_ul.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_one_ul.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_one_ull.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_one_ull.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_one_us.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_one_us.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_zero_uc.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_zero_uc.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_zero_ui.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_zero_ui.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_zero_ul.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_zero_ul.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_zero_ull.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_zero_ull.h | 6 ++----
libc/src/stdbit/stdc_first_trailing_zero_us.cpp | 5 ++---
libc/src/stdbit/stdc_first_trailing_zero_us.h | 6 ++----
libc/src/stdbit/stdc_has_single_bit_uc.cpp | 5 ++---
libc/src/stdbit/stdc_has_single_bit_uc.h | 6 ++----
libc/src/stdbit/stdc_has_single_bit_ui.cpp | 5 ++---
libc/src/stdbit/stdc_has_single_bit_ui.h | 6 ++----
libc/src/stdbit/stdc_has_single_bit_ul.cpp | 5 ++---
libc/src/stdbit/stdc_has_single_bit_ul.h | 6 ++----
libc/src/stdbit/stdc_has_single_bit_ull.cpp | 5 ++---
libc/src/stdbit/stdc_has_single_bit_ull.h | 6 ++----
libc/src/stdbit/stdc_has_single_bit_us.cpp | 5 ++---
libc/src/stdbit/stdc_has_single_bit_us.h | 6 ++----
libc/src/stdbit/stdc_leading_ones_uc.cpp | 5 ++---
libc/src/stdbit/stdc_leading_ones_uc.h | 6 ++----
libc/src/stdbit/stdc_leading_ones_ui.cpp | 5 ++---
libc/src/stdbit/stdc_leading_ones_ui.h | 6 ++----
libc/src/stdbit/stdc_leading_ones_ul.cpp | 5 ++---
libc/src/stdbit/stdc_leading_ones_ul.h | 6 ++----
libc/src/stdbit/stdc_leading_ones_ull.cpp | 5 ++---
libc/src/stdbit/stdc_leading_ones_ull.h | 6 ++----
libc/src/stdbit/stdc_leading_ones_us.cpp | 5 ++---
libc/src/stdbit/stdc_leading_ones_us.h | 6 ++----
libc/src/stdbit/stdc_leading_zeros_uc.cpp | 5 ++---
libc/src/stdbit/stdc_leading_zeros_uc.h | 6 ++----
libc/src/stdbit/stdc_leading_zeros_ui.cpp | 5 ++---
libc/src/stdbit/stdc_leading_zeros_ui.h | 6 ++----
libc/src/stdbit/stdc_leading_zeros_ul.cpp | 5 ++---
libc/src/stdbit/stdc_leading_zeros_ul.h | 6 ++----
libc/src/stdbit/stdc_leading_zeros_ull.cpp | 5 ++---
libc/src/stdbit/stdc_leading_zeros_ull.h | 6 ++----
libc/src/stdbit/stdc_leading_zeros_us.cpp | 5 ++---
libc/src/stdbit/stdc_leading_zeros_us.h | 6 ++----
libc/src/stdbit/stdc_trailing_ones_uc.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_ones_uc.h | 6 ++----
libc/src/stdbit/stdc_trailing_ones_ui.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_ones_ui.h | 6 ++----
libc/src/stdbit/stdc_trailing_ones_ul.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_ones_ul.h | 6 ++----
libc/src/stdbit/stdc_trailing_ones_ull.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_ones_ull.h | 6 ++----
libc/src/stdbit/stdc_trailing_ones_us.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_ones_us.h | 6 ++----
libc/src/stdbit/stdc_trailing_zeros_uc.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_zeros_uc.h | 6 ++----
libc/src/stdbit/stdc_trailing_zeros_ui.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_zeros_ui.h | 6 ++----
libc/src/stdbit/stdc_trailing_zeros_ul.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_zeros_ul.h | 6 ++----
libc/src/stdbit/stdc_trailing_zeros_ull.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_zeros_ull.h | 6 ++----
libc/src/stdbit/stdc_trailing_zeros_us.cpp | 5 ++---
libc/src/stdbit/stdc_trailing_zeros_us.h | 6 ++----
libc/src/stdfix/abshk.cpp | 5 ++---
libc/src/stdfix/abshk.h | 5 ++---
libc/src/stdfix/abshr.cpp | 5 ++---
libc/src/stdfix/abshr.h | 5 ++---
libc/src/stdfix/absk.cpp | 5 ++---
libc/src/stdfix/absk.h | 5 ++---
libc/src/stdfix/abslk.cpp | 5 ++---
libc/src/stdfix/abslk.h | 5 ++---
libc/src/stdfix/abslr.cpp | 5 ++---
libc/src/stdfix/abslr.h | 5 ++---
libc/src/stdfix/absr.cpp | 5 ++---
libc/src/stdfix/absr.h | 5 ++---
libc/src/stdfix/exphk.cpp | 5 ++---
libc/src/stdfix/exphk.h | 5 ++---
libc/src/stdfix/expk.cpp | 5 ++---
libc/src/stdfix/expk.h | 5 ++---
libc/src/stdfix/roundhk.cpp | 5 ++---
libc/src/stdfix/roundhk.h | 5 ++---
libc/src/stdfix/roundhr.cpp | 5 ++---
libc/src/stdfix/roundhr.h | 5 ++---
libc/src/stdfix/roundk.cpp | 5 ++---
libc/src/stdfix/roundk.h | 5 ++---
libc/src/stdfix/roundlk.cpp | 5 ++---
libc/src/stdfix/roundlk.h | 5 ++---
libc/src/stdfix/roundlr.cpp | 5 ++---
libc/src/stdfix/roundlr.h | 5 ++---
libc/src/stdfix/roundr.cpp | 5 ++---
libc/src/stdfix/roundr.h | 5 ++---
libc/src/stdfix/rounduhk.cpp | 5 ++---
libc/src/stdfix/rounduhk.h | 5 ++---
libc/src/stdfix/rounduhr.cpp | 5 ++---
libc/src/stdfix/rounduhr.h | 5 ++---
libc/src/stdfix/rounduk.cpp | 5 ++---
libc/src/stdfix/rounduk.h | 5 ++---
libc/src/stdfix/roundulk.cpp | 5 ++---
libc/src/stdfix/roundulk.h | 5 ++---
libc/src/stdfix/roundulr.cpp | 5 ++---
libc/src/stdfix/roundulr.h | 5 ++---
libc/src/stdfix/roundur.cpp | 5 ++---
libc/src/stdfix/roundur.h | 5 ++---
libc/src/stdfix/sqrtuhk.cpp | 5 ++---
libc/src/stdfix/sqrtuhk.h | 5 ++---
libc/src/stdfix/sqrtuhr.cpp | 5 ++---
libc/src/stdfix/sqrtuhr.h | 5 ++---
libc/src/stdfix/sqrtuk.cpp | 5 ++---
libc/src/stdfix/sqrtuk.h | 5 ++---
libc/src/stdfix/sqrtulr.cpp | 5 ++---
libc/src/stdfix/sqrtulr.h | 5 ++---
libc/src/stdfix/sqrtur.cpp | 5 ++---
libc/src/stdfix/sqrtur.h | 5 ++---
libc/src/stdfix/uhksqrtus.cpp | 5 ++---
libc/src/stdfix/uhksqrtus.h | 5 ++---
libc/src/stdfix/uksqrtui.cpp | 5 ++---
libc/src/stdfix/uksqrtui.h | 5 ++---
libc/src/stdio/CMakeLists.txt | 1 +
libc/src/stdio/baremetal/getchar.cpp | 5 ++---
libc/src/stdio/baremetal/printf.cpp | 5 ++---
libc/src/stdio/baremetal/putchar.cpp | 5 ++---
libc/src/stdio/baremetal/puts.cpp | 5 ++---
libc/src/stdio/baremetal/remove.cpp | 5 ++---
libc/src/stdio/baremetal/vprintf.cpp | 5 ++---
libc/src/stdio/clearerr.h | 5 ++---
libc/src/stdio/clearerr_unlocked.h | 5 ++---
libc/src/stdio/fclose.h | 5 ++---
libc/src/stdio/fdopen.h | 5 ++---
libc/src/stdio/feof.h | 5 ++---
libc/src/stdio/feof_unlocked.h | 5 ++---
libc/src/stdio/ferror.h | 5 ++---
libc/src/stdio/ferror_unlocked.h | 5 ++---
libc/src/stdio/fflush.h | 5 ++---
libc/src/stdio/fgetc.h | 5 ++---
libc/src/stdio/fgetc_unlocked.h | 5 ++---
libc/src/stdio/fgets.h | 5 ++---
libc/src/stdio/fileno.h | 5 ++---
libc/src/stdio/flockfile.cpp | 5 ++---
libc/src/stdio/flockfile.h | 5 ++---
libc/src/stdio/fopen.h | 5 ++---
libc/src/stdio/fopencookie.cpp | 5 ++---
libc/src/stdio/fopencookie.h | 5 ++---
libc/src/stdio/fprintf.cpp | 5 ++---
libc/src/stdio/fprintf.h | 5 ++---
libc/src/stdio/fputc.h | 5 ++---
libc/src/stdio/fputs.h | 5 ++---
libc/src/stdio/fread.h | 5 ++---
libc/src/stdio/fread_unlocked.h | 5 ++---
libc/src/stdio/fscanf.cpp | 5 ++---
libc/src/stdio/fscanf.h | 5 ++---
libc/src/stdio/fseek.h | 5 ++---
libc/src/stdio/fseeko.h | 5 ++---
libc/src/stdio/ftell.h | 5 ++---
libc/src/stdio/ftello.h | 5 ++---
libc/src/stdio/funlockfile.cpp | 5 ++---
libc/src/stdio/funlockfile.h | 5 ++---
libc/src/stdio/fwrite.h | 5 ++---
libc/src/stdio/fwrite_unlocked.h | 5 ++---
libc/src/stdio/generic/clearerr.cpp | 5 ++---
libc/src/stdio/generic/clearerr_unlocked.cpp | 5 ++---
libc/src/stdio/generic/fclose.cpp | 5 ++---
libc/src/stdio/generic/feof.cpp | 5 ++---
libc/src/stdio/generic/feof_unlocked.cpp | 5 ++---
libc/src/stdio/generic/ferror.cpp | 5 ++---
libc/src/stdio/generic/ferror_unlocked.cpp | 5 ++---
libc/src/stdio/generic/fflush.cpp | 5 ++---
libc/src/stdio/generic/fgetc.cpp | 5 ++---
libc/src/stdio/generic/fgetc_unlocked.cpp | 5 ++---
libc/src/stdio/generic/fgets.cpp | 5 ++---
libc/src/stdio/generic/fileno.cpp | 5 ++---
libc/src/stdio/generic/fopen.cpp | 5 ++---
libc/src/stdio/generic/fputc.cpp | 5 ++---
libc/src/stdio/generic/fputs.cpp | 5 ++---
libc/src/stdio/generic/fread.cpp | 5 ++---
libc/src/stdio/generic/fread_unlocked.cpp | 5 ++---
libc/src/stdio/generic/fseek.cpp | 5 ++---
libc/src/stdio/generic/fseeko.cpp | 5 ++---
libc/src/stdio/generic/ftell.cpp | 5 ++---
libc/src/stdio/generic/ftello.cpp | 5 ++---
libc/src/stdio/generic/fwrite.cpp | 5 ++---
libc/src/stdio/generic/fwrite_unlocked.cpp | 5 ++---
libc/src/stdio/generic/getc.cpp | 5 ++---
libc/src/stdio/generic/getc_unlocked.cpp | 5 ++---
libc/src/stdio/generic/getchar.cpp | 5 ++---
libc/src/stdio/generic/getchar_unlocked.cpp | 5 ++---
libc/src/stdio/generic/printf.cpp | 5 ++---
libc/src/stdio/generic/putc.cpp | 5 ++---
libc/src/stdio/generic/putchar.cpp | 5 ++---
libc/src/stdio/generic/puts.cpp | 5 ++---
libc/src/stdio/generic/ungetc.cpp | 5 ++---
libc/src/stdio/generic/vprintf.cpp | 5 ++---
libc/src/stdio/getc.h | 5 ++---
libc/src/stdio/getc_unlocked.h | 5 ++---
libc/src/stdio/getchar.h | 6 ++----
libc/src/stdio/getchar_unlocked.h | 6 ++----
libc/src/stdio/gpu/clearerr.cpp | 5 ++---
libc/src/stdio/gpu/fclose.cpp | 5 ++---
libc/src/stdio/gpu/feof.cpp | 5 ++---
libc/src/stdio/gpu/ferror.cpp | 5 ++---
libc/src/stdio/gpu/fflush.cpp | 5 ++---
libc/src/stdio/gpu/fgetc.cpp | 5 ++---
libc/src/stdio/gpu/fgets.cpp | 5 ++---
libc/src/stdio/gpu/file.h | 5 ++---
libc/src/stdio/gpu/fopen.cpp | 5 ++---
libc/src/stdio/gpu/fputc.cpp | 5 ++---
libc/src/stdio/gpu/fputs.cpp | 5 ++---
libc/src/stdio/gpu/fread.cpp | 5 ++---
libc/src/stdio/gpu/fseek.cpp | 5 ++---
libc/src/stdio/gpu/ftell.cpp | 5 ++---
libc/src/stdio/gpu/fwrite.cpp | 5 ++---
libc/src/stdio/gpu/getc.cpp | 5 ++---
libc/src/stdio/gpu/getchar.cpp | 5 ++---
libc/src/stdio/gpu/putc.cpp | 5 ++---
libc/src/stdio/gpu/putchar.cpp | 5 ++---
libc/src/stdio/gpu/puts.cpp | 5 ++---
libc/src/stdio/gpu/remove.cpp | 5 ++---
libc/src/stdio/gpu/stderr.cpp | 5 ++---
libc/src/stdio/gpu/stdin.cpp | 5 ++---
libc/src/stdio/gpu/stdout.cpp | 5 ++---
libc/src/stdio/gpu/ungetc.cpp | 5 ++---
libc/src/stdio/linux/fdopen.cpp | 5 ++---
libc/src/stdio/linux/remove.cpp | 5 ++---
libc/src/stdio/linux/rename.cpp | 5 ++---
libc/src/stdio/printf.h | 5 ++---
libc/src/stdio/printf_core/char_converter.h | 5 ++---
libc/src/stdio/printf_core/converter.cpp | 5 ++---
libc/src/stdio/printf_core/converter.h | 5 ++---
libc/src/stdio/printf_core/converter_utils.h | 5 ++---
libc/src/stdio/printf_core/core_structs.h | 4 ++--
libc/src/stdio/printf_core/fixed_converter.h | 5 ++---
libc/src/stdio/printf_core/float_dec_converter.h | 5 ++---
libc/src/stdio/printf_core/float_hex_converter.h | 5 ++---
.../stdio/printf_core/float_inf_nan_converter.h | 5 ++---
libc/src/stdio/printf_core/int_converter.h | 5 ++---
libc/src/stdio/printf_core/parser.h | 5 ++---
libc/src/stdio/printf_core/printf_main.cpp | 5 ++---
libc/src/stdio/printf_core/printf_main.h | 5 ++---
libc/src/stdio/printf_core/ptr_converter.h | 5 ++---
libc/src/stdio/printf_core/string_converter.h | 5 ++---
libc/src/stdio/printf_core/vfprintf_internal.h | 5 ++---
libc/src/stdio/printf_core/write_int_converter.h | 5 ++---
libc/src/stdio/printf_core/writer.cpp | 5 ++---
libc/src/stdio/printf_core/writer.h | 5 ++---
libc/src/stdio/putc.h | 5 ++---
libc/src/stdio/putchar.h | 6 ++----
libc/src/stdio/puts.h | 6 ++----
libc/src/stdio/remove.h | 5 ++---
libc/src/stdio/rename.h | 6 ++----
libc/src/stdio/scanf.cpp | 5 ++---
libc/src/stdio/scanf.h | 6 ++----
libc/src/stdio/scanf_core/converter.cpp | 5 ++---
libc/src/stdio/scanf_core/converter.h | 5 ++---
libc/src/stdio/scanf_core/converter_utils.h | 5 ++---
libc/src/stdio/scanf_core/core_structs.h | 5 ++---
.../src/stdio/scanf_core/current_pos_converter.h | 5 ++---
libc/src/stdio/scanf_core/float_converter.cpp | 5 ++---
libc/src/stdio/scanf_core/float_converter.h | 5 ++---
libc/src/stdio/scanf_core/int_converter.cpp | 5 ++---
libc/src/stdio/scanf_core/int_converter.h | 5 ++---
libc/src/stdio/scanf_core/parser.h | 5 ++---
libc/src/stdio/scanf_core/ptr_converter.cpp | 5 ++---
libc/src/stdio/scanf_core/ptr_converter.h | 5 ++---
libc/src/stdio/scanf_core/reader.cpp | 5 ++---
libc/src/stdio/scanf_core/reader.h | 5 ++---
libc/src/stdio/scanf_core/scanf_main.cpp | 5 ++---
libc/src/stdio/scanf_core/scanf_main.h | 5 ++---
libc/src/stdio/scanf_core/string_converter.cpp | 5 ++---
libc/src/stdio/scanf_core/string_converter.h | 5 ++---
libc/src/stdio/scanf_core/vfscanf_internal.h | 5 ++---
libc/src/stdio/setbuf.cpp | 5 ++---
libc/src/stdio/setbuf.h | 5 ++---
libc/src/stdio/setvbuf.cpp | 5 ++---
libc/src/stdio/setvbuf.h | 5 ++---
libc/src/stdio/snprintf.cpp | 5 ++---
libc/src/stdio/snprintf.h | 5 ++---
libc/src/stdio/sprintf.cpp | 5 ++---
libc/src/stdio/sprintf.h | 6 ++----
libc/src/stdio/sscanf.cpp | 5 ++---
libc/src/stdio/sscanf.h | 6 ++----
libc/src/stdio/ungetc.h | 5 ++---
libc/src/stdio/vfprintf.cpp | 5 ++---
libc/src/stdio/vfprintf.h | 5 ++---
libc/src/stdio/vprintf.h | 5 ++---
libc/src/stdio/vsnprintf.cpp | 5 ++---
libc/src/stdio/vsnprintf.h | 5 ++---
libc/src/stdio/vsprintf.cpp | 5 ++---
libc/src/stdio/vsprintf.h | 5 ++---
libc/src/stdlib/_Exit.cpp | 5 ++---
libc/src/stdlib/_Exit.h | 6 ++----
libc/src/stdlib/abort.h | 6 ++----
libc/src/stdlib/abs.cpp | 5 ++---
libc/src/stdlib/abs.h | 6 ++----
libc/src/stdlib/aligned_alloc.h | 5 ++---
libc/src/stdlib/at_quick_exit.cpp | 5 ++---
libc/src/stdlib/at_quick_exit.h | 5 ++---
libc/src/stdlib/atexit.cpp | 5 ++---
libc/src/stdlib/atexit.h | 6 ++----
libc/src/stdlib/atof.cpp | 5 ++---
libc/src/stdlib/atof.h | 6 ++----
libc/src/stdlib/atoi.cpp | 5 ++---
libc/src/stdlib/atoi.h | 6 ++----
libc/src/stdlib/atol.cpp | 5 ++---
libc/src/stdlib/atol.h | 6 ++----
libc/src/stdlib/atoll.cpp | 5 ++---
libc/src/stdlib/atoll.h | 6 ++----
libc/src/stdlib/baremetal/abort.cpp | 5 ++---
libc/src/stdlib/bsearch.cpp | 5 ++---
libc/src/stdlib/bsearch.h | 5 ++---
libc/src/stdlib/calloc.h | 5 ++---
libc/src/stdlib/div.cpp | 5 ++---
libc/src/stdlib/div.h | 5 ++---
libc/src/stdlib/exit.cpp | 5 ++---
libc/src/stdlib/exit.h | 5 ++---
libc/src/stdlib/exit_handler.cpp | 5 ++---
libc/src/stdlib/exit_handler.h | 5 ++---
libc/src/stdlib/free.h | 5 ++---
libc/src/stdlib/freelist_malloc.cpp | 5 ++---
libc/src/stdlib/getenv.cpp | 5 ++---
libc/src/stdlib/getenv.h | 6 ++----
libc/src/stdlib/gpu/abort.cpp | 5 ++---
libc/src/stdlib/gpu/free.cpp | 5 ++---
libc/src/stdlib/gpu/malloc.cpp | 5 ++---
libc/src/stdlib/labs.cpp | 5 ++---
libc/src/stdlib/labs.h | 6 ++----
libc/src/stdlib/ldiv.cpp | 5 ++---
libc/src/stdlib/ldiv.h | 5 ++---
libc/src/stdlib/linux/abort.cpp | 5 ++---
libc/src/stdlib/llabs.cpp | 5 ++---
libc/src/stdlib/llabs.h | 6 ++----
libc/src/stdlib/lldiv.cpp | 5 ++---
libc/src/stdlib/lldiv.h | 5 ++---
libc/src/stdlib/malloc.h | 5 ++---
libc/src/stdlib/qsort.cpp | 5 ++---
libc/src/stdlib/qsort.h | 5 ++---
libc/src/stdlib/qsort_r.cpp | 5 ++---
libc/src/stdlib/qsort_r.h | 5 ++---
libc/src/stdlib/qsort_util.h | 7 ++-----
libc/src/stdlib/quick_exit.cpp | 5 ++---
libc/src/stdlib/quick_exit.h | 6 ++----
libc/src/stdlib/rand.cpp | 5 ++---
libc/src/stdlib/rand.h | 5 ++---
libc/src/stdlib/rand_util.cpp | 5 ++---
libc/src/stdlib/rand_util.h | 5 ++---
libc/src/stdlib/realloc.h | 5 ++---
libc/src/stdlib/srand.cpp | 5 ++---
libc/src/stdlib/srand.h | 5 ++---
libc/src/stdlib/str_from_util.h | 7 ++-----
libc/src/stdlib/strfromd.cpp | 5 ++---
libc/src/stdlib/strfromd.h | 5 ++---
libc/src/stdlib/strfromf.cpp | 5 ++---
libc/src/stdlib/strfromf.h | 5 ++---
libc/src/stdlib/strfroml.cpp | 5 ++---
libc/src/stdlib/strfroml.h | 5 ++---
libc/src/stdlib/strtod.cpp | 5 ++---
libc/src/stdlib/strtod.h | 6 ++----
libc/src/stdlib/strtof.cpp | 5 ++---
libc/src/stdlib/strtof.h | 6 ++----
libc/src/stdlib/strtol.cpp | 5 ++---
libc/src/stdlib/strtol.h | 6 ++----
libc/src/stdlib/strtold.cpp | 5 ++---
libc/src/stdlib/strtold.h | 6 ++----
libc/src/stdlib/strtoll.cpp | 5 ++---
libc/src/stdlib/strtoll.h | 6 ++----
libc/src/stdlib/strtoul.cpp | 5 ++---
libc/src/stdlib/strtoul.h | 6 ++----
libc/src/stdlib/strtoull.cpp | 5 ++---
libc/src/stdlib/strtoull.h | 6 ++----
libc/src/string/allocating_string_utils.h | 4 ++--
libc/src/string/bcmp.cpp | 5 ++---
libc/src/string/bcmp.h | 5 ++---
libc/src/string/bcopy.cpp | 5 ++---
libc/src/string/bcopy.h | 5 ++---
libc/src/string/bzero.cpp | 5 ++---
libc/src/string/bzero.h | 5 ++---
libc/src/string/index.cpp | 5 ++---
libc/src/string/index.h | 6 ++----
libc/src/string/memccpy.cpp | 5 ++---
libc/src/string/memccpy.h | 5 ++---
libc/src/string/memchr.cpp | 5 ++---
libc/src/string/memchr.h | 5 ++---
libc/src/string/memcmp.cpp | 5 ++---
libc/src/string/memcmp.h | 5 ++---
libc/src/string/memcpy.cpp | 5 ++---
libc/src/string/memcpy.h | 5 ++---
libc/src/string/memmem.cpp | 5 ++---
libc/src/string/memmem.h | 5 ++---
libc/src/string/memmove.cpp | 5 ++---
libc/src/string/memmove.h | 5 ++---
.../string/memory_utils/aarch64/inline_bcmp.h | 5 ++---
.../string/memory_utils/aarch64/inline_memcmp.h | 4 ++--
.../string/memory_utils/aarch64/inline_memcpy.h | 4 ++--
.../string/memory_utils/aarch64/inline_memmove.h | 4 ++--
.../string/memory_utils/aarch64/inline_memset.h | 5 ++---
.../string/memory_utils/generic/aligned_access.h | 4 ++--
libc/src/string/memory_utils/generic/builtin.h | 7 +++----
.../string/memory_utils/generic/byte_per_byte.h | 4 ++--
libc/src/string/memory_utils/inline_bcmp.h | 5 ++---
libc/src/string/memory_utils/inline_bzero.h | 5 ++---
libc/src/string/memory_utils/inline_memcmp.h | 4 ++--
libc/src/string/memory_utils/inline_memcpy.h | 4 ++--
libc/src/string/memory_utils/inline_memmem.h | 5 ++---
libc/src/string/memory_utils/inline_memmove.h | 5 ++---
libc/src/string/memory_utils/inline_memset.h | 4 ++--
libc/src/string/memory_utils/inline_strcmp.h | 5 ++---
libc/src/string/memory_utils/inline_strstr.h | 5 ++---
libc/src/string/memory_utils/op_aarch64.h | 13 ++++---------
libc/src/string/memory_utils/op_builtin.h | 7 ++-----
libc/src/string/memory_utils/op_generic.h | 11 ++++-------
libc/src/string/memory_utils/op_riscv.h | 7 ++-----
libc/src/string/memory_utils/op_x86.h | 13 ++++---------
libc/src/string/memory_utils/riscv/inline_bcmp.h | 5 ++---
.../string/memory_utils/riscv/inline_memcmp.h | 5 ++---
.../string/memory_utils/riscv/inline_memcpy.h | 5 ++---
.../string/memory_utils/riscv/inline_memmove.h | 5 ++---
.../string/memory_utils/riscv/inline_memset.h | 5 ++---
libc/src/string/memory_utils/utils.h | 5 ++---
.../src/string/memory_utils/x86_64/inline_bcmp.h | 5 ++---
.../string/memory_utils/x86_64/inline_memcmp.h | 4 ++--
.../string/memory_utils/x86_64/inline_memcpy.h | 4 ++--
.../string/memory_utils/x86_64/inline_memmove.h | 4 ++--
.../string/memory_utils/x86_64/inline_memset.h | 5 ++---
libc/src/string/mempcpy.cpp | 5 ++---
libc/src/string/mempcpy.h | 5 ++---
libc/src/string/memrchr.cpp | 5 ++---
libc/src/string/memrchr.h | 5 ++---
libc/src/string/memset.cpp | 5 ++---
libc/src/string/memset.h | 5 ++---
libc/src/string/memset_explicit.cpp | 5 ++---
libc/src/string/memset_explicit.h | 5 ++---
libc/src/string/rindex.cpp | 5 ++---
libc/src/string/rindex.h | 6 ++----
libc/src/string/stpcpy.cpp | 5 ++---
libc/src/string/stpcpy.h | 6 ++----
libc/src/string/stpncpy.cpp | 5 ++---
libc/src/string/stpncpy.h | 5 ++---
libc/src/string/strcasecmp.cpp | 5 ++---
libc/src/string/strcasecmp.h | 6 ++----
libc/src/string/strcasestr.cpp | 5 ++---
libc/src/string/strcasestr.h | 6 ++----
libc/src/string/strcat.cpp | 5 ++---
libc/src/string/strcat.h | 5 ++---
libc/src/string/strchr.cpp | 5 ++---
libc/src/string/strchr.h | 6 ++----
libc/src/string/strchrnul.cpp | 5 ++---
libc/src/string/strchrnul.h | 6 ++----
libc/src/string/strcmp.cpp | 5 ++---
libc/src/string/strcmp.h | 6 ++----
libc/src/string/strcoll.cpp | 5 ++---
libc/src/string/strcoll.h | 6 ++----
libc/src/string/strcpy.cpp | 5 ++---
libc/src/string/strcpy.h | 5 ++---
libc/src/string/strcspn.cpp | 5 ++---
libc/src/string/strcspn.h | 5 ++---
libc/src/string/strdup.cpp | 5 ++---
libc/src/string/strdup.h | 5 ++---
libc/src/string/strerror.cpp | 5 ++---
libc/src/string/strerror.h | 6 ++----
libc/src/string/strerror_r.cpp | 5 ++---
libc/src/string/strerror_r.h | 5 ++---
libc/src/string/string_utils.h | 5 ++---
libc/src/string/strlcat.cpp | 5 ++---
libc/src/string/strlcat.h | 5 ++---
libc/src/string/strlcpy.cpp | 5 ++---
libc/src/string/strlcpy.h | 5 ++---
libc/src/string/strlen.cpp | 5 ++---
libc/src/string/strlen.h | 5 ++---
libc/src/string/strncasecmp.cpp | 5 ++---
libc/src/string/strncasecmp.h | 5 ++---
libc/src/string/strncat.cpp | 5 ++---
libc/src/string/strncat.h | 5 ++---
libc/src/string/strncmp.cpp | 5 ++---
libc/src/string/strncmp.h | 5 ++---
libc/src/string/strncpy.cpp | 5 ++---
libc/src/string/strncpy.h | 5 ++---
libc/src/string/strndup.cpp | 5 ++---
libc/src/string/strndup.h | 5 ++---
libc/src/string/strnlen.cpp | 5 ++---
libc/src/string/strnlen.h | 5 ++---
libc/src/string/strpbrk.cpp | 5 ++---
libc/src/string/strpbrk.h | 6 ++----
libc/src/string/strrchr.cpp | 5 ++---
libc/src/string/strrchr.h | 6 ++----
libc/src/string/strsep.cpp | 5 ++---
libc/src/string/strsep.h | 6 ++----
libc/src/string/strsignal.cpp | 5 ++---
libc/src/string/strsignal.h | 6 ++----
libc/src/string/strspn.cpp | 5 ++---
libc/src/string/strspn.h | 5 ++---
libc/src/string/strstr.cpp | 5 ++---
libc/src/string/strstr.h | 6 ++----
libc/src/string/strtok.cpp | 5 ++---
libc/src/string/strtok.h | 6 ++----
libc/src/string/strtok_r.cpp | 5 ++---
libc/src/string/strtok_r.h | 6 ++----
libc/src/string/strxfrm.cpp | 5 ++---
libc/src/string/strxfrm.h | 5 ++---
libc/src/sys/auxv/getauxval.h | 5 ++---
libc/src/sys/auxv/linux/getauxval.cpp | 5 ++---
libc/src/sys/epoll/epoll_create.h | 6 ++----
libc/src/sys/epoll/epoll_create1.h | 6 ++----
libc/src/sys/epoll/epoll_ctl.h | 5 ++---
libc/src/sys/epoll/epoll_pwait.h | 5 ++---
libc/src/sys/epoll/epoll_pwait2.h | 5 ++---
libc/src/sys/epoll/epoll_wait.h | 5 ++---
libc/src/sys/epoll/linux/epoll_create.cpp | 5 ++---
libc/src/sys/epoll/linux/epoll_create1.cpp | 5 ++---
libc/src/sys/epoll/linux/epoll_ctl.cpp | 5 ++---
libc/src/sys/epoll/linux/epoll_pwait.cpp | 5 ++---
libc/src/sys/epoll/linux/epoll_pwait2.cpp | 5 ++---
libc/src/sys/epoll/linux/epoll_wait.cpp | 5 ++---
libc/src/sys/mman/linux/madvise.cpp | 5 ++---
libc/src/sys/mman/linux/mincore.cpp | 5 ++---
libc/src/sys/mman/linux/mlock.cpp | 5 ++---
libc/src/sys/mman/linux/mlock2.cpp | 5 ++---
libc/src/sys/mman/linux/mlockall.cpp | 5 ++---
libc/src/sys/mman/linux/mmap.cpp | 5 ++---
libc/src/sys/mman/linux/mprotect.cpp | 5 ++---
libc/src/sys/mman/linux/msync.cpp | 5 ++---
libc/src/sys/mman/linux/munlock.cpp | 5 ++---
libc/src/sys/mman/linux/munlockall.cpp | 5 ++---
libc/src/sys/mman/linux/munmap.cpp | 5 ++---
libc/src/sys/mman/linux/posix_madvise.cpp | 5 ++---
libc/src/sys/mman/linux/shm_common.h | 5 ++---
libc/src/sys/mman/linux/shm_open.cpp | 5 ++---
libc/src/sys/mman/linux/shm_unlink.cpp | 5 ++---
libc/src/sys/mman/madvise.h | 5 ++---
libc/src/sys/mman/mincore.h | 5 ++---
libc/src/sys/mman/mlock.h | 5 ++---
libc/src/sys/mman/mlock2.h | 5 ++---
libc/src/sys/mman/mlockall.h | 5 ++---
libc/src/sys/mman/mmap.h | 5 ++---
libc/src/sys/mman/mprotect.h | 5 ++---
libc/src/sys/mman/msync.h | 5 ++---
libc/src/sys/mman/munlock.h | 5 ++---
libc/src/sys/mman/munlockall.h | 5 ++---
libc/src/sys/mman/munmap.h | 5 ++---
libc/src/sys/mman/posix_madvise.h | 5 ++---
libc/src/sys/mman/shm_open.h | 5 ++---
libc/src/sys/mman/shm_unlink.h | 6 ++----
libc/src/sys/prctl/linux/prctl.cpp | 5 ++---
libc/src/sys/prctl/prctl.h | 5 ++---
libc/src/sys/random/getrandom.h | 5 ++---
libc/src/sys/random/linux/getrandom.cpp | 5 ++---
libc/src/sys/resource/getrlimit.h | 5 ++---
libc/src/sys/resource/linux/getrlimit.cpp | 5 ++---
libc/src/sys/resource/linux/setrlimit.cpp | 5 ++---
libc/src/sys/resource/setrlimit.h | 5 ++---
libc/src/sys/select/linux/select.cpp | 5 ++---
libc/src/sys/select/select.h | 5 ++---
libc/src/sys/sendfile/linux/sendfile.cpp | 5 ++---
libc/src/sys/sendfile/sendfile.h | 5 ++---
libc/src/sys/socket/bind.h | 5 ++---
libc/src/sys/socket/linux/bind.cpp | 5 ++---
libc/src/sys/socket/linux/socket.cpp | 5 ++---
libc/src/sys/socket/socket.h | 6 ++----
libc/src/sys/stat/chmod.h | 5 ++---
libc/src/sys/stat/fchmod.h | 5 ++---
libc/src/sys/stat/fchmodat.h | 5 ++---
libc/src/sys/stat/fstat.h | 5 ++---
libc/src/sys/stat/linux/chmod.cpp | 5 ++---
libc/src/sys/stat/linux/fchmod.cpp | 5 ++---
libc/src/sys/stat/linux/fchmodat.cpp | 5 ++---
libc/src/sys/stat/linux/fstat.cpp | 5 ++---
libc/src/sys/stat/linux/kernel_statx.h | 5 ++---
libc/src/sys/stat/linux/lstat.cpp | 5 ++---
libc/src/sys/stat/linux/mkdir.cpp | 5 ++---
libc/src/sys/stat/linux/mkdirat.cpp | 5 ++---
libc/src/sys/stat/linux/stat.cpp | 5 ++---
libc/src/sys/stat/lstat.h | 5 ++---
libc/src/sys/stat/mkdir.h | 5 ++---
libc/src/sys/stat/mkdirat.h | 5 ++---
libc/src/sys/stat/stat.h | 5 ++---
libc/src/sys/statvfs/fstatvfs.h | 5 ++---
libc/src/sys/statvfs/linux/fstatvfs.cpp | 5 ++---
libc/src/sys/statvfs/linux/statfs_utils.h | 5 ++---
libc/src/sys/statvfs/linux/statvfs.cpp | 5 ++---
libc/src/sys/statvfs/statvfs.h | 5 ++---
libc/src/sys/utsname/linux/uname.cpp | 5 ++---
libc/src/sys/utsname/uname.h | 5 ++---
libc/src/sys/wait/linux/wait.cpp | 5 ++---
libc/src/sys/wait/linux/wait4.cpp | 5 ++---
libc/src/sys/wait/linux/waitpid.cpp | 5 ++---
libc/src/sys/wait/wait.h | 5 ++---
libc/src/sys/wait/wait4.h | 5 ++---
libc/src/sys/wait/wait4Impl.h | 5 ++---
libc/src/sys/wait/waitpid.h | 5 ++---
libc/src/termios/cfgetispeed.h | 5 ++---
libc/src/termios/cfgetospeed.h | 5 ++---
libc/src/termios/cfsetispeed.h | 5 ++---
libc/src/termios/cfsetospeed.h | 5 ++---
libc/src/termios/linux/cfgetispeed.cpp | 5 ++---
libc/src/termios/linux/cfgetospeed.cpp | 5 ++---
libc/src/termios/linux/cfsetispeed.cpp | 5 ++---
libc/src/termios/linux/cfsetospeed.cpp | 5 ++---
libc/src/termios/linux/kernel_termios.h | 5 ++---
libc/src/termios/linux/tcdrain.cpp | 5 ++---
libc/src/termios/linux/tcflow.cpp | 5 ++---
libc/src/termios/linux/tcflush.cpp | 5 ++---
libc/src/termios/linux/tcgetattr.cpp | 5 ++---
libc/src/termios/linux/tcgetsid.cpp | 5 ++---
libc/src/termios/linux/tcsendbreak.cpp | 5 ++---
libc/src/termios/linux/tcsetattr.cpp | 5 ++---
libc/src/termios/tcdrain.h | 5 ++---
libc/src/termios/tcflow.h | 5 ++---
libc/src/termios/tcflush.h | 5 ++---
libc/src/termios/tcgetattr.h | 5 ++---
libc/src/termios/tcgetsid.h | 5 ++---
libc/src/termios/tcsendbreak.h | 5 ++---
libc/src/termios/tcsetattr.h | 5 ++---
libc/src/threads/call_once.cpp | 5 ++---
libc/src/threads/call_once.h | 5 ++---
libc/src/threads/cnd_broadcast.h | 5 ++---
libc/src/threads/cnd_destroy.h | 5 ++---
libc/src/threads/cnd_init.h | 5 ++---
libc/src/threads/cnd_signal.h | 5 ++---
libc/src/threads/cnd_wait.h | 5 ++---
libc/src/threads/linux/Futex.h | 5 ++---
libc/src/threads/linux/cnd_broadcast.cpp | 5 ++---
libc/src/threads/linux/cnd_destroy.cpp | 5 ++---
libc/src/threads/linux/cnd_init.cpp | 5 ++---
libc/src/threads/linux/cnd_signal.cpp | 5 ++---
libc/src/threads/linux/cnd_wait.cpp | 5 ++---
libc/src/threads/mtx_destroy.cpp | 5 ++---
libc/src/threads/mtx_destroy.h | 5 ++---
libc/src/threads/mtx_init.cpp | 5 ++---
libc/src/threads/mtx_init.h | 5 ++---
libc/src/threads/mtx_lock.cpp | 5 ++---
libc/src/threads/mtx_lock.h | 5 ++---
libc/src/threads/mtx_unlock.cpp | 5 ++---
libc/src/threads/mtx_unlock.h | 5 ++---
libc/src/threads/thrd_create.cpp | 5 ++---
libc/src/threads/thrd_create.h | 5 ++---
libc/src/threads/thrd_current.cpp | 5 ++---
libc/src/threads/thrd_current.h | 5 ++---
libc/src/threads/thrd_detach.cpp | 5 ++---
libc/src/threads/thrd_detach.h | 5 ++---
libc/src/threads/thrd_equal.cpp | 5 ++---
libc/src/threads/thrd_equal.h | 5 ++---
libc/src/threads/thrd_exit.cpp | 5 ++---
libc/src/threads/thrd_exit.h | 5 ++---
libc/src/threads/thrd_join.cpp | 5 ++---
libc/src/threads/thrd_join.h | 5 ++---
libc/src/threads/tss_create.cpp | 5 ++---
libc/src/threads/tss_create.h | 5 ++---
libc/src/threads/tss_delete.cpp | 5 ++---
libc/src/threads/tss_delete.h | 5 ++---
libc/src/threads/tss_get.cpp | 5 ++---
libc/src/threads/tss_get.h | 5 ++---
libc/src/threads/tss_set.cpp | 5 ++---
libc/src/threads/tss_set.h | 5 ++---
libc/src/time/asctime.cpp | 5 ++---
libc/src/time/asctime.h | 5 ++---
libc/src/time/asctime_r.cpp | 5 ++---
libc/src/time/asctime_r.h | 5 ++---
libc/src/time/clock.h | 5 ++---
libc/src/time/clock_gettime.h | 5 ++---
libc/src/time/difftime.cpp | 5 ++---
libc/src/time/difftime.h | 5 ++---
libc/src/time/gettimeofday.h | 5 ++---
libc/src/time/gmtime.cpp | 5 ++---
libc/src/time/gmtime.h | 5 ++---
libc/src/time/gmtime_r.cpp | 5 ++---
libc/src/time/gmtime_r.h | 5 ++---
libc/src/time/gpu/clock.cpp | 5 ++---
libc/src/time/gpu/nanosleep.cpp | 5 ++---
libc/src/time/gpu/time_utils.cpp | 5 ++---
libc/src/time/gpu/time_utils.h | 6 ++----
libc/src/time/linux/clock.cpp | 5 ++---
libc/src/time/linux/clock_gettime.cpp | 5 ++---
libc/src/time/linux/gettimeofday.cpp | 5 ++---
libc/src/time/linux/nanosleep.cpp | 5 ++---
libc/src/time/linux/time.cpp | 5 ++---
libc/src/time/mktime.cpp | 5 ++---
libc/src/time/mktime.h | 5 ++---
libc/src/time/nanosleep.h | 5 ++---
libc/src/time/time_func.h | 5 ++---
libc/src/time/time_utils.cpp | 5 ++---
libc/src/time/time_utils.h | 5 ++---
libc/src/unistd/_exit.cpp | 5 ++---
libc/src/unistd/_exit.h | 6 ++----
libc/src/unistd/access.h | 6 ++----
libc/src/unistd/chdir.h | 6 ++----
libc/src/unistd/close.h | 6 ++----
libc/src/unistd/dup.h | 5 ++---
libc/src/unistd/dup2.h | 5 ++---
libc/src/unistd/dup3.h | 5 ++---
libc/src/unistd/environ.cpp | 6 ++----
libc/src/unistd/environ.h | 6 ++----
libc/src/unistd/execv.h | 6 ++----
libc/src/unistd/execve.h | 6 ++----
libc/src/unistd/fchdir.h | 6 ++----
libc/src/unistd/fork.h | 5 ++---
libc/src/unistd/fpathconf.h | 6 ++----
libc/src/unistd/fsync.h | 6 ++----
libc/src/unistd/ftruncate.h | 5 ++---
libc/src/unistd/getcwd.h | 5 ++---
libc/src/unistd/geteuid.h | 5 ++---
libc/src/unistd/getopt.cpp | 5 ++---
libc/src/unistd/getopt.h | 5 ++---
libc/src/unistd/getpid.h | 5 ++---
libc/src/unistd/getppid.h | 5 ++---
libc/src/unistd/getuid.h | 5 ++---
libc/src/unistd/isatty.h | 5 ++---
libc/src/unistd/link.h | 5 ++---
libc/src/unistd/linkat.h | 6 ++----
libc/src/unistd/linux/access.cpp | 5 ++---
libc/src/unistd/linux/chdir.cpp | 5 ++---
libc/src/unistd/linux/close.cpp | 5 ++---
libc/src/unistd/linux/dup.cpp | 5 ++---
libc/src/unistd/linux/dup2.cpp | 5 ++---
libc/src/unistd/linux/dup3.cpp | 5 ++---
libc/src/unistd/linux/execv.cpp | 5 ++---
libc/src/unistd/linux/execve.cpp | 5 ++---
libc/src/unistd/linux/fchdir.cpp | 5 ++---
libc/src/unistd/linux/fork.cpp | 5 ++---
libc/src/unistd/linux/fpathconf.cpp | 5 ++---
libc/src/unistd/linux/fsync.cpp | 5 ++---
libc/src/unistd/linux/ftruncate.cpp | 5 ++---
libc/src/unistd/linux/getcwd.cpp | 5 ++---
libc/src/unistd/linux/geteuid.cpp | 5 ++---
libc/src/unistd/linux/getpid.cpp | 5 ++---
libc/src/unistd/linux/getppid.cpp | 5 ++---
libc/src/unistd/linux/getuid.cpp | 5 ++---
libc/src/unistd/linux/isatty.cpp | 5 ++---
libc/src/unistd/linux/link.cpp | 5 ++---
libc/src/unistd/linux/linkat.cpp | 5 ++---
libc/src/unistd/linux/lseek.cpp | 5 ++---
libc/src/unistd/linux/pathconf.cpp | 5 ++---
libc/src/unistd/linux/pathconf_utils.cpp | 5 ++---
libc/src/unistd/linux/pathconf_utils.h | 5 ++---
libc/src/unistd/linux/pipe.cpp | 5 ++---
libc/src/unistd/linux/pread.cpp | 5 ++---
libc/src/unistd/linux/pwrite.cpp | 5 ++---
libc/src/unistd/linux/read.cpp | 5 ++---
libc/src/unistd/linux/readlink.cpp | 5 ++---
libc/src/unistd/linux/readlinkat.cpp | 5 ++---
libc/src/unistd/linux/rmdir.cpp | 5 ++---
libc/src/unistd/linux/symlink.cpp | 5 ++---
libc/src/unistd/linux/symlinkat.cpp | 5 ++---
libc/src/unistd/linux/syscall.cpp | 5 ++---
libc/src/unistd/linux/sysconf.cpp | 5 ++---
libc/src/unistd/linux/truncate.cpp | 5 ++---
libc/src/unistd/linux/unlink.cpp | 5 ++---
libc/src/unistd/linux/unlinkat.cpp | 5 ++---
libc/src/unistd/linux/write.cpp | 5 ++---
libc/src/unistd/lseek.h | 5 ++---
libc/src/unistd/pathconf.h | 6 ++----
libc/src/unistd/pipe.h | 6 ++----
libc/src/unistd/pread.h | 5 ++---
libc/src/unistd/pwrite.h | 5 ++---
libc/src/unistd/read.h | 5 ++---
libc/src/unistd/readlink.h | 5 ++---
libc/src/unistd/readlinkat.h | 5 ++---
libc/src/unistd/rmdir.h | 6 ++----
libc/src/unistd/swab.cpp | 5 ++---
libc/src/unistd/swab.h | 5 ++---
libc/src/unistd/symlink.h | 5 ++---
libc/src/unistd/symlinkat.h | 5 ++---
libc/src/unistd/syscall.h | 5 ++---
libc/src/unistd/sysconf.h | 5 ++---
libc/src/unistd/truncate.h | 5 ++---
libc/src/unistd/unlink.h | 6 ++----
libc/src/unistd/unlinkat.h | 6 ++----
libc/src/unistd/write.h | 5 ++---
libc/src/wchar/btowc.cpp | 5 ++---
libc/src/wchar/btowc.h | 5 ++---
libc/src/wchar/wctob.cpp | 5 ++---
libc/src/wchar/wctob.h | 5 ++---
libc/startup/baremetal/fini.cpp | 5 ++---
libc/startup/baremetal/init.cpp | 5 ++---
libc/startup/gpu/amdgpu/start.cpp | 5 ++---
libc/startup/gpu/nvptx/start.cpp | 5 ++---
libc/startup/linux/aarch64/tls.cpp | 5 ++---
libc/startup/linux/do_start.cpp | 5 ++---
libc/startup/linux/do_start.h | 5 ++---
libc/startup/linux/riscv/tls.cpp | 5 ++---
libc/startup/linux/x86_64/tls.cpp | 5 ++---
libc/test/IntegrationTest/test.cpp | 5 ++---
libc/test/UnitTest/BazelFilePath.cpp | 7 ++-----
libc/test/UnitTest/CmakeFilePath.cpp | 7 ++-----
libc/test/UnitTest/ErrnoSetterMatcher.h | 5 ++---
libc/test/UnitTest/ExecuteFunction.h | 5 ++---
libc/test/UnitTest/ExecuteFunctionUnix.cpp | 5 ++---
libc/test/UnitTest/FEnvSafeTest.cpp | 7 ++-----
libc/test/UnitTest/FEnvSafeTest.h | 7 ++-----
libc/test/UnitTest/FPExceptMatcher.cpp | 5 ++---
libc/test/UnitTest/FPExceptMatcher.h | 5 ++---
libc/test/UnitTest/FPMatcher.h | 5 ++---
libc/test/UnitTest/GTest.h | 7 ++-----
libc/test/UnitTest/HermeticTestUtils.cpp | 5 ++---
libc/test/UnitTest/LibcDeathTestExecutors.cpp | 5 ++---
libc/test/UnitTest/LibcTest.cpp | 5 ++---
libc/test/UnitTest/LibcTest.h | 5 ++---
libc/test/UnitTest/MemoryMatcher.cpp | 5 ++---
libc/test/UnitTest/MemoryMatcher.h | 11 ++++-------
libc/test/UnitTest/PrintfMatcher.cpp | 5 ++---
libc/test/UnitTest/PrintfMatcher.h | 5 ++---
libc/test/UnitTest/RoundingModeUtils.cpp | 5 ++---
libc/test/UnitTest/RoundingModeUtils.h | 5 ++---
libc/test/UnitTest/ScanfMatcher.cpp | 5 ++---
libc/test/UnitTest/ScanfMatcher.h | 5 ++---
libc/test/UnitTest/StringUtils.h | 5 ++---
libc/test/UnitTest/TestLogger.cpp | 5 ++---
libc/test/UnitTest/TestLogger.h | 6 ++----
libc/test/UnitTest/ZxTest.h | 7 ++-----
libc/test/include/sys/queue_test.cpp | 5 ++---
.../src/pthread/pthread_rwlock_test.cpp | 7 ++-----
libc/test/src/__support/CPP/algorithm_test.cpp | 7 ++-----
libc/test/src/__support/CPP/bit_test.cpp | 7 ++-----
libc/test/src/__support/CPP/cstddef_test.cpp | 7 ++-----
libc/test/src/__support/CPP/limits_test.cpp | 5 ++---
libc/test/src/__support/CPP/type_traits_test.cpp | 7 ++-----
.../src/__support/HashTable/bitmask_test.cpp | 5 ++---
libc/test/src/__support/HashTable/group_test.cpp | 5 ++---
libc/test/src/__support/HashTable/table_test.cpp | 5 ++---
libc/test/src/__support/big_int_test.cpp | 5 ++---
libc/test/src/__support/endian_test.cpp | 5 ++---
libc/test/src/__support/freelist_heap_test.cpp | 5 ++---
libc/test/src/__support/math_extras_test.cpp | 5 ++---
libc/test/src/__support/memory_size_test.cpp | 5 ++---
libc/test/src/__support/str_to_double_test.cpp | 5 ++---
libc/test/src/__support/str_to_float_test.cpp | 5 ++---
libc/test/src/__support/str_to_fp_test.h | 5 ++---
.../src/__support/str_to_long_double_test.cpp | 5 ++---
.../BinaryOpSingleOutputPerf.h | 5 ++---
.../SingleInputSingleOutputPerf.h | 5 ++---
libc/test/src/math/performance_testing/Timer.cpp | 5 ++---
libc/test/src/math/performance_testing/Timer.h | 5 ++---
libc/test/src/math/sdcomp26094.h | 5 ++---
libc/test/src/stdio/sprintf_test.cpp | 3 +--
libc/test/src/stdlib/strtoint32_test.cpp | 5 ++---
libc/test/src/stdlib/strtoint64_test.cpp | 5 ++---
libc/test/src/string/bcmp_test.cpp | 5 ++---
libc/test/src/string/bcopy_test.cpp | 5 ++---
libc/test/src/string/bzero_test.cpp | 5 ++---
libc/test/src/string/memcmp_test.cpp | 5 ++---
libc/test/src/string/memcpy_test.cpp | 5 ++---
libc/test/src/string/memmem_test.cpp | 5 ++---
libc/test/src/string/memmove_test.cpp | 5 ++---
.../src/string/memory_utils/memory_check_utils.h | 5 ++---
libc/test/src/string/memory_utils/op_tests.cpp | 5 ++---
libc/test/src/string/memory_utils/utils_test.cpp | 5 ++---
libc/test/src/string/memset_explicit_test.cpp | 5 ++---
libc/test/src/string/memset_test.cpp | 5 ++---
.../test/src/sys/statvfs/linux/fstatvfs_test.cpp | 5 ++---
libc/test/src/sys/statvfs/linux/statvfs_test.cpp | 5 ++---
libc/test/src/time/TmHelper.h | 5 ++---
libc/test/src/time/TmMatcher.h | 5 ++---
libc/utils/MPFRWrapper/MPFRUtils.cpp | 5 ++---
libc/utils/MPFRWrapper/MPFRUtils.h | 5 ++---
.../bazel/llvm-project-overlay/libc/BUILD.bazel | 16 +++++++++-------
.../libc/libc_build_rules.bzl | 2 +-
.../libc/test/libc_test_rules.bzl | 1 -
2327 files changed, 4678 insertions(+), 7567 deletions(-)
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 LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_ITERATOR_H
diff --git a/libc/src/__support/CPP/limits.h b/libc/src/__support/CPP/limits.h
index 686abcaea9880..5b9b3e755c72b 100644
--- a/libc/src/__support/CPP/limits.h
+++ b/libc/src/__support/CPP/limits.h
@@ -13,10 +13,9 @@
#include "src/__support/CPP/type_traits/is_integral.h"
#include "src/__support/CPP/type_traits/is_signed.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace cpp {
namespace internal {
@@ -87,6 +86,6 @@ struct numeric_limits<__uint128_t>
#endif
} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_LIMITS_H
diff --git a/libc/src/__support/CPP/mutex.h b/libc/src/__support/CPP/mutex.h
index 8a3102426e2d6..ff9c9f43a43cc 100644
--- a/libc/src/__support/CPP/mutex.h
+++ b/libc/src/__support/CPP/mutex.h
@@ -9,9 +9,7 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_MUTEX_H
#define LLVM_LIBC_SRC___SUPPORT_CPP_MUTEX_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace cpp {
// Assume the calling thread has already obtained mutex ownership.
@@ -46,6 +44,6 @@ template <typename MutexType> class lock_guard {
template <typename T> lock_guard(T &) -> lock_guard<T>;
} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_MUTEX_H
diff --git a/libc/src/__support/CPP/new.h b/libc/src/__support/CPP/new.h
index 94a8466a39677..72187b70d7d24 100644
--- a/libc/src/__support/CPP/new.h
+++ b/libc/src/__support/CPP/new.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_NEW_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h> // For size_t
#include <stdlib.h> // For malloc, free etc.
@@ -24,7 +23,7 @@ enum class align_val_t : size_t {};
} // namespace std
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
class AllocChecker {
bool success = false;
@@ -53,7 +52,7 @@ class AllocChecker {
}
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
LIBC_INLINE void *operator new(size_t size,
LIBC_NAMESPACE::AllocChecker &ac) noexcept {
diff --git a/libc/src/__support/CPP/optional.h b/libc/src/__support/CPP/optional.h
index aed2269db1b11..2c0f639a2b342 100644
--- a/libc/src/__support/CPP/optional.h
+++ b/libc/src/__support/CPP/optional.h
@@ -12,9 +12,8 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/CPP/utility.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace cpp {
// Trivial nullopt_t struct.
@@ -134,6 +133,6 @@ template <typename T> class optional {
};
} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_OPTIONAL_H
diff --git a/libc/src/__support/CPP/span.h b/libc/src/__support/CPP/span.h
index e9e3dbf169ce0..a8c1353581ba0 100644
--- a/libc/src/__support/CPP/span.h
+++ b/libc/src/__support/CPP/span.h
@@ -11,13 +11,11 @@
#include <stddef.h> // For size_t
#include "array.h" // For array
-#include "src/__support/macros/config.h"
#include "type_traits.h" // For remove_cv_t, enable_if_t, is_same_v, is_const_v
#include "src/__support/macros/attributes.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// A trimmed down implementation of std::span.
// Missing features:
@@ -121,7 +119,6 @@ template <typename T> class span {
size_t span_size;
};
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_SPAN_H
diff --git a/libc/src/__support/CPP/string.h b/libc/src/__support/CPP/string.h
index 64d4c276e8428..cb794e081970d 100644
--- a/libc/src/__support/CPP/string.h
+++ b/libc/src/__support/CPP/string.h
@@ -11,7 +11,6 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/integer_to_string.h" // IntegerToString
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "src/string/memory_utils/inline_memset.h"
#include "src/string/string_utils.h" // string_length
@@ -19,7 +18,7 @@
#include <stddef.h> // size_t
#include <stdlib.h> // malloc, free
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace cpp {
// This class mimics std::string but does not intend to be a full fledged
@@ -226,6 +225,6 @@ LIBC_INLINE string to_string(unsigned long long value) {
// LIBC_INLINE string to_string(long double value);
} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_STRING_H
diff --git a/libc/src/__support/CPP/string_view.h b/libc/src/__support/CPP/string_view.h
index 88f5270c3170a..8aa96fa87f698 100644
--- a/libc/src/__support/CPP/string_view.h
+++ b/libc/src/__support/CPP/string_view.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_STRING_VIEW_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace cpp {
// This is very simple alternate of the std::string_view class. There is no
@@ -215,6 +214,6 @@ class string_view {
};
} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_STRING_VIEW_H
diff --git a/libc/src/__support/CPP/stringstream.h b/libc/src/__support/CPP/stringstream.h
index a16084c848688..c8eb59cf65cbb 100644
--- a/libc/src/__support/CPP/stringstream.h
+++ b/libc/src/__support/CPP/stringstream.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_STRINGSTREAM_H
#include "span.h"
-#include "src/__support/macros/config.h"
#include "string_view.h"
#include "type_traits.h"
#include "src/__support/integer_to_string.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace cpp {
// This class is to be used to write simple strings into a user provided buffer
@@ -91,6 +90,6 @@ class StringStream {
};
} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_STRINGSTREAM_H
diff --git a/libc/src/__support/CPP/type_traits/add_lvalue_reference.h b/libc/src/__support/CPP/type_traits/add_lvalue_reference.h
index 6f5fc6b0a4be1..2bca6267914d5 100644
--- a/libc/src/__support/CPP/type_traits/add_lvalue_reference.h
+++ b/libc/src/__support/CPP/type_traits/add_lvalue_reference.h
@@ -9,10 +9,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// add_lvalue_reference
namespace detail {
@@ -27,7 +25,6 @@ struct add_lvalue_reference : decltype(detail::try_add_lvalue_reference<T>(0)) {
template <class T>
using add_lvalue_reference_t = typename add_lvalue_reference<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
diff --git a/libc/src/__support/CPP/type_traits/add_pointer.h b/libc/src/__support/CPP/type_traits/add_pointer.h
index 2568a35653edc..1257033ee80e2 100644
--- a/libc/src/__support/CPP/type_traits/add_pointer.h
+++ b/libc/src/__support/CPP/type_traits/add_pointer.h
@@ -10,10 +10,8 @@
#include "src/__support/CPP/type_traits/remove_reference.h"
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// add_pointer
namespace detail {
@@ -24,7 +22,6 @@ template <class T> auto try_add_pointer(...) -> cpp::type_identity<T>;
template <class T>
struct add_pointer : decltype(detail::try_add_pointer<T>(0)) {};
template <class T> using add_pointer_t = typename add_pointer<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ADD_POINTER_H
diff --git a/libc/src/__support/CPP/type_traits/add_rvalue_reference.h b/libc/src/__support/CPP/type_traits/add_rvalue_reference.h
index f51ebf46d7c8b..76db6712e5364 100644
--- a/libc/src/__support/CPP/type_traits/add_rvalue_reference.h
+++ b/libc/src/__support/CPP/type_traits/add_rvalue_reference.h
@@ -9,10 +9,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ADD_RVALUE_REFERENCE_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// add_rvalue_reference
namespace detail {
@@ -26,7 +24,6 @@ struct add_rvalue_reference : decltype(detail::try_add_rvalue_reference<T>(0)) {
template <class T>
using add_rvalue_reference_t = typename add_rvalue_reference<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ADD_RVALUE_REFERENCE_H
diff --git a/libc/src/__support/CPP/type_traits/aligned_storage.h b/libc/src/__support/CPP/type_traits/aligned_storage.h
index 69ad4cc8478e2..574b1146f6b2a 100644
--- a/libc/src/__support/CPP/type_traits/aligned_storage.h
+++ b/libc/src/__support/CPP/type_traits/aligned_storage.h
@@ -9,11 +9,9 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ALIGNED_STORAGE_H
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ALIGNED_STORAGE_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
template <size_t Len, size_t Align> struct aligned_storage {
struct type {
@@ -24,7 +22,6 @@ template <size_t Len, size_t Align> struct aligned_storage {
template <size_t Len, size_t Align>
using aligned_storage_t = typename aligned_storage<Len, Align>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ALIGNED_STORAGE_H
diff --git a/libc/src/__support/CPP/type_traits/always_false.h b/libc/src/__support/CPP/type_traits/always_false.h
index 218eb9d577ec3..a86e926569fe6 100644
--- a/libc/src/__support/CPP/type_traits/always_false.h
+++ b/libc/src/__support/CPP/type_traits/always_false.h
@@ -10,10 +10,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ALWAYS_FALSE_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 technically not part of the standard but it come often enough that
// it's convenient to have around.
@@ -26,7 +24,6 @@ namespace cpp {
// Usage `static_assert(cpp::always_false<T>, "error message");`
template <typename...> LIBC_INLINE_VAR constexpr bool always_false = false;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ALWAYS_FALSE_H
diff --git a/libc/src/__support/CPP/type_traits/bool_constant.h b/libc/src/__support/CPP/type_traits/bool_constant.h
index e61a81a84b0f8..72eeaf29bc094 100644
--- a/libc/src/__support/CPP/type_traits/bool_constant.h
+++ b/libc/src/__support/CPP/type_traits/bool_constant.h
@@ -9,15 +9,12 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_BOOL_CONSTANT_H
#include "src/__support/CPP/type_traits/integral_constant.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// bool_constant
template <bool V> using bool_constant = cpp::integral_constant<bool, V>;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_BOOL_CONSTANT_H
diff --git a/libc/src/__support/CPP/type_traits/conditional.h b/libc/src/__support/CPP/type_traits/conditional.h
index effcda02da1a1..4fa65a08e5552 100644
--- a/libc/src/__support/CPP/type_traits/conditional.h
+++ b/libc/src/__support/CPP/type_traits/conditional.h
@@ -9,10 +9,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_CONDITIONAL_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// conditional
template <bool B, typename T, typename F>
@@ -22,7 +20,6 @@ struct conditional<false, T, F> : type_identity<F> {};
template <bool B, typename T, typename F>
using conditional_t = typename conditional<B, T, F>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_CONDITIONAL_H
diff --git a/libc/src/__support/CPP/type_traits/decay.h b/libc/src/__support/CPP/type_traits/decay.h
index c07e9e8557787..f1a1200ab2ba1 100644
--- a/libc/src/__support/CPP/type_traits/decay.h
+++ b/libc/src/__support/CPP/type_traits/decay.h
@@ -17,10 +17,8 @@
#include "src/__support/CPP/type_traits/remove_cv.h"
#include "src/__support/CPP/type_traits/remove_extent.h"
#include "src/__support/CPP/type_traits/remove_reference.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// decay
template <class T> class decay {
@@ -34,7 +32,6 @@ template <class T> class decay {
};
template <class T> using decay_t = typename decay<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_DECAY_H
diff --git a/libc/src/__support/CPP/type_traits/enable_if.h b/libc/src/__support/CPP/type_traits/enable_if.h
index a2ce2037eb964..cda9189b29eca 100644
--- a/libc/src/__support/CPP/type_traits/enable_if.h
+++ b/libc/src/__support/CPP/type_traits/enable_if.h
@@ -9,10 +9,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ENABLE_IF_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// enable_if
template <bool B, typename T = void> struct enable_if;
@@ -20,7 +18,6 @@ template <typename T> struct enable_if<true, T> : type_identity<T> {};
template <bool B, typename T = void>
using enable_if_t = typename enable_if<B, T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_ENABLE_IF_H
diff --git a/libc/src/__support/CPP/type_traits/false_type.h b/libc/src/__support/CPP/type_traits/false_type.h
index 65934b96bab06..97c041ccd1624 100644
--- a/libc/src/__support/CPP/type_traits/false_type.h
+++ b/libc/src/__support/CPP/type_traits/false_type.h
@@ -9,15 +9,12 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_FALSE_TYPE_H
#include "src/__support/CPP/type_traits/bool_constant.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// false_type
using false_type = cpp::bool_constant<false>;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_FALSE_TYPE_H
diff --git a/libc/src/__support/CPP/type_traits/integral_constant.h b/libc/src/__support/CPP/type_traits/integral_constant.h
index 931a9b98a64ca..7b5b6c2150c71 100644
--- a/libc/src/__support/CPP/type_traits/integral_constant.h
+++ b/libc/src/__support/CPP/type_traits/integral_constant.h
@@ -9,10 +9,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_INTEGRAL_CONSTANT_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE_VAR
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// integral_constant
template <typename T, T v> struct integral_constant {
@@ -20,7 +18,6 @@ template <typename T, T v> struct integral_constant {
LIBC_INLINE_VAR static constexpr T value = v;
};
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_INTEGRAL_CONSTANT_H
diff --git a/libc/src/__support/CPP/type_traits/invoke.h b/libc/src/__support/CPP/type_traits/invoke.h
index e4d9be74d12df..94351d849b926 100644
--- a/libc/src/__support/CPP/type_traits/invoke.h
+++ b/libc/src/__support/CPP/type_traits/invoke.h
@@ -17,10 +17,8 @@
#include "src/__support/CPP/type_traits/is_same.h"
#include "src/__support/CPP/utility/forward.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
namespace detail {
@@ -61,7 +59,6 @@ decltype(auto) invoke(Function &&fun, Args &&...args) {
cpp::forward<Function>(fun), cpp::forward<Args>(args)...);
}
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_INVOKE_H
diff --git a/libc/src/__support/CPP/type_traits/invoke_result.h b/libc/src/__support/CPP/type_traits/invoke_result.h
index 71d848b77fd27..a6e522fbd1a0f 100644
--- a/libc/src/__support/CPP/type_traits/invoke_result.h
+++ b/libc/src/__support/CPP/type_traits/invoke_result.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/invoke.h"
#include "src/__support/CPP/type_traits/type_identity.h"
#include "src/__support/CPP/utility/declval.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
template <class F, class... Args>
struct invoke_result : cpp::type_identity<decltype(cpp::invoke(
@@ -23,7 +21,6 @@ struct invoke_result : cpp::type_identity<decltype(cpp::invoke(
template <class F, class... Args>
using invoke_result_t = typename invoke_result<F, Args...>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_INVOKE_RESULT_H
diff --git a/libc/src/__support/CPP/type_traits/is_arithmetic.h b/libc/src/__support/CPP/type_traits/is_arithmetic.h
index 33671b0def431..53bb21203f593 100644
--- a/libc/src/__support/CPP/type_traits/is_arithmetic.h
+++ b/libc/src/__support/CPP/type_traits/is_arithmetic.h
@@ -12,10 +12,8 @@
#include "src/__support/CPP/type_traits/is_floating_point.h"
#include "src/__support/CPP/type_traits/is_integral.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_arithmetic
template <typename T>
@@ -24,7 +22,6 @@ struct is_arithmetic : cpp::bool_constant<(cpp::is_integral_v<T> ||
template <typename T>
LIBC_INLINE_VAR constexpr bool is_arithmetic_v = is_arithmetic<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_ARITHMETIC_H
diff --git a/libc/src/__support/CPP/type_traits/is_array.h b/libc/src/__support/CPP/type_traits/is_array.h
index f0ab100fd5c73..14360b130b2b1 100644
--- a/libc/src/__support/CPP/type_traits/is_array.h
+++ b/libc/src/__support/CPP/type_traits/is_array.h
@@ -11,12 +11,10 @@
#include "src/__support/CPP/type_traits/false_type.h"
#include "src/__support/CPP/type_traits/true_type.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 {
// is_array
template <class T> struct is_array : false_type {};
@@ -25,7 +23,6 @@ template <class T, size_t N> struct is_array<T[N]> : true_type {};
template <class T>
LIBC_INLINE_VAR constexpr bool is_array_v = is_array<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_ARRAY_H
diff --git a/libc/src/__support/CPP/type_traits/is_base_of.h b/libc/src/__support/CPP/type_traits/is_base_of.h
index 2efd1bf3f1aff..47fb56876cd7f 100644
--- a/libc/src/__support/CPP/type_traits/is_base_of.h
+++ b/libc/src/__support/CPP/type_traits/is_base_of.h
@@ -14,10 +14,8 @@
#include "src/__support/CPP/type_traits/remove_all_extents.h"
#include "src/__support/CPP/type_traits/true_type.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_base_of
namespace detail {
@@ -41,7 +39,6 @@ struct is_base_of
template <typename Base, typename Derived>
LIBC_INLINE_VAR constexpr bool is_base_of_v = is_base_of<Base, Derived>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_BASE_OF_H
diff --git a/libc/src/__support/CPP/type_traits/is_class.h b/libc/src/__support/CPP/type_traits/is_class.h
index fe12f7d2763cf..83ebaea544c75 100644
--- a/libc/src/__support/CPP/type_traits/is_class.h
+++ b/libc/src/__support/CPP/type_traits/is_class.h
@@ -12,10 +12,8 @@
#include "src/__support/CPP/type_traits/false_type.h"
#include "src/__support/CPP/type_traits/is_union.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_class
namespace detail {
@@ -26,7 +24,6 @@ template <class T> struct is_class : decltype(detail::test<T>(nullptr)) {};
template <typename T>
LIBC_INLINE_VAR constexpr bool is_class_v = is_class<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_CLASS_H
diff --git a/libc/src/__support/CPP/type_traits/is_const.h b/libc/src/__support/CPP/type_traits/is_const.h
index b8e60f79a6684..8e56a9afd2291 100644
--- a/libc/src/__support/CPP/type_traits/is_const.h
+++ b/libc/src/__support/CPP/type_traits/is_const.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/false_type.h"
#include "src/__support/CPP/type_traits/true_type.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_const
template <class T> struct is_const : cpp::false_type {};
@@ -22,7 +20,6 @@ template <class T> struct is_const<const T> : cpp::true_type {};
template <class T>
LIBC_INLINE_VAR constexpr bool is_const_v = is_const<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_CONST_H
diff --git a/libc/src/__support/CPP/type_traits/is_constant_evaluated.h b/libc/src/__support/CPP/type_traits/is_constant_evaluated.h
index 0bb2d0806cb0d..93cfd07b567f0 100644
--- a/libc/src/__support/CPP/type_traits/is_constant_evaluated.h
+++ b/libc/src/__support/CPP/type_traits/is_constant_evaluated.h
@@ -9,16 +9,13 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
LIBC_INLINE constexpr bool is_constant_evaluated() {
return __builtin_is_constant_evaluated();
}
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
diff --git a/libc/src/__support/CPP/type_traits/is_convertible.h b/libc/src/__support/CPP/type_traits/is_convertible.h
index a9f94cbb95a2a..d419443493f7d 100644
--- a/libc/src/__support/CPP/type_traits/is_convertible.h
+++ b/libc/src/__support/CPP/type_traits/is_convertible.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/is_void.h"
#include "src/__support/CPP/utility/declval.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_convertible
namespace detail {
@@ -42,7 +40,6 @@ template <class From, class To>
LIBC_INLINE_VAR constexpr bool is_convertible_v =
is_convertible<From, To>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_CONVERTIBLE_H
diff --git a/libc/src/__support/CPP/type_traits/is_destructible.h b/libc/src/__support/CPP/type_traits/is_destructible.h
index 830f22efafa52..f94fe309ac8f7 100644
--- a/libc/src/__support/CPP/type_traits/is_destructible.h
+++ b/libc/src/__support/CPP/type_traits/is_destructible.h
@@ -16,10 +16,8 @@
#include "src/__support/CPP/type_traits/true_type.h"
#include "src/__support/CPP/type_traits/type_identity.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_destructible
#if __has_builtin(__is_destructible)
@@ -62,7 +60,6 @@ template <> struct is_destructible<void> : public false_type {};
template <class T>
LIBC_INLINE_VAR constexpr bool is_destructible_v = is_destructible<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_DESTRUCTIBLE_H
diff --git a/libc/src/__support/CPP/type_traits/is_enum.h b/libc/src/__support/CPP/type_traits/is_enum.h
index 623ae072aff68..8d55a1ca8a9f7 100644
--- a/libc/src/__support/CPP/type_traits/is_enum.h
+++ b/libc/src/__support/CPP/type_traits/is_enum.h
@@ -10,17 +10,14 @@
#include "src/__support/CPP/type_traits/bool_constant.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_enum
template <typename T> struct is_enum : bool_constant<__is_enum(T)> {};
template <typename T>
LIBC_INLINE_VAR constexpr bool is_enum_v = is_enum<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_ENUM_H
diff --git a/libc/src/__support/CPP/type_traits/is_fixed_point.h b/libc/src/__support/CPP/type_traits/is_fixed_point.h
index 9df2a7727c961..025268bc2979d 100644
--- a/libc/src/__support/CPP/type_traits/is_fixed_point.h
+++ b/libc/src/__support/CPP/type_traits/is_fixed_point.h
@@ -13,10 +13,8 @@
#include "src/__support/macros/attributes.h"
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_fixed_point
#ifdef LIBC_COMPILER_HAS_FIXED_POINT
@@ -43,7 +41,6 @@ template <typename T> struct is_fixed_point : false_type {};
template <typename T>
LIBC_INLINE_VAR constexpr bool is_fixed_point_v = is_fixed_point<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_FIXED_POINT_H
diff --git a/libc/src/__support/CPP/type_traits/is_floating_point.h b/libc/src/__support/CPP/type_traits/is_floating_point.h
index 11ffbfabe60b6..49b51dc83ea0a 100644
--- a/libc/src/__support/CPP/type_traits/is_floating_point.h
+++ b/libc/src/__support/CPP/type_traits/is_floating_point.h
@@ -11,11 +11,9 @@
#include "src/__support/CPP/type_traits/is_same.h"
#include "src/__support/CPP/type_traits/remove_cv.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_FLOAT128
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_floating_point
template <typename T> struct is_floating_point {
@@ -42,7 +40,6 @@ template <typename T>
LIBC_INLINE_VAR constexpr bool is_floating_point_v =
is_floating_point<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_FLOATING_POINT_H
diff --git a/libc/src/__support/CPP/type_traits/is_function.h b/libc/src/__support/CPP/type_traits/is_function.h
index f7717f0a4dcd6..0eba5860ad607 100644
--- a/libc/src/__support/CPP/type_traits/is_function.h
+++ b/libc/src/__support/CPP/type_traits/is_function.h
@@ -12,10 +12,8 @@
#include "src/__support/CPP/type_traits/is_const.h"
#include "src/__support/CPP/type_traits/is_reference.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_function
#if __has_builtin(__is_function)
@@ -29,7 +27,6 @@ struct is_function
template <class T>
LIBC_INLINE_VAR constexpr bool is_function_v = is_function<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_FUNCTION_H
diff --git a/libc/src/__support/CPP/type_traits/is_integral.h b/libc/src/__support/CPP/type_traits/is_integral.h
index 96ba09a07ddc6..68e16ff841833 100644
--- a/libc/src/__support/CPP/type_traits/is_integral.h
+++ b/libc/src/__support/CPP/type_traits/is_integral.h
@@ -11,11 +11,9 @@
#include "src/__support/CPP/type_traits/is_same.h"
#include "src/__support/CPP/type_traits/remove_cv.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_integral
template <typename T> struct is_integral {
@@ -37,7 +35,6 @@ template <typename T> struct is_integral {
template <typename T>
LIBC_INLINE_VAR constexpr bool is_integral_v = is_integral<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_INTEGRAL_H
diff --git a/libc/src/__support/CPP/type_traits/is_lvalue_reference.h b/libc/src/__support/CPP/type_traits/is_lvalue_reference.h
index e0bfbebdaa296..1dff57f186a3a 100644
--- a/libc/src/__support/CPP/type_traits/is_lvalue_reference.h
+++ b/libc/src/__support/CPP/type_traits/is_lvalue_reference.h
@@ -12,10 +12,8 @@
#include "src/__support/CPP/type_traits/false_type.h"
#include "src/__support/CPP/type_traits/true_type.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_lvalue_reference
#if __has_builtin(__is_lvalue_reference)
@@ -29,7 +27,6 @@ template <class T>
LIBC_INLINE_VAR constexpr bool is_lvalue_reference_v =
is_lvalue_reference<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_LVALUE_REFERENCE_H
diff --git a/libc/src/__support/CPP/type_traits/is_member_pointer.h b/libc/src/__support/CPP/type_traits/is_member_pointer.h
index f44567003959c..f1f362f8dfd54 100644
--- a/libc/src/__support/CPP/type_traits/is_member_pointer.h
+++ b/libc/src/__support/CPP/type_traits/is_member_pointer.h
@@ -12,10 +12,8 @@
#include "src/__support/CPP/type_traits/remove_cv.h"
#include "src/__support/CPP/type_traits/true_type.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_member_pointer
template <class T> struct is_member_pointer_helper : cpp::false_type {};
@@ -27,7 +25,6 @@ template <class T>
LIBC_INLINE_VAR constexpr bool is_member_pointer_v =
is_member_pointer<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_MEMBER_POINTER_H
diff --git a/libc/src/__support/CPP/type_traits/is_null_pointer.h b/libc/src/__support/CPP/type_traits/is_null_pointer.h
index acf341311be06..14452433862ae 100644
--- a/libc/src/__support/CPP/type_traits/is_null_pointer.h
+++ b/libc/src/__support/CPP/type_traits/is_null_pointer.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/is_same.h"
#include "src/__support/CPP/type_traits/remove_cv.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_null_pointer
using nullptr_t = decltype(nullptr);
@@ -23,7 +21,6 @@ struct is_null_pointer : cpp::is_same<cpp::nullptr_t, cpp::remove_cv_t<T>> {};
template <class T>
LIBC_INLINE_VAR constexpr bool is_null_pointer_v = is_null_pointer<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_NULL_POINTER_H
diff --git a/libc/src/__support/CPP/type_traits/is_object.h b/libc/src/__support/CPP/type_traits/is_object.h
index 16799fb8f25f6..a23bebca572be 100644
--- a/libc/src/__support/CPP/type_traits/is_object.h
+++ b/libc/src/__support/CPP/type_traits/is_object.h
@@ -14,10 +14,8 @@
#include "src/__support/CPP/type_traits/is_scalar.h"
#include "src/__support/CPP/type_traits/is_union.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_object
template <class T>
@@ -27,7 +25,6 @@ struct is_object
template <class T>
LIBC_INLINE_VAR constexpr bool is_object_v = is_object<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_OBJECT_H
diff --git a/libc/src/__support/CPP/type_traits/is_pointer.h b/libc/src/__support/CPP/type_traits/is_pointer.h
index 606c8e9e8c0fb..177f8e5b64e7a 100644
--- a/libc/src/__support/CPP/type_traits/is_pointer.h
+++ b/libc/src/__support/CPP/type_traits/is_pointer.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/false_type.h"
#include "src/__support/CPP/type_traits/true_type.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_pointer
template <typename T> struct is_pointer : cpp::false_type {};
@@ -25,7 +23,6 @@ template <typename T> struct is_pointer<T *const volatile> : cpp::true_type {};
template <typename T>
LIBC_INLINE_VAR constexpr bool is_pointer_v = is_pointer<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_POINTER_H
diff --git a/libc/src/__support/CPP/type_traits/is_reference.h b/libc/src/__support/CPP/type_traits/is_reference.h
index 12da81778fd54..bbfb2b7359c3e 100644
--- a/libc/src/__support/CPP/type_traits/is_reference.h
+++ b/libc/src/__support/CPP/type_traits/is_reference.h
@@ -12,10 +12,8 @@
#include "src/__support/CPP/type_traits/false_type.h"
#include "src/__support/CPP/type_traits/true_type.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_reference
#if __has_builtin(__is_reference)
@@ -28,7 +26,6 @@ template <typename T> struct is_reference<T &&> : public true_type {};
template <class T>
LIBC_INLINE_VAR constexpr bool is_reference_v = is_reference<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_REFERENCE_H
diff --git a/libc/src/__support/CPP/type_traits/is_rvalue_reference.h b/libc/src/__support/CPP/type_traits/is_rvalue_reference.h
index 998b6353afb15..3efbbe6b033a0 100644
--- a/libc/src/__support/CPP/type_traits/is_rvalue_reference.h
+++ b/libc/src/__support/CPP/type_traits/is_rvalue_reference.h
@@ -12,10 +12,8 @@
#include "src/__support/CPP/type_traits/false_type.h"
#include "src/__support/CPP/type_traits/true_type.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_rvalue_reference
#if __has_builtin(__is_rvalue_reference)
@@ -29,7 +27,6 @@ template <class T>
LIBC_INLINE_VAR constexpr bool is_rvalue_reference_v =
is_rvalue_reference<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_RVALUE_REFERENCE_H
diff --git a/libc/src/__support/CPP/type_traits/is_same.h b/libc/src/__support/CPP/type_traits/is_same.h
index 306d16b86f88f..eb73952f9f971 100644
--- a/libc/src/__support/CPP/type_traits/is_same.h
+++ b/libc/src/__support/CPP/type_traits/is_same.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/false_type.h"
#include "src/__support/CPP/type_traits/true_type.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_same
template <typename T, typename U> struct is_same : cpp::false_type {};
@@ -22,7 +20,6 @@ template <typename T> struct is_same<T, T> : cpp::true_type {};
template <typename T, typename U>
LIBC_INLINE_VAR constexpr bool is_same_v = is_same<T, U>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_SAME_H
diff --git a/libc/src/__support/CPP/type_traits/is_scalar.h b/libc/src/__support/CPP/type_traits/is_scalar.h
index 7f8a750cd7edb..1f71cde36ca27 100644
--- a/libc/src/__support/CPP/type_traits/is_scalar.h
+++ b/libc/src/__support/CPP/type_traits/is_scalar.h
@@ -15,10 +15,8 @@
#include "src/__support/CPP/type_traits/is_null_pointer.h"
#include "src/__support/CPP/type_traits/is_pointer.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_scalar
template <class T>
@@ -29,7 +27,6 @@ struct is_scalar
template <class T>
LIBC_INLINE_VAR constexpr bool is_scalar_v = is_scalar<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_SCALAR_H
diff --git a/libc/src/__support/CPP/type_traits/is_signed.h b/libc/src/__support/CPP/type_traits/is_signed.h
index 3f56fb38aabb0..971fe692679f9 100644
--- a/libc/src/__support/CPP/type_traits/is_signed.h
+++ b/libc/src/__support/CPP/type_traits/is_signed.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/bool_constant.h"
#include "src/__support/CPP/type_traits/is_arithmetic.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_signed
template <typename T>
@@ -25,7 +23,6 @@ struct is_signed : bool_constant<(is_arithmetic_v<T> && (T(-1) < T(0)))> {
template <typename T>
LIBC_INLINE_VAR constexpr bool is_signed_v = is_signed<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_SIGNED_H
diff --git a/libc/src/__support/CPP/type_traits/is_trivially_constructible.h b/libc/src/__support/CPP/type_traits/is_trivially_constructible.h
index b801911038a90..be97b2289cf0a 100644
--- a/libc/src/__support/CPP/type_traits/is_trivially_constructible.h
+++ b/libc/src/__support/CPP/type_traits/is_trivially_constructible.h
@@ -9,17 +9,14 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
#include "src/__support/CPP/type_traits/integral_constant.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_trivially_constructible
template <class T, class... Args>
struct is_trivially_constructible
: integral_constant<bool, __is_trivially_constructible(T, Args...)> {};
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
diff --git a/libc/src/__support/CPP/type_traits/is_trivially_copyable.h b/libc/src/__support/CPP/type_traits/is_trivially_copyable.h
index 68e56c8547834..b4c825d579619 100644
--- a/libc/src/__support/CPP/type_traits/is_trivially_copyable.h
+++ b/libc/src/__support/CPP/type_traits/is_trivially_copyable.h
@@ -9,17 +9,14 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
#include "src/__support/CPP/type_traits/integral_constant.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_trivially_copyable
template <class T>
struct is_trivially_copyable
: public integral_constant<bool, __is_trivially_copyable(T)> {};
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
diff --git a/libc/src/__support/CPP/type_traits/is_trivially_destructible.h b/libc/src/__support/CPP/type_traits/is_trivially_destructible.h
index d727a0ec3a82b..37e0e869266e1 100644
--- a/libc/src/__support/CPP/type_traits/is_trivially_destructible.h
+++ b/libc/src/__support/CPP/type_traits/is_trivially_destructible.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/bool_constant.h"
#include "src/__support/CPP/type_traits/is_destructible.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_trivially_destructible
#if __has_builtin(__is_trivially_destructible)
@@ -31,7 +29,6 @@ template <typename T>
LIBC_INLINE_VAR constexpr bool is_trivially_destructible_v =
is_trivially_destructible<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
diff --git a/libc/src/__support/CPP/type_traits/is_union.h b/libc/src/__support/CPP/type_traits/is_union.h
index 00ca11a351bdc..04e78a89fc0c1 100644
--- a/libc/src/__support/CPP/type_traits/is_union.h
+++ b/libc/src/__support/CPP/type_traits/is_union.h
@@ -10,17 +10,14 @@
#include "src/__support/CPP/type_traits/bool_constant.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_union
template <class T> struct is_union : bool_constant<__is_union(T)> {};
template <typename T>
LIBC_INLINE_VAR constexpr bool is_union_v = is_union<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_UNION_H
diff --git a/libc/src/__support/CPP/type_traits/is_unsigned.h b/libc/src/__support/CPP/type_traits/is_unsigned.h
index eed519b1c067e..f089c2b61632f 100644
--- a/libc/src/__support/CPP/type_traits/is_unsigned.h
+++ b/libc/src/__support/CPP/type_traits/is_unsigned.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/bool_constant.h"
#include "src/__support/CPP/type_traits/is_arithmetic.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_unsigned
template <typename T>
@@ -25,7 +23,6 @@ struct is_unsigned : bool_constant<(is_arithmetic_v<T> && (T(-1) > T(0)))> {
template <typename T>
LIBC_INLINE_VAR constexpr bool is_unsigned_v = is_unsigned<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_UNSIGNED_H
diff --git a/libc/src/__support/CPP/type_traits/is_void.h b/libc/src/__support/CPP/type_traits/is_void.h
index 30459dcf91a7f..040dc831fd64e 100644
--- a/libc/src/__support/CPP/type_traits/is_void.h
+++ b/libc/src/__support/CPP/type_traits/is_void.h
@@ -11,17 +11,14 @@
#include "src/__support/CPP/type_traits/is_same.h"
#include "src/__support/CPP/type_traits/remove_cv.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// is_void
template <typename T> struct is_void : is_same<void, remove_cv_t<T>> {};
template <typename T>
LIBC_INLINE_VAR constexpr bool is_void_v = is_void<T>::value;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_VOID_H
diff --git a/libc/src/__support/CPP/type_traits/make_signed.h b/libc/src/__support/CPP/type_traits/make_signed.h
index 00bc6be8fcc18..4652d8b6bfa56 100644
--- a/libc/src/__support/CPP/type_traits/make_signed.h
+++ b/libc/src/__support/CPP/type_traits/make_signed.h
@@ -9,11 +9,9 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_MAKE_SIGNED_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// make_signed
template <typename T> struct make_signed;
@@ -35,7 +33,6 @@ template <> struct make_signed<__uint128_t> : type_identity<__int128_t> {};
#endif
template <typename T> using make_signed_t = typename make_signed<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_MAKE_SIGNED_H
diff --git a/libc/src/__support/CPP/type_traits/make_unsigned.h b/libc/src/__support/CPP/type_traits/make_unsigned.h
index e5f60ae665219..1e814ae002a77 100644
--- a/libc/src/__support/CPP/type_traits/make_unsigned.h
+++ b/libc/src/__support/CPP/type_traits/make_unsigned.h
@@ -9,11 +9,9 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_MAKE_UNSIGNED_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// make_unsigned
@@ -40,7 +38,6 @@ template <> struct make_unsigned<__uint128_t> : type_identity<__uint128_t> {};
#endif
template <typename T> using make_unsigned_t = typename make_unsigned<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_MAKE_UNSIGNED_H
diff --git a/libc/src/__support/CPP/type_traits/remove_all_extents.h b/libc/src/__support/CPP/type_traits/remove_all_extents.h
index bc577ca6f4df9..5941b82bbc161 100644
--- a/libc/src/__support/CPP/type_traits/remove_all_extents.h
+++ b/libc/src/__support/CPP/type_traits/remove_all_extents.h
@@ -9,12 +9,10 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// remove_all_extents
#if __has_builtin(__remove_all_extents)
@@ -35,7 +33,6 @@ template <typename T>
using remove_all_extents_t = typename remove_all_extents<T>::type;
#endif
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
diff --git a/libc/src/__support/CPP/type_traits/remove_cv.h b/libc/src/__support/CPP/type_traits/remove_cv.h
index 2e843e0b4363a..3cd7e5914119c 100644
--- a/libc/src/__support/CPP/type_traits/remove_cv.h
+++ b/libc/src/__support/CPP/type_traits/remove_cv.h
@@ -9,10 +9,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_REMOVE_CV_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// remove_cv
template <class T> struct remove_cv : cpp::type_identity<T> {};
@@ -22,7 +20,6 @@ template <class T>
struct remove_cv<const volatile T> : cpp::type_identity<T> {};
template <class T> using remove_cv_t = typename remove_cv<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_REMOVE_CV_H
diff --git a/libc/src/__support/CPP/type_traits/remove_cvref.h b/libc/src/__support/CPP/type_traits/remove_cvref.h
index 27591783fd7a1..6b410bb5841bc 100644
--- a/libc/src/__support/CPP/type_traits/remove_cvref.h
+++ b/libc/src/__support/CPP/type_traits/remove_cvref.h
@@ -10,10 +10,8 @@
#include "src/__support/CPP/type_traits/remove_cv.h"
#include "src/__support/CPP/type_traits/remove_reference.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// remove_cvref
template <typename T> struct remove_cvref {
@@ -21,7 +19,6 @@ template <typename T> struct remove_cvref {
};
template <typename T> using remove_cvref_t = typename remove_cvref<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_REMOVE_CVREF_H
diff --git a/libc/src/__support/CPP/type_traits/remove_extent.h b/libc/src/__support/CPP/type_traits/remove_extent.h
index 4f5ffd34530d5..3c0759dc1a522 100644
--- a/libc/src/__support/CPP/type_traits/remove_extent.h
+++ b/libc/src/__support/CPP/type_traits/remove_extent.h
@@ -9,11 +9,9 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_REMOVE_EXTENT_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
#include "stddef.h" // size_t
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// remove_extent
template <class T> struct remove_extent : cpp::type_identity<T> {};
@@ -22,7 +20,6 @@ template <class T, size_t N>
struct remove_extent<T[N]> : cpp::type_identity<T> {};
template <class T> using remove_extent_t = typename remove_extent<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_REMOVE_EXTENT_H
diff --git a/libc/src/__support/CPP/type_traits/remove_reference.h b/libc/src/__support/CPP/type_traits/remove_reference.h
index 26ded0879f190..02a0bd6373d3a 100644
--- a/libc/src/__support/CPP/type_traits/remove_reference.h
+++ b/libc/src/__support/CPP/type_traits/remove_reference.h
@@ -9,10 +9,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_REMOVE_REFERENCE_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// remove_reference
template <class T> struct remove_reference : cpp::type_identity<T> {};
@@ -21,7 +19,6 @@ template <class T> struct remove_reference<T &&> : cpp::type_identity<T> {};
template <class T>
using remove_reference_t = typename remove_reference<T>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_REMOVE_REFERENCE_H
diff --git a/libc/src/__support/CPP/type_traits/true_type.h b/libc/src/__support/CPP/type_traits/true_type.h
index 55f8a535d03f3..60ffc8acd9dad 100644
--- a/libc/src/__support/CPP/type_traits/true_type.h
+++ b/libc/src/__support/CPP/type_traits/true_type.h
@@ -9,15 +9,12 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_TRUE_TYPE_H
#include "src/__support/CPP/type_traits/bool_constant.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// true_type
using true_type = cpp::bool_constant<true>;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_TRUE_TYPE_H
diff --git a/libc/src/__support/CPP/type_traits/type_identity.h b/libc/src/__support/CPP/type_traits/type_identity.h
index 304a1ed2cea31..f33a43ac7ea10 100644
--- a/libc/src/__support/CPP/type_traits/type_identity.h
+++ b/libc/src/__support/CPP/type_traits/type_identity.h
@@ -8,17 +8,13 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_TYPE_IDENTITY_H
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_TYPE_IDENTITY_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// type_identity
template <typename T> struct type_identity {
using type = T;
};
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_TYPE_IDENTITY_H
diff --git a/libc/src/__support/CPP/type_traits/void_t.h b/libc/src/__support/CPP/type_traits/void_t.h
index 9018860a83a2c..babdaccfbc537 100644
--- a/libc/src/__support/CPP/type_traits/void_t.h
+++ b/libc/src/__support/CPP/type_traits/void_t.h
@@ -9,10 +9,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_VOID_T_H
#include "src/__support/CPP/type_traits/type_identity.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// void_t
@@ -23,7 +21,6 @@ template <typename... Ts> struct make_void : cpp::type_identity<void> {};
template <typename... Ts>
using void_t = typename detail::make_void<Ts...>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_VOID_T_H
diff --git a/libc/src/__support/CPP/utility/declval.h b/libc/src/__support/CPP/utility/declval.h
index 9b963b92204f3..0d00aa6d38199 100644
--- a/libc/src/__support/CPP/utility/declval.h
+++ b/libc/src/__support/CPP/utility/declval.h
@@ -10,10 +10,8 @@
#include "src/__support/CPP/type_traits/add_rvalue_reference.h"
#include "src/__support/CPP/type_traits/always_false.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// declval
template <typename T> cpp::add_rvalue_reference_t<T> declval() {
@@ -21,7 +19,6 @@ template <typename T> cpp::add_rvalue_reference_t<T> declval() {
"declval not allowed in an evaluated context");
}
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_UTILITY_DECLVAL_H
diff --git a/libc/src/__support/CPP/utility/forward.h b/libc/src/__support/CPP/utility/forward.h
index 085b3d16f999b..891097ec96d54 100644
--- a/libc/src/__support/CPP/utility/forward.h
+++ b/libc/src/__support/CPP/utility/forward.h
@@ -11,10 +11,8 @@
#include "src/__support/CPP/type_traits/is_lvalue_reference.h"
#include "src/__support/CPP/type_traits/remove_reference.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// forward
template <typename T>
@@ -29,7 +27,6 @@ LIBC_INLINE constexpr T &&forward(remove_reference_t<T> &&value) {
return static_cast<T &&>(value);
}
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_UTILITY_FORWARD_H
diff --git a/libc/src/__support/CPP/utility/in_place.h b/libc/src/__support/CPP/utility/in_place.h
index b5411f247d551..3aace22f211a8 100644
--- a/libc/src/__support/CPP/utility/in_place.h
+++ b/libc/src/__support/CPP/utility/in_place.h
@@ -9,12 +9,10 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_UTILITY_IN_PLACE_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE, LIBC_INLINE_VAR
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// in_place
struct in_place_t {
@@ -33,7 +31,6 @@ template <size_t I> struct in_place_index_t {
template <size_t I>
LIBC_INLINE_VAR constexpr in_place_index_t<I> in_place_index{};
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_UTILITY_IN_PLACE_H
diff --git a/libc/src/__support/CPP/utility/integer_sequence.h b/libc/src/__support/CPP/utility/integer_sequence.h
index 06643d505aca0..2ed26df3d238e 100644
--- a/libc/src/__support/CPP/utility/integer_sequence.h
+++ b/libc/src/__support/CPP/utility/integer_sequence.h
@@ -9,10 +9,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CPP_UTILITY_INTEGER_SEQUENCE_H
#include "src/__support/CPP/type_traits/is_integral.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// integer_sequence
template <typename T, T... Ints> struct integer_sequence {
@@ -34,7 +32,6 @@ template <typename T, int N>
using make_integer_sequence =
typename detail::make_integer_sequence<T, N - 1>::type;
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_UTILITY_INTEGER_SEQUENCE_H
diff --git a/libc/src/__support/CPP/utility/move.h b/libc/src/__support/CPP/utility/move.h
index b61f723e8d4cb..4fec5e6af96e3 100644
--- a/libc/src/__support/CPP/utility/move.h
+++ b/libc/src/__support/CPP/utility/move.h
@@ -10,10 +10,8 @@
#include "src/__support/CPP/type_traits/remove_reference.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
// move
template <class T>
@@ -21,7 +19,6 @@ LIBC_INLINE constexpr cpp::remove_reference_t<T> &&move(T &&t) {
return static_cast<typename cpp::remove_reference_t<T> &&>(t);
}
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
#endif // LLVM_LIBC_SRC___SUPPORT_CPP_UTILITY_MOVE_H
diff --git a/libc/src/__support/FPUtil/BasicOperations.h b/libc/src/__support/FPUtil/BasicOperations.h
index a963a92bfb074..17eee7bddb282 100644
--- a/libc/src/__support/FPUtil/BasicOperations.h
+++ b/libc/src/__support/FPUtil/BasicOperations.h
@@ -15,11 +15,10 @@
#include "FEnvImpl.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/uint128.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
template <typename T, cpp::enable_if_t<cpp::is_floating_point_v<T>, int> = 0>
@@ -309,6 +308,6 @@ setpayload(T &res, T pl) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_BASICOPERATIONS_H
diff --git a/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h b/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
index fda33875f25bc..eee05c67d9e9b 100644
--- a/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
+++ b/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
@@ -15,9 +15,8 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
static constexpr int QUOTIENT_LSB_BITS = 3;
@@ -116,6 +115,6 @@ LIBC_INLINE T remquo(T x, T y, int &q) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_DIVISIONANDREMAINDEROPERATIONS_H
diff --git a/libc/src/__support/FPUtil/FEnvImpl.h b/libc/src/__support/FPUtil/FEnvImpl.h
index 4bb31a6f4c426..1674dd0358e88 100644
--- a/libc/src/__support/FPUtil/FEnvImpl.h
+++ b/libc/src/__support/FPUtil/FEnvImpl.h
@@ -13,7 +13,6 @@
#include "hdr/math_macros.h"
#include "hdr/types/fenv_t.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include "src/errno/libc_errno.h"
@@ -35,8 +34,7 @@
#include "riscv/FEnvImpl.h"
#else
-namespace LIBC_NAMESPACE_DECL {
-namespace fputil {
+namespace LIBC_NAMESPACE::fputil {
// All dummy functions silently succeed.
@@ -64,12 +62,10 @@ LIBC_INLINE int get_env(fenv_t *) { return 0; }
LIBC_INLINE int set_env(const fenv_t *) { return 0; }
-} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fputil
#endif
-namespace LIBC_NAMESPACE_DECL {
-namespace fputil {
+namespace LIBC_NAMESPACE::fputil {
LIBC_INLINE int clear_except_if_required(int excepts) {
if (math_errhandling & MATH_ERREXCEPT)
@@ -94,7 +90,6 @@ LIBC_INLINE void set_errno_if_required(int err) {
libc_errno = err;
}
-} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fputil
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_FENVIMPL_H
diff --git a/libc/src/__support/FPUtil/FMA.h b/libc/src/__support/FPUtil/FMA.h
index 807d685239732..cf01a317d7359 100644
--- a/libc/src/__support/FPUtil/FMA.h
+++ b/libc/src/__support/FPUtil/FMA.h
@@ -11,11 +11,10 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/generic/FMA.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
template <typename OutType, typename InType>
@@ -34,6 +33,6 @@ template <> LIBC_INLINE double fma(double x, double y, double z) {
#endif // LIBC_TARGET_CPU_HAS_FMA
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_FMA_H
diff --git a/libc/src/__support/FPUtil/FPBits.h b/libc/src/__support/FPUtil/FPBits.h
index 5d1f633bb56ee..559ecde767c30 100644
--- a/libc/src/__support/FPUtil/FPBits.h
+++ b/libc/src/__support/FPUtil/FPBits.h
@@ -14,7 +14,6 @@
#include "src/__support/common.h"
#include "src/__support/libc_assert.h" // LIBC_ASSERT
#include "src/__support/macros/attributes.h" // LIBC_INLINE, LIBC_INLINE_VAR
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_FLOAT128
#include "src/__support/math_extras.h" // mask_trailing_ones
#include "src/__support/sign.h" // Sign
@@ -22,7 +21,7 @@
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
// The supported floating point types.
@@ -825,6 +824,6 @@ struct FPBits final : public internal::FPRepImpl<get_fp_type<T>(), FPBits<T>> {
};
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_FPBITS_H
diff --git a/libc/src/__support/FPUtil/Hypot.h b/libc/src/__support/FPUtil/Hypot.h
index a5a991e75ed01..76b1f07976213 100644
--- a/libc/src/__support/FPUtil/Hypot.h
+++ b/libc/src/__support/FPUtil/Hypot.h
@@ -16,10 +16,9 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/uint128.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
namespace internal {
@@ -264,6 +263,6 @@ LIBC_INLINE T hypot(T x, T y) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_HYPOT_H
diff --git a/libc/src/__support/FPUtil/ManipulationFunctions.h b/libc/src/__support/FPUtil/ManipulationFunctions.h
index a14f355789999..97c43126a71a3 100644
--- a/libc/src/__support/FPUtil/ManipulationFunctions.h
+++ b/libc/src/__support/FPUtil/ManipulationFunctions.h
@@ -21,10 +21,9 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
template <typename T, cpp::enable_if_t<cpp::is_floating_point_v<T>, int> = 0>
@@ -259,7 +258,7 @@ LIBC_INLINE constexpr T nextupdown(T x) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#ifdef LIBC_TYPES_LONG_DOUBLE_IS_X86_FLOAT80
#include "x86_64/NextAfterLongDouble.h"
diff --git a/libc/src/__support/FPUtil/NearestIntegerOperations.h b/libc/src/__support/FPUtil/NearestIntegerOperations.h
index e4e497b898e83..a9a0a97eebb5c 100644
--- a/libc/src/__support/FPUtil/NearestIntegerOperations.h
+++ b/libc/src/__support/FPUtil/NearestIntegerOperations.h
@@ -16,9 +16,8 @@
#include "hdr/math_macros.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
template <typename T, cpp::enable_if_t<cpp::is_floating_point_v<T>, int> = 0>
@@ -401,6 +400,6 @@ LIBC_INLINE I round_to_signed_integer_using_current_rounding_mode(F x) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_NEARESTINTEGEROPERATIONS_H
diff --git a/libc/src/__support/FPUtil/NormalFloat.h b/libc/src/__support/FPUtil/NormalFloat.h
index b4cbb5042a68b..413d20430090b 100644
--- a/libc/src/__support/FPUtil/NormalFloat.h
+++ b/libc/src/__support/FPUtil/NormalFloat.h
@@ -13,11 +13,10 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
// A class which stores the normalized form of a floating point value.
@@ -268,6 +267,6 @@ template <> LIBC_INLINE NormalFloat<long double>::operator long double() const {
#endif // LIBC_TYPES_LONG_DOUBLE_IS_X86_FLOAT80
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_NORMALFLOAT_H
diff --git a/libc/src/__support/FPUtil/PolyEval.h b/libc/src/__support/FPUtil/PolyEval.h
index 41104620ed61d..7a6384541a747 100644
--- a/libc/src/__support/FPUtil/PolyEval.h
+++ b/libc/src/__support/FPUtil/PolyEval.h
@@ -12,7 +12,6 @@
#include "multiply_add.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
// Evaluate polynomial using Horner's Scheme:
// With polyeval(x, a_0, a_1, ..., a_n) = a_n * x^n + ... + a_1 * x + a_0, we
@@ -21,7 +20,7 @@
// Example: to evaluate x^3 + 2*x^2 + 3*x + 4, call
// polyeval( x, 4.0, 3.0, 2.0, 1.0 )
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
template <typename T>
@@ -49,6 +48,6 @@ polyeval(T x, T a0, Ts... a) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_POLYEVAL_H
diff --git a/libc/src/__support/FPUtil/aarch64/FEnvImpl.h b/libc/src/__support/FPUtil/aarch64/FEnvImpl.h
index 3cea9772154fc..cd8a5970edd65 100644
--- a/libc/src/__support/FPUtil/aarch64/FEnvImpl.h
+++ b/libc/src/__support/FPUtil/aarch64/FEnvImpl.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_AARCH64_FENVIMPL_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if !defined(LIBC_TARGET_ARCH_IS_AARCH64) || defined(__APPLE__)
@@ -24,7 +23,7 @@
#include "hdr/types/fenv_t.h"
#include "src/__support/FPUtil/FPBits.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
struct FEnv {
@@ -280,6 +279,6 @@ LIBC_INLINE int set_env(const fenv_t *envp) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_AARCH64_FENVIMPL_H
diff --git a/libc/src/__support/FPUtil/aarch64/fenv_darwin_impl.h b/libc/src/__support/FPUtil/aarch64/fenv_darwin_impl.h
index 969e70796d1f1..feb48e3719bf1 100644
--- a/libc/src/__support/FPUtil/aarch64/fenv_darwin_impl.h
+++ b/libc/src/__support/FPUtil/aarch64/fenv_darwin_impl.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_AARCH64_FENV_DARWIN_IMPL_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if !defined(LIBC_TARGET_ARCH_IS_AARCH64) || !defined(__APPLE__)
@@ -24,7 +23,7 @@
#include "hdr/types/fenv_t.h"
#include "src/__support/FPUtil/FPBits.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
struct FEnv {
@@ -285,6 +284,6 @@ LIBC_INLINE int set_env(const fenv_t *envp) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_AARCH64_FENV_DARWIN_IMPL_H
diff --git a/libc/src/__support/FPUtil/aarch64/nearest_integer.h b/libc/src/__support/FPUtil/aarch64/nearest_integer.h
index d5ea0678825fd..ca0763078ff0d 100644
--- a/libc/src/__support/FPUtil/aarch64/nearest_integer.h
+++ b/libc/src/__support/FPUtil/aarch64/nearest_integer.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_AARCH64_NEAREST_INTEGER_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if !defined(LIBC_TARGET_ARCH_IS_AARCH64)
#error "Invalid include"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
LIBC_INLINE float nearest_integer(float x) {
@@ -33,6 +32,6 @@ LIBC_INLINE double nearest_integer(double x) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_AARCH64_NEAREST_INTEGER_H
diff --git a/libc/src/__support/FPUtil/aarch64/sqrt.h b/libc/src/__support/FPUtil/aarch64/sqrt.h
index b69267ff91f5c..bad7e316bf370 100644
--- a/libc/src/__support/FPUtil/aarch64/sqrt.h
+++ b/libc/src/__support/FPUtil/aarch64/sqrt.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_AARCH64_SQRT_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if !defined(LIBC_TARGET_ARCH_IS_AARCH64)
@@ -19,7 +18,7 @@
#include "src/__support/FPUtil/generic/sqrt.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
template <> LIBC_INLINE float sqrt<float>(float x) {
@@ -35,6 +34,6 @@ template <> LIBC_INLINE double sqrt<double>(double x) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_AARCH64_SQRT_H
diff --git a/libc/src/__support/FPUtil/arm/FEnvImpl.h b/libc/src/__support/FPUtil/arm/FEnvImpl.h
index aaf37c0a045af..cb8d31d683af3 100644
--- a/libc/src/__support/FPUtil/arm/FEnvImpl.h
+++ b/libc/src/__support/FPUtil/arm/FEnvImpl.h
@@ -13,10 +13,9 @@
#include "hdr/types/fenv_t.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/macros/attributes.h" // For LIBC_INLINE
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
struct FEnv {
@@ -261,6 +260,6 @@ LIBC_INLINE int set_env(const fenv_t *envp) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_ARM_FENVIMPL_H
diff --git a/libc/src/__support/FPUtil/double_double.h b/libc/src/__support/FPUtil/double_double.h
index 25a4ee03387c6..6867026953f25 100644
--- a/libc/src/__support/FPUtil/double_double.h
+++ b/libc/src/__support/FPUtil/double_double.h
@@ -11,12 +11,10 @@
#include "multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include "src/__support/number_pair.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace fputil {
+namespace LIBC_NAMESPACE::fputil {
using DoubleDouble = LIBC_NAMESPACE::NumberPair<double>;
@@ -167,7 +165,6 @@ LIBC_INLINE DoubleDouble div(const DoubleDouble &a, const DoubleDouble &b) {
return r;
}
-} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fputil
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_DOUBLE_DOUBLE_H
diff --git a/libc/src/__support/FPUtil/dyadic_float.h b/libc/src/__support/FPUtil/dyadic_float.h
index 86346a47b35a3..32267bb68e1cc 100644
--- a/libc/src/__support/FPUtil/dyadic_float.h
+++ b/libc/src/__support/FPUtil/dyadic_float.h
@@ -14,13 +14,11 @@
#include "multiply_add.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/big_int.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
-namespace fputil {
+namespace LIBC_NAMESPACE::fputil {
// A generic class to perform computations of high precision floating points.
// We store the value in dyadic format, including 3 fields:
@@ -373,7 +371,6 @@ LIBC_INLINE constexpr DyadicFloat<Bits> mul_pow_2(const DyadicFloat<Bits> &a,
return result;
}
-} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fputil
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_DYADIC_FLOAT_H
diff --git a/libc/src/__support/FPUtil/except_value_utils.h b/libc/src/__support/FPUtil/except_value_utils.h
index b9f54aa24e3a2..1e0381194009d 100644
--- a/libc/src/__support/FPUtil/except_value_utils.h
+++ b/libc/src/__support/FPUtil/except_value_utils.h
@@ -13,10 +13,9 @@
#include "FPBits.h"
#include "rounding_mode.h"
#include "src/__support/CPP/optional.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
@@ -115,6 +114,6 @@ template <typename T> LIBC_INLINE T round_result_slightly_up(T value_rn) {
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_EXCEPT_VALUE_UTILS_H
diff --git a/libc/src/__support/FPUtil/fpbits_str.h b/libc/src/__support/FPUtil/fpbits_str.h
index 92981917561a1..97689867da4de 100644
--- a/libc/src/__support/FPUtil/fpbits_str.h
+++ b/libc/src/__support/FPUtil/fpbits_str.h
@@ -14,9 +14,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/integer_to_string.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace details {
@@ -71,6 +70,6 @@ template <typename T> LIBC_INLINE cpp::string str(fputil::FPBits<T> x) {
return s;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_FPBITS_STR_H
diff --git a/libc/src/__support/FPUtil/generic/FMA.h b/libc/src/__support/FPUtil/generic/FMA.h
index 337301d86d919..72341a129dcb5 100644
--- a/libc/src/__support/FPUtil/generic/FMA.h
+++ b/libc/src/__support/FPUtil/generic/FMA.h
@@ -18,12 +18,11 @@
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/big_int.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "hdr/fenv_macros.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
namespace generic {
@@ -273,6 +272,6 @@ fma(InType x, InType y, InType z) {
} // namespace generic
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_GENERIC_FMA_H
diff --git a/libc/src/__support/FPUtil/generic/FMod.h b/libc/src/__support/FPUtil/generic/FMod.h
index 30d6472085f6f..0b9244ebdc8a8 100644
--- a/libc/src/__support/FPUtil/generic/FMod.h
+++ b/libc/src/__support/FPUtil/generic/FMod.h
@@ -14,10 +14,9 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
namespace generic {
@@ -291,6 +290,6 @@ class FMod {
} // namespace generic
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_GENERIC_FMOD_H
diff --git a/libc/src/__support/FPUtil/generic/README.md b/libc/src/__support/FPUtil/generic/README.md
index e45812cfe120c..61278aca949cd 100644
--- a/libc/src/__support/FPUtil/generic/README.md
+++ b/libc/src/__support/FPUtil/generic/README.md
@@ -12,7 +12,7 @@ we want to be able to call the generic `long double` implementation from the
nested namespace, we will be to call them as follows:
```
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
long double fmal(long double x, long double y, long double z) {
@@ -20,7 +20,7 @@ long double fmal(long double x, long double y, long double z) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
```
Note that actual code might not be as straightforward as above (for example,
diff --git a/libc/src/__support/FPUtil/generic/add_sub.h b/libc/src/__support/FPUtil/generic/add_sub.h
index ec20a8723b704..a522deae31368 100644
--- a/libc/src/__support/FPUtil/generic/add_sub.h
+++ b/libc/src/__support/FPUtil/generic/add_sub.h
@@ -20,11 +20,9 @@
#include "src/__support/FPUtil/dyadic_float.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace fputil::generic {
+namespace LIBC_NAMESPACE::fputil::generic {
template <bool IsSub, typename OutType, typename InType>
LIBC_INLINE cpp::enable_if_t<cpp::is_floating_point_v<OutType> &&
@@ -203,7 +201,6 @@ sub(InType x, InType y) {
return add_or_sub</*IsSub=*/true, OutType>(x, y);
}
-} // namespace fputil::generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fputil::generic
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_GENERIC_ADD_SUB_H
diff --git a/libc/src/__support/FPUtil/generic/div.h b/libc/src/__support/FPUtil/generic/div.h
index 27545786aea17..0d84aa8d8bccc 100644
--- a/libc/src/__support/FPUtil/generic/div.h
+++ b/libc/src/__support/FPUtil/generic/div.h
@@ -18,11 +18,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/dyadic_float.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace fputil::generic {
+namespace LIBC_NAMESPACE::fputil::generic {
template <typename OutType, typename InType>
LIBC_INLINE cpp::enable_if_t<cpp::is_floating_point_v<OutType> &&
@@ -120,7 +118,6 @@ div(InType x, InType y) {
return result.template as<OutType, /*ShouldSignalExceptions=*/true>();
}
-} // namespace fputil::generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fputil::generic
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_GENERIC_DIV_H
diff --git a/libc/src/__support/FPUtil/generic/sqrt.h b/libc/src/__support/FPUtil/generic/sqrt.h
index 4502cc07d32b3..1b713796f7499 100644
--- a/libc/src/__support/FPUtil/generic/sqrt.h
+++ b/libc/src/__support/FPUtil/generic/sqrt.h
@@ -16,12 +16,11 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/dyadic_float.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/uint128.h"
#include "hdr/fenv_macros.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
namespace internal {
@@ -164,6 +163,6 @@ sqrt(InType x) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_GENERIC_SQRT_H
diff --git a/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h b/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h
index 053348d4c975d..6308ffe95493e 100644
--- a/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h
+++ b/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h
@@ -14,10 +14,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/uint128.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
namespace x86 {
@@ -135,6 +134,6 @@ LIBC_INLINE long double sqrt(long double x) {
} // namespace x86
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_GENERIC_SQRT_80_BIT_LONG_DOUBLE_H
diff --git a/libc/src/__support/FPUtil/multiply_add.h b/libc/src/__support/FPUtil/multiply_add.h
index a86067c401873..1b9eee4ace62d 100644
--- a/libc/src/__support/FPUtil/multiply_add.h
+++ b/libc/src/__support/FPUtil/multiply_add.h
@@ -11,11 +11,10 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
// Implement a simple wrapper for multiply-add operation:
@@ -35,7 +34,7 @@ multiply_add(T x, T y, T z) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#if defined(LIBC_TARGET_CPU_HAS_FMA)
@@ -43,7 +42,7 @@ multiply_add(T x, T y, T z) {
// We use builtins directly instead of including FMA.h to avoid a circular
// dependency: multiply_add.h -> FMA.h -> generic/FMA.h -> dyadic_float.h.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
LIBC_INLINE float multiply_add(float x, float y, float z) {
@@ -55,7 +54,7 @@ LIBC_INLINE double multiply_add(double x, double y, double z) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_TARGET_CPU_HAS_FMA
diff --git a/libc/src/__support/FPUtil/nearest_integer.h b/libc/src/__support/FPUtil/nearest_integer.h
index 5d0deddd751f5..f9d952cfa163b 100644
--- a/libc/src/__support/FPUtil/nearest_integer.h
+++ b/libc/src/__support/FPUtil/nearest_integer.h
@@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_FPUTIL_NEAREST_INTEGER_H
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_NEAREST_INTEGER_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/architectures.h"
#include "src/__support/macros/properties/cpu_features.h"
@@ -20,7 +19,7 @@
#include "aarch64/nearest_integer.h"
#elif defined(LIBC_TARGET_ARCH_IS_GPU)
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
LIBC_INLINE float nearest_integer(float x) { return __builtin_rintf(x); }
@@ -28,11 +27,11 @@ LIBC_INLINE float nearest_integer(float x) { return __builtin_rintf(x); }
LIBC_INLINE double nearest_integer(double x) { return __builtin_rint(x); }
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#else
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
// This is a fast implementation for rounding to a nearest integer that.
@@ -73,7 +72,7 @@ LIBC_INLINE double nearest_integer(double x) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_NEAREST_INTEGER_H
diff --git a/libc/src/__support/FPUtil/riscv/FEnvImpl.h b/libc/src/__support/FPUtil/riscv/FEnvImpl.h
index 2f525eb5dac5a..1de464a89de48 100644
--- a/libc/src/__support/FPUtil/riscv/FEnvImpl.h
+++ b/libc/src/__support/FPUtil/riscv/FEnvImpl.h
@@ -17,7 +17,7 @@
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
struct FEnv {
@@ -176,6 +176,6 @@ LIBC_INLINE int set_env(const fenv_t *envp) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_RISCV_FENVIMPL_H
diff --git a/libc/src/__support/FPUtil/riscv/sqrt.h b/libc/src/__support/FPUtil/riscv/sqrt.h
index 0363822a4e8af..a1c436d0ebb1d 100644
--- a/libc/src/__support/FPUtil/riscv/sqrt.h
+++ b/libc/src/__support/FPUtil/riscv/sqrt.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_RISCV_SQRT_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if !defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)
@@ -19,7 +18,7 @@
#include "src/__support/FPUtil/generic/sqrt.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
#ifdef __riscv_flen
@@ -39,6 +38,6 @@ template <> LIBC_INLINE double sqrt<double>(double x) {
#endif // __riscv_flen
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_RISCV_SQRT_H
diff --git a/libc/src/__support/FPUtil/rounding_mode.h b/libc/src/__support/FPUtil/rounding_mode.h
index bc66d09b94160..aa5e00fa560bc 100644
--- a/libc/src/__support/FPUtil/rounding_mode.h
+++ b/libc/src/__support/FPUtil/rounding_mode.h
@@ -11,10 +11,8 @@
#include "hdr/fenv_macros.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace fputil {
+namespace LIBC_NAMESPACE::fputil {
// Quick free-standing test whether fegetround() == FE_UPWARD.
// Using the following observation:
@@ -75,7 +73,6 @@ LIBC_INLINE int quick_get_round() {
return (2.0f + y == 2.0f) ? FE_TONEAREST : FE_UPWARD;
}
-} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fputil
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_ROUNDING_MODE_H
diff --git a/libc/src/__support/FPUtil/triple_double.h b/libc/src/__support/FPUtil/triple_double.h
index f3ac5404ca368..eafa777878651 100644
--- a/libc/src/__support/FPUtil/triple_double.h
+++ b/libc/src/__support/FPUtil/triple_double.h
@@ -9,10 +9,7 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_FPUTIL_TRIPLE_DOUBLE_H
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_TRIPLE_DOUBLE_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
-namespace fputil {
+namespace LIBC_NAMESPACE::fputil {
struct TripleDouble {
double lo = 0.0;
@@ -20,7 +17,6 @@ struct TripleDouble {
double hi = 0.0;
};
-} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fputil
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_TRIPLE_DOUBLE_H
diff --git a/libc/src/__support/FPUtil/x86_64/FEnvImpl.h b/libc/src/__support/FPUtil/x86_64/FEnvImpl.h
index b77178ea69ea0..2aa69565efc58 100644
--- a/libc/src/__support/FPUtil/x86_64/FEnvImpl.h
+++ b/libc/src/__support/FPUtil/x86_64/FEnvImpl.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_FENVIMPL_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if !defined(LIBC_TARGET_ARCH_IS_X86)
@@ -22,7 +21,7 @@
#include "hdr/types/fenv_t.h"
#include "src/__support/macros/sanitizer.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
namespace internal {
@@ -643,6 +642,6 @@ LIBC_INLINE int set_env(const fenv_t *envp) {
#endif
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_FENVIMPL_H
diff --git a/libc/src/__support/FPUtil/x86_64/NextAfterLongDouble.h b/libc/src/__support/FPUtil/x86_64/NextAfterLongDouble.h
index 2e6b297ae9349..d1c76ba954b93 100644
--- a/libc/src/__support/FPUtil/x86_64/NextAfterLongDouble.h
+++ b/libc/src/__support/FPUtil/x86_64/NextAfterLongDouble.h
@@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_NEXTAFTERLONGDOUBLE_H
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_NEXTAFTERLONGDOUBLE_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if !defined(LIBC_TARGET_ARCH_IS_X86)
@@ -22,7 +21,7 @@
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
LIBC_INLINE long double nextafter(long double from, long double to) {
@@ -120,6 +119,6 @@ LIBC_INLINE long double nextafter(long double from, long double to) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_NEXTAFTERLONGDOUBLE_H
diff --git a/libc/src/__support/FPUtil/x86_64/NextUpDownLongDouble.h b/libc/src/__support/FPUtil/x86_64/NextUpDownLongDouble.h
index 31869975ac5ad..1bc849500be04 100644
--- a/libc/src/__support/FPUtil/x86_64/NextUpDownLongDouble.h
+++ b/libc/src/__support/FPUtil/x86_64/NextUpDownLongDouble.h
@@ -11,15 +11,13 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if !defined(LIBC_TARGET_ARCH_IS_X86)
#error "Invalid include"
#endif
-namespace LIBC_NAMESPACE_DECL {
-namespace fputil {
+namespace LIBC_NAMESPACE::fputil {
template <bool IsDown>
LIBC_INLINE constexpr long double nextupdown(long double x) {
@@ -57,7 +55,6 @@ LIBC_INLINE constexpr long double nextupdown(long double x) {
return xbits.get_val();
}
-} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fputil
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_NEXTUPDOWNLONGDOUBLE_H
diff --git a/libc/src/__support/FPUtil/x86_64/nearest_integer.h b/libc/src/__support/FPUtil/x86_64/nearest_integer.h
index 4eae5ffe816b3..ee31aeefd8489 100644
--- a/libc/src/__support/FPUtil/x86_64/nearest_integer.h
+++ b/libc/src/__support/FPUtil/x86_64/nearest_integer.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_NEAREST_INTEGER_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if !defined(LIBC_TARGET_ARCH_IS_X86_64)
@@ -23,7 +22,7 @@
#include <immintrin.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
LIBC_INLINE float nearest_integer(float x) {
@@ -41,6 +40,6 @@ LIBC_INLINE double nearest_integer(double x) {
}
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_NEAREST_INTEGER_H
diff --git a/libc/src/__support/FPUtil/x86_64/sqrt.h b/libc/src/__support/FPUtil/x86_64/sqrt.h
index e10447751d216..bfcc5e98834d6 100644
--- a/libc/src/__support/FPUtil/x86_64/sqrt.h
+++ b/libc/src/__support/FPUtil/x86_64/sqrt.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_SQRT_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include "src/__support/macros/properties/cpu_features.h"
@@ -20,7 +19,7 @@
#include "src/__support/FPUtil/generic/sqrt.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
template <> LIBC_INLINE float sqrt<float>(float x) {
@@ -49,6 +48,6 @@ template <> LIBC_INLINE long double sqrt<long double>(long double x) {
#endif
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FPUTIL_X86_64_SQRT_H
diff --git a/libc/src/__support/File/dir.cpp b/libc/src/__support/File/dir.cpp
index 21b0106f70106..e0f7695b39323 100644
--- a/libc/src/__support/File/dir.cpp
+++ b/libc/src/__support/File/dir.cpp
@@ -11,10 +11,9 @@
#include "src/__support/CPP/mutex.h" // lock_guard
#include "src/__support/CPP/new.h"
#include "src/__support/error_or.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h" // For error macros
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ErrorOr<Dir *> Dir::open(const char *path) {
auto fd = platform_opendir(path);
@@ -62,4 +61,4 @@ int Dir::close() {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/File/dir.h b/libc/src/__support/File/dir.h
index 136c266524a01..9f8c8dbb0c36e 100644
--- a/libc/src/__support/File/dir.h
+++ b/libc/src/__support/File/dir.h
@@ -11,13 +11,12 @@
#include "src/__support/CPP/span.h"
#include "src/__support/error_or.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <dirent.h>
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Platform specific function which will open the directory |name|
// and return its file descriptor. Upon failure, the error value is returned.
@@ -75,6 +74,6 @@ class Dir {
LIBC_INLINE int getfd() { return fd; }
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FILE_DIR_H
diff --git a/libc/src/__support/File/file.cpp b/libc/src/__support/File/file.cpp
index 1b545c5096936..08052f8d0a328 100644
--- a/libc/src/__support/File/file.cpp
+++ b/libc/src/__support/File/file.cpp
@@ -12,10 +12,9 @@
#include "hdr/types/off_t.h"
#include "src/__support/CPP/new.h"
#include "src/__support/CPP/span.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h" // For error macros
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
FileIOResult File::write_unlocked(const void *data, size_t len) {
if (!write_allowed()) {
@@ -431,4 +430,4 @@ File::ModeFlags File::mode_flags(const char *mode) {
return flags;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/File/file.h b/libc/src/__support/File/file.h
index 0cedf866519d6..d804289702540 100644
--- a/libc/src/__support/File/file.h
+++ b/libc/src/__support/File/file.h
@@ -13,14 +13,13 @@
#include "hdr/types/off_t.h"
#include "src/__support/CPP/new.h"
#include "src/__support/error_or.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include "src/__support/threads/mutex.h"
#include <stddef.h>
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct FileIOResult {
size_t value;
@@ -315,6 +314,6 @@ extern File *stdin;
extern File *stdout;
extern File *stderr;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FILE_FILE_H
diff --git a/libc/src/__support/File/linux/dir.cpp b/libc/src/__support/File/linux/dir.cpp
index fc90ff097e460..cae545a9fb8e9 100644
--- a/libc/src/__support/File/linux/dir.cpp
+++ b/libc/src/__support/File/linux/dir.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/error_or.h"
-#include "src/__support/macros/config.h"
#include <fcntl.h> // For open flags
#include <sys/syscall.h> // For syscall numbers
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ErrorOr<int> platform_opendir(const char *name) {
int open_flags = O_RDONLY | O_DIRECTORY | O_CLOEXEC;
@@ -57,4 +56,4 @@ int platform_closedir(int fd) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/File/linux/file.cpp b/libc/src/__support/File/linux/file.cpp
index 22292336f300e..df68570bc1043 100644
--- a/libc/src/__support/File/linux/file.cpp
+++ b/libc/src/__support/File/linux/file.cpp
@@ -15,14 +15,13 @@
#include "src/__support/File/linux/lseekImpl.h"
#include "src/__support/OSUtil/fcntl.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/macros/config.h"
-#include "src/errno/libc_errno.h" // For error macros
+#include "src/errno/libc_errno.h" // For error macros
#include <fcntl.h> // For mode_t and other flags to the open syscall
#include <sys/stat.h> // For S_IS*, S_IF*, and S_IR* flags.
#include <sys/syscall.h> // For syscall numbers
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
FileIOResult linux_file_write(File *f, const void *data, size_t size) {
auto *lf = reinterpret_cast<LinuxFile *>(f);
@@ -180,4 +179,4 @@ int get_fileno(File *f) {
return lf->get_fd();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/File/linux/file.h b/libc/src/__support/File/linux/file.h
index 16d72a60f8638..0507109e6793f 100644
--- a/libc/src/__support/File/linux/file.h
+++ b/libc/src/__support/File/linux/file.h
@@ -8,9 +8,8 @@
#include "hdr/types/off_t.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
FileIOResult linux_file_write(File *, const void *, size_t);
FileIOResult linux_file_read(File *, void *, size_t);
@@ -34,4 +33,4 @@ class LinuxFile : public File {
// Create a File object and associate it with a fd.
ErrorOr<LinuxFile *> create_file_from_fd(int fd, const char *mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/File/linux/lseekImpl.h b/libc/src/__support/File/linux/lseekImpl.h
index a034913d9f6ec..af015a2fd6a70 100644
--- a/libc/src/__support/File/linux/lseekImpl.h
+++ b/libc/src/__support/File/linux/lseekImpl.h
@@ -13,13 +13,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
#include "src/__support/error_or.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stdint.h> // For uint64_t.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
LIBC_INLINE ErrorOr<off_t> lseekimpl(int fd, off_t offset, int whence) {
@@ -46,6 +45,6 @@ LIBC_INLINE ErrorOr<off_t> lseekimpl(int fd, off_t offset, int whence) {
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FILE_LINUX_LSEEKIMPL_H
diff --git a/libc/src/__support/File/linux/stderr.cpp b/libc/src/__support/File/linux/stderr.cpp
index bc174792856ec..0b4b207329fff 100644
--- a/libc/src/__support/File/linux/stderr.cpp
+++ b/libc/src/__support/File/linux/stderr.cpp
@@ -9,16 +9,15 @@
#include "file.h"
#include "hdr/stdio_macros.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
constexpr size_t STDERR_BUFFER_SIZE = 0;
static LinuxFile StdErr(2, nullptr, STDERR_BUFFER_SIZE, _IONBF, false,
File::ModeFlags(File::OpenMode::APPEND));
File *stderr = &StdErr;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
extern "C" {
FILE *stderr = reinterpret_cast<FILE *>(&LIBC_NAMESPACE::StdErr);
diff --git a/libc/src/__support/File/linux/stdin.cpp b/libc/src/__support/File/linux/stdin.cpp
index e7b6ede85ddeb..49146dacfd4ac 100644
--- a/libc/src/__support/File/linux/stdin.cpp
+++ b/libc/src/__support/File/linux/stdin.cpp
@@ -9,9 +9,8 @@
#include "file.h"
#include "hdr/stdio_macros.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
constexpr size_t STDIN_BUFFER_SIZE = 512;
uint8_t stdin_buffer[STDIN_BUFFER_SIZE];
@@ -19,7 +18,7 @@ static LinuxFile StdIn(0, stdin_buffer, STDIN_BUFFER_SIZE, _IOFBF, false,
File::ModeFlags(File::OpenMode::READ));
File *stdin = &StdIn;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
extern "C" {
FILE *stdin = reinterpret_cast<FILE *>(&LIBC_NAMESPACE::StdIn);
diff --git a/libc/src/__support/File/linux/stdout.cpp b/libc/src/__support/File/linux/stdout.cpp
index 0d3b9f3d03768..58caf85b5167f 100644
--- a/libc/src/__support/File/linux/stdout.cpp
+++ b/libc/src/__support/File/linux/stdout.cpp
@@ -9,9 +9,8 @@
#include "file.h"
#include "hdr/stdio_macros.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
constexpr size_t STDOUT_BUFFER_SIZE = 1024;
uint8_t stdout_buffer[STDOUT_BUFFER_SIZE];
@@ -19,7 +18,7 @@ static LinuxFile StdOut(1, stdout_buffer, STDOUT_BUFFER_SIZE, _IOLBF, false,
File::ModeFlags(File::OpenMode::APPEND));
File *stdout = &StdOut;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
extern "C" {
FILE *stdout = reinterpret_cast<FILE *>(&LIBC_NAMESPACE::StdOut);
diff --git a/libc/src/__support/GPU/allocator.cpp b/libc/src/__support/GPU/allocator.cpp
index 01273e16a9387..a049959964cfc 100644
--- a/libc/src/__support/GPU/allocator.cpp
+++ b/libc/src/__support/GPU/allocator.cpp
@@ -10,9 +10,8 @@
#include "src/__support/GPU/utils.h"
#include "src/__support/RPC/rpc_client.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
void *rpc_allocate(uint64_t size) {
@@ -43,4 +42,4 @@ void *allocate(uint64_t size) { return rpc_allocate(size); }
void deallocate(void *ptr) { rpc_free(ptr); }
} // namespace gpu
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/GPU/allocator.h b/libc/src/__support/GPU/allocator.h
index 466009aa71981..99eeb6826cc28 100644
--- a/libc/src/__support/GPU/allocator.h
+++ b/libc/src/__support/GPU/allocator.h
@@ -9,16 +9,15 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_GPU_ALLOCATOR_H
#define LLVM_LIBC_SRC___SUPPORT_GPU_ALLOCATOR_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace gpu {
void *allocate(uint64_t size);
void deallocate(void *ptr);
} // namespace gpu
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_GPU_ALLOCATOR_H
diff --git a/libc/src/__support/GPU/amdgpu/utils.h b/libc/src/__support/GPU/amdgpu/utils.h
index 6ab95403ca389..5f8ad74f6aea3 100644
--- a/libc/src/__support/GPU/amdgpu/utils.h
+++ b/libc/src/__support/GPU/amdgpu/utils.h
@@ -14,7 +14,7 @@
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace gpu {
/// Type aliases to the address spaces used by the AMDGPU backend.
@@ -178,6 +178,6 @@ LIBC_INLINE uint64_t fixed_frequency_clock() {
LIBC_INLINE uint32_t get_cluster_id() { return 0; }
} // namespace gpu
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif
diff --git a/libc/src/__support/GPU/generic/utils.h b/libc/src/__support/GPU/generic/utils.h
index 9461ef0aa245b..b6df59f7aa9ef 100644
--- a/libc/src/__support/GPU/generic/utils.h
+++ b/libc/src/__support/GPU/generic/utils.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_GPU_GENERIC_UTILS_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace gpu {
template <typename T> using Private = T;
@@ -79,6 +78,6 @@ LIBC_INLINE uint64_t fixed_frequency_clock() { return 0; }
LIBC_INLINE uint32_t get_cluster_id() { return 0; }
} // namespace gpu
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_GPU_GENERIC_UTILS_H
diff --git a/libc/src/__support/GPU/nvptx/utils.h b/libc/src/__support/GPU/nvptx/utils.h
index 1a43a839a9ce4..88b8ee2e31d32 100644
--- a/libc/src/__support/GPU/nvptx/utils.h
+++ b/libc/src/__support/GPU/nvptx/utils.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_GPU_NVPTX_IO_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace gpu {
/// Type aliases to the address spaces used by the NVPTX backend.
@@ -155,6 +154,6 @@ LIBC_INLINE uint64_t fixed_frequency_clock() {
LIBC_INLINE uint32_t get_cluster_id() { return __nvvm_read_ptx_sreg_smid(); }
} // namespace gpu
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif
diff --git a/libc/src/__support/GPU/utils.h b/libc/src/__support/GPU/utils.h
index ae52e7a088ad5..cb04a3562eb1c 100644
--- a/libc/src/__support/GPU/utils.h
+++ b/libc/src/__support/GPU/utils.h
@@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_GPU_UTILS_H
#define LLVM_LIBC_SRC___SUPPORT_GPU_UTILS_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if defined(LIBC_TARGET_ARCH_IS_AMDGPU)
@@ -20,7 +19,7 @@
#include "generic/utils.h"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace gpu {
/// Get the first active thread inside the lane.
LIBC_INLINE uint64_t get_first_lane_id(uint64_t lane_mask) {
@@ -52,6 +51,6 @@ LIBC_INLINE uint32_t scan(uint64_t lane_mask, uint32_t x) {
}
} // namespace gpu
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_GPU_UTILS_H
diff --git a/libc/src/__support/HashTable/bitmask.h b/libc/src/__support/HashTable/bitmask.h
index 3cac481b80609..afdf7c2c43bfb 100644
--- a/libc/src/__support/HashTable/bitmask.h
+++ b/libc/src/__support/HashTable/bitmask.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC___SUPPORT_HASHTABLE_BITMASK_H
#include "src/__support/CPP/bit.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/cpu_features.h"
#include <stddef.h> // size_t
#include <stdint.h> // uint8_t, uint64_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// Implementations of the bitmask.
@@ -82,7 +81,7 @@ template <class BitMask> struct IteratableBitMaskAdaptor : public BitMask {
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#if defined(LIBC_TARGET_CPU_HAS_SSE2) && defined(__LIBC_EXPLICIT_SIMD_OPT)
#include "sse2/bitmask_impl.inc"
diff --git a/libc/src/__support/HashTable/generic/bitmask_impl.inc b/libc/src/__support/HashTable/generic/bitmask_impl.inc
index 6266ac3c84a90..d6c5ae075558a 100644
--- a/libc/src/__support/HashTable/generic/bitmask_impl.inc
+++ b/libc/src/__support/HashTable/generic/bitmask_impl.inc
@@ -8,9 +8,8 @@
#include "src/__support/common.h"
#include "src/__support/endian.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// GPU architectures are 64-bit but use 32-bit general purpose registers.
@@ -122,4 +121,4 @@ struct Group {
}
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/HashTable/randomness.h b/libc/src/__support/HashTable/randomness.h
index 06d3e84a710e7..bcc91190e9d45 100644
--- a/libc/src/__support/HashTable/randomness.h
+++ b/libc/src/__support/HashTable/randomness.h
@@ -12,13 +12,12 @@
#include "src/__support/common.h"
#include "src/__support/hash.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#if defined(LIBC_HASHTABLE_USE_GETRANDOM)
#include "src/errno/libc_errno.h"
#include "src/sys/random/getrandom.h"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
namespace randomness {
// We need an initial state for the hash function. More entropy are to be added
@@ -59,5 +58,5 @@ LIBC_INLINE uint64_t next_random_seed() {
} // namespace randomness
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_HASHTABLE_RANDOMNESS_H
diff --git a/libc/src/__support/HashTable/sse2/bitmask_impl.inc b/libc/src/__support/HashTable/sse2/bitmask_impl.inc
index eb4b3b5119f26..e778c19f284a8 100644
--- a/libc/src/__support/HashTable/sse2/bitmask_impl.inc
+++ b/libc/src/__support/HashTable/sse2/bitmask_impl.inc
@@ -7,10 +7,7 @@
//===----------------------------------------------------------------------===//
#include <immintrin.h>
-
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// With SSE2, every bitmask is iteratable as
// we use single bit to encode the data.
@@ -49,4 +46,4 @@ struct Group {
}
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/HashTable/table.h b/libc/src/__support/HashTable/table.h
index d50a9482ec4ce..8f6c5887c189e 100644
--- a/libc/src/__support/HashTable/table.h
+++ b/libc/src/__support/HashTable/table.h
@@ -15,7 +15,6 @@
#include "src/__support/HashTable/bitmask.h"
#include "src/__support/hash.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/__support/memory_size.h"
#include "src/string/memset.h"
@@ -24,7 +23,7 @@
#include <stddef.h>
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
LIBC_INLINE uint8_t secondary_hash(uint64_t hash) {
@@ -350,6 +349,6 @@ struct HashTable {
}
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_HASHTABLE_TABLE_H
diff --git a/libc/src/__support/OSUtil/baremetal/exit.cpp b/libc/src/__support/OSUtil/baremetal/exit.cpp
index 64d3862422b6b..26088c28b0a50 100644
--- a/libc/src/__support/OSUtil/baremetal/exit.cpp
+++ b/libc/src/__support/OSUtil/baremetal/exit.cpp
@@ -7,15 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/__support/OSUtil/exit.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace internal {
+namespace LIBC_NAMESPACE::internal {
// This is intended to be provided by the vendor.
extern "C" [[noreturn]] void __llvm_libc_exit(int status);
[[noreturn]] void exit(int status) { __llvm_libc_exit(status); }
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::internal
diff --git a/libc/src/__support/OSUtil/baremetal/io.cpp b/libc/src/__support/OSUtil/baremetal/io.cpp
index de278eb0092f8..c97bd5ae65b13 100644
--- a/libc/src/__support/OSUtil/baremetal/io.cpp
+++ b/libc/src/__support/OSUtil/baremetal/io.cpp
@@ -9,9 +9,8 @@
#include "io.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This is intended to be provided by the vendor.
@@ -29,4 +28,4 @@ void write_to_stderr(cpp::string_view msg) {
__llvm_libc_log_write(msg.data(), msg.size());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/OSUtil/baremetal/io.h b/libc/src/__support/OSUtil/baremetal/io.h
index 92bf3db6b3fd1..b9ae0bde502be 100644
--- a/libc/src/__support/OSUtil/baremetal/io.h
+++ b/libc/src/__support/OSUtil/baremetal/io.h
@@ -12,13 +12,12 @@
#include "include/llvm-libc-types/size_t.h"
#include "include/llvm-libc-types/ssize_t.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ssize_t read_from_stdin(char *buf, size_t size);
void write_to_stderr(cpp::string_view msg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_BAREMETAL_IO_H
diff --git a/libc/src/__support/OSUtil/darwin/arm/syscall.h b/libc/src/__support/OSUtil/darwin/arm/syscall.h
index dc98c07a8ba33..ce10c2a7a3079 100644
--- a/libc/src/__support/OSUtil/darwin/arm/syscall.h
+++ b/libc/src/__support/OSUtil/darwin/arm/syscall.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_DARWIN_ARM_SYSCALL_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#define REGISTER_DECL_0 \
register long x16 __asm__("x16") = number; \
@@ -45,7 +44,7 @@
#define SYSCALL_INSTR(input_constraint) \
LIBC_INLINE_ASM("svc 0x80" : "=r"(x0) : input_constraint : "memory", "cc")
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE long syscall_impl(long number) {
REGISTER_DECL_0;
@@ -92,7 +91,7 @@ LIBC_INLINE long syscall_impl(long number, long arg1, long arg2, long arg3,
return x0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#undef REGISTER_DECL_0
#undef REGISTER_DECL_1
diff --git a/libc/src/__support/OSUtil/darwin/io.h b/libc/src/__support/OSUtil/darwin/io.h
index a5f7ecbd70362..9bbc8e1ded000 100644
--- a/libc/src/__support/OSUtil/darwin/io.h
+++ b/libc/src/__support/OSUtil/darwin/io.h
@@ -10,16 +10,15 @@
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_DARWIN_IO_H
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "syscall.h" // For internal syscall function.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE void write_to_stderr(cpp::string_view msg) {
LIBC_NAMESPACE::syscall_impl(4 /*SYS_write*/, 2 /* stderr */,
reinterpret_cast<long>(msg.data()), msg.size());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_DARWIN_IO_H
diff --git a/libc/src/__support/OSUtil/darwin/syscall.h b/libc/src/__support/OSUtil/darwin/syscall.h
index eab96366a21a3..93b492e14ddfc 100644
--- a/libc/src/__support/OSUtil/darwin/syscall.h
+++ b/libc/src/__support/OSUtil/darwin/syscall.h
@@ -11,7 +11,6 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#ifdef LIBC_TARGET_ARCH_IS_ANY_ARM
@@ -20,7 +19,7 @@
#error "Unsupported architecture"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename R, typename... Ts>
LIBC_INLINE R syscall_impl(long __number, Ts... ts) {
@@ -28,6 +27,6 @@ LIBC_INLINE R syscall_impl(long __number, Ts... ts) {
return cpp::bit_or_static_cast<R>(syscall_impl(__number, (long)ts...));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_DARWIN_SYSCALL_H
diff --git a/libc/src/__support/OSUtil/exit.h b/libc/src/__support/OSUtil/exit.h
index e784ca0cb00b8..f01e4c70502f6 100644
--- a/libc/src/__support/OSUtil/exit.h
+++ b/libc/src/__support/OSUtil/exit.h
@@ -9,14 +9,10 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_OSUTIL_EXIT_H
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_EXIT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
-namespace internal {
+namespace LIBC_NAMESPACE::internal {
[[noreturn]] void exit(int status);
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+}
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_EXIT_H
diff --git a/libc/src/__support/OSUtil/fcntl.h b/libc/src/__support/OSUtil/fcntl.h
index 46f7d28132396..d934545c28d76 100644
--- a/libc/src/__support/OSUtil/fcntl.h
+++ b/libc/src/__support/OSUtil/fcntl.h
@@ -8,14 +8,10 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_OSUTIL_FCNTL_H
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_FCNTL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
-namespace internal {
+namespace LIBC_NAMESPACE::internal {
int fcntl(int fd, int cmd, void *arg = nullptr);
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::internal
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_FCNTL_H
diff --git a/libc/src/__support/OSUtil/fuchsia/io.h b/libc/src/__support/OSUtil/fuchsia/io.h
index 3953afce079df..f68d734492fab 100644
--- a/libc/src/__support/OSUtil/fuchsia/io.h
+++ b/libc/src/__support/OSUtil/fuchsia/io.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_FUCHSIA_IO_H
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include <iostream>
#include <zircon/sanitizer.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE void write_to_stderr(cpp::string_view msg) {
#if defined(LIBC_COPT_TEST_USE_ZXTEST)
@@ -29,6 +28,6 @@ LIBC_INLINE void write_to_stderr(cpp::string_view msg) {
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_FUCHSIA_IO_H
diff --git a/libc/src/__support/OSUtil/gpu/exit.cpp b/libc/src/__support/OSUtil/gpu/exit.cpp
index 360bcca1c6da3..96acb549bb7ab 100644
--- a/libc/src/__support/OSUtil/gpu/exit.cpp
+++ b/libc/src/__support/OSUtil/gpu/exit.cpp
@@ -9,11 +9,9 @@
#include "src/__support/OSUtil/exit.h"
#include "src/__support/RPC/rpc_client.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace internal {
+namespace LIBC_NAMESPACE::internal {
[[noreturn]] void exit(int status) {
// We want to first make sure the server is listening before we exit.
@@ -27,5 +25,4 @@ namespace internal {
gpu::end_program();
}
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::internal
diff --git a/libc/src/__support/OSUtil/gpu/io.cpp b/libc/src/__support/OSUtil/gpu/io.cpp
index f3000bd0f48b1..fec4d9f7b35d2 100644
--- a/libc/src/__support/OSUtil/gpu/io.cpp
+++ b/libc/src/__support/OSUtil/gpu/io.cpp
@@ -10,9 +10,8 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/RPC/rpc_client.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void write_to_stderr(cpp::string_view msg) {
rpc::Client::Port port = rpc::client.open<RPC_WRITE_TO_STDERR>();
@@ -21,4 +20,4 @@ void write_to_stderr(cpp::string_view msg) {
port.close();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/OSUtil/gpu/io.h b/libc/src/__support/OSUtil/gpu/io.h
index e23db8acdaeca..e5562eb74a67d 100644
--- a/libc/src/__support/OSUtil/gpu/io.h
+++ b/libc/src/__support/OSUtil/gpu/io.h
@@ -11,12 +11,11 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void write_to_stderr(cpp::string_view msg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_GPU_IO_H
diff --git a/libc/src/__support/OSUtil/linux/aarch64/syscall.h b/libc/src/__support/OSUtil/linux/aarch64/syscall.h
index f28392de5dced..f6c9a741de3ac 100644
--- a/libc/src/__support/OSUtil/linux/aarch64/syscall.h
+++ b/libc/src/__support/OSUtil/linux/aarch64/syscall.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_LINUX_AARCH64_SYSCALL_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#define REGISTER_DECL_0 \
register long x8 __asm__("x8") = number; \
@@ -43,7 +42,7 @@
#define SYSCALL_INSTR(input_constraint) \
LIBC_INLINE_ASM("svc 0" : "=r"(x0) : input_constraint : "memory", "cc")
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE long syscall_impl(long number) {
REGISTER_DECL_0;
@@ -90,7 +89,7 @@ LIBC_INLINE long syscall_impl(long number, long arg1, long arg2, long arg3,
return x0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#undef REGISTER_DECL_0
#undef REGISTER_DECL_1
diff --git a/libc/src/__support/OSUtil/linux/arm/syscall.h b/libc/src/__support/OSUtil/linux/arm/syscall.h
index d1058c84281fe..9674ee45a49e9 100644
--- a/libc/src/__support/OSUtil/linux/arm/syscall.h
+++ b/libc/src/__support/OSUtil/linux/arm/syscall.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_LINUX_ARM_SYSCALL_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#ifdef __thumb__
#define R7 long r7 = number
@@ -61,7 +60,7 @@
#define REGISTER_CONSTRAINT_5 REGISTER_CONSTRAINT_4, "r"(r4)
#define REGISTER_CONSTRAINT_6 REGISTER_CONSTRAINT_5, "r"(r5)
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE long syscall_impl(long number) {
REGISTER_DECL_0;
@@ -108,7 +107,7 @@ LIBC_INLINE long syscall_impl(long number, long arg1, long arg2, long arg3,
return r0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#undef REGISTER_DECL_0
#undef REGISTER_DECL_1
diff --git a/libc/src/__support/OSUtil/linux/exit.cpp b/libc/src/__support/OSUtil/linux/exit.cpp
index 9c64ce42be185..4a1d56a172a1a 100644
--- a/libc/src/__support/OSUtil/linux/exit.cpp
+++ b/libc/src/__support/OSUtil/linux/exit.cpp
@@ -7,12 +7,10 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "syscall.h" // For internal syscall function.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
-namespace internal {
+namespace LIBC_NAMESPACE::internal {
// mark as no_stack_protector for x86 since TLS can be torn down before calling
// exit so that the stack protector canary cannot be loaded.
@@ -27,5 +25,4 @@ exit(int status) {
}
}
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::internal
diff --git a/libc/src/__support/OSUtil/linux/fcntl.cpp b/libc/src/__support/OSUtil/linux/fcntl.cpp
index e11013121b04b..d5e850a904703 100644
--- a/libc/src/__support/OSUtil/linux/fcntl.cpp
+++ b/libc/src/__support/OSUtil/linux/fcntl.cpp
@@ -15,14 +15,12 @@
#include "hdr/types/struct_flock64.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stdarg.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
-namespace internal {
+namespace LIBC_NAMESPACE::internal {
int fcntl(int fd, int cmd, void *arg) {
#if SYS_fcntl
@@ -99,5 +97,4 @@ int fcntl(int fd, int cmd, void *arg) {
}
}
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::internal
diff --git a/libc/src/__support/OSUtil/linux/io.h b/libc/src/__support/OSUtil/linux/io.h
index 63e5b120d5c67..fd5d2e1b898b2 100644
--- a/libc/src/__support/OSUtil/linux/io.h
+++ b/libc/src/__support/OSUtil/linux/io.h
@@ -10,18 +10,17 @@
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_LINUX_IO_H
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "syscall.h" // For internal syscall function.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE void write_to_stderr(cpp::string_view msg) {
LIBC_NAMESPACE::syscall_impl<long>(SYS_write, 2 /* stderr */, msg.data(),
msg.size());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_LINUX_IO_H
diff --git a/libc/src/__support/OSUtil/linux/riscv/syscall.h b/libc/src/__support/OSUtil/linux/riscv/syscall.h
index e460e9bb56e67..4fc716f7d416c 100644
--- a/libc/src/__support/OSUtil/linux/riscv/syscall.h
+++ b/libc/src/__support/OSUtil/linux/riscv/syscall.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_LINUX_RISCV_SYSCALL_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#define REGISTER_DECL_0 \
register long a7 __asm__("a7") = number; \
@@ -43,7 +42,7 @@
#define SYSCALL_INSTR(input_constraint) \
LIBC_INLINE_ASM("ecall\n\t" : "=r"(a0) : input_constraint : "memory")
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE long syscall_impl(long number) {
REGISTER_DECL_0;
@@ -90,7 +89,7 @@ LIBC_INLINE long syscall_impl(long number, long arg1, long arg2, long arg3,
return a0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#undef REGISTER_DECL_0
#undef REGISTER_DECL_1
diff --git a/libc/src/__support/OSUtil/linux/syscall.h b/libc/src/__support/OSUtil/linux/syscall.h
index ad3f6947d0a06..2be3cefa906af 100644
--- a/libc/src/__support/OSUtil/linux/syscall.h
+++ b/libc/src/__support/OSUtil/linux/syscall.h
@@ -11,7 +11,6 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#ifdef LIBC_TARGET_ARCH_IS_X86_64
@@ -24,7 +23,7 @@
#include "riscv/syscall.h"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename R, typename... Ts>
LIBC_INLINE R syscall_impl(long __number, Ts... ts) {
@@ -32,6 +31,6 @@ LIBC_INLINE R syscall_impl(long __number, Ts... ts) {
return cpp::bit_or_static_cast<R>(syscall_impl(__number, (long)ts...));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_LINUX_SYSCALL_H
diff --git a/libc/src/__support/OSUtil/linux/x86_64/syscall.h b/libc/src/__support/OSUtil/linux/x86_64/syscall.h
index ebd77980af6a4..986db9372ad39 100644
--- a/libc/src/__support/OSUtil/linux/x86_64/syscall.h
+++ b/libc/src/__support/OSUtil/linux/x86_64/syscall.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_OSUTIL_LINUX_X86_64_SYSCALL_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#define SYSCALL_CLOBBER_LIST "rcx", "r11", "memory"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE long syscall_impl(long __number) {
long retcode;
@@ -94,6 +93,6 @@ LIBC_INLINE long syscall_impl(long __number, long __arg1, long __arg2,
}
#undef SYSCALL_CLOBBER_LIST
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_OSUTIL_LINUX_X86_64_SYSCALL_H
diff --git a/libc/src/__support/RPC/rpc.h b/libc/src/__support/RPC/rpc.h
index a94b11902c119..05506c04fc079 100644
--- a/libc/src/__support/RPC/rpc.h
+++ b/libc/src/__support/RPC/rpc.h
@@ -24,11 +24,10 @@
#include "src/__support/CPP/functional.h"
#include "src/__support/CPP/optional.h"
#include "src/__support/GPU/utils.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace rpc {
/// A fixed size channel used to communicate between the RPC client and server.
@@ -598,6 +597,6 @@ LIBC_INLINE Server::Port Server::open(uint32_t lane_size) {
}
} // namespace rpc
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif
diff --git a/libc/src/__support/RPC/rpc_client.cpp b/libc/src/__support/RPC/rpc_client.cpp
index 232b20d008d1d..8367d54fada63 100644
--- a/libc/src/__support/RPC/rpc_client.cpp
+++ b/libc/src/__support/RPC/rpc_client.cpp
@@ -8,9 +8,8 @@
#include "rpc_client.h"
#include "rpc.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace rpc {
/// The libc client instance used to communicate with the server.
@@ -23,4 +22,4 @@ extern "C" [[gnu::visibility("protected")]] const void *__llvm_libc_rpc_client =
&client;
} // namespace rpc
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/RPC/rpc_client.h b/libc/src/__support/RPC/rpc_client.h
index 695b6b7515bf7..6e1827dbfeea9 100644
--- a/libc/src/__support/RPC/rpc_client.h
+++ b/libc/src/__support/RPC/rpc_client.h
@@ -12,15 +12,14 @@
#include "rpc.h"
#include "include/llvm-libc-types/rpc_opcodes_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace rpc {
/// The libc client instance used to communicate with the server.
extern Client client;
} // namespace rpc
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif
diff --git a/libc/src/__support/RPC/rpc_util.h b/libc/src/__support/RPC/rpc_util.h
index 1a29ed6557714..7a9901af83e73 100644
--- a/libc/src/__support/RPC/rpc_util.h
+++ b/libc/src/__support/RPC/rpc_util.h
@@ -12,13 +12,12 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/GPU/utils.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include "src/__support/threads/sleep.h"
#include "src/string/memory_utils/generic/byte_per_byte.h"
#include "src/string/memory_utils/inline_memcpy.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace rpc {
/// Conditional to indicate if this process is running on the GPU.
@@ -68,6 +67,6 @@ LIBC_INLINE void rpc_memcpy(void *dst, const void *src, size_t count) {
}
} // namespace rpc
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_RPC_RPC_UTIL_H
diff --git a/libc/src/__support/StringUtil/error_to_string.cpp b/libc/src/__support/StringUtil/error_to_string.cpp
index e347ddae90f6e..3ea60a6740b30 100644
--- a/libc/src/__support/StringUtil/error_to_string.cpp
+++ b/libc/src/__support/StringUtil/error_to_string.cpp
@@ -15,11 +15,10 @@
#include "src/__support/StringUtil/message_mapper.h"
#include "src/__support/integer_to_string.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
constexpr size_t max_buff_size() {
@@ -75,4 +74,4 @@ cpp::string_view get_error_string(int err_num, cpp::span<char> buffer) {
return internal::build_error_string(err_num, buffer);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/StringUtil/error_to_string.h b/libc/src/__support/StringUtil/error_to_string.h
index ff5868457f8c9..43cf785c30b03 100644
--- a/libc/src/__support/StringUtil/error_to_string.h
+++ b/libc/src/__support/StringUtil/error_to_string.h
@@ -11,14 +11,13 @@
#include "src/__support/CPP/span.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
cpp::string_view get_error_string(int err_num);
cpp::string_view get_error_string(int err_num, cpp::span<char> buffer);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_ERROR_TO_STRING_H
diff --git a/libc/src/__support/StringUtil/message_mapper.h b/libc/src/__support/StringUtil/message_mapper.h
index df7506a2f3ecb..dd91839fb9200 100644
--- a/libc/src/__support/StringUtil/message_mapper.h
+++ b/libc/src/__support/StringUtil/message_mapper.h
@@ -12,10 +12,9 @@
#include "src/__support/CPP/array.h"
#include "src/__support/CPP/optional.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct MsgMapping {
int num;
@@ -99,6 +98,6 @@ constexpr MsgTable<N1 + N2> operator+(const MsgTable<N1> &t1,
return res;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_MESSAGE_MAPPER_H
diff --git a/libc/src/__support/StringUtil/signal_to_string.cpp b/libc/src/__support/StringUtil/signal_to_string.cpp
index b67d28814816c..1fea53a32aa21 100644
--- a/libc/src/__support/StringUtil/signal_to_string.cpp
+++ b/libc/src/__support/StringUtil/signal_to_string.cpp
@@ -15,12 +15,11 @@
#include "src/__support/StringUtil/message_mapper.h"
#include "src/__support/integer_to_string.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include <signal.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
constexpr size_t max_buff_size() {
@@ -78,4 +77,4 @@ cpp::string_view get_signal_string(int sig_num, cpp::span<char> buffer) {
return internal::build_signal_string(sig_num, buffer);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/StringUtil/signal_to_string.h b/libc/src/__support/StringUtil/signal_to_string.h
index a162486d134e1..e27324e970c06 100644
--- a/libc/src/__support/StringUtil/signal_to_string.h
+++ b/libc/src/__support/StringUtil/signal_to_string.h
@@ -12,14 +12,13 @@
#include "src/__support/CPP/span.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
cpp::string_view get_signal_string(int err_num);
cpp::string_view get_signal_string(int err_num, cpp::span<char> buffer);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_SIGNAL_TO_STRING_H
diff --git a/libc/src/__support/StringUtil/tables/linux_extension_errors.h b/libc/src/__support/StringUtil/tables/linux_extension_errors.h
index 9c60a07220491..f48968892e967 100644
--- a/libc/src/__support/StringUtil/tables/linux_extension_errors.h
+++ b/libc/src/__support/StringUtil/tables/linux_extension_errors.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_LINUX_EXTENSION_ERRORS_H
#include "src/__support/StringUtil/message_mapper.h"
-#include "src/__support/macros/config.h"
#include <errno.h> // For error macros
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
constexpr MsgTable<52> LINUX_ERRORS = {
MsgMapping(ENOTBLK, "Block device required"),
@@ -71,6 +70,6 @@ constexpr MsgTable<52> LINUX_ERRORS = {
MsgMapping(EHWPOISON, "Memory page has hardware error"),
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_LINUX_EXTENSION_ERRORS_H
diff --git a/libc/src/__support/StringUtil/tables/linux_extension_signals.h b/libc/src/__support/StringUtil/tables/linux_extension_signals.h
index c9cb26b785a13..3f9f0c66ff24b 100644
--- a/libc/src/__support/StringUtil/tables/linux_extension_signals.h
+++ b/libc/src/__support/StringUtil/tables/linux_extension_signals.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_LINUX_EXTENSION_SIGNALS_H
#include "src/__support/StringUtil/message_mapper.h"
-#include "src/__support/macros/config.h"
#include <signal.h> // For signal numbers
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The array being larger than necessary isn't a problem. The MsgMappings will
// be set to their default state which maps 0 to an empty string. This will get
@@ -29,6 +28,6 @@ LIBC_INLINE_VAR constexpr const MsgTable<3> LINUX_SIGNALS = {
#endif
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_LINUX_EXTENSION_SIGNALS_H
diff --git a/libc/src/__support/StringUtil/tables/linux_platform_errors.h b/libc/src/__support/StringUtil/tables/linux_platform_errors.h
index 22cc87fb3654a..a7bb545d3bf92 100644
--- a/libc/src/__support/StringUtil/tables/linux_platform_errors.h
+++ b/libc/src/__support/StringUtil/tables/linux_platform_errors.h
@@ -11,14 +11,13 @@
#include "linux_extension_errors.h"
#include "posix_errors.h"
-#include "src/__support/macros/config.h"
#include "stdc_errors.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE_VAR constexpr auto PLATFORM_ERRORS =
STDC_ERRORS + POSIX_ERRORS + LINUX_ERRORS;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_LINUX_PLATFORM_ERRORS_H
diff --git a/libc/src/__support/StringUtil/tables/linux_platform_signals.h b/libc/src/__support/StringUtil/tables/linux_platform_signals.h
index 7c816aaf504fb..f12d31f222b09 100644
--- a/libc/src/__support/StringUtil/tables/linux_platform_signals.h
+++ b/libc/src/__support/StringUtil/tables/linux_platform_signals.h
@@ -11,14 +11,13 @@
#include "linux_extension_signals.h"
#include "posix_signals.h"
-#include "src/__support/macros/config.h"
#include "stdc_signals.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE_VAR constexpr auto PLATFORM_SIGNALS =
STDC_SIGNALS + POSIX_SIGNALS + LINUX_SIGNALS;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_LINUX_PLATFORM_SIGNALS_H
diff --git a/libc/src/__support/StringUtil/tables/minimal_platform_errors.h b/libc/src/__support/StringUtil/tables/minimal_platform_errors.h
index baaa07bc8c998..c5672c4d875f5 100644
--- a/libc/src/__support/StringUtil/tables/minimal_platform_errors.h
+++ b/libc/src/__support/StringUtil/tables/minimal_platform_errors.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_MINIMAL_PLATFORM_ERRORS_H
#define LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_MINIMAL_PLATFORM_ERRORS_H
-#include "src/__support/macros/config.h"
#include "stdc_errors.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE_VAR constexpr auto PLATFORM_ERRORS = STDC_ERRORS;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_MINIMAL_PLATFORM_ERRORS_H
diff --git a/libc/src/__support/StringUtil/tables/minimal_platform_signals.h b/libc/src/__support/StringUtil/tables/minimal_platform_signals.h
index d4cecb3b35e5d..7fe0dccfc465e 100644
--- a/libc/src/__support/StringUtil/tables/minimal_platform_signals.h
+++ b/libc/src/__support/StringUtil/tables/minimal_platform_signals.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_MINIMAL_PLATFORM_SIGNALS_H
#define LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_MINIMAL_PLATFORM_SIGNALS_H
-#include "src/__support/macros/config.h"
#include "stdc_signals.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE_VAR constexpr auto PLATFORM_SIGNALS = STDC_SIGNALS;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_MINIMAL_PLATFORM_SIGNALS_H
diff --git a/libc/src/__support/StringUtil/tables/posix_errors.h b/libc/src/__support/StringUtil/tables/posix_errors.h
index aae00d11ad556..3cb6de394ea36 100644
--- a/libc/src/__support/StringUtil/tables/posix_errors.h
+++ b/libc/src/__support/StringUtil/tables/posix_errors.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_POSIX_ERRORS_H
#include "src/__support/StringUtil/message_mapper.h"
-#include "src/__support/macros/config.h"
#include <errno.h> // For error macros
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE_VAR constexpr MsgTable<76> POSIX_ERRORS = {
MsgMapping(EPERM, "Operation not permitted"),
@@ -95,6 +94,6 @@ LIBC_INLINE_VAR constexpr MsgTable<76> POSIX_ERRORS = {
MsgMapping(ENOTRECOVERABLE, "State not recoverable"),
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_POSIX_ERRORS_H
diff --git a/libc/src/__support/StringUtil/tables/posix_signals.h b/libc/src/__support/StringUtil/tables/posix_signals.h
index 7c70f71837e27..b9535cbeb6f69 100644
--- a/libc/src/__support/StringUtil/tables/posix_signals.h
+++ b/libc/src/__support/StringUtil/tables/posix_signals.h
@@ -11,11 +11,10 @@
#include "src/__support/CPP/array.h"
#include "src/__support/StringUtil/message_mapper.h"
-#include "src/__support/macros/config.h"
#include <signal.h> // For signal numbers
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE_VAR constexpr MsgTable<22> POSIX_SIGNALS = {
MsgMapping(SIGHUP, "Hangup"),
@@ -42,6 +41,6 @@ LIBC_INLINE_VAR constexpr MsgTable<22> POSIX_SIGNALS = {
MsgMapping(SIGSYS, "Bad system call"),
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_POSIX_SIGNALS_H
diff --git a/libc/src/__support/StringUtil/tables/signal_table.h b/libc/src/__support/StringUtil/tables/signal_table.h
index bfec39b52f1ae..d7ffbc63722e5 100644
--- a/libc/src/__support/StringUtil/tables/signal_table.h
+++ b/libc/src/__support/StringUtil/tables/signal_table.h
@@ -12,7 +12,6 @@
#include "src/__support/StringUtil/message_mapper.h"
#include "posix_signals.h"
-#include "src/__support/macros/config.h"
#include "stdc_signals.h"
#if defined(__linux__) || defined(__Fuchsia__)
@@ -25,8 +24,7 @@
#include "linux_extension_signals.h"
#endif
-namespace LIBC_NAMESPACE_DECL {
-namespace internal {
+namespace LIBC_NAMESPACE::internal {
LIBC_INLINE_VAR constexpr auto PLATFORM_SIGNALS = []() {
if constexpr (USE_LINUX_PLATFORM_SIGNALS) {
@@ -36,7 +34,6 @@ LIBC_INLINE_VAR constexpr auto PLATFORM_SIGNALS = []() {
}
}();
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::internal
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_SIGNAL_TABLE_H
diff --git a/libc/src/__support/StringUtil/tables/stdc_errors.h b/libc/src/__support/StringUtil/tables/stdc_errors.h
index a5d2279ff399c..6873d6bd51074 100644
--- a/libc/src/__support/StringUtil/tables/stdc_errors.h
+++ b/libc/src/__support/StringUtil/tables/stdc_errors.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_STDC_ERRORS_H
#include "src/__support/StringUtil/message_mapper.h"
-#include "src/__support/macros/config.h"
#include <errno.h> // For error macros
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE_VAR constexpr const MsgTable<3> STDC_ERRORS = {
MsgMapping(0, "Success"),
@@ -22,6 +21,6 @@ LIBC_INLINE_VAR constexpr const MsgTable<3> STDC_ERRORS = {
MsgMapping(ERANGE, "Numerical result out of range"),
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_STDC_ERRORS_H
diff --git a/libc/src/__support/StringUtil/tables/stdc_signals.h b/libc/src/__support/StringUtil/tables/stdc_signals.h
index 094b59b4ba641..7c93b45a441c3 100644
--- a/libc/src/__support/StringUtil/tables/stdc_signals.h
+++ b/libc/src/__support/StringUtil/tables/stdc_signals.h
@@ -12,9 +12,8 @@
#include <signal.h> // For signal numbers
#include "src/__support/StringUtil/message_mapper.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE_VAR constexpr const MsgTable<6> STDC_SIGNALS = {
MsgMapping(SIGINT, "Interrupt"),
@@ -25,6 +24,6 @@ LIBC_INLINE_VAR constexpr const MsgTable<6> STDC_SIGNALS = {
MsgMapping(SIGTERM, "Terminated"),
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STRINGUTIL_TABLES_STDC_SIGNALS_H
diff --git a/libc/src/__support/arg_list.h b/libc/src/__support/arg_list.h
index a57973273c9f6..0965e12afd562 100644
--- a/libc/src/__support/arg_list.h
+++ b/libc/src/__support/arg_list.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_SRC___SUPPORT_ARG_LIST_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stdarg.h>
#include <stddef.h>
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
class ArgList {
@@ -100,6 +99,6 @@ class StructArgList {
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_ARG_LIST_H
diff --git a/libc/src/__support/big_int.h b/libc/src/__support/big_int.h
index 681782d57319e..8eeb4db9d650b 100644
--- a/libc/src/__support/big_int.h
+++ b/libc/src/__support/big_int.h
@@ -15,7 +15,6 @@
#include "src/__support/CPP/optional.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/compiler.h" // LIBC_COMPILER_IS_CLANG
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128, LIBC_TYPES_HAS_INT64
@@ -25,7 +24,7 @@
#include <stddef.h> // For size_t
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace multiword {
@@ -1294,6 +1293,6 @@ first_trailing_one(T value) {
: cpp::countr_zero(value) + 1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_UINT_H
diff --git a/libc/src/__support/block.h b/libc/src/__support/block.h
index 242602ad2f856..e1b7aeaaf813c 100644
--- a/libc/src/__support/block.h
+++ b/libc/src/__support/block.h
@@ -17,11 +17,10 @@
#include "src/__support/CPP/span.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// Types of corrupted blocks, and functions to crash with an error message
@@ -600,6 +599,6 @@ internal::BlockStatus Block<OffsetType, kAlign>::check_status() const {
return internal::BlockStatus::VALID;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_BLOCK_H
diff --git a/libc/src/__support/blockstore.h b/libc/src/__support/blockstore.h
index 8d13e0ed290df..bcab7504dbd6e 100644
--- a/libc/src/__support/blockstore.h
+++ b/libc/src/__support/blockstore.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_BLOCKSTORE_H
#define LLVM_LIBC_SRC___SUPPORT_BLOCKSTORE_H
-#include "src/__support/macros/config.h"
#include <src/__support/CPP/new.h>
#include <src/__support/libc_assert.h>
#include <stddef.h>
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The difference between BlockStore a traditional vector types is that,
// when more capacity is desired, a new block is added instead of allocating
@@ -204,6 +203,6 @@ LIBC_INLINE void BlockStore<T, BLOCK_SIZE, REVERSE_ORDER>::destroy(
template <typename T, size_t BLOCK_SIZE>
using ReverseOrderBlockStore = BlockStore<T, BLOCK_SIZE, true>;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_BLOCKSTORE_H
diff --git a/libc/src/__support/c_string.h b/libc/src/__support/c_string.h
index 11f41320681af..9049311a57789 100644
--- a/libc/src/__support/c_string.h
+++ b/libc/src/__support/c_string.h
@@ -11,9 +11,8 @@
#include "src/__support/CPP/string.h"
#include "src/__support/macros/attributes.h" // for LIBC_INLINE
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The CString class is a companion to the cpp::string class. Its use case is as
// a return value for a function that in C would return a char* and a flag for
@@ -32,6 +31,6 @@ class CString {
LIBC_INLINE operator const char *() const { return str.c_str(); }
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_C_STRING_H
diff --git a/libc/src/__support/char_vector.h b/libc/src/__support/char_vector.h
index df109da5d8127..d39310e09dd71 100644
--- a/libc/src/__support/char_vector.h
+++ b/libc/src/__support/char_vector.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC___SUPPORT_CHARVECTOR_H
#include "src/__support/common.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
#include <stdlib.h> // malloc, realloc, free
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This is very simple alternate of the std::string class. There is no
// bounds check performed in any of the methods. The callers are expected to
@@ -74,6 +73,6 @@ class CharVector {
LIBC_INLINE size_t length() { return index; }
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_CHARVECTOR_H
diff --git a/libc/src/__support/common.h b/libc/src/__support/common.h
index 48c773fa02c17..53951dc131c28 100644
--- a/libc/src/__support/common.h
+++ b/libc/src/__support/common.h
@@ -14,7 +14,6 @@
#endif
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#ifndef LLVM_LIBC_FUNCTION_ATTR
@@ -36,7 +35,7 @@
#define LLVM_LIBC_FUNCTION(type, name, arglist) \
LLVM_LIBC_FUNCTION_IMPL(type, name, arglist)
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
LIBC_INLINE constexpr bool same_string(char const *lhs, char const *rhs) {
for (; *lhs || *rhs; ++lhs, ++rhs)
@@ -45,7 +44,7 @@ LIBC_INLINE constexpr bool same_string(char const *lhs, char const *rhs) {
return true;
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#define __LIBC_MACRO_TO_STRING(str) #str
#define LIBC_MACRO_TO_STRING(str) __LIBC_MACRO_TO_STRING(str)
diff --git a/libc/src/__support/ctype_utils.h b/libc/src/__support/ctype_utils.h
index 91f6ce8cabd8d..5fa4777ffd65f 100644
--- a/libc/src/__support/ctype_utils.h
+++ b/libc/src/__support/ctype_utils.h
@@ -10,9 +10,8 @@
#define LLVM_LIBC_SRC___SUPPORT_CTYPE_UTILS_H
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// ------------------------------------------------------
@@ -56,6 +55,6 @@ LIBC_INLINE static constexpr int tolower(int ch) {
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_CTYPE_UTILS_H
diff --git a/libc/src/__support/detailed_powers_of_ten.h b/libc/src/__support/detailed_powers_of_ten.h
index 28741b8a3f563..c8340fda06eed 100644
--- a/libc/src/__support/detailed_powers_of_ten.h
+++ b/libc/src/__support/detailed_powers_of_ten.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_DETAILED_POWERS_OF_TEN_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// TODO(michaelrj): write a script that will generate this table.
@@ -735,6 +734,6 @@ static constexpr uint64_t DETAILED_POWERS_OF_TEN[696][2] = {
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_DETAILED_POWERS_OF_TEN_H
diff --git a/libc/src/__support/endian.h b/libc/src/__support/endian.h
index 8c443fefab5e8..cd083aad09c3c 100644
--- a/libc/src/__support/endian.h
+++ b/libc/src/__support/endian.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_ENDIAN_H
#include "common.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// We rely on compiler preprocessor defines to allow for cross compilation.
#if !defined(__BYTE_ORDER__) || !defined(__ORDER_LITTLE_ENDIAN__) || \
@@ -141,6 +140,6 @@ Endian<__ORDER_BIG_ENDIAN__>::to_little_endian<uint64_t>(uint64_t v) {
using Endian = internal::Endian<__BYTE_ORDER__>;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_ENDIAN_H
diff --git a/libc/src/__support/error_or.h b/libc/src/__support/error_or.h
index 3faaddde6cd32..34c652dd878c2 100644
--- a/libc/src/__support/error_or.h
+++ b/libc/src/__support/error_or.h
@@ -10,9 +10,8 @@
#define LLVM_LIBC_SRC___SUPPORT_ERROR_OR_H
#include "src/__support/CPP/expected.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <class T> using ErrorOr = cpp::expected<T, int>;
@@ -35,6 +34,6 @@ using Error = cpp::unexpected<int>;
// constexpr operator T() { return value; }
// };
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_ERROR_OR_H
diff --git a/libc/src/__support/fixed_point/fx_bits.h b/libc/src/__support/fixed_point/fx_bits.h
index 0a4c21fb6a14f..53e693d4ddfd1 100644
--- a/libc/src/__support/fixed_point/fx_bits.h
+++ b/libc/src/__support/fixed_point/fx_bits.h
@@ -13,7 +13,6 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/math_extras.h"
@@ -21,8 +20,7 @@
#ifdef LIBC_COMPILER_HAS_FIXED_POINT
-namespace LIBC_NAMESPACE_DECL {
-namespace fixed_point {
+namespace LIBC_NAMESPACE::fixed_point {
template <typename T> struct FXBits {
private:
@@ -163,8 +161,7 @@ template <typename T> LIBC_INLINE constexpr T round(T x, int n) {
return bit_and((x + round_bit), rounding_mask);
}
-} // namespace fixed_point
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fixed_point
#endif // LIBC_COMPILER_HAS_FIXED_POINT
diff --git a/libc/src/__support/fixed_point/fx_rep.h b/libc/src/__support/fixed_point/fx_rep.h
index 186938947694e..f13640a6c0191 100644
--- a/libc/src/__support/fixed_point/fx_rep.h
+++ b/libc/src/__support/fixed_point/fx_rep.h
@@ -12,14 +12,12 @@
#include "include/llvm-libc-macros/stdfix-macros.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE, LIBC_INLINE_VAR
-#include "src/__support/macros/config.h"
#include <stdint.h>
#ifdef LIBC_COMPILER_HAS_FIXED_POINT
-namespace LIBC_NAMESPACE_DECL {
-namespace fixed_point {
+namespace LIBC_NAMESPACE::fixed_point {
namespace internal {
@@ -295,8 +293,7 @@ template <> struct FXRep<unsigned sat accum> : FXRep<unsigned accum> {};
template <>
struct FXRep<unsigned long sat accum> : FXRep<unsigned long accum> {};
-} // namespace fixed_point
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fixed_point
#endif // LIBC_COMPILER_HAS_FIXED_POINT
diff --git a/libc/src/__support/fixed_point/sqrt.h b/libc/src/__support/fixed_point/sqrt.h
index b77319debeeaf..982e318e2d1e3 100644
--- a/libc/src/__support/fixed_point/sqrt.h
+++ b/libc/src/__support/fixed_point/sqrt.h
@@ -14,15 +14,13 @@
#include "src/__support/CPP/limits.h" // CHAR_BIT
#include "src/__support/CPP/type_traits.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "fx_rep.h"
#ifdef LIBC_COMPILER_HAS_FIXED_POINT
-namespace LIBC_NAMESPACE_DECL {
-namespace fixed_point {
+namespace LIBC_NAMESPACE::fixed_point {
namespace internal {
@@ -261,8 +259,7 @@ isqrt_fast(T x) {
return cpp::bit_cast<OutType>(r);
}
-} // namespace fixed_point
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::fixed_point
#endif // LIBC_COMPILER_HAS_FIXED_POINT
diff --git a/libc/src/__support/fixedvector.h b/libc/src/__support/fixedvector.h
index 7ac0c230f9c53..5161c0d7a533c 100644
--- a/libc/src/__support/fixedvector.h
+++ b/libc/src/__support/fixedvector.h
@@ -12,9 +12,8 @@
#include "src/__support/CPP/array.h"
#include "src/__support/CPP/iterator.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// A fixed size data store backed by an underlying cpp::array data structure. It
// supports vector like API but is not resizable like a vector.
@@ -98,6 +97,6 @@ template <typename T, size_t CAPACITY> class FixedVector {
}
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FIXEDVECTOR_H
diff --git a/libc/src/__support/float_to_string.h b/libc/src/__support/float_to_string.h
index c4c7a15179f95..09b13324f25bb 100644
--- a/libc/src/__support/float_to_string.h
+++ b/libc/src/__support/float_to_string.h
@@ -19,7 +19,6 @@
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
// This file has 5 compile-time flags to allow the user to configure the float
// to string behavior. These were used to explore tradeoffs during the design
@@ -106,7 +105,7 @@ constexpr size_t MID_INT_SIZE = 192;
// Any block that is all 9s adds one to the max block counter and doesn't clear
// the buffer because they can cause the block above them to be rounded up.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using BlockInt = uint32_t;
constexpr uint32_t BLOCK_SIZE = 9;
@@ -840,6 +839,6 @@ template <> class FloatToString<long double> {
#endif // !LIBC_TYPES_LONG_DOUBLE_IS_FLOAT64 &&
// !LIBC_COPT_FLOAT_TO_STR_NO_SPECIALIZE_LD
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FLOAT_TO_STRING_H
diff --git a/libc/src/__support/freelist.h b/libc/src/__support/freelist.h
index a54cf953fe7ab..b2eb84a85dbce 100644
--- a/libc/src/__support/freelist.h
+++ b/libc/src/__support/freelist.h
@@ -14,9 +14,8 @@
#include "src/__support/CPP/new.h"
#include "src/__support/CPP/span.h"
#include "src/__support/fixedvector.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using cpp::span;
@@ -204,6 +203,6 @@ FreeList<NUM_BUCKETS>::find_chunk_ptr_for_size(size_t size,
return chunk_ptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FREELIST_H
diff --git a/libc/src/__support/freelist_heap.h b/libc/src/__support/freelist_heap.h
index ce4f14b431585..3d0db544c4af0 100644
--- a/libc/src/__support/freelist_heap.h
+++ b/libc/src/__support/freelist_heap.h
@@ -16,11 +16,10 @@
#include "src/__support/CPP/optional.h"
#include "src/__support/CPP/span.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "src/string/memory_utils/inline_memset.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using cpp::optional;
using cpp::span;
@@ -259,6 +258,6 @@ void *FreeListHeap<NUM_BUCKETS>::calloc(size_t num, size_t size) {
extern FreeListHeap<> *freelist_heap;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_FREELIST_HEAP_H
diff --git a/libc/src/__support/hash.h b/libc/src/__support/hash.h
index 527c83993fd59..d1218fdc25927 100644
--- a/libc/src/__support/hash.h
+++ b/libc/src/__support/hash.h
@@ -12,11 +12,10 @@
#include "src/__support/CPP/bit.h" // rotl
#include "src/__support/CPP/limits.h" // numeric_limits
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/uint128.h" // UInt128
#include <stdint.h> // For uint64_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// Folded multiplication.
@@ -161,6 +160,6 @@ class HashState {
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_HASH_H
diff --git a/libc/src/__support/high_precision_decimal.h b/libc/src/__support/high_precision_decimal.h
index 3e397574d4cbb..6a22554165014 100644
--- a/libc/src/__support/high_precision_decimal.h
+++ b/libc/src/__support/high_precision_decimal.h
@@ -11,11 +11,10 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
struct LShiftTableEntry {
@@ -423,6 +422,6 @@ class HighPrecisionDecimal {
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_HIGH_PRECISION_DECIMAL_H
diff --git a/libc/src/__support/integer_literals.h b/libc/src/__support/integer_literals.h
index af3da1c443d7b..5fb67464090ce 100644
--- a/libc/src/__support/integer_literals.h
+++ b/libc/src/__support/integer_literals.h
@@ -15,12 +15,11 @@
#include "src/__support/CPP/limits.h" // CHAR_BIT
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/uint128.h" // UInt128
#include <stddef.h> // size_t
#include <stdint.h> // uintxx_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE constexpr uint8_t operator""_u8(unsigned long long value) {
return static_cast<uint8_t>(value);
@@ -183,6 +182,6 @@ template <typename T> LIBC_INLINE constexpr T parse_bigint(const char *ptr) {
return internal::parse_with_prefix<T>(ptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_INTEGER_LITERALS_H
diff --git a/libc/src/__support/integer_operations.h b/libc/src/__support/integer_operations.h
index 4ecff70a61752..390181f13b08b 100644
--- a/libc/src/__support/integer_operations.h
+++ b/libc/src/__support/integer_operations.h
@@ -11,9 +11,8 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename T>
LIBC_INLINE static constexpr cpp::enable_if_t<cpp::is_integral_v<T>, T>
@@ -28,6 +27,6 @@ integer_rem_quo(T x, T y, T ", T &rem) {
rem = x % y;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_INTEGER_OPERATIONS_H
diff --git a/libc/src/__support/integer_to_string.h b/libc/src/__support/integer_to_string.h
index 40d45a05ceadb..375f0e82960e3 100644
--- a/libc/src/__support/integer_to_string.h
+++ b/libc/src/__support/integer_to_string.h
@@ -69,9 +69,8 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/big_int.h" // make_integral_or_big_int_unsigned_t
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace details {
@@ -318,6 +317,6 @@ template <typename T, typename Fmt = radix::Dec> class IntegerToString {
}
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_INTEGER_TO_STRING_H
diff --git a/libc/src/__support/intrusive_list.h b/libc/src/__support/intrusive_list.h
index 4bbd8a41abd65..69be877777f78 100644
--- a/libc/src/__support/intrusive_list.h
+++ b/libc/src/__support/intrusive_list.h
@@ -14,9 +14,8 @@
#define LLVM_LIBC_SRC___SUPPORT_INTRUSIVE_LIST_H
#include "common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
class IntrusiveList {
@@ -61,6 +60,6 @@ class IntrusiveList {
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_INTRUSIVE_LIST_H
diff --git a/libc/src/__support/libc_assert.h b/libc/src/__support/libc_assert.h
index e3235199780c2..ed06cc329809f 100644
--- a/libc/src/__support/libc_assert.h
+++ b/libc/src/__support/libc_assert.h
@@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_LIBC_ASSERT_H
#define LLVM_LIBC_SRC___SUPPORT_LIBC_ASSERT_H
-#include "src/__support/macros/config.h"
#ifdef LIBC_COPT_USE_C_ASSERT
// The build is configured to just use the public <assert.h> API
@@ -26,7 +25,7 @@
#include "src/__support/integer_to_string.h"
#include "src/__support/macros/attributes.h" // For LIBC_INLINE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This is intended to be removed in a future patch to use a similar design to
// below, but it's necessary for the external assert.
@@ -44,7 +43,7 @@ LIBC_INLINE void report_assertion_failure(const char *assertion,
write_to_stderr("'\n");
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#ifdef LIBC_ASSERT
#error "Unexpected: LIBC_ASSERT macro already defined"
diff --git a/libc/src/__support/macros/config.h b/libc/src/__support/macros/config.h
index 8b1263e08249c..2ab0fba095e6b 100644
--- a/libc/src/__support/macros/config.h
+++ b/libc/src/__support/macros/config.h
@@ -15,7 +15,6 @@
// Workaround for compilers that do not support builtin detection.
// FIXME: This is only required for the GPU portion which should be moved.
-#include "src/__support/macros/config.h"
#ifndef __has_builtin
#define __has_builtin(b) 0
#endif
diff --git a/libc/src/__support/macros/optimization.h b/libc/src/__support/macros/optimization.h
index 5ffd474d35c54..05a47791deed8 100644
--- a/libc/src/__support/macros/optimization.h
+++ b/libc/src/__support/macros/optimization.h
@@ -11,19 +11,16 @@
#define LLVM_LIBC_SRC___SUPPORT_MACROS_OPTIMIZATION_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/compiler.h" // LIBC_COMPILER_IS_CLANG
// We use a template to implement likely/unlikely to make sure that we don't
// accidentally pass an integer.
-namespace LIBC_NAMESPACE_DECL {
-namespace details {
+namespace LIBC_NAMESPACE::details {
template <typename T>
LIBC_INLINE constexpr bool expects_bool_condition(T value, T expected) {
return __builtin_expect(value, expected);
}
-} // namespace details
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::details
#define LIBC_LIKELY(x) LIBC_NAMESPACE::details::expects_bool_condition(x, true)
#define LIBC_UNLIKELY(x) \
LIBC_NAMESPACE::details::expects_bool_condition(x, false)
diff --git a/libc/src/__support/math_extras.h b/libc/src/__support/math_extras.h
index 6f4a006aad270..4bd8719574068 100644
--- a/libc/src/__support/math_extras.h
+++ b/libc/src/__support/math_extras.h
@@ -14,9 +14,8 @@
#include "src/__support/CPP/limits.h" // CHAR_BIT, numeric_limits
#include "src/__support/CPP/type_traits.h" // is_unsigned_v, is_constant_evaluated
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Create a bitmask with the count right-most bits set to 1, and all other bits
// set to 0. Only unsigned types are allowed.
@@ -156,6 +155,6 @@ count_zeros(T value) {
return cpp::popcount<T>(static_cast<T>(~value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_MATH_EXTRAS_H
diff --git a/libc/src/__support/memory_size.h b/libc/src/__support/memory_size.h
index cdd6a10222de1..491123bbabf30 100644
--- a/libc/src/__support/memory_size.h
+++ b/libc/src/__support/memory_size.h
@@ -13,11 +13,10 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/string/memory_utils/utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
template <class T> LIBC_INLINE bool mul_overflow(T a, T b, T *res) {
#if __has_builtin(__builtin_mul_overflow)
@@ -86,6 +85,6 @@ class SafeMemSize {
}
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_MEMORY_SIZE_H
diff --git a/libc/src/__support/number_pair.h b/libc/src/__support/number_pair.h
index f5e877406d8f3..2f713fc03520f 100644
--- a/libc/src/__support/number_pair.h
+++ b/libc/src/__support/number_pair.h
@@ -10,17 +10,16 @@
#define LLVM_LIBC_SRC___SUPPORT_NUMBER_PAIR_H
#include "CPP/type_traits.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename T> struct NumberPair {
T lo = T(0);
T hi = T(0);
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_NUMBER_PAIR_H
diff --git a/libc/src/__support/str_to_float.h b/libc/src/__support/str_to_float.h
index c72bc1f957dc3..fa466ca8492fc 100644
--- a/libc/src/__support/str_to_float.h
+++ b/libc/src/__support/str_to_float.h
@@ -21,13 +21,12 @@
#include "src/__support/ctype_utils.h"
#include "src/__support/detailed_powers_of_ten.h"
#include "src/__support/high_precision_decimal.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/__support/str_to_num_result.h"
#include "src/__support/uint128.h"
#include "src/errno/libc_errno.h" // For ERANGE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
template <class T> struct ExpandedFloat {
@@ -1227,6 +1226,6 @@ template <class T> LIBC_INLINE StrToNumResult<T> strtonan(const char *arg) {
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STR_TO_FLOAT_H
diff --git a/libc/src/__support/str_to_integer.h b/libc/src/__support/str_to_integer.h
index 1f80229a9eff4..6db851ab0e65a 100644
--- a/libc/src/__support/str_to_integer.h
+++ b/libc/src/__support/str_to_integer.h
@@ -13,12 +13,11 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_num_result.h"
#include "src/__support/uint128.h"
#include "src/errno/libc_errno.h" // For ERANGE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// Returns a pointer to the first character in src that is not a whitespace
@@ -165,6 +164,6 @@ strtointeger(const char *__restrict src, int base,
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STR_TO_INTEGER_H
diff --git a/libc/src/__support/str_to_num_result.h b/libc/src/__support/str_to_num_result.h
index 6d361357cac2a..b32fbdeeb580f 100644
--- a/libc/src/__support/str_to_num_result.h
+++ b/libc/src/__support/str_to_num_result.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC___SUPPORT_STR_TO_NUM_RESULT_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename T> struct StrToNumResult {
T value;
@@ -32,6 +31,6 @@ template <typename T> struct StrToNumResult {
LIBC_INLINE constexpr operator T() { return value; }
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_STR_TO_NUM_RESULT_H
diff --git a/libc/src/__support/threads/CndVar.h b/libc/src/__support/threads/CndVar.h
index e42fa145faeaf..55f6e02b354cb 100644
--- a/libc/src/__support/threads/CndVar.h
+++ b/libc/src/__support/threads/CndVar.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC___SUPPORT_SRC_THREADS_LINUX_CNDVAR_H
#define LLVM_LIBC___SUPPORT_SRC_THREADS_LINUX_CNDVAR_H
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/futex_utils.h" // Futex
#include "src/__support/threads/linux/raw_mutex.h" // RawMutex
#include "src/__support/threads/mutex.h" // Mutex
#include <stdint.h> // uint32_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
class CndVar {
enum CndWaiterStatus : uint32_t {
@@ -50,6 +49,6 @@ class CndVar {
void broadcast();
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_CNDVAR_H
diff --git a/libc/src/__support/threads/callonce.h b/libc/src/__support/threads/callonce.h
index 5392722045c94..67f4c99657107 100644
--- a/libc/src/__support/threads/callonce.h
+++ b/libc/src/__support/threads/callonce.h
@@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_THREADS_CALLONCE_H
#define LLVM_LIBC_SRC___SUPPORT_THREADS_CALLONCE_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_LIKELY
// Plaform specific routines, provides:
@@ -22,7 +21,7 @@
#error "callonce is not supported on this platform"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Common definitions
using CallOnceCallback = void(void);
@@ -36,6 +35,6 @@ LIBC_INLINE int callonce(CallOnceFlag *flag, CallOnceCallback *callback) {
return callonce_impl::callonce_slowpath(flag, callback);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_CALLONCE_H
diff --git a/libc/src/__support/threads/fork_callbacks.cpp b/libc/src/__support/threads/fork_callbacks.cpp
index b050b1712f4aa..385a2bcb58168 100644
--- a/libc/src/__support/threads/fork_callbacks.cpp
+++ b/libc/src/__support/threads/fork_callbacks.cpp
@@ -9,12 +9,11 @@
#include "fork_callbacks.h"
#include "src/__support/CPP/mutex.h" // lock_guard
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <stddef.h> // For size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -92,4 +91,4 @@ void invoke_prepare_callbacks() { cb_manager.invoke_prepare(); }
void invoke_parent_callbacks() { cb_manager.invoke_parent(); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/threads/fork_callbacks.h b/libc/src/__support/threads/fork_callbacks.h
index 2a06a4a91892d..57a4f8228c5fb 100644
--- a/libc/src/__support/threads/fork_callbacks.h
+++ b/libc/src/__support/threads/fork_callbacks.h
@@ -9,9 +9,7 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_THREADS_FORK_CALLBACKS_H
#define LLVM_LIBC_SRC___SUPPORT_THREADS_FORK_CALLBACKS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using ForkCallback = void(void);
@@ -21,6 +19,6 @@ void invoke_prepare_callbacks();
void invoke_parent_callbacks();
void invoke_child_callbacks();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_FORK_CALLBACKS_H
diff --git a/libc/src/__support/threads/gpu/mutex.h b/libc/src/__support/threads/gpu/mutex.h
index c8c484ed2b794..9554083679335 100644
--- a/libc/src/__support/threads/gpu/mutex.h
+++ b/libc/src/__support/threads/gpu/mutex.h
@@ -10,10 +10,9 @@
#define LLVM_LIBC_SRC___SUPPORT_THREADS_GPU_MUTEX_H
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex_common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
/// Implementation of a simple passthrough mutex which guards nothing. A
/// complete Mutex locks in general cannot be implemented on the GPU. We simply
@@ -27,6 +26,6 @@ struct Mutex {
LIBC_INLINE MutexError reset() { return MutexError::NONE; }
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_GPU_MUTEX_H
diff --git a/libc/src/__support/threads/linux/CndVar.cpp b/libc/src/__support/threads/linux/CndVar.cpp
index be74c18dddf31..03125323477a2 100644
--- a/libc/src/__support/threads/linux/CndVar.cpp
+++ b/libc/src/__support/threads/linux/CndVar.cpp
@@ -9,14 +9,13 @@
#include "src/__support/threads/CndVar.h"
#include "src/__support/CPP/mutex.h"
#include "src/__support/OSUtil/syscall.h" // syscall_impl
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/futex_word.h" // FutexWordType
#include "src/__support/threads/linux/raw_mutex.h" // RawMutex
#include "src/__support/threads/mutex.h" // Mutex
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int CndVar::wait(Mutex *m) {
// The goal is to perform "unlock |m| and wait" in an
@@ -103,4 +102,4 @@ void CndVar::broadcast() {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/threads/linux/callonce.cpp b/libc/src/__support/threads/linux/callonce.cpp
index c6e5f2aba69fc..24d376f447fba 100644
--- a/libc/src/__support/threads/linux/callonce.cpp
+++ b/libc/src/__support/threads/linux/callonce.cpp
@@ -7,11 +7,10 @@
//===----------------------------------------------------------------------===//
#include "src/__support/threads/callonce.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/callonce.h"
#include "src/__support/threads/linux/futex_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace callonce_impl {
int callonce_slowpath(CallOnceFlag *flag, CallOnceCallback *func) {
auto *futex_word = reinterpret_cast<Futex *>(flag);
@@ -37,4 +36,4 @@ int callonce_slowpath(CallOnceFlag *flag, CallOnceCallback *func) {
return 0;
}
} // namespace callonce_impl
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/threads/linux/callonce.h b/libc/src/__support/threads/linux/callonce.h
index b3ea3a5b1c679..315cc6149e9ec 100644
--- a/libc/src/__support/threads/linux/callonce.h
+++ b/libc/src/__support/threads/linux/callonce.h
@@ -8,10 +8,9 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_CALLONCE_H
#define LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_CALLONCE_H
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/futex_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using CallOnceFlag = Futex;
namespace callonce_impl {
@@ -28,5 +27,5 @@ LIBC_INLINE bool callonce_fastpath(CallOnceFlag *flag) {
}
} // namespace callonce_impl
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_CALLONCE_H
diff --git a/libc/src/__support/threads/linux/futex_utils.h b/libc/src/__support/threads/linux/futex_utils.h
index 943a99ab38c8c..e40ade8e709b1 100644
--- a/libc/src/__support/threads/linux/futex_utils.h
+++ b/libc/src/__support/threads/linux/futex_utils.h
@@ -14,13 +14,12 @@
#include "src/__support/CPP/optional.h"
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/futex_word.h"
#include "src/__support/time/linux/abs_timeout.h"
#include <linux/errno.h>
#include <linux/futex.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
class Futex : public cpp::Atomic<FutexWordType> {
public:
using Timeout = internal::AbsTimeout;
@@ -83,6 +82,6 @@ class Futex : public cpp::Atomic<FutexWordType> {
static_assert(__is_standard_layout(Futex),
"Futex must be a standard layout type.");
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_FUTEX_UTILS_H
diff --git a/libc/src/__support/threads/linux/futex_word.h b/libc/src/__support/threads/linux/futex_word.h
index a5a6a0c110cae..acdd33bcdaafa 100644
--- a/libc/src/__support/threads/linux/futex_word.h
+++ b/libc/src/__support/threads/linux/futex_word.h
@@ -9,10 +9,9 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_FUTEX_WORD_H
#define LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_FUTEX_WORD_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Futexes are 32 bits in size on all platforms, including 64-bit platforms.
using FutexWordType = uint32_t;
@@ -25,6 +24,6 @@ constexpr auto FUTEX_SYSCALL_ID = SYS_futex_time64;
#error "futex and futex_time64 syscalls not available."
#endif
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_FUTEX_WORD_H
diff --git a/libc/src/__support/threads/linux/mutex.h b/libc/src/__support/threads/linux/mutex.h
index 0c4b1ae09af6f..79506d7e6911a 100644
--- a/libc/src/__support/threads/linux/mutex.h
+++ b/libc/src/__support/threads/linux/mutex.h
@@ -12,12 +12,11 @@
#include "hdr/types/pid_t.h"
#include "src/__support/CPP/optional.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/futex_utils.h"
#include "src/__support/threads/linux/raw_mutex.h"
#include "src/__support/threads/mutex_common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: support shared/recursive/robust mutexes.
class Mutex final : private RawMutex {
@@ -85,6 +84,6 @@ class Mutex final : private RawMutex {
}
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_MUTEX_H
diff --git a/libc/src/__support/threads/linux/raw_mutex.h b/libc/src/__support/threads/linux/raw_mutex.h
index 2bc302f49762c..75bd4bdfb6212 100644
--- a/libc/src/__support/threads/linux/raw_mutex.h
+++ b/libc/src/__support/threads/linux/raw_mutex.h
@@ -12,7 +12,6 @@
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/futex_utils.h"
#include "src/__support/threads/linux/futex_word.h"
#include "src/__support/threads/sleep.h"
@@ -33,7 +32,7 @@
"LIBC_COPT_RAW_MUTEX_DEFAULT_SPIN_COUNT is not defined, defaulting to 100"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Lock is a simple timable lock for internal usage.
// This is separated from Mutex because this one does not need to consider
// robustness and reentrancy. Also, this one has spin optimization for shorter
@@ -126,6 +125,6 @@ class RawMutex {
LIBC_INLINE Futex &get_raw_futex() { return futex; }
LIBC_INLINE void reset() { futex = UNLOCKED; }
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_RAW_MUTEX_H
diff --git a/libc/src/__support/threads/linux/rwlock.h b/libc/src/__support/threads/linux/rwlock.h
index d2fb0ce1a3c08..201fe92c37fc0 100644
--- a/libc/src/__support/threads/linux/rwlock.h
+++ b/libc/src/__support/threads/linux/rwlock.h
@@ -17,7 +17,6 @@
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/__support/threads/linux/futex_utils.h"
#include "src/__support/threads/linux/futex_word.h"
@@ -37,7 +36,7 @@
#include "src/__support/time/linux/monotonicity.h"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Forward declaration of the RwLock class.
class RwLock;
// A namespace to rwlock specific utilities.
@@ -554,6 +553,6 @@ class RwLock {
return LockResult::Success;
}
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SUPPORT_THREADS_LINUX_RWLOCK_H
diff --git a/libc/src/__support/threads/linux/thread.cpp b/libc/src/__support/threads/linux/thread.cpp
index 36b4a88eba9b4..1d986ff38cfff 100644
--- a/libc/src/__support/threads/linux/thread.cpp
+++ b/libc/src/__support/threads/linux/thread.cpp
@@ -14,7 +14,6 @@
#include "src/__support/OSUtil/syscall.h" // For syscall functions.
#include "src/__support/common.h"
#include "src/__support/error_or.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/futex_utils.h" // For FutexWordType
#include "src/errno/libc_errno.h" // For error macros
@@ -30,7 +29,7 @@
#include <sys/mman.h> // For PROT_* and MAP_* definitions.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#ifdef SYS_mmap2
static constexpr long MMAP_SYSCALL_NUMBER = SYS_mmap2;
@@ -518,4 +517,4 @@ void thread_exit(ThreadReturnValue retval, ThreadStyle style) {
__builtin_unreachable();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/threads/mutex_common.h b/libc/src/__support/threads/mutex_common.h
index 9913f69a6a61a..ad8d0025eba69 100644
--- a/libc/src/__support/threads/mutex_common.h
+++ b/libc/src/__support/threads/mutex_common.h
@@ -9,9 +9,7 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_THREADS_MUTEX_COMMON_H
#define LLVM_LIBC_SRC___SUPPORT_THREADS_MUTEX_COMMON_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
enum class MutexError : int {
NONE,
@@ -21,6 +19,6 @@ enum class MutexError : int {
BAD_LOCK_STATE,
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_MUTEX_COMMON_H
diff --git a/libc/src/__support/threads/sleep.h b/libc/src/__support/threads/sleep.h
index 777283356b58e..6433bc3badd50 100644
--- a/libc/src/__support/threads/sleep.h
+++ b/libc/src/__support/threads/sleep.h
@@ -10,9 +10,8 @@
#define LLVM_LIBC_SRC___SUPPORT_THREADS_SLEEP_H
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
/// Suspend the thread briefly to assist the thread scheduler during busy loops.
LIBC_INLINE void sleep_briefly() {
@@ -32,6 +31,6 @@ LIBC_INLINE void sleep_briefly() {
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_SLEEP_H
diff --git a/libc/src/__support/threads/thread.cpp b/libc/src/__support/threads/thread.cpp
index 886281e0d50f7..d7bedb8ca67d0 100644
--- a/libc/src/__support/threads/thread.cpp
+++ b/libc/src/__support/threads/thread.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/__support/threads/thread.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include "src/__support/CPP/array.h"
@@ -16,7 +15,7 @@
#include "src/__support/fixedvector.h"
#include "src/__support/macros/attributes.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_THREAD_LOCAL Thread self;
@@ -189,4 +188,4 @@ void *get_tss_value(unsigned int key) {
return u.payload;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/threads/thread.h b/libc/src/__support/threads/thread.h
index ce23a880e048a..f89c687eeaa19 100644
--- a/libc/src/__support/threads/thread.h
+++ b/libc/src/__support/threads/thread.h
@@ -14,7 +14,6 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/CPP/stringstream.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include <linux/param.h> // for exec_pagesize.
@@ -22,7 +21,7 @@
#include <stddef.h> // For size_t
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using ThreadRunnerPosix = void *(void *);
using ThreadRunnerStdc = int(void *);
@@ -251,6 +250,6 @@ void call_atexit_callbacks(ThreadAttributes *attrib);
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_THREAD_H
diff --git a/libc/src/__support/time/linux/abs_timeout.h b/libc/src/__support/time/linux/abs_timeout.h
index 37e602672208f..0097f8abc4ee9 100644
--- a/libc/src/__support/time/linux/abs_timeout.h
+++ b/libc/src/__support/time/linux/abs_timeout.h
@@ -12,10 +12,9 @@
#include "hdr/time_macros.h"
#include "hdr/types/struct_timespec.h"
#include "src/__support/CPP/expected.h"
-#include "src/__support/macros/config.h"
#include "src/__support/time/units.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// We use AbsTimeout to remind ourselves that the timeout is an absolute time.
// This is a simple wrapper around the timespec struct that also keeps track of
@@ -45,6 +44,6 @@ class AbsTimeout {
}
};
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_ABS_TIMEOUT_H
diff --git a/libc/src/__support/time/linux/clock_conversion.h b/libc/src/__support/time/linux/clock_conversion.h
index 7a52873263a14..4a7c8ff284849 100644
--- a/libc/src/__support/time/linux/clock_conversion.h
+++ b/libc/src/__support/time/linux/clock_conversion.h
@@ -9,11 +9,10 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_CLOCK_CONVERSION_H
#define LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_CLOCK_CONVERSION_H
-#include "src/__support/macros/config.h"
#include "src/__support/time/linux/clock_gettime.h"
#include "src/__support/time/units.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
LIBC_INLINE timespec convert_clock(timespec input, clockid_t from,
@@ -38,6 +37,6 @@ LIBC_INLINE timespec convert_clock(timespec input, clockid_t from,
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_CLOCK_CONVERSION_H
diff --git a/libc/src/__support/time/linux/clock_gettime.h b/libc/src/__support/time/linux/clock_gettime.h
index eca1ba70de592..bbdde98551abe 100644
--- a/libc/src/__support/time/linux/clock_gettime.h
+++ b/libc/src/__support/time/linux/clock_gettime.h
@@ -14,10 +14,9 @@
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/common.h"
#include "src/__support/error_or.h"
-#include "src/__support/macros/config.h"
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
LIBC_INLINE ErrorOr<int> clock_gettime(clockid_t clockid, timespec *ts) {
#if SYS_clock_gettime
@@ -40,6 +39,6 @@ LIBC_INLINE ErrorOr<int> clock_gettime(clockid_t clockid, timespec *ts) {
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_CLOCK_GETTIME_H
diff --git a/libc/src/__support/time/linux/monotonicity.h b/libc/src/__support/time/linux/monotonicity.h
index c7234db2e64c4..e413275430dd1 100644
--- a/libc/src/__support/time/linux/monotonicity.h
+++ b/libc/src/__support/time/linux/monotonicity.h
@@ -11,10 +11,9 @@
#include "hdr/time_macros.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/__support/time/linux/abs_timeout.h"
#include "src/__support/time/linux/clock_conversion.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// This function is separated from abs_timeout.
// This function pulls in the dependency to clock_conversion.h,
@@ -39,6 +38,6 @@ LIBC_INLINE void ensure_monotonicity(AbsTimeout &timeout) {
}
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_MONOTONICITY_H
diff --git a/libc/src/__support/time/units.h b/libc/src/__support/time/units.h
index ff951992610a7..ee74af70efdfc 100644
--- a/libc/src/__support/time/units.h
+++ b/libc/src/__support/time/units.h
@@ -11,9 +11,8 @@
#include "hdr/types/time_t.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace time_units {
LIBC_INLINE constexpr time_t operator""_s_ns(unsigned long long s) {
return static_cast<time_t>(s * 1'000'000'000);
@@ -34,6 +33,6 @@ LIBC_INLINE constexpr time_t operator""_us_ns(unsigned long long us) {
return static_cast<time_t>(us * 1'000);
}
} // namespace time_units
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_TIME_UNITS_H
diff --git a/libc/src/__support/wctype_utils.h b/libc/src/__support/wctype_utils.h
index 469d81250b535..aa1161c777453 100644
--- a/libc/src/__support/wctype_utils.h
+++ b/libc/src/__support/wctype_utils.h
@@ -11,13 +11,12 @@
#include "src/__support/CPP/optional.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#define __need_wint_t
#define __need_wchar_t
#include <stddef.h> // needed for wint_t and wchar_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// ------------------------------------------------------
@@ -45,6 +44,6 @@ LIBC_INLINE cpp::optional<wint_t> btowc(int c) {
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC___SUPPORT_WCTYPE_UTILS_H
diff --git a/libc/src/assert/__assert_fail.h b/libc/src/assert/__assert_fail.h
index bbc0aa8e2bf23..6b9dee2a4bf66 100644
--- a/libc/src/assert/__assert_fail.h
+++ b/libc/src/assert/__assert_fail.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_ASSERT___ASSERT_FAIL_H
#define LLVM_LIBC_SRC_ASSERT___ASSERT_FAIL_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[noreturn]] void __assert_fail(const char *assertion, const char *file,
unsigned line, const char *function);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_ASSERT___ASSERT_FAIL_H
diff --git a/libc/src/assert/generic/__assert_fail.cpp b/libc/src/assert/generic/__assert_fail.cpp
index 877336122eba2..4cf914bbe257f 100644
--- a/libc/src/assert/generic/__assert_fail.cpp
+++ b/libc/src/assert/generic/__assert_fail.cpp
@@ -9,10 +9,9 @@
#include "src/assert/__assert_fail.h"
#include "src/__support/OSUtil/io.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/abort.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, __assert_fail,
(const char *assertion, const char *file, unsigned line,
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(void, __assert_fail,
LIBC_NAMESPACE::abort();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/assert/gpu/__assert_fail.cpp b/libc/src/assert/gpu/__assert_fail.cpp
index 5b772426f28bc..7621c0803a00d 100644
--- a/libc/src/assert/gpu/__assert_fail.cpp
+++ b/libc/src/assert/gpu/__assert_fail.cpp
@@ -11,10 +11,9 @@
#include "src/__support/CPP/atomic.h"
#include "src/__support/GPU/utils.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/abort.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// A single-use lock to allow only a single thread to print the assertion.
static cpp::Atomic<uint32_t> lock = 0;
@@ -38,4 +37,4 @@ LLVM_LIBC_FUNCTION(void, __assert_fail,
LIBC_NAMESPACE::abort();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isalnum.cpp b/libc/src/ctype/isalnum.cpp
index 382553c23a6bf..42ed8ea475f10 100644
--- a/libc/src/ctype/isalnum.cpp
+++ b/libc/src/ctype/isalnum.cpp
@@ -10,9 +10,8 @@
#include "src/__support/ctype_utils.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, isalnum, (int c)) {
return static_cast<int>(internal::isalnum(static_cast<unsigned>(c)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isalnum.h b/libc/src/ctype/isalnum.h
index 6516f2ebc327d..71830c95cb2ff 100644
--- a/libc/src/ctype/isalnum.h
+++ b/libc/src/ctype/isalnum.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISALNUM_H
#define LLVM_LIBC_SRC_CTYPE_ISALNUM_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isalnum(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISALNUM_H
diff --git a/libc/src/ctype/isalpha.cpp b/libc/src/ctype/isalpha.cpp
index 1a63406780b6e..2b1bd0efc3b3a 100644
--- a/libc/src/ctype/isalpha.cpp
+++ b/libc/src/ctype/isalpha.cpp
@@ -10,9 +10,8 @@
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, isalpha, (int c)) {
return static_cast<int>(internal::isalpha(static_cast<unsigned>(c)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isalpha.h b/libc/src/ctype/isalpha.h
index a21c4592365c0..b5b07eecd6798 100644
--- a/libc/src/ctype/isalpha.h
+++ b/libc/src/ctype/isalpha.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISALPHA_H
#define LLVM_LIBC_SRC_CTYPE_ISALPHA_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isalpha(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISALPHA_H
diff --git a/libc/src/ctype/isascii.cpp b/libc/src/ctype/isascii.cpp
index ef3788d136e9d..8be3d7e205afe 100644
--- a/libc/src/ctype/isascii.cpp
+++ b/libc/src/ctype/isascii.cpp
@@ -9,12 +9,11 @@
#include "src/ctype/isascii.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, isascii, (int c)) {
return static_cast<int>((c & (~0x7f)) == 0);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isascii.h b/libc/src/ctype/isascii.h
index 20473a7a493f2..5a734a21bd1e5 100644
--- a/libc/src/ctype/isascii.h
+++ b/libc/src/ctype/isascii.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISASCII_H
#define LLVM_LIBC_SRC_CTYPE_ISASCII_H
-#include "src/__support/macros/config.h"
#undef isascii
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isascii(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISASCII_H
diff --git a/libc/src/ctype/isblank.cpp b/libc/src/ctype/isblank.cpp
index a4f33d265bd2d..9ac9d36580c7b 100644
--- a/libc/src/ctype/isblank.cpp
+++ b/libc/src/ctype/isblank.cpp
@@ -9,9 +9,8 @@
#include "src/ctype/isblank.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(int, isblank, (int c)) {
return static_cast<int>(c == ' ' || c == '\t');
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isblank.h b/libc/src/ctype/isblank.h
index 3fb69e8b620e8..4cacdb3d2a8d7 100644
--- a/libc/src/ctype/isblank.h
+++ b/libc/src/ctype/isblank.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISBLANK_H
#define LLVM_LIBC_SRC_CTYPE_ISBLANK_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isblank(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISBLANK_H
diff --git a/libc/src/ctype/iscntrl.cpp b/libc/src/ctype/iscntrl.cpp
index fb582fd6ef082..b52b86f1df291 100644
--- a/libc/src/ctype/iscntrl.cpp
+++ b/libc/src/ctype/iscntrl.cpp
@@ -9,9 +9,8 @@
#include "src/ctype/iscntrl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, iscntrl, (int c)) {
return static_cast<int>(ch < 0x20 || ch == 0x7f);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/iscntrl.h b/libc/src/ctype/iscntrl.h
index ac8e2eb6a93d4..e0cae0caa6b8d 100644
--- a/libc/src/ctype/iscntrl.h
+++ b/libc/src/ctype/iscntrl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISCNTRL_H
#define LLVM_LIBC_SRC_CTYPE_ISCNTRL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int iscntrl(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISCNTRL_H
diff --git a/libc/src/ctype/isdigit.cpp b/libc/src/ctype/isdigit.cpp
index 43c5f1940c7f0..d4d5d1f20f3fb 100644
--- a/libc/src/ctype/isdigit.cpp
+++ b/libc/src/ctype/isdigit.cpp
@@ -9,9 +9,8 @@
#include "src/ctype/isdigit.h"
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(int, isdigit, (int c)) {
return static_cast<int>(internal::isdigit(static_cast<unsigned>(c)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isdigit.h b/libc/src/ctype/isdigit.h
index ca8242d5c3018..a024cf464b52a 100644
--- a/libc/src/ctype/isdigit.h
+++ b/libc/src/ctype/isdigit.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISDIGIT_H
#define LLVM_LIBC_SRC_CTYPE_ISDIGIT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isdigit(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISDIGIT_H
diff --git a/libc/src/ctype/isgraph.cpp b/libc/src/ctype/isgraph.cpp
index a5b6e501b5813..e195f9fcbf48c 100644
--- a/libc/src/ctype/isgraph.cpp
+++ b/libc/src/ctype/isgraph.cpp
@@ -10,9 +10,8 @@
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, isgraph, (int c)) {
return static_cast<int>(internal::isgraph(static_cast<unsigned>(c)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isgraph.h b/libc/src/ctype/isgraph.h
index bc9ab7dc9954c..486c32d10a11a 100644
--- a/libc/src/ctype/isgraph.h
+++ b/libc/src/ctype/isgraph.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISGRAPH_H
#define LLVM_LIBC_SRC_CTYPE_ISGRAPH_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isgraph(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISGRAPH_H
diff --git a/libc/src/ctype/islower.cpp b/libc/src/ctype/islower.cpp
index 61ccbcc1db413..bd252e5e6efd1 100644
--- a/libc/src/ctype/islower.cpp
+++ b/libc/src/ctype/islower.cpp
@@ -10,9 +10,8 @@
#include "src/__support/ctype_utils.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, islower, (int c)) {
return static_cast<int>(internal::islower(static_cast<unsigned>(c)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/islower.h b/libc/src/ctype/islower.h
index f279dc7d14c1b..dc59ce9cea438 100644
--- a/libc/src/ctype/islower.h
+++ b/libc/src/ctype/islower.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISLOWER_H
#define LLVM_LIBC_SRC_CTYPE_ISLOWER_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int islower(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISLOWER_H
diff --git a/libc/src/ctype/isprint.cpp b/libc/src/ctype/isprint.cpp
index 42ab9cc8d238a..bdf9d083b621b 100644
--- a/libc/src/ctype/isprint.cpp
+++ b/libc/src/ctype/isprint.cpp
@@ -9,9 +9,8 @@
#include "src/ctype/isprint.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, isprint, (int c)) {
return static_cast<int>((ch - ' ') < 95);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isprint.h b/libc/src/ctype/isprint.h
index 551e2eb006573..22c835b7987c0 100644
--- a/libc/src/ctype/isprint.h
+++ b/libc/src/ctype/isprint.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISPRINT_H
#define LLVM_LIBC_SRC_CTYPE_ISPRINT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isprint(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISPRINT_H
diff --git a/libc/src/ctype/ispunct.cpp b/libc/src/ctype/ispunct.cpp
index c1906e3acdd80..d355c19c426c6 100644
--- a/libc/src/ctype/ispunct.cpp
+++ b/libc/src/ctype/ispunct.cpp
@@ -10,9 +10,8 @@
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(int, ispunct, (int c)) {
return static_cast<int>(!internal::isalnum(ch) && internal::isgraph(ch));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/ispunct.h b/libc/src/ctype/ispunct.h
index 96775f4f68bac..7eaa83ac8ae5e 100644
--- a/libc/src/ctype/ispunct.h
+++ b/libc/src/ctype/ispunct.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISPUNCT_H
#define LLVM_LIBC_SRC_CTYPE_ISPUNCT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ispunct(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISPUNCT_H
diff --git a/libc/src/ctype/isspace.cpp b/libc/src/ctype/isspace.cpp
index f890849378784..8c09eda00bc43 100644
--- a/libc/src/ctype/isspace.cpp
+++ b/libc/src/ctype/isspace.cpp
@@ -10,9 +10,8 @@
#include "src/__support/ctype_utils.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, isspace, (int c)) {
return static_cast<int>(internal::isspace(static_cast<unsigned>(c)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isspace.h b/libc/src/ctype/isspace.h
index f76ae173c1be3..56b70579fad94 100644
--- a/libc/src/ctype/isspace.h
+++ b/libc/src/ctype/isspace.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISSPACE_H
#define LLVM_LIBC_SRC_CTYPE_ISSPACE_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isspace(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISSPACE_H
diff --git a/libc/src/ctype/isupper.cpp b/libc/src/ctype/isupper.cpp
index 8f929ea1a009e..b527e3ee53279 100644
--- a/libc/src/ctype/isupper.cpp
+++ b/libc/src/ctype/isupper.cpp
@@ -10,9 +10,8 @@
#include "src/__support/ctype_utils.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, isupper, (int c)) {
return static_cast<int>(internal::isupper(static_cast<unsigned>(c)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isupper.h b/libc/src/ctype/isupper.h
index 398f65376f0a0..8f5ce849f7961 100644
--- a/libc/src/ctype/isupper.h
+++ b/libc/src/ctype/isupper.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISUPPER_H
#define LLVM_LIBC_SRC_CTYPE_ISUPPER_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isupper(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISUPPER_H
diff --git a/libc/src/ctype/isxdigit.cpp b/libc/src/ctype/isxdigit.cpp
index 391c5c53cee1e..79152c95986c3 100644
--- a/libc/src/ctype/isxdigit.cpp
+++ b/libc/src/ctype/isxdigit.cpp
@@ -10,9 +10,8 @@
#include "src/__support/ctype_utils.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(int, isxdigit, (int c)) {
return static_cast<int>(internal::isdigit(ch) || (ch | 32) - 'a' < 6);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/isxdigit.h b/libc/src/ctype/isxdigit.h
index 8d0a0993dec8a..4966c320341e0 100644
--- a/libc/src/ctype/isxdigit.h
+++ b/libc/src/ctype/isxdigit.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_ISXDIGIT_H
#define LLVM_LIBC_SRC_CTYPE_ISXDIGIT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isxdigit(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_ISXDIGIT_H
diff --git a/libc/src/ctype/toascii.cpp b/libc/src/ctype/toascii.cpp
index 53b26b5bdd6d6..06bf91b171906 100644
--- a/libc/src/ctype/toascii.cpp
+++ b/libc/src/ctype/toascii.cpp
@@ -9,10 +9,9 @@
#include "src/ctype/toascii.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, toascii, (int c)) { return (c & 0x7f); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/toascii.h b/libc/src/ctype/toascii.h
index d41e58521ee70..246580e23d5f6 100644
--- a/libc/src/ctype/toascii.h
+++ b/libc/src/ctype/toascii.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_TOASCII_H
#define LLVM_LIBC_SRC_CTYPE_TOASCII_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int toascii(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_TOASCII_H
diff --git a/libc/src/ctype/tolower.cpp b/libc/src/ctype/tolower.cpp
index e230428eef2b1..4e8b96dca078f 100644
--- a/libc/src/ctype/tolower.cpp
+++ b/libc/src/ctype/tolower.cpp
@@ -10,12 +10,11 @@
#include "src/__support/ctype_utils.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
LLVM_LIBC_FUNCTION(int, tolower, (int c)) { return internal::tolower(c); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/tolower.h b/libc/src/ctype/tolower.h
index d26d0b5f2f57c..8213da9319af1 100644
--- a/libc/src/ctype/tolower.h
+++ b/libc/src/ctype/tolower.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_TOLOWER_H
#define LLVM_LIBC_SRC_CTYPE_TOLOWER_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int tolower(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_TOLOWER_H
diff --git a/libc/src/ctype/toupper.cpp b/libc/src/ctype/toupper.cpp
index 97c1ac2c02b8c..7b0db35441035 100644
--- a/libc/src/ctype/toupper.cpp
+++ b/libc/src/ctype/toupper.cpp
@@ -10,9 +10,8 @@
#include "src/__support/ctype_utils.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Currently restricted to default locale.
// These should be extended using locale information.
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, toupper, (int c)) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/ctype/toupper.h b/libc/src/ctype/toupper.h
index 03016873ec3d7..b5d8890b2090d 100644
--- a/libc/src/ctype/toupper.h
+++ b/libc/src/ctype/toupper.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_CTYPE_TOUPPER_H
#define LLVM_LIBC_SRC_CTYPE_TOUPPER_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int toupper(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_CTYPE_TOUPPER_H
diff --git a/libc/src/dirent/closedir.cpp b/libc/src/dirent/closedir.cpp
index 1249ef94cf411..22c27c4c0f061 100644
--- a/libc/src/dirent/closedir.cpp
+++ b/libc/src/dirent/closedir.cpp
@@ -10,12 +10,11 @@
#include "src/__support/File/dir.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <dirent.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, closedir, (::DIR * dir)) {
auto *d = reinterpret_cast<LIBC_NAMESPACE::Dir *>(dir);
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, closedir, (::DIR * dir)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/dirent/closedir.h b/libc/src/dirent/closedir.h
index 14df5fe5f4748..6d6b898cfe1a9 100644
--- a/libc/src/dirent/closedir.h
+++ b/libc/src/dirent/closedir.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_DIRENT_CLOSEDIR_H
#define LLVM_LIBC_SRC_DIRENT_CLOSEDIR_H
-#include "src/__support/macros/config.h"
#include <dirent.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int closedir(::DIR *dir);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_DIRENT_CLOSEDIR_H
diff --git a/libc/src/dirent/dirfd.cpp b/libc/src/dirent/dirfd.cpp
index e60a62d4e1445..27995f6ef3c64 100644
--- a/libc/src/dirent/dirfd.cpp
+++ b/libc/src/dirent/dirfd.cpp
@@ -10,15 +10,14 @@
#include "src/__support/File/dir.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <dirent.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, dirfd, (::DIR * dir)) {
auto *d = reinterpret_cast<LIBC_NAMESPACE::Dir *>(dir);
return d->getfd();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/dirent/dirfd.h b/libc/src/dirent/dirfd.h
index ed037e2edfdd0..34acb01dd6118 100644
--- a/libc/src/dirent/dirfd.h
+++ b/libc/src/dirent/dirfd.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_DIRENT_DIRFD_H
#define LLVM_LIBC_SRC_DIRENT_DIRFD_H
-#include "src/__support/macros/config.h"
#include <dirent.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int dirfd(::DIR *dir);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_DIRENT_DIRFD_H
diff --git a/libc/src/dirent/opendir.cpp b/libc/src/dirent/opendir.cpp
index fee14ef0f558d..56f7bc8b574f0 100644
--- a/libc/src/dirent/opendir.cpp
+++ b/libc/src/dirent/opendir.cpp
@@ -10,12 +10,11 @@
#include "src/__support/File/dir.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <dirent.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(::DIR *, opendir, (const char *name)) {
auto dir = Dir::open(name);
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(::DIR *, opendir, (const char *name)) {
return reinterpret_cast<DIR *>(dir.value());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/dirent/opendir.h b/libc/src/dirent/opendir.h
index a9f33586f2e59..635cb9083d068 100644
--- a/libc/src/dirent/opendir.h
+++ b/libc/src/dirent/opendir.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_DIRENT_OPENDIR_H
#define LLVM_LIBC_SRC_DIRENT_OPENDIR_H
-#include "src/__support/macros/config.h"
#include <dirent.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
::DIR *opendir(const char *name);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_DIRENT_OPENDIR_H
diff --git a/libc/src/dirent/readdir.cpp b/libc/src/dirent/readdir.cpp
index ad460b5e80b8b..448935e3a4ab2 100644
--- a/libc/src/dirent/readdir.cpp
+++ b/libc/src/dirent/readdir.cpp
@@ -10,12 +10,11 @@
#include "src/__support/File/dir.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <dirent.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(struct ::dirent *, readdir, (::DIR * dir)) {
auto *d = reinterpret_cast<LIBC_NAMESPACE::Dir *>(dir);
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(struct ::dirent *, readdir, (::DIR * dir)) {
return dirent_val.value();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/dirent/readdir.h b/libc/src/dirent/readdir.h
index 2dcf5360ebd35..83c8c56e3f53b 100644
--- a/libc/src/dirent/readdir.h
+++ b/libc/src/dirent/readdir.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_DIRENT_READDIR_H
#define LLVM_LIBC_SRC_DIRENT_READDIR_H
-#include "src/__support/macros/config.h"
#include <dirent.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct ::dirent *readdir(DIR *dir);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_DIRENT_READDIR_H
diff --git a/libc/src/dlfcn/dlclose.cpp b/libc/src/dlfcn/dlclose.cpp
index e76eb74af681a..1f1bfabd79801 100644
--- a/libc/src/dlfcn/dlclose.cpp
+++ b/libc/src/dlfcn/dlclose.cpp
@@ -9,11 +9,10 @@
#include "dlclose.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO(@izaakschroeder): https://github.com/llvm/llvm-project/issues/97917
LLVM_LIBC_FUNCTION(int, dlclose, (void *)) { return -1; }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/dlfcn/dlclose.h b/libc/src/dlfcn/dlclose.h
index 4a9cb0091c467..27c0207d726e4 100644
--- a/libc/src/dlfcn/dlclose.h
+++ b/libc/src/dlfcn/dlclose.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_DLFCN_DLCLOSE_H
#define LLVM_LIBC_SRC_DLFCN_DLCLOSE_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int dlclose(void *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_DLFCN_DLCLOSE_H
diff --git a/libc/src/dlfcn/dlerror.cpp b/libc/src/dlfcn/dlerror.cpp
index cb2f2f50e2ef6..711b5a39420b6 100644
--- a/libc/src/dlfcn/dlerror.cpp
+++ b/libc/src/dlfcn/dlerror.cpp
@@ -9,13 +9,12 @@
#include "dlerror.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO(@izaakschroeder): https://github.com/llvm/llvm-project/issues/97918
LLVM_LIBC_FUNCTION(char *, dlerror, ()) {
return const_cast<char *>("unsupported");
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/dlfcn/dlerror.h b/libc/src/dlfcn/dlerror.h
index 79a2f6e114fe0..966496016d3eb 100644
--- a/libc/src/dlfcn/dlerror.h
+++ b/libc/src/dlfcn/dlerror.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_DLFCN_DLERROR_H
#define LLVM_LIBC_SRC_DLFCN_DLERROR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *dlerror();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_DLFCN_DLERROR_H
diff --git a/libc/src/dlfcn/dlopen.cpp b/libc/src/dlfcn/dlopen.cpp
index 9e8d58e347635..9fa4d061c9c82 100644
--- a/libc/src/dlfcn/dlopen.cpp
+++ b/libc/src/dlfcn/dlopen.cpp
@@ -9,11 +9,10 @@
#include "dlopen.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO(@izaakschroeder): https://github.com/llvm/llvm-project/issues/97919
LLVM_LIBC_FUNCTION(void *, dlopen, (const char *, int)) { return nullptr; }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/dlfcn/dlopen.h b/libc/src/dlfcn/dlopen.h
index 607ef7af08c81..4565953efd494 100644
--- a/libc/src/dlfcn/dlopen.h
+++ b/libc/src/dlfcn/dlopen.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_DLFCN_DLOPEN_H
#define LLVM_LIBC_SRC_DLFCN_DLOPEN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *dlopen(const char *, int);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_DLFCN_DLOPEN_H
diff --git a/libc/src/dlfcn/dlsym.cpp b/libc/src/dlfcn/dlsym.cpp
index c075c203bd583..4c8dac698f61d 100644
--- a/libc/src/dlfcn/dlsym.cpp
+++ b/libc/src/dlfcn/dlsym.cpp
@@ -9,11 +9,10 @@
#include "dlsym.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO(@izaakschroeder): https://github.com/llvm/llvm-project/issues/97920
LLVM_LIBC_FUNCTION(void *, dlsym, (void *, const char *)) { return nullptr; }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/dlfcn/dlsym.h b/libc/src/dlfcn/dlsym.h
index 70c6ab3fbb143..8157ac3e3fd4c 100644
--- a/libc/src/dlfcn/dlsym.h
+++ b/libc/src/dlfcn/dlsym.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_DLFCN_DLSYM_H
#define LLVM_LIBC_SRC_DLFCN_DLSYM_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *dlsym(void *, const char *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_DLFCN_DLSYM_H
diff --git a/libc/src/errno/libc_errno.cpp b/libc/src/errno/libc_errno.cpp
index 341636f0495c1..bd1438c226143 100644
--- a/libc/src/errno/libc_errno.cpp
+++ b/libc/src/errno/libc_errno.cpp
@@ -8,7 +8,6 @@
#include "libc_errno.h"
#include "src/__support/CPP/atomic.h"
-#include "src/__support/macros/config.h"
#ifdef LIBC_TARGET_ARCH_IS_GPU
// LIBC_THREAD_LOCAL on GPU currently does nothing. So essentially this is just
@@ -47,7 +46,7 @@ LIBC_NAMESPACE::Errno::operator int() { return errno; }
#endif // LIBC_FULL_BUILD
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Define the global `libc_errno` instance.
Errno libc_errno;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/errno/libc_errno.h b/libc/src/errno/libc_errno.h
index 8d28a01c8b7bb..df67ea3b42faa 100644
--- a/libc/src/errno/libc_errno.h
+++ b/libc/src/errno/libc_errno.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC_ERRNO_LIBC_ERRNO_H
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include "hdr/errno_macros.h"
@@ -31,7 +30,7 @@
// - Use regular `errno` in the code
// - Still depend on libc.src.errno.errno
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct Errno {
void operator=(int);
operator int();
@@ -39,6 +38,6 @@ struct Errno {
extern Errno libc_errno;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_ERRNO_LIBC_ERRNO_H
diff --git a/libc/src/fcntl/creat.h b/libc/src/fcntl/creat.h
index e180e17c25788..fc91a3cc8f677 100644
--- a/libc/src/fcntl/creat.h
+++ b/libc/src/fcntl/creat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_FCNTL_CREAT_H
#define LLVM_LIBC_SRC_FCNTL_CREAT_H
-#include "src/__support/macros/config.h"
#include <fcntl.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int creat(const char *path, int mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FCNTL_CREAT_H
diff --git a/libc/src/fcntl/fcntl.h b/libc/src/fcntl/fcntl.h
index 02d7250b632de..8fe3fb3146b91 100644
--- a/libc/src/fcntl/fcntl.h
+++ b/libc/src/fcntl/fcntl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FCNTL_FCNTL_H
#define LLVM_LIBC_SRC_FCNTL_FCNTL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fcntl(int fd, int cmd, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FCNTL_FCNTL_H
diff --git a/libc/src/fcntl/linux/creat.cpp b/libc/src/fcntl/linux/creat.cpp
index 2c5b5d736a3be..0710fab23fe1b 100644
--- a/libc/src/fcntl/linux/creat.cpp
+++ b/libc/src/fcntl/linux/creat.cpp
@@ -10,13 +10,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, creat, (const char *path, int mode_flags)) {
#ifdef SYS_open
@@ -34,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, creat, (const char *path, int mode_flags)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fcntl/linux/fcntl.cpp b/libc/src/fcntl/linux/fcntl.cpp
index a0c8459ced342..3875889d9d0b9 100644
--- a/libc/src/fcntl/linux/fcntl.cpp
+++ b/libc/src/fcntl/linux/fcntl.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/fcntl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fcntl, (int fd, int cmd, ...)) {
void *arg;
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, fcntl, (int fd, int cmd, ...)) {
return LIBC_NAMESPACE::internal::fcntl(fd, cmd, arg);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fcntl/linux/open.cpp b/libc/src/fcntl/linux/open.cpp
index 79b7b2b32c887..7394069a7e736 100644
--- a/libc/src/fcntl/linux/open.cpp
+++ b/libc/src/fcntl/linux/open.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <stdarg.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, open, (const char *path, int flags, ...)) {
mode_t mode_flags = 0;
@@ -43,4 +42,4 @@ LLVM_LIBC_FUNCTION(int, open, (const char *path, int flags, ...)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fcntl/linux/openat.cpp b/libc/src/fcntl/linux/openat.cpp
index 0862082c22ebf..a2f7413ff87bf 100644
--- a/libc/src/fcntl/linux/openat.cpp
+++ b/libc/src/fcntl/linux/openat.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <stdarg.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, openat, (int dfd, const char *path, int flags, ...)) {
mode_t mode_flags = 0;
@@ -39,4 +38,4 @@ LLVM_LIBC_FUNCTION(int, openat, (int dfd, const char *path, int flags, ...)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fcntl/open.h b/libc/src/fcntl/open.h
index 19bb53c2e3203..30950dd828ae3 100644
--- a/libc/src/fcntl/open.h
+++ b/libc/src/fcntl/open.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_FCNTL_OPEN_H
#define LLVM_LIBC_SRC_FCNTL_OPEN_H
-#include "src/__support/macros/config.h"
#include <fcntl.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int open(const char *path, int flags, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FCNTL_OPEN_H
diff --git a/libc/src/fcntl/openat.h b/libc/src/fcntl/openat.h
index d09791a84f735..5ea5d7f0b65ac 100644
--- a/libc/src/fcntl/openat.h
+++ b/libc/src/fcntl/openat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_FCNTL_OPENAT_H
#define LLVM_LIBC_SRC_FCNTL_OPENAT_H
-#include "src/__support/macros/config.h"
#include <fcntl.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int openat(int dfd, const char *path, int flags, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FCNTL_OPENAT_H
diff --git a/libc/src/fenv/feclearexcept.cpp b/libc/src/fenv/feclearexcept.cpp
index c8a032fe399b9..5eb1b0438b9af 100644
--- a/libc/src/fenv/feclearexcept.cpp
+++ b/libc/src/fenv/feclearexcept.cpp
@@ -9,12 +9,11 @@
#include "src/fenv/feclearexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, feclearexcept, (int e)) {
return fputil::clear_except(e);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/feclearexcept.h b/libc/src/fenv/feclearexcept.h
index 19379edbdfe27..e7df86d0e20d8 100644
--- a/libc/src/fenv/feclearexcept.h
+++ b/libc/src/fenv/feclearexcept.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FENV_FECLEAREXCEPT_H
#define LLVM_LIBC_SRC_FENV_FECLEAREXCEPT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int feclearexcept(int);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FECLEAREXCEPT_H
diff --git a/libc/src/fenv/fedisableexcept.cpp b/libc/src/fenv/fedisableexcept.cpp
index a2a1e97c54a87..c715627c395b9 100644
--- a/libc/src/fenv/fedisableexcept.cpp
+++ b/libc/src/fenv/fedisableexcept.cpp
@@ -9,12 +9,11 @@
#include "src/fenv/fedisableexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fedisableexcept, (int e)) {
return fputil::disable_except(e);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fedisableexcept.h b/libc/src/fenv/fedisableexcept.h
index 6aa0981b20557..977fd83262c1e 100644
--- a/libc/src/fenv/fedisableexcept.h
+++ b/libc/src/fenv/fedisableexcept.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FENV_FEDISABLEEXCEPT_H
#define LLVM_LIBC_SRC_FENV_FEDISABLEEXCEPT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fedisableexcept(int);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FEDISABLEEXCEPT_H
diff --git a/libc/src/fenv/feenableexcept.cpp b/libc/src/fenv/feenableexcept.cpp
index 468a170919e61..cf45b7f1b5f73 100644
--- a/libc/src/fenv/feenableexcept.cpp
+++ b/libc/src/fenv/feenableexcept.cpp
@@ -9,12 +9,11 @@
#include "src/fenv/feenableexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, feenableexcept, (int e)) {
return fputil::enable_except(e);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/feenableexcept.h b/libc/src/fenv/feenableexcept.h
index 0ed19f4dd407f..a077162479952 100644
--- a/libc/src/fenv/feenableexcept.h
+++ b/libc/src/fenv/feenableexcept.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FENV_FEENABLEEXCEPT_H
#define LLVM_LIBC_SRC_FENV_FEENABLEEXCEPT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int feenableexcept(int);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FEENABLEEXCEPT_H
diff --git a/libc/src/fenv/fegetenv.cpp b/libc/src/fenv/fegetenv.cpp
index c692b87c219a6..fbdb7d577b5a5 100644
--- a/libc/src/fenv/fegetenv.cpp
+++ b/libc/src/fenv/fegetenv.cpp
@@ -9,12 +9,11 @@
#include "src/fenv/fegetenv.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fegetenv, (fenv_t * envp)) {
return fputil::get_env(envp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fegetenv.h b/libc/src/fenv/fegetenv.h
index 58a5e7db65226..8d33029647402 100644
--- a/libc/src/fenv/fegetenv.h
+++ b/libc/src/fenv/fegetenv.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_FENV_FEGETENV_H
#include "hdr/types/fenv_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fegetenv(fenv_t *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FEGETENV_H
diff --git a/libc/src/fenv/fegetexcept.cpp b/libc/src/fenv/fegetexcept.cpp
index 2b3de83848b91..edc4faff05282 100644
--- a/libc/src/fenv/fegetexcept.cpp
+++ b/libc/src/fenv/fegetexcept.cpp
@@ -9,10 +9,9 @@
#include "src/fenv/fegetexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fegetexcept, ()) { return fputil::get_except(); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fegetexcept.h b/libc/src/fenv/fegetexcept.h
index eaf48e669e768..53ce64872eaf0 100644
--- a/libc/src/fenv/fegetexcept.h
+++ b/libc/src/fenv/fegetexcept.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FENV_FEGETEXCEPT_H
#define LLVM_LIBC_SRC_FENV_FEGETEXCEPT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fegetexcept();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FEGETEXCEPT_H
diff --git a/libc/src/fenv/fegetexceptflag.cpp b/libc/src/fenv/fegetexceptflag.cpp
index 58418cc9cc334..72f31bf7abd52 100644
--- a/libc/src/fenv/fegetexceptflag.cpp
+++ b/libc/src/fenv/fegetexceptflag.cpp
@@ -10,9 +10,8 @@
#include "hdr/types/fexcept_t.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fegetexceptflag, (fexcept_t * flagp, int excepts)) {
static_assert(sizeof(int) >= sizeof(fexcept_t),
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(int, fegetexceptflag, (fexcept_t * flagp, int excepts)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fegetexceptflag.h b/libc/src/fenv/fegetexceptflag.h
index c427bfbfc48de..fcb9598658d43 100644
--- a/libc/src/fenv/fegetexceptflag.h
+++ b/libc/src/fenv/fegetexceptflag.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_FENV_FEGETEXCEPTFLAG_H
#include "hdr/types/fexcept_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fegetexceptflag(fexcept_t *, int excepts);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FEGETEXCEPTFLAG_H
diff --git a/libc/src/fenv/fegetround.cpp b/libc/src/fenv/fegetround.cpp
index 4f5caedb77a8c..edf6eac0a5b03 100644
--- a/libc/src/fenv/fegetround.cpp
+++ b/libc/src/fenv/fegetround.cpp
@@ -9,10 +9,9 @@
#include "src/fenv/fegetround.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fegetround, ()) { return fputil::get_round(); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fegetround.h b/libc/src/fenv/fegetround.h
index 2887c33786d68..40be879a66d05 100644
--- a/libc/src/fenv/fegetround.h
+++ b/libc/src/fenv/fegetround.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FENV_FEGETROUND_H
#define LLVM_LIBC_SRC_FENV_FEGETROUND_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fegetround();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FEGETROUND_H
diff --git a/libc/src/fenv/feholdexcept.cpp b/libc/src/fenv/feholdexcept.cpp
index 81b3ea435e552..e5ca257e2be5d 100644
--- a/libc/src/fenv/feholdexcept.cpp
+++ b/libc/src/fenv/feholdexcept.cpp
@@ -10,9 +10,8 @@
#include "hdr/types/fenv_t.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, feholdexcept, (fenv_t * envp)) {
if (fputil::get_env(envp) != 0)
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, feholdexcept, (fenv_t * envp)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/feholdexcept.h b/libc/src/fenv/feholdexcept.h
index 1882538e1292c..e53619e12feaf 100644
--- a/libc/src/fenv/feholdexcept.h
+++ b/libc/src/fenv/feholdexcept.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_FENV_FEHOLDEXCEPT_H
#include "hdr/types/fenv_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int feholdexcept(fenv_t *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FEHOLDEXCEPT_H
diff --git a/libc/src/fenv/feraiseexcept.cpp b/libc/src/fenv/feraiseexcept.cpp
index 6eaa09dd49a62..0bee7f5f5b923 100644
--- a/libc/src/fenv/feraiseexcept.cpp
+++ b/libc/src/fenv/feraiseexcept.cpp
@@ -9,12 +9,11 @@
#include "src/fenv/feraiseexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, feraiseexcept, (int e)) {
return fputil::raise_except(e);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/feraiseexcept.h b/libc/src/fenv/feraiseexcept.h
index af62427540830..a5ab3b93720ef 100644
--- a/libc/src/fenv/feraiseexcept.h
+++ b/libc/src/fenv/feraiseexcept.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FENV_FERAISEEXCEPT_H
#define LLVM_LIBC_SRC_FENV_FERAISEEXCEPT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int feraiseexcept(int);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FERAISEEXCEPT_H
diff --git a/libc/src/fenv/fesetenv.cpp b/libc/src/fenv/fesetenv.cpp
index 7a9f90a740ded..25ac78958cf93 100644
--- a/libc/src/fenv/fesetenv.cpp
+++ b/libc/src/fenv/fesetenv.cpp
@@ -9,12 +9,11 @@
#include "src/fenv/fesetenv.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fesetenv, (const fenv_t *envp)) {
return fputil::set_env(envp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fesetenv.h b/libc/src/fenv/fesetenv.h
index 2f42ebc828ae7..8636711cb1fee 100644
--- a/libc/src/fenv/fesetenv.h
+++ b/libc/src/fenv/fesetenv.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_FENV_FESETENV_H
#include "hdr/types/fenv_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fesetenv(const fenv_t *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FESETENV_H
diff --git a/libc/src/fenv/fesetexcept.cpp b/libc/src/fenv/fesetexcept.cpp
index 87758211b7fe3..9afa7b73b4fb5 100644
--- a/libc/src/fenv/fesetexcept.cpp
+++ b/libc/src/fenv/fesetexcept.cpp
@@ -9,12 +9,11 @@
#include "src/fenv/fesetexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fesetexcept, (int excepts)) {
return fputil::set_except(excepts);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fesetexcept.h b/libc/src/fenv/fesetexcept.h
index 7b0d8d3d6c36c..40a7303efcb0a 100644
--- a/libc/src/fenv/fesetexcept.h
+++ b/libc/src/fenv/fesetexcept.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FENV_FESETEXCEPT_H
#define LLVM_LIBC_SRC_FENV_FESETEXCEPT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fesetexcept(int excepts);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FESETEXCEPT_H
diff --git a/libc/src/fenv/fesetexceptflag.cpp b/libc/src/fenv/fesetexceptflag.cpp
index 9cec9d15d9742..628f33dcb9c4b 100644
--- a/libc/src/fenv/fesetexceptflag.cpp
+++ b/libc/src/fenv/fesetexceptflag.cpp
@@ -10,9 +10,8 @@
#include "hdr/types/fexcept_t.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fesetexceptflag,
(const fexcept_t *flagp, int excepts)) {
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, fesetexceptflag,
return fputil::set_except(excepts_to_set);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fesetexceptflag.h b/libc/src/fenv/fesetexceptflag.h
index 74564151a52e0..a018358dc9dfc 100644
--- a/libc/src/fenv/fesetexceptflag.h
+++ b/libc/src/fenv/fesetexceptflag.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_FENV_FESETEXCEPTFLAG_H
#include "hdr/types/fexcept_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fesetexceptflag(const fexcept_t *, int excepts);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FESETEXCEPTFLAG_H
diff --git a/libc/src/fenv/fesetround.cpp b/libc/src/fenv/fesetround.cpp
index 6f65f9fc4adcf..22f2b9d1e087e 100644
--- a/libc/src/fenv/fesetround.cpp
+++ b/libc/src/fenv/fesetround.cpp
@@ -9,10 +9,9 @@
#include "src/fenv/fesetround.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fesetround, (int m)) { return fputil::set_round(m); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fesetround.h b/libc/src/fenv/fesetround.h
index 5b15c4fb0acdd..75023bdb691c4 100644
--- a/libc/src/fenv/fesetround.h
+++ b/libc/src/fenv/fesetround.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FENV_FESETROUND_H
#define LLVM_LIBC_SRC_FENV_FESETROUND_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fesetround(int);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FESETROUND_H
diff --git a/libc/src/fenv/fetestexcept.cpp b/libc/src/fenv/fetestexcept.cpp
index f4986acca6eb8..c284a2c2a9528 100644
--- a/libc/src/fenv/fetestexcept.cpp
+++ b/libc/src/fenv/fetestexcept.cpp
@@ -9,12 +9,11 @@
#include "src/fenv/fetestexcept.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fetestexcept, (int e)) {
return fputil::test_except(e);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fetestexcept.h b/libc/src/fenv/fetestexcept.h
index 07f30aef0177d..dec1ac20cc08b 100644
--- a/libc/src/fenv/fetestexcept.h
+++ b/libc/src/fenv/fetestexcept.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_FENV_FETESTEXCEPT_H
#define LLVM_LIBC_SRC_FENV_FETESTEXCEPT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fetestexcept(int);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FETESTEXCEPT_H
diff --git a/libc/src/fenv/fetestexceptflag.cpp b/libc/src/fenv/fetestexceptflag.cpp
index 03ba1e6f3f3b4..63453350a199f 100644
--- a/libc/src/fenv/fetestexceptflag.cpp
+++ b/libc/src/fenv/fetestexceptflag.cpp
@@ -10,9 +10,8 @@
#include "hdr/types/fexcept_t.h"
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fetestexceptflag,
(const fexcept_t *flagp, int excepts)) {
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(int, fetestexceptflag,
return *flagp | fputil::test_except(excepts);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/fetestexceptflag.h b/libc/src/fenv/fetestexceptflag.h
index 4cf6434703ed4..1c8b0b843f547 100644
--- a/libc/src/fenv/fetestexceptflag.h
+++ b/libc/src/fenv/fetestexceptflag.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_FENV_FETESTEXCEPTFLAG_H
#include "hdr/types/fexcept_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fetestexceptflag(const fexcept_t *, int excepts);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FETESTEXCEPTFLAG_H
diff --git a/libc/src/fenv/feupdateenv.cpp b/libc/src/fenv/feupdateenv.cpp
index 1cc730ca8bed0..0664863538155 100644
--- a/libc/src/fenv/feupdateenv.cpp
+++ b/libc/src/fenv/feupdateenv.cpp
@@ -11,9 +11,8 @@
#include "src/__support/common.h"
#include "hdr/types/fenv_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, feupdateenv, (const fenv_t *envp)) {
int current_excepts = fputil::test_except(FE_ALL_EXCEPT);
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, feupdateenv, (const fenv_t *envp)) {
return fputil::raise_except(current_excepts);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/fenv/feupdateenv.h b/libc/src/fenv/feupdateenv.h
index 52212cba66cc2..3c9c88b36e728 100644
--- a/libc/src/fenv/feupdateenv.h
+++ b/libc/src/fenv/feupdateenv.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_FENV_FEUPDATEENV_H
#include "hdr/types/fenv_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int feupdateenv(const fenv_t *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_FENV_FEUPDATEENV_H
diff --git a/libc/src/gpu/rpc_fprintf.cpp b/libc/src/gpu/rpc_fprintf.cpp
index 321137ef24955..7b0e60b59baf3 100644
--- a/libc/src/gpu/rpc_fprintf.cpp
+++ b/libc/src/gpu/rpc_fprintf.cpp
@@ -12,10 +12,9 @@
#include "src/__support/GPU/utils.h"
#include "src/__support/RPC/rpc_client.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/gpu/file.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <uint16_t opcode>
int fprintf_impl(::FILE *__restrict file, const char *__restrict format,
@@ -69,4 +68,4 @@ LLVM_LIBC_FUNCTION(int, rpc_fprintf,
args, size);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/gpu/rpc_fprintf.h b/libc/src/gpu/rpc_fprintf.h
index 7658b214c07c2..3292ce2d4b1ec 100644
--- a/libc/src/gpu/rpc_fprintf.h
+++ b/libc/src/gpu/rpc_fprintf.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC_GPU_RPC_HOST_CALL_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int rpc_fprintf(::FILE *__restrict stream, const char *__restrict format,
void *argc, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_GPU_RPC_HOST_CALL_H
diff --git a/libc/src/gpu/rpc_host_call.cpp b/libc/src/gpu/rpc_host_call.cpp
index ca2e331340a6c..7b9b9f2adfd53 100644
--- a/libc/src/gpu/rpc_host_call.cpp
+++ b/libc/src/gpu/rpc_host_call.cpp
@@ -11,9 +11,8 @@
#include "src/__support/GPU/utils.h"
#include "src/__support/RPC/rpc_client.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This calls the associated function pointer on the RPC server with the given
// arguments. We expect that the pointer here is a valid pointer on the server.
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(void, rpc_host_call, (void *fn, void *data, size_t size)) {
port.close();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/gpu/rpc_host_call.h b/libc/src/gpu/rpc_host_call.h
index 7cfea757ccdfd..473d90ba48fd0 100644
--- a/libc/src/gpu/rpc_host_call.h
+++ b/libc/src/gpu/rpc_host_call.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_GPU_RPC_HOST_CALL_H
#define LLVM_LIBC_SRC_GPU_RPC_HOST_CALL_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void rpc_host_call(void *fn, void *buffer, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_GPU_RPC_HOST_CALL_H
diff --git a/libc/src/inttypes/imaxabs.cpp b/libc/src/inttypes/imaxabs.cpp
index 385fd9b131713..b390676f9dde2 100644
--- a/libc/src/inttypes/imaxabs.cpp
+++ b/libc/src/inttypes/imaxabs.cpp
@@ -9,10 +9,9 @@
#include "src/inttypes/imaxabs.h"
#include "src/__support/common.h"
#include "src/__support/integer_operations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(intmax_t, imaxabs, (intmax_t j)) { return integer_abs(j); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/inttypes/imaxabs.h b/libc/src/inttypes/imaxabs.h
index 4cc39e295d486..cd30011b9e57a 100644
--- a/libc/src/inttypes/imaxabs.h
+++ b/libc/src/inttypes/imaxabs.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_INTTYPES_IMAXABS_H
#define LLVM_LIBC_SRC_INTTYPES_IMAXABS_H
-#include "src/__support/macros/config.h"
#include <inttypes.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
intmax_t imaxabs(intmax_t j);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_INTTYPES_IMAXABS_H
diff --git a/libc/src/inttypes/imaxdiv.cpp b/libc/src/inttypes/imaxdiv.cpp
index 4b878d55c881c..77f0cc58a897c 100644
--- a/libc/src/inttypes/imaxdiv.cpp
+++ b/libc/src/inttypes/imaxdiv.cpp
@@ -9,9 +9,8 @@
#include "src/inttypes/imaxdiv.h"
#include "src/__support/common.h"
#include "src/__support/integer_operations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(imaxdiv_t, imaxdiv, (intmax_t x, intmax_t y)) {
imaxdiv_t res;
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(imaxdiv_t, imaxdiv, (intmax_t x, intmax_t y)) {
return res;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/inttypes/imaxdiv.h b/libc/src/inttypes/imaxdiv.h
index 6dbefafc0fa1c..749122782347c 100644
--- a/libc/src/inttypes/imaxdiv.h
+++ b/libc/src/inttypes/imaxdiv.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_INTTYPES_IMAXDIV_H
#define LLVM_LIBC_SRC_INTTYPES_IMAXDIV_H
-#include "src/__support/macros/config.h"
#include <inttypes.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
imaxdiv_t imaxdiv(intmax_t x, intmax_t y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_INTTYPES_IMAXDIV_H
diff --git a/libc/src/inttypes/strtoimax.cpp b/libc/src/inttypes/strtoimax.cpp
index 85f197c75d90c..459877eeff472 100644
--- a/libc/src/inttypes/strtoimax.cpp
+++ b/libc/src/inttypes/strtoimax.cpp
@@ -8,11 +8,10 @@
#include "src/inttypes/strtoimax.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(intmax_t, strtoimax,
(const char *__restrict str, char **__restrict str_end,
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(intmax_t, strtoimax,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/inttypes/strtoimax.h b/libc/src/inttypes/strtoimax.h
index 804d07c219aad..b72547f3d22f6 100644
--- a/libc/src/inttypes/strtoimax.h
+++ b/libc/src/inttypes/strtoimax.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_INTTYPES_STRTOIMAX_H
#define LLVM_LIBC_SRC_INTTYPES_STRTOIMAX_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
intmax_t strtoimax(const char *__restrict str, char **__restrict str_end,
int base);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_INTTYPES_STRTOIMAX_H
diff --git a/libc/src/inttypes/strtoumax.cpp b/libc/src/inttypes/strtoumax.cpp
index 2e9cbc9acba75..4011a177b81fe 100644
--- a/libc/src/inttypes/strtoumax.cpp
+++ b/libc/src/inttypes/strtoumax.cpp
@@ -8,11 +8,10 @@
#include "src/inttypes/strtoumax.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(uintmax_t, strtoumax,
(const char *__restrict str, char **__restrict str_end,
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(uintmax_t, strtoumax,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/inttypes/strtoumax.h b/libc/src/inttypes/strtoumax.h
index 4c53c0362b9e5..d59e9932da519 100644
--- a/libc/src/inttypes/strtoumax.h
+++ b/libc/src/inttypes/strtoumax.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_INTTYPES_STRTOUMAX_H
#define LLVM_LIBC_SRC_INTTYPES_STRTOUMAX_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
uintmax_t strtoumax(const char *__restrict str, char **__restrict str_end,
int base);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_INTTYPES_STRTOUMAX_H
diff --git a/libc/src/math/aarch64/ceil.cpp b/libc/src/math/aarch64/ceil.cpp
index 5bfd053d603de..81cd95078efee 100644
--- a/libc/src/math/aarch64/ceil.cpp
+++ b/libc/src/math/aarch64/ceil.cpp
@@ -8,9 +8,8 @@
#include "src/math/ceil.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, ceil, (double x)) {
double y;
@@ -18,4 +17,4 @@ LLVM_LIBC_FUNCTION(double, ceil, (double x)) {
return y;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/aarch64/ceilf.cpp b/libc/src/math/aarch64/ceilf.cpp
index 2352245bc8303..3cbcc1f0e90d8 100644
--- a/libc/src/math/aarch64/ceilf.cpp
+++ b/libc/src/math/aarch64/ceilf.cpp
@@ -8,9 +8,8 @@
#include "src/math/ceilf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, ceilf, (float x)) {
float y;
@@ -18,4 +17,4 @@ LLVM_LIBC_FUNCTION(float, ceilf, (float x)) {
return y;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/aarch64/floor.cpp b/libc/src/math/aarch64/floor.cpp
index f9da52bdd45a8..0e3d13a13a95c 100644
--- a/libc/src/math/aarch64/floor.cpp
+++ b/libc/src/math/aarch64/floor.cpp
@@ -8,9 +8,8 @@
#include "src/math/floor.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, floor, (double x)) {
double y;
@@ -18,4 +17,4 @@ LLVM_LIBC_FUNCTION(double, floor, (double x)) {
return y;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/aarch64/floorf.cpp b/libc/src/math/aarch64/floorf.cpp
index 980b3c52a00b5..8942a9e7c576e 100644
--- a/libc/src/math/aarch64/floorf.cpp
+++ b/libc/src/math/aarch64/floorf.cpp
@@ -8,9 +8,8 @@
#include "src/math/floorf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, floorf, (float x)) {
float y;
@@ -18,4 +17,4 @@ LLVM_LIBC_FUNCTION(float, floorf, (float x)) {
return y;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/aarch64/round.cpp b/libc/src/math/aarch64/round.cpp
index c85445aa19ab5..8972c16c57167 100644
--- a/libc/src/math/aarch64/round.cpp
+++ b/libc/src/math/aarch64/round.cpp
@@ -8,9 +8,8 @@
#include "src/math/round.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, round, (double x)) {
double y;
@@ -18,4 +17,4 @@ LLVM_LIBC_FUNCTION(double, round, (double x)) {
return y;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/aarch64/roundf.cpp b/libc/src/math/aarch64/roundf.cpp
index 0c7f7640e8278..8b3a9cf50e601 100644
--- a/libc/src/math/aarch64/roundf.cpp
+++ b/libc/src/math/aarch64/roundf.cpp
@@ -8,9 +8,8 @@
#include "src/math/roundf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, roundf, (float x)) {
float y;
@@ -18,4 +17,4 @@ LLVM_LIBC_FUNCTION(float, roundf, (float x)) {
return y;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/aarch64/trunc.cpp b/libc/src/math/aarch64/trunc.cpp
index 1ef26f44fd234..34ffd1702f5a6 100644
--- a/libc/src/math/aarch64/trunc.cpp
+++ b/libc/src/math/aarch64/trunc.cpp
@@ -8,9 +8,8 @@
#include "src/math/trunc.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, trunc, (double x)) {
double y;
@@ -18,4 +17,4 @@ LLVM_LIBC_FUNCTION(double, trunc, (double x)) {
return y;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/aarch64/truncf.cpp b/libc/src/math/aarch64/truncf.cpp
index 0c64ef60e91c4..fc2426f26df24 100644
--- a/libc/src/math/aarch64/truncf.cpp
+++ b/libc/src/math/aarch64/truncf.cpp
@@ -8,9 +8,8 @@
#include "src/math/truncf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, truncf, (float x)) {
float y;
@@ -18,4 +17,4 @@ LLVM_LIBC_FUNCTION(float, truncf, (float x)) {
return y;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/acos.h b/libc/src/math/acos.h
index fed59e2b67de8..da89a9dd3d9d4 100644
--- a/libc/src/math/acos.h
+++ b/libc/src/math/acos.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ACOS_H
#define LLVM_LIBC_SRC_MATH_ACOS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double acos(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ACOS_H
diff --git a/libc/src/math/acosf.h b/libc/src/math/acosf.h
index 839f7dfa7483c..3221efa340a9d 100644
--- a/libc/src/math/acosf.h
+++ b/libc/src/math/acosf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ACOSF_H
#define LLVM_LIBC_SRC_MATH_ACOSF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float acosf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ACOSF_H
diff --git a/libc/src/math/acosh.h b/libc/src/math/acosh.h
index 7d59b6c9241d3..a5bbd82c120b8 100644
--- a/libc/src/math/acosh.h
+++ b/libc/src/math/acosh.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ACOSH_H
#define LLVM_LIBC_SRC_MATH_ACOSH_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double acosh(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ACOSH_H
diff --git a/libc/src/math/acoshf.h b/libc/src/math/acoshf.h
index a6f08bd9c68ec..aac43b4ccca8d 100644
--- a/libc/src/math/acoshf.h
+++ b/libc/src/math/acoshf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ACOSHF_H
#define LLVM_LIBC_SRC_MATH_ACOSHF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float acoshf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ACOSHF_H
diff --git a/libc/src/math/amdgpu/acos.cpp b/libc/src/math/amdgpu/acos.cpp
index de870f207326e..b1e30fef82ded 100644
--- a/libc/src/math/amdgpu/acos.cpp
+++ b/libc/src/math/amdgpu/acos.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, acos, (double x)) { return __ocml_acos_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/acosf.cpp b/libc/src/math/amdgpu/acosf.cpp
index 0a72a70a3ee9d..4c2dd4bcf4353 100644
--- a/libc/src/math/amdgpu/acosf.cpp
+++ b/libc/src/math/amdgpu/acosf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, acosf, (float x)) { return __ocml_acos_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/acosh.cpp b/libc/src/math/amdgpu/acosh.cpp
index 15c9734499832..dcdeeab29454e 100644
--- a/libc/src/math/amdgpu/acosh.cpp
+++ b/libc/src/math/amdgpu/acosh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, acosh, (double x)) { return __ocml_acosh_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/acoshf.cpp b/libc/src/math/amdgpu/acoshf.cpp
index 79e71b02e7198..52baa2eaecc79 100644
--- a/libc/src/math/amdgpu/acoshf.cpp
+++ b/libc/src/math/amdgpu/acoshf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, acoshf, (float x)) { return __ocml_acosh_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/asin.cpp b/libc/src/math/amdgpu/asin.cpp
index a79641e1977cb..835c317112e2e 100644
--- a/libc/src/math/amdgpu/asin.cpp
+++ b/libc/src/math/amdgpu/asin.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, asin, (double x)) { return __ocml_asin_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/asinf.cpp b/libc/src/math/amdgpu/asinf.cpp
index e70944a4d9890..72c45d5cf1723 100644
--- a/libc/src/math/amdgpu/asinf.cpp
+++ b/libc/src/math/amdgpu/asinf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, asinf, (float x)) { return __ocml_asin_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/asinh.cpp b/libc/src/math/amdgpu/asinh.cpp
index 642368592a99b..7a9f7ea4e9887 100644
--- a/libc/src/math/amdgpu/asinh.cpp
+++ b/libc/src/math/amdgpu/asinh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, asinh, (double x)) { return __ocml_asinh_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/asinhf.cpp b/libc/src/math/amdgpu/asinhf.cpp
index bafa77f946000..28d6bde5c9184 100644
--- a/libc/src/math/amdgpu/asinhf.cpp
+++ b/libc/src/math/amdgpu/asinhf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, asinhf, (float x)) { return __ocml_asinh_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/atan.cpp b/libc/src/math/amdgpu/atan.cpp
index 49941e97096f7..a1fa38ba451de 100644
--- a/libc/src/math/amdgpu/atan.cpp
+++ b/libc/src/math/amdgpu/atan.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, atan, (double x)) { return __ocml_atan_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/atan2.cpp b/libc/src/math/amdgpu/atan2.cpp
index f5907504cb364..9cfdba75eb8d6 100644
--- a/libc/src/math/amdgpu/atan2.cpp
+++ b/libc/src/math/amdgpu/atan2.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, atan2, (double x, double y)) {
return __ocml_atan2_f64(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/atan2f.cpp b/libc/src/math/amdgpu/atan2f.cpp
index 736c77d1cbce9..ef56293b4caf5 100644
--- a/libc/src/math/amdgpu/atan2f.cpp
+++ b/libc/src/math/amdgpu/atan2f.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, atan2f, (float x, float y)) {
return __ocml_atan2_f32(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/atanf.cpp b/libc/src/math/amdgpu/atanf.cpp
index ab1837dd026b7..bbcceca3ed092 100644
--- a/libc/src/math/amdgpu/atanf.cpp
+++ b/libc/src/math/amdgpu/atanf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, atanf, (float x)) { return __ocml_atan_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/atanh.cpp b/libc/src/math/amdgpu/atanh.cpp
index 091c155190f94..ec462586450bf 100644
--- a/libc/src/math/amdgpu/atanh.cpp
+++ b/libc/src/math/amdgpu/atanh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, atanh, (double x)) { return __ocml_atanh_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/atanhf.cpp b/libc/src/math/amdgpu/atanhf.cpp
index fa9cf39383963..227269369ab6b 100644
--- a/libc/src/math/amdgpu/atanhf.cpp
+++ b/libc/src/math/amdgpu/atanhf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, atanhf, (float x)) { return __ocml_atanh_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/ceil.cpp b/libc/src/math/amdgpu/ceil.cpp
index 8834c7b560a1b..ad1407d61f620 100644
--- a/libc/src/math/amdgpu/ceil.cpp
+++ b/libc/src/math/amdgpu/ceil.cpp
@@ -8,10 +8,9 @@
#include "src/math/ceil.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, ceil, (double x)) { return __builtin_ceil(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/ceilf.cpp b/libc/src/math/amdgpu/ceilf.cpp
index 5d26a30c849cd..c4fc58d936038 100644
--- a/libc/src/math/amdgpu/ceilf.cpp
+++ b/libc/src/math/amdgpu/ceilf.cpp
@@ -8,10 +8,9 @@
#include "src/math/ceilf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, ceilf, (float x)) { return __builtin_ceilf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/copysign.cpp b/libc/src/math/amdgpu/copysign.cpp
index 06ef36fb3595f..6f804bdb90a1f 100644
--- a/libc/src/math/amdgpu/copysign.cpp
+++ b/libc/src/math/amdgpu/copysign.cpp
@@ -8,12 +8,11 @@
#include "src/math/copysign.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, copysign, (double x, double y)) {
return __builtin_copysign(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/copysignf.cpp b/libc/src/math/amdgpu/copysignf.cpp
index aea94f3577d8f..4d7e132462ac9 100644
--- a/libc/src/math/amdgpu/copysignf.cpp
+++ b/libc/src/math/amdgpu/copysignf.cpp
@@ -8,12 +8,11 @@
#include "src/math/copysignf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, copysignf, (float x, float y)) {
return __builtin_copysignf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/cos.cpp b/libc/src/math/amdgpu/cos.cpp
index a4d4c94dd7ac7..68239d9337801 100644
--- a/libc/src/math/amdgpu/cos.cpp
+++ b/libc/src/math/amdgpu/cos.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, cos, (double x)) { return __ocml_cos_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/cosf.cpp b/libc/src/math/amdgpu/cosf.cpp
index 99ec1185a8346..a60e9ea28907c 100644
--- a/libc/src/math/amdgpu/cosf.cpp
+++ b/libc/src/math/amdgpu/cosf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, cosf, (float x)) { return __ocml_cos_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/cosh.cpp b/libc/src/math/amdgpu/cosh.cpp
index d94d7af251261..b71df0c0170c3 100644
--- a/libc/src/math/amdgpu/cosh.cpp
+++ b/libc/src/math/amdgpu/cosh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, cosh, (double x)) { return __ocml_cosh_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/coshf.cpp b/libc/src/math/amdgpu/coshf.cpp
index 5b641be27818a..699fb0478aee8 100644
--- a/libc/src/math/amdgpu/coshf.cpp
+++ b/libc/src/math/amdgpu/coshf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, coshf, (float x)) { return __ocml_cosh_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/declarations.h b/libc/src/math/amdgpu/declarations.h
index 98c14ee43cd19..81d788d943f22 100644
--- a/libc/src/math/amdgpu/declarations.h
+++ b/libc/src/math/amdgpu/declarations.h
@@ -12,9 +12,8 @@
#include "platform.h"
#include "src/__support/GPU/utils.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" {
float __ocml_acos_f32(float);
@@ -84,6 +83,6 @@ double __ocml_tgamma_f64(double);
float __ocml_tgamma_f32(float);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_AMDGPU_DECLARATIONS_H
diff --git a/libc/src/math/amdgpu/erf.cpp b/libc/src/math/amdgpu/erf.cpp
index 07ae268ff2cdc..7a464550c7e06 100644
--- a/libc/src/math/amdgpu/erf.cpp
+++ b/libc/src/math/amdgpu/erf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, erf, (double x)) { return __ocml_erf_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/erff.cpp b/libc/src/math/amdgpu/erff.cpp
index a4b7b275cfcc2..1f77d08585a3d 100644
--- a/libc/src/math/amdgpu/erff.cpp
+++ b/libc/src/math/amdgpu/erff.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, erff, (float x)) { return __ocml_erf_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/exp.cpp b/libc/src/math/amdgpu/exp.cpp
index dae79bec5599b..d19c73dd02426 100644
--- a/libc/src/math/amdgpu/exp.cpp
+++ b/libc/src/math/amdgpu/exp.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, exp, (double x)) { return __ocml_exp_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/exp10.cpp b/libc/src/math/amdgpu/exp10.cpp
index f13d218ca88c4..17d8f3350ac24 100644
--- a/libc/src/math/amdgpu/exp10.cpp
+++ b/libc/src/math/amdgpu/exp10.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, exp10, (double x)) { return __ocml_exp10_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/exp10f.cpp b/libc/src/math/amdgpu/exp10f.cpp
index 883e734e06877..ddab555a8fbd3 100644
--- a/libc/src/math/amdgpu/exp10f.cpp
+++ b/libc/src/math/amdgpu/exp10f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, exp10f, (float x)) { return __ocml_exp10_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/exp2.cpp b/libc/src/math/amdgpu/exp2.cpp
index fb336cf48f157..dfbb1f80d1294 100644
--- a/libc/src/math/amdgpu/exp2.cpp
+++ b/libc/src/math/amdgpu/exp2.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, exp2, (double x)) { return __ocml_exp2_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/exp2f.cpp b/libc/src/math/amdgpu/exp2f.cpp
index 77b4a9c3b86e7..016dfe3a62223 100644
--- a/libc/src/math/amdgpu/exp2f.cpp
+++ b/libc/src/math/amdgpu/exp2f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, exp2f, (float x)) { return __ocml_exp2_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/expf.cpp b/libc/src/math/amdgpu/expf.cpp
index 6c44aad164bfd..33393078cfa3a 100644
--- a/libc/src/math/amdgpu/expf.cpp
+++ b/libc/src/math/amdgpu/expf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, expf, (float x)) { return __ocml_exp_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/expm1.cpp b/libc/src/math/amdgpu/expm1.cpp
index df3643f9c78b5..d2ac28ae6a3e2 100644
--- a/libc/src/math/amdgpu/expm1.cpp
+++ b/libc/src/math/amdgpu/expm1.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, expm1, (double x)) { return __ocml_expm1_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/expm1f.cpp b/libc/src/math/amdgpu/expm1f.cpp
index 2409997f479c3..0ffe1a362af12 100644
--- a/libc/src/math/amdgpu/expm1f.cpp
+++ b/libc/src/math/amdgpu/expm1f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, expm1f, (float x)) { return __ocml_expm1_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fabs.cpp b/libc/src/math/amdgpu/fabs.cpp
index bb37596b9d563..c0d063d50ae53 100644
--- a/libc/src/math/amdgpu/fabs.cpp
+++ b/libc/src/math/amdgpu/fabs.cpp
@@ -8,10 +8,9 @@
#include "src/math/fabs.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fabs, (double x)) { return __builtin_fabs(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fabsf.cpp b/libc/src/math/amdgpu/fabsf.cpp
index 2698618f3f1e1..398ffd0c74c07 100644
--- a/libc/src/math/amdgpu/fabsf.cpp
+++ b/libc/src/math/amdgpu/fabsf.cpp
@@ -8,10 +8,9 @@
#include "src/math/fabsf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fabsf, (float x)) { return __builtin_fabsf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fdim.cpp b/libc/src/math/amdgpu/fdim.cpp
index 8ade0b21503b1..f16942dc61934 100644
--- a/libc/src/math/amdgpu/fdim.cpp
+++ b/libc/src/math/amdgpu/fdim.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fdim, (double x, double y)) {
return __ocml_fdim_f64(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fdimf.cpp b/libc/src/math/amdgpu/fdimf.cpp
index ed3855e5ce2d6..eccb441f14556 100644
--- a/libc/src/math/amdgpu/fdimf.cpp
+++ b/libc/src/math/amdgpu/fdimf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fdimf, (float x, float y)) {
return __ocml_fdim_f32(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/floor.cpp b/libc/src/math/amdgpu/floor.cpp
index 564efa9a7da38..eada89c178d75 100644
--- a/libc/src/math/amdgpu/floor.cpp
+++ b/libc/src/math/amdgpu/floor.cpp
@@ -8,10 +8,9 @@
#include "src/math/floor.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, floor, (double x)) { return __builtin_floor(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/floorf.cpp b/libc/src/math/amdgpu/floorf.cpp
index 6717c8f60c992..a5611c515a88d 100644
--- a/libc/src/math/amdgpu/floorf.cpp
+++ b/libc/src/math/amdgpu/floorf.cpp
@@ -8,10 +8,9 @@
#include "src/math/floorf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, floorf, (float x)) { return __builtin_floorf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fma.cpp b/libc/src/math/amdgpu/fma.cpp
index c4a117e42a3aa..41a6ddf60dbc3 100644
--- a/libc/src/math/amdgpu/fma.cpp
+++ b/libc/src/math/amdgpu/fma.cpp
@@ -8,12 +8,11 @@
#include "src/math/fma.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fma, (double x, double y, double z)) {
return __builtin_fma(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fmaf.cpp b/libc/src/math/amdgpu/fmaf.cpp
index c088bd5b30fea..c948e32f77eb9 100644
--- a/libc/src/math/amdgpu/fmaf.cpp
+++ b/libc/src/math/amdgpu/fmaf.cpp
@@ -8,12 +8,11 @@
#include "src/math/fmaf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaf, (float x, float y, float z)) {
return __builtin_fmaf(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fmax.cpp b/libc/src/math/amdgpu/fmax.cpp
index 474019733598f..09f0f942a042a 100644
--- a/libc/src/math/amdgpu/fmax.cpp
+++ b/libc/src/math/amdgpu/fmax.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmax, (double x, double y)) {
return __builtin_fmax(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fmaxf.cpp b/libc/src/math/amdgpu/fmaxf.cpp
index 59ee8259c025a..5913a85df6370 100644
--- a/libc/src/math/amdgpu/fmaxf.cpp
+++ b/libc/src/math/amdgpu/fmaxf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaxf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaxf, (float x, float y)) {
return __builtin_fmaxf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fmin.cpp b/libc/src/math/amdgpu/fmin.cpp
index 694eb664b599b..0d6f3521dcb70 100644
--- a/libc/src/math/amdgpu/fmin.cpp
+++ b/libc/src/math/amdgpu/fmin.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmin.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmin, (double x, double y)) {
return __builtin_fmin(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fminf.cpp b/libc/src/math/amdgpu/fminf.cpp
index 2060b71b0841f..42744abfb3b02 100644
--- a/libc/src/math/amdgpu/fminf.cpp
+++ b/libc/src/math/amdgpu/fminf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fminf, (float x, float y)) {
return __builtin_fminf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fmod.cpp b/libc/src/math/amdgpu/fmod.cpp
index 49d19c4decb96..0654cdd2abe08 100644
--- a/libc/src/math/amdgpu/fmod.cpp
+++ b/libc/src/math/amdgpu/fmod.cpp
@@ -8,12 +8,11 @@
#include "src/math/fmod.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmod, (double x, double y)) {
return __builtin_fmod(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/fmodf.cpp b/libc/src/math/amdgpu/fmodf.cpp
index 8fbcb0cc2ad9e..b689046468fbe 100644
--- a/libc/src/math/amdgpu/fmodf.cpp
+++ b/libc/src/math/amdgpu/fmodf.cpp
@@ -8,12 +8,11 @@
#include "src/math/fmodf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmodf, (float x, float y)) {
return __builtin_fmodf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/frexp.cpp b/libc/src/math/amdgpu/frexp.cpp
index 00e5187c0c719..0acf97342fa08 100644
--- a/libc/src/math/amdgpu/frexp.cpp
+++ b/libc/src/math/amdgpu/frexp.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, frexp, (double x, int *p)) {
return __builtin_frexp(x, p);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/frexpf.cpp b/libc/src/math/amdgpu/frexpf.cpp
index 2799e542efae2..d870bf3095b25 100644
--- a/libc/src/math/amdgpu/frexpf.cpp
+++ b/libc/src/math/amdgpu/frexpf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, frexpf, (float x, int *p)) {
return __builtin_frexpf(x, p);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/hypot.cpp b/libc/src/math/amdgpu/hypot.cpp
index dcf1152a75160..ffc13504c8f41 100644
--- a/libc/src/math/amdgpu/hypot.cpp
+++ b/libc/src/math/amdgpu/hypot.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, hypot, (double x, double y)) {
return __ocml_hypot_f64(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/hypotf.cpp b/libc/src/math/amdgpu/hypotf.cpp
index 68ec659d12e5b..811fc540488d3 100644
--- a/libc/src/math/amdgpu/hypotf.cpp
+++ b/libc/src/math/amdgpu/hypotf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, hypotf, (float x, float y)) {
return __ocml_hypot_f32(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/ilogb.cpp b/libc/src/math/amdgpu/ilogb.cpp
index 37f24dfd8c39c..4479908d38564 100644
--- a/libc/src/math/amdgpu/ilogb.cpp
+++ b/libc/src/math/amdgpu/ilogb.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ilogb, (double x)) { return __ocml_ilogb_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/ilogbf.cpp b/libc/src/math/amdgpu/ilogbf.cpp
index 56e74e1575f1d..cded285c72f38 100644
--- a/libc/src/math/amdgpu/ilogbf.cpp
+++ b/libc/src/math/amdgpu/ilogbf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ilogbf, (float x)) { return __ocml_ilogb_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/ldexp.cpp b/libc/src/math/amdgpu/ldexp.cpp
index 393eabb84e61b..70c5b0d6e555f 100644
--- a/libc/src/math/amdgpu/ldexp.cpp
+++ b/libc/src/math/amdgpu/ldexp.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, ldexp, (double x, int y)) {
return __builtin_ldexp(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/ldexpf.cpp b/libc/src/math/amdgpu/ldexpf.cpp
index 970603dd170eb..8dc7c132ee213 100644
--- a/libc/src/math/amdgpu/ldexpf.cpp
+++ b/libc/src/math/amdgpu/ldexpf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, ldexpf, (float x, int y)) {
return __builtin_ldexpf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/llrint.cpp b/libc/src/math/amdgpu/llrint.cpp
index 21129fe80a0c1..307420a9b8b26 100644
--- a/libc/src/math/amdgpu/llrint.cpp
+++ b/libc/src/math/amdgpu/llrint.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llrint, (double x)) {
return static_cast<long long>(__builtin_rint(x));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/llrintf.cpp b/libc/src/math/amdgpu/llrintf.cpp
index a6f9f43876010..23404990fb1bd 100644
--- a/libc/src/math/amdgpu/llrintf.cpp
+++ b/libc/src/math/amdgpu/llrintf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llrintf, (float x)) {
return static_cast<long long>(__builtin_rintf(x));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/log.cpp b/libc/src/math/amdgpu/log.cpp
index bd01adfa08a4d..3f2489580356f 100644
--- a/libc/src/math/amdgpu/log.cpp
+++ b/libc/src/math/amdgpu/log.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, log, (double x)) { return __ocml_log_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/log10.cpp b/libc/src/math/amdgpu/log10.cpp
index 75957c9aeb506..d522d5e84291d 100644
--- a/libc/src/math/amdgpu/log10.cpp
+++ b/libc/src/math/amdgpu/log10.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, log10, (double x)) { return __ocml_log10_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/log10f.cpp b/libc/src/math/amdgpu/log10f.cpp
index 9c12d6b11bcf0..47b9b162ad9db 100644
--- a/libc/src/math/amdgpu/log10f.cpp
+++ b/libc/src/math/amdgpu/log10f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, log10f, (float x)) { return __ocml_log10_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/log1p.cpp b/libc/src/math/amdgpu/log1p.cpp
index fc275196830f6..fae60e4485861 100644
--- a/libc/src/math/amdgpu/log1p.cpp
+++ b/libc/src/math/amdgpu/log1p.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, log1p, (double x)) { return __ocml_log1p_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/log1pf.cpp b/libc/src/math/amdgpu/log1pf.cpp
index b2d26fb1166fc..e7b1772158fcd 100644
--- a/libc/src/math/amdgpu/log1pf.cpp
+++ b/libc/src/math/amdgpu/log1pf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, log1pf, (float x)) { return __ocml_log1p_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/log2.cpp b/libc/src/math/amdgpu/log2.cpp
index 73f34b65a32f7..9d84f62dff6fc 100644
--- a/libc/src/math/amdgpu/log2.cpp
+++ b/libc/src/math/amdgpu/log2.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, log2, (double x)) { return __ocml_log2_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/log2f.cpp b/libc/src/math/amdgpu/log2f.cpp
index 3b62edacfa656..7742a6141c37d 100644
--- a/libc/src/math/amdgpu/log2f.cpp
+++ b/libc/src/math/amdgpu/log2f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, log2f, (float x)) { return __ocml_log2_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/logb.cpp b/libc/src/math/amdgpu/logb.cpp
index 4b68e281be874..1344fbb182af6 100644
--- a/libc/src/math/amdgpu/logb.cpp
+++ b/libc/src/math/amdgpu/logb.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, logb, (double x)) { return __ocml_logb_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/logbf.cpp b/libc/src/math/amdgpu/logbf.cpp
index bc7c462c7f927..fdb493fe28daf 100644
--- a/libc/src/math/amdgpu/logbf.cpp
+++ b/libc/src/math/amdgpu/logbf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, logbf, (float x)) { return __ocml_logb_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/logf.cpp b/libc/src/math/amdgpu/logf.cpp
index 17925672ef32f..d4d4b265ee5cd 100644
--- a/libc/src/math/amdgpu/logf.cpp
+++ b/libc/src/math/amdgpu/logf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, logf, (float x)) { return __ocml_log_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/lrint.cpp b/libc/src/math/amdgpu/lrint.cpp
index 715b552575789..b335b4f06393c 100644
--- a/libc/src/math/amdgpu/lrint.cpp
+++ b/libc/src/math/amdgpu/lrint.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lrint, (double x)) {
return static_cast<long>(__builtin_rint(x));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/lrintf.cpp b/libc/src/math/amdgpu/lrintf.cpp
index 387063803f27f..7959e76728a43 100644
--- a/libc/src/math/amdgpu/lrintf.cpp
+++ b/libc/src/math/amdgpu/lrintf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lrintf, (float x)) {
return static_cast<long>(__builtin_rintf(x));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/nearbyint.cpp b/libc/src/math/amdgpu/nearbyint.cpp
index 7d78c7241d023..9c7b600df7082 100644
--- a/libc/src/math/amdgpu/nearbyint.cpp
+++ b/libc/src/math/amdgpu/nearbyint.cpp
@@ -8,12 +8,11 @@
#include "src/math/nearbyint.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nearbyint, (double x)) {
return __builtin_nearbyint(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/nearbyintf.cpp b/libc/src/math/amdgpu/nearbyintf.cpp
index 4bd20dc58fb89..7fbe9f4f0e0be 100644
--- a/libc/src/math/amdgpu/nearbyintf.cpp
+++ b/libc/src/math/amdgpu/nearbyintf.cpp
@@ -8,12 +8,11 @@
#include "src/math/nearbyintf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nearbyintf, (float x)) {
return __builtin_nearbyintf(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/nextafter.cpp b/libc/src/math/amdgpu/nextafter.cpp
index 226b8a5a12547..5c74ef165268b 100644
--- a/libc/src/math/amdgpu/nextafter.cpp
+++ b/libc/src/math/amdgpu/nextafter.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nextafter, (double x, double y)) {
return __ocml_nextafter_f64(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/nextafterf.cpp b/libc/src/math/amdgpu/nextafterf.cpp
index 7bed2c17b6e12..a97b990a61fcd 100644
--- a/libc/src/math/amdgpu/nextafterf.cpp
+++ b/libc/src/math/amdgpu/nextafterf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nextafterf, (float x, float y)) {
return __ocml_nextafter_f32(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/platform.h b/libc/src/math/amdgpu/platform.h
index 472a9830e8bb3..29d6cac1fa492 100644
--- a/libc/src/math/amdgpu/platform.h
+++ b/libc/src/math/amdgpu/platform.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC_MATH_AMDGPU_PLATFORM_H
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The ROCm device library uses control globals to alter codegen for the
// different targets. To avoid needing to link them in manually we simply
@@ -50,6 +49,6 @@ extern const LIBC_INLINE_VAR uint32_t __oclc_ISA_version = 9000;
[[gnu::alias("__oclc_finite_only_opt")]] const uint8_t __oclc_finite_only_opt__;
[[gnu::alias("__oclc_ISA_version")]] const uint32_t __oclc_ISA_version__;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_AMDGPU_PLATFORM_H
diff --git a/libc/src/math/amdgpu/pow.cpp b/libc/src/math/amdgpu/pow.cpp
index 979ad6cda6ef0..e5056f67292d5 100644
--- a/libc/src/math/amdgpu/pow.cpp
+++ b/libc/src/math/amdgpu/pow.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, pow, (double x, double y)) {
return __ocml_pow_f64(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/powf.cpp b/libc/src/math/amdgpu/powf.cpp
index 6931934d4c11e..6114bcc642e11 100644
--- a/libc/src/math/amdgpu/powf.cpp
+++ b/libc/src/math/amdgpu/powf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, powf, (float x, float y)) {
return __ocml_pow_f32(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/powi.cpp b/libc/src/math/amdgpu/powi.cpp
index 6b31b471e4b20..b13cb52aaaf6a 100644
--- a/libc/src/math/amdgpu/powi.cpp
+++ b/libc/src/math/amdgpu/powi.cpp
@@ -8,14 +8,13 @@
#include "src/math/powi.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "declarations.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, powi, (double x, int y)) {
return __ocml_pown_f64(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/powif.cpp b/libc/src/math/amdgpu/powif.cpp
index 94f8a91d9c03b..7682f0e1a27a6 100644
--- a/libc/src/math/amdgpu/powif.cpp
+++ b/libc/src/math/amdgpu/powif.cpp
@@ -8,14 +8,13 @@
#include "src/math/powif.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "declarations.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, powif, (float x, int y)) {
return __ocml_pown_f32(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/remainder.cpp b/libc/src/math/amdgpu/remainder.cpp
index 9027204312e00..89b235f9c22af 100644
--- a/libc/src/math/amdgpu/remainder.cpp
+++ b/libc/src/math/amdgpu/remainder.cpp
@@ -8,12 +8,11 @@
#include "src/math/remainder.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, remainder, (double x, double y)) {
return __builtin_remainder(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/remainderf.cpp b/libc/src/math/amdgpu/remainderf.cpp
index 50df3b2ce25c1..9fee6f856dc8b 100644
--- a/libc/src/math/amdgpu/remainderf.cpp
+++ b/libc/src/math/amdgpu/remainderf.cpp
@@ -8,12 +8,11 @@
#include "src/math/remainderf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, remainderf, (float x, float y)) {
return __builtin_remainderf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/remquo.cpp b/libc/src/math/amdgpu/remquo.cpp
index 42c908e91c6c0..d8074a9626ecb 100644
--- a/libc/src/math/amdgpu/remquo.cpp
+++ b/libc/src/math/amdgpu/remquo.cpp
@@ -10,9 +10,8 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, remquo, (double x, double y, int *quo)) {
int tmp;
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(double, remquo, (double x, double y, int *quo)) {
return r;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/remquof.cpp b/libc/src/math/amdgpu/remquof.cpp
index 854d3bfe842fd..b6584dfb97c3b 100644
--- a/libc/src/math/amdgpu/remquof.cpp
+++ b/libc/src/math/amdgpu/remquof.cpp
@@ -10,9 +10,8 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, remquof, (float x, float y, int *quo)) {
int tmp;
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(float, remquof, (float x, float y, int *quo)) {
return r;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/rint.cpp b/libc/src/math/amdgpu/rint.cpp
index ac6837a4abc37..44d494a8ed57a 100644
--- a/libc/src/math/amdgpu/rint.cpp
+++ b/libc/src/math/amdgpu/rint.cpp
@@ -8,10 +8,9 @@
#include "src/math/rint.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, rint, (double x)) { return __builtin_rint(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/rintf.cpp b/libc/src/math/amdgpu/rintf.cpp
index 94093471a8d92..daf98d9436051 100644
--- a/libc/src/math/amdgpu/rintf.cpp
+++ b/libc/src/math/amdgpu/rintf.cpp
@@ -8,10 +8,9 @@
#include "src/math/rintf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, rintf, (float x)) { return __builtin_rintf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/round.cpp b/libc/src/math/amdgpu/round.cpp
index 0d2765f2e959f..9d8b5582f0407 100644
--- a/libc/src/math/amdgpu/round.cpp
+++ b/libc/src/math/amdgpu/round.cpp
@@ -8,10 +8,9 @@
#include "src/math/round.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, round, (double x)) { return __builtin_round(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/roundf.cpp b/libc/src/math/amdgpu/roundf.cpp
index 86e8ba3ac83d6..8743e4eb7fb8d 100644
--- a/libc/src/math/amdgpu/roundf.cpp
+++ b/libc/src/math/amdgpu/roundf.cpp
@@ -8,10 +8,9 @@
#include "src/math/roundf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, roundf, (float x)) { return __builtin_roundf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/scalbn.cpp b/libc/src/math/amdgpu/scalbn.cpp
index 05bbbc69b47a1..c2a43e03a7bcd 100644
--- a/libc/src/math/amdgpu/scalbn.cpp
+++ b/libc/src/math/amdgpu/scalbn.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, scalbn, (double x, int y)) {
return __builtin_amdgcn_ldexp(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/scalbnf.cpp b/libc/src/math/amdgpu/scalbnf.cpp
index f0e9e475674c3..63de26ccbc470 100644
--- a/libc/src/math/amdgpu/scalbnf.cpp
+++ b/libc/src/math/amdgpu/scalbnf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, scalbnf, (float x, int y)) {
return __builtin_amdgcn_ldexpf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/sin.cpp b/libc/src/math/amdgpu/sin.cpp
index f3d88af009ce4..dbc29a725db07 100644
--- a/libc/src/math/amdgpu/sin.cpp
+++ b/libc/src/math/amdgpu/sin.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, sin, (double x)) { return __ocml_sin_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/sincos.cpp b/libc/src/math/amdgpu/sincos.cpp
index 304ac0c7c6332..7cdd0d1f97690 100644
--- a/libc/src/math/amdgpu/sincos.cpp
+++ b/libc/src/math/amdgpu/sincos.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, sincos, (double x, double *sinptr, double *cosptr)) {
*sinptr = __ocml_sincos_f64(x, cosptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/sincosf.cpp b/libc/src/math/amdgpu/sincosf.cpp
index 1c4e9c6a2463f..37a5e2a6d11c2 100644
--- a/libc/src/math/amdgpu/sincosf.cpp
+++ b/libc/src/math/amdgpu/sincosf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, sincosf, (float x, float *sinptr, float *cosptr)) {
*sinptr = __ocml_sincos_f32(x, cosptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/sinf.cpp b/libc/src/math/amdgpu/sinf.cpp
index c6d64a63c755d..cda2c626f8ac6 100644
--- a/libc/src/math/amdgpu/sinf.cpp
+++ b/libc/src/math/amdgpu/sinf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sinf, (float x)) { return __ocml_sin_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/sinh.cpp b/libc/src/math/amdgpu/sinh.cpp
index 26314f46d0e97..66cacd19e4632 100644
--- a/libc/src/math/amdgpu/sinh.cpp
+++ b/libc/src/math/amdgpu/sinh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, sinh, (double x)) { return __ocml_sinh_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/sinhf.cpp b/libc/src/math/amdgpu/sinhf.cpp
index a4eb8e1a65283..5d3f5ea6b36ae 100644
--- a/libc/src/math/amdgpu/sinhf.cpp
+++ b/libc/src/math/amdgpu/sinhf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sinhf, (float x)) { return __ocml_sinh_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/sqrt.cpp b/libc/src/math/amdgpu/sqrt.cpp
index ed83b6e5c6cae..60ca5af4987b6 100644
--- a/libc/src/math/amdgpu/sqrt.cpp
+++ b/libc/src/math/amdgpu/sqrt.cpp
@@ -8,10 +8,9 @@
#include "src/math/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, sqrt, (double x)) { return __builtin_sqrt(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/sqrtf.cpp b/libc/src/math/amdgpu/sqrtf.cpp
index 851922c316452..e17f942a4d5fc 100644
--- a/libc/src/math/amdgpu/sqrtf.cpp
+++ b/libc/src/math/amdgpu/sqrtf.cpp
@@ -8,10 +8,9 @@
#include "src/math/sqrtf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sqrtf, (float x)) { return __builtin_sqrtf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/tan.cpp b/libc/src/math/amdgpu/tan.cpp
index c946dc2a3db67..6121a9319a2ab 100644
--- a/libc/src/math/amdgpu/tan.cpp
+++ b/libc/src/math/amdgpu/tan.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, tan, (double x)) { return __ocml_tan_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/tanf.cpp b/libc/src/math/amdgpu/tanf.cpp
index 8c93fc4f62369..fdd83ee7aeb94 100644
--- a/libc/src/math/amdgpu/tanf.cpp
+++ b/libc/src/math/amdgpu/tanf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, tanf, (float x)) { return __ocml_tan_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/tanh.cpp b/libc/src/math/amdgpu/tanh.cpp
index 834353e122abe..25a9c2954bf39 100644
--- a/libc/src/math/amdgpu/tanh.cpp
+++ b/libc/src/math/amdgpu/tanh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, tanh, (double x)) { return __ocml_tanh_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/tanhf.cpp b/libc/src/math/amdgpu/tanhf.cpp
index 5029596a8e6fd..a4bfd2095eb35 100644
--- a/libc/src/math/amdgpu/tanhf.cpp
+++ b/libc/src/math/amdgpu/tanhf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, tanhf, (float x)) { return __ocml_tanh_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/tgamma.cpp b/libc/src/math/amdgpu/tgamma.cpp
index 485a6a3def432..10f58d566f88a 100644
--- a/libc/src/math/amdgpu/tgamma.cpp
+++ b/libc/src/math/amdgpu/tgamma.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, tgamma, (double x)) { return __ocml_tgamma_f64(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/tgammaf.cpp b/libc/src/math/amdgpu/tgammaf.cpp
index e48a486c9c5e5..e7d22059a7c41 100644
--- a/libc/src/math/amdgpu/tgammaf.cpp
+++ b/libc/src/math/amdgpu/tgammaf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, tgammaf, (float x)) { return __ocml_tgamma_f32(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/trunc.cpp b/libc/src/math/amdgpu/trunc.cpp
index f60caa2a71d78..773600f0f2501 100644
--- a/libc/src/math/amdgpu/trunc.cpp
+++ b/libc/src/math/amdgpu/trunc.cpp
@@ -8,10 +8,9 @@
#include "src/math/trunc.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, trunc, (double x)) { return __builtin_trunc(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/amdgpu/truncf.cpp b/libc/src/math/amdgpu/truncf.cpp
index a6c9b8f188f02..534797a3e5860 100644
--- a/libc/src/math/amdgpu/truncf.cpp
+++ b/libc/src/math/amdgpu/truncf.cpp
@@ -8,10 +8,9 @@
#include "src/math/truncf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, truncf, (float x)) { return __builtin_truncf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/asin.h b/libc/src/math/asin.h
index 6516e403c4ba9..e443776e507d9 100644
--- a/libc/src/math/asin.h
+++ b/libc/src/math/asin.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ASIN_H
#define LLVM_LIBC_SRC_MATH_ASIN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double asin(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ASIN_H
diff --git a/libc/src/math/asinf.h b/libc/src/math/asinf.h
index ed0b8abd06105..227f10b0a5072 100644
--- a/libc/src/math/asinf.h
+++ b/libc/src/math/asinf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ASINF_H
#define LLVM_LIBC_SRC_MATH_ASINF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float asinf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ASINF_H
diff --git a/libc/src/math/asinh.h b/libc/src/math/asinh.h
index 45fbc7cfa7c29..418bf96179841 100644
--- a/libc/src/math/asinh.h
+++ b/libc/src/math/asinh.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ASINH_H
#define LLVM_LIBC_SRC_MATH_ASINH_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double asinh(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ASINH_H
diff --git a/libc/src/math/asinhf.h b/libc/src/math/asinhf.h
index d5787ee7d5e5e..32a697cbfad09 100644
--- a/libc/src/math/asinhf.h
+++ b/libc/src/math/asinhf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ASINHF_H
#define LLVM_LIBC_SRC_MATH_ASINHF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float asinhf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ASINHF_H
diff --git a/libc/src/math/atan.h b/libc/src/math/atan.h
index a9ba28a2efcd7..bcbc97a52ee6d 100644
--- a/libc/src/math/atan.h
+++ b/libc/src/math/atan.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ATAN_H
#define LLVM_LIBC_SRC_MATH_ATAN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double atan(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ATAN_H
diff --git a/libc/src/math/atan2.h b/libc/src/math/atan2.h
index 7bb2f96fe6444..024bbfb5fe9cb 100644
--- a/libc/src/math/atan2.h
+++ b/libc/src/math/atan2.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ATAN2_H
#define LLVM_LIBC_SRC_MATH_ATAN2_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double atan2(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ATAN2_H
diff --git a/libc/src/math/atan2f.h b/libc/src/math/atan2f.h
index ed60383cb925c..25d2de09342fa 100644
--- a/libc/src/math/atan2f.h
+++ b/libc/src/math/atan2f.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ATAN2F_H
#define LLVM_LIBC_SRC_MATH_ATAN2F_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float atan2f(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ATAN2F_H
diff --git a/libc/src/math/atanf.h b/libc/src/math/atanf.h
index 0be32f3c1dfcd..bb4c5a8bd963c 100644
--- a/libc/src/math/atanf.h
+++ b/libc/src/math/atanf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ATANF_H
#define LLVM_LIBC_SRC_MATH_ATANF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float atanf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ATANF_H
diff --git a/libc/src/math/atanh.h b/libc/src/math/atanh.h
index 485c824a1f2ca..dc84d07c02a0a 100644
--- a/libc/src/math/atanh.h
+++ b/libc/src/math/atanh.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ATANH_H
#define LLVM_LIBC_SRC_MATH_ATANH_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double atanh(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ATANH_H
diff --git a/libc/src/math/atanhf.h b/libc/src/math/atanhf.h
index 0a4d899c78e4f..589ffd022366a 100644
--- a/libc/src/math/atanhf.h
+++ b/libc/src/math/atanhf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ATANHF_H
#define LLVM_LIBC_SRC_MATH_ATANHF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float atanhf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ATANHF_H
diff --git a/libc/src/math/canonicalize.h b/libc/src/math/canonicalize.h
index 6b6b1e07e923c..b7b5959fb667c 100644
--- a/libc/src/math/canonicalize.h
+++ b/libc/src/math/canonicalize.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_CANONICALIZE_H
#define LLVM_LIBC_SRC_MATH_CANONICALIZE_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int canonicalize(double *cx, const double *x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CANONICALIZE_H
diff --git a/libc/src/math/canonicalizef.h b/libc/src/math/canonicalizef.h
index 94bc48b9b6aa2..556607f133496 100644
--- a/libc/src/math/canonicalizef.h
+++ b/libc/src/math/canonicalizef.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_CANONICALIZEF_H
#define LLVM_LIBC_SRC_MATH_CANONICALIZEF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int canonicalizef(float *cx, const float *x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CANONICALIZEF_H
diff --git a/libc/src/math/canonicalizef128.h b/libc/src/math/canonicalizef128.h
index eeeb7e3fb4526..6db8009475376 100644
--- a/libc/src/math/canonicalizef128.h
+++ b/libc/src/math/canonicalizef128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_CANONICALIZEF128_H
#define LLVM_LIBC_SRC_MATH_CANONICALIZEF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int canonicalizef128(float128 *cx, const float128 *x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CANONICALIZEF128_H
diff --git a/libc/src/math/canonicalizef16.h b/libc/src/math/canonicalizef16.h
index c47cec682574e..102af01c0c2ba 100644
--- a/libc/src/math/canonicalizef16.h
+++ b/libc/src/math/canonicalizef16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_CANONICALIZEF16_H
#define LLVM_LIBC_SRC_MATH_CANONICALIZEF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int canonicalizef16(float16 *cx, const float16 *x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CANONICALIZEF16_H
diff --git a/libc/src/math/canonicalizel.h b/libc/src/math/canonicalizel.h
index 1c6b9e68d2487..1cab29e8e8b1c 100644
--- a/libc/src/math/canonicalizel.h
+++ b/libc/src/math/canonicalizel.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_CANONICALIZEL_H
#define LLVM_LIBC_SRC_MATH_CANONICALIZEL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int canonicalizel(long double *cx, const long double *x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CANONICALIZEL_H
diff --git a/libc/src/math/cbrtf.h b/libc/src/math/cbrtf.h
index 1187efbdd38b2..74744594f2986 100644
--- a/libc/src/math/cbrtf.h
+++ b/libc/src/math/cbrtf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_CBRTF_H
#define LLVM_LIBC_SRC_MATH_CBRTF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float cbrtf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CBRTF_H
diff --git a/libc/src/math/ceil.h b/libc/src/math/ceil.h
index 4cf262e6957aa..c424deec34ca8 100644
--- a/libc/src/math/ceil.h
+++ b/libc/src/math/ceil.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_CEIL_H
#define LLVM_LIBC_SRC_MATH_CEIL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double ceil(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CEIL_H
diff --git a/libc/src/math/ceilf.h b/libc/src/math/ceilf.h
index 359465c15b62b..0fa3aa8bc048e 100644
--- a/libc/src/math/ceilf.h
+++ b/libc/src/math/ceilf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_CEILF_H
#define LLVM_LIBC_SRC_MATH_CEILF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float ceilf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CEILF_H
diff --git a/libc/src/math/ceilf128.h b/libc/src/math/ceilf128.h
index 211b8131a9559..b0c4020718b29 100644
--- a/libc/src/math/ceilf128.h
+++ b/libc/src/math/ceilf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_CEILF128_H
#define LLVM_LIBC_SRC_MATH_CEILF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 ceilf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CEILF128_H
diff --git a/libc/src/math/ceilf16.h b/libc/src/math/ceilf16.h
index b0e988b2f097f..36a6bd219d5b5 100644
--- a/libc/src/math/ceilf16.h
+++ b/libc/src/math/ceilf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_CEILF16_H
#define LLVM_LIBC_SRC_MATH_CEILF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 ceilf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CEILF16_H
diff --git a/libc/src/math/ceill.h b/libc/src/math/ceill.h
index ce79cb562c951..fbe6563d21923 100644
--- a/libc/src/math/ceill.h
+++ b/libc/src/math/ceill.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_CEILL_H
#define LLVM_LIBC_SRC_MATH_CEILL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double ceill(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_CEILL_H
diff --git a/libc/src/math/copysign.h b/libc/src/math/copysign.h
index a115f120477c5..004240f412bf1 100644
--- a/libc/src/math/copysign.h
+++ b/libc/src/math/copysign.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_COPYSIGN_H
#define LLVM_LIBC_SRC_MATH_COPYSIGN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double copysign(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COPYSIGN_H
diff --git a/libc/src/math/copysignf.h b/libc/src/math/copysignf.h
index 3877f7b299aad..503e7cbfeda6e 100644
--- a/libc/src/math/copysignf.h
+++ b/libc/src/math/copysignf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_COPYSIGNF_H
#define LLVM_LIBC_SRC_MATH_COPYSIGNF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float copysignf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COPYSIGNF_H
diff --git a/libc/src/math/copysignf128.h b/libc/src/math/copysignf128.h
index b001b8e61b258..06c194985d720 100644
--- a/libc/src/math/copysignf128.h
+++ b/libc/src/math/copysignf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_COPYSIGNF128_H
#define LLVM_LIBC_SRC_MATH_COPYSIGNF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 copysignf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COPYSIGNF128_H
diff --git a/libc/src/math/copysignf16.h b/libc/src/math/copysignf16.h
index 0b0e4865b3eb1..3ddde9fafaa70 100644
--- a/libc/src/math/copysignf16.h
+++ b/libc/src/math/copysignf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_COPYSIGNF16_H
#define LLVM_LIBC_SRC_MATH_COPYSIGNF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 copysignf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COPYSIGNF16_H
diff --git a/libc/src/math/copysignl.h b/libc/src/math/copysignl.h
index 6c5e8fbcfeb00..8b8b37bd85d95 100644
--- a/libc/src/math/copysignl.h
+++ b/libc/src/math/copysignl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_COPYSIGNL_H
#define LLVM_LIBC_SRC_MATH_COPYSIGNL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double copysignl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COPYSIGNL_H
diff --git a/libc/src/math/cos.h b/libc/src/math/cos.h
index 7c1a88f744fc7..aa97ccf66e6c7 100644
--- a/libc/src/math/cos.h
+++ b/libc/src/math/cos.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_COS_H
#define LLVM_LIBC_SRC_MATH_COS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double cos(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COS_H
diff --git a/libc/src/math/cosf.h b/libc/src/math/cosf.h
index 7942eaf471eb2..158f311910812 100644
--- a/libc/src/math/cosf.h
+++ b/libc/src/math/cosf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_COSF_H
#define LLVM_LIBC_SRC_MATH_COSF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float cosf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COSF_H
diff --git a/libc/src/math/cosh.h b/libc/src/math/cosh.h
index 4a4be4a5d4a14..f0c8b6bced454 100644
--- a/libc/src/math/cosh.h
+++ b/libc/src/math/cosh.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_COSH_H
#define LLVM_LIBC_SRC_MATH_COSH_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double cosh(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COSH_H
diff --git a/libc/src/math/coshf.h b/libc/src/math/coshf.h
index 28abada7f887e..c470a8c943b50 100644
--- a/libc/src/math/coshf.h
+++ b/libc/src/math/coshf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_COSHF_H
#define LLVM_LIBC_SRC_MATH_COSHF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float coshf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COSHF_H
diff --git a/libc/src/math/cospif.h b/libc/src/math/cospif.h
index fbe011f0ad6e7..50935bc33e59d 100644
--- a/libc/src/math/cospif.h
+++ b/libc/src/math/cospif.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_COSPIF_H
#define LLVM_LIBC_SRC_MATH_COSPIF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float cospif(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_COSPIF_H
diff --git a/libc/src/math/erf.h b/libc/src/math/erf.h
index bd16abca82bd1..a38c92410de13 100644
--- a/libc/src/math/erf.h
+++ b/libc/src/math/erf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ERF_H
#define LLVM_LIBC_SRC_MATH_ERF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double erf(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ERF_H
diff --git a/libc/src/math/erff.h b/libc/src/math/erff.h
index 24cfa83067308..f6c56c7dddab6 100644
--- a/libc/src/math/erff.h
+++ b/libc/src/math/erff.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ERFF_H
#define LLVM_LIBC_SRC_MATH_ERFF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float erff(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ERFF_H
diff --git a/libc/src/math/exp.h b/libc/src/math/exp.h
index 1e1e672c36bb6..6d60a3bc4802f 100644
--- a/libc/src/math/exp.h
+++ b/libc/src/math/exp.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_EXP_H
#define LLVM_LIBC_SRC_MATH_EXP_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double exp(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_EXP_H
diff --git a/libc/src/math/exp10.h b/libc/src/math/exp10.h
index 06e9be54306d3..081b419275a33 100644
--- a/libc/src/math/exp10.h
+++ b/libc/src/math/exp10.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_EXP10_H
#define LLVM_LIBC_SRC_MATH_EXP10_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double exp10(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_EXP10_H
diff --git a/libc/src/math/exp10f.h b/libc/src/math/exp10f.h
index 0e537421c66a9..4df5c461c1f56 100644
--- a/libc/src/math/exp10f.h
+++ b/libc/src/math/exp10f.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_EXP10F_H
#define LLVM_LIBC_SRC_MATH_EXP10F_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float exp10f(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_EXP10F_H
diff --git a/libc/src/math/exp2.h b/libc/src/math/exp2.h
index 50b11ee12e6d8..2feccf6128e76 100644
--- a/libc/src/math/exp2.h
+++ b/libc/src/math/exp2.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_EXP2_H
#define LLVM_LIBC_SRC_MATH_EXP2_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double exp2(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_EXP2_H
diff --git a/libc/src/math/exp2f.h b/libc/src/math/exp2f.h
index 994371c0adc87..13af54c02468f 100644
--- a/libc/src/math/exp2f.h
+++ b/libc/src/math/exp2f.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_EXP2F_H
#define LLVM_LIBC_SRC_MATH_EXP2F_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float exp2f(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_EXP2F_H
diff --git a/libc/src/math/exp2m1f.h b/libc/src/math/exp2m1f.h
index 71b15885912c4..0eaf6b00e958c 100644
--- a/libc/src/math/exp2m1f.h
+++ b/libc/src/math/exp2m1f.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_EXP2M1F_H
#define LLVM_LIBC_SRC_MATH_EXP2M1F_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float exp2m1f(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_EXP2M1F_H
diff --git a/libc/src/math/expf.h b/libc/src/math/expf.h
index e82b762234597..38837cba41d53 100644
--- a/libc/src/math/expf.h
+++ b/libc/src/math/expf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_EXPF_H
#define LLVM_LIBC_SRC_MATH_EXPF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float expf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_EXPF_H
diff --git a/libc/src/math/expm1.h b/libc/src/math/expm1.h
index 216e8b8f0d515..52409290a5ccf 100644
--- a/libc/src/math/expm1.h
+++ b/libc/src/math/expm1.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_EXPM1_H
#define LLVM_LIBC_SRC_MATH_EXPM1_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double expm1(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_EXPM1_H
diff --git a/libc/src/math/expm1f.h b/libc/src/math/expm1f.h
index e3539c57138f8..359cbeec72f6c 100644
--- a/libc/src/math/expm1f.h
+++ b/libc/src/math/expm1f.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_EXPM1F_H
#define LLVM_LIBC_SRC_MATH_EXPM1F_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float expm1f(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_EXPM1F_H
diff --git a/libc/src/math/f16add.h b/libc/src/math/f16add.h
index 1e794fd5833bb..763a0787d860d 100644
--- a/libc/src/math/f16add.h
+++ b/libc/src/math/f16add.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16ADD_H
#define LLVM_LIBC_SRC_MATH_F16ADD_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16add(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16ADD_H
diff --git a/libc/src/math/f16addf.h b/libc/src/math/f16addf.h
index d9cd0cffb77de..31d0e786584e6 100644
--- a/libc/src/math/f16addf.h
+++ b/libc/src/math/f16addf.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16ADDF_H
#define LLVM_LIBC_SRC_MATH_F16ADDF_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16addf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16ADDF_H
diff --git a/libc/src/math/f16addf128.h b/libc/src/math/f16addf128.h
index aabb5ebdaa2f2..284ce1d303775 100644
--- a/libc/src/math/f16addf128.h
+++ b/libc/src/math/f16addf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16ADDF128_H
#define LLVM_LIBC_SRC_MATH_F16ADDF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16addf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16ADDF128_H
diff --git a/libc/src/math/f16addl.h b/libc/src/math/f16addl.h
index b39a2901d1ecc..6a7267a10d0c6 100644
--- a/libc/src/math/f16addl.h
+++ b/libc/src/math/f16addl.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16ADDL_H
#define LLVM_LIBC_SRC_MATH_F16ADDL_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16addl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16ADDL_H
diff --git a/libc/src/math/f16div.h b/libc/src/math/f16div.h
index 4e1724ffefa30..3807bc02276c9 100644
--- a/libc/src/math/f16div.h
+++ b/libc/src/math/f16div.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16DIV_H
#define LLVM_LIBC_SRC_MATH_F16DIV_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16div(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16DIV_H
diff --git a/libc/src/math/f16divf.h b/libc/src/math/f16divf.h
index 351cffd38dc8f..a3359d9e47944 100644
--- a/libc/src/math/f16divf.h
+++ b/libc/src/math/f16divf.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16DIVF_H
#define LLVM_LIBC_SRC_MATH_F16DIVF_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16divf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16DIVF_H
diff --git a/libc/src/math/f16divf128.h b/libc/src/math/f16divf128.h
index b515419dfc719..2f63535ca27ce 100644
--- a/libc/src/math/f16divf128.h
+++ b/libc/src/math/f16divf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16DIVF128_H
#define LLVM_LIBC_SRC_MATH_F16DIVF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16divf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16DIVF128_H
diff --git a/libc/src/math/f16divl.h b/libc/src/math/f16divl.h
index 61a37747e721c..ad9999135b588 100644
--- a/libc/src/math/f16divl.h
+++ b/libc/src/math/f16divl.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16DIVL_H
#define LLVM_LIBC_SRC_MATH_F16DIVL_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16divl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16DIVL_H
diff --git a/libc/src/math/f16fma.h b/libc/src/math/f16fma.h
index d2628e317697e..d9505f88f37af 100644
--- a/libc/src/math/f16fma.h
+++ b/libc/src/math/f16fma.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16FMA_H
#define LLVM_LIBC_SRC_MATH_F16FMA_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16fma(double x, double y, double z);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16FMA_H
diff --git a/libc/src/math/f16fmaf.h b/libc/src/math/f16fmaf.h
index 627afae5cb0ee..d92cb43c292eb 100644
--- a/libc/src/math/f16fmaf.h
+++ b/libc/src/math/f16fmaf.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16FMAF_H
#define LLVM_LIBC_SRC_MATH_F16FMAF_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16fmaf(float x, float y, float z);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16FMAF_H
diff --git a/libc/src/math/f16fmaf128.h b/libc/src/math/f16fmaf128.h
index c8f81d42608f9..9203b4d30d212 100644
--- a/libc/src/math/f16fmaf128.h
+++ b/libc/src/math/f16fmaf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16FMAF128_H
#define LLVM_LIBC_SRC_MATH_F16FMAF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16fmaf128(float128 x, float128 y, float128 z);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16FMAF128_H
diff --git a/libc/src/math/f16fmal.h b/libc/src/math/f16fmal.h
index ff35f637f7f04..6f5dd33aa18f6 100644
--- a/libc/src/math/f16fmal.h
+++ b/libc/src/math/f16fmal.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16FMAL_H
#define LLVM_LIBC_SRC_MATH_F16FMAL_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16fmal(long double x, long double y, long double z);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16FMAL_H
diff --git a/libc/src/math/f16sqrt.h b/libc/src/math/f16sqrt.h
index 27c6f3454891d..f1134ac5ee2b9 100644
--- a/libc/src/math/f16sqrt.h
+++ b/libc/src/math/f16sqrt.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16SQRT_H
#define LLVM_LIBC_SRC_MATH_F16SQRT_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16sqrt(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16SQRT_H
diff --git a/libc/src/math/f16sqrtf.h b/libc/src/math/f16sqrtf.h
index 0471b02da0f3c..197ebe6db8016 100644
--- a/libc/src/math/f16sqrtf.h
+++ b/libc/src/math/f16sqrtf.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16SQRTF_H
#define LLVM_LIBC_SRC_MATH_F16SQRTF_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16sqrtf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16SQRTF_H
diff --git a/libc/src/math/f16sqrtf128.h b/libc/src/math/f16sqrtf128.h
index 713bbe14023c2..61a6ce9ea5a5d 100644
--- a/libc/src/math/f16sqrtf128.h
+++ b/libc/src/math/f16sqrtf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16SQRTF128_H
#define LLVM_LIBC_SRC_MATH_F16SQRTF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16sqrtf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16SQRTF128_H
diff --git a/libc/src/math/f16sqrtl.h b/libc/src/math/f16sqrtl.h
index 8238f9eb3a099..fd3c55fc95f32 100644
--- a/libc/src/math/f16sqrtl.h
+++ b/libc/src/math/f16sqrtl.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16SQRTL_H
#define LLVM_LIBC_SRC_MATH_F16SQRTL_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16sqrtl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16SQRTL_H
diff --git a/libc/src/math/f16sub.h b/libc/src/math/f16sub.h
index fbceba8a53c47..66f82daada019 100644
--- a/libc/src/math/f16sub.h
+++ b/libc/src/math/f16sub.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16SUB_H
#define LLVM_LIBC_SRC_MATH_F16SUB_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16sub(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16SUB_H
diff --git a/libc/src/math/f16subf.h b/libc/src/math/f16subf.h
index 255953a39cd3f..1d04a4c952d17 100644
--- a/libc/src/math/f16subf.h
+++ b/libc/src/math/f16subf.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16SUBF_H
#define LLVM_LIBC_SRC_MATH_F16SUBF_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16subf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16SUBF_H
diff --git a/libc/src/math/f16subf128.h b/libc/src/math/f16subf128.h
index fae3360a3d5cd..eb674297ba266 100644
--- a/libc/src/math/f16subf128.h
+++ b/libc/src/math/f16subf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16SUBF128_H
#define LLVM_LIBC_SRC_MATH_F16SUBF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16subf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16SUBF128_H
diff --git a/libc/src/math/f16subl.h b/libc/src/math/f16subl.h
index b4e3c3ca7631f..43b44a57a604e 100644
--- a/libc/src/math/f16subl.h
+++ b/libc/src/math/f16subl.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_F16SUBL_H
#define LLVM_LIBC_SRC_MATH_F16SUBL_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 f16subl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_F16SUBL_H
diff --git a/libc/src/math/fabs.h b/libc/src/math/fabs.h
index c2f179afe747a..0aad5ea1f69f9 100644
--- a/libc/src/math/fabs.h
+++ b/libc/src/math/fabs.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FABS_H
#define LLVM_LIBC_SRC_MATH_FABS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fabs(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FABS_H
diff --git a/libc/src/math/fabsf.h b/libc/src/math/fabsf.h
index 52347d9c1478d..ca2cc106a08b2 100644
--- a/libc/src/math/fabsf.h
+++ b/libc/src/math/fabsf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FABSF_H
#define LLVM_LIBC_SRC_MATH_FABSF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fabsf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FABSF_H
diff --git a/libc/src/math/fabsf128.h b/libc/src/math/fabsf128.h
index 4507e57c3cdc4..0a275025a5cfe 100644
--- a/libc/src/math/fabsf128.h
+++ b/libc/src/math/fabsf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FABSF128_H
#define LLVM_LIBC_SRC_MATH_FABSF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fabsf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FABSF128_H
diff --git a/libc/src/math/fabsf16.h b/libc/src/math/fabsf16.h
index f48a51f5ff58e..532662a77e9a6 100644
--- a/libc/src/math/fabsf16.h
+++ b/libc/src/math/fabsf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FABSF16_H
#define LLVM_LIBC_SRC_MATH_FABSF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fabsf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FABSF16_H
diff --git a/libc/src/math/fabsl.h b/libc/src/math/fabsl.h
index a04446015a8cd..b3df8bffed105 100644
--- a/libc/src/math/fabsl.h
+++ b/libc/src/math/fabsl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FABSL_H
#define LLVM_LIBC_SRC_MATH_FABSL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fabsl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FABSL_H
diff --git a/libc/src/math/fdim.h b/libc/src/math/fdim.h
index 19a9e99bf49b1..457cb470a4e2b 100644
--- a/libc/src/math/fdim.h
+++ b/libc/src/math/fdim.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FDIM_H
#define LLVM_LIBC_SRC_MATH_FDIM_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fdim(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FDIM_H
diff --git a/libc/src/math/fdimf.h b/libc/src/math/fdimf.h
index b90bb456afbf2..01d5a530b8cca 100644
--- a/libc/src/math/fdimf.h
+++ b/libc/src/math/fdimf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FDIMF_H
#define LLVM_LIBC_SRC_MATH_FDIMF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fdimf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FDIMF_H
diff --git a/libc/src/math/fdimf128.h b/libc/src/math/fdimf128.h
index a5e1387042b71..f0485aba4822c 100644
--- a/libc/src/math/fdimf128.h
+++ b/libc/src/math/fdimf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FDIMF128_H
#define LLVM_LIBC_SRC_MATH_FDIMF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fdimf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FDIMF128_H
diff --git a/libc/src/math/fdimf16.h b/libc/src/math/fdimf16.h
index e3aac7b8a1532..0aa23810c64fa 100644
--- a/libc/src/math/fdimf16.h
+++ b/libc/src/math/fdimf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FDIMF16_H
#define LLVM_LIBC_SRC_MATH_FDIMF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fdimf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FDIMF16_H
diff --git a/libc/src/math/fdiml.h b/libc/src/math/fdiml.h
index 226860108b08a..4b18d9a2590a4 100644
--- a/libc/src/math/fdiml.h
+++ b/libc/src/math/fdiml.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FDIML_H
#define LLVM_LIBC_SRC_MATH_FDIML_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fdiml(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FDIML_H
diff --git a/libc/src/math/floor.h b/libc/src/math/floor.h
index d6c61955c4122..2920c7a7ee45d 100644
--- a/libc/src/math/floor.h
+++ b/libc/src/math/floor.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FLOOR_H
#define LLVM_LIBC_SRC_MATH_FLOOR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double floor(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FLOOR_H
diff --git a/libc/src/math/floorf.h b/libc/src/math/floorf.h
index c9dfcf6e2782f..52d6dd701fa9b 100644
--- a/libc/src/math/floorf.h
+++ b/libc/src/math/floorf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FLOORF_H
#define LLVM_LIBC_SRC_MATH_FLOORF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float floorf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FLOORF_H
diff --git a/libc/src/math/floorf128.h b/libc/src/math/floorf128.h
index 9af48b259fb2a..b97c4b6c6cece 100644
--- a/libc/src/math/floorf128.h
+++ b/libc/src/math/floorf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FLOORF128_H
#define LLVM_LIBC_SRC_MATH_FLOORF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 floorf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FLOORF128_H
diff --git a/libc/src/math/floorf16.h b/libc/src/math/floorf16.h
index c9b1f48363d75..4e5e196105cf6 100644
--- a/libc/src/math/floorf16.h
+++ b/libc/src/math/floorf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FLOORF16_H
#define LLVM_LIBC_SRC_MATH_FLOORF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 floorf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FLOORF16_H
diff --git a/libc/src/math/floorl.h b/libc/src/math/floorl.h
index 4597b4e089a99..ef53b29e73588 100644
--- a/libc/src/math/floorl.h
+++ b/libc/src/math/floorl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FLOORL_H
#define LLVM_LIBC_SRC_MATH_FLOORL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double floorl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FLOORL_H
diff --git a/libc/src/math/fma.h b/libc/src/math/fma.h
index a705228183882..7f0608ea4aaa6 100644
--- a/libc/src/math/fma.h
+++ b/libc/src/math/fma.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMA_H
#define LLVM_LIBC_SRC_MATH_FMA_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fma(double x, double y, double z);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMA_H
diff --git a/libc/src/math/fmaf.h b/libc/src/math/fmaf.h
index b7335c4ca56a6..29e5bdc3e2335 100644
--- a/libc/src/math/fmaf.h
+++ b/libc/src/math/fmaf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAF_H
#define LLVM_LIBC_SRC_MATH_FMAF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fmaf(float x, float y, float z);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAF_H
diff --git a/libc/src/math/fmax.h b/libc/src/math/fmax.h
index 01128748bd677..64baa4d261dba 100644
--- a/libc/src/math/fmax.h
+++ b/libc/src/math/fmax.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAX_H
#define LLVM_LIBC_SRC_MATH_FMAX_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fmax(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAX_H
diff --git a/libc/src/math/fmaxf.h b/libc/src/math/fmaxf.h
index af6a0cb954c95..1126323e2a4b2 100644
--- a/libc/src/math/fmaxf.h
+++ b/libc/src/math/fmaxf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXF_H
#define LLVM_LIBC_SRC_MATH_FMAXF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fmaxf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXF_H
diff --git a/libc/src/math/fmaxf128.h b/libc/src/math/fmaxf128.h
index 47bf3541982ab..a4407d9655afa 100644
--- a/libc/src/math/fmaxf128.h
+++ b/libc/src/math/fmaxf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXF128_H
#define LLVM_LIBC_SRC_MATH_FMAXF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fmaxf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXF128_H
diff --git a/libc/src/math/fmaxf16.h b/libc/src/math/fmaxf16.h
index 904816009602f..bf608f82c420a 100644
--- a/libc/src/math/fmaxf16.h
+++ b/libc/src/math/fmaxf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXF16_H
#define LLVM_LIBC_SRC_MATH_FMAXF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fmaxf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXF16_H
diff --git a/libc/src/math/fmaximum.h b/libc/src/math/fmaximum.h
index 818c4281d02ee..8eac02b17b79a 100644
--- a/libc/src/math/fmaximum.h
+++ b/libc/src/math/fmaximum.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fmaximum(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_H
diff --git a/libc/src/math/fmaximum_mag.h b/libc/src/math/fmaximum_mag.h
index d4954e32a08fe..31b7c0fcf7ee3 100644
--- a/libc/src/math/fmaximum_mag.h
+++ b/libc/src/math/fmaximum_mag.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fmaximum_mag(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_H
diff --git a/libc/src/math/fmaximum_mag_num.h b/libc/src/math/fmaximum_mag_num.h
index debb0170366a1..c4ff243846e03 100644
--- a/libc/src/math/fmaximum_mag_num.h
+++ b/libc/src/math/fmaximum_mag_num.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUM_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUM_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fmaximum_mag_num(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUM_H
diff --git a/libc/src/math/fmaximum_mag_numf.h b/libc/src/math/fmaximum_mag_numf.h
index 0ec05c35e92d2..702903ab8bcfe 100644
--- a/libc/src/math/fmaximum_mag_numf.h
+++ b/libc/src/math/fmaximum_mag_numf.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUMF_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUMF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fmaximum_mag_numf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUMF_H
diff --git a/libc/src/math/fmaximum_mag_numf128.h b/libc/src/math/fmaximum_mag_numf128.h
index a263f98aabcf1..2afae7fc37c46 100644
--- a/libc/src/math/fmaximum_mag_numf128.h
+++ b/libc/src/math/fmaximum_mag_numf128.h
@@ -10,13 +10,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUMF128_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUMF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fmaximum_mag_numf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUMF128_H
diff --git a/libc/src/math/fmaximum_mag_numf16.h b/libc/src/math/fmaximum_mag_numf16.h
index 1bf2e461efa4b..4c963d4dccc73 100644
--- a/libc/src/math/fmaximum_mag_numf16.h
+++ b/libc/src/math/fmaximum_mag_numf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUMF16_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUMF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fmaximum_mag_numf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUMF16_H
diff --git a/libc/src/math/fmaximum_mag_numl.h b/libc/src/math/fmaximum_mag_numl.h
index 9fbc63842bd27..32f9ae9708a65 100644
--- a/libc/src/math/fmaximum_mag_numl.h
+++ b/libc/src/math/fmaximum_mag_numl.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUML_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUML_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fmaximum_mag_numl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAG_NUML_H
diff --git a/libc/src/math/fmaximum_magf.h b/libc/src/math/fmaximum_magf.h
index 73ffd2e5bc4a5..1bfcc795f8f81 100644
--- a/libc/src/math/fmaximum_magf.h
+++ b/libc/src/math/fmaximum_magf.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGF_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fmaximum_magf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGF_H
diff --git a/libc/src/math/fmaximum_magf128.h b/libc/src/math/fmaximum_magf128.h
index fb68af7e6a0c9..23c466b74cce8 100644
--- a/libc/src/math/fmaximum_magf128.h
+++ b/libc/src/math/fmaximum_magf128.h
@@ -10,13 +10,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGF128_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fmaximum_magf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGF128_H
diff --git a/libc/src/math/fmaximum_magf16.h b/libc/src/math/fmaximum_magf16.h
index 32aee6e3822b5..e5f57d3b7f1df 100644
--- a/libc/src/math/fmaximum_magf16.h
+++ b/libc/src/math/fmaximum_magf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGF16_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fmaximum_magf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGF16_H
diff --git a/libc/src/math/fmaximum_magl.h b/libc/src/math/fmaximum_magl.h
index 8745f6aaa90a9..23b283cb5dbc2 100644
--- a/libc/src/math/fmaximum_magl.h
+++ b/libc/src/math/fmaximum_magl.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGL_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fmaximum_magl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_MAGL_H
diff --git a/libc/src/math/fmaximum_num.h b/libc/src/math/fmaximum_num.h
index df4bfcb6e38be..ce3ce12ca64b4 100644
--- a/libc/src/math/fmaximum_num.h
+++ b/libc/src/math/fmaximum_num.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_NUM_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_NUM_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fmaximum_num(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_NUM_H
diff --git a/libc/src/math/fmaximum_numf.h b/libc/src/math/fmaximum_numf.h
index 65997154bdae3..b3243ed16be9f 100644
--- a/libc/src/math/fmaximum_numf.h
+++ b/libc/src/math/fmaximum_numf.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_NUMF_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_NUMF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fmaximum_numf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_NUMF_H
diff --git a/libc/src/math/fmaximum_numf128.h b/libc/src/math/fmaximum_numf128.h
index 1e9bd8dfb81aa..d55183ce88cc6 100644
--- a/libc/src/math/fmaximum_numf128.h
+++ b/libc/src/math/fmaximum_numf128.h
@@ -10,13 +10,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_NUMF128_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_NUMF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fmaximum_numf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_NUMF128_H
diff --git a/libc/src/math/fmaximum_numf16.h b/libc/src/math/fmaximum_numf16.h
index 3a2b2305b8282..b450a45956483 100644
--- a/libc/src/math/fmaximum_numf16.h
+++ b/libc/src/math/fmaximum_numf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_NUMF16_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_NUMF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fmaximum_numf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_NUMF16_H
diff --git a/libc/src/math/fmaximum_numl.h b/libc/src/math/fmaximum_numl.h
index fc1d3ca38526b..f668cbdf73151 100644
--- a/libc/src/math/fmaximum_numl.h
+++ b/libc/src/math/fmaximum_numl.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUM_NUML_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUM_NUML_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fmaximum_numl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUM_NUML_H
diff --git a/libc/src/math/fmaximumf.h b/libc/src/math/fmaximumf.h
index 9c4c54486507d..4eee696ce1521 100644
--- a/libc/src/math/fmaximumf.h
+++ b/libc/src/math/fmaximumf.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUMF_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUMF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fmaximumf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUMF_H
diff --git a/libc/src/math/fmaximumf128.h b/libc/src/math/fmaximumf128.h
index 3cc6fa023c797..4a214ef096e10 100644
--- a/libc/src/math/fmaximumf128.h
+++ b/libc/src/math/fmaximumf128.h
@@ -10,13 +10,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUMF128_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUMF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fmaximumf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUMF128_H
diff --git a/libc/src/math/fmaximumf16.h b/libc/src/math/fmaximumf16.h
index 8a81e81b9341d..806339fde6830 100644
--- a/libc/src/math/fmaximumf16.h
+++ b/libc/src/math/fmaximumf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUMF16_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUMF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fmaximumf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUMF16_H
diff --git a/libc/src/math/fmaximuml.h b/libc/src/math/fmaximuml.h
index 71310c2ccdec3..ba8a8b12110c7 100644
--- a/libc/src/math/fmaximuml.h
+++ b/libc/src/math/fmaximuml.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXIMUML_H
#define LLVM_LIBC_SRC_MATH_FMAXIMUML_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fmaximuml(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXIMUML_H
diff --git a/libc/src/math/fmaxl.h b/libc/src/math/fmaxl.h
index ea5cc4db5d533..a0673001fe0e6 100644
--- a/libc/src/math/fmaxl.h
+++ b/libc/src/math/fmaxl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMAXL_H
#define LLVM_LIBC_SRC_MATH_FMAXL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fmaxl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMAXL_H
diff --git a/libc/src/math/fmin.h b/libc/src/math/fmin.h
index d09ec695559db..bf011bb7c313c 100644
--- a/libc/src/math/fmin.h
+++ b/libc/src/math/fmin.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMIN_H
#define LLVM_LIBC_SRC_MATH_FMIN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fmin(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMIN_H
diff --git a/libc/src/math/fminf.h b/libc/src/math/fminf.h
index 8eeb542c1699c..b9c159a68b88e 100644
--- a/libc/src/math/fminf.h
+++ b/libc/src/math/fminf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINF_H
#define LLVM_LIBC_SRC_MATH_FMINF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fminf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINF_H
diff --git a/libc/src/math/fminf128.h b/libc/src/math/fminf128.h
index 7bc393ab3badc..d2ed593250a4a 100644
--- a/libc/src/math/fminf128.h
+++ b/libc/src/math/fminf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINF128_H
#define LLVM_LIBC_SRC_MATH_FMINF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fminf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINF128_H
diff --git a/libc/src/math/fminf16.h b/libc/src/math/fminf16.h
index a92ff50c4c68f..22d4e6c803948 100644
--- a/libc/src/math/fminf16.h
+++ b/libc/src/math/fminf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINF16_H
#define LLVM_LIBC_SRC_MATH_FMINF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fminf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINF16_H
diff --git a/libc/src/math/fminimum.h b/libc/src/math/fminimum.h
index 53d764e6bf58c..9d39b1bdd3db2 100644
--- a/libc/src/math/fminimum.h
+++ b/libc/src/math/fminimum.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fminimum(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_H
diff --git a/libc/src/math/fminimum_mag.h b/libc/src/math/fminimum_mag.h
index 5ebe3eeb5fda6..10b242e6026e8 100644
--- a/libc/src/math/fminimum_mag.h
+++ b/libc/src/math/fminimum_mag.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fminimum_mag(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_H
diff --git a/libc/src/math/fminimum_mag_num.h b/libc/src/math/fminimum_mag_num.h
index c4464343338dc..eb1823018851c 100644
--- a/libc/src/math/fminimum_mag_num.h
+++ b/libc/src/math/fminimum_mag_num.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUM_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUM_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fminimum_mag_num(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMH
diff --git a/libc/src/math/fminimum_mag_numf.h b/libc/src/math/fminimum_mag_numf.h
index 627b5ad29aa71..8091990911399 100644
--- a/libc/src/math/fminimum_mag_numf.h
+++ b/libc/src/math/fminimum_mag_numf.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMF_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fminimum_mag_numf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMF_H
diff --git a/libc/src/math/fminimum_mag_numf128.h b/libc/src/math/fminimum_mag_numf128.h
index e3e69a770c667..803c5e641d170 100644
--- a/libc/src/math/fminimum_mag_numf128.h
+++ b/libc/src/math/fminimum_mag_numf128.h
@@ -10,13 +10,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMF128_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fminimum_mag_numf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMF128_H
diff --git a/libc/src/math/fminimum_mag_numf16.h b/libc/src/math/fminimum_mag_numf16.h
index 5ceca3ae75b1a..0fd314b2f5a22 100644
--- a/libc/src/math/fminimum_mag_numf16.h
+++ b/libc/src/math/fminimum_mag_numf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMF16_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fminimum_mag_numf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUMF16_H
diff --git a/libc/src/math/fminimum_mag_numl.h b/libc/src/math/fminimum_mag_numl.h
index 6b1412604aef5..fdbb183280692 100644
--- a/libc/src/math/fminimum_mag_numl.h
+++ b/libc/src/math/fminimum_mag_numl.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUML_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUML_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fminimum_mag_numl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAG_NUML_H
diff --git a/libc/src/math/fminimum_magf.h b/libc/src/math/fminimum_magf.h
index 98c9cc08ce0e8..6209340074d2d 100644
--- a/libc/src/math/fminimum_magf.h
+++ b/libc/src/math/fminimum_magf.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAGF_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAGF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fminimum_magf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAGF_H
diff --git a/libc/src/math/fminimum_magf128.h b/libc/src/math/fminimum_magf128.h
index 00eee4e287933..05bd163be97c8 100644
--- a/libc/src/math/fminimum_magf128.h
+++ b/libc/src/math/fminimum_magf128.h
@@ -10,13 +10,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAGF128_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAGF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fminimum_magf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAGF128_H
diff --git a/libc/src/math/fminimum_magf16.h b/libc/src/math/fminimum_magf16.h
index cebc76d1d8e31..27673555403c9 100644
--- a/libc/src/math/fminimum_magf16.h
+++ b/libc/src/math/fminimum_magf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAGF16_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAGF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fminimum_magf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAGF16_H
diff --git a/libc/src/math/fminimum_magl.h b/libc/src/math/fminimum_magl.h
index 3220e5095eb41..bcda35ce3bd2a 100644
--- a/libc/src/math/fminimum_magl.h
+++ b/libc/src/math/fminimum_magl.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_MAGL_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_MAGL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fminimum_magl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_MAGL_H
diff --git a/libc/src/math/fminimum_num.h b/libc/src/math/fminimum_num.h
index 42afb06e2f3f3..4c864cba84872 100644
--- a/libc/src/math/fminimum_num.h
+++ b/libc/src/math/fminimum_num.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_NUM_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_NUM_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fminimum_num(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_NUM_H
diff --git a/libc/src/math/fminimum_numf.h b/libc/src/math/fminimum_numf.h
index 8252b8f321ccb..ac4b08b292be8 100644
--- a/libc/src/math/fminimum_numf.h
+++ b/libc/src/math/fminimum_numf.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_NUMF_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_NUMF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fminimum_numf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_NUMF_H
diff --git a/libc/src/math/fminimum_numf128.h b/libc/src/math/fminimum_numf128.h
index 1833e9e1c9f5c..00f8960ff1279 100644
--- a/libc/src/math/fminimum_numf128.h
+++ b/libc/src/math/fminimum_numf128.h
@@ -10,13 +10,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_NUMF128_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_NUMF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fminimum_numf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_NUMF128_H
diff --git a/libc/src/math/fminimum_numf16.h b/libc/src/math/fminimum_numf16.h
index 0b01c37e137ae..598ff9d3c32d2 100644
--- a/libc/src/math/fminimum_numf16.h
+++ b/libc/src/math/fminimum_numf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_NUMF16_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_NUMF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fminimum_numf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_NUMF16_H
diff --git a/libc/src/math/fminimum_numl.h b/libc/src/math/fminimum_numl.h
index 77d124f7cef1b..0da204e72c74d 100644
--- a/libc/src/math/fminimum_numl.h
+++ b/libc/src/math/fminimum_numl.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUM_NUML_H
#define LLVM_LIBC_SRC_MATH_FMINIMUM_NUML_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fminimum_numl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUM_NUML_H
diff --git a/libc/src/math/fminimumf.h b/libc/src/math/fminimumf.h
index 915e206d3f419..424309f3a5313 100644
--- a/libc/src/math/fminimumf.h
+++ b/libc/src/math/fminimumf.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUMF_H
#define LLVM_LIBC_SRC_MATH_FMINIMUMF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fminimumf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUMF_H
diff --git a/libc/src/math/fminimumf128.h b/libc/src/math/fminimumf128.h
index d507766059909..7ff0190727379 100644
--- a/libc/src/math/fminimumf128.h
+++ b/libc/src/math/fminimumf128.h
@@ -10,13 +10,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUMF128_H
#define LLVM_LIBC_SRC_MATH_FMINIMUMF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fminimumf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUMF128_H
diff --git a/libc/src/math/fminimumf16.h b/libc/src/math/fminimumf16.h
index eaa466aa6602d..86dd240ae406d 100644
--- a/libc/src/math/fminimumf16.h
+++ b/libc/src/math/fminimumf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUMF16_H
#define LLVM_LIBC_SRC_MATH_FMINIMUMF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fminimumf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUMF16_H
diff --git a/libc/src/math/fminimuml.h b/libc/src/math/fminimuml.h
index 3928806b9dd48..b9cc321354a28 100644
--- a/libc/src/math/fminimuml.h
+++ b/libc/src/math/fminimuml.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINIMUML_H
#define LLVM_LIBC_SRC_MATH_FMINIMUML_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fminimuml(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINIMUML_H
diff --git a/libc/src/math/fminl.h b/libc/src/math/fminl.h
index 7b352cbc174db..e111e26fc3f07 100644
--- a/libc/src/math/fminl.h
+++ b/libc/src/math/fminl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMINL_H
#define LLVM_LIBC_SRC_MATH_FMINL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fminl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMINL_H
diff --git a/libc/src/math/fmod.h b/libc/src/math/fmod.h
index f796930fad5ed..01b9aa7d2441e 100644
--- a/libc/src/math/fmod.h
+++ b/libc/src/math/fmod.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMOD_H
#define LLVM_LIBC_SRC_MATH_FMOD_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fmod(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMOD_H
diff --git a/libc/src/math/fmodf.h b/libc/src/math/fmodf.h
index 01e0868134cbd..90d97e6cf1e05 100644
--- a/libc/src/math/fmodf.h
+++ b/libc/src/math/fmodf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMODF_H
#define LLVM_LIBC_SRC_MATH_FMODF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fmodf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMODF_H
diff --git a/libc/src/math/fmodf128.h b/libc/src/math/fmodf128.h
index 908fc61a19497..b3242705f025e 100644
--- a/libc/src/math/fmodf128.h
+++ b/libc/src/math/fmodf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMODF128_H
#define LLVM_LIBC_SRC_MATH_FMODF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fmodf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMODF128_H
diff --git a/libc/src/math/fmodf16.h b/libc/src/math/fmodf16.h
index 1c8cb8a9f5479..ab658430275d8 100644
--- a/libc/src/math/fmodf16.h
+++ b/libc/src/math/fmodf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FMODF16_H
#define LLVM_LIBC_SRC_MATH_FMODF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fmodf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMODF16_H
diff --git a/libc/src/math/fmodl.h b/libc/src/math/fmodl.h
index 2ff5c9a264a5d..f259ddb238a8e 100644
--- a/libc/src/math/fmodl.h
+++ b/libc/src/math/fmodl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMODL_H
#define LLVM_LIBC_SRC_MATH_FMODL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fmodl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMODL_H
diff --git a/libc/src/math/fmul.h b/libc/src/math/fmul.h
index 73ec2ee51649c..fbc1069db733e 100644
--- a/libc/src/math/fmul.h
+++ b/libc/src/math/fmul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FMUL_H
#define LLVM_LIBC_SRC_MATH_FMUL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fmul(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FMUL_H
diff --git a/libc/src/math/frexp.h b/libc/src/math/frexp.h
index 316f5e0b635de..963ea7ba5fd07 100644
--- a/libc/src/math/frexp.h
+++ b/libc/src/math/frexp.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FREXP_H
#define LLVM_LIBC_SRC_MATH_FREXP_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double frexp(double x, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FREXP_H
diff --git a/libc/src/math/frexpf.h b/libc/src/math/frexpf.h
index f13707369a542..74eeac24bef8e 100644
--- a/libc/src/math/frexpf.h
+++ b/libc/src/math/frexpf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FREXPF_H
#define LLVM_LIBC_SRC_MATH_FREXPF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float frexpf(float x, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FREXPF_H
diff --git a/libc/src/math/frexpf128.h b/libc/src/math/frexpf128.h
index e143e6f17ffb3..55c4a47cc80ca 100644
--- a/libc/src/math/frexpf128.h
+++ b/libc/src/math/frexpf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FREXPF128_H
#define LLVM_LIBC_SRC_MATH_FREXPF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 frexpf128(float128 x, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FREXPF128_H
diff --git a/libc/src/math/frexpf16.h b/libc/src/math/frexpf16.h
index 09a9938794e23..dc1898cc5f702 100644
--- a/libc/src/math/frexpf16.h
+++ b/libc/src/math/frexpf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FREXPF16_H
#define LLVM_LIBC_SRC_MATH_FREXPF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 frexpf16(float16 x, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FREXPF16_H
diff --git a/libc/src/math/frexpl.h b/libc/src/math/frexpl.h
index a5d827961f4a7..818266ed9f5fa 100644
--- a/libc/src/math/frexpl.h
+++ b/libc/src/math/frexpl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FREXPL_H
#define LLVM_LIBC_SRC_MATH_FREXPL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double frexpl(long double x, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FREXPL_H
diff --git a/libc/src/math/fromfp.h b/libc/src/math/fromfp.h
index 63094bb207eaf..d3de2dd346083 100644
--- a/libc/src/math/fromfp.h
+++ b/libc/src/math/fromfp.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFP_H
#define LLVM_LIBC_SRC_MATH_FROMFP_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fromfp(double x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFP_H
diff --git a/libc/src/math/fromfpf.h b/libc/src/math/fromfpf.h
index 47e15ffa2075b..11d432148d018 100644
--- a/libc/src/math/fromfpf.h
+++ b/libc/src/math/fromfpf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFPF_H
#define LLVM_LIBC_SRC_MATH_FROMFPF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fromfpf(float x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFPF_H
diff --git a/libc/src/math/fromfpf128.h b/libc/src/math/fromfpf128.h
index 1600b81351ee6..5f85fde570a0f 100644
--- a/libc/src/math/fromfpf128.h
+++ b/libc/src/math/fromfpf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFPF128_H
#define LLVM_LIBC_SRC_MATH_FROMFPF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fromfpf128(float128 x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFPF128_H
diff --git a/libc/src/math/fromfpf16.h b/libc/src/math/fromfpf16.h
index a76a92f6df701..6e37c2de2e016 100644
--- a/libc/src/math/fromfpf16.h
+++ b/libc/src/math/fromfpf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFPF16_H
#define LLVM_LIBC_SRC_MATH_FROMFPF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fromfpf16(float16 x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFPF16_H
diff --git a/libc/src/math/fromfpl.h b/libc/src/math/fromfpl.h
index dab20069a884a..dd8e1eebdea99 100644
--- a/libc/src/math/fromfpl.h
+++ b/libc/src/math/fromfpl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFPL_H
#define LLVM_LIBC_SRC_MATH_FROMFPL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fromfpl(long double x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFPL_H
diff --git a/libc/src/math/fromfpx.h b/libc/src/math/fromfpx.h
index e3e36a06ff49f..3fc96e1e648b9 100644
--- a/libc/src/math/fromfpx.h
+++ b/libc/src/math/fromfpx.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFPX_H
#define LLVM_LIBC_SRC_MATH_FROMFPX_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double fromfpx(double x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFPX_H
diff --git a/libc/src/math/fromfpxf.h b/libc/src/math/fromfpxf.h
index 5cc75ac72c9fc..b55bc4c751395 100644
--- a/libc/src/math/fromfpxf.h
+++ b/libc/src/math/fromfpxf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFPXF_H
#define LLVM_LIBC_SRC_MATH_FROMFPXF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float fromfpxf(float x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFPXF_H
diff --git a/libc/src/math/fromfpxf128.h b/libc/src/math/fromfpxf128.h
index 32a772973cb05..88932646cdcc9 100644
--- a/libc/src/math/fromfpxf128.h
+++ b/libc/src/math/fromfpxf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFPXF128_H
#define LLVM_LIBC_SRC_MATH_FROMFPXF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 fromfpxf128(float128 x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFPXF128_H
diff --git a/libc/src/math/fromfpxf16.h b/libc/src/math/fromfpxf16.h
index 516ef4248fce4..f53afbcf3ffdf 100644
--- a/libc/src/math/fromfpxf16.h
+++ b/libc/src/math/fromfpxf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFPXF16_H
#define LLVM_LIBC_SRC_MATH_FROMFPXF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 fromfpxf16(float16 x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFPXF16_H
diff --git a/libc/src/math/fromfpxl.h b/libc/src/math/fromfpxl.h
index 1940508f46d2f..545288834b8f3 100644
--- a/libc/src/math/fromfpxl.h
+++ b/libc/src/math/fromfpxl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_FROMFPXL_H
#define LLVM_LIBC_SRC_MATH_FROMFPXL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double fromfpxl(long double x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_FROMFPXL_H
diff --git a/libc/src/math/generic/acosf.cpp b/libc/src/math/generic/acosf.cpp
index 95d8bc0213cba..f02edec267174 100644
--- a/libc/src/math/generic/acosf.cpp
+++ b/libc/src/math/generic/acosf.cpp
@@ -13,14 +13,13 @@
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/sqrt.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include <errno.h>
#include "inv_trigf_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static constexpr size_t N_EXCEPTS = 4;
@@ -121,4 +120,4 @@ LLVM_LIBC_FUNCTION(float, acosf, (float x)) {
return static_cast<float>(x_sign ? M_MATH_PI - r : r);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/acoshf.cpp b/libc/src/math/generic/acoshf.cpp
index 6158063d30521..9422ec63e1ce2 100644
--- a/libc/src/math/generic/acoshf.cpp
+++ b/libc/src/math/generic/acoshf.cpp
@@ -12,12 +12,11 @@
#include "src/__support/FPUtil/PolyEval.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/sqrt.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/math/generic/common_constants.h"
#include "src/math/generic/explogxf.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, acoshf, (float x)) {
using FPBits_t = typename fputil::FPBits<float>;
@@ -71,4 +70,4 @@ LLVM_LIBC_FUNCTION(float, acoshf, (float x)) {
x_d + fputil::sqrt<double>(fputil::multiply_add(x_d, x_d, -1.0))));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/asinf.cpp b/libc/src/math/generic/asinf.cpp
index d6acc3a1692bc..c4afca493a713 100644
--- a/libc/src/math/generic/asinf.cpp
+++ b/libc/src/math/generic/asinf.cpp
@@ -13,7 +13,6 @@
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/sqrt.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
@@ -21,7 +20,7 @@
#include "inv_trigf_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static constexpr size_t N_EXCEPTS = 2;
@@ -153,4 +152,4 @@ LLVM_LIBC_FUNCTION(float, asinf, (float x)) {
return static_cast<float>(fputil::multiply_add(c3, r, c2));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/asinhf.cpp b/libc/src/math/generic/asinhf.cpp
index 1d68ac9ea13bc..82dc2a31ebc22 100644
--- a/libc/src/math/generic/asinhf.cpp
+++ b/libc/src/math/generic/asinhf.cpp
@@ -11,12 +11,11 @@
#include "src/__support/FPUtil/PolyEval.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/sqrt.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/math/generic/common_constants.h"
#include "src/math/generic/explogxf.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, asinhf, (float x)) {
using FPBits_t = typename fputil::FPBits<float>;
@@ -103,4 +102,4 @@ LLVM_LIBC_FUNCTION(float, asinhf, (float x)) {
fputil::sqrt<double>(fputil::multiply_add(x_d, x_d, 1.0)))));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/atan2f.cpp b/libc/src/math/generic/atan2f.cpp
index e4b297c00f012..b79410dbf66ee 100644
--- a/libc/src/math/generic/atan2f.cpp
+++ b/libc/src/math/generic/atan2f.cpp
@@ -14,10 +14,9 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -304,4 +303,4 @@ LLVM_LIBC_FUNCTION(float, atan2f, (float y, float x)) {
const_term);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/atanf.cpp b/libc/src/math/generic/atanf.cpp
index 5e0788efbeb88..9fa1a331c9c03 100644
--- a/libc/src/math/generic/atanf.cpp
+++ b/libc/src/math/generic/atanf.cpp
@@ -14,10 +14,9 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, atanf, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -118,4 +117,4 @@ LLVM_LIBC_FUNCTION(float, atanf, (float x)) {
return static_cast<float>(r);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/atanhf.cpp b/libc/src/math/generic/atanhf.cpp
index a2051bd3e3e67..97fd1b2336006 100644
--- a/libc/src/math/generic/atanhf.cpp
+++ b/libc/src/math/generic/atanhf.cpp
@@ -8,11 +8,10 @@
#include "src/math/atanhf.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/math/generic/explogxf.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, atanhf, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -59,4 +58,4 @@ LLVM_LIBC_FUNCTION(float, atanhf, (float x)) {
return static_cast<float>(0.5 * log_eval((xdbl + 1.0) / (xdbl - 1.0)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/canonicalize.cpp b/libc/src/math/generic/canonicalize.cpp
index d93501d597376..f38ca01e157f8 100644
--- a/libc/src/math/generic/canonicalize.cpp
+++ b/libc/src/math/generic/canonicalize.cpp
@@ -9,12 +9,11 @@
#include "src/math/canonicalize.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, canonicalize, (double *cx, const double *x)) {
return fputil::canonicalize(*cx, *x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/canonicalizef.cpp b/libc/src/math/generic/canonicalizef.cpp
index 437cf8768458a..dce601de14914 100644
--- a/libc/src/math/generic/canonicalizef.cpp
+++ b/libc/src/math/generic/canonicalizef.cpp
@@ -9,12 +9,11 @@
#include "src/math/canonicalizef.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, canonicalizef, (float *cx, const float *x)) {
return fputil::canonicalize(*cx, *x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/canonicalizef128.cpp b/libc/src/math/generic/canonicalizef128.cpp
index 477d9c740a746..0078b478238cb 100644
--- a/libc/src/math/generic/canonicalizef128.cpp
+++ b/libc/src/math/generic/canonicalizef128.cpp
@@ -9,12 +9,11 @@
#include "src/math/canonicalizef128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, canonicalizef128, (float128 * cx, const float128 *x)) {
return fputil::canonicalize(*cx, *x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/canonicalizef16.cpp b/libc/src/math/generic/canonicalizef16.cpp
index ff32c918793ff..232e84f7dd68f 100644
--- a/libc/src/math/generic/canonicalizef16.cpp
+++ b/libc/src/math/generic/canonicalizef16.cpp
@@ -9,12 +9,11 @@
#include "src/math/canonicalizef16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, canonicalizef16, (float16 * cx, const float16 *x)) {
return fputil::canonicalize(*cx, *x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/canonicalizel.cpp b/libc/src/math/generic/canonicalizel.cpp
index fa2b846216d7b..5310a316acdd3 100644
--- a/libc/src/math/generic/canonicalizel.cpp
+++ b/libc/src/math/generic/canonicalizel.cpp
@@ -9,13 +9,12 @@
#include "src/math/canonicalizel.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, canonicalizel,
(long double *cx, const long double *x)) {
return fputil::canonicalize(*cx, *x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/cbrtf.cpp b/libc/src/math/generic/cbrtf.cpp
index 313961bf356b8..a1eb58d463a06 100644
--- a/libc/src/math/generic/cbrtf.cpp
+++ b/libc/src/math/generic/cbrtf.cpp
@@ -12,10 +12,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -155,4 +154,4 @@ LLVM_LIBC_FUNCTION(float, cbrtf, (float x)) {
return static_cast<float>(DoubleBits(r_bits).get_val());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ceil.cpp b/libc/src/math/generic/ceil.cpp
index a5ac1348834d8..efd0f246a9b90 100644
--- a/libc/src/math/generic/ceil.cpp
+++ b/libc/src/math/generic/ceil.cpp
@@ -9,10 +9,9 @@
#include "src/math/ceil.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, ceil, (double x)) { return fputil::ceil(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ceilf.cpp b/libc/src/math/generic/ceilf.cpp
index 0fd54361648dc..d49b34242da4f 100644
--- a/libc/src/math/generic/ceilf.cpp
+++ b/libc/src/math/generic/ceilf.cpp
@@ -9,10 +9,9 @@
#include "src/math/ceilf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, ceilf, (float x)) { return fputil::ceil(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ceilf128.cpp b/libc/src/math/generic/ceilf128.cpp
index 5d0cf46933cdf..af980429f87d8 100644
--- a/libc/src/math/generic/ceilf128.cpp
+++ b/libc/src/math/generic/ceilf128.cpp
@@ -9,10 +9,9 @@
#include "src/math/ceilf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, ceilf128, (float128 x)) { return fputil::ceil(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ceilf16.cpp b/libc/src/math/generic/ceilf16.cpp
index 1d17daf283d07..205d7428f66e6 100644
--- a/libc/src/math/generic/ceilf16.cpp
+++ b/libc/src/math/generic/ceilf16.cpp
@@ -9,10 +9,9 @@
#include "src/math/ceilf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, ceilf16, (float16 x)) { return fputil::ceil(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ceill.cpp b/libc/src/math/generic/ceill.cpp
index bce9d557be78a..7c3b680ce6442 100644
--- a/libc/src/math/generic/ceill.cpp
+++ b/libc/src/math/generic/ceill.cpp
@@ -9,12 +9,11 @@
#include "src/math/ceill.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, ceill, (long double x)) {
return fputil::ceil(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/common_constants.cpp b/libc/src/math/generic/common_constants.cpp
index e29c083fa474a..1a23d00297105 100644
--- a/libc/src/math/generic/common_constants.cpp
+++ b/libc/src/math/generic/common_constants.cpp
@@ -8,10 +8,9 @@
#include "common_constants.h"
#include "src/__support/FPUtil/triple_double.h"
-#include "src/__support/macros/config.h"
#include "src/__support/number_pair.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Lookup table for (1/f) where f = 1 + n*2^(-7), n = 0..127.
const double ONE_OVER_F[128] = {
@@ -806,4 +805,4 @@ const fputil::TripleDouble EXP2_MID2[64] = {
{0x1.6ae7d36d7c1f7p-109, 0x1.e47120223467fp-54, 0x1.02be6e199c811p0},
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/common_constants.h b/libc/src/math/generic/common_constants.h
index dc1a90c1cb24a..13fc8d757cb8c 100644
--- a/libc/src/math/generic/common_constants.h
+++ b/libc/src/math/generic/common_constants.h
@@ -10,10 +10,9 @@
#define LLVM_LIBC_SRC_MATH_GENERIC_COMMON_CONSTANTS_H
#include "src/__support/FPUtil/triple_double.h"
-#include "src/__support/macros/config.h"
#include "src/__support/number_pair.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Lookup table for (1/f) where f = 1 + n*2^(-7), n = 0..127.
extern const double ONE_OVER_F[128];
@@ -78,6 +77,6 @@ extern const fputil::TripleDouble EXP2_MID1[64];
// Lookup table for 2^(k * 2^-12) with k = 0..63.
extern const fputil::TripleDouble EXP2_MID2[64];
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_COMMON_CONSTANTS_H
diff --git a/libc/src/math/generic/copysign.cpp b/libc/src/math/generic/copysign.cpp
index 149d725af08e2..c5ad414bd6482 100644
--- a/libc/src/math/generic/copysign.cpp
+++ b/libc/src/math/generic/copysign.cpp
@@ -9,12 +9,11 @@
#include "src/math/copysign.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, copysign, (double x, double y)) {
return fputil::copysign(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/copysignf.cpp b/libc/src/math/generic/copysignf.cpp
index 17cd70d37c308..077e1ce60ec18 100644
--- a/libc/src/math/generic/copysignf.cpp
+++ b/libc/src/math/generic/copysignf.cpp
@@ -9,12 +9,11 @@
#include "src/math/copysignf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, copysignf, (float x, float y)) {
return fputil::copysign(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/copysignf128.cpp b/libc/src/math/generic/copysignf128.cpp
index 9a51c8d5eb8df..2fe36d52d01dc 100644
--- a/libc/src/math/generic/copysignf128.cpp
+++ b/libc/src/math/generic/copysignf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/copysignf128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, copysignf128, (float128 x, float128 y)) {
return fputil::copysign(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/copysignf16.cpp b/libc/src/math/generic/copysignf16.cpp
index 42695b3b4a6de..435c7e4733862 100644
--- a/libc/src/math/generic/copysignf16.cpp
+++ b/libc/src/math/generic/copysignf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/copysignf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, copysignf16, (float16 x, float16 y)) {
return fputil::copysign(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/copysignl.cpp b/libc/src/math/generic/copysignl.cpp
index 73c47bb04ad4a..b74393cee5d6a 100644
--- a/libc/src/math/generic/copysignl.cpp
+++ b/libc/src/math/generic/copysignl.cpp
@@ -9,12 +9,11 @@
#include "src/math/copysignl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, copysignl, (long double x, long double y)) {
return fputil::copysign(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/cos.cpp b/libc/src/math/generic/cos.cpp
index dbfeec70d83ac..0eb6d9d6a6de8 100644
--- a/libc/src/math/generic/cos.cpp
+++ b/libc/src/math/generic/cos.cpp
@@ -14,7 +14,6 @@
#include "src/__support/FPUtil/dyadic_float.h"
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include "src/math/generic/sincos_eval.h"
@@ -49,7 +48,7 @@ LIBC_INLINE constexpr bool NO_FMA = true;
#define LIBC_MATH_COS_SKIP_ACCURATE_PASS
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using DoubleDouble = fputil::DoubleDouble;
using Float128 = typename fputil::DyadicFloat<128>;
@@ -195,4 +194,4 @@ LLVM_LIBC_FUNCTION(double, cos, (double x)) {
#endif // !LIBC_MATH_COS_SKIP_ACCURATE_PASS
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/cosf.cpp b/libc/src/math/generic/cosf.cpp
index 6a59b3763b6e8..180a44e947eaf 100644
--- a/libc/src/math/generic/cosf.cpp
+++ b/libc/src/math/generic/cosf.cpp
@@ -14,13 +14,12 @@
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Exceptional cases for cosf.
static constexpr size_t N_EXCEPTS = 6;
@@ -135,4 +134,4 @@ LLVM_LIBC_FUNCTION(float, cosf, (float x)) {
sin_y, -sin_k, fputil::multiply_add(cosm1_y, cos_k, cos_k)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/coshf.cpp b/libc/src/math/generic/coshf.cpp
index c869f7d9dec5f..a8ea324c95052 100644
--- a/libc/src/math/generic/coshf.cpp
+++ b/libc/src/math/generic/coshf.cpp
@@ -10,11 +10,10 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/math/generic/explogxf.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, coshf, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -53,4 +52,4 @@ LLVM_LIBC_FUNCTION(float, coshf, (float x)) {
return static_cast<float>(exp_pm_eval</*is_sinh*/ false>(x));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/cospif.cpp b/libc/src/math/generic/cospif.cpp
index 4ef1539539921..d36468101c077 100644
--- a/libc/src/math/generic/cospif.cpp
+++ b/libc/src/math/generic/cospif.cpp
@@ -12,11 +12,10 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, cospif, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -93,4 +92,4 @@ LLVM_LIBC_FUNCTION(float, cospif, (float x)) {
sin_y, -sin_k, fputil::multiply_add(cosm1_y, cos_k, cos_k)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/erff.cpp b/libc/src/math/generic/erff.cpp
index 15357452759ea..aa7baffc7815e 100644
--- a/libc/src/math/generic/erff.cpp
+++ b/libc/src/math/generic/erff.cpp
@@ -12,10 +12,9 @@
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Polynomials approximating erf(x)/x on ( k/8, (k + 1)/8 ) generated by Sollya
// with:
@@ -177,4 +176,4 @@ LLVM_LIBC_FUNCTION(float, erff, (float x)) {
return static_cast<float>(xd * fputil::multiply_add(x8, p1, p0));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/exp.cpp b/libc/src/math/generic/exp.cpp
index df0c2eab7155c..3d060bcbd3be3 100644
--- a/libc/src/math/generic/exp.cpp
+++ b/libc/src/math/generic/exp.cpp
@@ -22,12 +22,11 @@
#include "src/__support/FPUtil/triple_double.h"
#include "src/__support/common.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using fputil::DoubleDouble;
using fputil::TripleDouble;
@@ -417,4 +416,4 @@ LLVM_LIBC_FUNCTION(double, exp, (double x)) {
return static_cast<double>(r_f128);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/exp10.cpp b/libc/src/math/generic/exp10.cpp
index d01bbd8fc01c3..a4ae41407112b 100644
--- a/libc/src/math/generic/exp10.cpp
+++ b/libc/src/math/generic/exp10.cpp
@@ -22,12 +22,11 @@
#include "src/__support/FPUtil/triple_double.h"
#include "src/__support/common.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using fputil::DoubleDouble;
using fputil::TripleDouble;
@@ -477,4 +476,4 @@ LLVM_LIBC_FUNCTION(double, exp10, (double x)) {
return static_cast<double>(r_f128);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/exp10f.cpp b/libc/src/math/generic/exp10f.cpp
index 5284c380f52ec..273b583df8e50 100644
--- a/libc/src/math/generic/exp10f.cpp
+++ b/libc/src/math/generic/exp10f.cpp
@@ -8,11 +8,10 @@
#include "src/math/exp10f.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/math/generic/exp10f_impl.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, exp10f, (float x)) { return generic::exp10f(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/exp10f_impl.h b/libc/src/math/generic/exp10f_impl.h
index fe2195c6e0473..ff4c1c3aec67c 100644
--- a/libc/src/math/generic/exp10f_impl.h
+++ b/libc/src/math/generic/exp10f_impl.h
@@ -18,13 +18,11 @@
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
-namespace generic {
+namespace LIBC_NAMESPACE::generic {
LIBC_INLINE float exp10f(float x) {
using FPBits = typename fputil::FPBits<float>;
@@ -137,7 +135,6 @@ LIBC_INLINE float exp10f(float x) {
return static_cast<float>(multiply_add(p, lo2 * rr.mh, c0 * rr.mh));
}
-} // namespace generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::generic
#endif // LLVM_LIBC_SRC_MATH_GENERIC_EXP10F_IMPL_H
diff --git a/libc/src/math/generic/exp2.cpp b/libc/src/math/generic/exp2.cpp
index fbabb625af51f..1a2fa3feb83e5 100644
--- a/libc/src/math/generic/exp2.cpp
+++ b/libc/src/math/generic/exp2.cpp
@@ -22,12 +22,11 @@
#include "src/__support/FPUtil/triple_double.h"
#include "src/__support/common.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using fputil::DoubleDouble;
using fputil::TripleDouble;
@@ -391,4 +390,4 @@ LLVM_LIBC_FUNCTION(double, exp2, (double x)) {
return static_cast<double>(r_f128);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/exp2f.cpp b/libc/src/math/generic/exp2f.cpp
index 60d6510f23699..e6cb9383dfa2e 100644
--- a/libc/src/math/generic/exp2f.cpp
+++ b/libc/src/math/generic/exp2f.cpp
@@ -8,11 +8,10 @@
#include "src/math/exp2f.h"
#include "src/__support/common.h" // for LLVM_LIBC_FUNCTION
-#include "src/__support/macros/config.h"
#include "src/math/generic/exp2f_impl.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, exp2f, (float x)) { return generic::exp2f(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/exp2f_impl.h b/libc/src/math/generic/exp2f_impl.h
index 3f1c5ee68f081..d2342e289fcba 100644
--- a/libc/src/math/generic/exp2f_impl.h
+++ b/libc/src/math/generic/exp2f_impl.h
@@ -17,7 +17,6 @@
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h"
@@ -25,8 +24,7 @@
#include "explogxf.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace generic {
+namespace LIBC_NAMESPACE::generic {
LIBC_INLINE float exp2f(float x) {
constexpr uint32_t EXVAL1 = 0x3b42'9d37U;
@@ -162,7 +160,6 @@ LIBC_INLINE float exp2f(float x) {
return static_cast<float>(fputil::multiply_add(p, dx_sq * mh, c1 * mh));
}
-} // namespace generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::generic
#endif // LLVM_LIBC_SRC_MATH_GENERIC_EXP2F_IMPL_H
diff --git a/libc/src/math/generic/exp2m1f.cpp b/libc/src/math/generic/exp2m1f.cpp
index 2060dc34cc9bf..c60930dd782e8 100644
--- a/libc/src/math/generic/exp2m1f.cpp
+++ b/libc/src/math/generic/exp2m1f.cpp
@@ -14,14 +14,13 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/__support/macros/properties/cpu_features.h"
#include "src/errno/libc_errno.h"
#include "explogxf.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static constexpr size_t N_EXCEPTS_LO = 8;
@@ -181,4 +180,4 @@ LLVM_LIBC_FUNCTION(float, exp2m1f, (float x)) {
return static_cast<float>(fputil::multiply_add(exp2_lo, mh, -1.0));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/exp_utils.cpp b/libc/src/math/generic/exp_utils.cpp
index cc21637e4c7c0..ad13919578ec1 100644
--- a/libc/src/math/generic/exp_utils.cpp
+++ b/libc/src/math/generic/exp_utils.cpp
@@ -7,9 +7,8 @@
//===----------------------------------------------------------------------===//
#include "exp_utils.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
const Exp2fDataTable exp2f_data = {
// :tab[i] = uint(2^(i/N)) - (i << 52-BITS)
@@ -125,4 +124,4 @@ const Exp2fDataTable exp2f_data = {
},
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/exp_utils.h b/libc/src/math/generic/exp_utils.h
index dca9eb7c2d715..405678c356f36 100644
--- a/libc/src/math/generic/exp_utils.h
+++ b/libc/src/math/generic/exp_utils.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_MATH_GENERIC_EXP_UTILS_H
#define LLVM_LIBC_SRC_MATH_GENERIC_EXP_UTILS_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
#define EXP2F_TABLE_BITS 5
#define EXP2F_POLY_ORDER 3
#define N (1 << EXP2F_TABLE_BITS)
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct Exp2fDataTable {
uint64_t tab[1 << EXP2F_TABLE_BITS];
@@ -29,6 +28,6 @@ struct Exp2fDataTable {
extern const Exp2fDataTable exp2f_data;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_EXP_UTILS_H
diff --git a/libc/src/math/generic/expf.cpp b/libc/src/math/generic/expf.cpp
index 1d7c0478eb225..c7ab974850a82 100644
--- a/libc/src/math/generic/expf.cpp
+++ b/libc/src/math/generic/expf.cpp
@@ -16,12 +16,11 @@
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, expf, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -106,4 +105,4 @@ LLVM_LIBC_FUNCTION(float, expf, (float x)) {
return static_cast<float>(exp_hi * exp_mid * exp_lo);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/explogxf.cpp b/libc/src/math/generic/explogxf.cpp
index 9e945eca7aed6..87ee57850c473 100644
--- a/libc/src/math/generic/explogxf.cpp
+++ b/libc/src/math/generic/explogxf.cpp
@@ -7,9 +7,8 @@
//===----------------------------------------------------------------------===//
#include "explogxf.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// N[Table[Log[2, 1 + x], {x, 0/64, 63/64, 1/64}], 40]
alignas(64) const double LOG_P1_LOG2[LOG_P1_SIZE] = {
@@ -72,4 +71,4 @@ alignas(64) const
double K_LOG2_EVEN[4] = {-0x1.71547652b82fep-1, -0x1.71547652b82fep-2,
-0x1.ec709dc3a03fdp-3, -0x1.2776c50ef9bfep-3};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/explogxf.h b/libc/src/math/generic/explogxf.h
index 7daed558f74b1..f7d04f517ce57 100644
--- a/libc/src/math/generic/explogxf.h
+++ b/libc/src/math/generic/explogxf.h
@@ -17,12 +17,11 @@
#include "src/__support/FPUtil/PolyEval.h"
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/cpu_features.h"
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct ExpBase {
// Base = e
@@ -380,6 +379,6 @@ LIBC_INLINE cpp::optional<double> ziv_test_denorm(int hi, double mid, double lo,
return cpp::nullopt;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_EXPLOGXF_H
diff --git a/libc/src/math/generic/expm1.cpp b/libc/src/math/generic/expm1.cpp
index d9485864df899..150c0bbcf60da 100644
--- a/libc/src/math/generic/expm1.cpp
+++ b/libc/src/math/generic/expm1.cpp
@@ -23,7 +23,6 @@
#include "src/__support/FPUtil/triple_double.h"
#include "src/__support/common.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#if ((LIBC_MATH & LIBC_MATH_SKIP_ACCURATE_PASS) != 0)
@@ -37,7 +36,7 @@
#include <iostream>
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using fputil::DoubleDouble;
using fputil::TripleDouble;
@@ -508,4 +507,4 @@ LLVM_LIBC_FUNCTION(double, expm1, (double x)) {
#endif // LIBC_MATH_EXPM1_SKIP_ACCURATE_PASS
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/expm1f.cpp b/libc/src/math/generic/expm1f.cpp
index b1a0fe16de077..6b9f07476a650 100644
--- a/libc/src/math/generic/expm1f.cpp
+++ b/libc/src/math/generic/expm1f.cpp
@@ -17,13 +17,12 @@
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, expm1f, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -171,4 +170,4 @@ LLVM_LIBC_FUNCTION(float, expm1f, (float x)) {
return static_cast<float>(fputil::multiply_add(exp_hi_mid, exp_lo, -1.0));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16add.cpp b/libc/src/math/generic/f16add.cpp
index e9be8a743721e..ef9b43e9f46aa 100644
--- a/libc/src/math/generic/f16add.cpp
+++ b/libc/src/math/generic/f16add.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16add.h"
#include "src/__support/FPUtil/generic/add_sub.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16add, (double x, double y)) {
return fputil::generic::add<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16addf.cpp b/libc/src/math/generic/f16addf.cpp
index ee05ff7f00531..f1761a193985d 100644
--- a/libc/src/math/generic/f16addf.cpp
+++ b/libc/src/math/generic/f16addf.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16addf.h"
#include "src/__support/FPUtil/generic/add_sub.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16addf, (float x, float y)) {
return fputil::generic::add<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16addf128.cpp b/libc/src/math/generic/f16addf128.cpp
index 4e9038e23125a..61c458f7d5de1 100644
--- a/libc/src/math/generic/f16addf128.cpp
+++ b/libc/src/math/generic/f16addf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16addf128.h"
#include "src/__support/FPUtil/generic/add_sub.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16addf128, (float128 x, float128 y)) {
return fputil::generic::add<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16addl.cpp b/libc/src/math/generic/f16addl.cpp
index 925f08418b99d..d32d09d0dbb83 100644
--- a/libc/src/math/generic/f16addl.cpp
+++ b/libc/src/math/generic/f16addl.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16addl.h"
#include "src/__support/FPUtil/generic/add_sub.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16addl, (long double x, long double y)) {
return fputil::generic::add<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16div.cpp b/libc/src/math/generic/f16div.cpp
index 7df94a8ef508f..2ff0ff7865539 100644
--- a/libc/src/math/generic/f16div.cpp
+++ b/libc/src/math/generic/f16div.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16div.h"
#include "src/__support/FPUtil/generic/div.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16div, (double x, double y)) {
return fputil::generic::div<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16divf.cpp b/libc/src/math/generic/f16divf.cpp
index 3e6289eee4017..45874fbac2055 100644
--- a/libc/src/math/generic/f16divf.cpp
+++ b/libc/src/math/generic/f16divf.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16divf.h"
#include "src/__support/FPUtil/generic/div.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16divf, (float x, float y)) {
return fputil::generic::div<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16divf128.cpp b/libc/src/math/generic/f16divf128.cpp
index 8980ebe9640bd..1d37ad8aa2366 100644
--- a/libc/src/math/generic/f16divf128.cpp
+++ b/libc/src/math/generic/f16divf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16divf128.h"
#include "src/__support/FPUtil/generic/div.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16divf128, (float128 x, float128 y)) {
return fputil::generic::div<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16divl.cpp b/libc/src/math/generic/f16divl.cpp
index 2a0b20041e0d3..3fb9c7891f5d1 100644
--- a/libc/src/math/generic/f16divl.cpp
+++ b/libc/src/math/generic/f16divl.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16divl.h"
#include "src/__support/FPUtil/generic/div.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16divl, (long double x, long double y)) {
return fputil::generic::div<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16fma.cpp b/libc/src/math/generic/f16fma.cpp
index 70314b5420fad..10ee028c06930 100644
--- a/libc/src/math/generic/f16fma.cpp
+++ b/libc/src/math/generic/f16fma.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16fma.h"
#include "src/__support/FPUtil/FMA.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16fma, (double x, double y, double z)) {
return fputil::fma<float16>(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16fmaf.cpp b/libc/src/math/generic/f16fmaf.cpp
index bd0b56b1ab31b..09f2712639335 100644
--- a/libc/src/math/generic/f16fmaf.cpp
+++ b/libc/src/math/generic/f16fmaf.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16fmaf.h"
#include "src/__support/FPUtil/FMA.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16fmaf, (float x, float y, float z)) {
return fputil::fma<float16>(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16fmaf128.cpp b/libc/src/math/generic/f16fmaf128.cpp
index 5c4823c47e79f..5b2f801cf21fa 100644
--- a/libc/src/math/generic/f16fmaf128.cpp
+++ b/libc/src/math/generic/f16fmaf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16fmaf128.h"
#include "src/__support/FPUtil/FMA.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16fmaf128, (float128 x, float128 y, float128 z)) {
return fputil::fma<float16>(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16fmal.cpp b/libc/src/math/generic/f16fmal.cpp
index 4f2bf92af5bbb..067483629a336 100644
--- a/libc/src/math/generic/f16fmal.cpp
+++ b/libc/src/math/generic/f16fmal.cpp
@@ -9,13 +9,12 @@
#include "src/math/f16fmal.h"
#include "src/__support/FPUtil/FMA.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16fmal,
(long double x, long double y, long double z)) {
return fputil::fma<float16>(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16sqrt.cpp b/libc/src/math/generic/f16sqrt.cpp
index 4addb553a5851..9d5f081f63315 100644
--- a/libc/src/math/generic/f16sqrt.cpp
+++ b/libc/src/math/generic/f16sqrt.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16sqrt.h"
#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16sqrt, (double x)) {
return fputil::sqrt<float16>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16sqrtf.cpp b/libc/src/math/generic/f16sqrtf.cpp
index be43a77787fae..1f7ee2df29e86 100644
--- a/libc/src/math/generic/f16sqrtf.cpp
+++ b/libc/src/math/generic/f16sqrtf.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16sqrtf.h"
#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16sqrtf, (float x)) {
return fputil::sqrt<float16>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16sqrtf128.cpp b/libc/src/math/generic/f16sqrtf128.cpp
index d33d6d2963fea..11a1e8252788e 100644
--- a/libc/src/math/generic/f16sqrtf128.cpp
+++ b/libc/src/math/generic/f16sqrtf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16sqrtf128.h"
#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16sqrtf128, (float128 x)) {
return fputil::sqrt<float16>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16sqrtl.cpp b/libc/src/math/generic/f16sqrtl.cpp
index c6ce73de7fec9..2aaac9a780f66 100644
--- a/libc/src/math/generic/f16sqrtl.cpp
+++ b/libc/src/math/generic/f16sqrtl.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16sqrtl.h"
#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16sqrtl, (long double x)) {
return fputil::sqrt<float16>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16sub.cpp b/libc/src/math/generic/f16sub.cpp
index 88962b880491d..114c8ad3155e1 100644
--- a/libc/src/math/generic/f16sub.cpp
+++ b/libc/src/math/generic/f16sub.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16sub.h"
#include "src/__support/FPUtil/generic/add_sub.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16sub, (double x, double y)) {
return fputil::generic::sub<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16subf.cpp b/libc/src/math/generic/f16subf.cpp
index adc0ca4375aaf..e4532a456b7b8 100644
--- a/libc/src/math/generic/f16subf.cpp
+++ b/libc/src/math/generic/f16subf.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16subf.h"
#include "src/__support/FPUtil/generic/add_sub.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16subf, (float x, float y)) {
return fputil::generic::sub<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16subf128.cpp b/libc/src/math/generic/f16subf128.cpp
index c3e0ba559f663..1f9ff28abdf29 100644
--- a/libc/src/math/generic/f16subf128.cpp
+++ b/libc/src/math/generic/f16subf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16subf128.h"
#include "src/__support/FPUtil/generic/add_sub.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16subf128, (float128 x, float128 y)) {
return fputil::generic::sub<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/f16subl.cpp b/libc/src/math/generic/f16subl.cpp
index 0ade79064773d..31970af9a2366 100644
--- a/libc/src/math/generic/f16subl.cpp
+++ b/libc/src/math/generic/f16subl.cpp
@@ -9,12 +9,11 @@
#include "src/math/f16subl.h"
#include "src/__support/FPUtil/generic/add_sub.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, f16subl, (long double x, long double y)) {
return fputil::generic::sub<float16>(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fabs.cpp b/libc/src/math/generic/fabs.cpp
index 472297aecb2f7..0c0b7748b1f35 100644
--- a/libc/src/math/generic/fabs.cpp
+++ b/libc/src/math/generic/fabs.cpp
@@ -9,10 +9,9 @@
#include "src/math/fabs.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fabs, (double x)) { return fputil::abs(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fabsf.cpp b/libc/src/math/generic/fabsf.cpp
index ad4fcb30c795d..a57f6bf914eb2 100644
--- a/libc/src/math/generic/fabsf.cpp
+++ b/libc/src/math/generic/fabsf.cpp
@@ -9,10 +9,9 @@
#include "src/math/fabsf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fabsf, (float x)) { return fputil::abs(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fabsf128.cpp b/libc/src/math/generic/fabsf128.cpp
index 795d907e881f6..615b13f862399 100644
--- a/libc/src/math/generic/fabsf128.cpp
+++ b/libc/src/math/generic/fabsf128.cpp
@@ -9,10 +9,9 @@
#include "src/math/fabsf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fabsf128, (float128 x)) { return fputil::abs(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fabsf16.cpp b/libc/src/math/generic/fabsf16.cpp
index 57671fb6067e2..4de84f35da302 100644
--- a/libc/src/math/generic/fabsf16.cpp
+++ b/libc/src/math/generic/fabsf16.cpp
@@ -9,10 +9,9 @@
#include "src/math/fabsf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fabsf16, (float16 x)) { return fputil::abs(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fabsl.cpp b/libc/src/math/generic/fabsl.cpp
index ea860549abd1e..6b912c92eca86 100644
--- a/libc/src/math/generic/fabsl.cpp
+++ b/libc/src/math/generic/fabsl.cpp
@@ -9,12 +9,11 @@
#include "src/math/fabsl.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fabsl, (long double x)) {
return fputil::abs(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fdim.cpp b/libc/src/math/generic/fdim.cpp
index 9ea121f327286..22d99867b423d 100644
--- a/libc/src/math/generic/fdim.cpp
+++ b/libc/src/math/generic/fdim.cpp
@@ -9,12 +9,11 @@
#include "src/math/fdim.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fdim, (double x, double y)) {
return fputil::fdim(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fdimf.cpp b/libc/src/math/generic/fdimf.cpp
index 2c6bf7a51dc57..789a0c57eb1ee 100644
--- a/libc/src/math/generic/fdimf.cpp
+++ b/libc/src/math/generic/fdimf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fdimf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fdimf, (float x, float y)) {
return fputil::fdim(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fdimf128.cpp b/libc/src/math/generic/fdimf128.cpp
index f8b1499b35b0b..a3ea9e591610c 100644
--- a/libc/src/math/generic/fdimf128.cpp
+++ b/libc/src/math/generic/fdimf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fdimf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fdimf128, (float128 x, float128 y)) {
return fputil::fdim(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fdimf16.cpp b/libc/src/math/generic/fdimf16.cpp
index 6eac460a93c71..25e1d88d7048d 100644
--- a/libc/src/math/generic/fdimf16.cpp
+++ b/libc/src/math/generic/fdimf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fdimf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fdimf16, (float16 x, float16 y)) {
return fputil::fdim(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fdiml.cpp b/libc/src/math/generic/fdiml.cpp
index ebac58ea797ed..c1091cc66b7a8 100644
--- a/libc/src/math/generic/fdiml.cpp
+++ b/libc/src/math/generic/fdiml.cpp
@@ -9,12 +9,11 @@
#include "src/math/fdiml.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fdiml, (long double x, long double y)) {
return fputil::fdim(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/floor.cpp b/libc/src/math/generic/floor.cpp
index 417d6aca3ffe5..60386f0c9cf81 100644
--- a/libc/src/math/generic/floor.cpp
+++ b/libc/src/math/generic/floor.cpp
@@ -9,10 +9,9 @@
#include "src/math/floor.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, floor, (double x)) { return fputil::floor(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/floorf.cpp b/libc/src/math/generic/floorf.cpp
index ca059e6d02d53..85666688685dc 100644
--- a/libc/src/math/generic/floorf.cpp
+++ b/libc/src/math/generic/floorf.cpp
@@ -9,10 +9,9 @@
#include "src/math/floorf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, floorf, (float x)) { return fputil::floor(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/floorf128.cpp b/libc/src/math/generic/floorf128.cpp
index f3ad20a1dcba0..22a8eacb45ddb 100644
--- a/libc/src/math/generic/floorf128.cpp
+++ b/libc/src/math/generic/floorf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/floorf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, floorf128, (float128 x)) {
return fputil::floor(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/floorf16.cpp b/libc/src/math/generic/floorf16.cpp
index 46068c2a548a9..db0b326c0e5f6 100644
--- a/libc/src/math/generic/floorf16.cpp
+++ b/libc/src/math/generic/floorf16.cpp
@@ -9,10 +9,9 @@
#include "src/math/floorf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, floorf16, (float16 x)) { return fputil::floor(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/floorl.cpp b/libc/src/math/generic/floorl.cpp
index 74fbb6893822a..280312797fe0a 100644
--- a/libc/src/math/generic/floorl.cpp
+++ b/libc/src/math/generic/floorl.cpp
@@ -9,12 +9,11 @@
#include "src/math/floorl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, floorl, (long double x)) {
return fputil::floor(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fma.cpp b/libc/src/math/generic/fma.cpp
index 2ea4ae9961150..7937766dccd71 100644
--- a/libc/src/math/generic/fma.cpp
+++ b/libc/src/math/generic/fma.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "src/__support/FPUtil/FMA.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fma, (double x, double y, double z)) {
return fputil::fma<double>(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaf.cpp b/libc/src/math/generic/fmaf.cpp
index dad85b4e9d1e6..d367a069ea7d8 100644
--- a/libc/src/math/generic/fmaf.cpp
+++ b/libc/src/math/generic/fmaf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "src/__support/FPUtil/FMA.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaf, (float x, float y, float z)) {
return fputil::fma<float>(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmax.cpp b/libc/src/math/generic/fmax.cpp
index b9ac4a0d8efaf..7feeee9dcd946 100644
--- a/libc/src/math/generic/fmax.cpp
+++ b/libc/src/math/generic/fmax.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmax.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmax, (double x, double y)) {
return fputil::fmax(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaxf.cpp b/libc/src/math/generic/fmaxf.cpp
index 1c422de371f23..32410926c89a0 100644
--- a/libc/src/math/generic/fmaxf.cpp
+++ b/libc/src/math/generic/fmaxf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaxf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaxf, (float x, float y)) {
return fputil::fmax(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaxf128.cpp b/libc/src/math/generic/fmaxf128.cpp
index 08a9c8fe88aef..096e4befeb79a 100644
--- a/libc/src/math/generic/fmaxf128.cpp
+++ b/libc/src/math/generic/fmaxf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaxf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fmaxf128, (float128 x, float128 y)) {
return fputil::fmax(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaxf16.cpp b/libc/src/math/generic/fmaxf16.cpp
index 02c2bd80149fd..c317aef3cb3b8 100644
--- a/libc/src/math/generic/fmaxf16.cpp
+++ b/libc/src/math/generic/fmaxf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaxf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fmaxf16, (float16 x, float16 y)) {
return fputil::fmax(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum.cpp b/libc/src/math/generic/fmaximum.cpp
index 1493521affd93..ac9593b325d4b 100644
--- a/libc/src/math/generic/fmaximum.cpp
+++ b/libc/src/math/generic/fmaximum.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmaximum, (double x, double y)) {
return fputil::fmaximum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_mag.cpp b/libc/src/math/generic/fmaximum_mag.cpp
index a0152bf73a62d..0deb0c2835f93 100644
--- a/libc/src/math/generic/fmaximum_mag.cpp
+++ b/libc/src/math/generic/fmaximum_mag.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_mag.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmaximum_mag, (double x, double y)) {
return fputil::fmaximum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_mag_num.cpp b/libc/src/math/generic/fmaximum_mag_num.cpp
index de250bbd32b7b..d0b1096b88bc6 100644
--- a/libc/src/math/generic/fmaximum_mag_num.cpp
+++ b/libc/src/math/generic/fmaximum_mag_num.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_mag_num.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmaximum_mag_num, (double x, double y)) {
return fputil::fmaximum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_mag_numf.cpp b/libc/src/math/generic/fmaximum_mag_numf.cpp
index e372f1bd1f9d3..672d3fd3b263a 100644
--- a/libc/src/math/generic/fmaximum_mag_numf.cpp
+++ b/libc/src/math/generic/fmaximum_mag_numf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_mag_numf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaximum_mag_numf, (float x, float y)) {
return fputil::fmaximum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_mag_numf128.cpp b/libc/src/math/generic/fmaximum_mag_numf128.cpp
index 09e72481d8908..e7d13f13a0982 100644
--- a/libc/src/math/generic/fmaximum_mag_numf128.cpp
+++ b/libc/src/math/generic/fmaximum_mag_numf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_mag_numf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fmaximum_mag_numf128, (float128 x, float128 y)) {
return fputil::fmaximum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_mag_numf16.cpp b/libc/src/math/generic/fmaximum_mag_numf16.cpp
index d81b9fe790783..5055802c4cf85 100644
--- a/libc/src/math/generic/fmaximum_mag_numf16.cpp
+++ b/libc/src/math/generic/fmaximum_mag_numf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_mag_numf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fmaximum_mag_numf16, (float16 x, float16 y)) {
return fputil::fmaximum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_mag_numl.cpp b/libc/src/math/generic/fmaximum_mag_numl.cpp
index 3816bdd142697..a8499ca473b36 100644
--- a/libc/src/math/generic/fmaximum_mag_numl.cpp
+++ b/libc/src/math/generic/fmaximum_mag_numl.cpp
@@ -9,13 +9,12 @@
#include "src/math/fmaximum_mag_numl.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fmaximum_mag_numl,
(long double x, long double y)) {
return fputil::fmaximum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_magf.cpp b/libc/src/math/generic/fmaximum_magf.cpp
index 41099a157b2e8..380aca05a5255 100644
--- a/libc/src/math/generic/fmaximum_magf.cpp
+++ b/libc/src/math/generic/fmaximum_magf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_magf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaximum_magf, (float x, float y)) {
return fputil::fmaximum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_magf128.cpp b/libc/src/math/generic/fmaximum_magf128.cpp
index 671d0fb69ee53..301938fb7ffd3 100644
--- a/libc/src/math/generic/fmaximum_magf128.cpp
+++ b/libc/src/math/generic/fmaximum_magf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_magf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fmaximum_magf128, (float128 x, float128 y)) {
return fputil::fmaximum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_magf16.cpp b/libc/src/math/generic/fmaximum_magf16.cpp
index 79e75ab376ccd..fbd5eaccf3093 100644
--- a/libc/src/math/generic/fmaximum_magf16.cpp
+++ b/libc/src/math/generic/fmaximum_magf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_magf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fmaximum_magf16, (float16 x, float16 y)) {
return fputil::fmaximum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_magl.cpp b/libc/src/math/generic/fmaximum_magl.cpp
index 1230076dadb64..283a11eda9aab 100644
--- a/libc/src/math/generic/fmaximum_magl.cpp
+++ b/libc/src/math/generic/fmaximum_magl.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_magl.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fmaximum_magl, (long double x, long double y)) {
return fputil::fmaximum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_num.cpp b/libc/src/math/generic/fmaximum_num.cpp
index 33df7daa380df..23553dbcae7ed 100644
--- a/libc/src/math/generic/fmaximum_num.cpp
+++ b/libc/src/math/generic/fmaximum_num.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_num.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmaximum_num, (double x, double y)) {
return fputil::fmaximum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_numf.cpp b/libc/src/math/generic/fmaximum_numf.cpp
index 1577080ba2c25..f946ff43f543c 100644
--- a/libc/src/math/generic/fmaximum_numf.cpp
+++ b/libc/src/math/generic/fmaximum_numf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_numf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaximum_numf, (float x, float y)) {
return fputil::fmaximum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_numf128.cpp b/libc/src/math/generic/fmaximum_numf128.cpp
index 5cfaca536320e..f33a5e195bf25 100644
--- a/libc/src/math/generic/fmaximum_numf128.cpp
+++ b/libc/src/math/generic/fmaximum_numf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_numf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fmaximum_numf128, (float128 x, float128 y)) {
return fputil::fmaximum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_numf16.cpp b/libc/src/math/generic/fmaximum_numf16.cpp
index 394ce8b5fe4f3..187cfbeee6e2d 100644
--- a/libc/src/math/generic/fmaximum_numf16.cpp
+++ b/libc/src/math/generic/fmaximum_numf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_numf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fmaximum_numf16, (float16 x, float16 y)) {
return fputil::fmaximum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximum_numl.cpp b/libc/src/math/generic/fmaximum_numl.cpp
index eecebf6ed35cc..503fc41409f68 100644
--- a/libc/src/math/generic/fmaximum_numl.cpp
+++ b/libc/src/math/generic/fmaximum_numl.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximum_numl.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fmaximum_numl, (long double x, long double y)) {
return fputil::fmaximum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximumf.cpp b/libc/src/math/generic/fmaximumf.cpp
index faa00a6301894..3b2a60931bf63 100644
--- a/libc/src/math/generic/fmaximumf.cpp
+++ b/libc/src/math/generic/fmaximumf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximumf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaximumf, (float x, float y)) {
return fputil::fmaximum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximumf128.cpp b/libc/src/math/generic/fmaximumf128.cpp
index 362b583822872..0099c913b0526 100644
--- a/libc/src/math/generic/fmaximumf128.cpp
+++ b/libc/src/math/generic/fmaximumf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximumf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fmaximumf128, (float128 x, float128 y)) {
return fputil::fmaximum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximumf16.cpp b/libc/src/math/generic/fmaximumf16.cpp
index aa4982d26bccb..9e194d2ecef69 100644
--- a/libc/src/math/generic/fmaximumf16.cpp
+++ b/libc/src/math/generic/fmaximumf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximumf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fmaximumf16, (float16 x, float16 y)) {
return fputil::fmaximum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaximuml.cpp b/libc/src/math/generic/fmaximuml.cpp
index 65e3b6935eee4..ecd698300458f 100644
--- a/libc/src/math/generic/fmaximuml.cpp
+++ b/libc/src/math/generic/fmaximuml.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaximuml.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fmaximuml, (long double x, long double y)) {
return fputil::fmaximum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmaxl.cpp b/libc/src/math/generic/fmaxl.cpp
index a5460f559eeba..6c6250736f4f1 100644
--- a/libc/src/math/generic/fmaxl.cpp
+++ b/libc/src/math/generic/fmaxl.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmaxl.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fmaxl, (long double x, long double y)) {
return fputil::fmax(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmin.cpp b/libc/src/math/generic/fmin.cpp
index 2351874029c72..b9f313d571635 100644
--- a/libc/src/math/generic/fmin.cpp
+++ b/libc/src/math/generic/fmin.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmin.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmin, (double x, double y)) {
return fputil::fmin(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminf.cpp b/libc/src/math/generic/fminf.cpp
index 83dd0aa66b54a..539fedbdd2fa2 100644
--- a/libc/src/math/generic/fminf.cpp
+++ b/libc/src/math/generic/fminf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fminf, (float x, float y)) {
return fputil::fmin(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminf128.cpp b/libc/src/math/generic/fminf128.cpp
index 184b7e3c21532..084ed4c9931bc 100644
--- a/libc/src/math/generic/fminf128.cpp
+++ b/libc/src/math/generic/fminf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fminf128, (float128 x, float128 y)) {
return fputil::fmin(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminf16.cpp b/libc/src/math/generic/fminf16.cpp
index 8b69273a906ec..12547c33c6361 100644
--- a/libc/src/math/generic/fminf16.cpp
+++ b/libc/src/math/generic/fminf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fminf16, (float16 x, float16 y)) {
return fputil::fmin(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum.cpp b/libc/src/math/generic/fminimum.cpp
index 2f14e64cd7575..28b257d950f43 100644
--- a/libc/src/math/generic/fminimum.cpp
+++ b/libc/src/math/generic/fminimum.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fminimum, (double x, double y)) {
return fputil::fminimum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_mag.cpp b/libc/src/math/generic/fminimum_mag.cpp
index 8d8001df659cb..6af99570e1ea4 100644
--- a/libc/src/math/generic/fminimum_mag.cpp
+++ b/libc/src/math/generic/fminimum_mag.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_mag.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fminimum_mag, (double x, double y)) {
return fputil::fminimum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_mag_num.cpp b/libc/src/math/generic/fminimum_mag_num.cpp
index ab049b5861145..fc5431ae27994 100644
--- a/libc/src/math/generic/fminimum_mag_num.cpp
+++ b/libc/src/math/generic/fminimum_mag_num.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_mag_num.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fminimum_mag_num, (double x, double y)) {
return fputil::fminimum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_mag_numf.cpp b/libc/src/math/generic/fminimum_mag_numf.cpp
index 2aa88c74105d4..71179a6f03c21 100644
--- a/libc/src/math/generic/fminimum_mag_numf.cpp
+++ b/libc/src/math/generic/fminimum_mag_numf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_mag_numf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fminimum_mag_numf, (float x, float y)) {
return fputil::fminimum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_mag_numf128.cpp b/libc/src/math/generic/fminimum_mag_numf128.cpp
index ec7ab54054e3d..109ce7e4e0111 100644
--- a/libc/src/math/generic/fminimum_mag_numf128.cpp
+++ b/libc/src/math/generic/fminimum_mag_numf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_mag_numf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fminimum_mag_numf128, (float128 x, float128 y)) {
return fputil::fminimum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_mag_numf16.cpp b/libc/src/math/generic/fminimum_mag_numf16.cpp
index 5805514b83f68..1a893c6c4bbc1 100644
--- a/libc/src/math/generic/fminimum_mag_numf16.cpp
+++ b/libc/src/math/generic/fminimum_mag_numf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_mag_numf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fminimum_mag_numf16, (float16 x, float16 y)) {
return fputil::fminimum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_mag_numl.cpp b/libc/src/math/generic/fminimum_mag_numl.cpp
index 70fea1f5ef282..c97ce6ead0425 100644
--- a/libc/src/math/generic/fminimum_mag_numl.cpp
+++ b/libc/src/math/generic/fminimum_mag_numl.cpp
@@ -9,13 +9,12 @@
#include "src/math/fminimum_mag_numl.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fminimum_mag_numl,
(long double x, long double y)) {
return fputil::fminimum_mag_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_magf.cpp b/libc/src/math/generic/fminimum_magf.cpp
index fcc2e056f2bff..834f6a4a97101 100644
--- a/libc/src/math/generic/fminimum_magf.cpp
+++ b/libc/src/math/generic/fminimum_magf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_magf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fminimum_magf, (float x, float y)) {
return fputil::fminimum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_magf128.cpp b/libc/src/math/generic/fminimum_magf128.cpp
index 3e7e01f4239eb..2828e28bb0a40 100644
--- a/libc/src/math/generic/fminimum_magf128.cpp
+++ b/libc/src/math/generic/fminimum_magf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_magf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fminimum_magf128, (float128 x, float128 y)) {
return fputil::fminimum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_magf16.cpp b/libc/src/math/generic/fminimum_magf16.cpp
index 4417f75321c5d..45183a963e2d8 100644
--- a/libc/src/math/generic/fminimum_magf16.cpp
+++ b/libc/src/math/generic/fminimum_magf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_magf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fminimum_magf16, (float16 x, float16 y)) {
return fputil::fminimum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_magl.cpp b/libc/src/math/generic/fminimum_magl.cpp
index befc4ac94c1bb..50e328fd92d1f 100644
--- a/libc/src/math/generic/fminimum_magl.cpp
+++ b/libc/src/math/generic/fminimum_magl.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_magl.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fminimum_magl, (long double x, long double y)) {
return fputil::fminimum_mag(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_num.cpp b/libc/src/math/generic/fminimum_num.cpp
index 3ff79def58075..e89c7f5acf9b1 100644
--- a/libc/src/math/generic/fminimum_num.cpp
+++ b/libc/src/math/generic/fminimum_num.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_num.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fminimum_num, (double x, double y)) {
return fputil::fminimum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_numf.cpp b/libc/src/math/generic/fminimum_numf.cpp
index c7ac99b14bd5a..c37c8bd423a1a 100644
--- a/libc/src/math/generic/fminimum_numf.cpp
+++ b/libc/src/math/generic/fminimum_numf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_numf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fminimum_numf, (float x, float y)) {
return fputil::fminimum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_numf128.cpp b/libc/src/math/generic/fminimum_numf128.cpp
index 6d957128c26fd..6b1f77bb447cf 100644
--- a/libc/src/math/generic/fminimum_numf128.cpp
+++ b/libc/src/math/generic/fminimum_numf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_numf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fminimum_numf128, (float128 x, float128 y)) {
return fputil::fminimum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_numf16.cpp b/libc/src/math/generic/fminimum_numf16.cpp
index 0af7205713c10..825ad3e7b63af 100644
--- a/libc/src/math/generic/fminimum_numf16.cpp
+++ b/libc/src/math/generic/fminimum_numf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_numf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fminimum_numf16, (float16 x, float16 y)) {
return fputil::fminimum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimum_numl.cpp b/libc/src/math/generic/fminimum_numl.cpp
index 8a4cff38bdd38..22045f83f2a73 100644
--- a/libc/src/math/generic/fminimum_numl.cpp
+++ b/libc/src/math/generic/fminimum_numl.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimum_numl.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fminimum_numl, (long double x, long double y)) {
return fputil::fminimum_num(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimumf.cpp b/libc/src/math/generic/fminimumf.cpp
index 57e33c184ccf1..c937fb0ea01d0 100644
--- a/libc/src/math/generic/fminimumf.cpp
+++ b/libc/src/math/generic/fminimumf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimumf.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fminimumf, (float x, float y)) {
return fputil::fminimum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimumf128.cpp b/libc/src/math/generic/fminimumf128.cpp
index 3dbd18d65362e..24e02b8ff537f 100644
--- a/libc/src/math/generic/fminimumf128.cpp
+++ b/libc/src/math/generic/fminimumf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimumf128.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fminimumf128, (float128 x, float128 y)) {
return fputil::fminimum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimumf16.cpp b/libc/src/math/generic/fminimumf16.cpp
index 42ad9a55e4d60..16f738be7e58c 100644
--- a/libc/src/math/generic/fminimumf16.cpp
+++ b/libc/src/math/generic/fminimumf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimumf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fminimumf16, (float16 x, float16 y)) {
return fputil::fminimum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminimuml.cpp b/libc/src/math/generic/fminimuml.cpp
index c80cb0a5fc440..43319503661aa 100644
--- a/libc/src/math/generic/fminimuml.cpp
+++ b/libc/src/math/generic/fminimuml.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminimuml.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fminimuml, (long double x, long double y)) {
return fputil::fminimum(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fminl.cpp b/libc/src/math/generic/fminl.cpp
index aa15de74ebd57..147f6c562c52c 100644
--- a/libc/src/math/generic/fminl.cpp
+++ b/libc/src/math/generic/fminl.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminl.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fminl, (long double x, long double y)) {
return fputil::fmin(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmod.cpp b/libc/src/math/generic/fmod.cpp
index 010e66aa745ca..69e0c8dd99169 100644
--- a/libc/src/math/generic/fmod.cpp
+++ b/libc/src/math/generic/fmod.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmod.h"
#include "src/__support/FPUtil/generic/FMod.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmod, (double x, double y)) {
return fputil::generic::FMod<double>::eval(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmodf.cpp b/libc/src/math/generic/fmodf.cpp
index 1e1ef48895cc7..9a9e46e29b466 100644
--- a/libc/src/math/generic/fmodf.cpp
+++ b/libc/src/math/generic/fmodf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmodf.h"
#include "src/__support/FPUtil/generic/FMod.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmodf, (float x, float y)) {
return fputil::generic::FMod<float, uint64_t>::eval(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmodf128.cpp b/libc/src/math/generic/fmodf128.cpp
index a7633bf9c2fff..08a379702d889 100644
--- a/libc/src/math/generic/fmodf128.cpp
+++ b/libc/src/math/generic/fmodf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmodf128.h"
#include "src/__support/FPUtil/generic/FMod.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fmodf128, (float128 x, float128 y)) {
return fputil::generic::FMod<float128>::eval(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmodf16.cpp b/libc/src/math/generic/fmodf16.cpp
index 2585639559496..a5bfd78113f63 100644
--- a/libc/src/math/generic/fmodf16.cpp
+++ b/libc/src/math/generic/fmodf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmodf16.h"
#include "src/__support/FPUtil/generic/FMod.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fmodf16, (float16 x, float16 y)) {
return fputil::generic::FMod<float16, uint32_t>::eval(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmodl.cpp b/libc/src/math/generic/fmodl.cpp
index 1af8ffc976ddd..23a3702890557 100644
--- a/libc/src/math/generic/fmodl.cpp
+++ b/libc/src/math/generic/fmodl.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmodl.h"
#include "src/__support/FPUtil/generic/FMod.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fmodl, (long double x, long double y)) {
return fputil::generic::FMod<long double>::eval(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fmul.cpp b/libc/src/math/generic/fmul.cpp
index 16fa11e93df09..40af20466a665 100644
--- a/libc/src/math/generic/fmul.cpp
+++ b/libc/src/math/generic/fmul.cpp
@@ -12,10 +12,9 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/uint128.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmul, (double x, double y)) {
auto x_bits = fputil::FPBits<double>(x);
@@ -126,4 +125,4 @@ LLVM_LIBC_FUNCTION(float, fmul, (double x, double y)) {
return result_bits.get_val();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/frexp.cpp b/libc/src/math/generic/frexp.cpp
index 0efc0d48e588d..a183ba70cfc3e 100644
--- a/libc/src/math/generic/frexp.cpp
+++ b/libc/src/math/generic/frexp.cpp
@@ -9,12 +9,11 @@
#include "src/math/frexp.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, frexp, (double x, int *exp)) {
return fputil::frexp(x, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/frexpf.cpp b/libc/src/math/generic/frexpf.cpp
index 09227badc3417..4fdc869907ca0 100644
--- a/libc/src/math/generic/frexpf.cpp
+++ b/libc/src/math/generic/frexpf.cpp
@@ -9,12 +9,11 @@
#include "src/math/frexpf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, frexpf, (float x, int *exp)) {
return fputil::frexp(x, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/frexpf128.cpp b/libc/src/math/generic/frexpf128.cpp
index eb816c4769707..b50f37d2dab4b 100644
--- a/libc/src/math/generic/frexpf128.cpp
+++ b/libc/src/math/generic/frexpf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/frexpf128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, frexpf128, (float128 x, int *exp)) {
return fputil::frexp(x, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/frexpf16.cpp b/libc/src/math/generic/frexpf16.cpp
index 4571b0d0ea389..2d29c07c7217d 100644
--- a/libc/src/math/generic/frexpf16.cpp
+++ b/libc/src/math/generic/frexpf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/frexpf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, frexpf16, (float16 x, int *exp)) {
return fputil::frexp(x, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/frexpl.cpp b/libc/src/math/generic/frexpl.cpp
index 6f2b456b5944e..0be4e744b2d34 100644
--- a/libc/src/math/generic/frexpl.cpp
+++ b/libc/src/math/generic/frexpl.cpp
@@ -9,12 +9,11 @@
#include "src/math/frexpl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, frexpl, (long double x, int *exp)) {
return fputil::frexp(x, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfp.cpp b/libc/src/math/generic/fromfp.cpp
index f75e6596b25f7..ba3f0a133cbcb 100644
--- a/libc/src/math/generic/fromfp.cpp
+++ b/libc/src/math/generic/fromfp.cpp
@@ -9,12 +9,11 @@
#include "src/math/fromfp.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fromfp, (double x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfpf.cpp b/libc/src/math/generic/fromfpf.cpp
index 83f0518143465..fd058a13201c9 100644
--- a/libc/src/math/generic/fromfpf.cpp
+++ b/libc/src/math/generic/fromfpf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fromfpf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fromfpf, (float x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfpf128.cpp b/libc/src/math/generic/fromfpf128.cpp
index bcbe86cc3e5d8..440a5da756932 100644
--- a/libc/src/math/generic/fromfpf128.cpp
+++ b/libc/src/math/generic/fromfpf128.cpp
@@ -9,13 +9,12 @@
#include "src/math/fromfpf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fromfpf128,
(float128 x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfpf16.cpp b/libc/src/math/generic/fromfpf16.cpp
index 0166e8e08309e..36040049fe3aa 100644
--- a/libc/src/math/generic/fromfpf16.cpp
+++ b/libc/src/math/generic/fromfpf16.cpp
@@ -9,13 +9,12 @@
#include "src/math/fromfpf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fromfpf16,
(float16 x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfpl.cpp b/libc/src/math/generic/fromfpl.cpp
index ab1cbefae1efb..ee3abeaf98f85 100644
--- a/libc/src/math/generic/fromfpl.cpp
+++ b/libc/src/math/generic/fromfpl.cpp
@@ -9,13 +9,12 @@
#include "src/math/fromfpl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fromfpl,
(long double x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfpx.cpp b/libc/src/math/generic/fromfpx.cpp
index cf545df4290e5..b9e7e4a7aa126 100644
--- a/libc/src/math/generic/fromfpx.cpp
+++ b/libc/src/math/generic/fromfpx.cpp
@@ -9,12 +9,11 @@
#include "src/math/fromfpx.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fromfpx, (double x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfpxf.cpp b/libc/src/math/generic/fromfpxf.cpp
index 1af3c98c1080c..1473499244d31 100644
--- a/libc/src/math/generic/fromfpxf.cpp
+++ b/libc/src/math/generic/fromfpxf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fromfpxf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fromfpxf, (float x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfpxf128.cpp b/libc/src/math/generic/fromfpxf128.cpp
index bb47578a6fc8b..5d930d22ae5eb 100644
--- a/libc/src/math/generic/fromfpxf128.cpp
+++ b/libc/src/math/generic/fromfpxf128.cpp
@@ -9,13 +9,12 @@
#include "src/math/fromfpxf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, fromfpxf128,
(float128 x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfpxf16.cpp b/libc/src/math/generic/fromfpxf16.cpp
index 64a3b869b0962..0854cb6613513 100644
--- a/libc/src/math/generic/fromfpxf16.cpp
+++ b/libc/src/math/generic/fromfpxf16.cpp
@@ -9,13 +9,12 @@
#include "src/math/fromfpxf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, fromfpxf16,
(float16 x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/fromfpxl.cpp b/libc/src/math/generic/fromfpxl.cpp
index b402aa12140f9..c3db055246f22 100644
--- a/libc/src/math/generic/fromfpxl.cpp
+++ b/libc/src/math/generic/fromfpxl.cpp
@@ -9,13 +9,12 @@
#include "src/math/fromfpxl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, fromfpxl,
(long double x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/true>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/getpayloadf16.cpp b/libc/src/math/generic/getpayloadf16.cpp
index 34c31acf108c0..0923226e5c5c8 100644
--- a/libc/src/math/generic/getpayloadf16.cpp
+++ b/libc/src/math/generic/getpayloadf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/getpayloadf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, getpayloadf16, (const float16 *x)) {
return fputil::getpayload(*x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/hypot.cpp b/libc/src/math/generic/hypot.cpp
index 0dfe4360bafe0..a1914d0e823c8 100644
--- a/libc/src/math/generic/hypot.cpp
+++ b/libc/src/math/generic/hypot.cpp
@@ -9,12 +9,11 @@
#include "src/math/hypot.h"
#include "src/__support/FPUtil/Hypot.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, hypot, (double x, double y)) {
return LIBC_NAMESPACE::fputil::hypot(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/hypotf.cpp b/libc/src/math/generic/hypotf.cpp
index 75c55ed846726..b09d09ad7f9c9 100644
--- a/libc/src/math/generic/hypotf.cpp
+++ b/libc/src/math/generic/hypotf.cpp
@@ -10,9 +10,8 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, hypotf, (float x, float y)) {
using DoubleBits = fputil::FPBits<double>;
@@ -71,4 +70,4 @@ LLVM_LIBC_FUNCTION(float, hypotf, (float x, float y)) {
return static_cast<float>(result.get_val());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ilogb.cpp b/libc/src/math/generic/ilogb.cpp
index 60f2af24dc225..7e4f66970c5d3 100644
--- a/libc/src/math/generic/ilogb.cpp
+++ b/libc/src/math/generic/ilogb.cpp
@@ -9,10 +9,9 @@
#include "src/math/ilogb.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ilogb, (double x)) { return fputil::intlogb<int>(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ilogbf.cpp b/libc/src/math/generic/ilogbf.cpp
index 7da2aff3de316..422788cec9e04 100644
--- a/libc/src/math/generic/ilogbf.cpp
+++ b/libc/src/math/generic/ilogbf.cpp
@@ -9,10 +9,9 @@
#include "src/math/ilogbf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ilogbf, (float x)) { return fputil::intlogb<int>(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ilogbf128.cpp b/libc/src/math/generic/ilogbf128.cpp
index 4abc670188a3a..4049eccc5f36b 100644
--- a/libc/src/math/generic/ilogbf128.cpp
+++ b/libc/src/math/generic/ilogbf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/ilogbf128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ilogbf128, (float128 x)) {
return fputil::intlogb<int>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ilogbf16.cpp b/libc/src/math/generic/ilogbf16.cpp
index 9217cdfe01651..87e43f8a5ada3 100644
--- a/libc/src/math/generic/ilogbf16.cpp
+++ b/libc/src/math/generic/ilogbf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/ilogbf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ilogbf16, (float16 x)) {
return fputil::intlogb<int>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ilogbl.cpp b/libc/src/math/generic/ilogbl.cpp
index 12460a8b154ee..b7f7eb40c4410 100644
--- a/libc/src/math/generic/ilogbl.cpp
+++ b/libc/src/math/generic/ilogbl.cpp
@@ -9,12 +9,11 @@
#include "src/math/ilogbl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ilogbl, (long double x)) {
return fputil::intlogb<int>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/inv_trigf_utils.cpp b/libc/src/math/generic/inv_trigf_utils.cpp
index f23028bb86b5c..19c8b997dc4ed 100644
--- a/libc/src/math/generic/inv_trigf_utils.cpp
+++ b/libc/src/math/generic/inv_trigf_utils.cpp
@@ -7,9 +7,8 @@
//===----------------------------------------------------------------------===//
#include "inv_trigf_utils.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Polynomial approximation for 0 <= x <= 1:
// atan(x) ~ atan((i/16) + (x - (i/16)) * Q(x - i/16)
@@ -83,4 +82,4 @@ double ATAN_COEFFS[17][9] = {
0x1.555e31a1e15e9p-6, -0x1.245240d65e629p-7, -0x1.fa9ba66478903p-11},
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/inv_trigf_utils.h b/libc/src/math/generic/inv_trigf_utils.h
index bdabec9c1b6bb..e60c367d7b46b 100644
--- a/libc/src/math/generic/inv_trigf_utils.h
+++ b/libc/src/math/generic/inv_trigf_utils.h
@@ -12,9 +12,8 @@
#include "src/__support/FPUtil/PolyEval.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// PI and PI / 2
constexpr double M_MATH_PI = 0x1.921fb54442d18p+1;
@@ -57,6 +56,6 @@ LIBC_INLINE double asin_eval(double xsq) {
return fputil::multiply_add(xsq, r2, r1);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_INV_TRIGF_UTILS_H
diff --git a/libc/src/math/generic/isnan.cpp b/libc/src/math/generic/isnan.cpp
index 73230a4e9a299..dd7eadb2a2031 100644
--- a/libc/src/math/generic/isnan.cpp
+++ b/libc/src/math/generic/isnan.cpp
@@ -8,10 +8,9 @@
#include "src/math/isnan.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, isnan, (double x)) { return __builtin_isnan(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/isnanf.cpp b/libc/src/math/generic/isnanf.cpp
index a1d814eab1825..98a81b03f538a 100644
--- a/libc/src/math/generic/isnanf.cpp
+++ b/libc/src/math/generic/isnanf.cpp
@@ -8,10 +8,9 @@
#include "src/math/isnanf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, isnanf, (float x)) { return __builtin_isnan(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/isnanl.cpp b/libc/src/math/generic/isnanl.cpp
index 57ce79f3c7b47..d61bfd52f0b7d 100644
--- a/libc/src/math/generic/isnanl.cpp
+++ b/libc/src/math/generic/isnanl.cpp
@@ -8,10 +8,9 @@
#include "src/math/isnanl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, isnanl, (long double x)) { return __builtin_isnan(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ldexp.cpp b/libc/src/math/generic/ldexp.cpp
index 93ed328671f2c..18aae09036409 100644
--- a/libc/src/math/generic/ldexp.cpp
+++ b/libc/src/math/generic/ldexp.cpp
@@ -9,12 +9,11 @@
#include "src/math/ldexp.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, ldexp, (double x, int exp)) {
return fputil::ldexp(x, exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ldexpf.cpp b/libc/src/math/generic/ldexpf.cpp
index 63c5d219f7a79..37f88ab2da00c 100644
--- a/libc/src/math/generic/ldexpf.cpp
+++ b/libc/src/math/generic/ldexpf.cpp
@@ -9,12 +9,11 @@
#include "src/math/ldexpf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, ldexpf, (float x, int exp)) {
return fputil::ldexp(x, exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ldexpf128.cpp b/libc/src/math/generic/ldexpf128.cpp
index 03b1a2d2032e2..ed2ebd38dfae7 100644
--- a/libc/src/math/generic/ldexpf128.cpp
+++ b/libc/src/math/generic/ldexpf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/ldexpf128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, ldexpf128, (float128 x, int exp)) {
return fputil::ldexp(x, exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ldexpf16.cpp b/libc/src/math/generic/ldexpf16.cpp
index caa344b41476b..ed15c4572edf5 100644
--- a/libc/src/math/generic/ldexpf16.cpp
+++ b/libc/src/math/generic/ldexpf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/ldexpf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, ldexpf16, (float16 x, int exp)) {
return fputil::ldexp(x, exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ldexpl.cpp b/libc/src/math/generic/ldexpl.cpp
index 9e1de5c5cf4a7..8b29009fa1aa4 100644
--- a/libc/src/math/generic/ldexpl.cpp
+++ b/libc/src/math/generic/ldexpl.cpp
@@ -9,12 +9,11 @@
#include "src/math/ldexpl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, ldexpl, (long double x, int exp)) {
return fputil::ldexp(x, exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llogb.cpp b/libc/src/math/generic/llogb.cpp
index 3850ac00d98d9..917bc38c03792 100644
--- a/libc/src/math/generic/llogb.cpp
+++ b/libc/src/math/generic/llogb.cpp
@@ -9,10 +9,9 @@
#include "src/math/llogb.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, llogb, (double x)) { return fputil::intlogb<long>(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llogbf.cpp b/libc/src/math/generic/llogbf.cpp
index fedad95cc48ad..ca1c03db5c2e4 100644
--- a/libc/src/math/generic/llogbf.cpp
+++ b/libc/src/math/generic/llogbf.cpp
@@ -9,10 +9,9 @@
#include "src/math/llogbf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, llogbf, (float x)) { return fputil::intlogb<long>(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llogbf128.cpp b/libc/src/math/generic/llogbf128.cpp
index 9106731d3415a..5ae4af302110c 100644
--- a/libc/src/math/generic/llogbf128.cpp
+++ b/libc/src/math/generic/llogbf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/llogbf128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, llogbf128, (float128 x)) {
return fputil::intlogb<long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llogbf16.cpp b/libc/src/math/generic/llogbf16.cpp
index c792e9034d88f..b7a21b95604d7 100644
--- a/libc/src/math/generic/llogbf16.cpp
+++ b/libc/src/math/generic/llogbf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/llogbf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, llogbf16, (float16 x)) {
return fputil::intlogb<long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llogbl.cpp b/libc/src/math/generic/llogbl.cpp
index 7ee3ac55653b6..a092997b92449 100644
--- a/libc/src/math/generic/llogbl.cpp
+++ b/libc/src/math/generic/llogbl.cpp
@@ -9,12 +9,11 @@
#include "src/math/llogbl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, llogbl, (long double x)) {
return fputil::intlogb<long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llrint.cpp b/libc/src/math/generic/llrint.cpp
index f6e8cab93ec39..87755e83fecec 100644
--- a/libc/src/math/generic/llrint.cpp
+++ b/libc/src/math/generic/llrint.cpp
@@ -9,9 +9,8 @@
#include "src/math/llrint.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llrint, (double x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<double,
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(long long, llrint, (double x)) {
x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llrintf.cpp b/libc/src/math/generic/llrintf.cpp
index b5180de9a9bf9..836e7cb6cdfb0 100644
--- a/libc/src/math/generic/llrintf.cpp
+++ b/libc/src/math/generic/llrintf.cpp
@@ -9,9 +9,8 @@
#include "src/math/llrintf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llrintf, (float x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<float,
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(long long, llrintf, (float x)) {
x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llrintf128.cpp b/libc/src/math/generic/llrintf128.cpp
index af489852eb73f..e5a4c50a26e8c 100644
--- a/libc/src/math/generic/llrintf128.cpp
+++ b/libc/src/math/generic/llrintf128.cpp
@@ -9,9 +9,8 @@
#include "src/math/llrintf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llrintf128, (float128 x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<float128,
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(long long, llrintf128, (float128 x)) {
x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llrintf16.cpp b/libc/src/math/generic/llrintf16.cpp
index c6b31c7352262..0bed21ad17bb8 100644
--- a/libc/src/math/generic/llrintf16.cpp
+++ b/libc/src/math/generic/llrintf16.cpp
@@ -9,9 +9,8 @@
#include "src/math/llrintf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llrintf16, (float16 x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<float16,
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(long long, llrintf16, (float16 x)) {
x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llrintl.cpp b/libc/src/math/generic/llrintl.cpp
index 35ae609d019fe..104e3d4ce9204 100644
--- a/libc/src/math/generic/llrintl.cpp
+++ b/libc/src/math/generic/llrintl.cpp
@@ -9,13 +9,12 @@
#include "src/math/llrintl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llrintl, (long double x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<
long double, long long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llround.cpp b/libc/src/math/generic/llround.cpp
index 40b2614396618..41bee8520ac2e 100644
--- a/libc/src/math/generic/llround.cpp
+++ b/libc/src/math/generic/llround.cpp
@@ -9,12 +9,11 @@
#include "src/math/llround.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llround, (double x)) {
return fputil::round_to_signed_integer<double, long long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llroundf.cpp b/libc/src/math/generic/llroundf.cpp
index 259c769a49c9c..67105e8d1f6bc 100644
--- a/libc/src/math/generic/llroundf.cpp
+++ b/libc/src/math/generic/llroundf.cpp
@@ -9,12 +9,11 @@
#include "src/math/llroundf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llroundf, (float x)) {
return fputil::round_to_signed_integer<float, long long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llroundf128.cpp b/libc/src/math/generic/llroundf128.cpp
index 2df24f5221cc3..25791631dd7e7 100644
--- a/libc/src/math/generic/llroundf128.cpp
+++ b/libc/src/math/generic/llroundf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/llroundf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llroundf128, (float128 x)) {
return fputil::round_to_signed_integer<float128, long long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llroundf16.cpp b/libc/src/math/generic/llroundf16.cpp
index d3f691ed0c6fd..9485674d54bcb 100644
--- a/libc/src/math/generic/llroundf16.cpp
+++ b/libc/src/math/generic/llroundf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/llroundf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llroundf16, (float16 x)) {
return fputil::round_to_signed_integer<float16, long long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/llroundl.cpp b/libc/src/math/generic/llroundl.cpp
index 49b41c810365e..98cfb3690659c 100644
--- a/libc/src/math/generic/llroundl.cpp
+++ b/libc/src/math/generic/llroundl.cpp
@@ -9,12 +9,11 @@
#include "src/math/llroundl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llroundl, (long double x)) {
return fputil::round_to_signed_integer<long double, long long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/log.cpp b/libc/src/math/generic/log.cpp
index 57c70e31730bf..6de0d90be80e1 100644
--- a/libc/src/math/generic/log.cpp
+++ b/libc/src/math/generic/log.cpp
@@ -15,13 +15,12 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "common_constants.h"
#include "log_range_reduction.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// 128-bit precision dyadic floating point numbers.
using Float128 = typename fputil::DyadicFloat<128>;
@@ -838,4 +837,4 @@ LLVM_LIBC_FUNCTION(double, log, (double x)) {
return log_accurate(x_e, index, u);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/log10.cpp b/libc/src/math/generic/log10.cpp
index b99b22b024fe3..fb839c111e6a0 100644
--- a/libc/src/math/generic/log10.cpp
+++ b/libc/src/math/generic/log10.cpp
@@ -15,13 +15,12 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "common_constants.h"
#include "log_range_reduction.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// 128-bit precision dyadic floating point numbers.
using Float128 = typename fputil::DyadicFloat<128>;
@@ -899,4 +898,4 @@ LLVM_LIBC_FUNCTION(double, log10, (double x)) {
return log10_accurate(x_e, index, u);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/log10f.cpp b/libc/src/math/generic/log10f.cpp
index f7dd85cc08bf0..1b6979d4414a9 100644
--- a/libc/src/math/generic/log10f.cpp
+++ b/libc/src/math/generic/log10f.cpp
@@ -15,7 +15,6 @@
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h"
@@ -55,7 +54,7 @@
// Dept. of Comp. Sci., Rutgets U., Technical Report DCS-TR-758, Nov. 2021.
// https://arxiv.org/pdf/2111.12852.pdf.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Lookup table for -log10(r) where r is defined in common_constants.cpp.
static constexpr double LOG10_R[128] = {
@@ -216,4 +215,4 @@ LLVM_LIBC_FUNCTION(float, log10f, (float x)) {
return static_cast<float>(r);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/log1p.cpp b/libc/src/math/generic/log1p.cpp
index f301a5aba3a57..2b187080a057b 100644
--- a/libc/src/math/generic/log1p.cpp
+++ b/libc/src/math/generic/log1p.cpp
@@ -15,12 +15,11 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "common_constants.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// 128-bit precision dyadic floating point numbers.
using Float128 = typename fputil::DyadicFloat<128>;
@@ -1042,4 +1041,4 @@ LLVM_LIBC_FUNCTION(double, log1p, (double x)) {
return log1p_accurate(x_e, idx, v_dd);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/log1pf.cpp b/libc/src/math/generic/log1pf.cpp
index 869cb077cc434..e3c7d95418b1f 100644
--- a/libc/src/math/generic/log1pf.cpp
+++ b/libc/src/math/generic/log1pf.cpp
@@ -15,7 +15,6 @@
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h"
@@ -31,7 +30,7 @@
// generated with Sollya using the following command:
// fpminimax(log(1 + x)/x, 7, [|D...|], [-2^-6; 2^-6]);
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
@@ -154,4 +153,4 @@ LLVM_LIBC_FUNCTION(float, log1pf, (float x)) {
return static_cast<float>(r);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/log2.cpp b/libc/src/math/generic/log2.cpp
index 7d868e2f6f619..c68bc60e8468b 100644
--- a/libc/src/math/generic/log2.cpp
+++ b/libc/src/math/generic/log2.cpp
@@ -15,13 +15,12 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "common_constants.h"
#include "log_range_reduction.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// 128-bit precision dyadic floating point numbers.
using Float128 = typename fputil::DyadicFloat<128>;
@@ -960,4 +959,4 @@ LLVM_LIBC_FUNCTION(double, log2, (double x)) {
return log2_accurate(x_e, index, u);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/log2f.cpp b/libc/src/math/generic/log2f.cpp
index 9cad02d796b18..c9f7b2121519d 100644
--- a/libc/src/math/generic/log2f.cpp
+++ b/libc/src/math/generic/log2f.cpp
@@ -14,7 +14,6 @@
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
// This is a correctly-rounded algorithm for log2(x) in single precision with
@@ -52,7 +51,7 @@
// Dept. of Comp. Sci., Rutgets U., Technical Report DCS-TR-758, Nov. 2021.
// https://arxiv.org/pdf/2111.12852.pdf.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, log2f, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -121,4 +120,4 @@ LLVM_LIBC_FUNCTION(float, log2f, (float x)) {
return static_cast<float>(r);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/log_range_reduction.h b/libc/src/math/generic/log_range_reduction.h
index 8c94230ee7577..d12da47a2cfae 100644
--- a/libc/src/math/generic/log_range_reduction.h
+++ b/libc/src/math/generic/log_range_reduction.h
@@ -11,10 +11,9 @@
#include "common_constants.h"
#include "src/__support/FPUtil/dyadic_float.h"
-#include "src/__support/macros/config.h"
#include "src/__support/uint128.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Struct to store -log*(r) for 4 range reduction steps.
struct LogRR {
@@ -88,6 +87,6 @@ log_range_reduction(double m_x, const LogRR &log_table,
static_cast<uint64_t>(vv4 >> 64)}));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_LOG_RANGE_REDUCTION_H
diff --git a/libc/src/math/generic/logb.cpp b/libc/src/math/generic/logb.cpp
index 4b8fde966aab1..8cd6edce05c23 100644
--- a/libc/src/math/generic/logb.cpp
+++ b/libc/src/math/generic/logb.cpp
@@ -9,10 +9,9 @@
#include "src/math/logb.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, logb, (double x)) { return fputil::logb(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/logbf.cpp b/libc/src/math/generic/logbf.cpp
index 0dc0251afe290..9f9f7fbcfbb88 100644
--- a/libc/src/math/generic/logbf.cpp
+++ b/libc/src/math/generic/logbf.cpp
@@ -9,10 +9,9 @@
#include "src/math/logbf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, logbf, (float x)) { return fputil::logb(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/logbf128.cpp b/libc/src/math/generic/logbf128.cpp
index af8348736c9f4..090433d1fb860 100644
--- a/libc/src/math/generic/logbf128.cpp
+++ b/libc/src/math/generic/logbf128.cpp
@@ -9,10 +9,9 @@
#include "src/math/logbf128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, logbf128, (float128 x)) { return fputil::logb(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/logbf16.cpp b/libc/src/math/generic/logbf16.cpp
index 6e286a266a137..52eb9ac6a342d 100644
--- a/libc/src/math/generic/logbf16.cpp
+++ b/libc/src/math/generic/logbf16.cpp
@@ -9,10 +9,9 @@
#include "src/math/logbf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, logbf16, (float16 x)) { return fputil::logb(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/logbl.cpp b/libc/src/math/generic/logbl.cpp
index dcab957f2c9c5..f18c3727a3168 100644
--- a/libc/src/math/generic/logbl.cpp
+++ b/libc/src/math/generic/logbl.cpp
@@ -9,12 +9,11 @@
#include "src/math/logbl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, logbl, (long double x)) {
return fputil::logb(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/logf.cpp b/libc/src/math/generic/logf.cpp
index f8ecf320568ac..5296ba6bc13cf 100644
--- a/libc/src/math/generic/logf.cpp
+++ b/libc/src/math/generic/logf.cpp
@@ -14,7 +14,6 @@
#include "src/__support/FPUtil/except_value_utils.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h"
@@ -50,7 +49,7 @@
// USA, January 16-22, 2022.
// https://people.cs.rutgers.edu/~sn349/papers/rlibmall-popl-2022.pdf
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, logf, (float x)) {
constexpr double LOG_2 = 0x1.62e42fefa39efp-1;
@@ -171,4 +170,4 @@ LLVM_LIBC_FUNCTION(float, logf, (float x)) {
return static_cast<float>(r);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lrint.cpp b/libc/src/math/generic/lrint.cpp
index eae9bc13d6311..59fde7b5018d3 100644
--- a/libc/src/math/generic/lrint.cpp
+++ b/libc/src/math/generic/lrint.cpp
@@ -9,13 +9,12 @@
#include "src/math/lrint.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lrint, (double x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<double,
long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lrintf.cpp b/libc/src/math/generic/lrintf.cpp
index e08c87c713e9e..e92014c79bdc4 100644
--- a/libc/src/math/generic/lrintf.cpp
+++ b/libc/src/math/generic/lrintf.cpp
@@ -9,13 +9,12 @@
#include "src/math/lrintf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lrintf, (float x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<float,
long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lrintf128.cpp b/libc/src/math/generic/lrintf128.cpp
index 15ecded1a3722..8e06062fc5802 100644
--- a/libc/src/math/generic/lrintf128.cpp
+++ b/libc/src/math/generic/lrintf128.cpp
@@ -9,13 +9,12 @@
#include "src/math/lrintf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lrintf128, (float128 x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<float128,
long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lrintf16.cpp b/libc/src/math/generic/lrintf16.cpp
index 92af687444446..d49be281a686b 100644
--- a/libc/src/math/generic/lrintf16.cpp
+++ b/libc/src/math/generic/lrintf16.cpp
@@ -9,13 +9,12 @@
#include "src/math/lrintf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lrintf16, (float16 x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<float16,
long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lrintl.cpp b/libc/src/math/generic/lrintl.cpp
index d881aeea1727b..b363aacb39bb3 100644
--- a/libc/src/math/generic/lrintl.cpp
+++ b/libc/src/math/generic/lrintl.cpp
@@ -9,13 +9,12 @@
#include "src/math/lrintl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lrintl, (long double x)) {
return fputil::round_to_signed_integer_using_current_rounding_mode<
long double, long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lround.cpp b/libc/src/math/generic/lround.cpp
index b208457000846..a22d8723bdbac 100644
--- a/libc/src/math/generic/lround.cpp
+++ b/libc/src/math/generic/lround.cpp
@@ -9,12 +9,11 @@
#include "src/math/lround.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lround, (double x)) {
return fputil::round_to_signed_integer<double, long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lroundf.cpp b/libc/src/math/generic/lroundf.cpp
index 1e1a948ac7972..40c1323fafd62 100644
--- a/libc/src/math/generic/lroundf.cpp
+++ b/libc/src/math/generic/lroundf.cpp
@@ -9,12 +9,11 @@
#include "src/math/lroundf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lroundf, (float x)) {
return fputil::round_to_signed_integer<float, long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lroundf128.cpp b/libc/src/math/generic/lroundf128.cpp
index 89b15f525f903..f93c475038256 100644
--- a/libc/src/math/generic/lroundf128.cpp
+++ b/libc/src/math/generic/lroundf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/lroundf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lroundf128, (float128 x)) {
return fputil::round_to_signed_integer<float128, long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lroundf16.cpp b/libc/src/math/generic/lroundf16.cpp
index d25bc8467f061..db8113d7bfb5e 100644
--- a/libc/src/math/generic/lroundf16.cpp
+++ b/libc/src/math/generic/lroundf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/lroundf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lroundf16, (float16 x)) {
return fputil::round_to_signed_integer<float16, long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/lroundl.cpp b/libc/src/math/generic/lroundl.cpp
index efcf3da3ff15f..c0c3bde4e285a 100644
--- a/libc/src/math/generic/lroundl.cpp
+++ b/libc/src/math/generic/lroundl.cpp
@@ -9,12 +9,11 @@
#include "src/math/lroundl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lroundl, (long double x)) {
return fputil::round_to_signed_integer<long double, long>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/modf.cpp b/libc/src/math/generic/modf.cpp
index ce56aa0bcf544..d465d194cc64c 100644
--- a/libc/src/math/generic/modf.cpp
+++ b/libc/src/math/generic/modf.cpp
@@ -9,12 +9,11 @@
#include "src/math/modf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, modf, (double x, double *iptr)) {
return fputil::modf(x, *iptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/modff.cpp b/libc/src/math/generic/modff.cpp
index c86a4fb279c7f..daa6697cb62da 100644
--- a/libc/src/math/generic/modff.cpp
+++ b/libc/src/math/generic/modff.cpp
@@ -9,12 +9,11 @@
#include "src/math/modff.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, modff, (float x, float *iptr)) {
return fputil::modf(x, *iptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/modff128.cpp b/libc/src/math/generic/modff128.cpp
index 6f519a6901105..6aef5f510a953 100644
--- a/libc/src/math/generic/modff128.cpp
+++ b/libc/src/math/generic/modff128.cpp
@@ -9,12 +9,11 @@
#include "src/math/modff128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, modff128, (float128 x, float128 *iptr)) {
return fputil::modf(x, *iptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/modff16.cpp b/libc/src/math/generic/modff16.cpp
index 853fc55e26bab..50cc5b5783ade 100644
--- a/libc/src/math/generic/modff16.cpp
+++ b/libc/src/math/generic/modff16.cpp
@@ -9,12 +9,11 @@
#include "src/math/modff16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, modff16, (float16 x, float16 *iptr)) {
return fputil::modf(x, *iptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/modfl.cpp b/libc/src/math/generic/modfl.cpp
index 8c9ab486b5aa3..3271da2953dbd 100644
--- a/libc/src/math/generic/modfl.cpp
+++ b/libc/src/math/generic/modfl.cpp
@@ -9,12 +9,11 @@
#include "src/math/modfl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, modfl, (long double x, long double *iptr)) {
return fputil::modf(x, *iptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nan.cpp b/libc/src/math/generic/nan.cpp
index f92cd3ff5eb50..c0d7fbf4ba483 100644
--- a/libc/src/math/generic/nan.cpp
+++ b/libc/src/math/generic/nan.cpp
@@ -8,11 +8,10 @@
#include "src/math/nan.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nan, (const char *arg)) {
auto result = internal::strtonan<double>(arg);
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(double, nan, (const char *arg)) {
return result.value;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nanf.cpp b/libc/src/math/generic/nanf.cpp
index 7287182406acd..2751a81ac4619 100644
--- a/libc/src/math/generic/nanf.cpp
+++ b/libc/src/math/generic/nanf.cpp
@@ -8,11 +8,10 @@
#include "src/math/nanf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nanf, (const char *arg)) {
auto result = internal::strtonan<float>(arg);
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(float, nanf, (const char *arg)) {
return result.value;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nanf128.cpp b/libc/src/math/generic/nanf128.cpp
index 3d8581afa0371..f087c9f074fde 100644
--- a/libc/src/math/generic/nanf128.cpp
+++ b/libc/src/math/generic/nanf128.cpp
@@ -8,11 +8,10 @@
#include "src/math/nanf128.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, nanf128, (const char *arg)) {
auto result = internal::strtonan<float128>(arg);
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(float128, nanf128, (const char *arg)) {
return result.value;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nanf16.cpp b/libc/src/math/generic/nanf16.cpp
index 27d9d165f4a85..c42cd25fe3ef0 100644
--- a/libc/src/math/generic/nanf16.cpp
+++ b/libc/src/math/generic/nanf16.cpp
@@ -8,11 +8,10 @@
#include "src/math/nanf16.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, nanf16, (const char *arg)) {
auto result = internal::strtonan<float16>(arg);
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(float16, nanf16, (const char *arg)) {
return result.value;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nanl.cpp b/libc/src/math/generic/nanl.cpp
index 4f698cb3c88d0..76dcb56b47b2d 100644
--- a/libc/src/math/generic/nanl.cpp
+++ b/libc/src/math/generic/nanl.cpp
@@ -8,11 +8,10 @@
#include "src/math/nanl.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, nanl, (const char *arg)) {
auto result = internal::strtonan<long double>(arg);
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(long double, nanl, (const char *arg)) {
return result.value;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nearbyint.cpp b/libc/src/math/generic/nearbyint.cpp
index 5662d6698e704..20cbf6c0e701a 100644
--- a/libc/src/math/generic/nearbyint.cpp
+++ b/libc/src/math/generic/nearbyint.cpp
@@ -9,12 +9,11 @@
#include "src/math/nearbyint.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nearbyint, (double x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nearbyintf.cpp b/libc/src/math/generic/nearbyintf.cpp
index 9b8db08215d88..5fb103388d262 100644
--- a/libc/src/math/generic/nearbyintf.cpp
+++ b/libc/src/math/generic/nearbyintf.cpp
@@ -9,12 +9,11 @@
#include "src/math/nearbyintf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nearbyintf, (float x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nearbyintf128.cpp b/libc/src/math/generic/nearbyintf128.cpp
index 95038b8bf1267..fca3587f5b58a 100644
--- a/libc/src/math/generic/nearbyintf128.cpp
+++ b/libc/src/math/generic/nearbyintf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/nearbyintf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, nearbyintf128, (float128 x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nearbyintf16.cpp b/libc/src/math/generic/nearbyintf16.cpp
index 1e6229b8227b0..efd31e9143f57 100644
--- a/libc/src/math/generic/nearbyintf16.cpp
+++ b/libc/src/math/generic/nearbyintf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/nearbyintf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, nearbyintf16, (float16 x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nearbyintl.cpp b/libc/src/math/generic/nearbyintl.cpp
index 79ee73c853ab5..9cbff0169b9b1 100644
--- a/libc/src/math/generic/nearbyintl.cpp
+++ b/libc/src/math/generic/nearbyintl.cpp
@@ -9,12 +9,11 @@
#include "src/math/nearbyintl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, nearbyintl, (long double x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextafter.cpp b/libc/src/math/generic/nextafter.cpp
index ff35c86930eab..57a58b10be911 100644
--- a/libc/src/math/generic/nextafter.cpp
+++ b/libc/src/math/generic/nextafter.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextafter.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nextafter, (double x, double y)) {
return fputil::nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextafterf.cpp b/libc/src/math/generic/nextafterf.cpp
index fd8ca02895b67..dd09fb7f900cf 100644
--- a/libc/src/math/generic/nextafterf.cpp
+++ b/libc/src/math/generic/nextafterf.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextafterf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nextafterf, (float x, float y)) {
return fputil::nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextafterf128.cpp b/libc/src/math/generic/nextafterf128.cpp
index c774f10b88ccd..905c89022ba10 100644
--- a/libc/src/math/generic/nextafterf128.cpp
+++ b/libc/src/math/generic/nextafterf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextafterf128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, nextafterf128, (float128 x, float128 y)) {
return fputil::nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextafterf16.cpp b/libc/src/math/generic/nextafterf16.cpp
index 70adc9c0800d3..144b3fc614614 100644
--- a/libc/src/math/generic/nextafterf16.cpp
+++ b/libc/src/math/generic/nextafterf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextafterf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, nextafterf16, (float16 x, float16 y)) {
return fputil::nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextafterl.cpp b/libc/src/math/generic/nextafterl.cpp
index 5dafd63b77560..e12ad040b5659 100644
--- a/libc/src/math/generic/nextafterl.cpp
+++ b/libc/src/math/generic/nextafterl.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextafterl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, nextafterl, (long double x, long double y)) {
return fputil::nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextdown.cpp b/libc/src/math/generic/nextdown.cpp
index 90a91435f6129..51dee483b70e6 100644
--- a/libc/src/math/generic/nextdown.cpp
+++ b/libc/src/math/generic/nextdown.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextdown.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nextdown, (double x)) {
return fputil::nextupdown</*IsDown=*/true>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextdownf.cpp b/libc/src/math/generic/nextdownf.cpp
index 282ebfd139c67..857b412d64c3c 100644
--- a/libc/src/math/generic/nextdownf.cpp
+++ b/libc/src/math/generic/nextdownf.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextdownf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nextdownf, (float x)) {
return fputil::nextupdown</*IsDown=*/true>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextdownf128.cpp b/libc/src/math/generic/nextdownf128.cpp
index 1557e3315be9b..2585a13df3a3c 100644
--- a/libc/src/math/generic/nextdownf128.cpp
+++ b/libc/src/math/generic/nextdownf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextdownf128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, nextdownf128, (float128 x)) {
return fputil::nextupdown</*IsDown=*/true>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextdownf16.cpp b/libc/src/math/generic/nextdownf16.cpp
index 2573fbf7267a6..9fdaa9dafdd8b 100644
--- a/libc/src/math/generic/nextdownf16.cpp
+++ b/libc/src/math/generic/nextdownf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextdownf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, nextdownf16, (float16 x)) {
return fputil::nextupdown</*IsDown=*/true>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextdownl.cpp b/libc/src/math/generic/nextdownl.cpp
index 476c5f30e66f9..06a09c9daea59 100644
--- a/libc/src/math/generic/nextdownl.cpp
+++ b/libc/src/math/generic/nextdownl.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextdownl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, nextdownl, (long double x)) {
return fputil::nextupdown</*IsDown=*/true>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nexttoward.cpp b/libc/src/math/generic/nexttoward.cpp
index 7102a0afe38f3..ce3e4e6a69ad2 100644
--- a/libc/src/math/generic/nexttoward.cpp
+++ b/libc/src/math/generic/nexttoward.cpp
@@ -9,9 +9,8 @@
#include "src/math/nexttoward.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nexttoward, (double x, long double y)) {
// We can reuse the nextafter implementation because the internal nextafter is
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(double, nexttoward, (double x, long double y)) {
return fputil::nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nexttowardf.cpp b/libc/src/math/generic/nexttowardf.cpp
index 095a7af8c2611..3b0762c50160a 100644
--- a/libc/src/math/generic/nexttowardf.cpp
+++ b/libc/src/math/generic/nexttowardf.cpp
@@ -9,9 +9,8 @@
#include "src/math/nexttowardf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nexttowardf, (float x, long double y)) {
// We can reuse the nextafter implementation because the internal nextafter is
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(float, nexttowardf, (float x, long double y)) {
return fputil::nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nexttowardf16.cpp b/libc/src/math/generic/nexttowardf16.cpp
index 75218b1dcf812..d1d78e8f22d3e 100644
--- a/libc/src/math/generic/nexttowardf16.cpp
+++ b/libc/src/math/generic/nexttowardf16.cpp
@@ -9,9 +9,8 @@
#include "src/math/nexttowardf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, nexttowardf16, (float16 x, long double y)) {
// We can reuse the nextafter implementation because the internal nextafter is
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(float16, nexttowardf16, (float16 x, long double y)) {
return fputil::nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nexttowardl.cpp b/libc/src/math/generic/nexttowardl.cpp
index b20868956dbc8..e9f7f83907603 100644
--- a/libc/src/math/generic/nexttowardl.cpp
+++ b/libc/src/math/generic/nexttowardl.cpp
@@ -9,9 +9,8 @@
#include "src/math/nexttowardl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, nexttowardl, (long double x, long double y)) {
// We can reuse the nextafter implementation because the internal nextafter is
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(long double, nexttowardl, (long double x, long double y)) {
return fputil::nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextup.cpp b/libc/src/math/generic/nextup.cpp
index ac068240875d1..d75a336eefcc8 100644
--- a/libc/src/math/generic/nextup.cpp
+++ b/libc/src/math/generic/nextup.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextup.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nextup, (double x)) {
return fputil::nextupdown</*IsDown=*/false>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextupf.cpp b/libc/src/math/generic/nextupf.cpp
index 10a4b032b66dd..3b18dae4488d4 100644
--- a/libc/src/math/generic/nextupf.cpp
+++ b/libc/src/math/generic/nextupf.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextupf.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nextupf, (float x)) {
return fputil::nextupdown</*IsDown=*/false>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextupf128.cpp b/libc/src/math/generic/nextupf128.cpp
index c380f0d60916f..7d862c30976cb 100644
--- a/libc/src/math/generic/nextupf128.cpp
+++ b/libc/src/math/generic/nextupf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextupf128.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, nextupf128, (float128 x)) {
return fputil::nextupdown</*IsDown=*/false>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextupf16.cpp b/libc/src/math/generic/nextupf16.cpp
index 5588480c58d0a..5d3d52c94068f 100644
--- a/libc/src/math/generic/nextupf16.cpp
+++ b/libc/src/math/generic/nextupf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextupf16.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, nextupf16, (float16 x)) {
return fputil::nextupdown</*IsDown=*/false>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/nextupl.cpp b/libc/src/math/generic/nextupl.cpp
index e4ef195738811..ccc52445eec5c 100644
--- a/libc/src/math/generic/nextupl.cpp
+++ b/libc/src/math/generic/nextupl.cpp
@@ -9,12 +9,11 @@
#include "src/math/nextupl.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, nextupl, (long double x)) {
return fputil::nextupdown</*IsDown=*/false>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/powf.cpp b/libc/src/math/generic/powf.cpp
index 845ac2521e090..13c04240f59c2 100644
--- a/libc/src/math/generic/powf.cpp
+++ b/libc/src/math/generic/powf.cpp
@@ -19,7 +19,6 @@
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/FPUtil/sqrt.h" // Speedup for powf(x, 1/2) = sqrtf(x)
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "exp10f_impl.h" // Speedup for powf(10, y) = exp10f(y)
@@ -27,7 +26,7 @@
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using fputil::DoubleDouble;
using fputil::TripleDouble;
@@ -857,4 +856,4 @@ LLVM_LIBC_FUNCTION(float, powf, (float x, float y)) {
0.0f;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/range_reduction.h b/libc/src/math/generic/range_reduction.h
index 9ea446d89bed5..8a75af5877962 100644
--- a/libc/src/math/generic/range_reduction.h
+++ b/libc/src/math/generic/range_reduction.h
@@ -13,9 +13,8 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace generic {
@@ -85,6 +84,6 @@ LIBC_INLINE int64_t large_range_reduction(double x, int x_exp, double &y) {
} // namespace generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_RANGE_REDUCTION_H
diff --git a/libc/src/math/generic/range_reduction_double_common.h b/libc/src/math/generic/range_reduction_double_common.h
index 2b1c4e8df0c3d..150118fba0ba0 100644
--- a/libc/src/math/generic/range_reduction_double_common.h
+++ b/libc/src/math/generic/range_reduction_double_common.h
@@ -16,9 +16,8 @@
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/common.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace generic {
@@ -226,6 +225,6 @@ LIBC_INLINE constexpr Float128 SIN_K_PI_OVER_128_F128[65] = {
} // namespace generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_RANGE_REDUCTION_DOUBLE_COMMON_H
diff --git a/libc/src/math/generic/range_reduction_double_fma.h b/libc/src/math/generic/range_reduction_double_fma.h
index 7448b5f63dfde..c136de957d2f0 100644
--- a/libc/src/math/generic/range_reduction_double_fma.h
+++ b/libc/src/math/generic/range_reduction_double_fma.h
@@ -14,9 +14,8 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fma {
@@ -491,6 +490,6 @@ LIBC_INLINE unsigned range_reduction_small(double x, DoubleDouble &u) {
} // namespace fma
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_RANGE_REDUCTION_DOUBLE_FMA_H
diff --git a/libc/src/math/generic/range_reduction_double_nofma.h b/libc/src/math/generic/range_reduction_double_nofma.h
index 445a45d3f9796..b9d34d6d9f1a8 100644
--- a/libc/src/math/generic/range_reduction_double_nofma.h
+++ b/libc/src/math/generic/range_reduction_double_nofma.h
@@ -14,9 +14,8 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace nofma {
@@ -489,6 +488,6 @@ LIBC_INLINE unsigned range_reduction_small(double x, DoubleDouble &u) {
} // namespace nofma
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_RANGE_REDUCTION_DOUBLE_NOFMA_H
diff --git a/libc/src/math/generic/range_reduction_fma.h b/libc/src/math/generic/range_reduction_fma.h
index 537d5729dc42c..97b9e3d0f89db 100644
--- a/libc/src/math/generic/range_reduction_fma.h
+++ b/libc/src/math/generic/range_reduction_fma.h
@@ -12,9 +12,8 @@
#include "src/__support/FPUtil/FMA.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/nearest_integer.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fma {
@@ -87,6 +86,6 @@ LIBC_INLINE int64_t large_range_reduction(double x, int x_exp, double &y) {
} // namespace fma
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_RANGE_REDUCTION_FMA_H
diff --git a/libc/src/math/generic/remainder.cpp b/libc/src/math/generic/remainder.cpp
index a22ffc45ead67..3703a32057751 100644
--- a/libc/src/math/generic/remainder.cpp
+++ b/libc/src/math/generic/remainder.cpp
@@ -9,13 +9,12 @@
#include "src/math/remainder.h"
#include "src/__support/FPUtil/DivisionAndRemainderOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, remainder, (double x, double y)) {
int quotient;
return fputil::remquo(x, y, quotient);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/remainderf.cpp b/libc/src/math/generic/remainderf.cpp
index 44e32e9047393..5e8c5e9996b69 100644
--- a/libc/src/math/generic/remainderf.cpp
+++ b/libc/src/math/generic/remainderf.cpp
@@ -9,13 +9,12 @@
#include "src/math/remainderf.h"
#include "src/__support/FPUtil/DivisionAndRemainderOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, remainderf, (float x, float y)) {
int quotient;
return fputil::remquo(x, y, quotient);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/remainderf16.cpp b/libc/src/math/generic/remainderf16.cpp
index 2b6488294fb74..35177228acdbf 100644
--- a/libc/src/math/generic/remainderf16.cpp
+++ b/libc/src/math/generic/remainderf16.cpp
@@ -9,13 +9,12 @@
#include "src/math/remainderf16.h"
#include "src/__support/FPUtil/DivisionAndRemainderOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, remainderf16, (float16 x, float16 y)) {
int quotient;
return fputil::remquo(x, y, quotient);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/remainderl.cpp b/libc/src/math/generic/remainderl.cpp
index a61a13e27e417..def5d4b6fdb98 100644
--- a/libc/src/math/generic/remainderl.cpp
+++ b/libc/src/math/generic/remainderl.cpp
@@ -9,13 +9,12 @@
#include "src/math/remainderl.h"
#include "src/__support/FPUtil/DivisionAndRemainderOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, remainderl, (long double x, long double y)) {
int quotient;
return fputil::remquo(x, y, quotient);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/remquo.cpp b/libc/src/math/generic/remquo.cpp
index 45deb81993bc3..bd88742e5a5c2 100644
--- a/libc/src/math/generic/remquo.cpp
+++ b/libc/src/math/generic/remquo.cpp
@@ -9,12 +9,11 @@
#include "src/math/remquo.h"
#include "src/__support/FPUtil/DivisionAndRemainderOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, remquo, (double x, double y, int *exp)) {
return fputil::remquo(x, y, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/remquof.cpp b/libc/src/math/generic/remquof.cpp
index f3616ab7bf497..b59606f6266fa 100644
--- a/libc/src/math/generic/remquof.cpp
+++ b/libc/src/math/generic/remquof.cpp
@@ -9,12 +9,11 @@
#include "src/math/remquof.h"
#include "src/__support/FPUtil/DivisionAndRemainderOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, remquof, (float x, float y, int *exp)) {
return fputil::remquo(x, y, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/remquof128.cpp b/libc/src/math/generic/remquof128.cpp
index cf8f564b5c52b..e195c7b51b5ff 100644
--- a/libc/src/math/generic/remquof128.cpp
+++ b/libc/src/math/generic/remquof128.cpp
@@ -9,12 +9,11 @@
#include "src/math/remquof128.h"
#include "src/__support/FPUtil/DivisionAndRemainderOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, remquof128, (float128 x, float128 y, int *exp)) {
return fputil::remquo(x, y, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/remquof16.cpp b/libc/src/math/generic/remquof16.cpp
index 3a5baadb3ce3a..a373bfa58651b 100644
--- a/libc/src/math/generic/remquof16.cpp
+++ b/libc/src/math/generic/remquof16.cpp
@@ -9,12 +9,11 @@
#include "src/math/remquof16.h"
#include "src/__support/FPUtil/DivisionAndRemainderOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, remquof16, (float16 x, float16 y, int *exp)) {
return fputil::remquo(x, y, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/remquol.cpp b/libc/src/math/generic/remquol.cpp
index 980f50cbcdeba..7a08af36a4753 100644
--- a/libc/src/math/generic/remquol.cpp
+++ b/libc/src/math/generic/remquol.cpp
@@ -9,13 +9,12 @@
#include "src/math/remquol.h"
#include "src/__support/FPUtil/DivisionAndRemainderOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, remquol,
(long double x, long double y, int *exp)) {
return fputil::remquo(x, y, *exp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/rint.cpp b/libc/src/math/generic/rint.cpp
index f7837df133484..e3189ea48b569 100644
--- a/libc/src/math/generic/rint.cpp
+++ b/libc/src/math/generic/rint.cpp
@@ -9,12 +9,11 @@
#include "src/math/rint.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, rint, (double x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/rintf.cpp b/libc/src/math/generic/rintf.cpp
index 29a2845cc85d4..259a46f376537 100644
--- a/libc/src/math/generic/rintf.cpp
+++ b/libc/src/math/generic/rintf.cpp
@@ -9,12 +9,11 @@
#include "src/math/rintf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, rintf, (float x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/rintf128.cpp b/libc/src/math/generic/rintf128.cpp
index f3b8afa1fd08f..ba9912d6f8538 100644
--- a/libc/src/math/generic/rintf128.cpp
+++ b/libc/src/math/generic/rintf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/rintf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, rintf128, (float128 x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/rintf16.cpp b/libc/src/math/generic/rintf16.cpp
index 69b89de31bf40..e0caa7ad2550e 100644
--- a/libc/src/math/generic/rintf16.cpp
+++ b/libc/src/math/generic/rintf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/rintf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, rintf16, (float16 x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/rintl.cpp b/libc/src/math/generic/rintl.cpp
index 007d29a144e98..5110f238cb05f 100644
--- a/libc/src/math/generic/rintl.cpp
+++ b/libc/src/math/generic/rintl.cpp
@@ -9,12 +9,11 @@
#include "src/math/rintl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, rintl, (long double x)) {
return fputil::round_using_current_rounding_mode(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/round.cpp b/libc/src/math/generic/round.cpp
index d8b171a2ef092..ca8f19f35f7fe 100644
--- a/libc/src/math/generic/round.cpp
+++ b/libc/src/math/generic/round.cpp
@@ -9,10 +9,9 @@
#include "src/math/round.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, round, (double x)) { return fputil::round(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/roundeven.cpp b/libc/src/math/generic/roundeven.cpp
index e6f599991bc0f..5f2adf9b5fce6 100644
--- a/libc/src/math/generic/roundeven.cpp
+++ b/libc/src/math/generic/roundeven.cpp
@@ -9,12 +9,11 @@
#include "src/math/roundeven.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, roundeven, (double x)) {
return fputil::round_using_specific_rounding_mode(x, FP_INT_TONEAREST);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/roundevenf.cpp b/libc/src/math/generic/roundevenf.cpp
index 0b63a093edf6c..353bec74ecf02 100644
--- a/libc/src/math/generic/roundevenf.cpp
+++ b/libc/src/math/generic/roundevenf.cpp
@@ -9,12 +9,11 @@
#include "src/math/roundevenf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, roundevenf, (float x)) {
return fputil::round_using_specific_rounding_mode(x, FP_INT_TONEAREST);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/roundevenf128.cpp b/libc/src/math/generic/roundevenf128.cpp
index 354076b4a68f8..259388c86fd33 100644
--- a/libc/src/math/generic/roundevenf128.cpp
+++ b/libc/src/math/generic/roundevenf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/roundevenf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, roundevenf128, (float128 x)) {
return fputil::round_using_specific_rounding_mode(x, FP_INT_TONEAREST);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/roundevenf16.cpp b/libc/src/math/generic/roundevenf16.cpp
index 8a27d81b895ae..9ecf79ce6f6c2 100644
--- a/libc/src/math/generic/roundevenf16.cpp
+++ b/libc/src/math/generic/roundevenf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/roundevenf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, roundevenf16, (float16 x)) {
return fputil::round_using_specific_rounding_mode(x, FP_INT_TONEAREST);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/roundevenl.cpp b/libc/src/math/generic/roundevenl.cpp
index 6ffe80a0f1d12..f8f429faeec8a 100644
--- a/libc/src/math/generic/roundevenl.cpp
+++ b/libc/src/math/generic/roundevenl.cpp
@@ -9,12 +9,11 @@
#include "src/math/roundevenl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, roundevenl, (long double x)) {
return fputil::round_using_specific_rounding_mode(x, FP_INT_TONEAREST);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/roundf.cpp b/libc/src/math/generic/roundf.cpp
index 68be4b1a51987..9627390ea8b8d 100644
--- a/libc/src/math/generic/roundf.cpp
+++ b/libc/src/math/generic/roundf.cpp
@@ -9,10 +9,9 @@
#include "src/math/roundf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, roundf, (float x)) { return fputil::round(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/roundf128.cpp b/libc/src/math/generic/roundf128.cpp
index 88a545e78dcdb..5b35d746d4407 100644
--- a/libc/src/math/generic/roundf128.cpp
+++ b/libc/src/math/generic/roundf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/roundf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, roundf128, (float128 x)) {
return fputil::round(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/roundf16.cpp b/libc/src/math/generic/roundf16.cpp
index 06f9a79cc21f3..75a255d7798d5 100644
--- a/libc/src/math/generic/roundf16.cpp
+++ b/libc/src/math/generic/roundf16.cpp
@@ -9,10 +9,9 @@
#include "src/math/roundf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, roundf16, (float16 x)) { return fputil::round(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/roundl.cpp b/libc/src/math/generic/roundl.cpp
index 0f7b29e1907cf..c734225844079 100644
--- a/libc/src/math/generic/roundl.cpp
+++ b/libc/src/math/generic/roundl.cpp
@@ -9,12 +9,11 @@
#include "src/math/roundl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, roundl, (long double x)) {
return fputil::round(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/scalblnf16.cpp b/libc/src/math/generic/scalblnf16.cpp
index 7f43841291e43..844a071d754a6 100644
--- a/libc/src/math/generic/scalblnf16.cpp
+++ b/libc/src/math/generic/scalblnf16.cpp
@@ -11,16 +11,15 @@
#include "src/__support/common.h"
#include "hdr/float_macros.h"
-#include "src/__support/macros/config.h"
#if FLT_RADIX != 2
#error "FLT_RADIX != 2 is not supported."
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, scalblnf16, (float16 x, long n)) {
return fputil::ldexp(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/scalbn.cpp b/libc/src/math/generic/scalbn.cpp
index c1ee994197f52..207cce1550bc0 100644
--- a/libc/src/math/generic/scalbn.cpp
+++ b/libc/src/math/generic/scalbn.cpp
@@ -10,16 +10,15 @@
#include "hdr/float_macros.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#if FLT_RADIX != 2
#error "FLT_RADIX != 2 is not supported."
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, scalbn, (double x, int n)) {
return fputil::ldexp(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/scalbnf.cpp b/libc/src/math/generic/scalbnf.cpp
index 4281b0093c54b..e478088d3ce5a 100644
--- a/libc/src/math/generic/scalbnf.cpp
+++ b/libc/src/math/generic/scalbnf.cpp
@@ -10,16 +10,15 @@
#include "hdr/float_macros.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#if FLT_RADIX != 2
#error "FLT_RADIX != 2 is not supported."
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, scalbnf, (float x, int n)) {
return fputil::ldexp(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/scalbnf128.cpp b/libc/src/math/generic/scalbnf128.cpp
index e3e284613cdc5..5fd59611d53de 100644
--- a/libc/src/math/generic/scalbnf128.cpp
+++ b/libc/src/math/generic/scalbnf128.cpp
@@ -10,16 +10,15 @@
#include "hdr/float_macros.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#if FLT_RADIX != 2
#error "FLT_RADIX != 2 is not supported."
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, scalbnf128, (float128 x, int n)) {
return fputil::ldexp(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/scalbnf16.cpp b/libc/src/math/generic/scalbnf16.cpp
index 641e2d0da0013..a42fdfffd569f 100644
--- a/libc/src/math/generic/scalbnf16.cpp
+++ b/libc/src/math/generic/scalbnf16.cpp
@@ -11,16 +11,15 @@
#include "src/__support/common.h"
#include "hdr/float_macros.h"
-#include "src/__support/macros/config.h"
#if FLT_RADIX != 2
#error "FLT_RADIX != 2 is not supported."
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, scalbnf16, (float16 x, int n)) {
return fputil::ldexp(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/scalbnl.cpp b/libc/src/math/generic/scalbnl.cpp
index 3015c3c6c7f41..1225a7ebaf572 100644
--- a/libc/src/math/generic/scalbnl.cpp
+++ b/libc/src/math/generic/scalbnl.cpp
@@ -10,16 +10,15 @@
#include "hdr/float_macros.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#if FLT_RADIX != 2
#error "FLT_RADIX != 2 is not supported."
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, scalbnl, (long double x, int n)) {
return fputil::ldexp(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/setpayloadf16.cpp b/libc/src/math/generic/setpayloadf16.cpp
index 1d1445eb22432..98fc239765d81 100644
--- a/libc/src/math/generic/setpayloadf16.cpp
+++ b/libc/src/math/generic/setpayloadf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/setpayloadf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, setpayloadf16, (float16 * res, float16 pl)) {
return static_cast<int>(fputil::setpayload</*IsSignaling=*/false>(*res, pl));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/setpayloadsigf16.cpp b/libc/src/math/generic/setpayloadsigf16.cpp
index 5ba9fcdb0fe18..c79620f6dfbe2 100644
--- a/libc/src/math/generic/setpayloadsigf16.cpp
+++ b/libc/src/math/generic/setpayloadsigf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/setpayloadsigf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, setpayloadsigf16, (float16 * res, float16 pl)) {
return static_cast<int>(fputil::setpayload</*IsSignaling=*/true>(*res, pl));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sin.cpp b/libc/src/math/generic/sin.cpp
index 5a4b5a3056ea4..e7a43245408bf 100644
--- a/libc/src/math/generic/sin.cpp
+++ b/libc/src/math/generic/sin.cpp
@@ -15,7 +15,6 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include "src/math/generic/sincos_eval.h"
@@ -50,7 +49,7 @@ LIBC_INLINE constexpr bool NO_FMA = true;
#define LIBC_MATH_SIN_SKIP_ACCURATE_PASS
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using DoubleDouble = fputil::DoubleDouble;
using Float128 = typename fputil::DyadicFloat<128>;
@@ -205,4 +204,4 @@ LLVM_LIBC_FUNCTION(double, sin, (double x)) {
#endif // !LIBC_MATH_SIN_SKIP_ACCURATE_PASS
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sincos.cpp b/libc/src/math/generic/sincos.cpp
index de107e6004b44..ed70e380b72e8 100644
--- a/libc/src/math/generic/sincos.cpp
+++ b/libc/src/math/generic/sincos.cpp
@@ -16,7 +16,6 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include "src/math/generic/sincos_eval.h"
@@ -51,7 +50,7 @@ LIBC_INLINE constexpr bool NO_FMA = true;
#define LIBC_MATH_SINCOS_SKIP_ACCURATE_PASS
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using DoubleDouble = fputil::DoubleDouble;
using Float128 = typename fputil::DyadicFloat<128>;
@@ -245,4 +244,4 @@ LLVM_LIBC_FUNCTION(void, sincos, (double x, double *sin_x, double *cos_x)) {
#endif // !LIBC_MATH_SINCOS_SKIP_ACCURATE_PASS
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sincos_eval.h b/libc/src/math/generic/sincos_eval.h
index e491467c5663f..5b4f3b8563cff 100644
--- a/libc/src/math/generic/sincos_eval.h
+++ b/libc/src/math/generic/sincos_eval.h
@@ -14,9 +14,8 @@
#include "src/__support/FPUtil/dyadic_float.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace generic {
@@ -120,6 +119,6 @@ LIBC_INLINE void sincos_eval(const Float128 &u, Float128 &sin_u,
} // namespace generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_SINCOSF_EVAL_H
diff --git a/libc/src/math/generic/sincosf.cpp b/libc/src/math/generic/sincosf.cpp
index 3bf8e9772231d..9ebf0b6868967 100644
--- a/libc/src/math/generic/sincosf.cpp
+++ b/libc/src/math/generic/sincosf.cpp
@@ -13,13 +13,12 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Exceptional values
static constexpr int N_EXCEPTS = 6;
@@ -200,4 +199,4 @@ LLVM_LIBC_FUNCTION(void, sincosf, (float x, float *sinp, float *cosp)) {
sin_y, -sin_k, fputil::multiply_add(cosm1_y, cos_k, cos_k)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sincosf_utils.h b/libc/src/math/generic/sincosf_utils.h
index 726a5ab9b64be..f20fb6a05a324 100644
--- a/libc/src/math/generic/sincosf_utils.h
+++ b/libc/src/math/generic/sincosf_utils.h
@@ -11,7 +11,6 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/PolyEval.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#if defined(LIBC_TARGET_CPU_HAS_FMA)
@@ -29,7 +28,7 @@ using LIBC_NAMESPACE::generic::large_range_reduction;
using LIBC_NAMESPACE::generic::small_range_reduction;
#endif // LIBC_TARGET_CPU_HAS_FMA
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Lookup table for sin(k * pi / 32) with k = 0, ..., 63.
// Table is generated with Sollya as follow:
@@ -120,6 +119,6 @@ LIBC_INLINE void sincospif_eval(double xd, double &sin_k, double &cos_k,
sincosf_poly_eval(k, y, sin_k, cos_k, sin_y, cosm1_y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GENERIC_SINCOSF_UTILS_H
diff --git a/libc/src/math/generic/sinf.cpp b/libc/src/math/generic/sinf.cpp
index 43c2c2a8d883d..ff555bcb12198 100644
--- a/libc/src/math/generic/sinf.cpp
+++ b/libc/src/math/generic/sinf.cpp
@@ -15,7 +15,6 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
@@ -27,7 +26,7 @@
#include "range_reduction.h"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sinf, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -156,4 +155,4 @@ LLVM_LIBC_FUNCTION(float, sinf, (float x)) {
sin_y, cos_k, fputil::multiply_add(cosm1_y, sin_k, sin_k)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sinhf.cpp b/libc/src/math/generic/sinhf.cpp
index 371dd6e67e66e..780c9a1f8d6ac 100644
--- a/libc/src/math/generic/sinhf.cpp
+++ b/libc/src/math/generic/sinhf.cpp
@@ -9,11 +9,10 @@
#include "src/math/sinhf.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/math/generic/explogxf.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sinhf, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -73,4 +72,4 @@ LLVM_LIBC_FUNCTION(float, sinhf, (float x)) {
return static_cast<float>(exp_pm_eval</*is_sinh*/ true>(x));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sinpif.cpp b/libc/src/math/generic/sinpif.cpp
index f572ded06b25a..05bdad3ab4d0e 100644
--- a/libc/src/math/generic/sinpif.cpp
+++ b/libc/src/math/generic/sinpif.cpp
@@ -13,10 +13,9 @@
#include "src/__support/FPUtil/PolyEval.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sinpif, (float x)) {
using FPBits = typename fputil::FPBits<float>;
@@ -109,4 +108,4 @@ LLVM_LIBC_FUNCTION(float, sinpif, (float x)) {
sin_y, cos_k, fputil::multiply_add(cosm1_y, sin_k, sin_k)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sqrt.cpp b/libc/src/math/generic/sqrt.cpp
index 791975e1be2d5..f33b0a2cdcf74 100644
--- a/libc/src/math/generic/sqrt.cpp
+++ b/libc/src/math/generic/sqrt.cpp
@@ -9,10 +9,9 @@
#include "src/math/sqrt.h"
#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, sqrt, (double x)) { return fputil::sqrt<double>(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sqrtf.cpp b/libc/src/math/generic/sqrtf.cpp
index 69e0c34770055..26a53e9077c1c 100644
--- a/libc/src/math/generic/sqrtf.cpp
+++ b/libc/src/math/generic/sqrtf.cpp
@@ -9,10 +9,9 @@
#include "src/math/sqrtf.h"
#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sqrtf, (float x)) { return fputil::sqrt<float>(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sqrtf128.cpp b/libc/src/math/generic/sqrtf128.cpp
index f87066b6f6403..70e28ddb692d4 100644
--- a/libc/src/math/generic/sqrtf128.cpp
+++ b/libc/src/math/generic/sqrtf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/sqrtf128.h"
#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, sqrtf128, (float128 x)) {
return fputil::sqrt<float128>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/sqrtl.cpp b/libc/src/math/generic/sqrtl.cpp
index 2368182740ca8..9f0cc87853823 100644
--- a/libc/src/math/generic/sqrtl.cpp
+++ b/libc/src/math/generic/sqrtl.cpp
@@ -9,12 +9,11 @@
#include "src/math/sqrtl.h"
#include "src/__support/FPUtil/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, sqrtl, (long double x)) {
return fputil::sqrt<long double>(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/tan.cpp b/libc/src/math/generic/tan.cpp
index a3bc972ef9c59..d153cc53acc80 100644
--- a/libc/src/math/generic/tan.cpp
+++ b/libc/src/math/generic/tan.cpp
@@ -17,7 +17,6 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/rounding_mode.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
@@ -53,7 +52,7 @@ LIBC_INLINE constexpr bool NO_FMA = true;
#define LIBC_MATH_TAN_SKIP_ACCURATE_PASS
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using DoubleDouble = fputil::DoubleDouble;
using Float128 = typename fputil::DyadicFloat<128>;
@@ -317,4 +316,4 @@ LLVM_LIBC_FUNCTION(double, tan, (double x)) {
#endif // !LIBC_MATH_TAN_SKIP_ACCURATE_PASS
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/tanf.cpp b/libc/src/math/generic/tanf.cpp
index 01d8c9855d461..b2882b57b29c8 100644
--- a/libc/src/math/generic/tanf.cpp
+++ b/libc/src/math/generic/tanf.cpp
@@ -15,13 +15,12 @@
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/nearest_integer.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Exceptional cases for tanf.
constexpr size_t N_EXCEPTS = 6;
@@ -140,4 +139,4 @@ LLVM_LIBC_FUNCTION(float, tanf, (float x)) {
multiply_add(sin_y, -sin_k, multiply_add(cosm1_y, cos_k, cos_k)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/tanhf.cpp b/libc/src/math/generic/tanhf.cpp
index 32153c3e1c943..0efd0cefebe57 100644
--- a/libc/src/math/generic/tanhf.cpp
+++ b/libc/src/math/generic/tanhf.cpp
@@ -11,12 +11,11 @@
#include "src/__support/FPUtil/PolyEval.h"
#include "src/__support/FPUtil/multiply_add.h"
#include "src/__support/FPUtil/nearest_integer.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/__support/macros/properties/cpu_features.h"
#include "src/math/generic/explogxf.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// 2^6 * log2(e)
constexpr double LOG2_E_EXP2_6 = ExpBase::LOG2_B * 2.0;
@@ -117,4 +116,4 @@ LLVM_LIBC_FUNCTION(float, tanhf, (float x)) {
return static_cast<float>((r - mh) / (r + mh));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/totalorderf16.cpp b/libc/src/math/generic/totalorderf16.cpp
index 743aa5a55db55..e43beb33d2fd3 100644
--- a/libc/src/math/generic/totalorderf16.cpp
+++ b/libc/src/math/generic/totalorderf16.cpp
@@ -9,12 +9,11 @@
#include "src/math/totalorderf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, totalorderf16, (const float16 *x, const float16 *y)) {
return static_cast<int>(fputil::totalorder(*x, *y));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/totalordermagf16.cpp b/libc/src/math/generic/totalordermagf16.cpp
index 0d2e9e174f522..09d04fbeb2d2c 100644
--- a/libc/src/math/generic/totalordermagf16.cpp
+++ b/libc/src/math/generic/totalordermagf16.cpp
@@ -9,13 +9,12 @@
#include "src/math/totalordermagf16.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, totalordermagf16,
(const float16 *x, const float16 *y)) {
return static_cast<int>(fputil::totalordermag(*x, *y));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/trunc.cpp b/libc/src/math/generic/trunc.cpp
index 0bf2ac5962e7b..d171ab1f092fd 100644
--- a/libc/src/math/generic/trunc.cpp
+++ b/libc/src/math/generic/trunc.cpp
@@ -9,10 +9,9 @@
#include "src/math/trunc.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, trunc, (double x)) { return fputil::trunc(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/truncf.cpp b/libc/src/math/generic/truncf.cpp
index 371cb9f8229a6..93bfb7f2882a5 100644
--- a/libc/src/math/generic/truncf.cpp
+++ b/libc/src/math/generic/truncf.cpp
@@ -9,10 +9,9 @@
#include "src/math/truncf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, truncf, (float x)) { return fputil::trunc(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/truncf128.cpp b/libc/src/math/generic/truncf128.cpp
index 200dbf1286af9..ecf05fa73b35c 100644
--- a/libc/src/math/generic/truncf128.cpp
+++ b/libc/src/math/generic/truncf128.cpp
@@ -9,12 +9,11 @@
#include "src/math/truncf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, truncf128, (float128 x)) {
return fputil::trunc(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/truncf16.cpp b/libc/src/math/generic/truncf16.cpp
index ea7695dc95f0b..65bd57d810323 100644
--- a/libc/src/math/generic/truncf16.cpp
+++ b/libc/src/math/generic/truncf16.cpp
@@ -9,10 +9,9 @@
#include "src/math/truncf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, truncf16, (float16 x)) { return fputil::trunc(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/truncl.cpp b/libc/src/math/generic/truncl.cpp
index 83b0827d4a192..3429129183100 100644
--- a/libc/src/math/generic/truncl.cpp
+++ b/libc/src/math/generic/truncl.cpp
@@ -9,12 +9,11 @@
#include "src/math/truncl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, truncl, (long double x)) {
return fputil::trunc(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfp.cpp b/libc/src/math/generic/ufromfp.cpp
index f460a4314a35a..15800d67fd8d3 100644
--- a/libc/src/math/generic/ufromfp.cpp
+++ b/libc/src/math/generic/ufromfp.cpp
@@ -9,12 +9,11 @@
#include "src/math/ufromfp.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, ufromfp, (double x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfpf.cpp b/libc/src/math/generic/ufromfpf.cpp
index 07be4e90375e9..898446ec45aa2 100644
--- a/libc/src/math/generic/ufromfpf.cpp
+++ b/libc/src/math/generic/ufromfpf.cpp
@@ -9,12 +9,11 @@
#include "src/math/ufromfpf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, ufromfpf, (float x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfpf128.cpp b/libc/src/math/generic/ufromfpf128.cpp
index 1a532cf047b2e..cc728f35551ca 100644
--- a/libc/src/math/generic/ufromfpf128.cpp
+++ b/libc/src/math/generic/ufromfpf128.cpp
@@ -9,13 +9,12 @@
#include "src/math/ufromfpf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, ufromfpf128,
(float128 x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfpf16.cpp b/libc/src/math/generic/ufromfpf16.cpp
index 314c5257a46b7..bf041f463115a 100644
--- a/libc/src/math/generic/ufromfpf16.cpp
+++ b/libc/src/math/generic/ufromfpf16.cpp
@@ -9,13 +9,12 @@
#include "src/math/ufromfpf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, ufromfpf16,
(float16 x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfpl.cpp b/libc/src/math/generic/ufromfpl.cpp
index 050950aa626ac..bd353e9ebbb56 100644
--- a/libc/src/math/generic/ufromfpl.cpp
+++ b/libc/src/math/generic/ufromfpl.cpp
@@ -9,13 +9,12 @@
#include "src/math/ufromfpl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, ufromfpl,
(long double x, int rnd, unsigned int width)) {
return fputil::fromfp</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfpx.cpp b/libc/src/math/generic/ufromfpx.cpp
index 178049bb75bc9..5ad95ff3061eb 100644
--- a/libc/src/math/generic/ufromfpx.cpp
+++ b/libc/src/math/generic/ufromfpx.cpp
@@ -9,12 +9,11 @@
#include "src/math/ufromfpx.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, ufromfpx, (double x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfpxf.cpp b/libc/src/math/generic/ufromfpxf.cpp
index 8f3cd5075b484..7c878489e8d25 100644
--- a/libc/src/math/generic/ufromfpxf.cpp
+++ b/libc/src/math/generic/ufromfpxf.cpp
@@ -9,12 +9,11 @@
#include "src/math/ufromfpxf.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, ufromfpxf, (float x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfpxf128.cpp b/libc/src/math/generic/ufromfpxf128.cpp
index 9d6348ce42810..57c290365e693 100644
--- a/libc/src/math/generic/ufromfpxf128.cpp
+++ b/libc/src/math/generic/ufromfpxf128.cpp
@@ -9,13 +9,12 @@
#include "src/math/ufromfpxf128.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float128, ufromfpxf128,
(float128 x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfpxf16.cpp b/libc/src/math/generic/ufromfpxf16.cpp
index b1f42a8d55ecc..aeb7aa8d76b63 100644
--- a/libc/src/math/generic/ufromfpxf16.cpp
+++ b/libc/src/math/generic/ufromfpxf16.cpp
@@ -9,13 +9,12 @@
#include "src/math/ufromfpxf16.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float16, ufromfpxf16,
(float16 x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/generic/ufromfpxl.cpp b/libc/src/math/generic/ufromfpxl.cpp
index 637721eb0a2ca..9a8ba7aa5b91d 100644
--- a/libc/src/math/generic/ufromfpxl.cpp
+++ b/libc/src/math/generic/ufromfpxl.cpp
@@ -9,13 +9,12 @@
#include "src/math/ufromfpxl.h"
#include "src/__support/FPUtil/NearestIntegerOperations.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, ufromfpxl,
(long double x, int rnd, unsigned int width)) {
return fputil::fromfpx</*IsSigned=*/false>(x, rnd, width);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/getpayloadf16.h b/libc/src/math/getpayloadf16.h
index 565454edd8189..1349dfd370239 100644
--- a/libc/src/math/getpayloadf16.h
+++ b/libc/src/math/getpayloadf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_GETPAYLOADF16_H
#define LLVM_LIBC_SRC_MATH_GETPAYLOADF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 getpayloadf16(const float16 *x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_GETPAYLOADF16_H
diff --git a/libc/src/math/hypot.h b/libc/src/math/hypot.h
index b78792be07b2b..981473f9e8d5b 100644
--- a/libc/src/math/hypot.h
+++ b/libc/src/math/hypot.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_HYPOT_H
#define LLVM_LIBC_SRC_MATH_HYPOT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double hypot(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_HYPOT_H
diff --git a/libc/src/math/hypotf.h b/libc/src/math/hypotf.h
index 2c10c465f2e5f..1d290b421f151 100644
--- a/libc/src/math/hypotf.h
+++ b/libc/src/math/hypotf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_HYPOTF_H
#define LLVM_LIBC_SRC_MATH_HYPOTF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float hypotf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_HYPOTF_H
diff --git a/libc/src/math/ilogb.h b/libc/src/math/ilogb.h
index 5b43107de23e3..e851a6a4c4d55 100644
--- a/libc/src/math/ilogb.h
+++ b/libc/src/math/ilogb.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ILOGB_H
#define LLVM_LIBC_SRC_MATH_ILOGB_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ilogb(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ILOGB_H
diff --git a/libc/src/math/ilogbf.h b/libc/src/math/ilogbf.h
index 36197ecd50b10..edea34618ac02 100644
--- a/libc/src/math/ilogbf.h
+++ b/libc/src/math/ilogbf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ILOGBF_H
#define LLVM_LIBC_SRC_MATH_ILOGBF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ilogbf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ILOGBF_H
diff --git a/libc/src/math/ilogbf128.h b/libc/src/math/ilogbf128.h
index 9ea5e89fdf993..d8fe3b970973c 100644
--- a/libc/src/math/ilogbf128.h
+++ b/libc/src/math/ilogbf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_ILOGBF128_H
#define LLVM_LIBC_SRC_MATH_ILOGBF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ilogbf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ILOGBF128_H
diff --git a/libc/src/math/ilogbf16.h b/libc/src/math/ilogbf16.h
index a712cd78dc0fc..4884a140cb4f6 100644
--- a/libc/src/math/ilogbf16.h
+++ b/libc/src/math/ilogbf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_ILOGBF16_H
#define LLVM_LIBC_SRC_MATH_ILOGBF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ilogbf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ILOGBF16_H
diff --git a/libc/src/math/ilogbl.h b/libc/src/math/ilogbl.h
index 5f089e24e266b..1b4782f3445ca 100644
--- a/libc/src/math/ilogbl.h
+++ b/libc/src/math/ilogbl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ILOGBL_H
#define LLVM_LIBC_SRC_MATH_ILOGBL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ilogbl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ILOGBL_H
diff --git a/libc/src/math/isnan.h b/libc/src/math/isnan.h
index e9776fdb8a94c..eda8e7eb30f39 100644
--- a/libc/src/math/isnan.h
+++ b/libc/src/math/isnan.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ISNAN_H
#define LLVM_LIBC_SRC_MATH_ISNAN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isnan(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ISNAN_H
diff --git a/libc/src/math/isnanf.h b/libc/src/math/isnanf.h
index bdf74d3b05f97..a12d39ee5af97 100644
--- a/libc/src/math/isnanf.h
+++ b/libc/src/math/isnanf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ISNANF_H
#define LLVM_LIBC_SRC_MATH_ISNANF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isnanf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ISNANF_H
diff --git a/libc/src/math/isnanl.h b/libc/src/math/isnanl.h
index ade6a8849ac49..9fbfca03cb15e 100644
--- a/libc/src/math/isnanl.h
+++ b/libc/src/math/isnanl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ISNANL_H
#define LLVM_LIBC_SRC_MATH_ISNANL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isnanl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ISNANL_H
diff --git a/libc/src/math/ldexp.h b/libc/src/math/ldexp.h
index e7897d245f299..7a8bcc34bf581 100644
--- a/libc/src/math/ldexp.h
+++ b/libc/src/math/ldexp.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LDEXP_H
#define LLVM_LIBC_SRC_MATH_LDEXP_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double ldexp(double x, int exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LDEXP_H
diff --git a/libc/src/math/ldexpf.h b/libc/src/math/ldexpf.h
index 363a1b70ad6fa..c06b487171cd2 100644
--- a/libc/src/math/ldexpf.h
+++ b/libc/src/math/ldexpf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LDEXPF_H
#define LLVM_LIBC_SRC_MATH_LDEXPF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float ldexpf(float x, int exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LDEXPF_H
diff --git a/libc/src/math/ldexpf128.h b/libc/src/math/ldexpf128.h
index 74c3ef612166e..7aa6ded3c8e4c 100644
--- a/libc/src/math/ldexpf128.h
+++ b/libc/src/math/ldexpf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LDEXPF128_H
#define LLVM_LIBC_SRC_MATH_LDEXPF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 ldexpf128(float128 x, int exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LDEXPF128_H
diff --git a/libc/src/math/ldexpf16.h b/libc/src/math/ldexpf16.h
index 877e48ba5781b..7303610b18dff 100644
--- a/libc/src/math/ldexpf16.h
+++ b/libc/src/math/ldexpf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LDEXPF16_H
#define LLVM_LIBC_SRC_MATH_LDEXPF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 ldexpf16(float16 x, int exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LDEXPF16_H
diff --git a/libc/src/math/ldexpl.h b/libc/src/math/ldexpl.h
index 16a480d202d0d..f2df0c86cad22 100644
--- a/libc/src/math/ldexpl.h
+++ b/libc/src/math/ldexpl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LDEXPL_H
#define LLVM_LIBC_SRC_MATH_LDEXPL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double ldexpl(long double x, int exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LDEXPL_H
diff --git a/libc/src/math/llogb.h b/libc/src/math/llogb.h
index f9454891ae16c..b51f89fc0416e 100644
--- a/libc/src/math/llogb.h
+++ b/libc/src/math/llogb.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LLOGB_H
#define LLVM_LIBC_SRC_MATH_LLOGB_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long llogb(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLOGB_H
diff --git a/libc/src/math/llogbf.h b/libc/src/math/llogbf.h
index 4415562f9f3fd..af4aa8a5b15c0 100644
--- a/libc/src/math/llogbf.h
+++ b/libc/src/math/llogbf.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LLOGBF_H
#define LLVM_LIBC_SRC_MATH_LLOGBF_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long llogbf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLOGBF_H
diff --git a/libc/src/math/llogbf128.h b/libc/src/math/llogbf128.h
index 1ad4932020257..ce7c872a63db4 100644
--- a/libc/src/math/llogbf128.h
+++ b/libc/src/math/llogbf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LLOGBF128_H
#define LLVM_LIBC_SRC_MATH_LLOGBF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long llogbf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLOGBF128_H
diff --git a/libc/src/math/llogbf16.h b/libc/src/math/llogbf16.h
index 4672328f1ce34..267ae410a31d8 100644
--- a/libc/src/math/llogbf16.h
+++ b/libc/src/math/llogbf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LLOGBF16_H
#define LLVM_LIBC_SRC_MATH_LLOGBF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long llogbf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLOGBF16_H
diff --git a/libc/src/math/llogbl.h b/libc/src/math/llogbl.h
index bf502a1c0bc3b..3c323a3af2a93 100644
--- a/libc/src/math/llogbl.h
+++ b/libc/src/math/llogbl.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LLOGBL_H
#define LLVM_LIBC_SRC_MATH_LLOGBL_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long llogbl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLOGBL_H
diff --git a/libc/src/math/llrint.h b/libc/src/math/llrint.h
index 7ad5bbdc1f66f..69c881ea844f9 100644
--- a/libc/src/math/llrint.h
+++ b/libc/src/math/llrint.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LLRINT_H
#define LLVM_LIBC_SRC_MATH_LLRINT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llrint(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLRINT_H
diff --git a/libc/src/math/llrintf.h b/libc/src/math/llrintf.h
index 89334b5a85c00..023e84aa05092 100644
--- a/libc/src/math/llrintf.h
+++ b/libc/src/math/llrintf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LLRINTF_H
#define LLVM_LIBC_SRC_MATH_LLRINTF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llrintf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLRINTF_H
diff --git a/libc/src/math/llrintf128.h b/libc/src/math/llrintf128.h
index ff2e9a2248bba..ac9c249342cc7 100644
--- a/libc/src/math/llrintf128.h
+++ b/libc/src/math/llrintf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LLRINTF128_H
#define LLVM_LIBC_SRC_MATH_LLRINTF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llrintf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLRINTF128_H
diff --git a/libc/src/math/llrintf16.h b/libc/src/math/llrintf16.h
index 5c053038c8ae4..90ad0e9e2ea2a 100644
--- a/libc/src/math/llrintf16.h
+++ b/libc/src/math/llrintf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LLRINTF16_H
#define LLVM_LIBC_SRC_MATH_LLRINTF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llrintf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLRINTF16_H
diff --git a/libc/src/math/llrintl.h b/libc/src/math/llrintl.h
index 0c0d7d31ef9da..4dbcc60589812 100644
--- a/libc/src/math/llrintl.h
+++ b/libc/src/math/llrintl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LLRINTL_H
#define LLVM_LIBC_SRC_MATH_LLRINTL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llrintl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLRINTL_H
diff --git a/libc/src/math/llround.h b/libc/src/math/llround.h
index 3843e120adcbe..265b4fd92e0e8 100644
--- a/libc/src/math/llround.h
+++ b/libc/src/math/llround.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LLROUND_H
#define LLVM_LIBC_SRC_MATH_LLROUND_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llround(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLROUND_H
diff --git a/libc/src/math/llroundf.h b/libc/src/math/llroundf.h
index 7f61889554080..2141ca91da46b 100644
--- a/libc/src/math/llroundf.h
+++ b/libc/src/math/llroundf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LLROUNDF_H
#define LLVM_LIBC_SRC_MATH_LLROUNDF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llroundf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLROUNDF_H
diff --git a/libc/src/math/llroundf128.h b/libc/src/math/llroundf128.h
index 59d4d8da582ed..3245dfafc4d5a 100644
--- a/libc/src/math/llroundf128.h
+++ b/libc/src/math/llroundf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LLROUNDF128_H
#define LLVM_LIBC_SRC_MATH_LLROUNDF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llroundf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLROUNDF128_H
diff --git a/libc/src/math/llroundf16.h b/libc/src/math/llroundf16.h
index 5ab6f2fab8645..379c45446ab27 100644
--- a/libc/src/math/llroundf16.h
+++ b/libc/src/math/llroundf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LLROUNDF16_H
#define LLVM_LIBC_SRC_MATH_LLROUNDF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llroundf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLROUNDF16_H
diff --git a/libc/src/math/llroundl.h b/libc/src/math/llroundl.h
index 325cac368c9e3..9cb4251f72fe5 100644
--- a/libc/src/math/llroundl.h
+++ b/libc/src/math/llroundl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LLROUNDL_H
#define LLVM_LIBC_SRC_MATH_LLROUNDL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llroundl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LLROUNDL_H
diff --git a/libc/src/math/log.h b/libc/src/math/log.h
index ce6296fdb64fe..67f5d7f89279b 100644
--- a/libc/src/math/log.h
+++ b/libc/src/math/log.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOG_H
#define LLVM_LIBC_SRC_MATH_LOG_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double log(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOG_H
diff --git a/libc/src/math/log10.h b/libc/src/math/log10.h
index 025163acc8902..3d8249aaee2d6 100644
--- a/libc/src/math/log10.h
+++ b/libc/src/math/log10.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOG10_H
#define LLVM_LIBC_SRC_MATH_LOG10_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double log10(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOG10_H
diff --git a/libc/src/math/log10f.h b/libc/src/math/log10f.h
index 59a799957db0e..ca3eadc8866b1 100644
--- a/libc/src/math/log10f.h
+++ b/libc/src/math/log10f.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOG10F_H
#define LLVM_LIBC_SRC_MATH_LOG10F_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float log10f(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOG10F_H
diff --git a/libc/src/math/log1p.h b/libc/src/math/log1p.h
index 84b3d8fdb9f1c..48eb9ca885265 100644
--- a/libc/src/math/log1p.h
+++ b/libc/src/math/log1p.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOG1P_H
#define LLVM_LIBC_SRC_MATH_LOG1P_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double log1p(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOG1P_H
diff --git a/libc/src/math/log1pf.h b/libc/src/math/log1pf.h
index 364c1e8ee74d9..854f76fce9f75 100644
--- a/libc/src/math/log1pf.h
+++ b/libc/src/math/log1pf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOG1PF_H
#define LLVM_LIBC_SRC_MATH_LOG1PF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float log1pf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOG1PF_H
diff --git a/libc/src/math/log2.h b/libc/src/math/log2.h
index a278954989e97..49f05493cf166 100644
--- a/libc/src/math/log2.h
+++ b/libc/src/math/log2.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOG2_H
#define LLVM_LIBC_SRC_MATH_LOG2_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double log2(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOG2_H
diff --git a/libc/src/math/log2f.h b/libc/src/math/log2f.h
index dc35c93bfd71e..04b7743edc0aa 100644
--- a/libc/src/math/log2f.h
+++ b/libc/src/math/log2f.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOG2F_H
#define LLVM_LIBC_SRC_MATH_LOG2F_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float log2f(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOG2F_H
diff --git a/libc/src/math/logb.h b/libc/src/math/logb.h
index 13207e2470038..e24dd4320de65 100644
--- a/libc/src/math/logb.h
+++ b/libc/src/math/logb.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOGB_H
#define LLVM_LIBC_SRC_MATH_LOGB_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double logb(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOGB_H
diff --git a/libc/src/math/logbf.h b/libc/src/math/logbf.h
index 83e117e025a6b..e8d5018056286 100644
--- a/libc/src/math/logbf.h
+++ b/libc/src/math/logbf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOGBF_H
#define LLVM_LIBC_SRC_MATH_LOGBF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float logbf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOGBF_H
diff --git a/libc/src/math/logbf128.h b/libc/src/math/logbf128.h
index 9ce23978707be..7823bbd615b89 100644
--- a/libc/src/math/logbf128.h
+++ b/libc/src/math/logbf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LOGBF128_H
#define LLVM_LIBC_SRC_MATH_LOGBF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 logbf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOGBF128_H
diff --git a/libc/src/math/logbf16.h b/libc/src/math/logbf16.h
index f602098d8294a..8082e06c33d52 100644
--- a/libc/src/math/logbf16.h
+++ b/libc/src/math/logbf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LOGBF16_H
#define LLVM_LIBC_SRC_MATH_LOGBF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 logbf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOGBF16_H
diff --git a/libc/src/math/logbl.h b/libc/src/math/logbl.h
index 02114c4d412ab..bc32993a4bdc2 100644
--- a/libc/src/math/logbl.h
+++ b/libc/src/math/logbl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOGBL_H
#define LLVM_LIBC_SRC_MATH_LOGBL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double logbl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOGBL_H
diff --git a/libc/src/math/logf.h b/libc/src/math/logf.h
index 163f369f4a77f..b69be468ab455 100644
--- a/libc/src/math/logf.h
+++ b/libc/src/math/logf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LOGF_H
#define LLVM_LIBC_SRC_MATH_LOGF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float logf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LOGF_H
diff --git a/libc/src/math/lrint.h b/libc/src/math/lrint.h
index f8988dc9cdc6d..e40f860f1a35e 100644
--- a/libc/src/math/lrint.h
+++ b/libc/src/math/lrint.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LRINT_H
#define LLVM_LIBC_SRC_MATH_LRINT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lrint(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LRINT_H
diff --git a/libc/src/math/lrintf.h b/libc/src/math/lrintf.h
index cbb1818036371..93b2c8cd265df 100644
--- a/libc/src/math/lrintf.h
+++ b/libc/src/math/lrintf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LRINTF_H
#define LLVM_LIBC_SRC_MATH_LRINTF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lrintf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LRINTF_H
diff --git a/libc/src/math/lrintf128.h b/libc/src/math/lrintf128.h
index ae710e9b00448..8f3f5ceabd3c2 100644
--- a/libc/src/math/lrintf128.h
+++ b/libc/src/math/lrintf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LRINTF128_H
#define LLVM_LIBC_SRC_MATH_LRINTF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lrintf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LRINTF128_H
diff --git a/libc/src/math/lrintf16.h b/libc/src/math/lrintf16.h
index 3f2ae90c6f2af..f31fba4cc6a46 100644
--- a/libc/src/math/lrintf16.h
+++ b/libc/src/math/lrintf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LRINTF16_H
#define LLVM_LIBC_SRC_MATH_LRINTF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lrintf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LRINTF16_H
diff --git a/libc/src/math/lrintl.h b/libc/src/math/lrintl.h
index fa6e0197aeb1e..c17901d220d18 100644
--- a/libc/src/math/lrintl.h
+++ b/libc/src/math/lrintl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LRINTL_H
#define LLVM_LIBC_SRC_MATH_LRINTL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lrintl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LRINTL_H
diff --git a/libc/src/math/lround.h b/libc/src/math/lround.h
index 951f900f24262..4a67cc9693ba7 100644
--- a/libc/src/math/lround.h
+++ b/libc/src/math/lround.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LROUND_H
#define LLVM_LIBC_SRC_MATH_LROUND_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lround(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LROUND_H
diff --git a/libc/src/math/lroundf.h b/libc/src/math/lroundf.h
index 9488cc6597718..9d4f4e82b7894 100644
--- a/libc/src/math/lroundf.h
+++ b/libc/src/math/lroundf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LROUNDF_H
#define LLVM_LIBC_SRC_MATH_LROUNDF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lroundf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LROUNDF_H
diff --git a/libc/src/math/lroundf128.h b/libc/src/math/lroundf128.h
index 4191db5792095..663b3732655b2 100644
--- a/libc/src/math/lroundf128.h
+++ b/libc/src/math/lroundf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LROUNDF128_H
#define LLVM_LIBC_SRC_MATH_LROUNDF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lroundf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LROUNDF128_H
diff --git a/libc/src/math/lroundf16.h b/libc/src/math/lroundf16.h
index 9ad782dfe0d82..57201e7063a9e 100644
--- a/libc/src/math/lroundf16.h
+++ b/libc/src/math/lroundf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_LROUNDF16_H
#define LLVM_LIBC_SRC_MATH_LROUNDF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lroundf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LROUNDF16_H
diff --git a/libc/src/math/lroundl.h b/libc/src/math/lroundl.h
index 159c67e827be6..86673dc597fd3 100644
--- a/libc/src/math/lroundl.h
+++ b/libc/src/math/lroundl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_LROUNDL_H
#define LLVM_LIBC_SRC_MATH_LROUNDL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long lroundl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_LROUNDL_H
diff --git a/libc/src/math/modf.h b/libc/src/math/modf.h
index 2c56d597a5e0e..91453a01f02fc 100644
--- a/libc/src/math/modf.h
+++ b/libc/src/math/modf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_MODF_H
#define LLVM_LIBC_SRC_MATH_MODF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double modf(double x, double *iptr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_MODF_H
diff --git a/libc/src/math/modff.h b/libc/src/math/modff.h
index 79e7d9bb04a6c..85bf2aacbc17c 100644
--- a/libc/src/math/modff.h
+++ b/libc/src/math/modff.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_MODFF_H
#define LLVM_LIBC_SRC_MATH_MODFF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float modff(float x, float *iptr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_MODFF_H
diff --git a/libc/src/math/modff128.h b/libc/src/math/modff128.h
index 32c98423a050c..48e614be95b98 100644
--- a/libc/src/math/modff128.h
+++ b/libc/src/math/modff128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_MODFF128_H
#define LLVM_LIBC_SRC_MATH_MODFF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 modff128(float128 x, float128 *iptr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_MODFF128_H
diff --git a/libc/src/math/modff16.h b/libc/src/math/modff16.h
index ce097440572b2..a3017c5a92a64 100644
--- a/libc/src/math/modff16.h
+++ b/libc/src/math/modff16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_MODFF16_H
#define LLVM_LIBC_SRC_MATH_MODFF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 modff16(float16 x, float16 *iptr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_MODFF16_H
diff --git a/libc/src/math/modfl.h b/libc/src/math/modfl.h
index c1e16272417c9..5ea2c6d98c0af 100644
--- a/libc/src/math/modfl.h
+++ b/libc/src/math/modfl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_MODFL_H
#define LLVM_LIBC_SRC_MATH_MODFL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double modfl(long double x, long double *iptr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_MODFL_H
diff --git a/libc/src/math/nan.h b/libc/src/math/nan.h
index 36fed1b2f75d5..463940b01a272 100644
--- a/libc/src/math/nan.h
+++ b/libc/src/math/nan.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NAN_H
#define LLVM_LIBC_SRC_MATH_NAN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double nan(const char *arg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NAN_H
diff --git a/libc/src/math/nanf.h b/libc/src/math/nanf.h
index 3b72ed287c749..f05d60e3a9671 100644
--- a/libc/src/math/nanf.h
+++ b/libc/src/math/nanf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NANF_H
#define LLVM_LIBC_SRC_MATH_NANF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float nanf(const char *arg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NANF_H
diff --git a/libc/src/math/nanf128.h b/libc/src/math/nanf128.h
index 1c1323adcd781..b06d14e2f945e 100644
--- a/libc/src/math/nanf128.h
+++ b/libc/src/math/nanf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NANF128_H
#define LLVM_LIBC_SRC_MATH_NANF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 nanf128(const char *arg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NANF128_H
diff --git a/libc/src/math/nanf16.h b/libc/src/math/nanf16.h
index 1721bcc0f95f7..c2db4bac0a155 100644
--- a/libc/src/math/nanf16.h
+++ b/libc/src/math/nanf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NANF16_H
#define LLVM_LIBC_SRC_MATH_NANF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 nanf16(const char *arg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NANF16_H
diff --git a/libc/src/math/nanl.h b/libc/src/math/nanl.h
index a4a03770caf60..d8bbce7cc1bcc 100644
--- a/libc/src/math/nanl.h
+++ b/libc/src/math/nanl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NANL_H
#define LLVM_LIBC_SRC_MATH_NANL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double nanl(const char *arg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NANL_H
diff --git a/libc/src/math/nearbyint.h b/libc/src/math/nearbyint.h
index 469bd99e1e613..df292a252583f 100644
--- a/libc/src/math/nearbyint.h
+++ b/libc/src/math/nearbyint.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEARBYINT_H
#define LLVM_LIBC_SRC_MATH_NEARBYINT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double nearbyint(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEARBYINT_H
diff --git a/libc/src/math/nearbyintf.h b/libc/src/math/nearbyintf.h
index d89a76233a81f..3860dc03bcf58 100644
--- a/libc/src/math/nearbyintf.h
+++ b/libc/src/math/nearbyintf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEARBYINTF_H
#define LLVM_LIBC_SRC_MATH_NEARBYINTF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float nearbyintf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEARBYINTF_H
diff --git a/libc/src/math/nearbyintf128.h b/libc/src/math/nearbyintf128.h
index 9c4fdd5963dac..d12754a481009 100644
--- a/libc/src/math/nearbyintf128.h
+++ b/libc/src/math/nearbyintf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NEARBYINTF128_H
#define LLVM_LIBC_SRC_MATH_NEARBYINTF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 nearbyintf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEARBYINTF128_H
diff --git a/libc/src/math/nearbyintf16.h b/libc/src/math/nearbyintf16.h
index 2241e43c911ff..3e6f3fb3d493c 100644
--- a/libc/src/math/nearbyintf16.h
+++ b/libc/src/math/nearbyintf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NEARBYINTF16_H
#define LLVM_LIBC_SRC_MATH_NEARBYINTF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 nearbyintf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEARBYINTF16_H
diff --git a/libc/src/math/nearbyintl.h b/libc/src/math/nearbyintl.h
index 3fed5d8ce5241..e22cae6386e69 100644
--- a/libc/src/math/nearbyintl.h
+++ b/libc/src/math/nearbyintl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEARBYINTL_H
#define LLVM_LIBC_SRC_MATH_NEARBYINTL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double nearbyintl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEARBYINTL_H
diff --git a/libc/src/math/nextafter.h b/libc/src/math/nextafter.h
index 636dbd527cd83..fc4c9eb182aa4 100644
--- a/libc/src/math/nextafter.h
+++ b/libc/src/math/nextafter.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTAFTER_H
#define LLVM_LIBC_SRC_MATH_NEXTAFTER_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double nextafter(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTAFTER_H
diff --git a/libc/src/math/nextafterf.h b/libc/src/math/nextafterf.h
index 70ab76e80277c..de7870df5d766 100644
--- a/libc/src/math/nextafterf.h
+++ b/libc/src/math/nextafterf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTAFTERF_H
#define LLVM_LIBC_SRC_MATH_NEXTAFTERF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float nextafterf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTAFTERF_H
diff --git a/libc/src/math/nextafterf128.h b/libc/src/math/nextafterf128.h
index 99b15d6cf43b9..a404d33810ec2 100644
--- a/libc/src/math/nextafterf128.h
+++ b/libc/src/math/nextafterf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTAFTERF128_H
#define LLVM_LIBC_SRC_MATH_NEXTAFTERF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 nextafterf128(float128 x, float128 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTAFTERF128_H
diff --git a/libc/src/math/nextafterf16.h b/libc/src/math/nextafterf16.h
index ab4e0fd870318..293569ef40c53 100644
--- a/libc/src/math/nextafterf16.h
+++ b/libc/src/math/nextafterf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTAFTERF16_H
#define LLVM_LIBC_SRC_MATH_NEXTAFTERF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 nextafterf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTAFTERF16_H
diff --git a/libc/src/math/nextafterl.h b/libc/src/math/nextafterl.h
index a697f799042d8..1b94e242c776e 100644
--- a/libc/src/math/nextafterl.h
+++ b/libc/src/math/nextafterl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTAFTERL_H
#define LLVM_LIBC_SRC_MATH_NEXTAFTERL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double nextafterl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTAFTERL_H
diff --git a/libc/src/math/nextdown.h b/libc/src/math/nextdown.h
index 21f33e383bca1..8049b170ee721 100644
--- a/libc/src/math/nextdown.h
+++ b/libc/src/math/nextdown.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTDOWN_H
#define LLVM_LIBC_SRC_MATH_NEXTDOWN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double nextdown(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTDOWN_H
diff --git a/libc/src/math/nextdownf.h b/libc/src/math/nextdownf.h
index f689287a6f286..0a2f23480574d 100644
--- a/libc/src/math/nextdownf.h
+++ b/libc/src/math/nextdownf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTDOWNF_H
#define LLVM_LIBC_SRC_MATH_NEXTDOWNF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float nextdownf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTDOWNF_H
diff --git a/libc/src/math/nextdownf128.h b/libc/src/math/nextdownf128.h
index 60ba251f67d55..0a3043bb431d8 100644
--- a/libc/src/math/nextdownf128.h
+++ b/libc/src/math/nextdownf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTDOWNF128_H
#define LLVM_LIBC_SRC_MATH_NEXTDOWNF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 nextdownf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTDOWNF128_H
diff --git a/libc/src/math/nextdownf16.h b/libc/src/math/nextdownf16.h
index 5183db2db2a2c..19137574ac92f 100644
--- a/libc/src/math/nextdownf16.h
+++ b/libc/src/math/nextdownf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTDOWNF16_H
#define LLVM_LIBC_SRC_MATH_NEXTDOWNF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 nextdownf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTDOWNF16_H
diff --git a/libc/src/math/nextdownl.h b/libc/src/math/nextdownl.h
index 581557932d4dd..9cb274a89b1c5 100644
--- a/libc/src/math/nextdownl.h
+++ b/libc/src/math/nextdownl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTDOWNL_H
#define LLVM_LIBC_SRC_MATH_NEXTDOWNL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double nextdownl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTDOWNL_H
diff --git a/libc/src/math/nexttoward.h b/libc/src/math/nexttoward.h
index cfa6af9246cda..6a5bece995768 100644
--- a/libc/src/math/nexttoward.h
+++ b/libc/src/math/nexttoward.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTTOWARD_H
#define LLVM_LIBC_SRC_MATH_NEXTTOWARD_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double nexttoward(double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTTOWARD_H
diff --git a/libc/src/math/nexttowardf.h b/libc/src/math/nexttowardf.h
index ee34548684ded..7a0eb2a61b4d4 100644
--- a/libc/src/math/nexttowardf.h
+++ b/libc/src/math/nexttowardf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTTOWARDF_H
#define LLVM_LIBC_SRC_MATH_NEXTTOWARDF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float nexttowardf(float x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTTOWARDF_H
diff --git a/libc/src/math/nexttowardf16.h b/libc/src/math/nexttowardf16.h
index 5975926049249..604eb32c25778 100644
--- a/libc/src/math/nexttowardf16.h
+++ b/libc/src/math/nexttowardf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTTOWARDF16_H
#define LLVM_LIBC_SRC_MATH_NEXTTOWARDF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 nexttowardf16(float16 x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTTOWARDF16_H
diff --git a/libc/src/math/nexttowardl.h b/libc/src/math/nexttowardl.h
index 180ffb5ea48f2..be1d8b298185d 100644
--- a/libc/src/math/nexttowardl.h
+++ b/libc/src/math/nexttowardl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTTOWARDL_H
#define LLVM_LIBC_SRC_MATH_NEXTTOWARDL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double nexttowardl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTTOWARDL_H
diff --git a/libc/src/math/nextup.h b/libc/src/math/nextup.h
index 37b81fde2c31c..97ae82270b06e 100644
--- a/libc/src/math/nextup.h
+++ b/libc/src/math/nextup.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTUP_H
#define LLVM_LIBC_SRC_MATH_NEXTUP_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double nextup(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTUP_H
diff --git a/libc/src/math/nextupf.h b/libc/src/math/nextupf.h
index 9963dbd8b2d59..ffc0fa168a108 100644
--- a/libc/src/math/nextupf.h
+++ b/libc/src/math/nextupf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTUPF_H
#define LLVM_LIBC_SRC_MATH_NEXTUPF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float nextupf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTUPF_H
diff --git a/libc/src/math/nextupf128.h b/libc/src/math/nextupf128.h
index 755c08d891d64..b4429922e4beb 100644
--- a/libc/src/math/nextupf128.h
+++ b/libc/src/math/nextupf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTUPF128_H
#define LLVM_LIBC_SRC_MATH_NEXTUPF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 nextupf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTUPF128_H
diff --git a/libc/src/math/nextupf16.h b/libc/src/math/nextupf16.h
index d80a1057a8ed1..b2973e4afc256 100644
--- a/libc/src/math/nextupf16.h
+++ b/libc/src/math/nextupf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTUPF16_H
#define LLVM_LIBC_SRC_MATH_NEXTUPF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 nextupf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTUPF16_H
diff --git a/libc/src/math/nextupl.h b/libc/src/math/nextupl.h
index d9c5c525a60ba..cbc6a168e4bea 100644
--- a/libc/src/math/nextupl.h
+++ b/libc/src/math/nextupl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_NEXTUPL_H
#define LLVM_LIBC_SRC_MATH_NEXTUPL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double nextupl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NEXTUPL_H
diff --git a/libc/src/math/nvptx/acos.cpp b/libc/src/math/nvptx/acos.cpp
index 7049f9fb31c55..da2c7952feba5 100644
--- a/libc/src/math/nvptx/acos.cpp
+++ b/libc/src/math/nvptx/acos.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, acos, (double x)) { return __nv_acos(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/acosf.cpp b/libc/src/math/nvptx/acosf.cpp
index cf70a0f3b923d..8a4125f03b8cd 100644
--- a/libc/src/math/nvptx/acosf.cpp
+++ b/libc/src/math/nvptx/acosf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, acosf, (float x)) { return __nv_acosf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/acosh.cpp b/libc/src/math/nvptx/acosh.cpp
index 2628aa997d0b7..06f6e2922f569 100644
--- a/libc/src/math/nvptx/acosh.cpp
+++ b/libc/src/math/nvptx/acosh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, acosh, (double x)) { return __nv_acosh(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/acoshf.cpp b/libc/src/math/nvptx/acoshf.cpp
index b8f57fdc05c29..00e8053a50783 100644
--- a/libc/src/math/nvptx/acoshf.cpp
+++ b/libc/src/math/nvptx/acoshf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, acoshf, (float x)) { return __nv_acoshf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/asin.cpp b/libc/src/math/nvptx/asin.cpp
index 417b67ac7da0a..74d92fded72b9 100644
--- a/libc/src/math/nvptx/asin.cpp
+++ b/libc/src/math/nvptx/asin.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, asin, (double x)) { return __nv_asin(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/asinf.cpp b/libc/src/math/nvptx/asinf.cpp
index ea819bdfd00ed..30544bc1313d6 100644
--- a/libc/src/math/nvptx/asinf.cpp
+++ b/libc/src/math/nvptx/asinf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, asinf, (float x)) { return __nv_asinf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/asinh.cpp b/libc/src/math/nvptx/asinh.cpp
index 49dcd227bb4bd..0e5dbb47e667e 100644
--- a/libc/src/math/nvptx/asinh.cpp
+++ b/libc/src/math/nvptx/asinh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, asinh, (double x)) { return __nv_asinh(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/asinhf.cpp b/libc/src/math/nvptx/asinhf.cpp
index af8afe7590edf..6648108646cd3 100644
--- a/libc/src/math/nvptx/asinhf.cpp
+++ b/libc/src/math/nvptx/asinhf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, asinhf, (float x)) { return __nv_asinhf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/atan.cpp b/libc/src/math/nvptx/atan.cpp
index e94ef5787ca45..3af793a53ae5e 100644
--- a/libc/src/math/nvptx/atan.cpp
+++ b/libc/src/math/nvptx/atan.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, atan, (double x)) { return __nv_atan(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/atan2.cpp b/libc/src/math/nvptx/atan2.cpp
index d12c4cb205d51..0c54e0e048996 100644
--- a/libc/src/math/nvptx/atan2.cpp
+++ b/libc/src/math/nvptx/atan2.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, atan2, (double x, double y)) {
return __nv_atan2(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/atan2f.cpp b/libc/src/math/nvptx/atan2f.cpp
index f39f3227b1d57..c3327d92c97e9 100644
--- a/libc/src/math/nvptx/atan2f.cpp
+++ b/libc/src/math/nvptx/atan2f.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, atan2f, (float x, float y)) {
return __nv_atan2f(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/atanf.cpp b/libc/src/math/nvptx/atanf.cpp
index f66ade7a438f3..5595262977323 100644
--- a/libc/src/math/nvptx/atanf.cpp
+++ b/libc/src/math/nvptx/atanf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, atanf, (float x)) { return __nv_atanf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/atanh.cpp b/libc/src/math/nvptx/atanh.cpp
index a206d517af11f..6699d959df187 100644
--- a/libc/src/math/nvptx/atanh.cpp
+++ b/libc/src/math/nvptx/atanh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, atanh, (double x)) { return __nv_atanh(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/atanhf.cpp b/libc/src/math/nvptx/atanhf.cpp
index 06f68833b3d26..526b7b3e37122 100644
--- a/libc/src/math/nvptx/atanhf.cpp
+++ b/libc/src/math/nvptx/atanhf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, atanhf, (float x)) { return __nv_atanhf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/ceil.cpp b/libc/src/math/nvptx/ceil.cpp
index 8834c7b560a1b..ad1407d61f620 100644
--- a/libc/src/math/nvptx/ceil.cpp
+++ b/libc/src/math/nvptx/ceil.cpp
@@ -8,10 +8,9 @@
#include "src/math/ceil.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, ceil, (double x)) { return __builtin_ceil(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/ceilf.cpp b/libc/src/math/nvptx/ceilf.cpp
index 5d26a30c849cd..c4fc58d936038 100644
--- a/libc/src/math/nvptx/ceilf.cpp
+++ b/libc/src/math/nvptx/ceilf.cpp
@@ -8,10 +8,9 @@
#include "src/math/ceilf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, ceilf, (float x)) { return __builtin_ceilf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/copysign.cpp b/libc/src/math/nvptx/copysign.cpp
index 06ef36fb3595f..6f804bdb90a1f 100644
--- a/libc/src/math/nvptx/copysign.cpp
+++ b/libc/src/math/nvptx/copysign.cpp
@@ -8,12 +8,11 @@
#include "src/math/copysign.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, copysign, (double x, double y)) {
return __builtin_copysign(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/copysignf.cpp b/libc/src/math/nvptx/copysignf.cpp
index aea94f3577d8f..4d7e132462ac9 100644
--- a/libc/src/math/nvptx/copysignf.cpp
+++ b/libc/src/math/nvptx/copysignf.cpp
@@ -8,12 +8,11 @@
#include "src/math/copysignf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, copysignf, (float x, float y)) {
return __builtin_copysignf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/cos.cpp b/libc/src/math/nvptx/cos.cpp
index 873fd50041b18..185ad3cf92159 100644
--- a/libc/src/math/nvptx/cos.cpp
+++ b/libc/src/math/nvptx/cos.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, cos, (double x)) { return __nv_cos(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/cosf.cpp b/libc/src/math/nvptx/cosf.cpp
index 82b3bb759ba0b..3d34de4be51bc 100644
--- a/libc/src/math/nvptx/cosf.cpp
+++ b/libc/src/math/nvptx/cosf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, cosf, (float x)) { return __nv_cosf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/cosh.cpp b/libc/src/math/nvptx/cosh.cpp
index 434e8c56bbf7d..179864c5f910d 100644
--- a/libc/src/math/nvptx/cosh.cpp
+++ b/libc/src/math/nvptx/cosh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, cosh, (double x)) { return __nv_cosh(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/coshf.cpp b/libc/src/math/nvptx/coshf.cpp
index 87d6b16ba8a3a..9147499db97cf 100644
--- a/libc/src/math/nvptx/coshf.cpp
+++ b/libc/src/math/nvptx/coshf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, coshf, (float x)) { return __nv_coshf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/declarations.h b/libc/src/math/nvptx/declarations.h
index 7bfa934c0142d..cf8f6e09e492a 100644
--- a/libc/src/math/nvptx/declarations.h
+++ b/libc/src/math/nvptx/declarations.h
@@ -9,9 +9,7 @@
#ifndef LLVM_LIBC_SRC_MATH_NVPTX_DECLARATIONS_H
#define LLVM_LIBC_SRC_MATH_NVPTX_DECLARATIONS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" {
double __nv_acos(double);
@@ -88,6 +86,6 @@ double __nv_tgamma(double);
float __nv_tgammaf(float);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NVPTX_DECLARATIONS_H
diff --git a/libc/src/math/nvptx/erf.cpp b/libc/src/math/nvptx/erf.cpp
index c7ca7d42fe8a8..5ea0177d5cd34 100644
--- a/libc/src/math/nvptx/erf.cpp
+++ b/libc/src/math/nvptx/erf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, erf, (double x)) { return __nv_erf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/erff.cpp b/libc/src/math/nvptx/erff.cpp
index 1c64e07c3370d..03fdceace8e9e 100644
--- a/libc/src/math/nvptx/erff.cpp
+++ b/libc/src/math/nvptx/erff.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, erff, (float x)) { return __nv_erff(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/exp.cpp b/libc/src/math/nvptx/exp.cpp
index dcbadcf2ae8d4..6bbe87ba2e783 100644
--- a/libc/src/math/nvptx/exp.cpp
+++ b/libc/src/math/nvptx/exp.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, exp, (double x)) { return __nv_exp(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/exp10.cpp b/libc/src/math/nvptx/exp10.cpp
index 0972a3c4ae462..11bb734fd1131 100644
--- a/libc/src/math/nvptx/exp10.cpp
+++ b/libc/src/math/nvptx/exp10.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, exp10, (double x)) { return __nv_exp10(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/exp10f.cpp b/libc/src/math/nvptx/exp10f.cpp
index 0709771fc99a8..4e3121a0b46e2 100644
--- a/libc/src/math/nvptx/exp10f.cpp
+++ b/libc/src/math/nvptx/exp10f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, exp10f, (float x)) { return __nv_exp10f(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/exp2.cpp b/libc/src/math/nvptx/exp2.cpp
index 3465e5b608fa9..35fc27b3a26a6 100644
--- a/libc/src/math/nvptx/exp2.cpp
+++ b/libc/src/math/nvptx/exp2.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, exp2, (double x)) { return __nv_exp2(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/exp2f.cpp b/libc/src/math/nvptx/exp2f.cpp
index 05257648c2e0e..8d137346fe00e 100644
--- a/libc/src/math/nvptx/exp2f.cpp
+++ b/libc/src/math/nvptx/exp2f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, exp2f, (float x)) { return __nv_exp2f(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/expf.cpp b/libc/src/math/nvptx/expf.cpp
index 2b802e5c3555f..a6362bd734611 100644
--- a/libc/src/math/nvptx/expf.cpp
+++ b/libc/src/math/nvptx/expf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, expf, (float x)) { return __nv_expf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/expm1.cpp b/libc/src/math/nvptx/expm1.cpp
index 91845cffc5fd5..0331903b8fd86 100644
--- a/libc/src/math/nvptx/expm1.cpp
+++ b/libc/src/math/nvptx/expm1.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, expm1, (double x)) { return __nv_expm1(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/expm1f.cpp b/libc/src/math/nvptx/expm1f.cpp
index 31e67af084fdb..7b74c548f3df6 100644
--- a/libc/src/math/nvptx/expm1f.cpp
+++ b/libc/src/math/nvptx/expm1f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, expm1f, (float x)) { return __nv_expm1f(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fabs.cpp b/libc/src/math/nvptx/fabs.cpp
index bb37596b9d563..c0d063d50ae53 100644
--- a/libc/src/math/nvptx/fabs.cpp
+++ b/libc/src/math/nvptx/fabs.cpp
@@ -8,10 +8,9 @@
#include "src/math/fabs.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fabs, (double x)) { return __builtin_fabs(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fabsf.cpp b/libc/src/math/nvptx/fabsf.cpp
index 2698618f3f1e1..398ffd0c74c07 100644
--- a/libc/src/math/nvptx/fabsf.cpp
+++ b/libc/src/math/nvptx/fabsf.cpp
@@ -8,10 +8,9 @@
#include "src/math/fabsf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fabsf, (float x)) { return __builtin_fabsf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fdim.cpp b/libc/src/math/nvptx/fdim.cpp
index edf4009273234..2f1ff51800266 100644
--- a/libc/src/math/nvptx/fdim.cpp
+++ b/libc/src/math/nvptx/fdim.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fdim, (double x, double y)) {
return __nv_fdim(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fdimf.cpp b/libc/src/math/nvptx/fdimf.cpp
index 017143aaebc8b..c24e6be72482a 100644
--- a/libc/src/math/nvptx/fdimf.cpp
+++ b/libc/src/math/nvptx/fdimf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fdimf, (float x, float y)) {
return __nv_fdimf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/floor.cpp b/libc/src/math/nvptx/floor.cpp
index 564efa9a7da38..eada89c178d75 100644
--- a/libc/src/math/nvptx/floor.cpp
+++ b/libc/src/math/nvptx/floor.cpp
@@ -8,10 +8,9 @@
#include "src/math/floor.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, floor, (double x)) { return __builtin_floor(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/floorf.cpp b/libc/src/math/nvptx/floorf.cpp
index 6717c8f60c992..a5611c515a88d 100644
--- a/libc/src/math/nvptx/floorf.cpp
+++ b/libc/src/math/nvptx/floorf.cpp
@@ -8,10 +8,9 @@
#include "src/math/floorf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, floorf, (float x)) { return __builtin_floorf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fma.cpp b/libc/src/math/nvptx/fma.cpp
index c4a117e42a3aa..41a6ddf60dbc3 100644
--- a/libc/src/math/nvptx/fma.cpp
+++ b/libc/src/math/nvptx/fma.cpp
@@ -8,12 +8,11 @@
#include "src/math/fma.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fma, (double x, double y, double z)) {
return __builtin_fma(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fmaf.cpp b/libc/src/math/nvptx/fmaf.cpp
index c088bd5b30fea..c948e32f77eb9 100644
--- a/libc/src/math/nvptx/fmaf.cpp
+++ b/libc/src/math/nvptx/fmaf.cpp
@@ -8,12 +8,11 @@
#include "src/math/fmaf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaf, (float x, float y, float z)) {
return __builtin_fmaf(x, y, z);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fmax.cpp b/libc/src/math/nvptx/fmax.cpp
index a2496fecb01c4..3ba65d7eccd36 100644
--- a/libc/src/math/nvptx/fmax.cpp
+++ b/libc/src/math/nvptx/fmax.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmax.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmax, (double x, double y)) {
return __builtin_fmax(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fmaxf.cpp b/libc/src/math/nvptx/fmaxf.cpp
index 586fd32fee59b..e977082b39f40 100644
--- a/libc/src/math/nvptx/fmaxf.cpp
+++ b/libc/src/math/nvptx/fmaxf.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmaxf, (float x, float y)) {
return __builtin_fmaxf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fmin.cpp b/libc/src/math/nvptx/fmin.cpp
index 694eb664b599b..0d6f3521dcb70 100644
--- a/libc/src/math/nvptx/fmin.cpp
+++ b/libc/src/math/nvptx/fmin.cpp
@@ -9,12 +9,11 @@
#include "src/math/fmin.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmin, (double x, double y)) {
return __builtin_fmin(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fminf.cpp b/libc/src/math/nvptx/fminf.cpp
index 2060b71b0841f..42744abfb3b02 100644
--- a/libc/src/math/nvptx/fminf.cpp
+++ b/libc/src/math/nvptx/fminf.cpp
@@ -9,12 +9,11 @@
#include "src/math/fminf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fminf, (float x, float y)) {
return __builtin_fminf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fmod.cpp b/libc/src/math/nvptx/fmod.cpp
index 49d19c4decb96..0654cdd2abe08 100644
--- a/libc/src/math/nvptx/fmod.cpp
+++ b/libc/src/math/nvptx/fmod.cpp
@@ -8,12 +8,11 @@
#include "src/math/fmod.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, fmod, (double x, double y)) {
return __builtin_fmod(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/fmodf.cpp b/libc/src/math/nvptx/fmodf.cpp
index 8fbcb0cc2ad9e..b689046468fbe 100644
--- a/libc/src/math/nvptx/fmodf.cpp
+++ b/libc/src/math/nvptx/fmodf.cpp
@@ -8,12 +8,11 @@
#include "src/math/fmodf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, fmodf, (float x, float y)) {
return __builtin_fmodf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/frexp.cpp b/libc/src/math/nvptx/frexp.cpp
index edba8d712aedb..2423961f7c61e 100644
--- a/libc/src/math/nvptx/frexp.cpp
+++ b/libc/src/math/nvptx/frexp.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, frexp, (double x, int *p)) {
return __nv_frexp(x, p);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/frexpf.cpp b/libc/src/math/nvptx/frexpf.cpp
index 04619412c160f..f1ea29068777b 100644
--- a/libc/src/math/nvptx/frexpf.cpp
+++ b/libc/src/math/nvptx/frexpf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, frexpf, (float x, int *p)) {
return __nv_frexpf(x, p);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/hypot.cpp b/libc/src/math/nvptx/hypot.cpp
index a7bacd6b1a85a..28bf04aa4a2bd 100644
--- a/libc/src/math/nvptx/hypot.cpp
+++ b/libc/src/math/nvptx/hypot.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, hypot, (double x, double y)) {
return __nv_hypot(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/hypotf.cpp b/libc/src/math/nvptx/hypotf.cpp
index 49e85a11a0c16..c506aab1acc0b 100644
--- a/libc/src/math/nvptx/hypotf.cpp
+++ b/libc/src/math/nvptx/hypotf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, hypotf, (float x, float y)) {
return __nv_hypotf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/ilogb.cpp b/libc/src/math/nvptx/ilogb.cpp
index 3d552c2130af1..fc75e2fd847a8 100644
--- a/libc/src/math/nvptx/ilogb.cpp
+++ b/libc/src/math/nvptx/ilogb.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ilogb, (double x)) { return __nv_ilogb(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/ilogbf.cpp b/libc/src/math/nvptx/ilogbf.cpp
index a78926f95d6da..3d14fcfa878fb 100644
--- a/libc/src/math/nvptx/ilogbf.cpp
+++ b/libc/src/math/nvptx/ilogbf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ilogbf, (float x)) { return __nv_ilogbf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/ldexp.cpp b/libc/src/math/nvptx/ldexp.cpp
index 0adc7c3f57f00..761dc4816b7a4 100644
--- a/libc/src/math/nvptx/ldexp.cpp
+++ b/libc/src/math/nvptx/ldexp.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, ldexp, (double x, int y)) {
return __nv_ldexp(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/ldexpf.cpp b/libc/src/math/nvptx/ldexpf.cpp
index eb7dd42853153..2d4c556a27140 100644
--- a/libc/src/math/nvptx/ldexpf.cpp
+++ b/libc/src/math/nvptx/ldexpf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, ldexpf, (float x, int y)) {
return __nv_ldexpf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/llrint.cpp b/libc/src/math/nvptx/llrint.cpp
index 21129fe80a0c1..307420a9b8b26 100644
--- a/libc/src/math/nvptx/llrint.cpp
+++ b/libc/src/math/nvptx/llrint.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llrint, (double x)) {
return static_cast<long long>(__builtin_rint(x));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/llrintf.cpp b/libc/src/math/nvptx/llrintf.cpp
index a6f9f43876010..23404990fb1bd 100644
--- a/libc/src/math/nvptx/llrintf.cpp
+++ b/libc/src/math/nvptx/llrintf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llrintf, (float x)) {
return static_cast<long long>(__builtin_rintf(x));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/log.cpp b/libc/src/math/nvptx/log.cpp
index fd556ac1e165a..26b6dfa607b94 100644
--- a/libc/src/math/nvptx/log.cpp
+++ b/libc/src/math/nvptx/log.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, log, (double x)) { return __nv_log(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/log10.cpp b/libc/src/math/nvptx/log10.cpp
index fbbf214167c1f..ff27025395672 100644
--- a/libc/src/math/nvptx/log10.cpp
+++ b/libc/src/math/nvptx/log10.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, log10, (double x)) { return __nv_log10(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/log10f.cpp b/libc/src/math/nvptx/log10f.cpp
index c2f24df043ab5..af903b60a7ce6 100644
--- a/libc/src/math/nvptx/log10f.cpp
+++ b/libc/src/math/nvptx/log10f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, log10f, (float x)) { return __nv_log10f(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/log1p.cpp b/libc/src/math/nvptx/log1p.cpp
index 2ffd0fee57170..47bc96b0d8812 100644
--- a/libc/src/math/nvptx/log1p.cpp
+++ b/libc/src/math/nvptx/log1p.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, log1p, (double x)) { return __nv_log1p(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/log1pf.cpp b/libc/src/math/nvptx/log1pf.cpp
index 2de4f27ff20c0..bfa4f7f22d54c 100644
--- a/libc/src/math/nvptx/log1pf.cpp
+++ b/libc/src/math/nvptx/log1pf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, log1pf, (float x)) { return __nv_log1pf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/log2.cpp b/libc/src/math/nvptx/log2.cpp
index 54e2da0c9efa6..86a980de65d4d 100644
--- a/libc/src/math/nvptx/log2.cpp
+++ b/libc/src/math/nvptx/log2.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, log2, (double x)) { return __nv_log2(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/log2f.cpp b/libc/src/math/nvptx/log2f.cpp
index c2a6054c797ff..5ce46291610dd 100644
--- a/libc/src/math/nvptx/log2f.cpp
+++ b/libc/src/math/nvptx/log2f.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, log2f, (float x)) { return __nv_log2f(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/logb.cpp b/libc/src/math/nvptx/logb.cpp
index f6998bd194887..b620b16184fc9 100644
--- a/libc/src/math/nvptx/logb.cpp
+++ b/libc/src/math/nvptx/logb.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, logb, (double x)) { return __nv_logb(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/logbf.cpp b/libc/src/math/nvptx/logbf.cpp
index f72c04f988b6a..f19f0320db9d4 100644
--- a/libc/src/math/nvptx/logbf.cpp
+++ b/libc/src/math/nvptx/logbf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, logbf, (float x)) { return __nv_logbf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/logf.cpp b/libc/src/math/nvptx/logf.cpp
index 1a5bc1e8fc1b1..6deb482c0ace3 100644
--- a/libc/src/math/nvptx/logf.cpp
+++ b/libc/src/math/nvptx/logf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, logf, (float x)) { return __nv_logf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/lrint.cpp b/libc/src/math/nvptx/lrint.cpp
index 715b552575789..b335b4f06393c 100644
--- a/libc/src/math/nvptx/lrint.cpp
+++ b/libc/src/math/nvptx/lrint.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lrint, (double x)) {
return static_cast<long>(__builtin_rint(x));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/lrintf.cpp b/libc/src/math/nvptx/lrintf.cpp
index 3ed05f6ca34cc..312a9469fade0 100644
--- a/libc/src/math/nvptx/lrintf.cpp
+++ b/libc/src/math/nvptx/lrintf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, lrintf, (float x)) { return __nv_lrintf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/nearbyint.cpp b/libc/src/math/nvptx/nearbyint.cpp
index 7d78c7241d023..9c7b600df7082 100644
--- a/libc/src/math/nvptx/nearbyint.cpp
+++ b/libc/src/math/nvptx/nearbyint.cpp
@@ -8,12 +8,11 @@
#include "src/math/nearbyint.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nearbyint, (double x)) {
return __builtin_nearbyint(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/nearbyintf.cpp b/libc/src/math/nvptx/nearbyintf.cpp
index 4bd20dc58fb89..7fbe9f4f0e0be 100644
--- a/libc/src/math/nvptx/nearbyintf.cpp
+++ b/libc/src/math/nvptx/nearbyintf.cpp
@@ -8,12 +8,11 @@
#include "src/math/nearbyintf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nearbyintf, (float x)) {
return __builtin_nearbyintf(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/nextafter.cpp b/libc/src/math/nvptx/nextafter.cpp
index 3dc910042192d..171aaad6f7cc1 100644
--- a/libc/src/math/nvptx/nextafter.cpp
+++ b/libc/src/math/nvptx/nextafter.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, nextafter, (double x, double y)) {
return __nv_nextafter(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/nextafterf.cpp b/libc/src/math/nvptx/nextafterf.cpp
index 162b85ef76c1f..a45937c0dc8ba 100644
--- a/libc/src/math/nvptx/nextafterf.cpp
+++ b/libc/src/math/nvptx/nextafterf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, nextafterf, (float x, float y)) {
return __nv_nextafterf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/nvptx.h b/libc/src/math/nvptx/nvptx.h
index 2035b766e6227..5f9b32f311eab 100644
--- a/libc/src/math/nvptx/nvptx.h
+++ b/libc/src/math/nvptx/nvptx.h
@@ -12,9 +12,8 @@
#include "declarations.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
LIBC_INLINE double acos(double x) { return __nv_acos(x); }
LIBC_INLINE float acosf(float x) { return __nv_acosf(x); }
@@ -98,6 +97,6 @@ LIBC_INLINE double tgamma(double x) { return __nv_tgamma(x); }
LIBC_INLINE float tgammaf(float x) { return __nv_tgammaf(x); }
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_NVPTX_NVPTX_H
diff --git a/libc/src/math/nvptx/pow.cpp b/libc/src/math/nvptx/pow.cpp
index c51dd56f55387..7de3c9e7e5448 100644
--- a/libc/src/math/nvptx/pow.cpp
+++ b/libc/src/math/nvptx/pow.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, pow, (double x, double y)) { return __nv_pow(x, y); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/powf.cpp b/libc/src/math/nvptx/powf.cpp
index 9c577c78a4a87..f9f7dbae63ac5 100644
--- a/libc/src/math/nvptx/powf.cpp
+++ b/libc/src/math/nvptx/powf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, powf, (float x, float y)) { return __nv_powf(x, y); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/powi.cpp b/libc/src/math/nvptx/powi.cpp
index 16214bd9cc27a..b7871ab9da92e 100644
--- a/libc/src/math/nvptx/powi.cpp
+++ b/libc/src/math/nvptx/powi.cpp
@@ -8,12 +8,11 @@
#include "src/math/powi.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "declarations.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, powi, (double x, int y)) { return __nv_powi(x, y); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/powif.cpp b/libc/src/math/nvptx/powif.cpp
index 5d26fdc87daca..0143745479cec 100644
--- a/libc/src/math/nvptx/powif.cpp
+++ b/libc/src/math/nvptx/powif.cpp
@@ -8,12 +8,11 @@
#include "src/math/powif.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "declarations.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, powif, (float x, int y)) { return __nv_powif(x, y); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/remainder.cpp b/libc/src/math/nvptx/remainder.cpp
index 9027204312e00..89b235f9c22af 100644
--- a/libc/src/math/nvptx/remainder.cpp
+++ b/libc/src/math/nvptx/remainder.cpp
@@ -8,12 +8,11 @@
#include "src/math/remainder.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, remainder, (double x, double y)) {
return __builtin_remainder(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/remainderf.cpp b/libc/src/math/nvptx/remainderf.cpp
index 50df3b2ce25c1..9fee6f856dc8b 100644
--- a/libc/src/math/nvptx/remainderf.cpp
+++ b/libc/src/math/nvptx/remainderf.cpp
@@ -8,12 +8,11 @@
#include "src/math/remainderf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, remainderf, (float x, float y)) {
return __builtin_remainderf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/remquo.cpp b/libc/src/math/nvptx/remquo.cpp
index aae1831bce61a..da69a20f8f4f8 100644
--- a/libc/src/math/nvptx/remquo.cpp
+++ b/libc/src/math/nvptx/remquo.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, remquo, (double x, double y, int *quo)) {
return __nv_remquo(x, y, quo);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/remquof.cpp b/libc/src/math/nvptx/remquof.cpp
index d7ce3c0f03b52..dcfba5d7b5fa9 100644
--- a/libc/src/math/nvptx/remquof.cpp
+++ b/libc/src/math/nvptx/remquof.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, remquof, (float x, float y, int *quo)) {
return __nv_remquof(x, y, quo);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/rint.cpp b/libc/src/math/nvptx/rint.cpp
index ac6837a4abc37..44d494a8ed57a 100644
--- a/libc/src/math/nvptx/rint.cpp
+++ b/libc/src/math/nvptx/rint.cpp
@@ -8,10 +8,9 @@
#include "src/math/rint.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, rint, (double x)) { return __builtin_rint(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/rintf.cpp b/libc/src/math/nvptx/rintf.cpp
index 94093471a8d92..daf98d9436051 100644
--- a/libc/src/math/nvptx/rintf.cpp
+++ b/libc/src/math/nvptx/rintf.cpp
@@ -8,10 +8,9 @@
#include "src/math/rintf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, rintf, (float x)) { return __builtin_rintf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/round.cpp b/libc/src/math/nvptx/round.cpp
index 0d2765f2e959f..9d8b5582f0407 100644
--- a/libc/src/math/nvptx/round.cpp
+++ b/libc/src/math/nvptx/round.cpp
@@ -8,10 +8,9 @@
#include "src/math/round.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, round, (double x)) { return __builtin_round(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/roundf.cpp b/libc/src/math/nvptx/roundf.cpp
index 86e8ba3ac83d6..8743e4eb7fb8d 100644
--- a/libc/src/math/nvptx/roundf.cpp
+++ b/libc/src/math/nvptx/roundf.cpp
@@ -8,10 +8,9 @@
#include "src/math/roundf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, roundf, (float x)) { return __builtin_roundf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/scalbn.cpp b/libc/src/math/nvptx/scalbn.cpp
index ecadc345a3534..80374db4c1c93 100644
--- a/libc/src/math/nvptx/scalbn.cpp
+++ b/libc/src/math/nvptx/scalbn.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, scalbn, (double x, int y)) {
return __nv_scalbn(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/scalbnf.cpp b/libc/src/math/nvptx/scalbnf.cpp
index 35ff69964fffa..24fa3a5ed698a 100644
--- a/libc/src/math/nvptx/scalbnf.cpp
+++ b/libc/src/math/nvptx/scalbnf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, scalbnf, (float x, int y)) {
return __nv_scalbnf(x, y);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/sin.cpp b/libc/src/math/nvptx/sin.cpp
index 0e86f9c77e599..1bff129a0151c 100644
--- a/libc/src/math/nvptx/sin.cpp
+++ b/libc/src/math/nvptx/sin.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, sin, (double x)) { return __nv_sin(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/sincos.cpp b/libc/src/math/nvptx/sincos.cpp
index 5a77234e2d74e..73f92cfb7c348 100644
--- a/libc/src/math/nvptx/sincos.cpp
+++ b/libc/src/math/nvptx/sincos.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, sincos, (double x, double *sinptr, double *cosptr)) {
return __nv_sincos(x, sinptr, cosptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/sincosf.cpp b/libc/src/math/nvptx/sincosf.cpp
index e4039ada837b9..d053aa38151b6 100644
--- a/libc/src/math/nvptx/sincosf.cpp
+++ b/libc/src/math/nvptx/sincosf.cpp
@@ -10,12 +10,11 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, sincosf, (float x, float *sinptr, float *cosptr)) {
return __nv_sincosf(x, sinptr, cosptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/sinf.cpp b/libc/src/math/nvptx/sinf.cpp
index 14e722fbad196..9abd5cb4d5c62 100644
--- a/libc/src/math/nvptx/sinf.cpp
+++ b/libc/src/math/nvptx/sinf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sinf, (float x)) { return __nv_sinf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/sinh.cpp b/libc/src/math/nvptx/sinh.cpp
index 701811d9a9921..dc6a1e16c6341 100644
--- a/libc/src/math/nvptx/sinh.cpp
+++ b/libc/src/math/nvptx/sinh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, sinh, (double x)) { return __nv_sinh(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/sinhf.cpp b/libc/src/math/nvptx/sinhf.cpp
index 2c6ac21fffa17..c9ab470ed823c 100644
--- a/libc/src/math/nvptx/sinhf.cpp
+++ b/libc/src/math/nvptx/sinhf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sinhf, (float x)) { return __nv_sinhf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/sqrt.cpp b/libc/src/math/nvptx/sqrt.cpp
index ed83b6e5c6cae..60ca5af4987b6 100644
--- a/libc/src/math/nvptx/sqrt.cpp
+++ b/libc/src/math/nvptx/sqrt.cpp
@@ -8,10 +8,9 @@
#include "src/math/sqrt.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, sqrt, (double x)) { return __builtin_sqrt(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/sqrtf.cpp b/libc/src/math/nvptx/sqrtf.cpp
index 851922c316452..e17f942a4d5fc 100644
--- a/libc/src/math/nvptx/sqrtf.cpp
+++ b/libc/src/math/nvptx/sqrtf.cpp
@@ -8,10 +8,9 @@
#include "src/math/sqrtf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, sqrtf, (float x)) { return __builtin_sqrtf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/tan.cpp b/libc/src/math/nvptx/tan.cpp
index 2d3f1fe51ea4a..deb03dca250a5 100644
--- a/libc/src/math/nvptx/tan.cpp
+++ b/libc/src/math/nvptx/tan.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, tan, (double x)) { return __nv_tan(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/tanf.cpp b/libc/src/math/nvptx/tanf.cpp
index bdf51d9a619a1..5739e4a1624de 100644
--- a/libc/src/math/nvptx/tanf.cpp
+++ b/libc/src/math/nvptx/tanf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, tanf, (float x)) { return __nv_tanf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/tanh.cpp b/libc/src/math/nvptx/tanh.cpp
index 8255889e7d2b3..eabee2cbaf068 100644
--- a/libc/src/math/nvptx/tanh.cpp
+++ b/libc/src/math/nvptx/tanh.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, tanh, (double x)) { return __nv_tanh(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/tanhf.cpp b/libc/src/math/nvptx/tanhf.cpp
index a22524a0fa426..582424cb9490a 100644
--- a/libc/src/math/nvptx/tanhf.cpp
+++ b/libc/src/math/nvptx/tanhf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, tanhf, (float x)) { return __nv_tanhf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/tgamma.cpp b/libc/src/math/nvptx/tgamma.cpp
index 29f0334f72749..f92193831f9bb 100644
--- a/libc/src/math/nvptx/tgamma.cpp
+++ b/libc/src/math/nvptx/tgamma.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, tgamma, (double x)) { return __nv_tgamma(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/tgammaf.cpp b/libc/src/math/nvptx/tgammaf.cpp
index d7de80b36d294..833994455d575 100644
--- a/libc/src/math/nvptx/tgammaf.cpp
+++ b/libc/src/math/nvptx/tgammaf.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "declarations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, tgammaf, (float x)) { return __nv_tgammaf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/trunc.cpp b/libc/src/math/nvptx/trunc.cpp
index f60caa2a71d78..773600f0f2501 100644
--- a/libc/src/math/nvptx/trunc.cpp
+++ b/libc/src/math/nvptx/trunc.cpp
@@ -8,10 +8,9 @@
#include "src/math/trunc.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, trunc, (double x)) { return __builtin_trunc(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/nvptx/truncf.cpp b/libc/src/math/nvptx/truncf.cpp
index a6c9b8f188f02..534797a3e5860 100644
--- a/libc/src/math/nvptx/truncf.cpp
+++ b/libc/src/math/nvptx/truncf.cpp
@@ -8,10 +8,9 @@
#include "src/math/truncf.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, truncf, (float x)) { return __builtin_truncf(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/math/pow.h b/libc/src/math/pow.h
index a861920cc36c6..dd9b4a6556837 100644
--- a/libc/src/math/pow.h
+++ b/libc/src/math/pow.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_POW_H
#define LLVM_LIBC_SRC_MATH_POW_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double pow(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_POW_H
diff --git a/libc/src/math/powf.h b/libc/src/math/powf.h
index 61c474a6b173e..6582dc335d613 100644
--- a/libc/src/math/powf.h
+++ b/libc/src/math/powf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_POWF_H
#define LLVM_LIBC_SRC_MATH_POWF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float powf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_POWF_H
diff --git a/libc/src/math/powi.h b/libc/src/math/powi.h
index a70fab62b85cb..1ee7140f06489 100644
--- a/libc/src/math/powi.h
+++ b/libc/src/math/powi.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_POWI_H
#define LLVM_LIBC_SRC_MATH_POWI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double powi(double x, int y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_POW_H
diff --git a/libc/src/math/powif.h b/libc/src/math/powif.h
index ee6716f2a1846..417012a34fecc 100644
--- a/libc/src/math/powif.h
+++ b/libc/src/math/powif.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_POWIF_H
#define LLVM_LIBC_SRC_MATH_POWIF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float powif(float x, int y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_POW_H
diff --git a/libc/src/math/remainder.h b/libc/src/math/remainder.h
index 5bf2af92543cf..f1f89542013d7 100644
--- a/libc/src/math/remainder.h
+++ b/libc/src/math/remainder.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_REMAINDER_H
#define LLVM_LIBC_SRC_MATH_REMAINDER_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double remainder(double x, double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_REMAINDER_H
diff --git a/libc/src/math/remainderf.h b/libc/src/math/remainderf.h
index 4997ebccc9290..31a9bbe86b56c 100644
--- a/libc/src/math/remainderf.h
+++ b/libc/src/math/remainderf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_REMAINDERF_H
#define LLVM_LIBC_SRC_MATH_REMAINDERF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float remainderf(float x, float y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_REMAINDERF_H
diff --git a/libc/src/math/remainderf16.h b/libc/src/math/remainderf16.h
index 75f39e55f9884..e23eead4bae2c 100644
--- a/libc/src/math/remainderf16.h
+++ b/libc/src/math/remainderf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_REMAINDERF16_H
#define LLVM_LIBC_SRC_MATH_REMAINDERF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 remainderf16(float16 x, float16 y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_REMAINDERF16_H
diff --git a/libc/src/math/remainderl.h b/libc/src/math/remainderl.h
index e0df705b0ed27..584af37f5f37c 100644
--- a/libc/src/math/remainderl.h
+++ b/libc/src/math/remainderl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_REMAINDERL_H
#define LLVM_LIBC_SRC_MATH_REMAINDERL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double remainderl(long double x, long double y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_REMAINDERL_H
diff --git a/libc/src/math/remquo.h b/libc/src/math/remquo.h
index c16ec957e144f..7590e7df5ddb8 100644
--- a/libc/src/math/remquo.h
+++ b/libc/src/math/remquo.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_REMQUO_H
#define LLVM_LIBC_SRC_MATH_REMQUO_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double remquo(double x, double y, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_REMQUO_H
diff --git a/libc/src/math/remquof.h b/libc/src/math/remquof.h
index b63f773b6435f..8b8e8772706fd 100644
--- a/libc/src/math/remquof.h
+++ b/libc/src/math/remquof.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_REMQUOF_H
#define LLVM_LIBC_SRC_MATH_REMQUOF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float remquof(float x, float y, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_REMQUOF_H
diff --git a/libc/src/math/remquof128.h b/libc/src/math/remquof128.h
index 49e99a9a8bb2c..e9db1ef5c5b51 100644
--- a/libc/src/math/remquof128.h
+++ b/libc/src/math/remquof128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_REMQUOF128_H
#define LLVM_LIBC_SRC_MATH_REMQUOF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 remquof128(float128 x, float128 y, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_REMQUOF128_H
diff --git a/libc/src/math/remquof16.h b/libc/src/math/remquof16.h
index 310c3db712cde..fee848c955a01 100644
--- a/libc/src/math/remquof16.h
+++ b/libc/src/math/remquof16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_REMQUOF16_H
#define LLVM_LIBC_SRC_MATH_REMQUOF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 remquof16(float16 x, float16 y, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_REMQUOF16_H
diff --git a/libc/src/math/remquol.h b/libc/src/math/remquol.h
index de5adf49827d8..ba9b09929cc2f 100644
--- a/libc/src/math/remquol.h
+++ b/libc/src/math/remquol.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_REMQUOL_H
#define LLVM_LIBC_SRC_MATH_REMQUOL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double remquol(long double x, long double y, int *exp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_REMQUOL_H
diff --git a/libc/src/math/rint.h b/libc/src/math/rint.h
index 1080c4df8e00b..3cd676bfb724e 100644
--- a/libc/src/math/rint.h
+++ b/libc/src/math/rint.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_RINT_H
#define LLVM_LIBC_SRC_MATH_RINT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double rint(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_RINT_H
diff --git a/libc/src/math/rintf.h b/libc/src/math/rintf.h
index b371b8c3468d8..d0246a32cdd30 100644
--- a/libc/src/math/rintf.h
+++ b/libc/src/math/rintf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_RINTF_H
#define LLVM_LIBC_SRC_MATH_RINTF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float rintf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_RINTF_H
diff --git a/libc/src/math/rintf128.h b/libc/src/math/rintf128.h
index 2edafcb73fd85..2d9248974f024 100644
--- a/libc/src/math/rintf128.h
+++ b/libc/src/math/rintf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_RINTF128_H
#define LLVM_LIBC_SRC_MATH_RINTF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 rintf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_RINTF128_H
diff --git a/libc/src/math/rintf16.h b/libc/src/math/rintf16.h
index 839f2dd0f3c00..5ea9587ef3cf6 100644
--- a/libc/src/math/rintf16.h
+++ b/libc/src/math/rintf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_RINTF16_H
#define LLVM_LIBC_SRC_MATH_RINTF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 rintf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_RINTF16_H
diff --git a/libc/src/math/rintl.h b/libc/src/math/rintl.h
index fed476973b5da..bddfa183f7ae7 100644
--- a/libc/src/math/rintl.h
+++ b/libc/src/math/rintl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_RINTL_H
#define LLVM_LIBC_SRC_MATH_RINTL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double rintl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_RINTL_H
diff --git a/libc/src/math/round.h b/libc/src/math/round.h
index c2cd3bf921f0c..3e6a3b34c9a46 100644
--- a/libc/src/math/round.h
+++ b/libc/src/math/round.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUND_H
#define LLVM_LIBC_SRC_MATH_ROUND_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double round(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUND_H
diff --git a/libc/src/math/roundeven.h b/libc/src/math/roundeven.h
index a996a03f73b58..9c76b1fe334ab 100644
--- a/libc/src/math/roundeven.h
+++ b/libc/src/math/roundeven.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUNDEVEN_H
#define LLVM_LIBC_SRC_MATH_ROUNDEVEN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double roundeven(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUNDEVEN_H
diff --git a/libc/src/math/roundevenf.h b/libc/src/math/roundevenf.h
index bdeca6712ea7a..447e7fd940c18 100644
--- a/libc/src/math/roundevenf.h
+++ b/libc/src/math/roundevenf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUNDEVENF_H
#define LLVM_LIBC_SRC_MATH_ROUNDEVENF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float roundevenf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUNDEVENF_H
diff --git a/libc/src/math/roundevenf128.h b/libc/src/math/roundevenf128.h
index ca2ef3703e8ae..589839d090756 100644
--- a/libc/src/math/roundevenf128.h
+++ b/libc/src/math/roundevenf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUNDEVENF128_H
#define LLVM_LIBC_SRC_MATH_ROUNDEVENF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 roundevenf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUNDEVENF128_H
diff --git a/libc/src/math/roundevenf16.h b/libc/src/math/roundevenf16.h
index 8f5fe22eeacb0..382e2e39cff3f 100644
--- a/libc/src/math/roundevenf16.h
+++ b/libc/src/math/roundevenf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUNDEVENF16_H
#define LLVM_LIBC_SRC_MATH_ROUNDEVENF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 roundevenf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUNDEVENF16_H
diff --git a/libc/src/math/roundevenl.h b/libc/src/math/roundevenl.h
index c53fb0863d72f..a2f3397e4479a 100644
--- a/libc/src/math/roundevenl.h
+++ b/libc/src/math/roundevenl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUNDEVENL_H
#define LLVM_LIBC_SRC_MATH_ROUNDEVENL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double roundevenl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUNDEVENL_H
diff --git a/libc/src/math/roundf.h b/libc/src/math/roundf.h
index 21dbaa810d2bf..d6ca186ed16e1 100644
--- a/libc/src/math/roundf.h
+++ b/libc/src/math/roundf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUNDF_H
#define LLVM_LIBC_SRC_MATH_ROUNDF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float roundf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUNDF_H
diff --git a/libc/src/math/roundf128.h b/libc/src/math/roundf128.h
index ef56d04a1696d..e4aca17d7eb63 100644
--- a/libc/src/math/roundf128.h
+++ b/libc/src/math/roundf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUNDF128_H
#define LLVM_LIBC_SRC_MATH_ROUNDF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 roundf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUNDF128_H
diff --git a/libc/src/math/roundf16.h b/libc/src/math/roundf16.h
index 30772639747a5..e52f2aeb87e6d 100644
--- a/libc/src/math/roundf16.h
+++ b/libc/src/math/roundf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUNDF16_H
#define LLVM_LIBC_SRC_MATH_ROUNDF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 roundf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUNDF16_H
diff --git a/libc/src/math/roundl.h b/libc/src/math/roundl.h
index 8a9fed47aaa5c..0abe87a055061 100644
--- a/libc/src/math/roundl.h
+++ b/libc/src/math/roundl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_ROUNDL_H
#define LLVM_LIBC_SRC_MATH_ROUNDL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double roundl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_ROUNDL_H
diff --git a/libc/src/math/scalblnf16.h b/libc/src/math/scalblnf16.h
index d47a78cd1448b..be93fab1bf68a 100644
--- a/libc/src/math/scalblnf16.h
+++ b/libc/src/math/scalblnf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_SCALBLNF16_H
#define LLVM_LIBC_SRC_MATH_SCALBLNF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 scalblnf16(float16 x, long n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SCALBLNF16_H
diff --git a/libc/src/math/scalbn.h b/libc/src/math/scalbn.h
index d4669d22df43e..9fc1dc4d93fbd 100644
--- a/libc/src/math/scalbn.h
+++ b/libc/src/math/scalbn.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SCALBN_H
#define LLVM_LIBC_SRC_MATH_SCALBN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double scalbn(double x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SCALBN_H
diff --git a/libc/src/math/scalbnf.h b/libc/src/math/scalbnf.h
index d298eeb562a4e..6b5a5f9cab7f0 100644
--- a/libc/src/math/scalbnf.h
+++ b/libc/src/math/scalbnf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SCALBNF_H
#define LLVM_LIBC_SRC_MATH_SCALBNF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float scalbnf(float x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SCALBNF_H
diff --git a/libc/src/math/scalbnf128.h b/libc/src/math/scalbnf128.h
index b96d954c69e30..bd3b560fb7cc4 100644
--- a/libc/src/math/scalbnf128.h
+++ b/libc/src/math/scalbnf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_SCALBNF128_H
#define LLVM_LIBC_SRC_MATH_SCALBNF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 scalbnf128(float128 x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SCALBNF128_H
diff --git a/libc/src/math/scalbnf16.h b/libc/src/math/scalbnf16.h
index e554a517a2f81..95e4862f38070 100644
--- a/libc/src/math/scalbnf16.h
+++ b/libc/src/math/scalbnf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_SCALBNF16_H
#define LLVM_LIBC_SRC_MATH_SCALBNF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 scalbnf16(float16 x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SCALBNF16_H
diff --git a/libc/src/math/scalbnl.h b/libc/src/math/scalbnl.h
index ff023049c2db9..876f147dde4f3 100644
--- a/libc/src/math/scalbnl.h
+++ b/libc/src/math/scalbnl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SCALBNL_H
#define LLVM_LIBC_SRC_MATH_SCALBNL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double scalbnl(long double x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SCALBNL_H
diff --git a/libc/src/math/setpayloadf16.h b/libc/src/math/setpayloadf16.h
index 6bdf64a1330be..8705e2804fa99 100644
--- a/libc/src/math/setpayloadf16.h
+++ b/libc/src/math/setpayloadf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_SETPAYLOADF16_H
#define LLVM_LIBC_SRC_MATH_SETPAYLOADF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int setpayloadf16(float16 *res, float16 pl);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SETPAYLOADF16_H
diff --git a/libc/src/math/setpayloadsigf16.h b/libc/src/math/setpayloadsigf16.h
index 0c5e7737c991b..ee9bc38ab9423 100644
--- a/libc/src/math/setpayloadsigf16.h
+++ b/libc/src/math/setpayloadsigf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_SETPAYLOADSIGF16_H
#define LLVM_LIBC_SRC_MATH_SETPAYLOADSIGF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int setpayloadsigf16(float16 *res, float16 pl);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SETPAYLOADSIGF16_H
diff --git a/libc/src/math/sin.h b/libc/src/math/sin.h
index 2a4362d1ba287..50ecdc74fb2d9 100644
--- a/libc/src/math/sin.h
+++ b/libc/src/math/sin.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SIN_H
#define LLVM_LIBC_SRC_MATH_SIN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double sin(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SIN_H
diff --git a/libc/src/math/sincos.h b/libc/src/math/sincos.h
index 580bdbb9a6b3e..6235a7c5c0454 100644
--- a/libc/src/math/sincos.h
+++ b/libc/src/math/sincos.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SINCOS_H
#define LLVM_LIBC_SRC_MATH_SINCOS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void sincos(double x, double *sinx, double *cosx);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SINCOS_H
diff --git a/libc/src/math/sincosf.h b/libc/src/math/sincosf.h
index 28dbc652f1367..56539f52ce0e6 100644
--- a/libc/src/math/sincosf.h
+++ b/libc/src/math/sincosf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SINCOSF_H
#define LLVM_LIBC_SRC_MATH_SINCOSF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void sincosf(float x, float *sinx, float *cosx);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SINCOSF_H
diff --git a/libc/src/math/sinf.h b/libc/src/math/sinf.h
index c4f8c889086fe..aa0b753e74ae3 100644
--- a/libc/src/math/sinf.h
+++ b/libc/src/math/sinf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SINF_H
#define LLVM_LIBC_SRC_MATH_SINF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float sinf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SINF_H
diff --git a/libc/src/math/sinh.h b/libc/src/math/sinh.h
index b87471c2bfcc2..bf1b1f1d815c1 100644
--- a/libc/src/math/sinh.h
+++ b/libc/src/math/sinh.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SINH_H
#define LLVM_LIBC_SRC_MATH_SINH_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double sinh(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SINH_H
diff --git a/libc/src/math/sinhf.h b/libc/src/math/sinhf.h
index f69a194c1f6d9..65cb39f9e3926 100644
--- a/libc/src/math/sinhf.h
+++ b/libc/src/math/sinhf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SINHF_H
#define LLVM_LIBC_SRC_MATH_SINHF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float sinhf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SINHF_H
diff --git a/libc/src/math/sinpif.h b/libc/src/math/sinpif.h
index 038fb1935d15f..63d481945f470 100644
--- a/libc/src/math/sinpif.h
+++ b/libc/src/math/sinpif.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SINPIF_H
#define LLVM_LIBC_SRC_MATH_SINPIF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float sinpif(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SINPIF_H
diff --git a/libc/src/math/sqrt.h b/libc/src/math/sqrt.h
index 566944a95f40a..d003e3f0964de 100644
--- a/libc/src/math/sqrt.h
+++ b/libc/src/math/sqrt.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SQRT_H
#define LLVM_LIBC_SRC_MATH_SQRT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double sqrt(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SQRT_H
diff --git a/libc/src/math/sqrtf.h b/libc/src/math/sqrtf.h
index db39ab73ee678..fe4192a550386 100644
--- a/libc/src/math/sqrtf.h
+++ b/libc/src/math/sqrtf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SQRTF_H
#define LLVM_LIBC_SRC_MATH_SQRTF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float sqrtf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SQRTF_H
diff --git a/libc/src/math/sqrtf128.h b/libc/src/math/sqrtf128.h
index 81f4c12eff90d..9da9eb69374cb 100644
--- a/libc/src/math/sqrtf128.h
+++ b/libc/src/math/sqrtf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_SQRTF128_H
#define LLVM_LIBC_SRC_MATH_SQRTF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 sqrtf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SQRTF128_H
diff --git a/libc/src/math/sqrtl.h b/libc/src/math/sqrtl.h
index 52b208d655d69..e632c1925ddc2 100644
--- a/libc/src/math/sqrtl.h
+++ b/libc/src/math/sqrtl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_SQRTL_H
#define LLVM_LIBC_SRC_MATH_SQRTL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double sqrtl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_SQRTL_H
diff --git a/libc/src/math/tan.h b/libc/src/math/tan.h
index 462c60f1f9aed..5d0121f158f11 100644
--- a/libc/src/math/tan.h
+++ b/libc/src/math/tan.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_TAN_H
#define LLVM_LIBC_SRC_MATH_TAN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double tan(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TAN_H
diff --git a/libc/src/math/tanf.h b/libc/src/math/tanf.h
index 0d4b9e79ac32c..e0f06a8ba64cf 100644
--- a/libc/src/math/tanf.h
+++ b/libc/src/math/tanf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_TANF_H
#define LLVM_LIBC_SRC_MATH_TANF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float tanf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TANF_H
diff --git a/libc/src/math/tanh.h b/libc/src/math/tanh.h
index eadde36c394c5..66561eef403dd 100644
--- a/libc/src/math/tanh.h
+++ b/libc/src/math/tanh.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_TANH_H
#define LLVM_LIBC_SRC_MATH_TANH_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double tanh(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TANH_H
diff --git a/libc/src/math/tanhf.h b/libc/src/math/tanhf.h
index a0bd1e926a30a..ff9d02efaffb7 100644
--- a/libc/src/math/tanhf.h
+++ b/libc/src/math/tanhf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_TANHF_H
#define LLVM_LIBC_SRC_MATH_TANHF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float tanhf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TANHF_H
diff --git a/libc/src/math/tgamma.h b/libc/src/math/tgamma.h
index 9210a4bb8e7f4..24590ed1a4676 100644
--- a/libc/src/math/tgamma.h
+++ b/libc/src/math/tgamma.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_TGAMMA_H
#define LLVM_LIBC_SRC_MATH_TGAMMA_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double tgamma(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TGAMMA_H
diff --git a/libc/src/math/tgammaf.h b/libc/src/math/tgammaf.h
index 0524deefcf552..d28e4c325152a 100644
--- a/libc/src/math/tgammaf.h
+++ b/libc/src/math/tgammaf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_TGAMMAF_H
#define LLVM_LIBC_SRC_MATH_TGAMMAF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float tgammaf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TGAMMAF_H
diff --git a/libc/src/math/totalorderf16.h b/libc/src/math/totalorderf16.h
index db787c96dc3ea..f5390140c4dc2 100644
--- a/libc/src/math/totalorderf16.h
+++ b/libc/src/math/totalorderf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_TOTALORDERF16_H
#define LLVM_LIBC_SRC_MATH_TOTALORDERF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int totalorderf16(const float16 *x, const float16 *y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TOTALORDERF16_H
diff --git a/libc/src/math/totalordermagf16.h b/libc/src/math/totalordermagf16.h
index eed8bf3586cac..8c6621b9783df 100644
--- a/libc/src/math/totalordermagf16.h
+++ b/libc/src/math/totalordermagf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_TOTALORDERMAGF16_H
#define LLVM_LIBC_SRC_MATH_TOTALORDERMAGF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int totalordermagf16(const float16 *x, const float16 *y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TOTALORDERMAGF16_H
diff --git a/libc/src/math/trunc.h b/libc/src/math/trunc.h
index d4fb8788fca69..d766aff923dc9 100644
--- a/libc/src/math/trunc.h
+++ b/libc/src/math/trunc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_TRUNC_H
#define LLVM_LIBC_SRC_MATH_TRUNC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double trunc(double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TRUNC_H
diff --git a/libc/src/math/truncf.h b/libc/src/math/truncf.h
index 3cdf2ee8006d1..e666d778154a3 100644
--- a/libc/src/math/truncf.h
+++ b/libc/src/math/truncf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_TRUNCF_H
#define LLVM_LIBC_SRC_MATH_TRUNCF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float truncf(float x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TRUNCF_H
diff --git a/libc/src/math/truncf128.h b/libc/src/math/truncf128.h
index df3899c35e668..5eb6116551d1c 100644
--- a/libc/src/math/truncf128.h
+++ b/libc/src/math/truncf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_TRUNCF128_H
#define LLVM_LIBC_SRC_MATH_TRUNCF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 truncf128(float128 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TRUNCF128_H
diff --git a/libc/src/math/truncf16.h b/libc/src/math/truncf16.h
index db03c68fd631a..6d65980461c49 100644
--- a/libc/src/math/truncf16.h
+++ b/libc/src/math/truncf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_TRUNCF16_H
#define LLVM_LIBC_SRC_MATH_TRUNCF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 truncf16(float16 x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TRUNCF16_H
diff --git a/libc/src/math/truncl.h b/libc/src/math/truncl.h
index 6b4d22d92dd88..38f414f65fcc0 100644
--- a/libc/src/math/truncl.h
+++ b/libc/src/math/truncl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_TRUNCL_H
#define LLVM_LIBC_SRC_MATH_TRUNCL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double truncl(long double x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_TRUNCL_H
diff --git a/libc/src/math/ufromfp.h b/libc/src/math/ufromfp.h
index 6b40623fc5e70..f4667486440c2 100644
--- a/libc/src/math/ufromfp.h
+++ b/libc/src/math/ufromfp.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFP_H
#define LLVM_LIBC_SRC_MATH_UFROMFP_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double ufromfp(double x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFP_H
diff --git a/libc/src/math/ufromfpf.h b/libc/src/math/ufromfpf.h
index d272cecc3cae8..40c6773d143e8 100644
--- a/libc/src/math/ufromfpf.h
+++ b/libc/src/math/ufromfpf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFPF_H
#define LLVM_LIBC_SRC_MATH_UFROMFPF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float ufromfpf(float x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFPF_H
diff --git a/libc/src/math/ufromfpf128.h b/libc/src/math/ufromfpf128.h
index b38ef691fa165..785fa82becbcd 100644
--- a/libc/src/math/ufromfpf128.h
+++ b/libc/src/math/ufromfpf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFPF128_H
#define LLVM_LIBC_SRC_MATH_UFROMFPF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 ufromfpf128(float128 x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFPF128_H
diff --git a/libc/src/math/ufromfpf16.h b/libc/src/math/ufromfpf16.h
index c863a2d4eb493..07a38bd232fc7 100644
--- a/libc/src/math/ufromfpf16.h
+++ b/libc/src/math/ufromfpf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFPF16_H
#define LLVM_LIBC_SRC_MATH_UFROMFPF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 ufromfpf16(float16 x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFPF16_H
diff --git a/libc/src/math/ufromfpl.h b/libc/src/math/ufromfpl.h
index c7b93317fa68e..f05a77dc2f103 100644
--- a/libc/src/math/ufromfpl.h
+++ b/libc/src/math/ufromfpl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFPL_H
#define LLVM_LIBC_SRC_MATH_UFROMFPL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double ufromfpl(long double x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFPL_H
diff --git a/libc/src/math/ufromfpx.h b/libc/src/math/ufromfpx.h
index 00a3c5f5b435d..79c413af968a5 100644
--- a/libc/src/math/ufromfpx.h
+++ b/libc/src/math/ufromfpx.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFPX_H
#define LLVM_LIBC_SRC_MATH_UFROMFPX_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double ufromfpx(double x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFPX_H
diff --git a/libc/src/math/ufromfpxf.h b/libc/src/math/ufromfpxf.h
index 1740ac33dec77..f6bd8f7d59959 100644
--- a/libc/src/math/ufromfpxf.h
+++ b/libc/src/math/ufromfpxf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFPXF_H
#define LLVM_LIBC_SRC_MATH_UFROMFPXF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float ufromfpxf(float x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFPXF_H
diff --git a/libc/src/math/ufromfpxf128.h b/libc/src/math/ufromfpxf128.h
index 5008b7ae9b460..f3b43ff54f37c 100644
--- a/libc/src/math/ufromfpxf128.h
+++ b/libc/src/math/ufromfpxf128.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFPXF128_H
#define LLVM_LIBC_SRC_MATH_UFROMFPXF128_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float128 ufromfpxf128(float128 x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFPXF128_H
diff --git a/libc/src/math/ufromfpxf16.h b/libc/src/math/ufromfpxf16.h
index 9e03353d3e588..988092bde319c 100644
--- a/libc/src/math/ufromfpxf16.h
+++ b/libc/src/math/ufromfpxf16.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFPXF16_H
#define LLVM_LIBC_SRC_MATH_UFROMFPXF16_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float16 ufromfpxf16(float16 x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFPXF16_H
diff --git a/libc/src/math/ufromfpxl.h b/libc/src/math/ufromfpxl.h
index 13ff93607f73a..180b8f93d2187 100644
--- a/libc/src/math/ufromfpxl.h
+++ b/libc/src/math/ufromfpxl.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_MATH_UFROMFPXL_H
#define LLVM_LIBC_SRC_MATH_UFROMFPXL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double ufromfpxl(long double x, int rnd, unsigned int width);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_MATH_UFROMFPXL_H
diff --git a/libc/src/network/htonl.cpp b/libc/src/network/htonl.cpp
index ec3c02e2894f2..862d5e3a0bc41 100644
--- a/libc/src/network/htonl.cpp
+++ b/libc/src/network/htonl.cpp
@@ -9,12 +9,11 @@
#include "src/network/htonl.h"
#include "src/__support/common.h"
#include "src/__support/endian.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(uint32_t, htonl, (uint32_t hostlong)) {
return Endian::to_big_endian(hostlong);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/network/htonl.h b/libc/src/network/htonl.h
index 14217310a2271..c7743dfad7ba3 100644
--- a/libc/src/network/htonl.h
+++ b/libc/src/network/htonl.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_NETWORK_HTONL_H
#define LLVM_LIBC_SRC_NETWORK_HTONL_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
uint32_t htonl(uint32_t hostlong);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_NETWORK_HTONL_H
diff --git a/libc/src/network/htons.cpp b/libc/src/network/htons.cpp
index 78416b3a7d1f0..e844454d5687f 100644
--- a/libc/src/network/htons.cpp
+++ b/libc/src/network/htons.cpp
@@ -9,12 +9,11 @@
#include "src/network/htons.h"
#include "src/__support/common.h"
#include "src/__support/endian.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(uint16_t, htons, (uint16_t hostshort)) {
return Endian::to_big_endian(hostshort);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/network/htons.h b/libc/src/network/htons.h
index 8f5c68a0a60a8..e0a379f94e526 100644
--- a/libc/src/network/htons.h
+++ b/libc/src/network/htons.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_NETWORK_HTONS_H
#define LLVM_LIBC_SRC_NETWORK_HTONS_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
uint16_t htons(uint16_t hostshort);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_NETWORK_HTONS_H
diff --git a/libc/src/network/ntohl.cpp b/libc/src/network/ntohl.cpp
index 974b574432ff3..c00f4a5ae09c9 100644
--- a/libc/src/network/ntohl.cpp
+++ b/libc/src/network/ntohl.cpp
@@ -9,9 +9,8 @@
#include "src/network/ntohl.h"
#include "src/__support/common.h"
#include "src/__support/endian.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(uint32_t, ntohl, (uint32_t netlong)) {
if constexpr (Endian::IS_LITTLE)
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(uint32_t, ntohl, (uint32_t netlong)) {
return netlong;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/network/ntohl.h b/libc/src/network/ntohl.h
index c325951948062..2fc4ef059c587 100644
--- a/libc/src/network/ntohl.h
+++ b/libc/src/network/ntohl.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_NETWORK_NTOHL_H
#define LLVM_LIBC_SRC_NETWORK_NTOHL_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
uint32_t ntohl(uint32_t netlong);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_NETWORK_NTOHL_H
diff --git a/libc/src/network/ntohs.cpp b/libc/src/network/ntohs.cpp
index bb1779f3dcb30..572b6860fa6b9 100644
--- a/libc/src/network/ntohs.cpp
+++ b/libc/src/network/ntohs.cpp
@@ -9,9 +9,8 @@
#include "src/network/ntohs.h"
#include "src/__support/common.h"
#include "src/__support/endian.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(uint16_t, ntohs, (uint16_t netshort)) {
if constexpr (Endian::IS_LITTLE)
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(uint16_t, ntohs, (uint16_t netshort)) {
return netshort;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/network/ntohs.h b/libc/src/network/ntohs.h
index f55591415f764..a84c52eeb9c2f 100644
--- a/libc/src/network/ntohs.h
+++ b/libc/src/network/ntohs.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_NETWORK_NTOHS_H
#define LLVM_LIBC_SRC_NETWORK_NTOHS_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
uint16_t ntohs(uint16_t netshort);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_NETWORK_NTOHS_H
diff --git a/libc/src/pthread/pthread_atfork.cpp b/libc/src/pthread/pthread_atfork.cpp
index d3f3c259992ec..57191b8534771 100644
--- a/libc/src/pthread/pthread_atfork.cpp
+++ b/libc/src/pthread/pthread_atfork.cpp
@@ -9,13 +9,12 @@
#include "pthread_atfork.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/fork_callbacks.h"
#include <errno.h>
#include <pthread.h> // For pthread_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_atfork,
(__atfork_callback_t prepare, __atfork_callback_t parent,
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, pthread_atfork,
return register_atfork_callbacks(prepare, parent, child) ? 0 : ENOMEM;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_atfork.h b/libc/src/pthread/pthread_atfork.h
index 4292e2ad46be5..8b89d6895647b 100644
--- a/libc/src/pthread/pthread_atfork.h
+++ b/libc/src/pthread/pthread_atfork.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATFORK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATFORK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_atfork(__atfork_callback_t prepare, __atfork_callback_t parent,
__atfork_callback_t child);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATFORK_H
diff --git a/libc/src/pthread/pthread_attr_destroy.cpp b/libc/src/pthread/pthread_attr_destroy.cpp
index 090cc23d81218..a5bde84256fc6 100644
--- a/libc/src/pthread/pthread_attr_destroy.cpp
+++ b/libc/src/pthread/pthread_attr_destroy.cpp
@@ -9,15 +9,14 @@
#include "pthread_attr_destroy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_destroy, (pthread_attr_t *)) {
// There is nothing to cleanup.
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_destroy.h b/libc/src/pthread/pthread_attr_destroy.h
index a5e7e62fa3bec..532a0f45f7cd5 100644
--- a/libc/src/pthread/pthread_attr_destroy.h
+++ b/libc/src/pthread/pthread_attr_destroy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_DESTROY_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_DESTROY_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_destroy(pthread_attr_t *attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_DESTROY_H
diff --git a/libc/src/pthread/pthread_attr_getdetachstate.cpp b/libc/src/pthread/pthread_attr_getdetachstate.cpp
index ec755138b093e..4bff85d45c17c 100644
--- a/libc/src/pthread/pthread_attr_getdetachstate.cpp
+++ b/libc/src/pthread/pthread_attr_getdetachstate.cpp
@@ -9,11 +9,10 @@
#include "pthread_attr_getdetachstate.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_getdetachstate,
(const pthread_attr_t *attr, int *detachstate)) {
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(int, pthread_attr_getdetachstate,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_getdetachstate.h b/libc/src/pthread/pthread_attr_getdetachstate.h
index e1c89baf315d8..57a47b73bd50b 100644
--- a/libc/src/pthread/pthread_attr_getdetachstate.h
+++ b/libc/src/pthread/pthread_attr_getdetachstate.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETDETACHSTATE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETDETACHSTATE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detach_state);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETDETACHSTATE_H
diff --git a/libc/src/pthread/pthread_attr_getguardsize.cpp b/libc/src/pthread/pthread_attr_getguardsize.cpp
index b7c50859fa533..8f28db8d9c96c 100644
--- a/libc/src/pthread/pthread_attr_getguardsize.cpp
+++ b/libc/src/pthread/pthread_attr_getguardsize.cpp
@@ -9,11 +9,10 @@
#include "pthread_attr_getguardsize.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_getguardsize,
(const pthread_attr_t *__restrict attr,
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, pthread_attr_getguardsize,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_getguardsize.h b/libc/src/pthread/pthread_attr_getguardsize.h
index e5f9cbf752aef..ef2e75828f9e2 100644
--- a/libc/src/pthread/pthread_attr_getguardsize.h
+++ b/libc/src/pthread/pthread_attr_getguardsize.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETGUARDSIZE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETGUARDSIZE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_getguardsize(const pthread_attr_t *__restrict attr,
size_t *__restrict guardsize);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETGUARDSIZE_H
diff --git a/libc/src/pthread/pthread_attr_getstack.cpp b/libc/src/pthread/pthread_attr_getstack.cpp
index 6166e442d4723..8788fbc1ffdd3 100644
--- a/libc/src/pthread/pthread_attr_getstack.cpp
+++ b/libc/src/pthread/pthread_attr_getstack.cpp
@@ -10,12 +10,11 @@
#include "pthread_attr_getstacksize.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_getstack,
(const pthread_attr_t *__restrict attr,
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, pthread_attr_getstack,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_getstack.h b/libc/src/pthread/pthread_attr_getstack.h
index f28c734c80791..22ac24a89e422 100644
--- a/libc/src/pthread/pthread_attr_getstack.h
+++ b/libc/src/pthread/pthread_attr_getstack.h
@@ -9,15 +9,14 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETSTACK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETSTACK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_getstack(const pthread_attr_t *__restrict attr,
void **__restrict stack,
size_t *__restrict stacksize);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETSTACK_H
diff --git a/libc/src/pthread/pthread_attr_getstacksize.cpp b/libc/src/pthread/pthread_attr_getstacksize.cpp
index 230ca78502707..ecc4787951dfa 100644
--- a/libc/src/pthread/pthread_attr_getstacksize.cpp
+++ b/libc/src/pthread/pthread_attr_getstacksize.cpp
@@ -9,11 +9,10 @@
#include "pthread_attr_getstacksize.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_getstacksize,
(const pthread_attr_t *__restrict attr,
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, pthread_attr_getstacksize,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_getstacksize.h b/libc/src/pthread/pthread_attr_getstacksize.h
index 078da78f55e9a..3136f08ffb711 100644
--- a/libc/src/pthread/pthread_attr_getstacksize.h
+++ b/libc/src/pthread/pthread_attr_getstacksize.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETSTACKSIZE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETSTACKSIZE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_getstacksize(const pthread_attr_t *__restrict attr,
size_t *__restrict stacksize);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_GETSTACKSIZE_H
diff --git a/libc/src/pthread/pthread_attr_init.cpp b/libc/src/pthread/pthread_attr_init.cpp
index 1fc6430058f68..13d302c18f98a 100644
--- a/libc/src/pthread/pthread_attr_init.cpp
+++ b/libc/src/pthread/pthread_attr_init.cpp
@@ -9,12 +9,11 @@
#include "pthread_attr_init.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h" // For thread::DEFAULT_*
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_init, (pthread_attr_t * attr)) {
*attr = pthread_attr_t{
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, pthread_attr_init, (pthread_attr_t * attr)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_init.h b/libc/src/pthread/pthread_attr_init.h
index 69969980725b8..3a2ad3d2b8b81 100644
--- a/libc/src/pthread/pthread_attr_init.h
+++ b/libc/src/pthread/pthread_attr_init.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_INIT_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_INIT_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_init(pthread_attr_t *attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_INIT_H
diff --git a/libc/src/pthread/pthread_attr_setdetachstate.cpp b/libc/src/pthread/pthread_attr_setdetachstate.cpp
index 3aa72d217f28b..029b4d514ef43 100644
--- a/libc/src/pthread/pthread_attr_setdetachstate.cpp
+++ b/libc/src/pthread/pthread_attr_setdetachstate.cpp
@@ -9,12 +9,11 @@
#include "pthread_attr_setdetachstate.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_setdetachstate,
(pthread_attr_t * attr, int detachstate)) {
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, pthread_attr_setdetachstate,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_setdetachstate.h b/libc/src/pthread/pthread_attr_setdetachstate.h
index 06e1aa6503d45..2b994d9e99d30 100644
--- a/libc/src/pthread/pthread_attr_setdetachstate.h
+++ b/libc/src/pthread/pthread_attr_setdetachstate.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETDETACHSTATE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETDETACHSTATE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_setdetachstate(pthread_attr_t *attr, int detach_state);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETDETACHSTATE_H
diff --git a/libc/src/pthread/pthread_attr_setguardsize.cpp b/libc/src/pthread/pthread_attr_setguardsize.cpp
index 389ee773fc5db..98855b20cb0fb 100644
--- a/libc/src/pthread/pthread_attr_setguardsize.cpp
+++ b/libc/src/pthread/pthread_attr_setguardsize.cpp
@@ -9,13 +9,12 @@
#include "pthread_attr_setguardsize.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <linux/param.h> // For EXEC_PAGESIZE.
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_setguardsize,
(pthread_attr_t *__restrict attr, size_t guardsize)) {
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, pthread_attr_setguardsize,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_setguardsize.h b/libc/src/pthread/pthread_attr_setguardsize.h
index f418355d7c58a..64d896af02666 100644
--- a/libc/src/pthread/pthread_attr_setguardsize.h
+++ b/libc/src/pthread/pthread_attr_setguardsize.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETGUARDSIZE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETGUARDSIZE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETGUARDSIZE_H
diff --git a/libc/src/pthread/pthread_attr_setstack.cpp b/libc/src/pthread/pthread_attr_setstack.cpp
index f4f2d1450633e..dde4e3fd70ed2 100644
--- a/libc/src/pthread/pthread_attr_setstack.cpp
+++ b/libc/src/pthread/pthread_attr_setstack.cpp
@@ -10,14 +10,13 @@
#include "pthread_attr_setstacksize.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h" // For STACK_ALIGNMENT
#include <errno.h>
#include <pthread.h>
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_setstack,
(pthread_attr_t *__restrict attr, void *stack,
@@ -36,4 +35,4 @@ LLVM_LIBC_FUNCTION(int, pthread_attr_setstack,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_setstack.h b/libc/src/pthread/pthread_attr_setstack.h
index 9ae2cfaf6b965..fe2a7f4fbd061 100644
--- a/libc/src/pthread/pthread_attr_setstack.h
+++ b/libc/src/pthread/pthread_attr_setstack.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETSTACK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETSTACK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_setstack(pthread_attr_t *attr, void *stack, size_t stacksize);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETSTACK_H
diff --git a/libc/src/pthread/pthread_attr_setstacksize.cpp b/libc/src/pthread/pthread_attr_setstacksize.cpp
index f327d3365b5d8..642a888aba706 100644
--- a/libc/src/pthread/pthread_attr_setstacksize.cpp
+++ b/libc/src/pthread/pthread_attr_setstacksize.cpp
@@ -9,12 +9,11 @@
#include "pthread_attr_setstacksize.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_attr_setstacksize,
(pthread_attr_t *__restrict attr, size_t stacksize)) {
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, pthread_attr_setstacksize,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_attr_setstacksize.h b/libc/src/pthread/pthread_attr_setstacksize.h
index 06418564179b0..f5940948949b8 100644
--- a/libc/src/pthread/pthread_attr_setstacksize.h
+++ b/libc/src/pthread/pthread_attr_setstacksize.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETSTACKSIZE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETSTACKSIZE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ATTR_SETSTACKSIZE_H
diff --git a/libc/src/pthread/pthread_condattr_destroy.cpp b/libc/src/pthread/pthread_condattr_destroy.cpp
index f0b9fd1c167cb..41994c6941ffe 100644
--- a/libc/src/pthread/pthread_condattr_destroy.cpp
+++ b/libc/src/pthread/pthread_condattr_destroy.cpp
@@ -9,11 +9,10 @@
#include "pthread_condattr_destroy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_condattr_destroy,
(pthread_condattr_t * attr [[gnu::unused]])) {
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, pthread_condattr_destroy,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_condattr_destroy.h b/libc/src/pthread/pthread_condattr_destroy.h
index 15794979b5ba0..2910fa9f96168 100644
--- a/libc/src/pthread/pthread_condattr_destroy.h
+++ b/libc/src/pthread/pthread_condattr_destroy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_DESTROY_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_DESTROY_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_condattr_destroy(pthread_condattr_t *attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_DESTROY_H
diff --git a/libc/src/pthread/pthread_condattr_getclock.cpp b/libc/src/pthread/pthread_condattr_getclock.cpp
index 75fd9308c7b8d..a3a3963f4f429 100644
--- a/libc/src/pthread/pthread_condattr_getclock.cpp
+++ b/libc/src/pthread/pthread_condattr_getclock.cpp
@@ -9,12 +9,11 @@
#include "pthread_condattr_getclock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h> // pthread_condattr_t
#include <sys/types.h> // clockid_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_condattr_getclock,
(const pthread_condattr_t *__restrict attr,
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, pthread_condattr_getclock,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_condattr_getclock.h b/libc/src/pthread/pthread_condattr_getclock.h
index 52025b3040c1a..d5878c4f45b53 100644
--- a/libc/src/pthread/pthread_condattr_getclock.h
+++ b/libc/src/pthread/pthread_condattr_getclock.h
@@ -9,15 +9,14 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_GETCLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_GETCLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h> // pthread_condattr_t
#include <sys/types.h> // clockid_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_condattr_getclock(const pthread_condattr_t *__restrict attr,
clockid_t *__restrict clock_id);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_GETCLOCK_H
diff --git a/libc/src/pthread/pthread_condattr_getpshared.cpp b/libc/src/pthread/pthread_condattr_getpshared.cpp
index 8692149718238..0c5fdc115c25d 100644
--- a/libc/src/pthread/pthread_condattr_getpshared.cpp
+++ b/libc/src/pthread/pthread_condattr_getpshared.cpp
@@ -9,11 +9,10 @@
#include "pthread_condattr_getpshared.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_condattr_getpshared,
(const pthread_condattr_t *__restrict attr,
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, pthread_condattr_getpshared,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_condattr_getpshared.h b/libc/src/pthread/pthread_condattr_getpshared.h
index 2b1eb10af2101..3d7a0c1d357c6 100644
--- a/libc/src/pthread/pthread_condattr_getpshared.h
+++ b/libc/src/pthread/pthread_condattr_getpshared.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_PSHARED_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_PSHARED_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_condattr_getpshared(const pthread_condattr_t *__restrict attr,
int *__restrict pshared);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_PSHARED_H
diff --git a/libc/src/pthread/pthread_condattr_init.cpp b/libc/src/pthread/pthread_condattr_init.cpp
index 12005b8a9d30f..54633b2e3a5ea 100644
--- a/libc/src/pthread/pthread_condattr_init.cpp
+++ b/libc/src/pthread/pthread_condattr_init.cpp
@@ -9,12 +9,11 @@
#include "pthread_condattr_init.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h> // pthread_condattr_t, PTHREAD_PROCESS_PRIVATE
#include <time.h> // CLOCK_REALTIME
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_condattr_init, (pthread_condattr_t * attr)) {
attr->clock = CLOCK_REALTIME;
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, pthread_condattr_init, (pthread_condattr_t * attr)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_condattr_init.h b/libc/src/pthread/pthread_condattr_init.h
index 8f681544f6203..9f3c06bb6f4ae 100644
--- a/libc/src/pthread/pthread_condattr_init.h
+++ b/libc/src/pthread/pthread_condattr_init.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_INIT_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_INIT_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_condattr_init(pthread_condattr_t *attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_INIT_H
diff --git a/libc/src/pthread/pthread_condattr_setclock.cpp b/libc/src/pthread/pthread_condattr_setclock.cpp
index 5c0144523f93e..6eca8b30ef7f8 100644
--- a/libc/src/pthread/pthread_condattr_setclock.cpp
+++ b/libc/src/pthread/pthread_condattr_setclock.cpp
@@ -9,14 +9,13 @@
#include "pthread_condattr_setclock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h> // EINVAL
#include <pthread.h> // pthread_condattr_t
#include <sys/types.h> // clockid_t
#include <time.h> // CLOCK_MONOTONIC, CLOCK_REALTIME
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_condattr_setclock,
(pthread_condattr_t * attr, clockid_t clock)) {
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, pthread_condattr_setclock,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_condattr_setclock.h b/libc/src/pthread/pthread_condattr_setclock.h
index e9fd77a2d5d5a..328766fe78833 100644
--- a/libc/src/pthread/pthread_condattr_setclock.h
+++ b/libc/src/pthread/pthread_condattr_setclock.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_SETCLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_SETCLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
#include <sys/types.h> // clockid_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_condattr_setclock(pthread_condattr_t *attr, clockid_t clock);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_SETCLOCK_H
diff --git a/libc/src/pthread/pthread_condattr_setpshared.cpp b/libc/src/pthread/pthread_condattr_setpshared.cpp
index 536aeadac5d44..7f1560acad843 100644
--- a/libc/src/pthread/pthread_condattr_setpshared.cpp
+++ b/libc/src/pthread/pthread_condattr_setpshared.cpp
@@ -9,12 +9,11 @@
#include "pthread_condattr_setpshared.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h> // EINVAL
#include <pthread.h> // pthread_condattr_t, PTHREAD_PROCESS_SHARED, PTHREAD_PROCESS_PRIVATE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_condattr_setpshared,
(pthread_condattr_t * attr, int pshared)) {
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, pthread_condattr_setpshared,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_condattr_setpshared.h b/libc/src/pthread/pthread_condattr_setpshared.h
index 7a55466660563..8083bdec78cc4 100644
--- a/libc/src/pthread/pthread_condattr_setpshared.h
+++ b/libc/src/pthread/pthread_condattr_setpshared.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_SETPSHARED_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_SETPSHARED_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_condattr_setpshared(pthread_condattr_t *attr, int pshared);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_CONDATTR_SETPSHARED_H
diff --git a/libc/src/pthread/pthread_create.cpp b/libc/src/pthread/pthread_create.cpp
index 1fb4b50109401..8b406cd09326a 100644
--- a/libc/src/pthread/pthread_create.cpp
+++ b/libc/src/pthread/pthread_create.cpp
@@ -16,14 +16,13 @@
#include "pthread_attr_getstack.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/__support/threads/thread.h"
#include <errno.h>
#include <pthread.h> // For pthread_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(pthread_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between pthread_t and internal Thread.");
@@ -85,4 +84,4 @@ LLVM_LIBC_FUNCTION(int, pthread_create,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_create.h b/libc/src/pthread/pthread_create.h
index d6c3c9c2b211c..75466e39df7e1 100644
--- a/libc/src/pthread/pthread_create.h
+++ b/libc/src/pthread/pthread_create.h
@@ -9,15 +9,14 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_CREATE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_CREATE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_create(pthread_t *__restrict thread,
const pthread_attr_t *__restrict attr,
__pthread_start_t func, void *arg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_CREATE_H
diff --git a/libc/src/pthread/pthread_detach.cpp b/libc/src/pthread/pthread_detach.cpp
index b3c96678de536..e8b69b6576265 100644
--- a/libc/src/pthread/pthread_detach.cpp
+++ b/libc/src/pthread/pthread_detach.cpp
@@ -9,12 +9,11 @@
#include "pthread_detach.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <pthread.h> // For pthread_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(pthread_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between pthread_t and internal Thread.");
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, pthread_detach, (pthread_t th)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_detach.h b/libc/src/pthread/pthread_detach.h
index 471a3581a22ca..d54fdf854de39 100644
--- a/libc/src/pthread/pthread_detach.h
+++ b/libc/src/pthread/pthread_detach.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_DETACH_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_DETACH_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_detach(pthread_t thread);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_DETACH_H
diff --git a/libc/src/pthread/pthread_equal.cpp b/libc/src/pthread/pthread_equal.cpp
index 7d2873897f8d9..f154e9ba9a421 100644
--- a/libc/src/pthread/pthread_equal.cpp
+++ b/libc/src/pthread/pthread_equal.cpp
@@ -9,12 +9,11 @@
#include "pthread_equal.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <pthread.h> // For pthread_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(pthread_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between pthread_t and internal Thread.");
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, pthread_equal, (pthread_t lhs, pthread_t rhs)) {
return *lhs_internal == *rhs_internal;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_equal.h b/libc/src/pthread/pthread_equal.h
index a64990a4bb7ce..448fb8fc07d1d 100644
--- a/libc/src/pthread/pthread_equal.h
+++ b/libc/src/pthread/pthread_equal.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_EQUAL_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_EQUAL_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_equal(pthread_t lhs, pthread_t rhs);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_EQUAL_H
diff --git a/libc/src/pthread/pthread_exit.cpp b/libc/src/pthread/pthread_exit.cpp
index 7e3bbee8b20e6..acba665d0fa4f 100644
--- a/libc/src/pthread/pthread_exit.cpp
+++ b/libc/src/pthread/pthread_exit.cpp
@@ -9,12 +9,11 @@
#include "pthread_exit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <pthread.h> // For pthread_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(pthread_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between pthread_t and internal Thread.");
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(void, pthread_exit, (void *retval)) {
LIBC_NAMESPACE::thread_exit(ThreadReturnValue(retval), ThreadStyle::POSIX);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_exit.h b/libc/src/pthread/pthread_exit.h
index 9aa9e0a0b16e5..6617dab84c69e 100644
--- a/libc/src/pthread/pthread_exit.h
+++ b/libc/src/pthread/pthread_exit.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_EXIT_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_EXIT_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[noreturn]] void pthread_exit(void *retval);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_EXIT_H
diff --git a/libc/src/pthread/pthread_getname_np.cpp b/libc/src/pthread/pthread_getname_np.cpp
index 8df3ae2458621..3de8c2e92f7a0 100644
--- a/libc/src/pthread/pthread_getname_np.cpp
+++ b/libc/src/pthread/pthread_getname_np.cpp
@@ -11,13 +11,12 @@
#include "src/__support/CPP/span.h"
#include "src/__support/CPP/stringstream.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <pthread.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(pthread_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between pthread_t and internal Thread.");
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(int, pthread_getname_np,
return thread->get_name(name_stream);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_getname_np.h b/libc/src/pthread/pthread_getname_np.h
index 417bc2263c383..a51573749ba87 100644
--- a/libc/src/pthread/pthread_getname_np.h
+++ b/libc/src/pthread/pthread_getname_np.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_GETNAME_NP_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_GETNAME_NP_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_getname_np(pthread_t, char *, size_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_GETNAME_NP_H
diff --git a/libc/src/pthread/pthread_getspecific.cpp b/libc/src/pthread/pthread_getspecific.cpp
index eddc026db62e1..3893b52efd6e9 100644
--- a/libc/src/pthread/pthread_getspecific.cpp
+++ b/libc/src/pthread/pthread_getspecific.cpp
@@ -9,16 +9,15 @@
#include "pthread_getspecific.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <pthread.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, pthread_getspecific, (pthread_key_t key)) {
return get_tss_value(key);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_getspecific.h b/libc/src/pthread/pthread_getspecific.h
index f4914886f1432..28439838bd65b 100644
--- a/libc/src/pthread/pthread_getspecific.h
+++ b/libc/src/pthread/pthread_getspecific.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_GETSPECIFIC_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_GETSPECIFIC_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *pthread_getspecific(pthread_key_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_GETSPECIFIC_H
diff --git a/libc/src/pthread/pthread_join.cpp b/libc/src/pthread/pthread_join.cpp
index 78f99655e501e..8d4c2dd46c474 100644
--- a/libc/src/pthread/pthread_join.cpp
+++ b/libc/src/pthread/pthread_join.cpp
@@ -9,12 +9,11 @@
#include "pthread_join.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <pthread.h> // For pthread_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(pthread_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between pthread_t and internal Thread.");
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, pthread_join, (pthread_t th, void **retval)) {
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_join.h b/libc/src/pthread/pthread_join.h
index e430ec3c4db0b..506efaead40ff 100644
--- a/libc/src/pthread/pthread_join.h
+++ b/libc/src/pthread/pthread_join.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_JOIN_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_JOIN_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_join(pthread_t thread, void **retval);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_JOIN_H
diff --git a/libc/src/pthread/pthread_key_create.cpp b/libc/src/pthread/pthread_key_create.cpp
index 0583baca22f4d..81c1f39954a5b 100644
--- a/libc/src/pthread/pthread_key_create.cpp
+++ b/libc/src/pthread/pthread_key_create.cpp
@@ -9,13 +9,12 @@
#include "pthread_key_create.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_key_create,
(pthread_key_t * key, __pthread_tss_dtor_t dtor)) {
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, pthread_key_create,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_key_create.h b/libc/src/pthread/pthread_key_create.h
index 23a861cd878e7..f12c9088e7c86 100644
--- a/libc/src/pthread/pthread_key_create.h
+++ b/libc/src/pthread/pthread_key_create.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_KEY_CREATE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_KEY_CREATE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_key_create(pthread_key_t *key, __pthread_tss_dtor_t dtor);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_KEY_CREATE_H
diff --git a/libc/src/pthread/pthread_key_delete.cpp b/libc/src/pthread/pthread_key_delete.cpp
index 20484fa9bdf82..18a4cc7e18665 100644
--- a/libc/src/pthread/pthread_key_delete.cpp
+++ b/libc/src/pthread/pthread_key_delete.cpp
@@ -9,13 +9,12 @@
#include "pthread_key_delete.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_key_delete, (pthread_key_t key)) {
if (LIBC_NAMESPACE::tss_key_delete(key))
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, pthread_key_delete, (pthread_key_t key)) {
return EINVAL;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_key_delete.h b/libc/src/pthread/pthread_key_delete.h
index 62572eeda3860..5b7e40bb373a6 100644
--- a/libc/src/pthread/pthread_key_delete.h
+++ b/libc/src/pthread/pthread_key_delete.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_KEY_DELETE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_KEY_DELETE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_key_delete(pthread_key_t key);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_KEY_DELETE_H
diff --git a/libc/src/pthread/pthread_mutex_destroy.cpp b/libc/src/pthread/pthread_mutex_destroy.cpp
index 4603ebed394ad..65f4b7901f4f1 100644
--- a/libc/src/pthread/pthread_mutex_destroy.cpp
+++ b/libc/src/pthread/pthread_mutex_destroy.cpp
@@ -9,12 +9,11 @@
#include "pthread_mutex_destroy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_mutex_destroy, (pthread_mutex_t * mutex)) {
auto *m = reinterpret_cast<Mutex *>(mutex);
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutex_destroy, (pthread_mutex_t * mutex)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutex_destroy.h b/libc/src/pthread/pthread_mutex_destroy.h
index ebbed187d5c16..2df303eb2d6ca 100644
--- a/libc/src/pthread/pthread_mutex_destroy.h
+++ b/libc/src/pthread/pthread_mutex_destroy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_DESTROY_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_DESTROY_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutex_destroy(pthread_mutex_t *mutex);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_DESTROY_H
diff --git a/libc/src/pthread/pthread_mutex_init.cpp b/libc/src/pthread/pthread_mutex_init.cpp
index 0281f732473d9..3914669b1c73e 100644
--- a/libc/src/pthread/pthread_mutex_init.cpp
+++ b/libc/src/pthread/pthread_mutex_init.cpp
@@ -10,13 +10,12 @@
#include "pthread_mutexattr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(Mutex) <= sizeof(pthread_mutex_t),
"The public pthread_mutex_t type cannot accommodate the internal "
@@ -34,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutex_init,
return err == MutexError::NONE ? 0 : EAGAIN;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutex_init.h b/libc/src/pthread/pthread_mutex_init.h
index 8e3ba60303ec6..e6b5a0ac7eef9 100644
--- a/libc/src/pthread/pthread_mutex_init.h
+++ b/libc/src/pthread/pthread_mutex_init.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_INIT_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_INIT_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutex_init(pthread_mutex_t *mutex,
const pthread_mutexattr_t *__restrict attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_INIT_H
diff --git a/libc/src/pthread/pthread_mutex_lock.cpp b/libc/src/pthread/pthread_mutex_lock.cpp
index 1537454873c12..efc6f75e43429 100644
--- a/libc/src/pthread/pthread_mutex_lock.cpp
+++ b/libc/src/pthread/pthread_mutex_lock.cpp
@@ -9,12 +9,11 @@
#include "pthread_mutex_lock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The implementation currently handles only plain mutexes.
LLVM_LIBC_FUNCTION(int, pthread_mutex_lock, (pthread_mutex_t * mutex)) {
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutex_lock, (pthread_mutex_t * mutex)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutex_lock.h b/libc/src/pthread/pthread_mutex_lock.h
index a83ae2cb334b4..c5a835e4fc870 100644
--- a/libc/src/pthread/pthread_mutex_lock.h
+++ b/libc/src/pthread/pthread_mutex_lock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_LOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_LOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutex_lock(pthread_mutex_t *mutex);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_LOCK_H
diff --git a/libc/src/pthread/pthread_mutex_unlock.cpp b/libc/src/pthread/pthread_mutex_unlock.cpp
index de4d2cbe9efb5..b0819bd5fcd89 100644
--- a/libc/src/pthread/pthread_mutex_unlock.cpp
+++ b/libc/src/pthread/pthread_mutex_unlock.cpp
@@ -9,12 +9,11 @@
#include "pthread_mutex_unlock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The implementation currently handles only plain mutexes.
LLVM_LIBC_FUNCTION(int, pthread_mutex_unlock, (pthread_mutex_t * mutex)) {
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutex_unlock, (pthread_mutex_t * mutex)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutex_unlock.h b/libc/src/pthread/pthread_mutex_unlock.h
index a3d661a06c4be..303ec001d2378 100644
--- a/libc/src/pthread/pthread_mutex_unlock.h
+++ b/libc/src/pthread/pthread_mutex_unlock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_UNLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_UNLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutex_unlock(pthread_mutex_t *mutex);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEX_UNLOCK_H
diff --git a/libc/src/pthread/pthread_mutexattr.h b/libc/src/pthread/pthread_mutexattr.h
index be719b9d14997..292ceebe049f9 100644
--- a/libc/src/pthread/pthread_mutexattr.h
+++ b/libc/src/pthread/pthread_mutexattr.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
enum class PThreadMutexAttrPos : unsigned int {
TYPE_SHIFT = 0,
@@ -49,6 +48,6 @@ LIBC_INLINE int get_mutexattr_pshared(pthread_mutexattr_t attr) {
unsigned(PThreadMutexAttrPos::PSHARED_SHIFT);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_H
diff --git a/libc/src/pthread/pthread_mutexattr_destroy.cpp b/libc/src/pthread/pthread_mutexattr_destroy.cpp
index 3b2551afd11b5..9722d2b551cd7 100644
--- a/libc/src/pthread/pthread_mutexattr_destroy.cpp
+++ b/libc/src/pthread/pthread_mutexattr_destroy.cpp
@@ -10,14 +10,13 @@
#include "pthread_mutexattr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_mutexattr_destroy, (pthread_mutexattr_t *)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutexattr_destroy.h b/libc/src/pthread/pthread_mutexattr_destroy.h
index 815145a0199e8..32a8b949fad8e 100644
--- a/libc/src/pthread/pthread_mutexattr_destroy.h
+++ b/libc/src/pthread/pthread_mutexattr_destroy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_DESTROY_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_DESTROY_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutexattr_destroy(pthread_mutexattr_t *attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_DESTROY_H
diff --git a/libc/src/pthread/pthread_mutexattr_getpshared.cpp b/libc/src/pthread/pthread_mutexattr_getpshared.cpp
index 2d83a5229e9ec..a89af08464e2f 100644
--- a/libc/src/pthread/pthread_mutexattr_getpshared.cpp
+++ b/libc/src/pthread/pthread_mutexattr_getpshared.cpp
@@ -10,11 +10,10 @@
#include "pthread_mutexattr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_mutexattr_getpshared,
(const pthread_mutexattr_t *__restrict attr,
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutexattr_getpshared,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutexattr_getpshared.h b/libc/src/pthread/pthread_mutexattr_getpshared.h
index 31b204acf036f..843fa36583d67 100644
--- a/libc/src/pthread/pthread_mutexattr_getpshared.h
+++ b/libc/src/pthread/pthread_mutexattr_getpshared.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_GETPSHARED_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_GETPSHARED_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutexattr_getpshared(const pthread_mutexattr_t *__restrict attr,
int *__restrict pshared);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_GETPSHARED_H
diff --git a/libc/src/pthread/pthread_mutexattr_getrobust.cpp b/libc/src/pthread/pthread_mutexattr_getrobust.cpp
index 508b502a58008..9c54b075dd944 100644
--- a/libc/src/pthread/pthread_mutexattr_getrobust.cpp
+++ b/libc/src/pthread/pthread_mutexattr_getrobust.cpp
@@ -10,11 +10,10 @@
#include "pthread_mutexattr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_mutexattr_getrobust,
(const pthread_mutexattr_t *__restrict attr,
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutexattr_getrobust,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutexattr_getrobust.h b/libc/src/pthread/pthread_mutexattr_getrobust.h
index c968f540e2060..5ef2b929d7049 100644
--- a/libc/src/pthread/pthread_mutexattr_getrobust.h
+++ b/libc/src/pthread/pthread_mutexattr_getrobust.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_GETROBUST_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_GETROBUST_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutexattr_getrobust(const pthread_mutexattr_t *__restrict attr,
int *__restrict robust);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_GETROBUST_H
diff --git a/libc/src/pthread/pthread_mutexattr_gettype.cpp b/libc/src/pthread/pthread_mutexattr_gettype.cpp
index 3747bf5ce73e9..c54396eff6fd8 100644
--- a/libc/src/pthread/pthread_mutexattr_gettype.cpp
+++ b/libc/src/pthread/pthread_mutexattr_gettype.cpp
@@ -10,11 +10,10 @@
#include "pthread_mutexattr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_mutexattr_gettype,
(const pthread_mutexattr_t *__restrict attr,
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutexattr_gettype,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutexattr_gettype.h b/libc/src/pthread/pthread_mutexattr_gettype.h
index 67562b371c377..b0e7c6e8e6a0c 100644
--- a/libc/src/pthread/pthread_mutexattr_gettype.h
+++ b/libc/src/pthread/pthread_mutexattr_gettype.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_GETTYPE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_GETTYPE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutexattr_gettype(const pthread_mutexattr_t *__restrict attr,
int *__restrict type);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_GETTYPE_H
diff --git a/libc/src/pthread/pthread_mutexattr_init.cpp b/libc/src/pthread/pthread_mutexattr_init.cpp
index 7f0ce0b60f535..439d198249a1e 100644
--- a/libc/src/pthread/pthread_mutexattr_init.cpp
+++ b/libc/src/pthread/pthread_mutexattr_init.cpp
@@ -10,9 +10,8 @@
#include "pthread_mutexattr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_mutexattr_init, (pthread_mutexattr_t * attr)) {
// Set the default attributes and mark the attribute object as initiliazed
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutexattr_init, (pthread_mutexattr_t * attr)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutexattr_init.h b/libc/src/pthread/pthread_mutexattr_init.h
index fdcd3471e6f28..13de2e5925102 100644
--- a/libc/src/pthread/pthread_mutexattr_init.h
+++ b/libc/src/pthread/pthread_mutexattr_init.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_INIT_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_INIT_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutexattr_init(pthread_mutexattr_t *attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_INIT_H
diff --git a/libc/src/pthread/pthread_mutexattr_setpshared.cpp b/libc/src/pthread/pthread_mutexattr_setpshared.cpp
index b290de764c91b..f654d337bac25 100644
--- a/libc/src/pthread/pthread_mutexattr_setpshared.cpp
+++ b/libc/src/pthread/pthread_mutexattr_setpshared.cpp
@@ -10,12 +10,11 @@
#include "pthread_mutexattr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_mutexattr_setpshared,
(pthread_mutexattr_t *__restrict attr, int pshared)) {
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutexattr_setpshared,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutexattr_setpshared.h b/libc/src/pthread/pthread_mutexattr_setpshared.h
index 6a04cd9ae433a..0726b7792fedb 100644
--- a/libc/src/pthread/pthread_mutexattr_setpshared.h
+++ b/libc/src/pthread/pthread_mutexattr_setpshared.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_SETPSHARED_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_SETPSHARED_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutexattr_setpshared(pthread_mutexattr_t *__restrict attr,
int pshared);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_SETPSHARED_H
diff --git a/libc/src/pthread/pthread_mutexattr_setrobust.cpp b/libc/src/pthread/pthread_mutexattr_setrobust.cpp
index e572827486c07..15fdac61e438d 100644
--- a/libc/src/pthread/pthread_mutexattr_setrobust.cpp
+++ b/libc/src/pthread/pthread_mutexattr_setrobust.cpp
@@ -10,12 +10,11 @@
#include "pthread_mutexattr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_mutexattr_setrobust,
(pthread_mutexattr_t *__restrict attr, int robust)) {
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutexattr_setrobust,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutexattr_setrobust.h b/libc/src/pthread/pthread_mutexattr_setrobust.h
index 62f0d052cb389..8361a14e38f68 100644
--- a/libc/src/pthread/pthread_mutexattr_setrobust.h
+++ b/libc/src/pthread/pthread_mutexattr_setrobust.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_SETROBUST_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_SETROBUST_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutexattr_setrobust(pthread_mutexattr_t *__restrict attr,
int robust);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_SETROBUST_H
diff --git a/libc/src/pthread/pthread_mutexattr_settype.cpp b/libc/src/pthread/pthread_mutexattr_settype.cpp
index 27e8ff859ba34..d5514a1cbf832 100644
--- a/libc/src/pthread/pthread_mutexattr_settype.cpp
+++ b/libc/src/pthread/pthread_mutexattr_settype.cpp
@@ -10,12 +10,11 @@
#include "pthread_mutexattr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_mutexattr_settype,
(pthread_mutexattr_t *__restrict attr, int type)) {
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, pthread_mutexattr_settype,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_mutexattr_settype.h b/libc/src/pthread/pthread_mutexattr_settype.h
index 1507919c164d6..8ad3285bacf30 100644
--- a/libc/src/pthread/pthread_mutexattr_settype.h
+++ b/libc/src/pthread/pthread_mutexattr_settype.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_SETTYPE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_SETTYPE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_mutexattr_settype(pthread_mutexattr_t *__restrict attr, int type);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_MUTEXATTR_SETTYPE_H
diff --git a/libc/src/pthread/pthread_once.cpp b/libc/src/pthread/pthread_once.cpp
index d78644a8dab26..0e0045e9c5407 100644
--- a/libc/src/pthread/pthread_once.cpp
+++ b/libc/src/pthread/pthread_once.cpp
@@ -8,12 +8,11 @@
#include "pthread_once.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/callonce.h"
#include <pthread.h> // For pthread_once_t and __pthread_once_func_t definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_once,
(pthread_once_t * flag, __pthread_once_func_t func)) {
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(int, pthread_once,
reinterpret_cast<CallOnceCallback *>(func));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_once.h b/libc/src/pthread/pthread_once.h
index 0e9af00a37d20..25ee70a99c4d4 100644
--- a/libc/src/pthread/pthread_once.h
+++ b/libc/src/pthread/pthread_once.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_ONCE_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_ONCE_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_once(pthread_once_t *flag, __pthread_once_func_t func);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_ONCE_H
diff --git a/libc/src/pthread/pthread_rwlock_destroy.cpp b/libc/src/pthread/pthread_rwlock_destroy.cpp
index 345076aae4348..d82bb376bda2c 100644
--- a/libc/src/pthread/pthread_rwlock_destroy.cpp
+++ b/libc/src/pthread/pthread_rwlock_destroy.cpp
@@ -9,13 +9,12 @@
#include "src/pthread/pthread_rwlock_destroy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/rwlock.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlock_destroy, (pthread_rwlock_t * rwlock)) {
if (!rwlock)
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlock_destroy, (pthread_rwlock_t * rwlock)) {
return static_cast<int>(res);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlock_destroy.h b/libc/src/pthread/pthread_rwlock_destroy.h
index 892a049689343..f845e806d6e60 100644
--- a/libc/src/pthread/pthread_rwlock_destroy.h
+++ b/libc/src/pthread/pthread_rwlock_destroy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_DESTROY_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_DESTROY_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlock_destroy(pthread_rwlock_t *rwlock);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_DESTROY_H
diff --git a/libc/src/pthread/pthread_rwlock_init.cpp b/libc/src/pthread/pthread_rwlock_init.cpp
index d1a31625d0dab..b1b58aac6c6ff 100644
--- a/libc/src/pthread/pthread_rwlock_init.cpp
+++ b/libc/src/pthread/pthread_rwlock_init.cpp
@@ -11,13 +11,12 @@
#include "src/__support/CPP/new.h"
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/rwlock.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(
sizeof(RwLock) == sizeof(pthread_rwlock_t) &&
@@ -65,4 +64,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlock_init,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlock_init.h b/libc/src/pthread/pthread_rwlock_init.h
index dbd64436fb500..78d2934882c1d 100644
--- a/libc/src/pthread/pthread_rwlock_init.h
+++ b/libc/src/pthread/pthread_rwlock_init.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_INIT_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_INIT_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlock_init(pthread_rwlock_t *rwlock,
const pthread_rwlockattr_t *__restrict attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_INIT_H
diff --git a/libc/src/pthread/pthread_rwlock_rdlock.cpp b/libc/src/pthread/pthread_rwlock_rdlock.cpp
index 16d82301c54a9..e9aee5da4e7e4 100644
--- a/libc/src/pthread/pthread_rwlock_rdlock.cpp
+++ b/libc/src/pthread/pthread_rwlock_rdlock.cpp
@@ -9,13 +9,12 @@
#include "src/pthread/pthread_rwlock_rdlock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/rwlock.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(
sizeof(RwLock) == sizeof(pthread_rwlock_t) &&
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlock_rdlock, (pthread_rwlock_t * rwlock)) {
return static_cast<int>(rw->read_lock());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlock_rdlock.h b/libc/src/pthread/pthread_rwlock_rdlock.h
index f5c0c26c6ff89..79027739f4b7c 100644
--- a/libc/src/pthread/pthread_rwlock_rdlock.h
+++ b/libc/src/pthread/pthread_rwlock_rdlock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_RDLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_RDLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlock_rdlock(pthread_rwlock_t *rwlock);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_RDLOCK_H
diff --git a/libc/src/pthread/pthread_rwlock_timedrdlock.cpp b/libc/src/pthread/pthread_rwlock_timedrdlock.cpp
index 905541014a4a4..6ce69ea738a93 100644
--- a/libc/src/pthread/pthread_rwlock_timedrdlock.cpp
+++ b/libc/src/pthread/pthread_rwlock_timedrdlock.cpp
@@ -10,7 +10,6 @@
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/__support/threads/linux/rwlock.h"
#include "src/__support/time/linux/abs_timeout.h"
@@ -18,7 +17,7 @@
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(
sizeof(RwLock) == sizeof(pthread_rwlock_t) &&
@@ -47,4 +46,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlock_timedrdlock,
__builtin_unreachable();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlock_timedrdlock.h b/libc/src/pthread/pthread_rwlock_timedrdlock.h
index d6c67dcfd6370..dfa43f25ba706 100644
--- a/libc/src/pthread/pthread_rwlock_timedrdlock.h
+++ b/libc/src/pthread/pthread_rwlock_timedrdlock.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TIMEDRDLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TIMEDRDLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlock_timedrdlock(pthread_rwlock_t *__restrict rwlock,
const struct timespec *__restrict abs_timeout);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TIMEDRDLOCK_H
diff --git a/libc/src/pthread/pthread_rwlock_timedwrlock.cpp b/libc/src/pthread/pthread_rwlock_timedwrlock.cpp
index f77ac40f22b89..ad3f913eb15aa 100644
--- a/libc/src/pthread/pthread_rwlock_timedwrlock.cpp
+++ b/libc/src/pthread/pthread_rwlock_timedwrlock.cpp
@@ -10,7 +10,6 @@
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/__support/threads/linux/rwlock.h"
#include "src/__support/time/linux/abs_timeout.h"
@@ -18,7 +17,7 @@
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlock_timedwrlock,
(pthread_rwlock_t *__restrict rwlock,
@@ -41,4 +40,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlock_timedwrlock,
__builtin_unreachable();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlock_timedwrlock.h b/libc/src/pthread/pthread_rwlock_timedwrlock.h
index 995d80c2f5734..a39d8de8d330f 100644
--- a/libc/src/pthread/pthread_rwlock_timedwrlock.h
+++ b/libc/src/pthread/pthread_rwlock_timedwrlock.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TIMEDWRLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TIMEDWRLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlock_timedwrlock(pthread_rwlock_t *__restrict rwlock,
const struct timespec *__restrict abs_timeout);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TIMEDWRLOCK_H
diff --git a/libc/src/pthread/pthread_rwlock_tryrdlock.cpp b/libc/src/pthread/pthread_rwlock_tryrdlock.cpp
index da59a576b8274..9dc1bf09bc830 100644
--- a/libc/src/pthread/pthread_rwlock_tryrdlock.cpp
+++ b/libc/src/pthread/pthread_rwlock_tryrdlock.cpp
@@ -9,13 +9,12 @@
#include "src/pthread/pthread_rwlock_tryrdlock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/rwlock.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(
sizeof(RwLock) == sizeof(pthread_rwlock_t) &&
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlock_tryrdlock, (pthread_rwlock_t * rwlock)) {
return static_cast<int>(rw->try_read_lock());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlock_tryrdlock.h b/libc/src/pthread/pthread_rwlock_tryrdlock.h
index 10ef7afbc160e..b07ab5b152b1a 100644
--- a/libc/src/pthread/pthread_rwlock_tryrdlock.h
+++ b/libc/src/pthread/pthread_rwlock_tryrdlock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TRYRDLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TRYRDLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlock_tryrdlock(pthread_rwlock_t *rwlock);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TRYRDLOCK_H
diff --git a/libc/src/pthread/pthread_rwlock_trywrlock.cpp b/libc/src/pthread/pthread_rwlock_trywrlock.cpp
index ccd1bd49c402c..e4ace3cb350af 100644
--- a/libc/src/pthread/pthread_rwlock_trywrlock.cpp
+++ b/libc/src/pthread/pthread_rwlock_trywrlock.cpp
@@ -9,13 +9,12 @@
#include "src/pthread/pthread_rwlock_trywrlock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/rwlock.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(
sizeof(RwLock) == sizeof(pthread_rwlock_t) &&
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlock_trywrlock, (pthread_rwlock_t * rwlock)) {
return static_cast<int>(rw->try_write_lock());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlock_trywrlock.h b/libc/src/pthread/pthread_rwlock_trywrlock.h
index df185b087ce6f..fc146c6db859f 100644
--- a/libc/src/pthread/pthread_rwlock_trywrlock.h
+++ b/libc/src/pthread/pthread_rwlock_trywrlock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TRYWRLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TRYWRLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlock_trywrlock(pthread_rwlock_t *rwlock);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_TRYWRLOCK_H
diff --git a/libc/src/pthread/pthread_rwlock_unlock.cpp b/libc/src/pthread/pthread_rwlock_unlock.cpp
index 77c50a8e65fdf..21cedf42a8d50 100644
--- a/libc/src/pthread/pthread_rwlock_unlock.cpp
+++ b/libc/src/pthread/pthread_rwlock_unlock.cpp
@@ -9,13 +9,12 @@
#include "src/pthread/pthread_rwlock_unlock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/rwlock.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlock_unlock, (pthread_rwlock_t * rwlock)) {
if (!rwlock)
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlock_unlock, (pthread_rwlock_t * rwlock)) {
return static_cast<int>(rw->unlock());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlock_unlock.h b/libc/src/pthread/pthread_rwlock_unlock.h
index d416f8d32f9f0..b9a72f1e06992 100644
--- a/libc/src/pthread/pthread_rwlock_unlock.h
+++ b/libc/src/pthread/pthread_rwlock_unlock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_UNLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_UNLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlock_unlock(pthread_rwlock_t *rwlock);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_UNLOCK_H
diff --git a/libc/src/pthread/pthread_rwlock_wrlock.cpp b/libc/src/pthread/pthread_rwlock_wrlock.cpp
index c2561c81f4bd0..5d3868a58f4e9 100644
--- a/libc/src/pthread/pthread_rwlock_wrlock.cpp
+++ b/libc/src/pthread/pthread_rwlock_wrlock.cpp
@@ -9,13 +9,12 @@
#include "src/pthread/pthread_rwlock_wrlock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/rwlock.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(
sizeof(RwLock) == sizeof(pthread_rwlock_t) &&
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlock_wrlock, (pthread_rwlock_t * rwlock)) {
return static_cast<int>(rw->write_lock());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlock_wrlock.h b/libc/src/pthread/pthread_rwlock_wrlock.h
index 662c3478baf07..ba77c1f1f09ac 100644
--- a/libc/src/pthread/pthread_rwlock_wrlock.h
+++ b/libc/src/pthread/pthread_rwlock_wrlock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_WRLOCK_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_WRLOCK_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlock_wrlock(pthread_rwlock_t *rwlock);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCK_WRLOCK_H
diff --git a/libc/src/pthread/pthread_rwlockattr_destroy.cpp b/libc/src/pthread/pthread_rwlockattr_destroy.cpp
index b86cd1188fe29..e3ca75112f0ef 100644
--- a/libc/src/pthread/pthread_rwlockattr_destroy.cpp
+++ b/libc/src/pthread/pthread_rwlockattr_destroy.cpp
@@ -9,11 +9,10 @@
#include "pthread_rwlockattr_destroy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h> // pthread_rwlockattr_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_destroy,
(pthread_rwlockattr_t * attr [[gnu::unused]])) {
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_destroy,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlockattr_destroy.h b/libc/src/pthread/pthread_rwlockattr_destroy.h
index 1de3d9ef58867..5904d6b004187 100644
--- a/libc/src/pthread/pthread_rwlockattr_destroy.h
+++ b/libc/src/pthread/pthread_rwlockattr_destroy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_DESTROY_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_DESTROY_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlockattr_destroy(pthread_rwlockattr_t *attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_DESTROY_H
diff --git a/libc/src/pthread/pthread_rwlockattr_getkind_np.cpp b/libc/src/pthread/pthread_rwlockattr_getkind_np.cpp
index 9c034cf50b3bf..0c821797b42ca 100644
--- a/libc/src/pthread/pthread_rwlockattr_getkind_np.cpp
+++ b/libc/src/pthread/pthread_rwlockattr_getkind_np.cpp
@@ -9,11 +9,10 @@
#include "pthread_rwlockattr_getkind_np.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h> // pthread_rwlockattr_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_getkind_np,
(const pthread_rwlockattr_t *__restrict attr,
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_getkind_np,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlockattr_getkind_np.h b/libc/src/pthread/pthread_rwlockattr_getkind_np.h
index 5feeeb265f96f..51f633cd559d4 100644
--- a/libc/src/pthread/pthread_rwlockattr_getkind_np.h
+++ b/libc/src/pthread/pthread_rwlockattr_getkind_np.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_GETKIND_NP_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_GETKIND_NP_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlockattr_getkind_np(const pthread_rwlockattr_t *__restrict attr,
int *__restrict pref);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_GETKIND_NP_H
diff --git a/libc/src/pthread/pthread_rwlockattr_getpshared.cpp b/libc/src/pthread/pthread_rwlockattr_getpshared.cpp
index 0943e3374ed00..0dad230a2bde2 100644
--- a/libc/src/pthread/pthread_rwlockattr_getpshared.cpp
+++ b/libc/src/pthread/pthread_rwlockattr_getpshared.cpp
@@ -9,11 +9,10 @@
#include "pthread_rwlockattr_getpshared.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h> // pthread_rwlockattr_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_getpshared,
(const pthread_rwlockattr_t *attr, int *pshared)) {
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_getpshared,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlockattr_getpshared.h b/libc/src/pthread/pthread_rwlockattr_getpshared.h
index 77fd767594b81..64843e59aae69 100644
--- a/libc/src/pthread/pthread_rwlockattr_getpshared.h
+++ b/libc/src/pthread/pthread_rwlockattr_getpshared.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_GETPSHARED_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_GETPSHARED_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *attr,
int *pshared);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_GETPSHARED_H
diff --git a/libc/src/pthread/pthread_rwlockattr_init.cpp b/libc/src/pthread/pthread_rwlockattr_init.cpp
index 3ff1041d11c87..bbc89555c6c1c 100644
--- a/libc/src/pthread/pthread_rwlockattr_init.cpp
+++ b/libc/src/pthread/pthread_rwlockattr_init.cpp
@@ -9,11 +9,10 @@
#include "pthread_rwlockattr_init.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <pthread.h> // pthread_rwlockattr_t, PTHREAD_PROCESS_PRIVATE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_init,
(pthread_rwlockattr_t * attr)) {
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_init,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlockattr_init.h b/libc/src/pthread/pthread_rwlockattr_init.h
index c2e525fcf0388..30ae499fb65dc 100644
--- a/libc/src/pthread/pthread_rwlockattr_init.h
+++ b/libc/src/pthread/pthread_rwlockattr_init.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_INIT_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_INIT_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlockattr_init(pthread_rwlockattr_t *attr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_INIT_H
diff --git a/libc/src/pthread/pthread_rwlockattr_setkind_np.cpp b/libc/src/pthread/pthread_rwlockattr_setkind_np.cpp
index 45dbb05c7ab89..47fbf2a851e50 100644
--- a/libc/src/pthread/pthread_rwlockattr_setkind_np.cpp
+++ b/libc/src/pthread/pthread_rwlockattr_setkind_np.cpp
@@ -9,12 +9,11 @@
#include "pthread_rwlockattr_setkind_np.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <pthread.h> // pthread_rwlockattr_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_setkind_np,
(pthread_rwlockattr_t * attr, int pref)) {
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_setkind_np,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlockattr_setkind_np.h b/libc/src/pthread/pthread_rwlockattr_setkind_np.h
index cea5566f9f865..00ef8e1bbe009 100644
--- a/libc/src/pthread/pthread_rwlockattr_setkind_np.h
+++ b/libc/src/pthread/pthread_rwlockattr_setkind_np.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_SETKIND_NP_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_SETKIND_NP_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlockattr_setkind_np(pthread_rwlockattr_t *attr, int pref);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_SETKIND_NP_H
diff --git a/libc/src/pthread/pthread_rwlockattr_setpshared.cpp b/libc/src/pthread/pthread_rwlockattr_setpshared.cpp
index 8088b68fdf33f..6bcba7c1b4935 100644
--- a/libc/src/pthread/pthread_rwlockattr_setpshared.cpp
+++ b/libc/src/pthread/pthread_rwlockattr_setpshared.cpp
@@ -9,12 +9,11 @@
#include "pthread_rwlockattr_setpshared.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h> // EINVAL
#include <pthread.h> // pthread_rwlockattr_t, PTHREAD_PROCESS_SHARED, PTHREAD_PROCESS_PRIVATE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_setpshared,
(pthread_rwlockattr_t * attr, int pshared)) {
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_setpshared,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_rwlockattr_setpshared.h b/libc/src/pthread/pthread_rwlockattr_setpshared.h
index 69058655453c4..393c07d1eecbc 100644
--- a/libc/src/pthread/pthread_rwlockattr_setpshared.h
+++ b/libc/src/pthread/pthread_rwlockattr_setpshared.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_SETPSHARED_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_SETPSHARED_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *attr, int pshared);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_RWLOCKATTR_SETPSHARED_H
diff --git a/libc/src/pthread/pthread_self.cpp b/libc/src/pthread/pthread_self.cpp
index c3169ec1ca5c4..3e74f964c9af2 100644
--- a/libc/src/pthread/pthread_self.cpp
+++ b/libc/src/pthread/pthread_self.cpp
@@ -9,12 +9,11 @@
#include "pthread_self.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <pthread.h> // For pthread_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(pthread_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between pthread_t and internal Thread.");
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(pthread_t, pthread_self, ()) {
return th;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_self.h b/libc/src/pthread/pthread_self.h
index 4edb5661b79e2..058072e45ed28 100644
--- a/libc/src/pthread/pthread_self.h
+++ b/libc/src/pthread/pthread_self.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_SELF_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_SELF_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
pthread_t pthread_self();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_SELF_H
diff --git a/libc/src/pthread/pthread_setname_np.cpp b/libc/src/pthread/pthread_setname_np.cpp
index 785a96a09df02..e211d7e082740 100644
--- a/libc/src/pthread/pthread_setname_np.cpp
+++ b/libc/src/pthread/pthread_setname_np.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(pthread_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between pthread_t and internal Thread.");
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, pthread_setname_np, (pthread_t th, const char *name)) {
return thread->set_name(cpp::string_view(name));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_setname_np.h b/libc/src/pthread/pthread_setname_np.h
index 6dc6bfb9d30a3..e240425ae2b46 100644
--- a/libc/src/pthread/pthread_setname_np.h
+++ b/libc/src/pthread/pthread_setname_np.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_SETNAME_NP_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_SETNAME_NP_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_setname_np(pthread_t, const char *name);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_SETNAME_NP_H
diff --git a/libc/src/pthread/pthread_setspecific.cpp b/libc/src/pthread/pthread_setspecific.cpp
index 5587a2d937abb..e9b23d8483a8f 100644
--- a/libc/src/pthread/pthread_setspecific.cpp
+++ b/libc/src/pthread/pthread_setspecific.cpp
@@ -9,13 +9,12 @@
#include "pthread_setspecific.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <errno.h>
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_setspecific,
(pthread_key_t key, const void *data)) {
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, pthread_setspecific,
return EINVAL;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/pthread/pthread_setspecific.h b/libc/src/pthread/pthread_setspecific.h
index 2a85968ba7b5b..af9a890fd0aeb 100644
--- a/libc/src/pthread/pthread_setspecific.h
+++ b/libc/src/pthread/pthread_setspecific.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_PTHREAD_PTHREAD_SETSPECIFIC_H
#define LLVM_LIBC_SRC_PTHREAD_PTHREAD_SETSPECIFIC_H
-#include "src/__support/macros/config.h"
#include <pthread.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pthread_setspecific(pthread_key_t, const void *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_PTHREAD_PTHREAD_SETSPECIFIC_H
diff --git a/libc/src/sched/linux/sched_get_priority_max.cpp b/libc/src/sched/linux/sched_get_priority_max.cpp
index 77a82c77405f3..0b6537ecd84c6 100644
--- a/libc/src/sched/linux/sched_get_priority_max.cpp
+++ b/libc/src/sched/linux/sched_get_priority_max.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_get_priority_max, (int policy)) {
int ret =
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, sched_get_priority_max, (int policy)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_get_priority_min.cpp b/libc/src/sched/linux/sched_get_priority_min.cpp
index fca66a15edb55..1240a500887ee 100644
--- a/libc/src/sched/linux/sched_get_priority_min.cpp
+++ b/libc/src/sched/linux/sched_get_priority_min.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_get_priority_min, (int policy)) {
int ret =
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, sched_get_priority_min, (int policy)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_getaffinity.cpp b/libc/src/sched/linux/sched_getaffinity.cpp
index 7b1fd8c5aa2af..476576178fa48 100644
--- a/libc/src/sched/linux/sched_getaffinity.cpp
+++ b/libc/src/sched/linux/sched_getaffinity.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sched.h>
#include <stdint.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_getaffinity,
(pid_t tid, size_t cpuset_size, cpu_set_t *mask)) {
@@ -37,4 +36,4 @@ LLVM_LIBC_FUNCTION(int, sched_getaffinity,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_getcpucount.cpp b/libc/src/sched/linux/sched_getcpucount.cpp
index dbda4b2c789ad..a816d92e4c0b5 100644
--- a/libc/src/sched/linux/sched_getcpucount.cpp
+++ b/libc/src/sched/linux/sched_getcpucount.cpp
@@ -9,12 +9,11 @@
#include "src/sched/sched_getcpucount.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <sched.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, __sched_getcpucount,
(size_t cpuset_size, const cpu_set_t *mask)) {
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, __sched_getcpucount,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_getparam.cpp b/libc/src/sched/linux/sched_getparam.cpp
index 75756a65f0ede..64a62c5fd5e84 100644
--- a/libc/src/sched/linux/sched_getparam.cpp
+++ b/libc/src/sched/linux/sched_getparam.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_getparam,
(pid_t tid, struct sched_param *param)) {
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, sched_getparam,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_getscheduler.cpp b/libc/src/sched/linux/sched_getscheduler.cpp
index 545cda8e7484b..992a11d292591 100644
--- a/libc/src/sched/linux/sched_getscheduler.cpp
+++ b/libc/src/sched/linux/sched_getscheduler.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_getscheduler, (pid_t tid)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_sched_getscheduler, tid);
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, sched_getscheduler, (pid_t tid)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_rr_get_interval.cpp b/libc/src/sched/linux/sched_rr_get_interval.cpp
index 1f0ef69dfc893..5dcac203bb418 100644
--- a/libc/src/sched/linux/sched_rr_get_interval.cpp
+++ b/libc/src/sched/linux/sched_rr_get_interval.cpp
@@ -10,7 +10,6 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
@@ -19,7 +18,7 @@
#include <linux/time_types.h> // For __kernel_timespec.
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_rr_get_interval,
(pid_t tid, struct timespec *tp)) {
@@ -54,4 +53,4 @@ LLVM_LIBC_FUNCTION(int, sched_rr_get_interval,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_setaffinity.cpp b/libc/src/sched/linux/sched_setaffinity.cpp
index cad48c26bf938..509894258e126 100644
--- a/libc/src/sched/linux/sched_setaffinity.cpp
+++ b/libc/src/sched/linux/sched_setaffinity.cpp
@@ -10,13 +10,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sched.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_setaffinity,
(pid_t tid, size_t cpuset_size, const cpu_set_t *mask)) {
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, sched_setaffinity,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_setparam.cpp b/libc/src/sched/linux/sched_setparam.cpp
index e78e78a707e05..79acf78ef887e 100644
--- a/libc/src/sched/linux/sched_setparam.cpp
+++ b/libc/src/sched/linux/sched_setparam.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_setparam,
(pid_t tid, const struct sched_param *param)) {
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, sched_setparam,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_setscheduler.cpp b/libc/src/sched/linux/sched_setscheduler.cpp
index b6b6f667b3f9e..1c18526a3c814 100644
--- a/libc/src/sched/linux/sched_setscheduler.cpp
+++ b/libc/src/sched/linux/sched_setscheduler.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_setscheduler,
(pid_t tid, int policy, const struct sched_param *param)) {
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, sched_setscheduler,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/linux/sched_yield.cpp b/libc/src/sched/linux/sched_yield.cpp
index 3de9d0ba35717..6878a375aa092 100644
--- a/libc/src/sched/linux/sched_yield.cpp
+++ b/libc/src/sched/linux/sched_yield.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sched_yield, ()) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_sched_yield);
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, sched_yield, ()) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sched/sched_get_priority_max.h b/libc/src/sched/sched_get_priority_max.h
index e37bec723b847..01611dae7bd12 100644
--- a/libc/src/sched/sched_get_priority_max.h
+++ b/libc/src/sched/sched_get_priority_max.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GET_PRIORITY_MAX_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GET_PRIORITY_MAX_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_get_priority_max(int policy);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_GET_PRIORITY_MAX_H
diff --git a/libc/src/sched/sched_get_priority_min.h b/libc/src/sched/sched_get_priority_min.h
index 691d8482e1c7a..f4b5d5487887c 100644
--- a/libc/src/sched/sched_get_priority_min.h
+++ b/libc/src/sched/sched_get_priority_min.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GET_PRIORITY_MIN_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GET_PRIORITY_MIN_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_get_priority_min(int policy);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_GET_PRIORITY_MIN_H
diff --git a/libc/src/sched/sched_getaffinity.h b/libc/src/sched/sched_getaffinity.h
index 52ec5bca6b22a..2f29b7e2a0b9e 100644
--- a/libc/src/sched/sched_getaffinity.h
+++ b/libc/src/sched/sched_getaffinity.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GETAFFINITY_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GETAFFINITY_H
-#include "src/__support/macros/config.h"
#include <sched.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_getaffinity(pid_t tid, size_t cpuset_size, cpu_set_t *mask);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_GETAFFINITY_H
diff --git a/libc/src/sched/sched_getcpucount.h b/libc/src/sched/sched_getcpucount.h
index 8f35301ca6c0d..a0c696fd1f4ae 100644
--- a/libc/src/sched/sched_getcpucount.h
+++ b/libc/src/sched/sched_getcpucount.h
@@ -9,16 +9,15 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GETCPUCOUNT_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GETCPUCOUNT_H
-#include "src/__support/macros/config.h"
#include <sched.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This function is for internal use in the CPU_COUNT macro, but since that's a
// macro and will be applied to client files, this must be a public entrypoint.
int __sched_getcpucount(size_t cpuset_size, const cpu_set_t *mask);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_GETCPUCOUNT_H
diff --git a/libc/src/sched/sched_getparam.h b/libc/src/sched/sched_getparam.h
index e1b23656d5859..09bed7012e3fd 100644
--- a/libc/src/sched/sched_getparam.h
+++ b/libc/src/sched/sched_getparam.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GETPARAM_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GETPARAM_H
-#include "src/__support/macros/config.h"
#include <sched.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_getparam(pid_t tid, struct sched_param *param);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_GETPARAM_H
diff --git a/libc/src/sched/sched_getscheduler.h b/libc/src/sched/sched_getscheduler.h
index d29e902180ea8..6e4fe060a6c4e 100644
--- a/libc/src/sched/sched_getscheduler.h
+++ b/libc/src/sched/sched_getscheduler.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_GETSCHEDULER_H
#define LLVM_LIBC_SRC_SCHED_SCHED_GETSCHEDULER_H
-#include "src/__support/macros/config.h"
#include <sched.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_getscheduler(pid_t tid);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_GETSCHEDULER_H
diff --git a/libc/src/sched/sched_rr_get_interval.h b/libc/src/sched/sched_rr_get_interval.h
index ff093298a3bb3..f9eb2d9a2220d 100644
--- a/libc/src/sched/sched_rr_get_interval.h
+++ b/libc/src/sched/sched_rr_get_interval.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_RR_GET_INTERVAL_H
#define LLVM_LIBC_SRC_SCHED_SCHED_RR_GET_INTERVAL_H
-#include "src/__support/macros/config.h"
#include <sched.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_rr_get_interval(pid_t tid, struct timespec *tp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_RR_GET_INTERVAL_H
diff --git a/libc/src/sched/sched_setaffinity.h b/libc/src/sched/sched_setaffinity.h
index cb2303dd813e2..5da6dd43e7d5d 100644
--- a/libc/src/sched/sched_setaffinity.h
+++ b/libc/src/sched/sched_setaffinity.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_SETAFFINITY_H
#define LLVM_LIBC_SRC_SCHED_SCHED_SETAFFINITY_H
-#include "src/__support/macros/config.h"
#include <sched.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_setaffinity(pid_t pid, size_t cpuset_size, const cpu_set_t *mask);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_SETAFFINITY_H
diff --git a/libc/src/sched/sched_setparam.h b/libc/src/sched/sched_setparam.h
index e4691a7912000..c371bc0bc7531 100644
--- a/libc/src/sched/sched_setparam.h
+++ b/libc/src/sched/sched_setparam.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_SETPARAM_H
#define LLVM_LIBC_SRC_SCHED_SCHED_SETPARAM_H
-#include "src/__support/macros/config.h"
#include <sched.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_setparam(pid_t tid, const struct sched_param *param);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_SETPARAM_H
diff --git a/libc/src/sched/sched_setscheduler.h b/libc/src/sched/sched_setscheduler.h
index e745002c0d961..8e0cb0d0629ae 100644
--- a/libc/src/sched/sched_setscheduler.h
+++ b/libc/src/sched/sched_setscheduler.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_SETSCHEDULER_H
#define LLVM_LIBC_SRC_SCHED_SCHED_SETSCHEDULER_H
-#include "src/__support/macros/config.h"
#include <sched.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_setscheduler(pid_t tid, int policy, const struct sched_param *param);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_SETSCHEDULER_H
diff --git a/libc/src/sched/sched_yield.h b/libc/src/sched/sched_yield.h
index c48fdd765e06d..493646a84edbb 100644
--- a/libc/src/sched/sched_yield.h
+++ b/libc/src/sched/sched_yield.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_SCHED_SCHED_YIELD_H
#define LLVM_LIBC_SRC_SCHED_SCHED_YIELD_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sched_yield(void);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SCHED_SCHED_YIELD_H
diff --git a/libc/src/search/hcreate.cpp b/libc/src/search/hcreate.cpp
index ac816a902e221..4bf638b5920e9 100644
--- a/libc/src/search/hcreate.cpp
+++ b/libc/src/search/hcreate.cpp
@@ -9,11 +9,10 @@
#include "src/search/hcreate.h"
#include "src/__support/HashTable/randomness.h"
#include "src/__support/HashTable/table.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/search/hsearch/global.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, hcreate, (size_t capacity)) {
// We follow FreeBSD's implementation here. If the global_hash_table is
// already initialized, this function will do nothing and return 1.
@@ -32,4 +31,4 @@ LLVM_LIBC_FUNCTION(int, hcreate, (size_t capacity)) {
return 1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/search/hcreate.h b/libc/src/search/hcreate.h
index 2f5a9c71b1a54..2ac37fb030c26 100644
--- a/libc/src/search/hcreate.h
+++ b/libc/src/search/hcreate.h
@@ -9,11 +9,10 @@
#ifndef LLVM_LIBC_SRC_SEARCH_HCREATE_H
#define LLVM_LIBC_SRC_SEARCH_HCREATE_H
-#include "src/__support/macros/config.h"
#include <search.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int hcreate(size_t capacity);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SEARCH_HCREATE_H
diff --git a/libc/src/search/hcreate_r.cpp b/libc/src/search/hcreate_r.cpp
index 17acd808c19a6..612a45cd0c688 100644
--- a/libc/src/search/hcreate_r.cpp
+++ b/libc/src/search/hcreate_r.cpp
@@ -9,10 +9,9 @@
#include "src/search/hcreate_r.h"
#include "src/__support/HashTable/randomness.h"
#include "src/__support/HashTable/table.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, hcreate_r,
(size_t capacity, struct hsearch_data *htab)) {
if (htab == nullptr) {
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(int, hcreate_r,
return 1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/search/hcreate_r.h b/libc/src/search/hcreate_r.h
index 9606077b3e830..e81895ef815c9 100644
--- a/libc/src/search/hcreate_r.h
+++ b/libc/src/search/hcreate_r.h
@@ -9,11 +9,10 @@
#ifndef LLVM_LIBC_SRC_SEARCH_HCREATE_R_H
#define LLVM_LIBC_SRC_SEARCH_HCREATE_R_H
-#include "src/__support/macros/config.h"
#include <search.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int hcreate_r(size_t capacity, struct hsearch_data *htab);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SEARCH_HCREATE_R_H
diff --git a/libc/src/search/hdestroy.cpp b/libc/src/search/hdestroy.cpp
index c794b2a1ccb9c..3c5ea7b7af033 100644
--- a/libc/src/search/hdestroy.cpp
+++ b/libc/src/search/hdestroy.cpp
@@ -8,10 +8,9 @@
#include "src/search/hdestroy.h"
#include "src/__support/HashTable/table.h"
-#include "src/__support/macros/config.h"
#include "src/search/hsearch/global.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, hdestroy, (void)) {
// HashTable::deallocate will check for nullptr. It will be a no-op if
// global_hash_table is null.
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(void, hdestroy, (void)) {
internal::global_hash_table = nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/search/hdestroy.h b/libc/src/search/hdestroy.h
index c2b9a876c38f3..b81e309a6bc80 100644
--- a/libc/src/search/hdestroy.h
+++ b/libc/src/search/hdestroy.h
@@ -9,11 +9,10 @@
#ifndef LLVM_LIBC_SRC_SEARCH_HDESTROY_H
#define LLVM_LIBC_SRC_SEARCH_HDESTROY_H
-#include "src/__support/macros/config.h"
#include <search.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void hdestroy(void);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SEARCH_HDESTROY_H
diff --git a/libc/src/search/hdestroy_r.cpp b/libc/src/search/hdestroy_r.cpp
index 7eff5bb6fff9d..e2fda93931f78 100644
--- a/libc/src/search/hdestroy_r.cpp
+++ b/libc/src/search/hdestroy_r.cpp
@@ -8,10 +8,9 @@
#include "src/search/hdestroy_r.h"
#include "src/__support/HashTable/table.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, hdestroy_r, (struct hsearch_data * htab)) {
if (htab == nullptr) {
libc_errno = EINVAL;
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(void, hdestroy_r, (struct hsearch_data * htab)) {
htab->__opaque = nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/search/hdestroy_r.h b/libc/src/search/hdestroy_r.h
index c9a4ddf018f38..503af41794448 100644
--- a/libc/src/search/hdestroy_r.h
+++ b/libc/src/search/hdestroy_r.h
@@ -9,11 +9,10 @@
#ifndef LLVM_LIBC_SRC_SEARCH_HDESTROY_R_H
#define LLVM_LIBC_SRC_SEARCH_HDESTROY_R_H
-#include "src/__support/macros/config.h"
#include <search.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void hdestroy_r(struct hsearch_data *htab);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SEARCH_HDESTROY_R_H
diff --git a/libc/src/search/hsearch.cpp b/libc/src/search/hsearch.cpp
index c18b5d3d7f547..a30803c5a0de7 100644
--- a/libc/src/search/hsearch.cpp
+++ b/libc/src/search/hsearch.cpp
@@ -9,11 +9,10 @@
#include "src/search/hsearch.h"
#include "src/__support/HashTable/randomness.h"
#include "src/__support/HashTable/table.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/search/hsearch/global.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ENTRY *, hsearch, (ENTRY item, ACTION action)) {
ENTRY *result = nullptr;
if (internal::global_hash_table == nullptr) {
@@ -47,4 +46,4 @@ LLVM_LIBC_FUNCTION(ENTRY *, hsearch, (ENTRY item, ACTION action)) {
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/search/hsearch.h b/libc/src/search/hsearch.h
index 4d039850f25d0..32dc073a49b83 100644
--- a/libc/src/search/hsearch.h
+++ b/libc/src/search/hsearch.h
@@ -9,11 +9,10 @@
#ifndef LLVM_LIBC_SRC_SEARCH_HSEARCH_H
#define LLVM_LIBC_SRC_SEARCH_HSEARCH_H
-#include "src/__support/macros/config.h"
#include <search.h> // ENTRY, ACTION
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ENTRY *hsearch(ENTRY item, ACTION action);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SEARCH_HSEARCH_H
diff --git a/libc/src/search/hsearch/global.cpp b/libc/src/search/hsearch/global.cpp
index 8dc64a05a1490..b6782ada50de4 100644
--- a/libc/src/search/hsearch/global.cpp
+++ b/libc/src/search/hsearch/global.cpp
@@ -6,10 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
struct HashTable *global_hash_table = nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/search/hsearch/global.h b/libc/src/search/hsearch/global.h
index 2ca532c167007..9579195a2f3e7 100644
--- a/libc/src/search/hsearch/global.h
+++ b/libc/src/search/hsearch/global.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_SEARCH_HSEARCH_GLOBAL_H
#define LLVM_LIBC_SRC_SEARCH_HSEARCH_GLOBAL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
extern struct HashTable *global_hash_table;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SEARCH_HSEARCH_GLOBAL_H
diff --git a/libc/src/search/hsearch_r.cpp b/libc/src/search/hsearch_r.cpp
index f93e608a190b1..a2c3a86eded6e 100644
--- a/libc/src/search/hsearch_r.cpp
+++ b/libc/src/search/hsearch_r.cpp
@@ -8,10 +8,9 @@
#include "src/search/hsearch_r.h"
#include "src/__support/HashTable/table.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, hsearch_r,
(ENTRY item, ACTION action, ENTRY **retval,
struct hsearch_data *htab)) {
@@ -41,4 +40,4 @@ LLVM_LIBC_FUNCTION(int, hsearch_r,
return 1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/search/hsearch_r.h b/libc/src/search/hsearch_r.h
index 6e9511035f6f2..d36094c2eba58 100644
--- a/libc/src/search/hsearch_r.h
+++ b/libc/src/search/hsearch_r.h
@@ -9,12 +9,11 @@
#ifndef LLVM_LIBC_SRC_SEARCH_HSEARCH_R_H
#define LLVM_LIBC_SRC_SEARCH_HSEARCH_R_H
-#include "src/__support/macros/config.h"
#include <search.h> // ENTRY, ACTION
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int hsearch_r(ENTRY item, ACTION action, ENTRY **retval,
struct hsearch_data *htab);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SEARCH_HSEARCH_R_H
diff --git a/libc/src/search/insque.cpp b/libc/src/search/insque.cpp
index 61a4171b5ce11..7b7d7c787af13 100644
--- a/libc/src/search/insque.cpp
+++ b/libc/src/search/insque.cpp
@@ -9,12 +9,11 @@
#include "src/search/insque.h"
#include "src/__support/common.h"
#include "src/__support/intrusive_list.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, insque, (void *elem, void *prev)) {
internal::IntrusiveList::insert(elem, prev);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/search/insque.h b/libc/src/search/insque.h
index 8c6c6b0e37801..e0fb69ed1df7c 100644
--- a/libc/src/search/insque.h
+++ b/libc/src/search/insque.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SEARCH_INSQUE_H
#define LLVM_LIBC_SRC_SEARCH_INSQUE_H
-#include "src/__support/macros/config.h"
#include <search.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void insque(void *elem, void *prev);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SEARCH_INSQUE_H
diff --git a/libc/src/search/remque.cpp b/libc/src/search/remque.cpp
index 97425dfbb57d9..f1d9859eedb51 100644
--- a/libc/src/search/remque.cpp
+++ b/libc/src/search/remque.cpp
@@ -9,12 +9,11 @@
#include "src/search/remque.h"
#include "src/__support/common.h"
#include "src/__support/intrusive_list.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, remque, (void *elem)) {
internal::IntrusiveList::remove(elem);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/search/remque.h b/libc/src/search/remque.h
index d06957978a874..51f225c004740 100644
--- a/libc/src/search/remque.h
+++ b/libc/src/search/remque.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SEARCH_REMQUE_H
#define LLVM_LIBC_SRC_SEARCH_REMQUE_H
-#include "src/__support/macros/config.h"
#include <search.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void remque(void *elem);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SEARCH_REMQUE_H
diff --git a/libc/src/setjmp/arm/longjmp.cpp b/libc/src/setjmp/arm/longjmp.cpp
index f36c79df66064..a088b5800fd14 100644
--- a/libc/src/setjmp/arm/longjmp.cpp
+++ b/libc/src/setjmp/arm/longjmp.cpp
@@ -9,9 +9,8 @@
#include "src/setjmp/longjmp.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#if defined(__thumb__) && __ARM_ARCH_ISA_THUMB == 1
@@ -72,4 +71,4 @@ LLVM_LIBC_FUNCTION(void, longjmp, (__jmp_buf * buf, int val)) {
#endif
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/setjmp/arm/setjmp.cpp b/libc/src/setjmp/arm/setjmp.cpp
index dc4252a350509..287e09c4a08ba 100644
--- a/libc/src/setjmp/arm/setjmp.cpp
+++ b/libc/src/setjmp/arm/setjmp.cpp
@@ -7,10 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/setjmp/setjmp_impl.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#if defined(__thumb__) && __ARM_ARCH_ISA_THUMB == 1
@@ -62,4 +61,4 @@ LLVM_LIBC_FUNCTION(int, setjmp, (__jmp_buf * buf)) {
#endif
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/setjmp/longjmp.h b/libc/src/setjmp/longjmp.h
index 29c5c9e1fbc92..3697d62968c27 100644
--- a/libc/src/setjmp/longjmp.h
+++ b/libc/src/setjmp/longjmp.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SETJMP_LONGJMP_H
#define LLVM_LIBC_SRC_SETJMP_LONGJMP_H
-#include "src/__support/macros/config.h"
#include <setjmp.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void longjmp(__jmp_buf *buf, int val);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SETJMP_LONGJMP_H
diff --git a/libc/src/setjmp/riscv/longjmp.cpp b/libc/src/setjmp/riscv/longjmp.cpp
index 0f9537ccc4151..034c31e723d6d 100644
--- a/libc/src/setjmp/riscv/longjmp.cpp
+++ b/libc/src/setjmp/riscv/longjmp.cpp
@@ -8,7 +8,6 @@
#include "src/setjmp/longjmp.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include <setjmp.h>
@@ -28,7 +27,7 @@
#define LOAD_FP(reg, val) LOAD_IMPL(fld, reg, val)
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, longjmp, (__jmp_buf * buf, int val)) {
LOAD(ra, buf->__pc);
@@ -67,4 +66,4 @@ LLVM_LIBC_FUNCTION(void, longjmp, (__jmp_buf * buf, int val)) {
LIBC_INLINE_ASM("add a0, %0, zero\n\t" : : "r"(val) :);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/setjmp/riscv/setjmp.cpp b/libc/src/setjmp/riscv/setjmp.cpp
index 12def578b56f3..04d6b5ec6ee5f 100644
--- a/libc/src/setjmp/riscv/setjmp.cpp
+++ b/libc/src/setjmp/riscv/setjmp.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/setjmp/setjmp_impl.h"
#include <setjmp.h>
@@ -27,7 +26,7 @@
#define STORE_FP(reg, val) STORE_IMPL(fsd, reg, val)
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, setjmp, (__jmp_buf * buf)) {
STORE(ra, buf->__pc);
@@ -65,4 +64,4 @@ LLVM_LIBC_FUNCTION(int, setjmp, (__jmp_buf * buf)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/setjmp/setjmp_impl.h b/libc/src/setjmp/setjmp_impl.h
index 50d7a6b44503b..52c835c7414c7 100644
--- a/libc/src/setjmp/setjmp_impl.h
+++ b/libc/src/setjmp/setjmp_impl.h
@@ -11,13 +11,12 @@
// This header has the _impl prefix in its name to avoid conflict with the
// public header setjmp.h which is also included. here.
-#include "src/__support/macros/config.h"
#include <setjmp.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int setjmp(__jmp_buf *buf);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SETJMP_SETJMP_IMPL_H
diff --git a/libc/src/setjmp/x86_64/longjmp.cpp b/libc/src/setjmp/x86_64/longjmp.cpp
index f479c7bc96c97..32340463e9f37 100644
--- a/libc/src/setjmp/x86_64/longjmp.cpp
+++ b/libc/src/setjmp/x86_64/longjmp.cpp
@@ -8,13 +8,12 @@
#include "src/setjmp/longjmp.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#if !defined(LIBC_TARGET_ARCH_IS_X86_64)
#error "Invalid file include"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, longjmp, (__jmp_buf * buf, int val)) {
register __UINT64_TYPE__ rbx __asm__("rbx");
@@ -42,4 +41,4 @@ LLVM_LIBC_FUNCTION(void, longjmp, (__jmp_buf * buf, int val)) {
LIBC_INLINE_ASM("jmp *%0\n\t" : : "m"(buf->rip));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/setjmp/x86_64/setjmp.cpp b/libc/src/setjmp/x86_64/setjmp.cpp
index 6a1cc7a83936a..8b6981d4cc34a 100644
--- a/libc/src/setjmp/x86_64/setjmp.cpp
+++ b/libc/src/setjmp/x86_64/setjmp.cpp
@@ -7,14 +7,13 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/setjmp/setjmp_impl.h"
#if !defined(LIBC_TARGET_ARCH_IS_X86_64)
#error "Invalid file include"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, setjmp, (__jmp_buf * buf)) {
register __UINT64_TYPE__ rbx __asm__("rbx");
@@ -54,4 +53,4 @@ LLVM_LIBC_FUNCTION(int, setjmp, (__jmp_buf * buf)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/kill.h b/libc/src/signal/kill.h
index 46048f2dbe044..a6d18935459ca 100644
--- a/libc/src/signal/kill.h
+++ b/libc/src/signal/kill.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SIGNAL_KILL_H
#define LLVM_LIBC_SRC_SIGNAL_KILL_H
-#include "src/__support/macros/config.h"
#include <signal.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int kill(pid_t pid, int sig);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_KILL_H
diff --git a/libc/src/signal/linux/__restore.cpp b/libc/src/signal/linux/__restore.cpp
index d3b4240f3e6ac..36fa375d672e1 100644
--- a/libc/src/signal/linux/__restore.cpp
+++ b/libc/src/signal/linux/__restore.cpp
@@ -11,11 +11,10 @@
// make any stack allocations so we must ensure this.
#include "src/__support/OSUtil/syscall.h"
-#include "src/__support/macros/config.h"
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" void __restore_rt()
__attribute__((no_sanitize("all"),
@@ -25,4 +24,4 @@ extern "C" void __restore_rt() {
LIBC_NAMESPACE::syscall_impl<long>(SYS_rt_sigreturn);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/kill.cpp b/libc/src/signal/linux/kill.cpp
index ed117858f51ef..a02b3b1d14003 100644
--- a/libc/src/signal/linux/kill.cpp
+++ b/libc/src/signal/linux/kill.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/signal/linux/signal_utils.h"
#include <signal.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, kill, (pid_t pid, int sig)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_kill, pid, sig);
@@ -32,4 +31,4 @@ LLVM_LIBC_FUNCTION(int, kill, (pid_t pid, int sig)) {
return ret; // always 0
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/raise.cpp b/libc/src/signal/linux/raise.cpp
index 4a8913941db11..2250df5478444 100644
--- a/libc/src/signal/linux/raise.cpp
+++ b/libc/src/signal/linux/raise.cpp
@@ -10,10 +10,9 @@
#include "hdr/types/sigset_t.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/signal/linux/signal_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, raise, (int sig)) {
sigset_t sigset;
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, raise, (int sig)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/sigaction.cpp b/libc/src/signal/linux/sigaction.cpp
index 65ec36741683c..7b220e5c37f6f 100644
--- a/libc/src/signal/linux/sigaction.cpp
+++ b/libc/src/signal/linux/sigaction.cpp
@@ -10,11 +10,10 @@
#include "hdr/types/sigset_t.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/signal/linux/signal_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TOOD: Some architectures will have their signal trampoline functions in the
// vdso, use those when available.
@@ -47,4 +46,4 @@ LLVM_LIBC_FUNCTION(int, sigaction,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/sigaddset.cpp b/libc/src/signal/linux/sigaddset.cpp
index 628883e13b887..8fc5d43180e28 100644
--- a/libc/src/signal/linux/sigaddset.cpp
+++ b/libc/src/signal/linux/sigaddset.cpp
@@ -10,11 +10,10 @@
#include "hdr/types/sigset_t.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/signal/linux/signal_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sigaddset, (sigset_t * set, int signum)) {
if (set != nullptr && add_signal(*set, signum))
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, sigaddset, (sigset_t * set, int signum)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/sigaltstack.cpp b/libc/src/signal/linux/sigaltstack.cpp
index 2e142a473fea7..47e0b23f4bad5 100644
--- a/libc/src/signal/linux/sigaltstack.cpp
+++ b/libc/src/signal/linux/sigaltstack.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/signal/sigaltstack.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/signal/linux/signal_utils.h"
@@ -16,7 +15,7 @@
#include <signal.h>
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sigaltstack,
(const stack_t *__restrict ss, stack_t *__restrict oss)) {
@@ -43,4 +42,4 @@ LLVM_LIBC_FUNCTION(int, sigaltstack,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/sigdelset.cpp b/libc/src/signal/linux/sigdelset.cpp
index 2e964051ebde7..997f4574c05d0 100644
--- a/libc/src/signal/linux/sigdelset.cpp
+++ b/libc/src/signal/linux/sigdelset.cpp
@@ -10,11 +10,10 @@
#include "hdr/types/sigset_t.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/signal/linux/signal_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sigdelset, (sigset_t * set, int signum)) {
if (set != nullptr && delete_signal(*set, signum))
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, sigdelset, (sigset_t * set, int signum)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/sigemptyset.cpp b/libc/src/signal/linux/sigemptyset.cpp
index d347477695e6c..d08191e8ce4e0 100644
--- a/libc/src/signal/linux/sigemptyset.cpp
+++ b/libc/src/signal/linux/sigemptyset.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/signal/sigemptyset.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/signal/linux/signal_utils.h"
@@ -15,7 +14,7 @@
#include <signal.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sigemptyset, (sigset_t * set)) {
if (!set) {
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, sigemptyset, (sigset_t * set)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/sigfillset.cpp b/libc/src/signal/linux/sigfillset.cpp
index 3e9897a03bb73..d98bbf7f619cc 100644
--- a/libc/src/signal/linux/sigfillset.cpp
+++ b/libc/src/signal/linux/sigfillset.cpp
@@ -10,11 +10,10 @@
#include "hdr/types/sigset_t.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/signal/linux/signal_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sigfillset, (sigset_t * set)) {
if (!set) {
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, sigfillset, (sigset_t * set)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/signal.cpp b/libc/src/signal/linux/signal.cpp
index 241258faf2e81..0d5463553eb78 100644
--- a/libc/src/signal/linux/signal.cpp
+++ b/libc/src/signal/linux/signal.cpp
@@ -9,10 +9,9 @@
#include "src/signal/signal.h"
#include "hdr/signal_macros.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/signal/sigaction.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(sighandler_t, signal, (int signum, sighandler_t handler)) {
struct sigaction action, old;
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(sighandler_t, signal, (int signum, sighandler_t handler)) {
: old.sa_handler;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/linux/signal_utils.h b/libc/src/signal/linux/signal_utils.h
index 81021276d784c..3fd0cc0b7b459 100644
--- a/libc/src/signal/linux/signal_utils.h
+++ b/libc/src/signal/linux/signal_utils.h
@@ -12,13 +12,12 @@
#include "hdr/types/sigset_t.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <signal.h> // sigaction
#include <stddef.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The POSIX definition of struct sigaction and the sigaction data structure
// expected by the rt_sigaction syscall differ in their definition. So, we
@@ -107,6 +106,6 @@ LIBC_INLINE int restore_signals(const sigset_t &set) {
&set, nullptr, sizeof(sigset_t));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_LINUX_SIGNAL_UTILS_H
diff --git a/libc/src/signal/linux/sigprocmask.cpp b/libc/src/signal/linux/sigprocmask.cpp
index 8838379ae5d30..0e94efb6400c0 100644
--- a/libc/src/signal/linux/sigprocmask.cpp
+++ b/libc/src/signal/linux/sigprocmask.cpp
@@ -11,13 +11,12 @@
#include "hdr/types/sigset_t.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/signal/linux/signal_utils.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sigprocmask,
(int how, const sigset_t *__restrict set,
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, sigprocmask,
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/signal/raise.h b/libc/src/signal/raise.h
index 8e6894c1a9053..ee4f3c9f826a9 100644
--- a/libc/src/signal/raise.h
+++ b/libc/src/signal/raise.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SIGNAL_RAISE_H
#define LLVM_LIBC_SRC_SIGNAL_RAISE_H
-#include "src/__support/macros/config.h"
#include <signal.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int raise(int sig);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_RAISE_H
diff --git a/libc/src/signal/sigaction.h b/libc/src/signal/sigaction.h
index 363be84a1cc2b..15b689b7dacc7 100644
--- a/libc/src/signal/sigaction.h
+++ b/libc/src/signal/sigaction.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_SRC_SIGNAL_SIGACTION_H
#include "hdr/types/struct_sigaction.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sigaction(int signal, const struct sigaction *__restrict libc_new,
struct sigaction *__restrict libc_old);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_SIGACTION_H
diff --git a/libc/src/signal/sigaddset.h b/libc/src/signal/sigaddset.h
index 057afaaf08d82..c703b46bc6059 100644
--- a/libc/src/signal/sigaddset.h
+++ b/libc/src/signal/sigaddset.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_SIGNAL_SIGADDSET_H
#include "hdr/types/sigset_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sigaddset(sigset_t *set, int signum);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_SIGADDSET_H
diff --git a/libc/src/signal/sigaltstack.h b/libc/src/signal/sigaltstack.h
index fc6ec356e5ef8..705bd368ce47b 100644
--- a/libc/src/signal/sigaltstack.h
+++ b/libc/src/signal/sigaltstack.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SIGNAL_SIGALTSTACK_H
#define LLVM_LIBC_SRC_SIGNAL_SIGALTSTACK_H
-#include "src/__support/macros/config.h"
#include <signal.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sigaltstack(const stack_t *__restrict ss, stack_t *__restrict oss);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_SIGALTSTACK_H
diff --git a/libc/src/signal/sigdelset.h b/libc/src/signal/sigdelset.h
index 27f831a8deab0..7bdb6e6d18fdd 100644
--- a/libc/src/signal/sigdelset.h
+++ b/libc/src/signal/sigdelset.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_SIGNAL_SIGDELSET_H
#include "hdr/types/sigset_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sigdelset(sigset_t *set, int signum);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_SIGDELSET_H
diff --git a/libc/src/signal/sigemptyset.h b/libc/src/signal/sigemptyset.h
index 886537644fe9a..661fd33b888e0 100644
--- a/libc/src/signal/sigemptyset.h
+++ b/libc/src/signal/sigemptyset.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_SIGNAL_SIGEMPTYSET_H
#include "hdr/types/sigset_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sigemptyset(sigset_t *set);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_SIGEMPTYSET_H
diff --git a/libc/src/signal/sigfillset.h b/libc/src/signal/sigfillset.h
index fdd1580979ecb..2849aacf953b1 100644
--- a/libc/src/signal/sigfillset.h
+++ b/libc/src/signal/sigfillset.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_SIGNAL_SIGFILLSET_H
#include "hdr/types/sigset_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sigfillset(sigset_t *set);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_SIGFILLSET_H
diff --git a/libc/src/signal/signal.h b/libc/src/signal/signal.h
index 2037305f8c11e..15bb5f01232ee 100644
--- a/libc/src/signal/signal.h
+++ b/libc/src/signal/signal.h
@@ -9,15 +9,14 @@
#ifndef LLVM_LIBC_SRC_SIGNAL_SIGNAL_H
#define LLVM_LIBC_SRC_SIGNAL_SIGNAL_H
-#include "src/__support/macros/config.h"
#include <signal.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using sighandler_t = __sighandler_t;
sighandler_t signal(int signum, sighandler_t handler);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_SIGNAL_H
diff --git a/libc/src/signal/sigprocmask.h b/libc/src/signal/sigprocmask.h
index 9b12846268eac..8569578eb68ca 100644
--- a/libc/src/signal/sigprocmask.h
+++ b/libc/src/signal/sigprocmask.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_SRC_SIGNAL_SIGPROCMASK_H
#include "hdr/types/sigset_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sigprocmask(int how, const sigset_t *__restrict set,
sigset_t *__restrict oldset);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SIGNAL_SIGPROCMASK_H
diff --git a/libc/src/spawn/file_actions.h b/libc/src/spawn/file_actions.h
index 80b92959c6a43..7113256bf49cb 100644
--- a/libc/src/spawn/file_actions.h
+++ b/libc/src/spawn/file_actions.h
@@ -9,11 +9,10 @@
#ifndef LLVM_LIBC_SRC_SPAWN_FILE_ACTIONS_H
#define LLVM_LIBC_SRC_SPAWN_FILE_ACTIONS_H
-#include "src/__support/macros/config.h"
#include <spawn.h> // For mode_t
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct BaseSpawnFileAction {
enum ActionType {
@@ -68,6 +67,6 @@ struct SpawnFileDup2Action : public BaseSpawnFileAction {
newfd(new_fdesc) {}
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SPAWN_FILE_ACTIONS_H
diff --git a/libc/src/spawn/linux/posix_spawn.cpp b/libc/src/spawn/linux/posix_spawn.cpp
index 4c0469b3ce384..0a0467df4959e 100644
--- a/libc/src/spawn/linux/posix_spawn.cpp
+++ b/libc/src/spawn/linux/posix_spawn.cpp
@@ -11,7 +11,6 @@
#include "src/__support/CPP/optional.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/spawn/file_actions.h"
#include <fcntl.h>
@@ -19,7 +18,7 @@
#include <spawn.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -146,4 +145,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/spawn/posix_spawn.h b/libc/src/spawn/posix_spawn.h
index d521c2a53fc85..354b94c2d2d73 100644
--- a/libc/src/spawn/posix_spawn.h
+++ b/libc/src/spawn/posix_spawn.h
@@ -9,16 +9,15 @@
#ifndef LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_H
#define LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_H
-#include "src/__support/macros/config.h"
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int posix_spawn(pid_t *__restrict pid, const char *__restrict path,
const posix_spawn_file_actions_t *file_actions,
const posix_spawnattr_t *__restrict attr,
char *const *__restrict argv, char *const *__restrict envp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_H
diff --git a/libc/src/spawn/posix_spawn_file_actions_addclose.cpp b/libc/src/spawn/posix_spawn_file_actions_addclose.cpp
index e43af8f665f95..9b3c4885dfd77 100644
--- a/libc/src/spawn/posix_spawn_file_actions_addclose.cpp
+++ b/libc/src/spawn/posix_spawn_file_actions_addclose.cpp
@@ -11,12 +11,11 @@
#include "file_actions.h"
#include "src/__support/CPP/new.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_addclose,
(posix_spawn_file_actions_t *__restrict actions, int fd)) {
@@ -34,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_addclose,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/spawn/posix_spawn_file_actions_addclose.h b/libc/src/spawn/posix_spawn_file_actions_addclose.h
index 8d4c4eda39846..c84965180fa7a 100644
--- a/libc/src/spawn/posix_spawn_file_actions_addclose.h
+++ b/libc/src/spawn/posix_spawn_file_actions_addclose.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE_H
#define LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE_H
-#include "src/__support/macros/config.h"
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int posix_spawn_file_actions_addclose(
posix_spawn_file_actions_t *__restrict actions, int fd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE_H
diff --git a/libc/src/spawn/posix_spawn_file_actions_adddup2.cpp b/libc/src/spawn/posix_spawn_file_actions_adddup2.cpp
index 9f28ffa48bee0..caa558e2a9a5f 100644
--- a/libc/src/spawn/posix_spawn_file_actions_adddup2.cpp
+++ b/libc/src/spawn/posix_spawn_file_actions_adddup2.cpp
@@ -11,12 +11,11 @@
#include "file_actions.h"
#include "src/__support/CPP/new.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_adddup2,
(posix_spawn_file_actions_t * actions, int fd, int newfd)) {
@@ -34,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_adddup2,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/spawn/posix_spawn_file_actions_adddup2.h b/libc/src/spawn/posix_spawn_file_actions_adddup2.h
index 1cbf3dc595794..7a7f3a5fb5bfd 100644
--- a/libc/src/spawn/posix_spawn_file_actions_adddup2.h
+++ b/libc/src/spawn/posix_spawn_file_actions_adddup2.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2_H
#define LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2_H
-#include "src/__support/macros/config.h"
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *actions,
int fd, int newfd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2_H
diff --git a/libc/src/spawn/posix_spawn_file_actions_addopen.cpp b/libc/src/spawn/posix_spawn_file_actions_addopen.cpp
index 7f9286099573e..c544f04bd54ae 100644
--- a/libc/src/spawn/posix_spawn_file_actions_addopen.cpp
+++ b/libc/src/spawn/posix_spawn_file_actions_addopen.cpp
@@ -11,12 +11,11 @@
#include "file_actions.h"
#include "src/__support/CPP/new.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_addopen,
(posix_spawn_file_actions_t *__restrict actions, int fd,
@@ -35,4 +34,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_addopen,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/spawn/posix_spawn_file_actions_addopen.h b/libc/src/spawn/posix_spawn_file_actions_addopen.h
index d51434ced4350..121213abe50f8 100644
--- a/libc/src/spawn/posix_spawn_file_actions_addopen.h
+++ b/libc/src/spawn/posix_spawn_file_actions_addopen.h
@@ -9,15 +9,14 @@
#ifndef LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN_H
#define LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN_H
-#include "src/__support/macros/config.h"
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int posix_spawn_file_actions_addopen(
posix_spawn_file_actions_t *__restrict actions, int fd,
const char *__restrict path, int oflag, mode_t mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN_H
diff --git a/libc/src/spawn/posix_spawn_file_actions_destroy.cpp b/libc/src/spawn/posix_spawn_file_actions_destroy.cpp
index 155e4c6a3b2be..73e0ac828cd69 100644
--- a/libc/src/spawn/posix_spawn_file_actions_destroy.cpp
+++ b/libc/src/spawn/posix_spawn_file_actions_destroy.cpp
@@ -11,12 +11,11 @@
#include "file_actions.h"
#include "src/__support/CPP/new.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <errno.h>
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_destroy,
(posix_spawn_file_actions_t * actions)) {
@@ -50,4 +49,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_destroy,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/spawn/posix_spawn_file_actions_destroy.h b/libc/src/spawn/posix_spawn_file_actions_destroy.h
index 7bbcfc3a51ea7..28b9b05b9e79a 100644
--- a/libc/src/spawn/posix_spawn_file_actions_destroy.h
+++ b/libc/src/spawn/posix_spawn_file_actions_destroy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_DESTROY_H
#define LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_DESTROY_H
-#include "src/__support/macros/config.h"
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *actions);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_DESTROY_H
diff --git a/libc/src/spawn/posix_spawn_file_actions_init.cpp b/libc/src/spawn/posix_spawn_file_actions_init.cpp
index 14242fcf11779..04e5610c717c6 100644
--- a/libc/src/spawn/posix_spawn_file_actions_init.cpp
+++ b/libc/src/spawn/posix_spawn_file_actions_init.cpp
@@ -9,11 +9,10 @@
#include "posix_spawn_file_actions_init.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_init,
(posix_spawn_file_actions_t * actions)) {
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_init,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/spawn/posix_spawn_file_actions_init.h b/libc/src/spawn/posix_spawn_file_actions_init.h
index 79451400ed001..d7b228fff08d0 100644
--- a/libc/src/spawn/posix_spawn_file_actions_init.h
+++ b/libc/src/spawn/posix_spawn_file_actions_init.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_INIT_H
#define LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_INIT_H
-#include "src/__support/macros/config.h"
#include <spawn.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int posix_spawn_file_actions_init(posix_spawn_file_actions_t *actions);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_INIT_H
diff --git a/libc/src/stdbit/stdc_bit_ceil_uc.cpp b/libc/src/stdbit/stdc_bit_ceil_uc.cpp
index 8febabf0415df..675ae4a0edb02 100644
--- a/libc/src/stdbit/stdc_bit_ceil_uc.cpp
+++ b/libc/src/stdbit/stdc_bit_ceil_uc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned char, stdc_bit_ceil_uc, (unsigned char value)) {
return cpp::bit_ceil(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_ceil_uc.h b/libc/src/stdbit/stdc_bit_ceil_uc.h
index 211073c246bb1..204261e410812 100644
--- a/libc/src/stdbit/stdc_bit_ceil_uc.h
+++ b/libc/src/stdbit/stdc_bit_ceil_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned char stdc_bit_ceil_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_UC_H
diff --git a/libc/src/stdbit/stdc_bit_ceil_ui.cpp b/libc/src/stdbit/stdc_bit_ceil_ui.cpp
index 257adcdb94a4c..a8ac9726179bc 100644
--- a/libc/src/stdbit/stdc_bit_ceil_ui.cpp
+++ b/libc/src/stdbit/stdc_bit_ceil_ui.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_bit_ceil_ui, (unsigned value)) {
return cpp::bit_ceil(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_ceil_ui.h b/libc/src/stdbit/stdc_bit_ceil_ui.h
index d2da377accfce..db66c336e3662 100644
--- a/libc/src/stdbit/stdc_bit_ceil_ui.h
+++ b/libc/src/stdbit/stdc_bit_ceil_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_bit_ceil_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_UI_H
diff --git a/libc/src/stdbit/stdc_bit_ceil_ul.cpp b/libc/src/stdbit/stdc_bit_ceil_ul.cpp
index 7b2455958cb88..18a9c38b5b4cf 100644
--- a/libc/src/stdbit/stdc_bit_ceil_ul.cpp
+++ b/libc/src/stdbit/stdc_bit_ceil_ul.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned long, stdc_bit_ceil_ul, (unsigned long value)) {
return cpp::bit_ceil(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_ceil_ul.h b/libc/src/stdbit/stdc_bit_ceil_ul.h
index fe22d79fbe65f..f8393a42fcbfc 100644
--- a/libc/src/stdbit/stdc_bit_ceil_ul.h
+++ b/libc/src/stdbit/stdc_bit_ceil_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long stdc_bit_ceil_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_UL_H
diff --git a/libc/src/stdbit/stdc_bit_ceil_ull.cpp b/libc/src/stdbit/stdc_bit_ceil_ull.cpp
index dd94da4855248..0989f36ab7685 100644
--- a/libc/src/stdbit/stdc_bit_ceil_ull.cpp
+++ b/libc/src/stdbit/stdc_bit_ceil_ull.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned long long, stdc_bit_ceil_ull,
(unsigned long long value)) {
return cpp::bit_ceil(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_ceil_ull.h b/libc/src/stdbit/stdc_bit_ceil_ull.h
index 80a6d3c474b51..e65f537efb172 100644
--- a/libc/src/stdbit/stdc_bit_ceil_ull.h
+++ b/libc/src/stdbit/stdc_bit_ceil_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long long stdc_bit_ceil_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_ULL_H
diff --git a/libc/src/stdbit/stdc_bit_ceil_us.cpp b/libc/src/stdbit/stdc_bit_ceil_us.cpp
index 4d35e18bb5d4a..f86a216bb840e 100644
--- a/libc/src/stdbit/stdc_bit_ceil_us.cpp
+++ b/libc/src/stdbit/stdc_bit_ceil_us.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned short, stdc_bit_ceil_us, (unsigned short value)) {
return cpp::bit_ceil(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_ceil_us.h b/libc/src/stdbit/stdc_bit_ceil_us.h
index 6001e7afdcd1f..16a14e51b7433 100644
--- a/libc/src/stdbit/stdc_bit_ceil_us.h
+++ b/libc/src/stdbit/stdc_bit_ceil_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned short stdc_bit_ceil_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_CEIL_US_H
diff --git a/libc/src/stdbit/stdc_bit_floor_uc.cpp b/libc/src/stdbit/stdc_bit_floor_uc.cpp
index 54959ecd3cf4f..6cb04c9eb43e6 100644
--- a/libc/src/stdbit/stdc_bit_floor_uc.cpp
+++ b/libc/src/stdbit/stdc_bit_floor_uc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned char, stdc_bit_floor_uc, (unsigned char value)) {
return cpp::bit_floor(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_floor_uc.h b/libc/src/stdbit/stdc_bit_floor_uc.h
index baa4af8904be8..d6f53c5f69979 100644
--- a/libc/src/stdbit/stdc_bit_floor_uc.h
+++ b/libc/src/stdbit/stdc_bit_floor_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned char stdc_bit_floor_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_UC_H
diff --git a/libc/src/stdbit/stdc_bit_floor_ui.cpp b/libc/src/stdbit/stdc_bit_floor_ui.cpp
index a3458bc4061e8..149b63f190cf3 100644
--- a/libc/src/stdbit/stdc_bit_floor_ui.cpp
+++ b/libc/src/stdbit/stdc_bit_floor_ui.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_bit_floor_ui, (unsigned value)) {
return cpp::bit_floor(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_floor_ui.h b/libc/src/stdbit/stdc_bit_floor_ui.h
index aaf9c7383fa27..fcc606386f86d 100644
--- a/libc/src/stdbit/stdc_bit_floor_ui.h
+++ b/libc/src/stdbit/stdc_bit_floor_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_bit_floor_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_UI_H
diff --git a/libc/src/stdbit/stdc_bit_floor_ul.cpp b/libc/src/stdbit/stdc_bit_floor_ul.cpp
index 3f28bee5b638f..a29a044545684 100644
--- a/libc/src/stdbit/stdc_bit_floor_ul.cpp
+++ b/libc/src/stdbit/stdc_bit_floor_ul.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned long, stdc_bit_floor_ul, (unsigned long value)) {
return cpp::bit_floor(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_floor_ul.h b/libc/src/stdbit/stdc_bit_floor_ul.h
index 20ab34e0ed83d..08327aa60c906 100644
--- a/libc/src/stdbit/stdc_bit_floor_ul.h
+++ b/libc/src/stdbit/stdc_bit_floor_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long stdc_bit_floor_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_UL_H
diff --git a/libc/src/stdbit/stdc_bit_floor_ull.cpp b/libc/src/stdbit/stdc_bit_floor_ull.cpp
index 5470045d261d4..d1084b6357322 100644
--- a/libc/src/stdbit/stdc_bit_floor_ull.cpp
+++ b/libc/src/stdbit/stdc_bit_floor_ull.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned long long, stdc_bit_floor_ull,
(unsigned long long value)) {
return cpp::bit_floor(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_floor_ull.h b/libc/src/stdbit/stdc_bit_floor_ull.h
index 4c49a07480767..8f360b23855ad 100644
--- a/libc/src/stdbit/stdc_bit_floor_ull.h
+++ b/libc/src/stdbit/stdc_bit_floor_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long long stdc_bit_floor_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_ULL_H
diff --git a/libc/src/stdbit/stdc_bit_floor_us.cpp b/libc/src/stdbit/stdc_bit_floor_us.cpp
index a4f3929344525..d1357a980e3a8 100644
--- a/libc/src/stdbit/stdc_bit_floor_us.cpp
+++ b/libc/src/stdbit/stdc_bit_floor_us.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned short, stdc_bit_floor_us, (unsigned short value)) {
return cpp::bit_floor(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_floor_us.h b/libc/src/stdbit/stdc_bit_floor_us.h
index 1494013c715e8..fcd0b9e3c549a 100644
--- a/libc/src/stdbit/stdc_bit_floor_us.h
+++ b/libc/src/stdbit/stdc_bit_floor_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned short stdc_bit_floor_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_FLOOR_US_H
diff --git a/libc/src/stdbit/stdc_bit_width_uc.cpp b/libc/src/stdbit/stdc_bit_width_uc.cpp
index 71894bfd799cd..2c361c1bbb1cf 100644
--- a/libc/src/stdbit/stdc_bit_width_uc.cpp
+++ b/libc/src/stdbit/stdc_bit_width_uc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_bit_width_uc, (unsigned char value)) {
return static_cast<unsigned>(cpp::bit_width(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_width_uc.h b/libc/src/stdbit/stdc_bit_width_uc.h
index 869cce2a6458a..70c038aaf1dfe 100644
--- a/libc/src/stdbit/stdc_bit_width_uc.h
+++ b/libc/src/stdbit/stdc_bit_width_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_bit_width_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_UC_H
diff --git a/libc/src/stdbit/stdc_bit_width_ui.cpp b/libc/src/stdbit/stdc_bit_width_ui.cpp
index c073e752fd2f9..b94452b09bd50 100644
--- a/libc/src/stdbit/stdc_bit_width_ui.cpp
+++ b/libc/src/stdbit/stdc_bit_width_ui.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_bit_width_ui, (unsigned value)) {
return static_cast<unsigned>(cpp::bit_width(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_width_ui.h b/libc/src/stdbit/stdc_bit_width_ui.h
index 71cfb36c5db0c..9e8de3d6ef46e 100644
--- a/libc/src/stdbit/stdc_bit_width_ui.h
+++ b/libc/src/stdbit/stdc_bit_width_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_bit_width_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_UI_H
diff --git a/libc/src/stdbit/stdc_bit_width_ul.cpp b/libc/src/stdbit/stdc_bit_width_ul.cpp
index 69630d95cc620..80044314e4b21 100644
--- a/libc/src/stdbit/stdc_bit_width_ul.cpp
+++ b/libc/src/stdbit/stdc_bit_width_ul.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_bit_width_ul, (unsigned long value)) {
return static_cast<unsigned>(cpp::bit_width(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_width_ul.h b/libc/src/stdbit/stdc_bit_width_ul.h
index e13e3be79ed26..447a2918e2f2b 100644
--- a/libc/src/stdbit/stdc_bit_width_ul.h
+++ b/libc/src/stdbit/stdc_bit_width_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_bit_width_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_UL_H
diff --git a/libc/src/stdbit/stdc_bit_width_ull.cpp b/libc/src/stdbit/stdc_bit_width_ull.cpp
index b720b45d1620a..006fa20b2de5e 100644
--- a/libc/src/stdbit/stdc_bit_width_ull.cpp
+++ b/libc/src/stdbit/stdc_bit_width_ull.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_bit_width_ull, (unsigned long long value)) {
return static_cast<unsigned>(cpp::bit_width(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_width_ull.h b/libc/src/stdbit/stdc_bit_width_ull.h
index 91c935a185ba0..bc51897f448fc 100644
--- a/libc/src/stdbit/stdc_bit_width_ull.h
+++ b/libc/src/stdbit/stdc_bit_width_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_bit_width_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_ULL_H
diff --git a/libc/src/stdbit/stdc_bit_width_us.cpp b/libc/src/stdbit/stdc_bit_width_us.cpp
index ba004817b84a2..3d9f72bf5d060 100644
--- a/libc/src/stdbit/stdc_bit_width_us.cpp
+++ b/libc/src/stdbit/stdc_bit_width_us.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_bit_width_us, (unsigned short value)) {
return static_cast<unsigned>(cpp::bit_width(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_bit_width_us.h b/libc/src/stdbit/stdc_bit_width_us.h
index 3d9bfe9242bac..02cd37426eb4c 100644
--- a/libc/src/stdbit/stdc_bit_width_us.h
+++ b/libc/src/stdbit/stdc_bit_width_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_bit_width_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_BIT_WIDTH_US_H
diff --git a/libc/src/stdbit/stdc_count_ones_uc.cpp b/libc/src/stdbit/stdc_count_ones_uc.cpp
index 9df8bcda9ca0a..1e998ff521b7d 100644
--- a/libc/src/stdbit/stdc_count_ones_uc.cpp
+++ b/libc/src/stdbit/stdc_count_ones_uc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_ones_uc, (unsigned char value)) {
return static_cast<unsigned>(cpp::popcount(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_ones_uc.h b/libc/src/stdbit/stdc_count_ones_uc.h
index c982d0b04ed16..eed3ee5f181b6 100644
--- a/libc/src/stdbit/stdc_count_ones_uc.h
+++ b/libc/src/stdbit/stdc_count_ones_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_ones_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_UC_H
diff --git a/libc/src/stdbit/stdc_count_ones_ui.cpp b/libc/src/stdbit/stdc_count_ones_ui.cpp
index 9b012e281cb7e..e457dd793db33 100644
--- a/libc/src/stdbit/stdc_count_ones_ui.cpp
+++ b/libc/src/stdbit/stdc_count_ones_ui.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_ones_ui, (unsigned value)) {
return static_cast<unsigned>(cpp::popcount(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_ones_ui.h b/libc/src/stdbit/stdc_count_ones_ui.h
index f5bc2db004292..1f7ccb9c502f6 100644
--- a/libc/src/stdbit/stdc_count_ones_ui.h
+++ b/libc/src/stdbit/stdc_count_ones_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_ones_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_UI_H
diff --git a/libc/src/stdbit/stdc_count_ones_ul.cpp b/libc/src/stdbit/stdc_count_ones_ul.cpp
index ac30c9ecac74c..ed86653fc7ee2 100644
--- a/libc/src/stdbit/stdc_count_ones_ul.cpp
+++ b/libc/src/stdbit/stdc_count_ones_ul.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_ones_ul, (unsigned long value)) {
return static_cast<unsigned>(cpp::popcount(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_ones_ul.h b/libc/src/stdbit/stdc_count_ones_ul.h
index 014a15569f6dd..bde349a2fb94f 100644
--- a/libc/src/stdbit/stdc_count_ones_ul.h
+++ b/libc/src/stdbit/stdc_count_ones_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_ones_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_UL_H
diff --git a/libc/src/stdbit/stdc_count_ones_ull.cpp b/libc/src/stdbit/stdc_count_ones_ull.cpp
index d27d0d3e11660..c5ecc3cda6477 100644
--- a/libc/src/stdbit/stdc_count_ones_ull.cpp
+++ b/libc/src/stdbit/stdc_count_ones_ull.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_ones_ull, (unsigned long long value)) {
return static_cast<unsigned>(cpp::popcount(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_ones_ull.h b/libc/src/stdbit/stdc_count_ones_ull.h
index 652e8d1856562..830239f8874b0 100644
--- a/libc/src/stdbit/stdc_count_ones_ull.h
+++ b/libc/src/stdbit/stdc_count_ones_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_ones_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_ULL_H
diff --git a/libc/src/stdbit/stdc_count_ones_us.cpp b/libc/src/stdbit/stdc_count_ones_us.cpp
index 9b925bad6093d..465c5c374e7c6 100644
--- a/libc/src/stdbit/stdc_count_ones_us.cpp
+++ b/libc/src/stdbit/stdc_count_ones_us.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_ones_us, (unsigned short value)) {
return static_cast<unsigned>(cpp::popcount(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_ones_us.h b/libc/src/stdbit/stdc_count_ones_us.h
index 24485ddb75cbe..08fd4e76eaae6 100644
--- a/libc/src/stdbit/stdc_count_ones_us.h
+++ b/libc/src/stdbit/stdc_count_ones_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_ones_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ONES_US_H
diff --git a/libc/src/stdbit/stdc_count_zeros_uc.cpp b/libc/src/stdbit/stdc_count_zeros_uc.cpp
index ab5f0f39fed08..309ebb55e0fac 100644
--- a/libc/src/stdbit/stdc_count_zeros_uc.cpp
+++ b/libc/src/stdbit/stdc_count_zeros_uc.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_count_zeros_uc.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_zeros_uc, (unsigned char value)) {
return static_cast<unsigned>(count_zeros(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_zeros_uc.h b/libc/src/stdbit/stdc_count_zeros_uc.h
index 12f754bed34cd..34b4636ee3f9e 100644
--- a/libc/src/stdbit/stdc_count_zeros_uc.h
+++ b/libc/src/stdbit/stdc_count_zeros_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_zeros_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_UC_H
diff --git a/libc/src/stdbit/stdc_count_zeros_ui.cpp b/libc/src/stdbit/stdc_count_zeros_ui.cpp
index 28efc544bb888..31ea907b24de8 100644
--- a/libc/src/stdbit/stdc_count_zeros_ui.cpp
+++ b/libc/src/stdbit/stdc_count_zeros_ui.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_count_zeros_ui.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_zeros_ui, (unsigned value)) {
return static_cast<unsigned>(count_zeros(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_zeros_ui.h b/libc/src/stdbit/stdc_count_zeros_ui.h
index df3562ff59cec..48e8630f6f097 100644
--- a/libc/src/stdbit/stdc_count_zeros_ui.h
+++ b/libc/src/stdbit/stdc_count_zeros_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_zeros_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_UI_H
diff --git a/libc/src/stdbit/stdc_count_zeros_ul.cpp b/libc/src/stdbit/stdc_count_zeros_ul.cpp
index 25c9b8d7782ff..f5df5c49f1312 100644
--- a/libc/src/stdbit/stdc_count_zeros_ul.cpp
+++ b/libc/src/stdbit/stdc_count_zeros_ul.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_count_zeros_ul.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_zeros_ul, (unsigned long value)) {
return static_cast<unsigned>(count_zeros(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_zeros_ul.h b/libc/src/stdbit/stdc_count_zeros_ul.h
index 962eed53fea5b..b88387741adef 100644
--- a/libc/src/stdbit/stdc_count_zeros_ul.h
+++ b/libc/src/stdbit/stdc_count_zeros_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_zeros_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_UL_H
diff --git a/libc/src/stdbit/stdc_count_zeros_ull.cpp b/libc/src/stdbit/stdc_count_zeros_ull.cpp
index c0d641e94754f..6a9c8f04a799f 100644
--- a/libc/src/stdbit/stdc_count_zeros_ull.cpp
+++ b/libc/src/stdbit/stdc_count_zeros_ull.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_count_zeros_ull.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_zeros_ull, (unsigned long long value)) {
return static_cast<unsigned>(count_zeros(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_zeros_ull.h b/libc/src/stdbit/stdc_count_zeros_ull.h
index 3db13a16fa68e..e15b33011ab7f 100644
--- a/libc/src/stdbit/stdc_count_zeros_ull.h
+++ b/libc/src/stdbit/stdc_count_zeros_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_zeros_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_ULL_H
diff --git a/libc/src/stdbit/stdc_count_zeros_us.cpp b/libc/src/stdbit/stdc_count_zeros_us.cpp
index fb352b049933c..c08186ec6e87c 100644
--- a/libc/src/stdbit/stdc_count_zeros_us.cpp
+++ b/libc/src/stdbit/stdc_count_zeros_us.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_count_zeros_us.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_count_zeros_us, (unsigned short value)) {
return static_cast<unsigned>(count_zeros(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_count_zeros_us.h b/libc/src/stdbit/stdc_count_zeros_us.h
index 9e0f252a52b46..d422377f076bc 100644
--- a/libc/src/stdbit/stdc_count_zeros_us.h
+++ b/libc/src/stdbit/stdc_count_zeros_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_count_zeros_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_COUNT_ZEROS_US_H
diff --git a/libc/src/stdbit/stdc_first_leading_one_uc.cpp b/libc/src/stdbit/stdc_first_leading_one_uc.cpp
index 0d73f5c8e8f4d..2e28ed3bb6f82 100644
--- a/libc/src/stdbit/stdc_first_leading_one_uc.cpp
+++ b/libc/src/stdbit/stdc_first_leading_one_uc.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_first_leading_one_uc.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_one_uc, (unsigned char value)) {
return static_cast<unsigned>(first_leading_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_one_uc.h b/libc/src/stdbit/stdc_first_leading_one_uc.h
index bc1025b797ccb..58892c3f0ff29 100644
--- a/libc/src/stdbit/stdc_first_leading_one_uc.h
+++ b/libc/src/stdbit/stdc_first_leading_one_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_one_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_UC_H
diff --git a/libc/src/stdbit/stdc_first_leading_one_ui.cpp b/libc/src/stdbit/stdc_first_leading_one_ui.cpp
index cd33a1943c7ae..a07a39b09d9f4 100644
--- a/libc/src/stdbit/stdc_first_leading_one_ui.cpp
+++ b/libc/src/stdbit/stdc_first_leading_one_ui.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_first_leading_one_ui.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_one_ui, (unsigned value)) {
return static_cast<unsigned>(first_leading_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_one_ui.h b/libc/src/stdbit/stdc_first_leading_one_ui.h
index f1687aca659a3..613adf4e1ff76 100644
--- a/libc/src/stdbit/stdc_first_leading_one_ui.h
+++ b/libc/src/stdbit/stdc_first_leading_one_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_one_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_UI_H
diff --git a/libc/src/stdbit/stdc_first_leading_one_ul.cpp b/libc/src/stdbit/stdc_first_leading_one_ul.cpp
index a7a74535f3f0d..4350fb7826b49 100644
--- a/libc/src/stdbit/stdc_first_leading_one_ul.cpp
+++ b/libc/src/stdbit/stdc_first_leading_one_ul.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_first_leading_one_ul.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_one_ul, (unsigned long value)) {
return static_cast<unsigned>(first_leading_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_one_ul.h b/libc/src/stdbit/stdc_first_leading_one_ul.h
index 53e02f274daf3..47c179f3fbacd 100644
--- a/libc/src/stdbit/stdc_first_leading_one_ul.h
+++ b/libc/src/stdbit/stdc_first_leading_one_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_one_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_UL_H
diff --git a/libc/src/stdbit/stdc_first_leading_one_ull.cpp b/libc/src/stdbit/stdc_first_leading_one_ull.cpp
index 07d73300df8f5..57a5ae368e11a 100644
--- a/libc/src/stdbit/stdc_first_leading_one_ull.cpp
+++ b/libc/src/stdbit/stdc_first_leading_one_ull.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_leading_one_ull.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_one_ull,
(unsigned long long value)) {
return static_cast<unsigned>(first_leading_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_one_ull.h b/libc/src/stdbit/stdc_first_leading_one_ull.h
index 96dc8c42688a4..344d03f7100f4 100644
--- a/libc/src/stdbit/stdc_first_leading_one_ull.h
+++ b/libc/src/stdbit/stdc_first_leading_one_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_one_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_ULL_H
diff --git a/libc/src/stdbit/stdc_first_leading_one_us.cpp b/libc/src/stdbit/stdc_first_leading_one_us.cpp
index 4c88abdac2ffd..f14433b13f350 100644
--- a/libc/src/stdbit/stdc_first_leading_one_us.cpp
+++ b/libc/src/stdbit/stdc_first_leading_one_us.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_leading_one_us.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_one_us,
(unsigned short value)) {
return static_cast<unsigned>(first_leading_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_one_us.h b/libc/src/stdbit/stdc_first_leading_one_us.h
index c213c3df3b792..9d5feaf1e92f0 100644
--- a/libc/src/stdbit/stdc_first_leading_one_us.h
+++ b/libc/src/stdbit/stdc_first_leading_one_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_one_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ONE_US_H
diff --git a/libc/src/stdbit/stdc_first_leading_zero_uc.cpp b/libc/src/stdbit/stdc_first_leading_zero_uc.cpp
index 03371357ee251..6e2164256f172 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_uc.cpp
+++ b/libc/src/stdbit/stdc_first_leading_zero_uc.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_leading_zero_uc.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_zero_uc,
(unsigned char value)) {
return static_cast<unsigned>(first_leading_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_zero_uc.h b/libc/src/stdbit/stdc_first_leading_zero_uc.h
index e20cf307c05c0..63ecd20acc618 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_uc.h
+++ b/libc/src/stdbit/stdc_first_leading_zero_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_zero_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_UC_H
diff --git a/libc/src/stdbit/stdc_first_leading_zero_ui.cpp b/libc/src/stdbit/stdc_first_leading_zero_ui.cpp
index c9e55e67a3738..cb733a94c0d84 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_ui.cpp
+++ b/libc/src/stdbit/stdc_first_leading_zero_ui.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_first_leading_zero_ui.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_zero_ui, (unsigned value)) {
return static_cast<unsigned>(first_leading_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_zero_ui.h b/libc/src/stdbit/stdc_first_leading_zero_ui.h
index 204901ebf0a9a..d8d5d9345010f 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_ui.h
+++ b/libc/src/stdbit/stdc_first_leading_zero_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_zero_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_UI_H
diff --git a/libc/src/stdbit/stdc_first_leading_zero_ul.cpp b/libc/src/stdbit/stdc_first_leading_zero_ul.cpp
index cb5231cbf3439..8a3930a271ed9 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_ul.cpp
+++ b/libc/src/stdbit/stdc_first_leading_zero_ul.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_leading_zero_ul.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_zero_ul,
(unsigned long value)) {
return static_cast<unsigned>(first_leading_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_zero_ul.h b/libc/src/stdbit/stdc_first_leading_zero_ul.h
index f0d2b3285bffc..8df1b55c2c3aa 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_ul.h
+++ b/libc/src/stdbit/stdc_first_leading_zero_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_zero_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_UL_H
diff --git a/libc/src/stdbit/stdc_first_leading_zero_ull.cpp b/libc/src/stdbit/stdc_first_leading_zero_ull.cpp
index 65591433c0309..5a69197a82996 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_ull.cpp
+++ b/libc/src/stdbit/stdc_first_leading_zero_ull.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_leading_zero_ull.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_zero_ull,
(unsigned long long value)) {
return static_cast<unsigned>(first_leading_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_zero_ull.h b/libc/src/stdbit/stdc_first_leading_zero_ull.h
index 6cdb1790b5dec..9aec5e7e55453 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_ull.h
+++ b/libc/src/stdbit/stdc_first_leading_zero_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_zero_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_ULL_H
diff --git a/libc/src/stdbit/stdc_first_leading_zero_us.cpp b/libc/src/stdbit/stdc_first_leading_zero_us.cpp
index 25c3d892d38cc..6482c8654db3b 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_us.cpp
+++ b/libc/src/stdbit/stdc_first_leading_zero_us.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_leading_zero_us.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_leading_zero_us,
(unsigned short value)) {
return static_cast<unsigned>(first_leading_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_leading_zero_us.h b/libc/src/stdbit/stdc_first_leading_zero_us.h
index eacd406c8f645..8587378069ce1 100644
--- a/libc/src/stdbit/stdc_first_leading_zero_us.h
+++ b/libc/src/stdbit/stdc_first_leading_zero_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_leading_zero_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_LEADING_ZERO_US_H
diff --git a/libc/src/stdbit/stdc_first_trailing_one_uc.cpp b/libc/src/stdbit/stdc_first_trailing_one_uc.cpp
index cd880241aa6bf..d3e8825eef00f 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_uc.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_one_uc.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_trailing_one_uc.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_one_uc,
(unsigned char value)) {
return static_cast<unsigned>(first_trailing_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_one_uc.h b/libc/src/stdbit/stdc_first_trailing_one_uc.h
index b54ca47bf7f7c..d733ce850de0f 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_uc.h
+++ b/libc/src/stdbit/stdc_first_trailing_one_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_one_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_UC_H
diff --git a/libc/src/stdbit/stdc_first_trailing_one_ui.cpp b/libc/src/stdbit/stdc_first_trailing_one_ui.cpp
index 03233d5fefcb3..842bd69950501 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_ui.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_one_ui.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_first_trailing_one_ui.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_one_ui, (unsigned value)) {
return static_cast<unsigned>(first_trailing_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_one_ui.h b/libc/src/stdbit/stdc_first_trailing_one_ui.h
index be3eaf81312cd..6a6a5046709ae 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_ui.h
+++ b/libc/src/stdbit/stdc_first_trailing_one_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_one_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_UI_H
diff --git a/libc/src/stdbit/stdc_first_trailing_one_ul.cpp b/libc/src/stdbit/stdc_first_trailing_one_ul.cpp
index 0e5080d622b34..0497d1d77811e 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_ul.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_one_ul.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_trailing_one_ul.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_one_ul,
(unsigned long value)) {
return static_cast<unsigned>(first_trailing_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_one_ul.h b/libc/src/stdbit/stdc_first_trailing_one_ul.h
index c0ad0da50fb3b..09b6a9bbbe34a 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_ul.h
+++ b/libc/src/stdbit/stdc_first_trailing_one_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_one_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_UL_H
diff --git a/libc/src/stdbit/stdc_first_trailing_one_ull.cpp b/libc/src/stdbit/stdc_first_trailing_one_ull.cpp
index 3336983cbfcd0..6e062dd27cdd6 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_ull.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_one_ull.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_trailing_one_ull.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_one_ull,
(unsigned long long value)) {
return static_cast<unsigned>(first_trailing_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_one_ull.h b/libc/src/stdbit/stdc_first_trailing_one_ull.h
index 7cf961cc4abef..3e12a1d745669 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_ull.h
+++ b/libc/src/stdbit/stdc_first_trailing_one_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_one_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_ULL_H
diff --git a/libc/src/stdbit/stdc_first_trailing_one_us.cpp b/libc/src/stdbit/stdc_first_trailing_one_us.cpp
index 01cf247441dc8..e90158f102049 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_us.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_one_us.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_trailing_one_us.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_one_us,
(unsigned short value)) {
return static_cast<unsigned>(first_trailing_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_one_us.h b/libc/src/stdbit/stdc_first_trailing_one_us.h
index 24b1db50717d3..f380898fc68cd 100644
--- a/libc/src/stdbit/stdc_first_trailing_one_us.h
+++ b/libc/src/stdbit/stdc_first_trailing_one_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_one_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ONE_US_H
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_uc.cpp b/libc/src/stdbit/stdc_first_trailing_zero_uc.cpp
index 617839b18cf95..a6939f6286b34 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_uc.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_zero_uc.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_trailing_zero_uc.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_zero_uc,
(unsigned char value)) {
return static_cast<unsigned>(first_trailing_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_uc.h b/libc/src/stdbit/stdc_first_trailing_zero_uc.h
index 39f61df52844b..242472ae34f2e 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_uc.h
+++ b/libc/src/stdbit/stdc_first_trailing_zero_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_zero_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_UC_H
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_ui.cpp b/libc/src/stdbit/stdc_first_trailing_zero_ui.cpp
index c852f5133a6ad..7a50b696afff7 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_ui.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_zero_ui.cpp
@@ -9,13 +9,12 @@
#include "src/stdbit/stdc_first_trailing_zero_ui.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_zero_ui, (unsigned value)) {
return static_cast<unsigned>(first_trailing_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_ui.h b/libc/src/stdbit/stdc_first_trailing_zero_ui.h
index d43399b13f7a5..cc308f762b2b6 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_ui.h
+++ b/libc/src/stdbit/stdc_first_trailing_zero_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_zero_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_UI_H
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_ul.cpp b/libc/src/stdbit/stdc_first_trailing_zero_ul.cpp
index 42dccdf9b7465..88acbabdf2d9f 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_ul.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_zero_ul.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_trailing_zero_ul.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_zero_ul,
(unsigned long value)) {
return static_cast<unsigned>(first_trailing_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_ul.h b/libc/src/stdbit/stdc_first_trailing_zero_ul.h
index f6c9fdffb5841..8241337334174 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_ul.h
+++ b/libc/src/stdbit/stdc_first_trailing_zero_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_zero_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_UL_H
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_ull.cpp b/libc/src/stdbit/stdc_first_trailing_zero_ull.cpp
index 4282eb489fa7e..92df8f284e8b5 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_ull.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_zero_ull.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_trailing_zero_ull.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_zero_ull,
(unsigned long long value)) {
return static_cast<unsigned>(first_trailing_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_ull.h b/libc/src/stdbit/stdc_first_trailing_zero_ull.h
index ddd8b2e605aa6..3737fc1be2d43 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_ull.h
+++ b/libc/src/stdbit/stdc_first_trailing_zero_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_zero_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_ULL_H
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_us.cpp b/libc/src/stdbit/stdc_first_trailing_zero_us.cpp
index c49c985dc35bf..86caa20dd3bd6 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_us.cpp
+++ b/libc/src/stdbit/stdc_first_trailing_zero_us.cpp
@@ -9,14 +9,13 @@
#include "src/stdbit/stdc_first_trailing_zero_us.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_first_trailing_zero_us,
(unsigned short value)) {
return static_cast<unsigned>(first_trailing_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_first_trailing_zero_us.h b/libc/src/stdbit/stdc_first_trailing_zero_us.h
index 8b958889bef3a..608b052296964 100644
--- a/libc/src/stdbit/stdc_first_trailing_zero_us.h
+++ b/libc/src/stdbit/stdc_first_trailing_zero_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_first_trailing_zero_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_FIRST_TRAILING_ZERO_US_H
diff --git a/libc/src/stdbit/stdc_has_single_bit_uc.cpp b/libc/src/stdbit/stdc_has_single_bit_uc.cpp
index cf3011a87445a..e5acdc2a71b4b 100644
--- a/libc/src/stdbit/stdc_has_single_bit_uc.cpp
+++ b/libc/src/stdbit/stdc_has_single_bit_uc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(bool, stdc_has_single_bit_uc, (unsigned char value)) {
return cpp::has_single_bit(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_has_single_bit_uc.h b/libc/src/stdbit/stdc_has_single_bit_uc.h
index 89b09b48d0dac..028d4ee710505 100644
--- a/libc/src/stdbit/stdc_has_single_bit_uc.h
+++ b/libc/src/stdbit/stdc_has_single_bit_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
bool stdc_has_single_bit_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_UC_H
diff --git a/libc/src/stdbit/stdc_has_single_bit_ui.cpp b/libc/src/stdbit/stdc_has_single_bit_ui.cpp
index 06de58380633f..37578882324aa 100644
--- a/libc/src/stdbit/stdc_has_single_bit_ui.cpp
+++ b/libc/src/stdbit/stdc_has_single_bit_ui.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(bool, stdc_has_single_bit_ui, (unsigned value)) {
return cpp::has_single_bit(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_has_single_bit_ui.h b/libc/src/stdbit/stdc_has_single_bit_ui.h
index e7dab6a0ed072..1e8cd9afaee88 100644
--- a/libc/src/stdbit/stdc_has_single_bit_ui.h
+++ b/libc/src/stdbit/stdc_has_single_bit_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
bool stdc_has_single_bit_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_UI_H
diff --git a/libc/src/stdbit/stdc_has_single_bit_ul.cpp b/libc/src/stdbit/stdc_has_single_bit_ul.cpp
index b2e586fac3445..85133ab81cc60 100644
--- a/libc/src/stdbit/stdc_has_single_bit_ul.cpp
+++ b/libc/src/stdbit/stdc_has_single_bit_ul.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(bool, stdc_has_single_bit_ul, (unsigned long value)) {
return cpp::has_single_bit(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_has_single_bit_ul.h b/libc/src/stdbit/stdc_has_single_bit_ul.h
index 4614cc053793f..9b924fca9f065 100644
--- a/libc/src/stdbit/stdc_has_single_bit_ul.h
+++ b/libc/src/stdbit/stdc_has_single_bit_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
bool stdc_has_single_bit_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_UL_H
diff --git a/libc/src/stdbit/stdc_has_single_bit_ull.cpp b/libc/src/stdbit/stdc_has_single_bit_ull.cpp
index 45aeda82b9085..4491cf2b98b6d 100644
--- a/libc/src/stdbit/stdc_has_single_bit_ull.cpp
+++ b/libc/src/stdbit/stdc_has_single_bit_ull.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(bool, stdc_has_single_bit_ull, (unsigned long long value)) {
return cpp::has_single_bit(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_has_single_bit_ull.h b/libc/src/stdbit/stdc_has_single_bit_ull.h
index 84d4702cbc0f8..d4802bc287274 100644
--- a/libc/src/stdbit/stdc_has_single_bit_ull.h
+++ b/libc/src/stdbit/stdc_has_single_bit_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
bool stdc_has_single_bit_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_ULL_H
diff --git a/libc/src/stdbit/stdc_has_single_bit_us.cpp b/libc/src/stdbit/stdc_has_single_bit_us.cpp
index e915293530ca4..7a42ae553aa2e 100644
--- a/libc/src/stdbit/stdc_has_single_bit_us.cpp
+++ b/libc/src/stdbit/stdc_has_single_bit_us.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(bool, stdc_has_single_bit_us, (unsigned short value)) {
return cpp::has_single_bit(value);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_has_single_bit_us.h b/libc/src/stdbit/stdc_has_single_bit_us.h
index d0fc5190ff8c7..201ff4954c3b7 100644
--- a/libc/src/stdbit/stdc_has_single_bit_us.h
+++ b/libc/src/stdbit/stdc_has_single_bit_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
bool stdc_has_single_bit_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_HAS_SINGLE_BIT_US_H
diff --git a/libc/src/stdbit/stdc_leading_ones_uc.cpp b/libc/src/stdbit/stdc_leading_ones_uc.cpp
index 020bd40fcaa73..69322d957dbf2 100644
--- a/libc/src/stdbit/stdc_leading_ones_uc.cpp
+++ b/libc/src/stdbit/stdc_leading_ones_uc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_ones_uc, (unsigned char value)) {
return static_cast<unsigned>(cpp::countl_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_ones_uc.h b/libc/src/stdbit/stdc_leading_ones_uc.h
index 7daaf673a4158..fc4d2bdf623a6 100644
--- a/libc/src/stdbit/stdc_leading_ones_uc.h
+++ b/libc/src/stdbit/stdc_leading_ones_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_ones_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_UC_H
diff --git a/libc/src/stdbit/stdc_leading_ones_ui.cpp b/libc/src/stdbit/stdc_leading_ones_ui.cpp
index 2c51755ad6e62..2a73c2ccfa49b 100644
--- a/libc/src/stdbit/stdc_leading_ones_ui.cpp
+++ b/libc/src/stdbit/stdc_leading_ones_ui.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_ones_ui, (unsigned value)) {
return static_cast<unsigned>(cpp::countl_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_ones_ui.h b/libc/src/stdbit/stdc_leading_ones_ui.h
index 93b042cf8f44f..c381eb50e9732 100644
--- a/libc/src/stdbit/stdc_leading_ones_ui.h
+++ b/libc/src/stdbit/stdc_leading_ones_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_ones_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_UI_H
diff --git a/libc/src/stdbit/stdc_leading_ones_ul.cpp b/libc/src/stdbit/stdc_leading_ones_ul.cpp
index 50570a5897a24..5b2f61d43b027 100644
--- a/libc/src/stdbit/stdc_leading_ones_ul.cpp
+++ b/libc/src/stdbit/stdc_leading_ones_ul.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_ones_ul, (unsigned long value)) {
return static_cast<unsigned>(cpp::countl_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_ones_ul.h b/libc/src/stdbit/stdc_leading_ones_ul.h
index d4cf91c1f4dc2..3441edf861361 100644
--- a/libc/src/stdbit/stdc_leading_ones_ul.h
+++ b/libc/src/stdbit/stdc_leading_ones_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_ones_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_UL_H
diff --git a/libc/src/stdbit/stdc_leading_ones_ull.cpp b/libc/src/stdbit/stdc_leading_ones_ull.cpp
index aff91a40d5443..05660b9fed653 100644
--- a/libc/src/stdbit/stdc_leading_ones_ull.cpp
+++ b/libc/src/stdbit/stdc_leading_ones_ull.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_ones_ull,
(unsigned long long value)) {
return static_cast<unsigned>(cpp::countl_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_ones_ull.h b/libc/src/stdbit/stdc_leading_ones_ull.h
index e459e4ba57fce..167eb732794d7 100644
--- a/libc/src/stdbit/stdc_leading_ones_ull.h
+++ b/libc/src/stdbit/stdc_leading_ones_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_ones_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_ULL_H
diff --git a/libc/src/stdbit/stdc_leading_ones_us.cpp b/libc/src/stdbit/stdc_leading_ones_us.cpp
index 34db4ec295ccd..d93327db739b5 100644
--- a/libc/src/stdbit/stdc_leading_ones_us.cpp
+++ b/libc/src/stdbit/stdc_leading_ones_us.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_ones_us, (unsigned short value)) {
return static_cast<unsigned>(cpp::countl_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_ones_us.h b/libc/src/stdbit/stdc_leading_ones_us.h
index 206756b633643..2a552d784b195 100644
--- a/libc/src/stdbit/stdc_leading_ones_us.h
+++ b/libc/src/stdbit/stdc_leading_ones_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_ones_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ONES_US_H
diff --git a/libc/src/stdbit/stdc_leading_zeros_uc.cpp b/libc/src/stdbit/stdc_leading_zeros_uc.cpp
index d9b1628488a3e..dbd2d7662c44f 100644
--- a/libc/src/stdbit/stdc_leading_zeros_uc.cpp
+++ b/libc/src/stdbit/stdc_leading_zeros_uc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_uc, (unsigned char value)) {
return static_cast<unsigned>(cpp::countl_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_uc.h b/libc/src/stdbit/stdc_leading_zeros_uc.h
index 6bc1f3006bd76..1edca66e13448 100644
--- a/libc/src/stdbit/stdc_leading_zeros_uc.h
+++ b/libc/src/stdbit/stdc_leading_zeros_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_zeros_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UC_H
diff --git a/libc/src/stdbit/stdc_leading_zeros_ui.cpp b/libc/src/stdbit/stdc_leading_zeros_ui.cpp
index 05a1a50412c91..99bc0eb70f33b 100644
--- a/libc/src/stdbit/stdc_leading_zeros_ui.cpp
+++ b/libc/src/stdbit/stdc_leading_zeros_ui.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_ui, (unsigned value)) {
return static_cast<unsigned>(cpp::countl_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_ui.h b/libc/src/stdbit/stdc_leading_zeros_ui.h
index ce7f266b97d96..14113d486b54a 100644
--- a/libc/src/stdbit/stdc_leading_zeros_ui.h
+++ b/libc/src/stdbit/stdc_leading_zeros_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_zeros_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UI_H
diff --git a/libc/src/stdbit/stdc_leading_zeros_ul.cpp b/libc/src/stdbit/stdc_leading_zeros_ul.cpp
index e560889973939..0d5ff886fe991 100644
--- a/libc/src/stdbit/stdc_leading_zeros_ul.cpp
+++ b/libc/src/stdbit/stdc_leading_zeros_ul.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_ul, (unsigned long value)) {
return static_cast<unsigned>(cpp::countl_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_ul.h b/libc/src/stdbit/stdc_leading_zeros_ul.h
index a4c671f753ef2..5bac6df1b14dc 100644
--- a/libc/src/stdbit/stdc_leading_zeros_ul.h
+++ b/libc/src/stdbit/stdc_leading_zeros_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_zeros_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_UL_H
diff --git a/libc/src/stdbit/stdc_leading_zeros_ull.cpp b/libc/src/stdbit/stdc_leading_zeros_ull.cpp
index 0bf3f13398675..b23cea7c3ee44 100644
--- a/libc/src/stdbit/stdc_leading_zeros_ull.cpp
+++ b/libc/src/stdbit/stdc_leading_zeros_ull.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_ull,
(unsigned long long value)) {
return static_cast<unsigned>(cpp::countl_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_ull.h b/libc/src/stdbit/stdc_leading_zeros_ull.h
index a59fe2eff6108..e13624345fc78 100644
--- a/libc/src/stdbit/stdc_leading_zeros_ull.h
+++ b/libc/src/stdbit/stdc_leading_zeros_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_zeros_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_ULL_H
diff --git a/libc/src/stdbit/stdc_leading_zeros_us.cpp b/libc/src/stdbit/stdc_leading_zeros_us.cpp
index 00ac7c3e1e277..424fdc7282563 100644
--- a/libc/src/stdbit/stdc_leading_zeros_us.cpp
+++ b/libc/src/stdbit/stdc_leading_zeros_us.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_us, (unsigned short value)) {
return static_cast<unsigned>(cpp::countl_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_leading_zeros_us.h b/libc/src/stdbit/stdc_leading_zeros_us.h
index 1ee4732d95017..6a3969002daf5 100644
--- a/libc/src/stdbit/stdc_leading_zeros_us.h
+++ b/libc/src/stdbit/stdc_leading_zeros_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_leading_zeros_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_LEADING_ZEROS_US_H
diff --git a/libc/src/stdbit/stdc_trailing_ones_uc.cpp b/libc/src/stdbit/stdc_trailing_ones_uc.cpp
index 302a766db0805..eabb21367e285 100644
--- a/libc/src/stdbit/stdc_trailing_ones_uc.cpp
+++ b/libc/src/stdbit/stdc_trailing_ones_uc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_ones_uc, (unsigned char value)) {
return static_cast<unsigned>(cpp::countr_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_ones_uc.h b/libc/src/stdbit/stdc_trailing_ones_uc.h
index 8eced3b12d335..9736e21e1f280 100644
--- a/libc/src/stdbit/stdc_trailing_ones_uc.h
+++ b/libc/src/stdbit/stdc_trailing_ones_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_ones_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_UC_H
diff --git a/libc/src/stdbit/stdc_trailing_ones_ui.cpp b/libc/src/stdbit/stdc_trailing_ones_ui.cpp
index 8ad6e78c50bf9..87eb54fe5f026 100644
--- a/libc/src/stdbit/stdc_trailing_ones_ui.cpp
+++ b/libc/src/stdbit/stdc_trailing_ones_ui.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_ones_ui, (unsigned value)) {
return static_cast<unsigned>(cpp::countr_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_ones_ui.h b/libc/src/stdbit/stdc_trailing_ones_ui.h
index de7c9312291e7..aad7fcf0daf55 100644
--- a/libc/src/stdbit/stdc_trailing_ones_ui.h
+++ b/libc/src/stdbit/stdc_trailing_ones_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_ones_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_UI_H
diff --git a/libc/src/stdbit/stdc_trailing_ones_ul.cpp b/libc/src/stdbit/stdc_trailing_ones_ul.cpp
index af398a1573812..6d358a21ac337 100644
--- a/libc/src/stdbit/stdc_trailing_ones_ul.cpp
+++ b/libc/src/stdbit/stdc_trailing_ones_ul.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_ones_ul, (unsigned long value)) {
return static_cast<unsigned>(cpp::countr_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_ones_ul.h b/libc/src/stdbit/stdc_trailing_ones_ul.h
index 64da53869b162..80589501b1ed2 100644
--- a/libc/src/stdbit/stdc_trailing_ones_ul.h
+++ b/libc/src/stdbit/stdc_trailing_ones_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_ones_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_UL_H
diff --git a/libc/src/stdbit/stdc_trailing_ones_ull.cpp b/libc/src/stdbit/stdc_trailing_ones_ull.cpp
index ef6927e2f1564..fb5fffe07817d 100644
--- a/libc/src/stdbit/stdc_trailing_ones_ull.cpp
+++ b/libc/src/stdbit/stdc_trailing_ones_ull.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_ones_ull,
(unsigned long long value)) {
return static_cast<unsigned>(cpp::countr_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_ones_ull.h b/libc/src/stdbit/stdc_trailing_ones_ull.h
index f93bd572fedfc..3d3f0b306789a 100644
--- a/libc/src/stdbit/stdc_trailing_ones_ull.h
+++ b/libc/src/stdbit/stdc_trailing_ones_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_ones_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_ULL_H
diff --git a/libc/src/stdbit/stdc_trailing_ones_us.cpp b/libc/src/stdbit/stdc_trailing_ones_us.cpp
index 3a54d8ed74672..ee7ff4f78d489 100644
--- a/libc/src/stdbit/stdc_trailing_ones_us.cpp
+++ b/libc/src/stdbit/stdc_trailing_ones_us.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_ones_us, (unsigned short value)) {
return static_cast<unsigned>(cpp::countr_one(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_ones_us.h b/libc/src/stdbit/stdc_trailing_ones_us.h
index 3dad46046f2d3..b783cd22ad2de 100644
--- a/libc/src/stdbit/stdc_trailing_ones_us.h
+++ b/libc/src/stdbit/stdc_trailing_ones_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_ones_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ONES_US_H
diff --git a/libc/src/stdbit/stdc_trailing_zeros_uc.cpp b/libc/src/stdbit/stdc_trailing_zeros_uc.cpp
index fcc05d4bcce00..36924c5a053ad 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_uc.cpp
+++ b/libc/src/stdbit/stdc_trailing_zeros_uc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_zeros_uc, (unsigned char value)) {
return static_cast<unsigned>(cpp::countr_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_zeros_uc.h b/libc/src/stdbit/stdc_trailing_zeros_uc.h
index 114c05cbdac11..866201e5acea8 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_uc.h
+++ b/libc/src/stdbit/stdc_trailing_zeros_uc.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_UC_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_UC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_zeros_uc(unsigned char value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_UC_H
diff --git a/libc/src/stdbit/stdc_trailing_zeros_ui.cpp b/libc/src/stdbit/stdc_trailing_zeros_ui.cpp
index 94bca3e991593..a264fd97f251f 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_ui.cpp
+++ b/libc/src/stdbit/stdc_trailing_zeros_ui.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_zeros_ui, (unsigned value)) {
return static_cast<unsigned>(cpp::countr_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_zeros_ui.h b/libc/src/stdbit/stdc_trailing_zeros_ui.h
index 0d8f5ee334751..0642e312f4fe7 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_ui.h
+++ b/libc/src/stdbit/stdc_trailing_zeros_ui.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_UI_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_UI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_zeros_ui(unsigned value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_UI_H
diff --git a/libc/src/stdbit/stdc_trailing_zeros_ul.cpp b/libc/src/stdbit/stdc_trailing_zeros_ul.cpp
index 407eb85ddd73e..8e0c36cb09965 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_ul.cpp
+++ b/libc/src/stdbit/stdc_trailing_zeros_ul.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_zeros_ul, (unsigned long value)) {
return static_cast<unsigned>(cpp::countr_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_zeros_ul.h b/libc/src/stdbit/stdc_trailing_zeros_ul.h
index 368cd67e2330c..e10b4474753a0 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_ul.h
+++ b/libc/src/stdbit/stdc_trailing_zeros_ul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_UL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_UL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_zeros_ul(unsigned long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_UL_H
diff --git a/libc/src/stdbit/stdc_trailing_zeros_ull.cpp b/libc/src/stdbit/stdc_trailing_zeros_ull.cpp
index eba3dff88f4f1..77cb20cb1ba45 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_ull.cpp
+++ b/libc/src/stdbit/stdc_trailing_zeros_ull.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_zeros_ull,
(unsigned long long value)) {
return static_cast<unsigned>(cpp::countr_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_zeros_ull.h b/libc/src/stdbit/stdc_trailing_zeros_ull.h
index 896c33b3ac104..f95169d29f45e 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_ull.h
+++ b/libc/src/stdbit/stdc_trailing_zeros_ull.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_ULL_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_ULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_zeros_ull(unsigned long long value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_ULL_H
diff --git a/libc/src/stdbit/stdc_trailing_zeros_us.cpp b/libc/src/stdbit/stdc_trailing_zeros_us.cpp
index 82eba56c5fc68..a5b9f4a7d8498 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_us.cpp
+++ b/libc/src/stdbit/stdc_trailing_zeros_us.cpp
@@ -10,12 +10,11 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned, stdc_trailing_zeros_us, (unsigned short value)) {
return static_cast<unsigned>(cpp::countr_zero(value));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdbit/stdc_trailing_zeros_us.h b/libc/src/stdbit/stdc_trailing_zeros_us.h
index 0241192a8a972..ddbdf0d647abd 100644
--- a/libc/src/stdbit/stdc_trailing_zeros_us.h
+++ b/libc/src/stdbit/stdc_trailing_zeros_us.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_US_H
#define LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_US_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned stdc_trailing_zeros_us(unsigned short value);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDBIT_STDC_TRAILING_ZEROS_US_H
diff --git a/libc/src/stdfix/abshk.cpp b/libc/src/stdfix/abshk.cpp
index 384988997c8c7..d76a5e64e6107 100644
--- a/libc/src/stdfix/abshk.cpp
+++ b/libc/src/stdfix/abshk.cpp
@@ -9,12 +9,11 @@
#include "abshk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(short accum, abshk, (short accum x)) {
return fixed_point::abs(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/abshk.h b/libc/src/stdfix/abshk.h
index 060abed151332..13c9300caab88 100644
--- a/libc/src/stdfix/abshk.h
+++ b/libc/src/stdfix/abshk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ABSHK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
short accum abshk(short accum x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ABSHK_H
diff --git a/libc/src/stdfix/abshr.cpp b/libc/src/stdfix/abshr.cpp
index d4289800fef0b..db887046b662c 100644
--- a/libc/src/stdfix/abshr.cpp
+++ b/libc/src/stdfix/abshr.cpp
@@ -9,12 +9,11 @@
#include "abshr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(short fract, abshr, (short fract x)) {
return fixed_point::abs(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/abshr.h b/libc/src/stdfix/abshr.h
index 162c4396c2e63..5acd0cfc4a60d 100644
--- a/libc/src/stdfix/abshr.h
+++ b/libc/src/stdfix/abshr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ABSHR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
short fract abshr(short fract x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ABSHR_H
diff --git a/libc/src/stdfix/absk.cpp b/libc/src/stdfix/absk.cpp
index 8c18175fa97d3..ca231d95a0ab7 100644
--- a/libc/src/stdfix/absk.cpp
+++ b/libc/src/stdfix/absk.cpp
@@ -9,10 +9,9 @@
#include "absk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(accum, absk, (accum x)) { return fixed_point::abs(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/absk.h b/libc/src/stdfix/absk.h
index 266a4faeba763..73dfcac0ac8e7 100644
--- a/libc/src/stdfix/absk.h
+++ b/libc/src/stdfix/absk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ABSK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
accum absk(accum x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ABSK_H
diff --git a/libc/src/stdfix/abslk.cpp b/libc/src/stdfix/abslk.cpp
index c24d21671a110..5e085198ce428 100644
--- a/libc/src/stdfix/abslk.cpp
+++ b/libc/src/stdfix/abslk.cpp
@@ -9,12 +9,11 @@
#include "abslk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long accum, abslk, (long accum x)) {
return fixed_point::abs(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/abslk.h b/libc/src/stdfix/abslk.h
index a1ee8ca02fdcd..7de116fa22793 100644
--- a/libc/src/stdfix/abslk.h
+++ b/libc/src/stdfix/abslk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ABSLK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long accum abslk(long accum x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ABSLK_H
diff --git a/libc/src/stdfix/abslr.cpp b/libc/src/stdfix/abslr.cpp
index 3f84fc725e51c..0f8969510a505 100644
--- a/libc/src/stdfix/abslr.cpp
+++ b/libc/src/stdfix/abslr.cpp
@@ -9,12 +9,11 @@
#include "abslr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long fract, abslr, (long fract x)) {
return fixed_point::abs(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/abslr.h b/libc/src/stdfix/abslr.h
index 961409ada5a8a..bf5b585bbbb66 100644
--- a/libc/src/stdfix/abslr.h
+++ b/libc/src/stdfix/abslr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ABSLR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long fract abslr(long fract x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ABSLR_H
diff --git a/libc/src/stdfix/absr.cpp b/libc/src/stdfix/absr.cpp
index 42f639d63f5a7..dbbecb4947da9 100644
--- a/libc/src/stdfix/absr.cpp
+++ b/libc/src/stdfix/absr.cpp
@@ -9,10 +9,9 @@
#include "absr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(fract, absr, (fract x)) { return fixed_point::abs(x); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/absr.h b/libc/src/stdfix/absr.h
index 0b47ab1f2e7fd..b5ead7ce14e2a 100644
--- a/libc/src/stdfix/absr.h
+++ b/libc/src/stdfix/absr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ABSR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
fract absr(fract x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ABSR_H
diff --git a/libc/src/stdfix/exphk.cpp b/libc/src/stdfix/exphk.cpp
index 0b17a4075e8f3..19a972b390c71 100644
--- a/libc/src/stdfix/exphk.cpp
+++ b/libc/src/stdfix/exphk.cpp
@@ -10,9 +10,8 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -90,4 +89,4 @@ LLVM_LIBC_FUNCTION(short accum, exphk, (short accum x)) {
return (exp_hi * (exp_mid * (0x1.0p0hk + lo)));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/exphk.h b/libc/src/stdfix/exphk.h
index d10dda13a3007..da03bb76d53f5 100644
--- a/libc/src/stdfix/exphk.h
+++ b/libc/src/stdfix/exphk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_EXPHK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
short accum exphk(short accum x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_EXPHK_H
diff --git a/libc/src/stdfix/expk.cpp b/libc/src/stdfix/expk.cpp
index 0851c7fef48d9..57227fd27769c 100644
--- a/libc/src/stdfix/expk.cpp
+++ b/libc/src/stdfix/expk.cpp
@@ -10,9 +10,8 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -102,4 +101,4 @@ LLVM_LIBC_FUNCTION(accum, expk, (accum x)) {
return (exp_hi * (exp_mid * l2));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/expk.h b/libc/src/stdfix/expk.h
index 4fd1dd5fffb5d..4526686a200b4 100644
--- a/libc/src/stdfix/expk.h
+++ b/libc/src/stdfix/expk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_EXPK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
accum expk(accum x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_EXPK_H
diff --git a/libc/src/stdfix/roundhk.cpp b/libc/src/stdfix/roundhk.cpp
index c94aa6de5f960..a4f459ea0d653 100644
--- a/libc/src/stdfix/roundhk.cpp
+++ b/libc/src/stdfix/roundhk.cpp
@@ -9,12 +9,11 @@
#include "roundhk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(short accum, roundhk, (short accum x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/roundhk.h b/libc/src/stdfix/roundhk.h
index 0c1e3780a71ad..9a5c874cc030d 100644
--- a/libc/src/stdfix/roundhk.h
+++ b/libc/src/stdfix/roundhk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDHK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
short accum roundhk(short accum x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDHK_H
diff --git a/libc/src/stdfix/roundhr.cpp b/libc/src/stdfix/roundhr.cpp
index 539f951662243..7757d1cc735f4 100644
--- a/libc/src/stdfix/roundhr.cpp
+++ b/libc/src/stdfix/roundhr.cpp
@@ -9,12 +9,11 @@
#include "roundhr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(short fract, roundhr, (short fract x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/roundhr.h b/libc/src/stdfix/roundhr.h
index a3a4ace902f10..ba5a67945d6c3 100644
--- a/libc/src/stdfix/roundhr.h
+++ b/libc/src/stdfix/roundhr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDHR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
short fract roundhr(short fract x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDHR_H
diff --git a/libc/src/stdfix/roundk.cpp b/libc/src/stdfix/roundk.cpp
index 3aedfa322b9a7..bf47dd9898d8f 100644
--- a/libc/src/stdfix/roundk.cpp
+++ b/libc/src/stdfix/roundk.cpp
@@ -9,12 +9,11 @@
#include "roundk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(accum, roundk, (accum x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/roundk.h b/libc/src/stdfix/roundk.h
index 36d34992146cf..e9fa6d8f9c3b8 100644
--- a/libc/src/stdfix/roundk.h
+++ b/libc/src/stdfix/roundk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
accum roundk(accum x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDK_H
diff --git a/libc/src/stdfix/roundlk.cpp b/libc/src/stdfix/roundlk.cpp
index 94dceb40cf819..d2ffe8ab03785 100644
--- a/libc/src/stdfix/roundlk.cpp
+++ b/libc/src/stdfix/roundlk.cpp
@@ -9,12 +9,11 @@
#include "roundlk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long accum, roundlk, (long accum x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/roundlk.h b/libc/src/stdfix/roundlk.h
index e1661ec7268c3..5fa0e90e855a6 100644
--- a/libc/src/stdfix/roundlk.h
+++ b/libc/src/stdfix/roundlk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDLK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long accum roundlk(long accum x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDLK_H
diff --git a/libc/src/stdfix/roundlr.cpp b/libc/src/stdfix/roundlr.cpp
index 5a7737d05e6a6..cd4c911ffe68e 100644
--- a/libc/src/stdfix/roundlr.cpp
+++ b/libc/src/stdfix/roundlr.cpp
@@ -9,12 +9,11 @@
#include "roundlr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long fract, roundlr, (long fract x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/roundlr.h b/libc/src/stdfix/roundlr.h
index 58d6ffa6977e9..c015292e8f3f2 100644
--- a/libc/src/stdfix/roundlr.h
+++ b/libc/src/stdfix/roundlr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDLR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long fract roundlr(long fract x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDLR_H
diff --git a/libc/src/stdfix/roundr.cpp b/libc/src/stdfix/roundr.cpp
index d4ade17ac3c6d..24216936d5f9b 100644
--- a/libc/src/stdfix/roundr.cpp
+++ b/libc/src/stdfix/roundr.cpp
@@ -9,12 +9,11 @@
#include "roundr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(fract, roundr, (fract x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/roundr.h b/libc/src/stdfix/roundr.h
index 105314da1828d..b5b1375c882e0 100644
--- a/libc/src/stdfix/roundr.h
+++ b/libc/src/stdfix/roundr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
fract roundr(fract x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDR_H
diff --git a/libc/src/stdfix/rounduhk.cpp b/libc/src/stdfix/rounduhk.cpp
index 3c13a313ed54f..22561588e0336 100644
--- a/libc/src/stdfix/rounduhk.cpp
+++ b/libc/src/stdfix/rounduhk.cpp
@@ -9,13 +9,12 @@
#include "rounduhk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned short accum, rounduhk,
(unsigned short accum x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/rounduhk.h b/libc/src/stdfix/rounduhk.h
index e6cbc218be474..85ebf2903ec7e 100644
--- a/libc/src/stdfix/rounduhk.h
+++ b/libc/src/stdfix/rounduhk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDUHK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned short accum rounduhk(unsigned short accum x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDUHK_H
diff --git a/libc/src/stdfix/rounduhr.cpp b/libc/src/stdfix/rounduhr.cpp
index 8c7abaf6bca48..e2e3435c15ef3 100644
--- a/libc/src/stdfix/rounduhr.cpp
+++ b/libc/src/stdfix/rounduhr.cpp
@@ -9,13 +9,12 @@
#include "rounduhr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned short fract, rounduhr,
(unsigned short fract x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/rounduhr.h b/libc/src/stdfix/rounduhr.h
index 2d8c85a6c15ed..1be0aab1f5a79 100644
--- a/libc/src/stdfix/rounduhr.h
+++ b/libc/src/stdfix/rounduhr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDUHR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned short fract rounduhr(unsigned short fract x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDUHR_H
diff --git a/libc/src/stdfix/rounduk.cpp b/libc/src/stdfix/rounduk.cpp
index d543a6853fc3c..b9f8522aed35d 100644
--- a/libc/src/stdfix/rounduk.cpp
+++ b/libc/src/stdfix/rounduk.cpp
@@ -9,12 +9,11 @@
#include "rounduk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned accum, rounduk, (unsigned accum x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/rounduk.h b/libc/src/stdfix/rounduk.h
index 51f0f9ce32953..8dae89586c490 100644
--- a/libc/src/stdfix/rounduk.h
+++ b/libc/src/stdfix/rounduk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDUK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned accum rounduk(unsigned accum x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDUK_H
diff --git a/libc/src/stdfix/roundulk.cpp b/libc/src/stdfix/roundulk.cpp
index 09c1d86f4b93f..241b2c2c9a061 100644
--- a/libc/src/stdfix/roundulk.cpp
+++ b/libc/src/stdfix/roundulk.cpp
@@ -9,13 +9,12 @@
#include "roundulk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned long accum, roundulk,
(unsigned long accum x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/roundulk.h b/libc/src/stdfix/roundulk.h
index 797ce9fb957a7..81dfd1dceb600 100644
--- a/libc/src/stdfix/roundulk.h
+++ b/libc/src/stdfix/roundulk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDULK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long accum roundulk(unsigned long accum x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDULK_H
diff --git a/libc/src/stdfix/roundulr.cpp b/libc/src/stdfix/roundulr.cpp
index e654b197dc9fe..6c32074520cd5 100644
--- a/libc/src/stdfix/roundulr.cpp
+++ b/libc/src/stdfix/roundulr.cpp
@@ -9,13 +9,12 @@
#include "roundulr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned long fract, roundulr,
(unsigned long fract x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/roundulr.h b/libc/src/stdfix/roundulr.h
index 1f6165b10f368..002fc94907c61 100644
--- a/libc/src/stdfix/roundulr.h
+++ b/libc/src/stdfix/roundulr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDULR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long fract roundulr(unsigned long fract x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDULR_H
diff --git a/libc/src/stdfix/roundur.cpp b/libc/src/stdfix/roundur.cpp
index 1d3485425984f..e91b7f1103753 100644
--- a/libc/src/stdfix/roundur.cpp
+++ b/libc/src/stdfix/roundur.cpp
@@ -9,12 +9,11 @@
#include "roundur.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/fx_bits.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned fract, roundur, (unsigned fract x, int n)) {
return fixed_point::round(x, n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/roundur.h b/libc/src/stdfix/roundur.h
index 815fd145b66fb..72de44b1e0c4e 100644
--- a/libc/src/stdfix/roundur.h
+++ b/libc/src/stdfix/roundur.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_ROUNDUR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned fract roundur(unsigned fract x, int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_ROUNDUR_H
diff --git a/libc/src/stdfix/sqrtuhk.cpp b/libc/src/stdfix/sqrtuhk.cpp
index 312846af7b737..e8dc842c8a998 100644
--- a/libc/src/stdfix/sqrtuhk.cpp
+++ b/libc/src/stdfix/sqrtuhk.cpp
@@ -9,12 +9,11 @@
#include "sqrtuhk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/sqrt.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned short accum, sqrtuhk, (unsigned short accum x)) {
return fixed_point::sqrt(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/sqrtuhk.h b/libc/src/stdfix/sqrtuhk.h
index 5b8f9eaebc76e..80000a0079696 100644
--- a/libc/src/stdfix/sqrtuhk.h
+++ b/libc/src/stdfix/sqrtuhk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_SQRTUHK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned short accum sqrtuhk(unsigned short accum x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_SQRTUHK_H
diff --git a/libc/src/stdfix/sqrtuhr.cpp b/libc/src/stdfix/sqrtuhr.cpp
index 87e151cc8ac60..6bba07aa20d59 100644
--- a/libc/src/stdfix/sqrtuhr.cpp
+++ b/libc/src/stdfix/sqrtuhr.cpp
@@ -9,12 +9,11 @@
#include "sqrtuhr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/sqrt.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned short fract, sqrtuhr, (unsigned short fract x)) {
return fixed_point::sqrt(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/sqrtuhr.h b/libc/src/stdfix/sqrtuhr.h
index 390c369be1597..fd95f0924e8d4 100644
--- a/libc/src/stdfix/sqrtuhr.h
+++ b/libc/src/stdfix/sqrtuhr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_SQRTUHR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned short fract sqrtuhr(unsigned short fract x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_SQRTUHR_H
diff --git a/libc/src/stdfix/sqrtuk.cpp b/libc/src/stdfix/sqrtuk.cpp
index 857f75f30cac7..6e5d8118c83b7 100644
--- a/libc/src/stdfix/sqrtuk.cpp
+++ b/libc/src/stdfix/sqrtuk.cpp
@@ -9,12 +9,11 @@
#include "sqrtuk.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/sqrt.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned accum, sqrtuk, (unsigned accum x)) {
return fixed_point::sqrt(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/sqrtuk.h b/libc/src/stdfix/sqrtuk.h
index 2b043c153277f..04d0adadde9ad 100644
--- a/libc/src/stdfix/sqrtuk.h
+++ b/libc/src/stdfix/sqrtuk.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_SQRTUK_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned accum sqrtuk(unsigned accum x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_SQRTUK_H
diff --git a/libc/src/stdfix/sqrtulr.cpp b/libc/src/stdfix/sqrtulr.cpp
index db9b0639d8136..c9e5cd51f66bc 100644
--- a/libc/src/stdfix/sqrtulr.cpp
+++ b/libc/src/stdfix/sqrtulr.cpp
@@ -9,12 +9,11 @@
#include "sqrtulr.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/sqrt.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned long fract, sqrtulr, (unsigned long fract x)) {
return fixed_point::sqrt(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/sqrtulr.h b/libc/src/stdfix/sqrtulr.h
index a43cc44b79c3b..284adaaf35bf5 100644
--- a/libc/src/stdfix/sqrtulr.h
+++ b/libc/src/stdfix/sqrtulr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_SQRTULR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long fract sqrtulr(unsigned long fract x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_SQRTULR_H
diff --git a/libc/src/stdfix/sqrtur.cpp b/libc/src/stdfix/sqrtur.cpp
index 4c696b2c5c38d..ac5be84910849 100644
--- a/libc/src/stdfix/sqrtur.cpp
+++ b/libc/src/stdfix/sqrtur.cpp
@@ -9,12 +9,11 @@
#include "sqrtur.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/sqrt.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned fract, sqrtur, (unsigned fract x)) {
return fixed_point::sqrt(x);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/sqrtur.h b/libc/src/stdfix/sqrtur.h
index 47a9ab6edbbe6..df9dfe5a0bf39 100644
--- a/libc/src/stdfix/sqrtur.h
+++ b/libc/src/stdfix/sqrtur.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_SQRTUR_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned fract sqrtur(unsigned fract x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_SQRTUR_H
diff --git a/libc/src/stdfix/uhksqrtus.cpp b/libc/src/stdfix/uhksqrtus.cpp
index f41e8794a0418..335750ae902b2 100644
--- a/libc/src/stdfix/uhksqrtus.cpp
+++ b/libc/src/stdfix/uhksqrtus.cpp
@@ -9,9 +9,8 @@
#include "uhksqrtus.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/sqrt.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned short accum, uhksqrtus, (unsigned short x)) {
#ifdef LIBC_FAST_MATH
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(unsigned short accum, uhksqrtus, (unsigned short x)) {
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/uhksqrtus.h b/libc/src/stdfix/uhksqrtus.h
index 0633f7efe688c..c24846a800303 100644
--- a/libc/src/stdfix/uhksqrtus.h
+++ b/libc/src/stdfix/uhksqrtus.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_UHKSQRTUS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned short accum uhksqrtus(unsigned short x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_UHKSQRTUS_H
diff --git a/libc/src/stdfix/uksqrtui.cpp b/libc/src/stdfix/uksqrtui.cpp
index 504bd06163cf4..ee1ae1335027a 100644
--- a/libc/src/stdfix/uksqrtui.cpp
+++ b/libc/src/stdfix/uksqrtui.cpp
@@ -9,9 +9,8 @@
#include "uksqrtui.h"
#include "src/__support/common.h"
#include "src/__support/fixed_point/sqrt.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned accum, uksqrtui, (unsigned int x)) {
#ifdef LIBC_FAST_MATH
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(unsigned accum, uksqrtui, (unsigned int x)) {
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdfix/uksqrtui.h b/libc/src/stdfix/uksqrtui.h
index f9fb0e0480b6a..cd4ff41ea100a 100644
--- a/libc/src/stdfix/uksqrtui.h
+++ b/libc/src/stdfix/uksqrtui.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDFIX_UKSQRTUI_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned accum uksqrtui(unsigned int x);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDFIX_UKSQRTUI_H
diff --git a/libc/src/stdio/CMakeLists.txt b/libc/src/stdio/CMakeLists.txt
index 7c61238e69576..e5bf5c64ec833 100644
--- a/libc/src/stdio/CMakeLists.txt
+++ b/libc/src/stdio/CMakeLists.txt
@@ -209,6 +209,7 @@ add_entrypoint_object(
libc.src.stdio.printf_core.vfprintf_internal
)
+
add_subdirectory(printf_core)
add_subdirectory(scanf_core)
diff --git a/libc/src/stdio/baremetal/getchar.cpp b/libc/src/stdio/baremetal/getchar.cpp
index 0a78a1ff8adf1..01a5a587e5bce 100644
--- a/libc/src/stdio/baremetal/getchar.cpp
+++ b/libc/src/stdio/baremetal/getchar.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/getchar.h"
#include "src/__support/OSUtil/io.h"
-#include "src/__support/macros/config.h"
#include "hdr/stdio_macros.h" // for EOF.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, getchar, ()) {
char buf[1];
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, getchar, ()) {
return buf[0];
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/baremetal/printf.cpp b/libc/src/stdio/baremetal/printf.cpp
index 04aa284ee0839..dfc3c0b853959 100644
--- a/libc/src/stdio/baremetal/printf.cpp
+++ b/libc/src/stdio/baremetal/printf.cpp
@@ -9,7 +9,6 @@
#include "src/stdio/printf.h"
#include "src/__support/OSUtil/io.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/printf_main.h"
#include "src/stdio/printf_core/writer.h"
@@ -17,7 +16,7 @@
#include <stdarg.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -50,4 +49,4 @@ LLVM_LIBC_FUNCTION(int, printf, (const char *__restrict format, ...)) {
return retval;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/baremetal/putchar.cpp b/libc/src/stdio/baremetal/putchar.cpp
index 0ba46a5ade6c9..23e9745e9cf70 100644
--- a/libc/src/stdio/baremetal/putchar.cpp
+++ b/libc/src/stdio/baremetal/putchar.cpp
@@ -9,9 +9,8 @@
#include "src/stdio/putchar.h"
#include "src/__support/CPP/string_view.h"
#include "src/__support/OSUtil/io.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, putchar, (int c)) {
char uc = static_cast<char>(c);
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(int, putchar, (int c)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/baremetal/puts.cpp b/libc/src/stdio/baremetal/puts.cpp
index 5062efda1c0dc..136cdb8acf800 100644
--- a/libc/src/stdio/baremetal/puts.cpp
+++ b/libc/src/stdio/baremetal/puts.cpp
@@ -9,9 +9,8 @@
#include "src/stdio/puts.h"
#include "src/__support/CPP/string_view.h"
#include "src/__support/OSUtil/io.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, puts, (const char *__restrict str)) {
cpp::string_view str_view(str);
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, puts, (const char *__restrict str)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/baremetal/remove.cpp b/libc/src/stdio/baremetal/remove.cpp
index d383d0cf78887..f4f2cdca7c69b 100644
--- a/libc/src/stdio/baremetal/remove.cpp
+++ b/libc/src/stdio/baremetal/remove.cpp
@@ -9,12 +9,11 @@
#include "src/stdio/remove.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: This is a temporary workaround for issue #85335.
LLVM_LIBC_FUNCTION(int, remove, (const char *)) { return -1; }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/baremetal/vprintf.cpp b/libc/src/stdio/baremetal/vprintf.cpp
index 617b5f488e772..203ec18efb657 100644
--- a/libc/src/stdio/baremetal/vprintf.cpp
+++ b/libc/src/stdio/baremetal/vprintf.cpp
@@ -9,7 +9,6 @@
#include "src/stdio/vprintf.h"
#include "src/__support/OSUtil/io.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/printf_main.h"
#include "src/stdio/printf_core/writer.h"
@@ -17,7 +16,7 @@
#include <stdarg.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -48,4 +47,4 @@ LLVM_LIBC_FUNCTION(int, vprintf,
return retval;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/clearerr.h b/libc/src/stdio/clearerr.h
index 790d923f7da62..2b3418037c433 100644
--- a/libc/src/stdio/clearerr.h
+++ b/libc/src/stdio/clearerr.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_CLEARERR_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void clearerr(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_CLEARERR_H
diff --git a/libc/src/stdio/clearerr_unlocked.h b/libc/src/stdio/clearerr_unlocked.h
index 2a57e768cdbec..05ddbdd1d7af1 100644
--- a/libc/src/stdio/clearerr_unlocked.h
+++ b/libc/src/stdio/clearerr_unlocked.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_CLEARERR_UNLOCKED_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void clearerr_unlocked(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_CLEARERR_UNLOCKED_H
diff --git a/libc/src/stdio/fclose.h b/libc/src/stdio/fclose.h
index 0b1a36dcb1b9a..731e3581d8fd1 100644
--- a/libc/src/stdio/fclose.h
+++ b/libc/src/stdio/fclose.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FCLOSE_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fclose(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FCLOSE_H
diff --git a/libc/src/stdio/fdopen.h b/libc/src/stdio/fdopen.h
index 9917c2b2a378e..29028b8ab5ed3 100644
--- a/libc/src/stdio/fdopen.h
+++ b/libc/src/stdio/fdopen.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FDOPEN_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
::FILE *fdopen(int fd, const char *mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FDOPEN_H
diff --git a/libc/src/stdio/feof.h b/libc/src/stdio/feof.h
index 6a88d3b6e8dc9..3d47db6993e1f 100644
--- a/libc/src/stdio/feof.h
+++ b/libc/src/stdio/feof.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FEOF_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int feof(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FEOF_H
diff --git a/libc/src/stdio/feof_unlocked.h b/libc/src/stdio/feof_unlocked.h
index 0c14439a11c56..6eae427992698 100644
--- a/libc/src/stdio/feof_unlocked.h
+++ b/libc/src/stdio/feof_unlocked.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FEOF_UNLOCKED_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int feof_unlocked(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FEOF_UNLOCKED_H
diff --git a/libc/src/stdio/ferror.h b/libc/src/stdio/ferror.h
index d613c373a4b7d..9e2f949bf30e5 100644
--- a/libc/src/stdio/ferror.h
+++ b/libc/src/stdio/ferror.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FERROR_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ferror(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FERROR_H
diff --git a/libc/src/stdio/ferror_unlocked.h b/libc/src/stdio/ferror_unlocked.h
index 13cfd239a2aee..16cfd5a1b1482 100644
--- a/libc/src/stdio/ferror_unlocked.h
+++ b/libc/src/stdio/ferror_unlocked.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FERROR_UNLOCKED_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ferror_unlocked(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FERROR_UNLOCKED_H
diff --git a/libc/src/stdio/fflush.h b/libc/src/stdio/fflush.h
index e810484992a09..d64d5264cf7dd 100644
--- a/libc/src/stdio/fflush.h
+++ b/libc/src/stdio/fflush.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FFLUSH_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fflush(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FFLUSH_H
diff --git a/libc/src/stdio/fgetc.h b/libc/src/stdio/fgetc.h
index f17a88adf871d..f88d759d549ec 100644
--- a/libc/src/stdio/fgetc.h
+++ b/libc/src/stdio/fgetc.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FGETC_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fgetc(::FILE *f);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FGETC_H
diff --git a/libc/src/stdio/fgetc_unlocked.h b/libc/src/stdio/fgetc_unlocked.h
index 5643ee206b30c..9ff311af833e4 100644
--- a/libc/src/stdio/fgetc_unlocked.h
+++ b/libc/src/stdio/fgetc_unlocked.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FGETC_UNLOCKED_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fgetc_unlocked(::FILE *f);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FGETC_UNLOCKED_H
diff --git a/libc/src/stdio/fgets.h b/libc/src/stdio/fgets.h
index 499c27cea24e4..d3d49a1f42952 100644
--- a/libc/src/stdio/fgets.h
+++ b/libc/src/stdio/fgets.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FGETS_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *fgets(char *__restrict str, int count, ::FILE *__restrict raw_stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FGETS_H
diff --git a/libc/src/stdio/fileno.h b/libc/src/stdio/fileno.h
index 7e49e7166685b..667061afbc94d 100644
--- a/libc/src/stdio/fileno.h
+++ b/libc/src/stdio/fileno.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FILENO_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fileno(::FILE *f);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FILENO_H
diff --git a/libc/src/stdio/flockfile.cpp b/libc/src/stdio/flockfile.cpp
index 4fc0af51dbfe8..b996a77b3c300 100644
--- a/libc/src/stdio/flockfile.cpp
+++ b/libc/src/stdio/flockfile.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/flockfile.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, flockfile, (::FILE * stream)) {
reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->lock();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/flockfile.h b/libc/src/stdio/flockfile.h
index b7e2b5f5a9814..ef002657a2416 100644
--- a/libc/src/stdio/flockfile.h
+++ b/libc/src/stdio/flockfile.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FLOCKFILE_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void flockfile(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FLOCKFILE_H
diff --git a/libc/src/stdio/fopen.h b/libc/src/stdio/fopen.h
index a76c3a918f9ac..23f95cfe592e6 100644
--- a/libc/src/stdio/fopen.h
+++ b/libc/src/stdio/fopen.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FOPEN_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
::FILE *fopen(const char *__restrict name, const char *__restrict mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FOPEN_H
diff --git a/libc/src/stdio/fopencookie.cpp b/libc/src/stdio/fopencookie.cpp
index 07be9a5635a92..367172a6fd8c7 100644
--- a/libc/src/stdio/fopencookie.cpp
+++ b/libc/src/stdio/fopencookie.cpp
@@ -14,10 +14,9 @@
#include "src/__support/CPP/new.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -98,4 +97,4 @@ LLVM_LIBC_FUNCTION(::FILE *, fopencookie,
return reinterpret_cast<::FILE *>(file);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/fopencookie.h b/libc/src/stdio/fopencookie.h
index 15b377f6e275a..dc832128a30d0 100644
--- a/libc/src/stdio/fopencookie.h
+++ b/libc/src/stdio/fopencookie.h
@@ -11,13 +11,12 @@
#include "hdr/types/FILE.h"
#include "hdr/types/cookie_io_functions_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
::FILE *fopencookie(void *cookie, const char *__restrict mode,
cookie_io_functions_t desc);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FOPENCOOKIE_H
diff --git a/libc/src/stdio/fprintf.cpp b/libc/src/stdio/fprintf.cpp
index 087aeadfc52c5..5d14d82b77df7 100644
--- a/libc/src/stdio/fprintf.cpp
+++ b/libc/src/stdio/fprintf.cpp
@@ -10,13 +10,12 @@
#include "src/__support/File/file.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/vfprintf_internal.h"
#include "hdr/types/FILE.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fprintf,
(::FILE *__restrict stream, const char *__restrict format,
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, fprintf,
return ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/fprintf.h b/libc/src/stdio/fprintf.h
index 4ab90e3c3f81a..4d070cec7d291 100644
--- a/libc/src/stdio/fprintf.h
+++ b/libc/src/stdio/fprintf.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FPRINTF_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fprintf(::FILE *__restrict stream, const char *__restrict format, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FPRINTF_H
diff --git a/libc/src/stdio/fputc.h b/libc/src/stdio/fputc.h
index 5dde302d8d86c..6c449650d3c1e 100644
--- a/libc/src/stdio/fputc.h
+++ b/libc/src/stdio/fputc.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FPUTC_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fputc(int c, ::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FPUTC_H
diff --git a/libc/src/stdio/fputs.h b/libc/src/stdio/fputs.h
index 4b5534f84f0cc..4dddf96eab27e 100644
--- a/libc/src/stdio/fputs.h
+++ b/libc/src/stdio/fputs.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FPUTS_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fputs(const char *__restrict str, ::FILE *__restrict stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FPUTS_H
diff --git a/libc/src/stdio/fread.h b/libc/src/stdio/fread.h
index ab11af3beb459..a74095aafff91 100644
--- a/libc/src/stdio/fread.h
+++ b/libc/src/stdio/fread.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC_STDIO_FREAD_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t fread(void *__restrict buffer, size_t size, size_t nmemb,
::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FREAD_H
diff --git a/libc/src/stdio/fread_unlocked.h b/libc/src/stdio/fread_unlocked.h
index ff5561e0d30cc..49a3827608f3a 100644
--- a/libc/src/stdio/fread_unlocked.h
+++ b/libc/src/stdio/fread_unlocked.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC_STDIO_FREAD_UNLOCKED_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t fread_unlocked(void *__restrict buffer, size_t size, size_t nmemb,
::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FREAD_UNLOCKED_H
diff --git a/libc/src/stdio/fscanf.cpp b/libc/src/stdio/fscanf.cpp
index 94b843978749e..1f99f873c0700 100644
--- a/libc/src/stdio/fscanf.cpp
+++ b/libc/src/stdio/fscanf.cpp
@@ -10,13 +10,12 @@
#include "src/__support/File/file.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/vfscanf_internal.h"
#include "hdr/types/FILE.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fscanf,
(::FILE *__restrict stream, const char *__restrict format,
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(int, fscanf,
return (ret_val == -1) ? EOF : ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/fscanf.h b/libc/src/stdio/fscanf.h
index 3a8b86b6707d1..21df616783bb3 100644
--- a/libc/src/stdio/fscanf.h
+++ b/libc/src/stdio/fscanf.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FSCANF_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fscanf(::FILE *__restrict stream, const char *__restrict format, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FSCANF_H
diff --git a/libc/src/stdio/fseek.h b/libc/src/stdio/fseek.h
index a979b41c7b7a1..5496cbef4b2f4 100644
--- a/libc/src/stdio/fseek.h
+++ b/libc/src/stdio/fseek.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FSEEK_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fseek(::FILE *stream, long offset, int whence);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FSEEK_H
diff --git a/libc/src/stdio/fseeko.h b/libc/src/stdio/fseeko.h
index 6b83d4a489b33..25fc39e561397 100644
--- a/libc/src/stdio/fseeko.h
+++ b/libc/src/stdio/fseeko.h
@@ -11,12 +11,11 @@
#include "hdr/types/FILE.h"
#include "hdr/types/off_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fseeko(::FILE *stream, off_t offset, int whence);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FSEEKO_H
diff --git a/libc/src/stdio/ftell.h b/libc/src/stdio/ftell.h
index 813d9a1393701..b644edd70181c 100644
--- a/libc/src/stdio/ftell.h
+++ b/libc/src/stdio/ftell.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FTELL_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long ftell(::FILE *f);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FTELL_H
diff --git a/libc/src/stdio/ftello.h b/libc/src/stdio/ftello.h
index 92732d57070d8..fc00b6a3e0516 100644
--- a/libc/src/stdio/ftello.h
+++ b/libc/src/stdio/ftello.h
@@ -11,12 +11,11 @@
#include "hdr/types/FILE.h"
#include "hdr/types/off_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
off_t ftello(::FILE *f);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FTELLO_H
diff --git a/libc/src/stdio/funlockfile.cpp b/libc/src/stdio/funlockfile.cpp
index 7a0712acc72f1..404b2324efd15 100644
--- a/libc/src/stdio/funlockfile.cpp
+++ b/libc/src/stdio/funlockfile.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/funlockfile.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, funlockfile, (::FILE * stream)) {
reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->unlock();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/funlockfile.h b/libc/src/stdio/funlockfile.h
index 0949ca0d92b54..65b77ddfc711e 100644
--- a/libc/src/stdio/funlockfile.h
+++ b/libc/src/stdio/funlockfile.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_FUNLOCKFILE_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void funlockfile(::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FUNLOCKFILE_H
diff --git a/libc/src/stdio/fwrite.h b/libc/src/stdio/fwrite.h
index 8ba5e4d7ce101..c1532984582d1 100644
--- a/libc/src/stdio/fwrite.h
+++ b/libc/src/stdio/fwrite.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC_STDIO_FWRITE_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t fwrite(const void *__restrict ptr, size_t size, size_t nmemb,
::FILE *__restrict stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FWRITE_H
diff --git a/libc/src/stdio/fwrite_unlocked.h b/libc/src/stdio/fwrite_unlocked.h
index 5ee6d38784282..c1a02af807b08 100644
--- a/libc/src/stdio/fwrite_unlocked.h
+++ b/libc/src/stdio/fwrite_unlocked.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC_STDIO_FWRITE_UNLOCKED_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t fwrite_unlocked(const void *__restrict ptr, size_t size, size_t nmemb,
::FILE *__restrict stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_FWRITE_UNLOCKED_H
diff --git a/libc/src/stdio/generic/clearerr.cpp b/libc/src/stdio/generic/clearerr.cpp
index 583181aba5b23..11a2da1847321 100644
--- a/libc/src/stdio/generic/clearerr.cpp
+++ b/libc/src/stdio/generic/clearerr.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/clearerr.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, clearerr, (::FILE * stream)) {
reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->clearerr();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/clearerr_unlocked.cpp b/libc/src/stdio/generic/clearerr_unlocked.cpp
index 313604c811c6d..86caa7ba8a4c5 100644
--- a/libc/src/stdio/generic/clearerr_unlocked.cpp
+++ b/libc/src/stdio/generic/clearerr_unlocked.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/clearerr_unlocked.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, clearerr_unlocked, (::FILE * stream)) {
reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->clearerr_unlocked();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fclose.cpp b/libc/src/stdio/generic/fclose.cpp
index 388407a58d414..50ef17cf2a4a5 100644
--- a/libc/src/stdio/generic/fclose.cpp
+++ b/libc/src/stdio/generic/fclose.cpp
@@ -10,10 +10,9 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fclose, (::FILE * stream)) {
int result = reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->close();
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, fclose, (::FILE * stream)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/feof.cpp b/libc/src/stdio/generic/feof.cpp
index 8c7d195377196..77df40e8bcfdf 100644
--- a/libc/src/stdio/generic/feof.cpp
+++ b/libc/src/stdio/generic/feof.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/feof.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, feof, (::FILE * stream)) {
return reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->iseof();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/feof_unlocked.cpp b/libc/src/stdio/generic/feof_unlocked.cpp
index 0ce827b79716f..0dcefafb6c259 100644
--- a/libc/src/stdio/generic/feof_unlocked.cpp
+++ b/libc/src/stdio/generic/feof_unlocked.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/feof_unlocked.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, feof_unlocked, (::FILE * stream)) {
return reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->iseof_unlocked();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/ferror.cpp b/libc/src/stdio/generic/ferror.cpp
index 33e778ec69765..66128fd6b7753 100644
--- a/libc/src/stdio/generic/ferror.cpp
+++ b/libc/src/stdio/generic/ferror.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/ferror.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ferror, (::FILE * stream)) {
return reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->error();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/ferror_unlocked.cpp b/libc/src/stdio/generic/ferror_unlocked.cpp
index f567f05b55da6..76a4e2556dee3 100644
--- a/libc/src/stdio/generic/ferror_unlocked.cpp
+++ b/libc/src/stdio/generic/ferror_unlocked.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/ferror_unlocked.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ferror_unlocked, (::FILE * stream)) {
return reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->error_unlocked();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fflush.cpp b/libc/src/stdio/generic/fflush.cpp
index 5bdf71ad35940..670dda03d54eb 100644
--- a/libc/src/stdio/generic/fflush.cpp
+++ b/libc/src/stdio/generic/fflush.cpp
@@ -10,10 +10,9 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fflush, (::FILE * stream)) {
int result = reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->flush();
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, fflush, (::FILE * stream)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fgetc.cpp b/libc/src/stdio/generic/fgetc.cpp
index aa6660ca180cf..66afa64875597 100644
--- a/libc/src/stdio/generic/fgetc.cpp
+++ b/libc/src/stdio/generic/fgetc.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fgetc, (::FILE * stream)) {
unsigned char c;
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, fgetc, (::FILE * stream)) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fgetc_unlocked.cpp b/libc/src/stdio/generic/fgetc_unlocked.cpp
index 34a27f1d1c420..7d67a94400ae9 100644
--- a/libc/src/stdio/generic/fgetc_unlocked.cpp
+++ b/libc/src/stdio/generic/fgetc_unlocked.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fgetc_unlocked, (::FILE * stream)) {
unsigned char c;
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, fgetc_unlocked, (::FILE * stream)) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fgets.cpp b/libc/src/stdio/generic/fgets.cpp
index de6474087a140..121790bf7d180 100644
--- a/libc/src/stdio/generic/fgets.cpp
+++ b/libc/src/stdio/generic/fgets.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, fgets,
(char *__restrict str, int count,
@@ -53,4 +52,4 @@ LLVM_LIBC_FUNCTION(char *, fgets,
return str;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fileno.cpp b/libc/src/stdio/generic/fileno.cpp
index 0bec180dd20ac..4ead752c43dda 100644
--- a/libc/src/stdio/generic/fileno.cpp
+++ b/libc/src/stdio/generic/fileno.cpp
@@ -11,12 +11,11 @@
#include "hdr/types/FILE.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fileno, (::FILE * stream)) {
return get_fileno(reinterpret_cast<LIBC_NAMESPACE::File *>(stream));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fopen.cpp b/libc/src/stdio/generic/fopen.cpp
index d6e418bacf37e..19cf3bcd02f5e 100644
--- a/libc/src/stdio/generic/fopen.cpp
+++ b/libc/src/stdio/generic/fopen.cpp
@@ -10,10 +10,9 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(::FILE *, fopen,
(const char *__restrict name, const char *__restrict mode)) {
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(::FILE *, fopen,
return reinterpret_cast<::FILE *>(result.value());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fputc.cpp b/libc/src/stdio/generic/fputc.cpp
index 54a38aeb2f1e2..71d4bb8d5debb 100644
--- a/libc/src/stdio/generic/fputc.cpp
+++ b/libc/src/stdio/generic/fputc.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fputc, (int c, ::FILE *stream)) {
unsigned char uc = static_cast<unsigned char>(c);
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, fputc, (int c, ::FILE *stream)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fputs.cpp b/libc/src/stdio/generic/fputs.cpp
index 8aef7683b3ce3..cefc6c6813750 100644
--- a/libc/src/stdio/generic/fputs.cpp
+++ b/libc/src/stdio/generic/fputs.cpp
@@ -11,11 +11,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fputs,
(const char *__restrict str, ::FILE *__restrict stream)) {
@@ -34,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, fputs,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fread.cpp b/libc/src/stdio/generic/fread.cpp
index 3a04094ea8b4b..986828b86b340 100644
--- a/libc/src/stdio/generic/fread.cpp
+++ b/libc/src/stdio/generic/fread.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, fread,
(void *__restrict buffer, size_t size, size_t nmemb,
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(size_t, fread,
return result.value / size;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fread_unlocked.cpp b/libc/src/stdio/generic/fread_unlocked.cpp
index 151f43c6bbeba..072503d0502ec 100644
--- a/libc/src/stdio/generic/fread_unlocked.cpp
+++ b/libc/src/stdio/generic/fread_unlocked.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, fread_unlocked,
(void *__restrict buffer, size_t size, size_t nmemb,
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(size_t, fread_unlocked,
return result.value / size;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fseek.cpp b/libc/src/stdio/generic/fseek.cpp
index 21820da18542a..c5edc8d4198c7 100644
--- a/libc/src/stdio/generic/fseek.cpp
+++ b/libc/src/stdio/generic/fseek.cpp
@@ -9,10 +9,9 @@
#include "src/stdio/fseek.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fseek, (::FILE * stream, long offset, int whence)) {
auto result =
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, fseek, (::FILE * stream, long offset, int whence)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fseeko.cpp b/libc/src/stdio/generic/fseeko.cpp
index 7456b4a219079..215da759937f6 100644
--- a/libc/src/stdio/generic/fseeko.cpp
+++ b/libc/src/stdio/generic/fseeko.cpp
@@ -9,10 +9,9 @@
#include "src/stdio/fseeko.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fseeko, (::FILE * stream, off_t offset, int whence)) {
auto result =
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, fseeko, (::FILE * stream, off_t offset, int whence)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/ftell.cpp b/libc/src/stdio/generic/ftell.cpp
index ec15ca4e96caf..16487cabf6380 100644
--- a/libc/src/stdio/generic/ftell.cpp
+++ b/libc/src/stdio/generic/ftell.cpp
@@ -9,10 +9,9 @@
#include "src/stdio/ftell.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, ftell, (::FILE * stream)) {
auto result = reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->tell();
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(long, ftell, (::FILE * stream)) {
return static_cast<long>(result.value());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/ftello.cpp b/libc/src/stdio/generic/ftello.cpp
index e3d0726ec4843..c72e56ea6eb1a 100644
--- a/libc/src/stdio/generic/ftello.cpp
+++ b/libc/src/stdio/generic/ftello.cpp
@@ -9,10 +9,9 @@
#include "src/stdio/ftello.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(off_t, ftello, (::FILE * stream)) {
auto result = reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->tell();
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(off_t, ftello, (::FILE * stream)) {
return result.value();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fwrite.cpp b/libc/src/stdio/generic/fwrite.cpp
index 66eb9a3c71855..14c14f5e1a981 100644
--- a/libc/src/stdio/generic/fwrite.cpp
+++ b/libc/src/stdio/generic/fwrite.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, fwrite,
(const void *__restrict buffer, size_t size, size_t nmemb,
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(size_t, fwrite,
return result.value / size;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/fwrite_unlocked.cpp b/libc/src/stdio/generic/fwrite_unlocked.cpp
index a0d9014cd68de..0c76bd13d995a 100644
--- a/libc/src/stdio/generic/fwrite_unlocked.cpp
+++ b/libc/src/stdio/generic/fwrite_unlocked.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, fwrite_unlocked,
(const void *__restrict buffer, size_t size, size_t nmemb,
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(size_t, fwrite_unlocked,
return result.value / size;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/getc.cpp b/libc/src/stdio/generic/getc.cpp
index e988468898c53..20f39479d3100 100644
--- a/libc/src/stdio/generic/getc.cpp
+++ b/libc/src/stdio/generic/getc.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, getc, (::FILE * stream)) {
unsigned char c;
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, getc, (::FILE * stream)) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/getc_unlocked.cpp b/libc/src/stdio/generic/getc_unlocked.cpp
index 92d5092623ac5..849d0be6725ae 100644
--- a/libc/src/stdio/generic/getc_unlocked.cpp
+++ b/libc/src/stdio/generic/getc_unlocked.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, getc_unlocked, (::FILE * stream)) {
unsigned char c;
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, getc_unlocked, (::FILE * stream)) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/getchar.cpp b/libc/src/stdio/generic/getchar.cpp
index 371fc70eb214f..bf3825bbbf166 100644
--- a/libc/src/stdio/generic/getchar.cpp
+++ b/libc/src/stdio/generic/getchar.cpp
@@ -10,10 +10,9 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, getchar, ()) {
unsigned char c;
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, getchar, ()) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/getchar_unlocked.cpp b/libc/src/stdio/generic/getchar_unlocked.cpp
index b898f5cb25963..86777d118ce3b 100644
--- a/libc/src/stdio/generic/getchar_unlocked.cpp
+++ b/libc/src/stdio/generic/getchar_unlocked.cpp
@@ -10,10 +10,9 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, getchar_unlocked, ()) {
unsigned char c;
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, getchar_unlocked, ()) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/printf.cpp b/libc/src/stdio/generic/printf.cpp
index bb7c7c86f843f..14a4225af44c5 100644
--- a/libc/src/stdio/generic/printf.cpp
+++ b/libc/src/stdio/generic/printf.cpp
@@ -10,7 +10,6 @@
#include "src/__support/File/file.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/vfprintf_internal.h"
#include "hdr/types/FILE.h"
@@ -22,7 +21,7 @@
#define PRINTF_STDOUT ::stdout
#endif // LIBC_COPT_STDIO_USE_SYSTEM_FILE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, printf, (const char *__restrict format, ...)) {
va_list vlist;
@@ -36,4 +35,4 @@ LLVM_LIBC_FUNCTION(int, printf, (const char *__restrict format, ...)) {
return ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/putc.cpp b/libc/src/stdio/generic/putc.cpp
index b5f008fdce44a..e8ebbb3d18e9d 100644
--- a/libc/src/stdio/generic/putc.cpp
+++ b/libc/src/stdio/generic/putc.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, putc, (int c, ::FILE *stream)) {
unsigned char uc = static_cast<unsigned char>(c);
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, putc, (int c, ::FILE *stream)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/putchar.cpp b/libc/src/stdio/generic/putchar.cpp
index e86df23d6716b..e9e6f962b3415 100644
--- a/libc/src/stdio/generic/putchar.cpp
+++ b/libc/src/stdio/generic/putchar.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, putchar, (int c)) {
unsigned char uc = static_cast<unsigned char>(c);
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, putchar, (int c)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/puts.cpp b/libc/src/stdio/generic/puts.cpp
index 7dbe2c79f920d..247d4f088463c 100644
--- a/libc/src/stdio/generic/puts.cpp
+++ b/libc/src/stdio/generic/puts.cpp
@@ -11,11 +11,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -55,4 +54,4 @@ LLVM_LIBC_FUNCTION(int, puts, (const char *__restrict str)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/ungetc.cpp b/libc/src/stdio/generic/ungetc.cpp
index 44ffdfc3e523f..8e2897e3c5261 100644
--- a/libc/src/stdio/generic/ungetc.cpp
+++ b/libc/src/stdio/generic/ungetc.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/ungetc.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ungetc, (int c, ::FILE *stream)) {
return reinterpret_cast<LIBC_NAMESPACE::File *>(stream)->ungetc(c);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/generic/vprintf.cpp b/libc/src/stdio/generic/vprintf.cpp
index 08d71515646ed..f78a84fb8454f 100644
--- a/libc/src/stdio/generic/vprintf.cpp
+++ b/libc/src/stdio/generic/vprintf.cpp
@@ -10,7 +10,6 @@
#include "src/__support/File/file.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/vfprintf_internal.h"
#include "hdr/types/FILE.h"
@@ -22,7 +21,7 @@
#define PRINTF_STDOUT ::stdout
#endif // LIBC_COPT_STDIO_USE_SYSTEM_FILE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, vprintf,
(const char *__restrict format, va_list vlist)) {
@@ -34,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, vprintf,
return ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/getc.h b/libc/src/stdio/getc.h
index 823f319ef6fd3..85675268cb405 100644
--- a/libc/src/stdio/getc.h
+++ b/libc/src/stdio/getc.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_GETC_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int getc(::FILE *f);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_GETC_H
diff --git a/libc/src/stdio/getc_unlocked.h b/libc/src/stdio/getc_unlocked.h
index 2e0abac51c27b..45dcb4eb0afa4 100644
--- a/libc/src/stdio/getc_unlocked.h
+++ b/libc/src/stdio/getc_unlocked.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_GETC_UNLOCKED_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int getc_unlocked(::FILE *f);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_GETC_UNLOCKED_H
diff --git a/libc/src/stdio/getchar.h b/libc/src/stdio/getchar.h
index c9497fea0f55c..4168808d3e329 100644
--- a/libc/src/stdio/getchar.h
+++ b/libc/src/stdio/getchar.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDIO_GETCHAR_H
#define LLVM_LIBC_SRC_STDIO_GETCHAR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int getchar();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_GETCHAR_H
diff --git a/libc/src/stdio/getchar_unlocked.h b/libc/src/stdio/getchar_unlocked.h
index 96fae852daecc..24fdb752f5530 100644
--- a/libc/src/stdio/getchar_unlocked.h
+++ b/libc/src/stdio/getchar_unlocked.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDIO_GETCHAR_UNLOCKED_H
#define LLVM_LIBC_SRC_STDIO_GETCHAR_UNLOCKED_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int getchar_unlocked();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_GETCHAR_UNLOCKED_H
diff --git a/libc/src/stdio/gpu/clearerr.cpp b/libc/src/stdio/gpu/clearerr.cpp
index 5826a7bcb95fb..ec7fe41ac08e1 100644
--- a/libc/src/stdio/gpu/clearerr.cpp
+++ b/libc/src/stdio/gpu/clearerr.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/clearerr.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, clearerr, (::FILE * stream)) {
rpc::Client::Port port = rpc::client.open<RPC_CLEARERR>();
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(void, clearerr, (::FILE * stream)) {
port.close();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fclose.cpp b/libc/src/stdio/gpu/fclose.cpp
index 78caccd90c693..3bc68f1dfc7cd 100644
--- a/libc/src/stdio/gpu/fclose.cpp
+++ b/libc/src/stdio/gpu/fclose.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/stdio/fclose.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/gpu/file.h"
#include "hdr/stdio_macros.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fclose, (::FILE * stream)) {
uint64_t ret = 0;
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, fclose, (::FILE * stream)) {
return static_cast<int>(ret);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/feof.cpp b/libc/src/stdio/gpu/feof.cpp
index 4a8a17332a0a9..dee1e3841e638 100644
--- a/libc/src/stdio/gpu/feof.cpp
+++ b/libc/src/stdio/gpu/feof.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/feof.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, feof, (::FILE * stream)) {
int ret;
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, feof, (::FILE * stream)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/ferror.cpp b/libc/src/stdio/gpu/ferror.cpp
index 1cee96f5ef23b..90e1592cdbe09 100644
--- a/libc/src/stdio/gpu/ferror.cpp
+++ b/libc/src/stdio/gpu/ferror.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/ferror.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ferror, (::FILE * stream)) {
int ret;
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, ferror, (::FILE * stream)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fflush.cpp b/libc/src/stdio/gpu/fflush.cpp
index be267a2e9ce12..60c352217dd96 100644
--- a/libc/src/stdio/gpu/fflush.cpp
+++ b/libc/src/stdio/gpu/fflush.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/fflush.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fflush, (::FILE * stream)) {
int ret;
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, fflush, (::FILE * stream)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fgetc.cpp b/libc/src/stdio/gpu/fgetc.cpp
index cb42f3100a9fe..08e6eb37c5e0d 100644
--- a/libc/src/stdio/gpu/fgetc.cpp
+++ b/libc/src/stdio/gpu/fgetc.cpp
@@ -8,12 +8,11 @@
#include "src/stdio/fgetc.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/stdio_macros.h" // for EOF.
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fgetc, (::FILE * stream)) {
unsigned char c;
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, fgetc, (::FILE * stream)) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fgets.cpp b/libc/src/stdio/gpu/fgets.cpp
index 942f6f0ff03bc..fb0a30b78e697 100644
--- a/libc/src/stdio/gpu/fgets.cpp
+++ b/libc/src/stdio/gpu/fgets.cpp
@@ -8,7 +8,6 @@
#include "src/stdio/fgets.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/feof.h"
#include "src/stdio/ferror.h"
@@ -16,7 +15,7 @@
#include "hdr/types/FILE.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, fgets,
(char *__restrict str, int count,
@@ -41,4 +40,4 @@ LLVM_LIBC_FUNCTION(char *, fgets,
return str;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/file.h b/libc/src/stdio/gpu/file.h
index 5de76842d7bea..8cbba9ec5d713 100644
--- a/libc/src/stdio/gpu/file.h
+++ b/libc/src/stdio/gpu/file.h
@@ -7,14 +7,13 @@
//===----------------------------------------------------------------------===//
#include "src/__support/RPC/rpc_client.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
#include "hdr/types/FILE.h"
#include <stdio.h> //needed for stdin/out/err
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace file {
enum Stream {
@@ -97,4 +96,4 @@ LIBC_INLINE uint64_t read(::FILE *f, void *data, size_t size) {
}
} // namespace file
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fopen.cpp b/libc/src/stdio/gpu/fopen.cpp
index 76daece68ac9d..1e55725f18cce 100644
--- a/libc/src/stdio/gpu/fopen.cpp
+++ b/libc/src/stdio/gpu/fopen.cpp
@@ -8,12 +8,11 @@
#include "src/stdio/fopen.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/gpu/file.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(::FILE *, fopen,
(const char *__restrict path, const char *__restrict mode)) {
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(::FILE *, fopen,
return reinterpret_cast<FILE *>(file);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fputc.cpp b/libc/src/stdio/gpu/fputc.cpp
index ad2db03df0ca4..a99eaeb8ceb93 100644
--- a/libc/src/stdio/gpu/fputc.cpp
+++ b/libc/src/stdio/gpu/fputc.cpp
@@ -8,12 +8,11 @@
#include "src/stdio/fputc.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/stdio_macros.h" // for EOF.
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fputc, (int c, ::FILE *stream)) {
unsigned char uc = static_cast<unsigned char>(c);
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, fputc, (int c, ::FILE *stream)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fputs.cpp b/libc/src/stdio/gpu/fputs.cpp
index 7a08244bc26e4..4803da978dc1f 100644
--- a/libc/src/stdio/gpu/fputs.cpp
+++ b/libc/src/stdio/gpu/fputs.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/fputs.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/stdio/gpu/file.h"
#include "hdr/stdio_macros.h" // for EOF.
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fputs,
(const char *__restrict str, ::FILE *__restrict stream)) {
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, fputs,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fread.cpp b/libc/src/stdio/gpu/fread.cpp
index 57fa5b6111ff6..233a7809e8468 100644
--- a/libc/src/stdio/gpu/fread.cpp
+++ b/libc/src/stdio/gpu/fread.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/stdio/fread.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/gpu/file.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, fread,
(void *__restrict buffer, size_t size, size_t nmemb,
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(size_t, fread,
return result / size;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fseek.cpp b/libc/src/stdio/gpu/fseek.cpp
index 4f3e9ce6ec024..3b1f85db1fd0b 100644
--- a/libc/src/stdio/gpu/fseek.cpp
+++ b/libc/src/stdio/gpu/fseek.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/fseek.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fseek, (::FILE * stream, long offset, int whence)) {
int ret;
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, fseek, (::FILE * stream, long offset, int whence)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/ftell.cpp b/libc/src/stdio/gpu/ftell.cpp
index 483b1ad4fee0f..5664726d68d30 100644
--- a/libc/src/stdio/gpu/ftell.cpp
+++ b/libc/src/stdio/gpu/ftell.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/ftell.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, ftell, (::FILE * stream)) {
long ret;
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(long, ftell, (::FILE * stream)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/fwrite.cpp b/libc/src/stdio/gpu/fwrite.cpp
index 6c548690039a4..1321e32c272a1 100644
--- a/libc/src/stdio/gpu/fwrite.cpp
+++ b/libc/src/stdio/gpu/fwrite.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/fwrite.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, fwrite,
(const void *__restrict buffer, size_t size, size_t nmemb,
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(size_t, fwrite,
return result / size;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/getc.cpp b/libc/src/stdio/gpu/getc.cpp
index 9c329749ee1fc..d77d8ba0ff421 100644
--- a/libc/src/stdio/gpu/getc.cpp
+++ b/libc/src/stdio/gpu/getc.cpp
@@ -8,12 +8,11 @@
#include "src/stdio/getc.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/stdio_macros.h" // for EOF.
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, getc, (::FILE * stream)) {
unsigned char c;
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, getc, (::FILE * stream)) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/getchar.cpp b/libc/src/stdio/gpu/getchar.cpp
index 048cf23b0d64a..28e86da8400a3 100644
--- a/libc/src/stdio/gpu/getchar.cpp
+++ b/libc/src/stdio/gpu/getchar.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/getchar.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/stdio_macros.h" // for EOF.
#include "hdr/types/FILE.h"
#include <stdio.h> //needed for stdin
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, getchar, ()) {
unsigned char c;
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, getchar, ()) {
return c;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/putc.cpp b/libc/src/stdio/gpu/putc.cpp
index f8ae98d26cf0e..d054d282c4632 100644
--- a/libc/src/stdio/gpu/putc.cpp
+++ b/libc/src/stdio/gpu/putc.cpp
@@ -8,12 +8,11 @@
#include "src/stdio/putc.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/stdio_macros.h" // for EOF.
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, putc, (int c, ::FILE *stream)) {
unsigned char uc = static_cast<unsigned char>(c);
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, putc, (int c, ::FILE *stream)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/putchar.cpp b/libc/src/stdio/gpu/putchar.cpp
index d03a3fe68daf7..3e38401c7a042 100644
--- a/libc/src/stdio/gpu/putchar.cpp
+++ b/libc/src/stdio/gpu/putchar.cpp
@@ -8,14 +8,13 @@
#include "src/stdio/putchar.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/stdio_macros.h" // for EOF.
#include "hdr/types/FILE.h"
#include <stdio.h> //needed for stdout
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, putchar, (int c)) {
unsigned char uc = static_cast<unsigned char>(c);
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, putchar, (int c)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/puts.cpp b/libc/src/stdio/gpu/puts.cpp
index af84432d1ef8c..f6d91ccf63008 100644
--- a/libc/src/stdio/gpu/puts.cpp
+++ b/libc/src/stdio/gpu/puts.cpp
@@ -8,7 +8,6 @@
#include "src/stdio/puts.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/stdio/gpu/file.h"
@@ -17,7 +16,7 @@
#include <stdio.h> //needed for stdout
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, puts, (const char *__restrict str)) {
cpp::string_view str_view(str);
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, puts, (const char *__restrict str)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/remove.cpp b/libc/src/stdio/gpu/remove.cpp
index 3f21e8aeff5ae..6b53e1f6af596 100644
--- a/libc/src/stdio/gpu/remove.cpp
+++ b/libc/src/stdio/gpu/remove.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/remove.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, remove, (const char *path)) {
int ret;
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, remove, (const char *path)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/gpu/stderr.cpp b/libc/src/stdio/gpu/stderr.cpp
index efbc3b407d60e..e239b94c7b8a9 100644
--- a/libc/src/stdio/gpu/stderr.cpp
+++ b/libc/src/stdio/gpu/stderr.cpp
@@ -7,11 +7,10 @@
//===----------------------------------------------------------------------===//
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static struct {
} stub;
FILE *stderr = reinterpret_cast<FILE *>(&stub);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
extern "C" FILE *stderr = reinterpret_cast<FILE *>(&LIBC_NAMESPACE::stub);
diff --git a/libc/src/stdio/gpu/stdin.cpp b/libc/src/stdio/gpu/stdin.cpp
index 66618fd0b4db8..6a305c89ac23c 100644
--- a/libc/src/stdio/gpu/stdin.cpp
+++ b/libc/src/stdio/gpu/stdin.cpp
@@ -7,11 +7,10 @@
//===----------------------------------------------------------------------===//
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static struct {
} stub;
FILE *stdin = reinterpret_cast<FILE *>(&stub);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
extern "C" FILE *stdin = reinterpret_cast<FILE *>(&LIBC_NAMESPACE::stub);
diff --git a/libc/src/stdio/gpu/stdout.cpp b/libc/src/stdio/gpu/stdout.cpp
index e3869f9e26b77..fffe1376a818f 100644
--- a/libc/src/stdio/gpu/stdout.cpp
+++ b/libc/src/stdio/gpu/stdout.cpp
@@ -7,11 +7,10 @@
//===----------------------------------------------------------------------===//
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static struct {
} stub;
FILE *stdout = reinterpret_cast<FILE *>(&stub);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
extern "C" FILE *stdout = reinterpret_cast<FILE *>(&LIBC_NAMESPACE::stub);
diff --git a/libc/src/stdio/gpu/ungetc.cpp b/libc/src/stdio/gpu/ungetc.cpp
index e9232a5e43a27..52379e125464b 100644
--- a/libc/src/stdio/gpu/ungetc.cpp
+++ b/libc/src/stdio/gpu/ungetc.cpp
@@ -8,11 +8,10 @@
#include "src/stdio/ungetc.h"
#include "file.h"
-#include "src/__support/macros/config.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ungetc, (int c, ::FILE *stream)) {
int ret;
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, ungetc, (int c, ::FILE *stream)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/linux/fdopen.cpp b/libc/src/stdio/linux/fdopen.cpp
index 7d72fdc88e9fb..a1d08eecbfdee 100644
--- a/libc/src/stdio/linux/fdopen.cpp
+++ b/libc/src/stdio/linux/fdopen.cpp
@@ -9,10 +9,9 @@
#include "src/stdio/fdopen.h"
#include "src/__support/File/linux/file.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(::FILE *, fdopen, (int fd, const char *mode)) {
auto result = LIBC_NAMESPACE::create_file_from_fd(fd, mode);
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(::FILE *, fdopen, (int fd, const char *mode)) {
return reinterpret_cast<::FILE *>(result.value());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/linux/remove.cpp b/libc/src/stdio/linux/remove.cpp
index 9e299aaf43e45..b2742c29a3e26 100644
--- a/libc/src/stdio/linux/remove.cpp
+++ b/libc/src/stdio/linux/remove.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h> // For AT_* macros.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, remove, (const char *path)) {
// We first try unlinking it as a file. If it is ia file, it will succeed. If
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, remove, (const char *path)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/linux/rename.cpp b/libc/src/stdio/linux/rename.cpp
index 69fd22720ed19..379a6ef3c0c84 100644
--- a/libc/src/stdio/linux/rename.cpp
+++ b/libc/src/stdio/linux/rename.cpp
@@ -10,11 +10,10 @@
#include "include/llvm-libc-macros/linux/fcntl-macros.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, rename, (const char *oldpath, const char *newpath)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_renameat2, AT_FDCWD, oldpath,
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, rename, (const char *oldpath, const char *newpath)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/printf.h b/libc/src/stdio/printf.h
index 9e47ad8680f9c..60ccf613e2980 100644
--- a/libc/src/stdio/printf.h
+++ b/libc/src/stdio/printf.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_PRINTF_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int printf(const char *__restrict format, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_H
diff --git a/libc/src/stdio/printf_core/char_converter.h b/libc/src/stdio/printf_core/char_converter.h
index 2596cba813c2e..13596b8ed4f23 100644
--- a/libc/src/stdio/printf_core/char_converter.h
+++ b/libc/src/stdio/printf_core/char_converter.h
@@ -9,12 +9,11 @@
#ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_CHAR_CONVERTER_H
#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_CHAR_CONVERTER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/converter_utils.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/writer.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
LIBC_INLINE int convert_char(Writer *writer, const FormatSection &to_conv) {
@@ -43,6 +42,6 @@ LIBC_INLINE int convert_char(Writer *writer, const FormatSection &to_conv) {
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_CHAR_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/converter.cpp b/libc/src/stdio/printf_core/converter.cpp
index 37af5dc1ea026..613d693c3cfcb 100644
--- a/libc/src/stdio/printf_core/converter.cpp
+++ b/libc/src/stdio/printf_core/converter.cpp
@@ -8,7 +8,6 @@
#include "src/stdio/printf_core/converter.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/printf_config.h"
#include "src/stdio/printf_core/writer.h"
@@ -23,7 +22,7 @@
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
int convert(Writer *writer, const FormatSection &to_conv) {
@@ -97,4 +96,4 @@ int convert(Writer *writer, const FormatSection &to_conv) {
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/printf_core/converter.h b/libc/src/stdio/printf_core/converter.h
index 2b3f06d0aa7a3..d653f1e56dc28 100644
--- a/libc/src/stdio/printf_core/converter.h
+++ b/libc/src/stdio/printf_core/converter.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_CONVERTER_H
#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_CONVERTER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/writer.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
// convert will call a conversion function to convert the FormatSection into
@@ -24,6 +23,6 @@ namespace printf_core {
int convert(Writer *writer, const FormatSection &to_conv);
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/converter_utils.h b/libc/src/stdio/printf_core/converter_utils.h
index 3f25ebfd40ed9..a0e96a11be5bf 100644
--- a/libc/src/stdio/printf_core/converter_utils.h
+++ b/libc/src/stdio/printf_core/converter_utils.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_CONVERTER_UTILS_H
#include "src/__support/CPP/limits.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include <inttypes.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
LIBC_INLINE uintmax_t apply_length_modifier(uintmax_t num,
@@ -70,6 +69,6 @@ LIBC_INLINE uintmax_t apply_length_modifier(uintmax_t num,
enum class RoundDirection { Up, Down, Even };
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_CONVERTER_UTILS_H
diff --git a/libc/src/stdio/printf_core/core_structs.h b/libc/src/stdio/printf_core/core_structs.h
index 76d006b813dd1..bfe362becad1e 100644
--- a/libc/src/stdio/printf_core/core_structs.h
+++ b/libc/src/stdio/printf_core/core_structs.h
@@ -19,7 +19,7 @@
#include <inttypes.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
// These length modifiers match the length modifiers in the format string, which
@@ -136,6 +136,6 @@ constexpr int INT_CONVERSION_ERROR = -4;
constexpr int FIXED_POINT_CONVERSION_ERROR = -5;
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_CORE_STRUCTS_H
diff --git a/libc/src/stdio/printf_core/fixed_converter.h b/libc/src/stdio/printf_core/fixed_converter.h
index c8812d77b62e3..de69c603be6b6 100644
--- a/libc/src/stdio/printf_core/fixed_converter.h
+++ b/libc/src/stdio/printf_core/fixed_converter.h
@@ -15,7 +15,6 @@
#include "src/__support/fixed_point/fx_rep.h"
#include "src/__support/integer_to_string.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/converter_utils.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/writer.h"
@@ -23,7 +22,7 @@
#include <inttypes.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
// This is just for assertions. It will be compiled out for release builds.
@@ -305,6 +304,6 @@ LIBC_INLINE int convert_fixed(Writer *writer, const FormatSection &to_conv) {
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FIXED_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/float_dec_converter.h b/libc/src/stdio/printf_core/float_dec_converter.h
index e39ba6ecea8d4..1237db62e428a 100644
--- a/libc/src/stdio/printf_core/float_dec_converter.h
+++ b/libc/src/stdio/printf_core/float_dec_converter.h
@@ -16,7 +16,6 @@
#include "src/__support/float_to_string.h"
#include "src/__support/integer_to_string.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/converter_utils.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/float_inf_nan_converter.h"
@@ -25,7 +24,7 @@
#include <inttypes.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
using StorageType = fputil::FPBits<long double>::StorageType;
@@ -1171,6 +1170,6 @@ LIBC_INLINE int convert_float_dec_auto(Writer *writer,
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FLOAT_DEC_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/float_hex_converter.h b/libc/src/stdio/printf_core/float_hex_converter.h
index 0b3ff3dd1cbfd..8fac36df3d1e2 100644
--- a/libc/src/stdio/printf_core/float_hex_converter.h
+++ b/libc/src/stdio/printf_core/float_hex_converter.h
@@ -12,7 +12,6 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/rounding_mode.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/converter_utils.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/float_inf_nan_converter.h"
@@ -21,7 +20,7 @@
#include <inttypes.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
LIBC_INLINE int convert_float_hex_exp(Writer *writer,
@@ -256,6 +255,6 @@ LIBC_INLINE int convert_float_hex_exp(Writer *writer,
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FLOAT_HEX_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/float_inf_nan_converter.h b/libc/src/stdio/printf_core/float_inf_nan_converter.h
index a7da682b835be..f755ef6e31f26 100644
--- a/libc/src/stdio/printf_core/float_inf_nan_converter.h
+++ b/libc/src/stdio/printf_core/float_inf_nan_converter.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FLOAT_INF_NAN_CONVERTER_H
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/converter_utils.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/writer.h"
@@ -18,7 +17,7 @@
#include <inttypes.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
using StorageType = fputil::FPBits<long double>::StorageType;
@@ -79,6 +78,6 @@ LIBC_INLINE int convert_inf_nan(Writer *writer, const FormatSection &to_conv) {
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_FLOAT_INF_NAN_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/int_converter.h b/libc/src/stdio/printf_core/int_converter.h
index f345e86b97a69..496e7bd1a56d9 100644
--- a/libc/src/stdio/printf_core/int_converter.h
+++ b/libc/src/stdio/printf_core/int_converter.h
@@ -12,7 +12,6 @@
#include "src/__support/CPP/span.h"
#include "src/__support/CPP/string_view.h"
#include "src/__support/integer_to_string.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/converter_utils.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/writer.h"
@@ -20,7 +19,7 @@
#include <inttypes.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
// These functions only work on characters that are already known to be in the
@@ -210,6 +209,6 @@ LIBC_INLINE int convert_int(Writer *writer, const FormatSection &to_conv) {
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_INT_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/parser.h b/libc/src/stdio/printf_core/parser.h
index 207affd83f65b..b9a8f303dd673 100644
--- a/libc/src/stdio/printf_core/parser.h
+++ b/libc/src/stdio/printf_core/parser.h
@@ -13,7 +13,6 @@
#include "src/__support/CPP/algorithm.h" // max
#include "src/__support/CPP/optional.h"
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/printf_config.h"
@@ -24,7 +23,7 @@
#include "src/__support/fixed_point/fx_rep.h"
#endif // LIBC_INTERNAL_PRINTF_HAS_FIXED_POINT
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
template <typename T> struct int_type_of {
@@ -669,6 +668,6 @@ template <typename ArgProvider> class Parser {
};
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PARSER_H
diff --git a/libc/src/stdio/printf_core/printf_main.cpp b/libc/src/stdio/printf_core/printf_main.cpp
index bd4a5a168bd23..54e70f58c87fe 100644
--- a/libc/src/stdio/printf_core/printf_main.cpp
+++ b/libc/src/stdio/printf_core/printf_main.cpp
@@ -9,7 +9,6 @@
#include "src/stdio/printf_core/printf_main.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/converter.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/parser.h"
@@ -17,7 +16,7 @@
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
int printf_main(Writer *writer, const char *__restrict str,
@@ -40,4 +39,4 @@ int printf_main(Writer *writer, const char *__restrict str,
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/printf_core/printf_main.h b/libc/src/stdio/printf_core/printf_main.h
index 3e73bf36e0e30..15c6977622afb 100644
--- a/libc/src/stdio/printf_core/printf_main.h
+++ b/libc/src/stdio/printf_core/printf_main.h
@@ -10,18 +10,17 @@
#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PRINTF_MAIN_H
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/writer.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
int printf_main(Writer *writer, const char *__restrict str,
internal::ArgList &args);
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PRINTF_MAIN_H
diff --git a/libc/src/stdio/printf_core/ptr_converter.h b/libc/src/stdio/printf_core/ptr_converter.h
index bf84718dfe6a8..c5d4086647ec3 100644
--- a/libc/src/stdio/printf_core/ptr_converter.h
+++ b/libc/src/stdio/printf_core/ptr_converter.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PTR_CONVERTER_H
#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PTR_CONVERTER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/int_converter.h"
#include "src/stdio/printf_core/string_converter.h"
#include "src/stdio/printf_core/writer.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
LIBC_INLINE int convert_pointer(Writer *writer, const FormatSection &to_conv) {
@@ -36,6 +35,6 @@ LIBC_INLINE int convert_pointer(Writer *writer, const FormatSection &to_conv) {
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_PTR_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/string_converter.h b/libc/src/stdio/printf_core/string_converter.h
index 1f36d51124107..9e05591079faa 100644
--- a/libc/src/stdio/printf_core/string_converter.h
+++ b/libc/src/stdio/printf_core/string_converter.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_STRING_CONVERTER_H
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/converter_utils.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/writer.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
LIBC_INLINE int convert_string(Writer *writer, const FormatSection &to_conv) {
@@ -59,6 +58,6 @@ LIBC_INLINE int convert_string(Writer *writer, const FormatSection &to_conv) {
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_STRING_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/vfprintf_internal.h b/libc/src/stdio/printf_core/vfprintf_internal.h
index 3becfee71dd27..2917aa22865f5 100644
--- a/libc/src/stdio/printf_core/vfprintf_internal.h
+++ b/libc/src/stdio/printf_core/vfprintf_internal.h
@@ -12,14 +12,13 @@
#include "src/__support/File/file.h"
#include "src/__support/arg_list.h"
#include "src/__support/macros/attributes.h" // For LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/printf_main.h"
#include "src/stdio/printf_core/writer.h"
#include "hdr/types/FILE.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
#ifndef LIBC_COPT_STDIO_USE_SYSTEM_FILE
@@ -85,6 +84,6 @@ LIBC_INLINE int vfprintf_internal(::FILE *__restrict stream,
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_VFPRINTF_INTERNAL_H
diff --git a/libc/src/stdio/printf_core/write_int_converter.h b/libc/src/stdio/printf_core/write_int_converter.h
index a47cb41cb3287..18aa5c79897ec 100644
--- a/libc/src/stdio/printf_core/write_int_converter.h
+++ b/libc/src/stdio/printf_core/write_int_converter.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STDIO_PRINTF_CORE_WRITE_INT_CONVERTER_H
#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_WRITE_INT_CONVERTER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/stdio/printf_core/writer.h"
#include <inttypes.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
LIBC_INLINE int convert_write_int(Writer *writer,
@@ -65,6 +64,6 @@ LIBC_INLINE int convert_write_int(Writer *writer,
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_WRITE_INT_CONVERTER_H
diff --git a/libc/src/stdio/printf_core/writer.cpp b/libc/src/stdio/printf_core/writer.cpp
index d1cf85df1c8f8..f8ecd829af3a6 100644
--- a/libc/src/stdio/printf_core/writer.cpp
+++ b/libc/src/stdio/printf_core/writer.cpp
@@ -8,12 +8,11 @@
#include "writer.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/string/memory_utils/inline_memset.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
int Writer::pad(char new_char, size_t length) {
@@ -43,4 +42,4 @@ int Writer::pad(char new_char, size_t length) {
}
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/printf_core/writer.h b/libc/src/stdio/printf_core/writer.h
index 89421561f3b2e..67513eca97288 100644
--- a/libc/src/stdio/printf_core/writer.h
+++ b/libc/src/stdio/printf_core/writer.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC_STDIO_PRINTF_CORE_WRITER_H
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/stdio/printf_core/core_structs.h"
#include "src/string/memory_utils/inline_memcpy.h"
@@ -18,7 +17,7 @@
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace printf_core {
struct WriteBuffer {
@@ -135,6 +134,6 @@ class Writer final {
};
} // namespace printf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PRINTF_CORE_WRITER_H
diff --git a/libc/src/stdio/putc.h b/libc/src/stdio/putc.h
index 35ec07bd51524..9d331d005bf68 100644
--- a/libc/src/stdio/putc.h
+++ b/libc/src/stdio/putc.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_PUTC_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int putc(int c, ::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PUTC_H
diff --git a/libc/src/stdio/putchar.h b/libc/src/stdio/putchar.h
index 84a5ea8d4493d..e458e3179ed6b 100644
--- a/libc/src/stdio/putchar.h
+++ b/libc/src/stdio/putchar.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDIO_PUTCHAR_H
#define LLVM_LIBC_SRC_STDIO_PUTCHAR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int putchar(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PUTCHAR_H
diff --git a/libc/src/stdio/puts.h b/libc/src/stdio/puts.h
index d93495b0fbb46..68d5225b00a17 100644
--- a/libc/src/stdio/puts.h
+++ b/libc/src/stdio/puts.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDIO_PUTS_H
#define LLVM_LIBC_SRC_STDIO_PUTS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int puts(const char *__restrict str);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_PUTS_H
diff --git a/libc/src/stdio/remove.h b/libc/src/stdio/remove.h
index 267946ff27598..3e541a0c675ae 100644
--- a/libc/src/stdio/remove.h
+++ b/libc/src/stdio/remove.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_REMOVE_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int remove(const char *path);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_REMOVE_H
diff --git a/libc/src/stdio/rename.h b/libc/src/stdio/rename.h
index 5c9ab88346c81..eadda7c3eac9b 100644
--- a/libc/src/stdio/rename.h
+++ b/libc/src/stdio/rename.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDIO_RENAME_H
#define LLVM_LIBC_SRC_STDIO_RENAME_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int rename(const char *oldpath, const char *newpath);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_RENAME_H
diff --git a/libc/src/stdio/scanf.cpp b/libc/src/stdio/scanf.cpp
index 86a8851df2886..bfa8d46007b99 100644
--- a/libc/src/stdio/scanf.cpp
+++ b/libc/src/stdio/scanf.cpp
@@ -10,7 +10,6 @@
#include "src/__support/File/file.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/vfscanf_internal.h"
#include "hdr/types/FILE.h"
@@ -22,7 +21,7 @@
#define SCANF_STDIN ::stdin
#endif // LIBC_COPT_STDIO_USE_SYSTEM_FILE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, scanf, (const char *__restrict format, ...)) {
va_list vlist;
@@ -38,4 +37,4 @@ LLVM_LIBC_FUNCTION(int, scanf, (const char *__restrict format, ...)) {
return (ret_val == -1) ? EOF : ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/scanf.h b/libc/src/stdio/scanf.h
index f3349c75c6351..58e42d1fac185 100644
--- a/libc/src/stdio/scanf.h
+++ b/libc/src/stdio/scanf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDIO_SCANF_H
#define LLVM_LIBC_SRC_STDIO_SCANF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int scanf(const char *__restrict format, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_H
diff --git a/libc/src/stdio/scanf_core/converter.cpp b/libc/src/stdio/scanf_core/converter.cpp
index b1ee8cd1e74bb..5334af1be98e1 100644
--- a/libc/src/stdio/scanf_core/converter.cpp
+++ b/libc/src/stdio/scanf_core/converter.cpp
@@ -9,7 +9,6 @@
#include "src/stdio/scanf_core/converter.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
@@ -23,7 +22,7 @@
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
int convert(Reader *reader, const FormatSection &to_conv) {
@@ -100,4 +99,4 @@ int raw_match(Reader *reader, cpp::string_view raw_string) {
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/scanf_core/converter.h b/libc/src/stdio/scanf_core/converter.h
index 3f514eeb75bdf..f741840da304e 100644
--- a/libc/src/stdio/scanf_core/converter.h
+++ b/libc/src/stdio/scanf_core/converter.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_CONVERTER_H
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
// convert will call a conversion function to convert the FormatSection into
@@ -29,6 +28,6 @@ int convert(Reader *reader, const FormatSection &to_conv);
int raw_match(Reader *reader, cpp::string_view raw_string);
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_CONVERTER_H
diff --git a/libc/src/stdio/scanf_core/converter_utils.h b/libc/src/stdio/scanf_core/converter_utils.h
index 61954556b838a..a25e8a73e99a4 100644
--- a/libc/src/stdio/scanf_core/converter_utils.h
+++ b/libc/src/stdio/scanf_core/converter_utils.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_CONVERTER_UTILS_H
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/stdio/scanf_core/core_structs.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
LIBC_INLINE constexpr char to_lower(char a) { return a | 32; }
@@ -107,6 +106,6 @@ LIBC_INLINE void write_float_with_length(char *str,
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_CONVERTER_UTILS_H
diff --git a/libc/src/stdio/scanf_core/core_structs.h b/libc/src/stdio/scanf_core/core_structs.h
index 87b2429ae550e..29e1bf2e47f39 100644
--- a/libc/src/stdio/scanf_core/core_structs.h
+++ b/libc/src/stdio/scanf_core/core_structs.h
@@ -11,12 +11,11 @@
#include "src/__support/CPP/bitset.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include <inttypes.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
// These length modifiers match the length modifiers in the format string, which
@@ -87,6 +86,6 @@ enum ErrorCodes : int {
ALLOCATION_FAILURE = -4,
};
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_CORE_STRUCTS_H
diff --git a/libc/src/stdio/scanf_core/current_pos_converter.h b/libc/src/stdio/scanf_core/current_pos_converter.h
index 8af1cc0ca0c27..be25cefed151a 100644
--- a/libc/src/stdio/scanf_core/current_pos_converter.h
+++ b/libc/src/stdio/scanf_core/current_pos_converter.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STDIO_SCANF_CORE_CURRENT_POS_CONVERTER_H
#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_CURRENT_POS_CONVERTER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/converter_utils.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
LIBC_INLINE int convert_current_pos(Reader *reader,
@@ -26,6 +25,6 @@ LIBC_INLINE int convert_current_pos(Reader *reader,
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_CURRENT_POS_CONVERTER_H
diff --git a/libc/src/stdio/scanf_core/float_converter.cpp b/libc/src/stdio/scanf_core/float_converter.cpp
index b2d60a249a5a7..8500d98f4121a 100644
--- a/libc/src/stdio/scanf_core/float_converter.cpp
+++ b/libc/src/stdio/scanf_core/float_converter.cpp
@@ -11,14 +11,13 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/char_vector.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/converter_utils.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
// All of the floating point conversions are the same for scanf, every name will
@@ -224,4 +223,4 @@ int convert_float(Reader *reader, const FormatSection &to_conv) {
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/scanf_core/float_converter.h b/libc/src/stdio/scanf_core/float_converter.h
index bd44847830fd1..a3ea1da86a3f4 100644
--- a/libc/src/stdio/scanf_core/float_converter.h
+++ b/libc/src/stdio/scanf_core/float_converter.h
@@ -9,18 +9,17 @@
#ifndef LLVM_LIBC_SRC_STDIO_SCANF_CORE_FLOAT_CONVERTER_H
#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_FLOAT_CONVERTER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
int convert_float(Reader *reader, const FormatSection &to_conv);
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_FLOAT_CONVERTER_H
diff --git a/libc/src/stdio/scanf_core/int_converter.cpp b/libc/src/stdio/scanf_core/int_converter.cpp
index 136db2a3773e1..05d6ed6e0fd35 100644
--- a/libc/src/stdio/scanf_core/int_converter.cpp
+++ b/libc/src/stdio/scanf_core/int_converter.cpp
@@ -10,14 +10,13 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/converter_utils.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
// This code is very similar to the code in __support/str_to_integer.h but is
@@ -213,4 +212,4 @@ int convert_int(Reader *reader, const FormatSection &to_conv) {
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/scanf_core/int_converter.h b/libc/src/stdio/scanf_core/int_converter.h
index 5fc27ad0faafc..7c9d8b4fbae32 100644
--- a/libc/src/stdio/scanf_core/int_converter.h
+++ b/libc/src/stdio/scanf_core/int_converter.h
@@ -9,18 +9,17 @@
#ifndef LLVM_LIBC_SRC_STDIO_SCANF_CORE_INT_CONVERTER_H
#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_INT_CONVERTER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
int convert_int(Reader *reader, const FormatSection &to_conv);
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_INT_CONVERTER_H
diff --git a/libc/src/stdio/scanf_core/parser.h b/libc/src/stdio/scanf_core/parser.h
index 6cc5b30eb0db2..5ae9009bc4a23 100644
--- a/libc/src/stdio/scanf_core/parser.h
+++ b/libc/src/stdio/scanf_core/parser.h
@@ -11,14 +11,13 @@
#include "src/__support/arg_list.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/scanf_config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
#ifndef LIBC_COPT_SCANF_DISABLE_INDEX_MODE
@@ -280,6 +279,6 @@ template <typename ArgProvider> class Parser {
};
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_PARSER_H
diff --git a/libc/src/stdio/scanf_core/ptr_converter.cpp b/libc/src/stdio/scanf_core/ptr_converter.cpp
index 1a42a389d74b4..cc233c3656290 100644
--- a/libc/src/stdio/scanf_core/ptr_converter.cpp
+++ b/libc/src/stdio/scanf_core/ptr_converter.cpp
@@ -8,7 +8,6 @@
#include "src/stdio/scanf_core/ptr_converter.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/converter_utils.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/int_converter.h"
@@ -16,7 +15,7 @@
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
int convert_pointer(Reader *reader, const FormatSection &to_conv) {
static const char nullptr_string[] = "(nullptr)";
@@ -41,4 +40,4 @@ int convert_pointer(Reader *reader, const FormatSection &to_conv) {
return convert_int(reader, to_conv);
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/scanf_core/ptr_converter.h b/libc/src/stdio/scanf_core/ptr_converter.h
index 0732c1c0e3284..363d9aacde7be 100644
--- a/libc/src/stdio/scanf_core/ptr_converter.h
+++ b/libc/src/stdio/scanf_core/ptr_converter.h
@@ -9,18 +9,17 @@
#ifndef LLVM_LIBC_SRC_STDIO_SCANF_CORE_PTR_CONVERTER_H
#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_PTR_CONVERTER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
int convert_pointer(Reader *reader, const FormatSection &to_conv);
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_PTR_CONVERTER_H
diff --git a/libc/src/stdio/scanf_core/reader.cpp b/libc/src/stdio/scanf_core/reader.cpp
index ec1f5c098dc7a..eca0e3784dc8d 100644
--- a/libc/src/stdio/scanf_core/reader.cpp
+++ b/libc/src/stdio/scanf_core/reader.cpp
@@ -7,10 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/stdio/scanf_core/reader.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
void Reader::ungetc(char c) {
@@ -26,4 +25,4 @@ void Reader::ungetc(char c) {
stream_ungetc(static_cast<int>(c), input_stream);
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/scanf_core/reader.h b/libc/src/stdio/scanf_core/reader.h
index e7955d6689254..f750c4341a8d7 100644
--- a/libc/src/stdio/scanf_core/reader.h
+++ b/libc/src/stdio/scanf_core/reader.h
@@ -10,10 +10,9 @@
#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_READER_H
#include "src/__support/macros/attributes.h" // For LIBC_INLINE
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
using StreamGetc = int (*)(void *);
@@ -69,6 +68,6 @@ class Reader {
};
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_READER_H
diff --git a/libc/src/stdio/scanf_core/scanf_main.cpp b/libc/src/stdio/scanf_core/scanf_main.cpp
index eb480943aeeda..dc7740d64b665 100644
--- a/libc/src/stdio/scanf_core/scanf_main.cpp
+++ b/libc/src/stdio/scanf_core/scanf_main.cpp
@@ -9,7 +9,6 @@
#include "src/stdio/scanf_core/scanf_main.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/converter.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/parser.h"
@@ -17,7 +16,7 @@
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
int scanf_main(Reader *reader, const char *__restrict str,
@@ -43,4 +42,4 @@ int scanf_main(Reader *reader, const char *__restrict str,
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/scanf_core/scanf_main.h b/libc/src/stdio/scanf_core/scanf_main.h
index 27c246933dceb..f1688d648ccc8 100644
--- a/libc/src/stdio/scanf_core/scanf_main.h
+++ b/libc/src/stdio/scanf_core/scanf_main.h
@@ -10,18 +10,17 @@
#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_SCANF_MAIN_H
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
int scanf_main(Reader *reader, const char *__restrict str,
internal::ArgList &args);
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_SCANF_MAIN_H
diff --git a/libc/src/stdio/scanf_core/string_converter.cpp b/libc/src/stdio/scanf_core/string_converter.cpp
index 0de2eeed2f5e4..94a7fc4e5fe0d 100644
--- a/libc/src/stdio/scanf_core/string_converter.cpp
+++ b/libc/src/stdio/scanf_core/string_converter.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
int convert_string(Reader *reader, const FormatSection &to_conv) {
@@ -74,4 +73,4 @@ int convert_string(Reader *reader, const FormatSection &to_conv) {
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/scanf_core/string_converter.h b/libc/src/stdio/scanf_core/string_converter.h
index 552dc22a502f5..165fc47e4bdf7 100644
--- a/libc/src/stdio/scanf_core/string_converter.h
+++ b/libc/src/stdio/scanf_core/string_converter.h
@@ -9,18 +9,17 @@
#ifndef LLVM_LIBC_SRC_STDIO_SCANF_CORE_STRING_CONVERTER_H
#define LLVM_LIBC_SRC_STDIO_SCANF_CORE_STRING_CONVERTER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "src/stdio/scanf_core/reader.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace scanf_core {
int convert_string(Reader *reader, const FormatSection &to_conv);
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_STRING_CONVERTER_H
diff --git a/libc/src/stdio/scanf_core/vfscanf_internal.h b/libc/src/stdio/scanf_core/vfscanf_internal.h
index 2b0072a6ae35f..0571eaca3c570 100644
--- a/libc/src/stdio/scanf_core/vfscanf_internal.h
+++ b/libc/src/stdio/scanf_core/vfscanf_internal.h
@@ -11,14 +11,13 @@
#include "src/__support/File/file.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/reader.h"
#include "src/stdio/scanf_core/scanf_main.h"
#include "hdr/types/FILE.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
@@ -86,6 +85,6 @@ LIBC_INLINE int vfscanf_internal(::FILE *__restrict stream,
return retval;
}
} // namespace scanf_core
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SCANF_CORE_VFSCANF_INTERNAL_H
diff --git a/libc/src/stdio/setbuf.cpp b/libc/src/stdio/setbuf.cpp
index f3db97de58371..61a5cc617828d 100644
--- a/libc/src/stdio/setbuf.cpp
+++ b/libc/src/stdio/setbuf.cpp
@@ -9,10 +9,9 @@
#include "src/stdio/setbuf.h"
#include "hdr/stdio_macros.h"
#include "src/__support/File/file.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, setbuf,
(::FILE *__restrict stream, char *__restrict buf)) {
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(void, setbuf,
libc_errno = err;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/setbuf.h b/libc/src/stdio/setbuf.h
index f9d8e890d20ae..ec81994d22815 100644
--- a/libc/src/stdio/setbuf.h
+++ b/libc/src/stdio/setbuf.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_SETBUF_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void setbuf(::FILE *__restrict stream, char *__restrict buf);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SETBUF_H
diff --git a/libc/src/stdio/setvbuf.cpp b/libc/src/stdio/setvbuf.cpp
index 0a6b8cacb59c8..186848a548062 100644
--- a/libc/src/stdio/setvbuf.cpp
+++ b/libc/src/stdio/setvbuf.cpp
@@ -10,11 +10,10 @@
#include "src/__support/File/file.h"
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, setvbuf,
(::FILE *__restrict stream, char *__restrict buf, int type,
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, setvbuf,
return err;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/setvbuf.h b/libc/src/stdio/setvbuf.h
index 50bfc5cc3e665..4fe4811a795c2 100644
--- a/libc/src/stdio/setvbuf.h
+++ b/libc/src/stdio/setvbuf.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC_STDIO_SETVBUF_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int setvbuf(::FILE *__restrict stream, char *__restrict buf, int type,
size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SETVBUF_H
diff --git a/libc/src/stdio/snprintf.cpp b/libc/src/stdio/snprintf.cpp
index 12ad3cd1f762b..fbfc2b2180326 100644
--- a/libc/src/stdio/snprintf.cpp
+++ b/libc/src/stdio/snprintf.cpp
@@ -9,14 +9,13 @@
#include "src/stdio/snprintf.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/printf_main.h"
#include "src/stdio/printf_core/writer.h"
#include <stdarg.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, snprintf,
(char *__restrict buffer, size_t buffsz,
@@ -36,4 +35,4 @@ LLVM_LIBC_FUNCTION(int, snprintf,
return ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/snprintf.h b/libc/src/stdio/snprintf.h
index 92a6529704076..0e4e398abc391 100644
--- a/libc/src/stdio/snprintf.h
+++ b/libc/src/stdio/snprintf.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STDIO_SNPRINTF_H
#define LLVM_LIBC_SRC_STDIO_SNPRINTF_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int snprintf(char *__restrict buffer, size_t buffsz,
const char *__restrict format, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SNPRINTF_H
diff --git a/libc/src/stdio/sprintf.cpp b/libc/src/stdio/sprintf.cpp
index 1f59e6bae4723..11f2f1a8634ff 100644
--- a/libc/src/stdio/sprintf.cpp
+++ b/libc/src/stdio/sprintf.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/printf_main.h"
#include "src/stdio/printf_core/writer.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sprintf,
(char *__restrict buffer, const char *__restrict format,
@@ -36,4 +35,4 @@ LLVM_LIBC_FUNCTION(int, sprintf,
return ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/sprintf.h b/libc/src/stdio/sprintf.h
index ef65de399dc6d..14bb4fa121f42 100644
--- a/libc/src/stdio/sprintf.h
+++ b/libc/src/stdio/sprintf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDIO_SPRINTF_H
#define LLVM_LIBC_SRC_STDIO_SPRINTF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sprintf(char *__restrict buffer, const char *__restrict format, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SPRINTF_H
diff --git a/libc/src/stdio/sscanf.cpp b/libc/src/stdio/sscanf.cpp
index 96d9a2aebd66f..28c3e75907fad 100644
--- a/libc/src/stdio/sscanf.cpp
+++ b/libc/src/stdio/sscanf.cpp
@@ -10,7 +10,6 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/reader.h"
#include "src/stdio/scanf_core/scanf_main.h"
@@ -18,7 +17,7 @@
#include "hdr/types/FILE.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, sscanf,
(const char *__restrict buffer,
@@ -38,4 +37,4 @@ LLVM_LIBC_FUNCTION(int, sscanf,
return (ret_val == -1) ? EOF : ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/sscanf.h b/libc/src/stdio/sscanf.h
index 690b2603425fc..9e4b28e0033cf 100644
--- a/libc/src/stdio/sscanf.h
+++ b/libc/src/stdio/sscanf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDIO_SSCANF_H
#define LLVM_LIBC_SRC_STDIO_SSCANF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int sscanf(const char *__restrict buffer, const char *__restrict format, ...);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_SSCANF_H
diff --git a/libc/src/stdio/ungetc.h b/libc/src/stdio/ungetc.h
index 9e29b2e334f32..9a4470485e35d 100644
--- a/libc/src/stdio/ungetc.h
+++ b/libc/src/stdio/ungetc.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDIO_UNGETC_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ungetc(int c, ::FILE *stream);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_UNGETC_H
diff --git a/libc/src/stdio/vfprintf.cpp b/libc/src/stdio/vfprintf.cpp
index 01f4265f118a6..4e3d460af74d9 100644
--- a/libc/src/stdio/vfprintf.cpp
+++ b/libc/src/stdio/vfprintf.cpp
@@ -10,13 +10,12 @@
#include "src/__support/File/file.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/vfprintf_internal.h"
#include "hdr/types/FILE.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, vfprintf,
(::FILE *__restrict stream, const char *__restrict format,
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, vfprintf,
return ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/vfprintf.h b/libc/src/stdio/vfprintf.h
index 91418c69e84df..af8e3c9112a55 100644
--- a/libc/src/stdio/vfprintf.h
+++ b/libc/src/stdio/vfprintf.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC_STDIO_VFPRINTF_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int vfprintf(::FILE *__restrict stream, const char *__restrict format,
va_list vlist);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_VFPRINTF_H
diff --git a/libc/src/stdio/vprintf.h b/libc/src/stdio/vprintf.h
index 63f0f3ae62d6e..adc507a4c0b9a 100644
--- a/libc/src/stdio/vprintf.h
+++ b/libc/src/stdio/vprintf.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_SRC_STDIO_VPRINTF_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int vprintf(const char *__restrict format, va_list vlist);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_VPRINTF_H
diff --git a/libc/src/stdio/vsnprintf.cpp b/libc/src/stdio/vsnprintf.cpp
index a584c76833a2d..9446d3b223506 100644
--- a/libc/src/stdio/vsnprintf.cpp
+++ b/libc/src/stdio/vsnprintf.cpp
@@ -9,14 +9,13 @@
#include "src/stdio/vsnprintf.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/printf_main.h"
#include "src/stdio/printf_core/writer.h"
#include <stdarg.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, vsnprintf,
(char *__restrict buffer, size_t buffsz,
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(int, vsnprintf,
return ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/vsnprintf.h b/libc/src/stdio/vsnprintf.h
index 27ae763f7746a..6da25fc66f792 100644
--- a/libc/src/stdio/vsnprintf.h
+++ b/libc/src/stdio/vsnprintf.h
@@ -9,15 +9,14 @@
#ifndef LLVM_LIBC_SRC_STDIO_VSNPRINTF_H
#define LLVM_LIBC_SRC_STDIO_VSNPRINTF_H
-#include "src/__support/macros/config.h"
#include <stdarg.h>
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int vsnprintf(char *__restrict buffer, size_t buffsz,
const char *__restrict format, va_list vlist);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_VSNPRINTF_H
diff --git a/libc/src/stdio/vsprintf.cpp b/libc/src/stdio/vsprintf.cpp
index b3978a09c671a..5ebdf9a2a539f 100644
--- a/libc/src/stdio/vsprintf.cpp
+++ b/libc/src/stdio/vsprintf.cpp
@@ -10,13 +10,12 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/arg_list.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/printf_main.h"
#include "src/stdio/printf_core/writer.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, vsprintf,
(char *__restrict buffer, const char *__restrict format,
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(int, vsprintf,
return ret_val;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdio/vsprintf.h b/libc/src/stdio/vsprintf.h
index abb89ba76eae5..fe8def5994214 100644
--- a/libc/src/stdio/vsprintf.h
+++ b/libc/src/stdio/vsprintf.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STDIO_VSPRINTF_H
#define LLVM_LIBC_SRC_STDIO_VSPRINTF_H
-#include "src/__support/macros/config.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int vsprintf(char *__restrict buffer, const char *__restrict format,
va_list vlist);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDIO_VSPRINTF_H
diff --git a/libc/src/stdlib/_Exit.cpp b/libc/src/stdlib/_Exit.cpp
index 859598c0a3929..03a766261014e 100644
--- a/libc/src/stdlib/_Exit.cpp
+++ b/libc/src/stdlib/_Exit.cpp
@@ -8,14 +8,13 @@
#include "src/__support/OSUtil/exit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/_Exit.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[noreturn]] LLVM_LIBC_FUNCTION(void, _Exit, (int status)) {
internal::exit(status);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/_Exit.h b/libc/src/stdlib/_Exit.h
index 398ab5352c670..bc05fafeb766b 100644
--- a/libc/src/stdlib/_Exit.h
+++ b/libc/src/stdlib/_Exit.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB__EXIT_H
#define LLVM_LIBC_SRC_STDLIB__EXIT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[noreturn]] void _Exit(int status);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB__EXIT_H
diff --git a/libc/src/stdlib/abort.h b/libc/src/stdlib/abort.h
index 2bb292bfa0a90..d3bf1e9e477c2 100644
--- a/libc/src/stdlib/abort.h
+++ b/libc/src/stdlib/abort.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_ABORT_H
#define LLVM_LIBC_SRC_STDLIB_ABORT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[noreturn]] void abort();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_ABORT_H
diff --git a/libc/src/stdlib/abs.cpp b/libc/src/stdlib/abs.cpp
index 688c504ac6d7c..6be63e0468f52 100644
--- a/libc/src/stdlib/abs.cpp
+++ b/libc/src/stdlib/abs.cpp
@@ -9,10 +9,9 @@
#include "src/stdlib/abs.h"
#include "src/__support/common.h"
#include "src/__support/integer_operations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, abs, (int n)) { return integer_abs(n); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/abs.h b/libc/src/stdlib/abs.h
index 56ab04beae157..19cef1446bd36 100644
--- a/libc/src/stdlib/abs.h
+++ b/libc/src/stdlib/abs.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_ABS_H
#define LLVM_LIBC_SRC_STDLIB_ABS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int abs(int n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_ABS_H
diff --git a/libc/src/stdlib/aligned_alloc.h b/libc/src/stdlib/aligned_alloc.h
index 0205c0246b730..7f294c8114d49 100644
--- a/libc/src/stdlib/aligned_alloc.h
+++ b/libc/src/stdlib/aligned_alloc.h
@@ -6,16 +6,15 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include <stddef.h>
#ifndef LLVM_LIBC_SRC_STDLIB_ALIGNED_ALLOC_H
#define LLVM_LIBC_SRC_STDLIB_ALIGNED_ALLOC_H
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *aligned_alloc(size_t alignment, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_ALIGNED_ALLOC_H
diff --git a/libc/src/stdlib/at_quick_exit.cpp b/libc/src/stdlib/at_quick_exit.cpp
index 7acae8c52def3..752d67e7fe44d 100644
--- a/libc/src/stdlib/at_quick_exit.cpp
+++ b/libc/src/stdlib/at_quick_exit.cpp
@@ -9,10 +9,9 @@
#include "src/stdlib/at_quick_exit.h"
#include "hdr/types/atexithandler_t.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/exit_handler.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, at_quick_exit, (__atexithandler_t callback)) {
return add_atexit_unit(
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, at_quick_exit, (__atexithandler_t callback)) {
{&stdc_at_exit_func, reinterpret_cast<void *>(callback)});
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/at_quick_exit.h b/libc/src/stdlib/at_quick_exit.h
index 0bfd4ff86b7f6..c36c797088aba 100644
--- a/libc/src/stdlib/at_quick_exit.h
+++ b/libc/src/stdlib/at_quick_exit.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STDLIB_AT_QUICK_EXIT_H
#include "hdr/types/atexithandler_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int at_quick_exit(__atexithandler_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_AT_QUICK_EXIT_H
diff --git a/libc/src/stdlib/atexit.cpp b/libc/src/stdlib/atexit.cpp
index 6844fb7aacaf6..ca3cbfe87a88c 100644
--- a/libc/src/stdlib/atexit.cpp
+++ b/libc/src/stdlib/atexit.cpp
@@ -9,10 +9,9 @@
#include "src/stdlib/atexit.h"
#include "hdr/types/atexithandler_t.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/exit_handler.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" {
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(int, atexit, (__atexithandler_t callback)) {
{&stdc_at_exit_func, reinterpret_cast<void *>(callback)});
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/atexit.h b/libc/src/stdlib/atexit.h
index 39ce2dc52624a..7faaf654247c2 100644
--- a/libc/src/stdlib/atexit.h
+++ b/libc/src/stdlib/atexit.h
@@ -10,12 +10,10 @@
#define LLVM_LIBC_SRC_STDLIB_ATEXIT_H
#include "hdr/types/atexithandler_t.h"
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int atexit(__atexithandler_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_ATEXIT_H
diff --git a/libc/src/stdlib/atof.cpp b/libc/src/stdlib/atof.cpp
index 18a65c67705d3..61eb7db0056f1 100644
--- a/libc/src/stdlib/atof.cpp
+++ b/libc/src/stdlib/atof.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/atof.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, atof, (const char *str)) {
auto result = internal::strtofloatingpoint<double>(str);
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(double, atof, (const char *str)) {
return result.value;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/atof.h b/libc/src/stdlib/atof.h
index dfa97c3c3a377..cc9ae5157d6a5 100644
--- a/libc/src/stdlib/atof.h
+++ b/libc/src/stdlib/atof.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_ATOF_H
#define LLVM_LIBC_SRC_STDLIB_ATOF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double atof(const char *str);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_ATOF_H
diff --git a/libc/src/stdlib/atoi.cpp b/libc/src/stdlib/atoi.cpp
index 9e46b53b1aa0b..d1dc3203d3c57 100644
--- a/libc/src/stdlib/atoi.cpp
+++ b/libc/src/stdlib/atoi.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/atoi.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, atoi, (const char *str)) {
// This is done because the standard specifies that atoi is identical to
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, atoi, (const char *str)) {
return static_cast<int>(result);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/atoi.h b/libc/src/stdlib/atoi.h
index 218c0517ba5f6..fb5de31860d02 100644
--- a/libc/src/stdlib/atoi.h
+++ b/libc/src/stdlib/atoi.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_ATOI_H
#define LLVM_LIBC_SRC_STDLIB_ATOI_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int atoi(const char *str);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_ATOI_H
diff --git a/libc/src/stdlib/atol.cpp b/libc/src/stdlib/atol.cpp
index 7f3414a4afdd2..5586db7838c6b 100644
--- a/libc/src/stdlib/atol.cpp
+++ b/libc/src/stdlib/atol.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/atol.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, atol, (const char *str)) {
auto result = internal::strtointeger<long>(str, 10);
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(long, atol, (const char *str)) {
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/atol.h b/libc/src/stdlib/atol.h
index 3787dc12b527c..690731f8714d8 100644
--- a/libc/src/stdlib/atol.h
+++ b/libc/src/stdlib/atol.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_ATOL_H
#define LLVM_LIBC_SRC_STDLIB_ATOL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long atol(const char *str);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_ATOL_H
diff --git a/libc/src/stdlib/atoll.cpp b/libc/src/stdlib/atoll.cpp
index 4f1a02ad8315b..921459ddc3ac3 100644
--- a/libc/src/stdlib/atoll.cpp
+++ b/libc/src/stdlib/atoll.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/atoll.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, atoll, (const char *str)) {
auto result = internal::strtointeger<long long>(str, 10);
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(long long, atoll, (const char *str)) {
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/atoll.h b/libc/src/stdlib/atoll.h
index b3035fdc3918b..4746eb1e5e307 100644
--- a/libc/src/stdlib/atoll.h
+++ b/libc/src/stdlib/atoll.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_ATOLL_H
#define LLVM_LIBC_SRC_STDLIB_ATOLL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long atoll(const char *str);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_ATOLL_H
diff --git a/libc/src/stdlib/baremetal/abort.cpp b/libc/src/stdlib/baremetal/abort.cpp
index 98cf71084499a..4dd85367411e6 100644
--- a/libc/src/stdlib/baremetal/abort.cpp
+++ b/libc/src/stdlib/baremetal/abort.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/abort.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, abort, ()) { __builtin_trap(); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/bsearch.cpp b/libc/src/stdlib/bsearch.cpp
index 69b3e749c03fe..4292d6b6fe046 100644
--- a/libc/src/stdlib/bsearch.cpp
+++ b/libc/src/stdlib/bsearch.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/bsearch.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, bsearch,
(const void *key, const void *array, size_t array_size,
@@ -45,4 +44,4 @@ LLVM_LIBC_FUNCTION(void *, bsearch,
return nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/bsearch.h b/libc/src/stdlib/bsearch.h
index cef37ea6c449a..3590198ba5570 100644
--- a/libc/src/stdlib/bsearch.h
+++ b/libc/src/stdlib/bsearch.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STDLIB_BSEARCH_H
#define LLVM_LIBC_SRC_STDLIB_BSEARCH_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *bsearch(const void *key, const void *array, size_t array_size,
size_t elem_size, int (*compare)(const void *, const void *));
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif //LLVM_LIBC_SRC_STDLIB_BSEARCH_H
diff --git a/libc/src/stdlib/calloc.h b/libc/src/stdlib/calloc.h
index a8cf734da7d3e..bdb025b9d0d1c 100644
--- a/libc/src/stdlib/calloc.h
+++ b/libc/src/stdlib/calloc.h
@@ -6,16 +6,15 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include <stddef.h>
#ifndef LLVM_LIBC_SRC_STDLIB_CALLOC_H
#define LLVM_LIBC_SRC_STDLIB_CALLOC_H
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *calloc(size_t num, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_CALLOC_H
diff --git a/libc/src/stdlib/div.cpp b/libc/src/stdlib/div.cpp
index 766e8ae608340..ee7c335bdb7fd 100644
--- a/libc/src/stdlib/div.cpp
+++ b/libc/src/stdlib/div.cpp
@@ -9,9 +9,8 @@
#include "src/stdlib/div.h"
#include "src/__support/common.h"
#include "src/__support/integer_operations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(div_t, div, (int x, int y)) {
div_t res;
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(div_t, div, (int x, int y)) {
return res;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/div.h b/libc/src/stdlib/div.h
index e76f79bbeee5f..3a6853f7c95f5 100644
--- a/libc/src/stdlib/div.h
+++ b/libc/src/stdlib/div.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STDLIB_DIV_H
#define LLVM_LIBC_SRC_STDLIB_DIV_H
-#include "src/__support/macros/config.h"
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
div_t div(int x, int y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_DIV_H
diff --git a/libc/src/stdlib/exit.cpp b/libc/src/stdlib/exit.cpp
index 28a6f8a63c0c6..1afeec5a460da 100644
--- a/libc/src/stdlib/exit.cpp
+++ b/libc/src/stdlib/exit.cpp
@@ -9,9 +9,8 @@
#include "src/stdlib/exit.h"
#include "src/__support/OSUtil/exit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" void __cxa_finalize(void *);
@@ -20,4 +19,4 @@ extern "C" void __cxa_finalize(void *);
internal::exit(status);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/exit.h b/libc/src/stdlib/exit.h
index 1f0153b98c1f4..b13573547fbf8 100644
--- a/libc/src/stdlib/exit.h
+++ b/libc/src/stdlib/exit.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STDLIB_EXIT_H
#define LLVM_LIBC_SRC_STDLIB_EXIT_H
-#include "src/__support/macros/config.h"
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[noreturn]] void exit(int status);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_EXIT_H
diff --git a/libc/src/stdlib/exit_handler.cpp b/libc/src/stdlib/exit_handler.cpp
index ed0751a4c889e..ed41247e4a31d 100644
--- a/libc/src/stdlib/exit_handler.cpp
+++ b/libc/src/stdlib/exit_handler.cpp
@@ -8,9 +8,8 @@
#include "src/stdlib/exit_handler.h"
#include "src/__support/CPP/mutex.h" // lock_guard
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
constinit ExitCallbackList at_quick_exit_callbacks;
constinit ExitCallbackList atexit_callbacks;
@@ -40,4 +39,4 @@ int add_atexit_unit(ExitCallbackList &callbacks, const AtExitUnit &unit) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/exit_handler.h b/libc/src/stdlib/exit_handler.h
index 41733b7a0e7e5..8494c2f2e526e 100644
--- a/libc/src/stdlib/exit_handler.h
+++ b/libc/src/stdlib/exit_handler.h
@@ -13,10 +13,9 @@
#include "src/__support/blockstore.h"
#include "src/__support/common.h"
#include "src/__support/fixedvector.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using AtExitCallback = void(void *);
using StdCAtExitCallback = void(void);
@@ -49,6 +48,6 @@ void call_exit_callbacks(ExitCallbackList &callbacks);
int add_atexit_unit(ExitCallbackList &callbacks, const AtExitUnit &unit);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_EXIT_HANDLER_H
diff --git a/libc/src/stdlib/free.h b/libc/src/stdlib/free.h
index 1b250f3d3a7aa..b3970fd967740 100644
--- a/libc/src/stdlib/free.h
+++ b/libc/src/stdlib/free.h
@@ -6,16 +6,15 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include <stdlib.h>
#ifndef LLVM_LIBC_SRC_STDLIB_FREE_H
#define LLVM_LIBC_SRC_STDLIB_FREE_H
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void free(void *ptr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_FREE_H
diff --git a/libc/src/stdlib/freelist_malloc.cpp b/libc/src/stdlib/freelist_malloc.cpp
index cfffa0425ff66..684c447a204e4 100644
--- a/libc/src/stdlib/freelist_malloc.cpp
+++ b/libc/src/stdlib/freelist_malloc.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/__support/freelist_heap.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/aligned_alloc.h"
#include "src/stdlib/calloc.h"
#include "src/stdlib/free.h"
@@ -16,7 +15,7 @@
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
#ifdef LIBC_FREELIST_MALLOC_SIZE
@@ -48,4 +47,4 @@ LLVM_LIBC_FUNCTION(void *, aligned_alloc, (size_t alignment, size_t size)) {
return freelist_heap->aligned_allocate(alignment, size);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/getenv.cpp b/libc/src/stdlib/getenv.cpp
index 6b1bb693a6d83..7a8eb1943c0a9 100644
--- a/libc/src/stdlib/getenv.cpp
+++ b/libc/src/stdlib/getenv.cpp
@@ -10,11 +10,10 @@
#include "config/linux/app.h"
#include "src/__support/CPP/string_view.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h> // For size_t.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, getenv, (const char *name)) {
char **env_ptr = reinterpret_cast<char **>(LIBC_NAMESPACE::app.env_ptr);
@@ -42,4 +41,4 @@ LLVM_LIBC_FUNCTION(char *, getenv, (const char *name)) {
return nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/getenv.h b/libc/src/stdlib/getenv.h
index a5d41fe19c98c..adb386b18ca81 100644
--- a/libc/src/stdlib/getenv.h
+++ b/libc/src/stdlib/getenv.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_GETENV_H
#define LLVM_LIBC_SRC_STDLIB_GETENV_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *getenv(const char *name);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_GETENV_H
diff --git a/libc/src/stdlib/gpu/abort.cpp b/libc/src/stdlib/gpu/abort.cpp
index fee198607cc02..f3b052be6d24d 100644
--- a/libc/src/stdlib/gpu/abort.cpp
+++ b/libc/src/stdlib/gpu/abort.cpp
@@ -8,11 +8,10 @@
#include "src/__support/RPC/rpc_client.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/abort.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, abort, ()) {
// We want to first make sure the server is listening before we abort.
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(void, abort, ()) {
gpu::end_program();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/gpu/free.cpp b/libc/src/stdlib/gpu/free.cpp
index 1f0e9ec735974..fb5703b78ae6c 100644
--- a/libc/src/stdlib/gpu/free.cpp
+++ b/libc/src/stdlib/gpu/free.cpp
@@ -10,10 +10,9 @@
#include "src/__support/GPU/allocator.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, free, (void *ptr)) { gpu::deallocate(ptr); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/gpu/malloc.cpp b/libc/src/stdlib/gpu/malloc.cpp
index 54f2d8843996e..93558231d0811 100644
--- a/libc/src/stdlib/gpu/malloc.cpp
+++ b/libc/src/stdlib/gpu/malloc.cpp
@@ -10,12 +10,11 @@
#include "src/__support/GPU/allocator.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, malloc, (size_t size)) {
return gpu::allocate(size);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/labs.cpp b/libc/src/stdlib/labs.cpp
index a8265e4083921..d9237fad910c5 100644
--- a/libc/src/stdlib/labs.cpp
+++ b/libc/src/stdlib/labs.cpp
@@ -9,10 +9,9 @@
#include "src/stdlib/labs.h"
#include "src/__support/common.h"
#include "src/__support/integer_operations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, labs, (long n)) { return integer_abs(n); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/labs.h b/libc/src/stdlib/labs.h
index c15af79581e4f..b7af538cd52c0 100644
--- a/libc/src/stdlib/labs.h
+++ b/libc/src/stdlib/labs.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_LABS_H
#define LLVM_LIBC_SRC_STDLIB_LABS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long labs(long n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_LABS_H
diff --git a/libc/src/stdlib/ldiv.cpp b/libc/src/stdlib/ldiv.cpp
index 94f385f12b02c..57e2250063375 100644
--- a/libc/src/stdlib/ldiv.cpp
+++ b/libc/src/stdlib/ldiv.cpp
@@ -9,9 +9,8 @@
#include "src/stdlib/ldiv.h"
#include "src/__support/common.h"
#include "src/__support/integer_operations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ldiv_t, ldiv, (long x, long y)) {
ldiv_t res;
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(ldiv_t, ldiv, (long x, long y)) {
return res;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/ldiv.h b/libc/src/stdlib/ldiv.h
index 56b71fd044b18..0f0fafa7498b5 100644
--- a/libc/src/stdlib/ldiv.h
+++ b/libc/src/stdlib/ldiv.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STDLIB_LDIV_H
#define LLVM_LIBC_SRC_STDLIB_LDIV_H
-#include "src/__support/macros/config.h"
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ldiv_t ldiv(long x, long y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_LDIV_H
diff --git a/libc/src/stdlib/linux/abort.cpp b/libc/src/stdlib/linux/abort.cpp
index d78ea675593a4..59feec3e5a06d 100644
--- a/libc/src/stdlib/linux/abort.cpp
+++ b/libc/src/stdlib/linux/abort.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/signal/raise.h"
#include "src/stdlib/_Exit.h"
#include "src/stdlib/abort.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, abort, ()) {
// TODO: When sigprocmask and sigaction land:
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(void, abort, ()) {
LIBC_NAMESPACE::_Exit(127);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/llabs.cpp b/libc/src/stdlib/llabs.cpp
index 09636f19ed6eb..f42c2b8a993dd 100644
--- a/libc/src/stdlib/llabs.cpp
+++ b/libc/src/stdlib/llabs.cpp
@@ -9,10 +9,9 @@
#include "src/stdlib/llabs.h"
#include "src/__support/common.h"
#include "src/__support/integer_operations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, llabs, (long long n)) { return integer_abs(n); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/llabs.h b/libc/src/stdlib/llabs.h
index b0cabddba0fb8..953fe1709c1a7 100644
--- a/libc/src/stdlib/llabs.h
+++ b/libc/src/stdlib/llabs.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_LLABS_H
#define LLVM_LIBC_SRC_STDLIB_LLABS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long llabs(long long n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_LLABS_H
diff --git a/libc/src/stdlib/lldiv.cpp b/libc/src/stdlib/lldiv.cpp
index f55a4f6b95662..ff2fdf8eff33d 100644
--- a/libc/src/stdlib/lldiv.cpp
+++ b/libc/src/stdlib/lldiv.cpp
@@ -9,9 +9,8 @@
#include "src/stdlib/lldiv.h"
#include "src/__support/common.h"
#include "src/__support/integer_operations.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(lldiv_t, lldiv, (long long x, long long y)) {
lldiv_t res;
@@ -19,4 +18,4 @@ LLVM_LIBC_FUNCTION(lldiv_t, lldiv, (long long x, long long y)) {
return res;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/lldiv.h b/libc/src/stdlib/lldiv.h
index ad688e00289ef..ee7f4d37c7469 100644
--- a/libc/src/stdlib/lldiv.h
+++ b/libc/src/stdlib/lldiv.h
@@ -8,13 +8,12 @@
#ifndef LLVM_LIBC_SRC_STDLIB_LLDIV_H
#define LLVM_LIBC_SRC_STDLIB_LLDIV_H
-#include "src/__support/macros/config.h"
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
lldiv_t lldiv(long long x, long long y);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_LLDIV_H
diff --git a/libc/src/stdlib/malloc.h b/libc/src/stdlib/malloc.h
index 1974f5d3a7815..514e2b133c7b1 100644
--- a/libc/src/stdlib/malloc.h
+++ b/libc/src/stdlib/malloc.h
@@ -6,16 +6,15 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include <stdlib.h>
#ifndef LLVM_LIBC_SRC_STDLIB_MALLOC_H
#define LLVM_LIBC_SRC_STDLIB_MALLOC_H
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *malloc(size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_MALLOC_H
diff --git a/libc/src/stdlib/qsort.cpp b/libc/src/stdlib/qsort.cpp
index 048e63ab214ed..f040f375ea59e 100644
--- a/libc/src/stdlib/qsort.cpp
+++ b/libc/src/stdlib/qsort.cpp
@@ -8,12 +8,11 @@
#include "src/stdlib/qsort.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/qsort_util.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, qsort,
(void *array, size_t array_size, size_t elem_size,
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(void, qsort,
array_size, elem_size, c));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/qsort.h b/libc/src/stdlib/qsort.h
index 38988312f9014..5c78481ad7013 100644
--- a/libc/src/stdlib/qsort.h
+++ b/libc/src/stdlib/qsort.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STDLIB_QSORT_H
#define LLVM_LIBC_SRC_STDLIB_QSORT_H
-#include "src/__support/macros/config.h"
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void qsort(void *array, size_t array_size, size_t elem_size,
int (*compare)(const void *, const void *));
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_QSORT_H
diff --git a/libc/src/stdlib/qsort_r.cpp b/libc/src/stdlib/qsort_r.cpp
index efbe5ad484b0e..758991848eff8 100644
--- a/libc/src/stdlib/qsort_r.cpp
+++ b/libc/src/stdlib/qsort_r.cpp
@@ -8,12 +8,11 @@
#include "src/stdlib/qsort_r.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/qsort_util.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, qsort_r,
(void *array, size_t array_size, size_t elem_size,
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(void, qsort_r,
array_size, elem_size, c));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/qsort_r.h b/libc/src/stdlib/qsort_r.h
index 574968a528711..fab0576ed803f 100644
--- a/libc/src/stdlib/qsort_r.h
+++ b/libc/src/stdlib/qsort_r.h
@@ -9,10 +9,9 @@
#ifndef LLVM_LIBC_SRC_STDLIB_QSORT_R_H
#define LLVM_LIBC_SRC_STDLIB_QSORT_R_H
-#include "src/__support/macros/config.h"
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This qsort_r uses the glibc argument ordering instead of the BSD argument
// ordering (which puts arg before the function pointer). Putting arg after the
@@ -22,6 +21,6 @@ namespace LIBC_NAMESPACE_DECL {
void qsort_r(void *array, size_t array_size, size_t elem_size,
int (*compare)(const void *, const void *, void *), void *arg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_QSORT_R_H
diff --git a/libc/src/stdlib/qsort_util.h b/libc/src/stdlib/qsort_util.h
index 3a9cc4b8669f8..f4b8094d05a9a 100644
--- a/libc/src/stdlib/qsort_util.h
+++ b/libc/src/stdlib/qsort_util.h
@@ -10,12 +10,10 @@
#define LLVM_LIBC_SRC_STDLIB_QSORT_UTIL_H
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
-namespace internal {
+namespace LIBC_NAMESPACE::internal {
// A simple quicksort implementation using the Hoare partition scheme.
@@ -149,7 +147,6 @@ LIBC_INLINE void quicksort(const Array &array) {
quicksort(array.make_array(split_index, array.size() - split_index));
}
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::internal
#endif // LLVM_LIBC_SRC_STDLIB_QSORT_UTIL_H
diff --git a/libc/src/stdlib/quick_exit.cpp b/libc/src/stdlib/quick_exit.cpp
index a5abf3e05d1a1..38f0a3db3e2cf 100644
--- a/libc/src/stdlib/quick_exit.cpp
+++ b/libc/src/stdlib/quick_exit.cpp
@@ -9,11 +9,10 @@
#include "src/stdlib/quick_exit.h"
#include "src/__support/OSUtil/exit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/exit_handler.h"
// extern "C" void __cxa_finalize(void *);
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern ExitCallbackList at_quick_exit_callbacks;
@@ -22,4 +21,4 @@ extern ExitCallbackList at_quick_exit_callbacks;
internal::exit(status);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/quick_exit.h b/libc/src/stdlib/quick_exit.h
index f41bbaa0fa184..9a3c20ccd9b17 100644
--- a/libc/src/stdlib/quick_exit.h
+++ b/libc/src/stdlib/quick_exit.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_QUICK_EXIT_H
#define LLVM_LIBC_SRC_STDLIB_QUICK_EXIT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[noreturn]] void quick_exit(int status);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_QUICK_EXIT_H
diff --git a/libc/src/stdlib/rand.cpp b/libc/src/stdlib/rand.cpp
index 1931727e2d9d1..ff3875c2f6959 100644
--- a/libc/src/stdlib/rand.cpp
+++ b/libc/src/stdlib/rand.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/rand.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/sleep.h"
#include "src/stdlib/rand_util.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// An implementation of the xorshift64star pseudo random number generator. This
// is a good general purpose generator for most non-cryptographics applications.
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(int, rand, (void)) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/rand.h b/libc/src/stdlib/rand.h
index df217b569aa8a..72bb147849851 100644
--- a/libc/src/stdlib/rand.h
+++ b/libc/src/stdlib/rand.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STDLIB_RAND_H
#define LLVM_LIBC_SRC_STDLIB_RAND_H
-#include "src/__support/macros/config.h"
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int rand(void);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_RAND_H
diff --git a/libc/src/stdlib/rand_util.cpp b/libc/src/stdlib/rand_util.cpp
index c05bdc7fbccb1..ff3478db70003 100644
--- a/libc/src/stdlib/rand_util.cpp
+++ b/libc/src/stdlib/rand_util.cpp
@@ -9,12 +9,11 @@
#include "src/stdlib/rand_util.h"
#include "src/__support/CPP/atomic.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// C standard 7.10p2: If 'rand' is called before 'srand' it is to
// proceed as if the 'srand' function was called with a value of '1'.
cpp::Atomic<unsigned long> rand_next = 1;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/rand_util.h b/libc/src/stdlib/rand_util.h
index 8bf7e586dd068..5d7febf8248d8 100644
--- a/libc/src/stdlib/rand_util.h
+++ b/libc/src/stdlib/rand_util.h
@@ -11,15 +11,14 @@
#include "src/__support/CPP/atomic.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The ISO C standard does not explicitly require thread-safe behavior for the
// generic `rand()` function. Some implementations expect it however, so we
// provide it here.
extern cpp::Atomic<unsigned long> rand_next;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_RAND_UTIL_H
diff --git a/libc/src/stdlib/realloc.h b/libc/src/stdlib/realloc.h
index 4d675a601d67d..6e025faa7a8ce 100644
--- a/libc/src/stdlib/realloc.h
+++ b/libc/src/stdlib/realloc.h
@@ -6,16 +6,15 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include <stddef.h>
#ifndef LLVM_LIBC_SRC_STDLIB_REALLOC_H
#define LLVM_LIBC_SRC_STDLIB_REALLOC_H
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *realloc(void *ptr, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_REALLOC_H
diff --git a/libc/src/stdlib/srand.cpp b/libc/src/stdlib/srand.cpp
index d11c18eed42c3..21166c7a6754e 100644
--- a/libc/src/stdlib/srand.cpp
+++ b/libc/src/stdlib/srand.cpp
@@ -8,13 +8,12 @@
#include "src/stdlib/srand.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/rand_util.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, srand, (unsigned int seed)) {
rand_next.store(seed, cpp::MemoryOrder::RELAXED);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/srand.h b/libc/src/stdlib/srand.h
index c9fce46ddd2bc..1bcf8de78c0a4 100644
--- a/libc/src/stdlib/srand.h
+++ b/libc/src/stdlib/srand.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STDLIB_SRAND_H
#define LLVM_LIBC_SRC_STDLIB_SRAND_H
-#include "src/__support/macros/config.h"
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void srand(unsigned int seed);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_SRAND_H
diff --git a/libc/src/stdlib/str_from_util.h b/libc/src/stdlib/str_from_util.h
index 7f54bdf71a018..58afa98afc08e 100644
--- a/libc/src/stdlib/str_from_util.h
+++ b/libc/src/stdlib/str_from_util.h
@@ -18,7 +18,6 @@
#define LLVM_LIBC_SRC_STDLIB_STRFROM_UTIL_H
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/stdio/printf_core/converter_atlas.h"
#include "src/stdio/printf_core/core_structs.h"
@@ -26,8 +25,7 @@
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
-namespace internal {
+namespace LIBC_NAMESPACE::internal {
template <typename T>
using storage_type = typename fputil::FPBits<T>::StorageType;
@@ -135,7 +133,6 @@ int strfromfloat_convert(printf_core::Writer *writer,
return -1;
}
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::internal
#endif // LLVM_LIBC_SRC_STDLIB_STRFROM_UTIL_H
diff --git a/libc/src/stdlib/strfromd.cpp b/libc/src/stdlib/strfromd.cpp
index 4c51e4c5c8a01..329f6fdcaff73 100644
--- a/libc/src/stdlib/strfromd.cpp
+++ b/libc/src/stdlib/strfromd.cpp
@@ -7,10 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/stdlib/strfromd.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/str_from_util.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, strfromd,
(char *__restrict s, size_t n, const char *__restrict format,
@@ -37,4 +36,4 @@ LLVM_LIBC_FUNCTION(int, strfromd,
return writer.get_chars_written();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strfromd.h b/libc/src/stdlib/strfromd.h
index 8a68ff5f68849..d2c3fefb6300d 100644
--- a/libc/src/stdlib/strfromd.h
+++ b/libc/src/stdlib/strfromd.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRFROMD_H
#define LLVM_LIBC_SRC_STDLIB_STRFROMD_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int strfromd(char *__restrict s, size_t n, const char *__restrict format,
double fp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRFROMD_H
diff --git a/libc/src/stdlib/strfromf.cpp b/libc/src/stdlib/strfromf.cpp
index ea98a69ee4d60..80e1d74797c80 100644
--- a/libc/src/stdlib/strfromf.cpp
+++ b/libc/src/stdlib/strfromf.cpp
@@ -7,10 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/stdlib/strfromf.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/str_from_util.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, strfromf,
(char *__restrict s, size_t n, const char *__restrict format,
@@ -37,4 +36,4 @@ LLVM_LIBC_FUNCTION(int, strfromf,
return writer.get_chars_written();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strfromf.h b/libc/src/stdlib/strfromf.h
index e65e6b3a564c2..492c2c33cf080 100644
--- a/libc/src/stdlib/strfromf.h
+++ b/libc/src/stdlib/strfromf.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRFROMF_H
#define LLVM_LIBC_SRC_STDLIB_STRFROMF_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int strfromf(char *__restrict s, size_t n, const char *__restrict format,
float fp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRFROMF_H
diff --git a/libc/src/stdlib/strfroml.cpp b/libc/src/stdlib/strfroml.cpp
index d5bee7609f69c..f0bc9354c7ad7 100644
--- a/libc/src/stdlib/strfroml.cpp
+++ b/libc/src/stdlib/strfroml.cpp
@@ -7,10 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/stdlib/strfroml.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/str_from_util.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, strfroml,
(char *__restrict s, size_t n, const char *__restrict format,
@@ -42,4 +41,4 @@ LLVM_LIBC_FUNCTION(int, strfroml,
return writer.get_chars_written();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strfroml.h b/libc/src/stdlib/strfroml.h
index 1bff12e34f85f..e99d035e4da60 100644
--- a/libc/src/stdlib/strfroml.h
+++ b/libc/src/stdlib/strfroml.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRFROML_H
#define LLVM_LIBC_SRC_STDLIB_STRFROML_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int strfroml(char *__restrict s, size_t n, const char *__restrict format,
long double fp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRFROML_H
diff --git a/libc/src/stdlib/strtod.cpp b/libc/src/stdlib/strtod.cpp
index 2c6819163aa46..461f7feb5bf63 100644
--- a/libc/src/stdlib/strtod.cpp
+++ b/libc/src/stdlib/strtod.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/strtod.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, strtod,
(const char *__restrict str, char **__restrict str_end)) {
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(double, strtod,
return result.value;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strtod.h b/libc/src/stdlib/strtod.h
index 1a32e38be3f93..5efad845fdee3 100644
--- a/libc/src/stdlib/strtod.h
+++ b/libc/src/stdlib/strtod.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRTOD_H
#define LLVM_LIBC_SRC_STDLIB_STRTOD_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double strtod(const char *__restrict str, char **__restrict str_end);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRTOD_H
diff --git a/libc/src/stdlib/strtof.cpp b/libc/src/stdlib/strtof.cpp
index 351bf64ad4f70..554d096879c59 100644
--- a/libc/src/stdlib/strtof.cpp
+++ b/libc/src/stdlib/strtof.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/strtof.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(float, strtof,
(const char *__restrict str, char **__restrict str_end)) {
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(float, strtof,
return result.value;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strtof.h b/libc/src/stdlib/strtof.h
index 2e7645fd3443e..d800b2233cf8e 100644
--- a/libc/src/stdlib/strtof.h
+++ b/libc/src/stdlib/strtof.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRTOF_H
#define LLVM_LIBC_SRC_STDLIB_STRTOF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
float strtof(const char *__restrict str, char **__restrict str_end);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRTOF_H
diff --git a/libc/src/stdlib/strtol.cpp b/libc/src/stdlib/strtol.cpp
index 77f8712d7c136..e9bedf2371668 100644
--- a/libc/src/stdlib/strtol.cpp
+++ b/libc/src/stdlib/strtol.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/strtol.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, strtol,
(const char *__restrict str, char **__restrict str_end,
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(long, strtol,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strtol.h b/libc/src/stdlib/strtol.h
index 54779d4bdb084..c46c650dc5b3e 100644
--- a/libc/src/stdlib/strtol.h
+++ b/libc/src/stdlib/strtol.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRTOL_H
#define LLVM_LIBC_SRC_STDLIB_STRTOL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long strtol(const char *__restrict str, char **__restrict str_end, int base);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRTOL_H
diff --git a/libc/src/stdlib/strtold.cpp b/libc/src/stdlib/strtold.cpp
index 88d29c9f36278..9c3e1db900670 100644
--- a/libc/src/stdlib/strtold.cpp
+++ b/libc/src/stdlib/strtold.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/strtold.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long double, strtold,
(const char *__restrict str, char **__restrict str_end)) {
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(long double, strtold,
return result.value;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strtold.h b/libc/src/stdlib/strtold.h
index 4b663ca00bc34..6a0b5d450b58b 100644
--- a/libc/src/stdlib/strtold.h
+++ b/libc/src/stdlib/strtold.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRTOLD_H
#define LLVM_LIBC_SRC_STDLIB_STRTOLD_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long double strtold(const char *__restrict str, char **__restrict str_end);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRTOLD_H
diff --git a/libc/src/stdlib/strtoll.cpp b/libc/src/stdlib/strtoll.cpp
index 8d1b3efdcf87d..99e82056bcb5b 100644
--- a/libc/src/stdlib/strtoll.cpp
+++ b/libc/src/stdlib/strtoll.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/strtoll.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long long, strtoll,
(const char *__restrict str, char **__restrict str_end,
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(long long, strtoll,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strtoll.h b/libc/src/stdlib/strtoll.h
index 399c20b76a354..d699785bfd710 100644
--- a/libc/src/stdlib/strtoll.h
+++ b/libc/src/stdlib/strtoll.h
@@ -9,13 +9,11 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRTOLL_H
#define LLVM_LIBC_SRC_STDLIB_STRTOLL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long long strtoll(const char *__restrict str, char **__restrict str_end,
int base);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRTOLL_H
diff --git a/libc/src/stdlib/strtoul.cpp b/libc/src/stdlib/strtoul.cpp
index 1d832318c4489..f50ed7ea2dc36 100644
--- a/libc/src/stdlib/strtoul.cpp
+++ b/libc/src/stdlib/strtoul.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/strtoul.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned long, strtoul,
(const char *__restrict str, char **__restrict str_end,
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(unsigned long, strtoul,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strtoul.h b/libc/src/stdlib/strtoul.h
index ca1911addc56e..af839928d1b0c 100644
--- a/libc/src/stdlib/strtoul.h
+++ b/libc/src/stdlib/strtoul.h
@@ -9,13 +9,11 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRTOUL_H
#define LLVM_LIBC_SRC_STDLIB_STRTOUL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long strtoul(const char *__restrict str, char **__restrict str_end,
int base);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRTOUL_H
diff --git a/libc/src/stdlib/strtoull.cpp b/libc/src/stdlib/strtoull.cpp
index dba22611cfb09..de3a0d04b2cb1 100644
--- a/libc/src/stdlib/strtoull.cpp
+++ b/libc/src/stdlib/strtoull.cpp
@@ -8,11 +8,10 @@
#include "src/stdlib/strtoull.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(unsigned long long, strtoull,
(const char *__restrict str, char **__restrict str_end,
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(unsigned long long, strtoull,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/strtoull.h b/libc/src/stdlib/strtoull.h
index 58801e52789c0..47ed1019834ce 100644
--- a/libc/src/stdlib/strtoull.h
+++ b/libc/src/stdlib/strtoull.h
@@ -9,13 +9,11 @@
#ifndef LLVM_LIBC_SRC_STDLIB_STRTOULL_H
#define LLVM_LIBC_SRC_STDLIB_STRTOULL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long long strtoull(const char *__restrict str,
char **__restrict str_end, int base);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STDLIB_STRTOULL_H
diff --git a/libc/src/string/allocating_string_utils.h b/libc/src/string/allocating_string_utils.h
index b3a8663c2f477..4112b7931d103 100644
--- a/libc/src/string/allocating_string_utils.h
+++ b/libc/src/string/allocating_string_utils.h
@@ -17,7 +17,7 @@
#include <stddef.h> // For size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
LIBC_INLINE cpp::optional<char *> strdup(const char *src) {
@@ -33,6 +33,6 @@ LIBC_INLINE cpp::optional<char *> strdup(const char *src) {
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_ALLOCATING_STRING_UTILS_H
diff --git a/libc/src/string/bcmp.cpp b/libc/src/string/bcmp.cpp
index 6e9c9ae3b7a3b..f18fa0c883eec 100644
--- a/libc/src/string/bcmp.cpp
+++ b/libc/src/string/bcmp.cpp
@@ -8,14 +8,13 @@
#include "src/string/bcmp.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_bcmp.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, bcmp,
(const void *lhs, const void *rhs, size_t count)) {
return inline_bcmp(lhs, rhs, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/bcmp.h b/libc/src/string/bcmp.h
index a82b529164d95..711aecf083501 100644
--- a/libc/src/string/bcmp.h
+++ b/libc/src/string/bcmp.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_BCMP_H
#define LLVM_LIBC_SRC_STRING_BCMP_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int bcmp(const void *lhs, const void *rhs, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_BCMP_H
diff --git a/libc/src/string/bcopy.cpp b/libc/src/string/bcopy.cpp
index 89aad71e354c7..9399d332dff7f 100644
--- a/libc/src/string/bcopy.cpp
+++ b/libc/src/string/bcopy.cpp
@@ -8,13 +8,12 @@
#include "src/string/bcopy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memmove.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, bcopy, (const void *src, void *dst, size_t count)) {
return inline_memmove(dst, src, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/bcopy.h b/libc/src/string/bcopy.h
index 4cf0263a7d639..ec4d8cde1c6cb 100644
--- a/libc/src/string/bcopy.h
+++ b/libc/src/string/bcopy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_BCOPY_H
#define LLVM_LIBC_SRC_STRING_BCOPY_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void bcopy(const void *src, void *dest, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_BCOPY_H
diff --git a/libc/src/string/bzero.cpp b/libc/src/string/bzero.cpp
index 7bcbee3547b9b..c833cd8c2116d 100644
--- a/libc/src/string/bzero.cpp
+++ b/libc/src/string/bzero.cpp
@@ -8,13 +8,12 @@
#include "src/string/bzero.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_bzero.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, bzero, (void *ptr, size_t count)) {
inline_bzero(reinterpret_cast<char *>(ptr), count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/bzero.h b/libc/src/string/bzero.h
index d9722197e8e8b..3f52fe2128052 100644
--- a/libc/src/string/bzero.h
+++ b/libc/src/string/bzero.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_BZERO_H
#define LLVM_LIBC_SRC_STRING_BZERO_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void bzero(void *ptr, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_BZERO_H
diff --git a/libc/src/string/index.cpp b/libc/src/string/index.cpp
index 46cf54825f6ce..4b2a3527d0ad8 100644
--- a/libc/src/string/index.cpp
+++ b/libc/src/string/index.cpp
@@ -9,13 +9,12 @@
#include "src/string/index.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, index, (const char *src, int c)) {
return internal::strchr_implementation(src, c);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/index.h b/libc/src/string/index.h
index 9843bcdf9a573..993f060b6ac86 100644
--- a/libc/src/string/index.h
+++ b/libc/src/string/index.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_INDEX_H
#define LLVM_LIBC_SRC_STRING_INDEX_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *index(const char *src, int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_INDEX_H
diff --git a/libc/src/string/memccpy.cpp b/libc/src/string/memccpy.cpp
index ae90cf9370d49..200384e9f6190 100644
--- a/libc/src/string/memccpy.cpp
+++ b/libc/src/string/memccpy.cpp
@@ -9,10 +9,9 @@
#include "src/string/memccpy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h> // For size_t.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, memccpy,
(void *__restrict dest, const void *__restrict src, int c,
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(void *, memccpy,
return nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/memccpy.h b/libc/src/string/memccpy.h
index d6d2ea4650210..ce12dfbddc289 100644
--- a/libc/src/string/memccpy.h
+++ b/libc/src/string/memccpy.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMCCPY_H
#define LLVM_LIBC_SRC_STRING_MEMCCPY_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *memccpy(void *__restrict dest, const void *__restrict src, int c,
size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMCCPY_H
diff --git a/libc/src/string/memchr.cpp b/libc/src/string/memchr.cpp
index ba52f14afa9d6..918bdd957b413 100644
--- a/libc/src/string/memchr.cpp
+++ b/libc/src/string/memchr.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/string/memchr.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Look at performance benefits of comparing words.
LLVM_LIBC_FUNCTION(void *, memchr, (const void *src, int c, size_t n)) {
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(void *, memchr, (const void *src, int c, size_t n)) {
static_cast<unsigned char>(c), n);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/memchr.h b/libc/src/string/memchr.h
index 748fd6402489d..b84c8317be55e 100644
--- a/libc/src/string/memchr.h
+++ b/libc/src/string/memchr.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMCHR_H
#define LLVM_LIBC_SRC_STRING_MEMCHR_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *memchr(const void *src, int c, size_t n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMCHR_H
diff --git a/libc/src/string/memcmp.cpp b/libc/src/string/memcmp.cpp
index 68996fb787236..adfbc1eca326a 100644
--- a/libc/src/string/memcmp.cpp
+++ b/libc/src/string/memcmp.cpp
@@ -7,16 +7,15 @@
//===----------------------------------------------------------------------===//
#include "src/string/memcmp.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcmp.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, memcmp,
(const void *lhs, const void *rhs, size_t count)) {
return inline_memcmp(lhs, rhs, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/memcmp.h b/libc/src/string/memcmp.h
index b934ee3a8bb33..f2c1dd3541cb2 100644
--- a/libc/src/string/memcmp.h
+++ b/libc/src/string/memcmp.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMCMP_H
#define LLVM_LIBC_SRC_STRING_MEMCMP_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int memcmp(const void *lhs, const void *rhs, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMCMP_H
diff --git a/libc/src/string/memcpy.cpp b/libc/src/string/memcpy.cpp
index 0eb7f2c170e08..e6cf978dc3bc6 100644
--- a/libc/src/string/memcpy.cpp
+++ b/libc/src/string/memcpy.cpp
@@ -8,10 +8,9 @@
#include "src/string/memcpy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcpy.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, memcpy,
(void *__restrict dst, const void *__restrict src,
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(void *, memcpy,
return dst;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/memcpy.h b/libc/src/string/memcpy.h
index d624878a6b226..ea34a2d3d8754 100644
--- a/libc/src/string/memcpy.h
+++ b/libc/src/string/memcpy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMCPY_H
#define LLVM_LIBC_SRC_STRING_MEMCPY_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *memcpy(void *__restrict, const void *__restrict, size_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMCPY_H
diff --git a/libc/src/string/memmem.cpp b/libc/src/string/memmem.cpp
index c38df8ff84f6f..c695a8d4b8b49 100644
--- a/libc/src/string/memmem.cpp
+++ b/libc/src/string/memmem.cpp
@@ -8,10 +8,9 @@
#include "src/string/memmem.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memmem.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, memmem,
(const void *haystack, size_t haystack_len,
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(void *, memmem,
return inline_memmem(haystack, haystack_len, needle, needle_len, COMP);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/memmem.h b/libc/src/string/memmem.h
index ce1bd61b5b21f..b1f84c8cf3234 100644
--- a/libc/src/string/memmem.h
+++ b/libc/src/string/memmem.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMMEM_H
#define LLVM_LIBC_SRC_STRING_MEMMEM_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // For size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *memmem(const void *haystack, size_t haystack_len, const void *needle,
size_t needle_len);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMMEM_H
diff --git a/libc/src/string/memmove.cpp b/libc/src/string/memmove.cpp
index 26a8c4187f3d3..19e38a3c8bdbe 100644
--- a/libc/src/string/memmove.cpp
+++ b/libc/src/string/memmove.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/string/memmove.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "src/string/memory_utils/inline_memmove.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, memmove,
(void *dst, const void *src, size_t count)) {
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(void *, memmove,
return dst;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/memmove.h b/libc/src/string/memmove.h
index 56b071a62f10e..4d78aadbd6620 100644
--- a/libc/src/string/memmove.h
+++ b/libc/src/string/memmove.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMMOVE_H
#define LLVM_LIBC_SRC_STRING_MEMMOVE_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *memmove(void *dst, const void *src, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMMOVE_H
diff --git a/libc/src/string/memory_utils/aarch64/inline_bcmp.h b/libc/src/string/memory_utils/aarch64/inline_bcmp.h
index 93196415f2662..b80b578187634 100644
--- a/libc/src/string/memory_utils/aarch64/inline_bcmp.h
+++ b/libc/src/string/memory_utils/aarch64/inline_bcmp.h
@@ -9,7 +9,6 @@
#define LIBC_SRC_STRING_MEMORY_UTILS_AARCH64_INLINE_BCMP_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/string/memory_utils/op_aarch64.h"
#include "src/string/memory_utils/op_generic.h"
@@ -17,7 +16,7 @@
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE BcmpReturnType inline_bcmp_aarch64(CPtr p1,
CPtr p2,
@@ -66,6 +65,6 @@ namespace LIBC_NAMESPACE_DECL {
return aarch64::Bcmp<32>::loop_and_tail(p1, p2, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_SRC_STRING_MEMORY_UTILS_AARCH64_INLINE_BCMP_H
diff --git a/libc/src/string/memory_utils/aarch64/inline_memcmp.h b/libc/src/string/memory_utils/aarch64/inline_memcmp.h
index 84f5a41230798..d0e0bd7cf025f 100644
--- a/libc/src/string/memory_utils/aarch64/inline_memcmp.h
+++ b/libc/src/string/memory_utils/aarch64/inline_memcmp.h
@@ -14,7 +14,7 @@
#include "src/string/memory_utils/op_generic.h"
#include "src/string/memory_utils/utils.h" // MemcmpReturnType
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE MemcmpReturnType
inline_memcmp_generic_gt16(CPtr p1, CPtr p2, size_t count) {
@@ -66,6 +66,6 @@ LIBC_INLINE MemcmpReturnType inline_memcmp_aarch64(CPtr p1, CPtr p2,
else
return inline_memcmp_generic_gt16(p1, p2, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_MEMCMP_H
diff --git a/libc/src/string/memory_utils/aarch64/inline_memcpy.h b/libc/src/string/memory_utils/aarch64/inline_memcpy.h
index 2b34b675d8af2..ea1a03f4fa0bf 100644
--- a/libc/src/string/memory_utils/aarch64/inline_memcpy.h
+++ b/libc/src/string/memory_utils/aarch64/inline_memcpy.h
@@ -14,7 +14,7 @@
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE void
inline_memcpy_aarch64(Ptr __restrict dst, CPtr __restrict src, size_t count) {
@@ -43,6 +43,6 @@ inline_memcpy_aarch64(Ptr __restrict dst, CPtr __restrict src, size_t count) {
return builtin::Memcpy<64>::loop_and_tail(dst, src, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_AARCH64_INLINE_MEMCPY_H
diff --git a/libc/src/string/memory_utils/aarch64/inline_memmove.h b/libc/src/string/memory_utils/aarch64/inline_memmove.h
index def82373fbfbe..ca28655c91682 100644
--- a/libc/src/string/memory_utils/aarch64/inline_memmove.h
+++ b/libc/src/string/memory_utils/aarch64/inline_memmove.h
@@ -16,7 +16,7 @@
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE void inline_memmove_aarch64(Ptr dst, CPtr src, size_t count) {
static_assert(aarch64::kNeon, "aarch64 supports vector types");
@@ -48,6 +48,6 @@ LIBC_INLINE void inline_memmove_aarch64(Ptr dst, CPtr src, size_t count) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_SRC_STRING_MEMORY_UTILS_AARCH64_INLINE_MEMMOVE_H
diff --git a/libc/src/string/memory_utils/aarch64/inline_memset.h b/libc/src/string/memory_utils/aarch64/inline_memset.h
index a2c05534aa330..91512acce6fc0 100644
--- a/libc/src/string/memory_utils/aarch64/inline_memset.h
+++ b/libc/src/string/memory_utils/aarch64/inline_memset.h
@@ -9,14 +9,13 @@
#define LIBC_SRC_STRING_MEMORY_UTILS_AARCH64_INLINE_MEMSET_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/op_aarch64.h"
#include "src/string/memory_utils/op_generic.h"
#include "src/string/memory_utils/utils.h" // Ptr, CPtr
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE static void
inline_memset_aarch64(Ptr dst, uint8_t value, size_t count) {
@@ -57,6 +56,6 @@ inline_memset_aarch64(Ptr dst, uint8_t value, size_t count) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_SRC_STRING_MEMORY_UTILS_AARCH64_INLINE_MEMSET_H
diff --git a/libc/src/string/memory_utils/generic/aligned_access.h b/libc/src/string/memory_utils/generic/aligned_access.h
index 7e480b8a1c2bb..b6ece816756c5 100644
--- a/libc/src/string/memory_utils/generic/aligned_access.h
+++ b/libc/src/string/memory_utils/generic/aligned_access.h
@@ -20,7 +20,7 @@
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE uint32_t load32_aligned(CPtr ptr, size_t offset,
size_t alignment) {
@@ -202,6 +202,6 @@ inline_memcmp_aligned_access_64bit(CPtr p1, CPtr p2, size_t count) {
return inline_memcmp_byte_per_byte(p1, p2, count, offset);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_GENERIC_ALIGNED_ACCESS_H
diff --git a/libc/src/string/memory_utils/generic/builtin.h b/libc/src/string/memory_utils/generic/builtin.h
index 5670a4e610565..ba4f4b8984088 100644
--- a/libc/src/string/memory_utils/generic/builtin.h
+++ b/libc/src/string/memory_utils/generic/builtin.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_GENERIC_BUILTIN_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
-#include "src/string/memory_utils/utils.h" // Ptr, CPtr
+#include "src/string/memory_utils/utils.h" // Ptr, CPtr
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#if !__has_builtin(__builtin_memcpy) || !__has_builtin(__builtin_memset) || \
!__has_builtin(__builtin_memmove)
@@ -37,6 +36,6 @@ inline_memset_builtin(Ptr dst, uint8_t value, size_t count, size_t offset = 0) {
__builtin_memset(dst + offset, value, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_GENERIC_BUILTIN_H
diff --git a/libc/src/string/memory_utils/generic/byte_per_byte.h b/libc/src/string/memory_utils/generic/byte_per_byte.h
index eab5964bfe167..9515398794df4 100644
--- a/libc/src/string/memory_utils/generic/byte_per_byte.h
+++ b/libc/src/string/memory_utils/generic/byte_per_byte.h
@@ -18,7 +18,7 @@
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE void
inline_memcpy_byte_per_byte(Ptr dst, CPtr src, size_t count,
@@ -73,6 +73,6 @@ inline_memcmp_byte_per_byte(CPtr p1, CPtr p2, size_t count, size_t offset = 0) {
return MemcmpReturnType::zero();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_GENERIC_BYTE_PER_BYTE_H
diff --git a/libc/src/string/memory_utils/inline_bcmp.h b/libc/src/string/memory_utils/inline_bcmp.h
index 14cf16ebb6b69..69aa2acf75be4 100644
--- a/libc/src/string/memory_utils/inline_bcmp.h
+++ b/libc/src/string/memory_utils/inline_bcmp.h
@@ -10,7 +10,6 @@
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_BCMP_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_
#include <stddef.h> // size_t
@@ -31,7 +30,7 @@
#error "Unsupported architecture"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[gnu::flatten]] LIBC_INLINE int inline_bcmp(const void *p1, const void *p2,
size_t count) {
@@ -39,7 +38,7 @@ namespace LIBC_NAMESPACE_DECL {
reinterpret_cast<CPtr>(p1), reinterpret_cast<CPtr>(p2), count));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#undef LIBC_SRC_STRING_MEMORY_UTILS_BCMP
diff --git a/libc/src/string/memory_utils/inline_bzero.h b/libc/src/string/memory_utils/inline_bzero.h
index 4a92e8b57a68e..d760baca9d0f4 100644
--- a/libc/src/string/memory_utils/inline_bzero.h
+++ b/libc/src/string/memory_utils/inline_bzero.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_BZERO_H
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memset.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[gnu::flatten]] LIBC_INLINE static void inline_bzero(Ptr dst, size_t count) {
inline_memset(dst, 0, count);
@@ -25,6 +24,6 @@ namespace LIBC_NAMESPACE_DECL {
inline_bzero(reinterpret_cast<Ptr>(dst), count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_BZERO_H
diff --git a/libc/src/string/memory_utils/inline_memcmp.h b/libc/src/string/memory_utils/inline_memcmp.h
index 82216265c23be..1fdc13973c646 100644
--- a/libc/src/string/memory_utils/inline_memcmp.h
+++ b/libc/src/string/memory_utils/inline_memcmp.h
@@ -31,7 +31,7 @@
#error "Unsupported architecture"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[gnu::flatten]] LIBC_INLINE int inline_memcmp(const void *p1, const void *p2,
size_t count) {
@@ -39,7 +39,7 @@ namespace LIBC_NAMESPACE_DECL {
reinterpret_cast<CPtr>(p1), reinterpret_cast<CPtr>(p2), count));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#undef LIBC_SRC_STRING_MEMORY_UTILS_MEMCMP
diff --git a/libc/src/string/memory_utils/inline_memcpy.h b/libc/src/string/memory_utils/inline_memcpy.h
index 7a77e77438138..c88fd55eff645 100644
--- a/libc/src/string/memory_utils/inline_memcpy.h
+++ b/libc/src/string/memory_utils/inline_memcpy.h
@@ -38,7 +38,7 @@
#error "Unsupported architecture"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[gnu::flatten]] LIBC_INLINE void
inline_memcpy(void *__restrict dst, const void *__restrict src, size_t count) {
@@ -46,6 +46,6 @@ inline_memcpy(void *__restrict dst, const void *__restrict src, size_t count) {
reinterpret_cast<CPtr>(src), count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMCPY_H
diff --git a/libc/src/string/memory_utils/inline_memmem.h b/libc/src/string/memory_utils/inline_memmem.h
index 15e3d633985d6..eaddee57aef54 100644
--- a/libc/src/string/memory_utils/inline_memmem.h
+++ b/libc/src/string/memory_utils/inline_memmem.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMMEM_H
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename Comp>
LIBC_INLINE constexpr static void *
@@ -40,6 +39,6 @@ inline_memmem(const void *haystack, size_t haystack_len, const void *needle,
return nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMMEM_H
diff --git a/libc/src/string/memory_utils/inline_memmove.h b/libc/src/string/memory_utils/inline_memmove.h
index 85d0159701ece..3cbc3e0b0a528 100644
--- a/libc/src/string/memory_utils/inline_memmove.h
+++ b/libc/src/string/memory_utils/inline_memmove.h
@@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMMOVE_H
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMMOVE_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t, ptrdiff_t
#if defined(LIBC_TARGET_ARCH_IS_X86)
@@ -43,7 +42,7 @@
#error "Unsupported architecture"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE constexpr bool inline_memmove_no_small_size(void *, const void *,
size_t) {
@@ -68,6 +67,6 @@ LIBC_INLINE void inline_memmove(void *dst, const void *src, size_t count) {
inline_memmove_follow_up(dst, src, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif /* LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMMOVE_H */
diff --git a/libc/src/string/memory_utils/inline_memset.h b/libc/src/string/memory_utils/inline_memset.h
index 858e983f00932..1c07c1ca4bffc 100644
--- a/libc/src/string/memory_utils/inline_memset.h
+++ b/libc/src/string/memory_utils/inline_memset.h
@@ -34,13 +34,13 @@
#error "Unsupported architecture"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE static void inline_memset(void *dst, uint8_t value, size_t count) {
LIBC_SRC_STRING_MEMORY_UTILS_MEMSET(reinterpret_cast<Ptr>(dst), value, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#undef LIBC_SRC_STRING_MEMORY_UTILS_MEMSET
diff --git a/libc/src/string/memory_utils/inline_strcmp.h b/libc/src/string/memory_utils/inline_strcmp.h
index 281d5b14c6cba..2bcd56ad3d6b0 100644
--- a/libc/src/string/memory_utils/inline_strcmp.h
+++ b/libc/src/string/memory_utils/inline_strcmp.h
@@ -9,10 +9,9 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRCMP_H
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRCMP_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename Comp>
LIBC_INLINE constexpr int inline_strcmp(const char *left, const char *right,
@@ -40,6 +39,6 @@ LIBC_INLINE constexpr int inline_strncmp(const char *left, const char *right,
*reinterpret_cast<const unsigned char *>(right));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRCMP_H
diff --git a/libc/src/string/memory_utils/inline_strstr.h b/libc/src/string/memory_utils/inline_strstr.h
index 9c99e920b4b57..f0f8e2bbf896a 100644
--- a/libc/src/string/memory_utils/inline_strstr.h
+++ b/libc/src/string/memory_utils/inline_strstr.h
@@ -9,12 +9,11 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRSTR_H
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRSTR_H
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memmem.h"
#include "src/string/string_utils.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename Comp>
LIBC_INLINE constexpr char *inline_strstr(const char *haystack,
@@ -25,6 +24,6 @@ LIBC_INLINE constexpr char *inline_strstr(const char *haystack,
return static_cast<char *>(result);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRSTR_H
diff --git a/libc/src/string/memory_utils/op_aarch64.h b/libc/src/string/memory_utils/op_aarch64.h
index 1090ea2617f09..6a2013b2a8fae 100644
--- a/libc/src/string/memory_utils/op_aarch64.h
+++ b/libc/src/string/memory_utils/op_aarch64.h
@@ -13,7 +13,6 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_AARCH64_H
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_AARCH64_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if defined(LIBC_TARGET_ARCH_IS_AARCH64)
@@ -26,8 +25,7 @@
#include <arm_neon.h>
#endif //__ARM_NEON
-namespace LIBC_NAMESPACE_DECL {
-namespace aarch64 {
+namespace LIBC_NAMESPACE::aarch64 {
LIBC_INLINE_VAR constexpr bool kNeon = LLVM_LIBC_IS_DEFINED(__ARM_NEON);
@@ -172,11 +170,9 @@ template <size_t Size> struct Bcmp {
}
};
-} // namespace aarch64
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::aarch64
-namespace LIBC_NAMESPACE_DECL {
-namespace generic {
+namespace LIBC_NAMESPACE::generic {
///////////////////////////////////////////////////////////////////////////////
// Specializations for uint16_t
@@ -268,8 +264,7 @@ LIBC_INLINE MemcmpReturnType cmp<uint8x16x2_t>(CPtr p1, CPtr p2,
}
return MemcmpReturnType::zero();
}
-} // namespace generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::generic
#endif // LIBC_TARGET_ARCH_IS_AARCH64
diff --git a/libc/src/string/memory_utils/op_builtin.h b/libc/src/string/memory_utils/op_builtin.h
index d7c1b1f870115..75dd4de53a470 100644
--- a/libc/src/string/memory_utils/op_builtin.h
+++ b/libc/src/string/memory_utils/op_builtin.h
@@ -16,11 +16,9 @@
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_BUILTIN_H
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/utils.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace builtin {
+namespace LIBC_NAMESPACE::builtin {
///////////////////////////////////////////////////////////////////////////////
// Memcpy
@@ -153,7 +151,6 @@ template <size_t Size> struct Memcmp {
}
};
-} // namespace builtin
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::builtin
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_BUILTIN_H
diff --git a/libc/src/string/memory_utils/op_generic.h b/libc/src/string/memory_utils/op_generic.h
index 89bbea8a2bdd2..efaff80b7e4da 100644
--- a/libc/src/string/memory_utils/op_generic.h
+++ b/libc/src/string/memory_utils/op_generic.h
@@ -27,7 +27,6 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
#include "src/__support/endian.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT64
#include "src/string/memory_utils/op_builtin.h"
@@ -39,15 +38,14 @@ static_assert((UINTPTR_MAX == 4294967295U) ||
(UINTPTR_MAX == 18446744073709551615UL),
"We currently only support 32- or 64-bit platforms");
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Compiler types using the vector attributes.
using generic_v128 = uint8_t __attribute__((__vector_size__(16)));
using generic_v256 = uint8_t __attribute__((__vector_size__(32)));
using generic_v512 = uint8_t __attribute__((__vector_size__(64)));
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
-namespace LIBC_NAMESPACE_DECL {
-namespace generic {
+namespace LIBC_NAMESPACE::generic {
// We accept three types of values as elements for generic operations:
// - scalar : unsigned integral types,
@@ -580,7 +578,6 @@ LIBC_INLINE MemcmpReturnType cmp<uint8_t>(CPtr p1, CPtr p2, size_t offset) {
template <>
LIBC_INLINE MemcmpReturnType cmp_neq<uint8_t>(CPtr p1, CPtr p2, size_t offset);
-} // namespace generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::generic
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_GENERIC_H
diff --git a/libc/src/string/memory_utils/op_riscv.h b/libc/src/string/memory_utils/op_riscv.h
index 2d211de0facfc..313d55e644cb4 100644
--- a/libc/src/string/memory_utils/op_riscv.h
+++ b/libc/src/string/memory_utils/op_riscv.h
@@ -12,7 +12,6 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_RISCV_H
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_RISCV_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)
@@ -20,8 +19,7 @@
#include "src/__support/common.h"
#include "src/string/memory_utils/op_generic.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace generic {
+namespace LIBC_NAMESPACE::generic {
///////////////////////////////////////////////////////////////////////////////
// Specializations for uint16_t
@@ -80,8 +78,7 @@ LIBC_INLINE MemcmpReturnType cmp_neq<uint64_t>(CPtr p1, CPtr p2,
return cmp_neq_uint64_t(a, b);
}
-} // namespace generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::generic
#endif // LIBC_TARGET_ARCH_IS_ANY_RISCV
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_RISCV_H
diff --git a/libc/src/string/memory_utils/op_x86.h b/libc/src/string/memory_utils/op_x86.h
index cf9667283818d..2d9cebbb0496a 100644
--- a/libc/src/string/memory_utils/op_x86.h
+++ b/libc/src/string/memory_utils/op_x86.h
@@ -12,7 +12,6 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_X86_H
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_X86_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#if defined(LIBC_TARGET_ARCH_IS_X86)
@@ -38,8 +37,7 @@
#define _mm_movemask_epi8(A) 0
#endif
-namespace LIBC_NAMESPACE_DECL {
-namespace x86 {
+namespace LIBC_NAMESPACE::x86 {
// A set of constants to check compile time features.
LIBC_INLINE_VAR constexpr bool K_SSE2 = LLVM_LIBC_IS_DEFINED(__SSE2__);
@@ -57,11 +55,9 @@ struct Memcpy {
}
};
-} // namespace x86
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::x86
-namespace LIBC_NAMESPACE_DECL {
-namespace generic {
+namespace LIBC_NAMESPACE::generic {
///////////////////////////////////////////////////////////////////////////////
// Specializations for uint16_t
@@ -318,8 +314,7 @@ LIBC_INLINE MemcmpReturnType cmp_neq<__m512i>(CPtr p1, CPtr p2, size_t offset) {
#pragma GCC diagnostic pop
-} // namespace generic
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::generic
#endif // LIBC_TARGET_ARCH_IS_X86
diff --git a/libc/src/string/memory_utils/riscv/inline_bcmp.h b/libc/src/string/memory_utils/riscv/inline_bcmp.h
index 4bdde27cd16be..d66f0a7b225e6 100644
--- a/libc/src/string/memory_utils/riscv/inline_bcmp.h
+++ b/libc/src/string/memory_utils/riscv/inline_bcmp.h
@@ -9,14 +9,13 @@
#define LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_BCMP_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
#include "src/string/memory_utils/generic/aligned_access.h"
#include "src/string/memory_utils/utils.h" // Ptr, CPtr
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE BcmpReturnType inline_bcmp_riscv(CPtr p1, CPtr p2,
size_t count) {
@@ -29,6 +28,6 @@ namespace LIBC_NAMESPACE_DECL {
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_BCMP_H
diff --git a/libc/src/string/memory_utils/riscv/inline_memcmp.h b/libc/src/string/memory_utils/riscv/inline_memcmp.h
index ca834952d331e..0b28ad92235c1 100644
--- a/libc/src/string/memory_utils/riscv/inline_memcmp.h
+++ b/libc/src/string/memory_utils/riscv/inline_memcmp.h
@@ -9,14 +9,13 @@
#define LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMCMP_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
#include "src/string/memory_utils/generic/aligned_access.h"
#include "src/string/memory_utils/utils.h" // Ptr, CPtr
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE MemcmpReturnType
inline_memcmp_riscv(CPtr p1, CPtr p2, size_t count) {
@@ -29,6 +28,6 @@ inline_memcmp_riscv(CPtr p1, CPtr p2, size_t count) {
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMCMP_H
diff --git a/libc/src/string/memory_utils/riscv/inline_memcpy.h b/libc/src/string/memory_utils/riscv/inline_memcpy.h
index 8eb87e0f38ce5..05531c8b75972 100644
--- a/libc/src/string/memory_utils/riscv/inline_memcpy.h
+++ b/libc/src/string/memory_utils/riscv/inline_memcpy.h
@@ -9,14 +9,13 @@
#define LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMCPY_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
#include "src/string/memory_utils/generic/aligned_access.h"
#include "src/string/memory_utils/utils.h" // Ptr, CPtr
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE void
inline_memcpy_riscv(Ptr __restrict dst, CPtr __restrict src, size_t count) {
@@ -29,6 +28,6 @@ inline_memcpy_riscv(Ptr __restrict dst, CPtr __restrict src, size_t count) {
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMCPY_H
diff --git a/libc/src/string/memory_utils/riscv/inline_memmove.h b/libc/src/string/memory_utils/riscv/inline_memmove.h
index 28de4c240260d..1a95a8ebba07c 100644
--- a/libc/src/string/memory_utils/riscv/inline_memmove.h
+++ b/libc/src/string/memory_utils/riscv/inline_memmove.h
@@ -9,20 +9,19 @@
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMMOVE_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
#include "src/string/memory_utils/generic/byte_per_byte.h"
#include "src/string/memory_utils/utils.h" // Ptr, CPtr
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE void
inline_memmove_riscv(Ptr __restrict dst, CPtr __restrict src, size_t count) {
return inline_memmove_byte_per_byte(dst, src, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMMOVE_H
diff --git a/libc/src/string/memory_utils/riscv/inline_memset.h b/libc/src/string/memory_utils/riscv/inline_memset.h
index d6ab523f16414..b9b8a188aff67 100644
--- a/libc/src/string/memory_utils/riscv/inline_memset.h
+++ b/libc/src/string/memory_utils/riscv/inline_memset.h
@@ -9,14 +9,13 @@
#define LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMSET_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
#include "src/string/memory_utils/generic/aligned_access.h"
#include "src/string/memory_utils/utils.h" // Ptr, CPtr
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE static void inline_memset_riscv(Ptr dst, uint8_t value,
size_t count) {
@@ -29,6 +28,6 @@ LIBC_INLINE static void inline_memset_riscv(Ptr dst, uint8_t value,
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMSET_H
diff --git a/libc/src/string/memory_utils/utils.h b/libc/src/string/memory_utils/utils.h
index 5e5fe593cce77..cb1fd899b6c63 100644
--- a/libc/src/string/memory_utils/utils.h
+++ b/libc/src/string/memory_utils/utils.h
@@ -14,13 +14,12 @@
#include "src/__support/CPP/type_traits.h"
#include "src/__support/endian.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include <stddef.h> // size_t
#include <stdint.h> // intptr_t / uintptr_t / INT32_MAX / INT32_MIN
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Returns the number of bytes to substract from ptr to get to the previous
// multiple of alignment. If ptr is already aligned returns 0.
@@ -350,6 +349,6 @@ LIBC_INLINE void prefetch_to_local_cache(CPtr dst) {
__builtin_prefetch(dst, /*read*/ 0, /*max locality*/ 3);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_UTILS_H
diff --git a/libc/src/string/memory_utils/x86_64/inline_bcmp.h b/libc/src/string/memory_utils/x86_64/inline_bcmp.h
index 49fe08fb0501b..58eaedbbe015f 100644
--- a/libc/src/string/memory_utils/x86_64/inline_bcmp.h
+++ b/libc/src/string/memory_utils/x86_64/inline_bcmp.h
@@ -9,14 +9,13 @@
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_BCMP_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/op_generic.h"
#include "src/string/memory_utils/op_x86.h"
#include "src/string/memory_utils/utils.h" // Ptr, CPtr
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE BcmpReturnType
inline_bcmp_generic_gt16(CPtr p1, CPtr p2, size_t count) {
@@ -89,6 +88,6 @@ inline_bcmp_x86_avx512bw_gt16(CPtr p1, CPtr p2, size_t count) {
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_BCMP_H
diff --git a/libc/src/string/memory_utils/x86_64/inline_memcmp.h b/libc/src/string/memory_utils/x86_64/inline_memcmp.h
index 7fd101227c883..6a315adcd566c 100644
--- a/libc/src/string/memory_utils/x86_64/inline_memcmp.h
+++ b/libc/src/string/memory_utils/x86_64/inline_memcmp.h
@@ -15,7 +15,7 @@
#include "src/string/memory_utils/op_x86.h"
#include "src/string/memory_utils/utils.h" // MemcmpReturnType
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[maybe_unused]] LIBC_INLINE MemcmpReturnType
inline_memcmp_generic_gt16(CPtr p1, CPtr p2, size_t count) {
@@ -89,6 +89,6 @@ LIBC_INLINE MemcmpReturnType inline_memcmp_x86(CPtr p1, CPtr p2, size_t count) {
#endif
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_MEMCMP_H
diff --git a/libc/src/string/memory_utils/x86_64/inline_memcpy.h b/libc/src/string/memory_utils/x86_64/inline_memcpy.h
index 59a360811f11c..507b3e25199ed 100644
--- a/libc/src/string/memory_utils/x86_64/inline_memcpy.h
+++ b/libc/src/string/memory_utils/x86_64/inline_memcpy.h
@@ -26,7 +26,7 @@
#error LLVM_LIBC_MEMCPY_X86_USE_REPMOVSB_FROM_SIZE is deprecated use LIBC_COPT_MEMCPY_X86_USE_REPMOVSB_FROM_SIZE=0 instead.
#endif // LLVM_LIBC_MEMCPY_X86_USE_REPMOVSB_FROM_SIZE
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace x86 {
@@ -222,6 +222,6 @@ inline_memcpy_x86_maybe_interpose_repmovsb(Ptr __restrict dst,
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_MEMCPY_H
diff --git a/libc/src/string/memory_utils/x86_64/inline_memmove.h b/libc/src/string/memory_utils/x86_64/inline_memmove.h
index d81e833598f79..879b36eaa6734 100644
--- a/libc/src/string/memory_utils/x86_64/inline_memmove.h
+++ b/libc/src/string/memory_utils/x86_64/inline_memmove.h
@@ -16,7 +16,7 @@
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE bool inline_memmove_small_size_x86(Ptr dst, CPtr src,
size_t count) {
@@ -115,6 +115,6 @@ LIBC_INLINE void inline_memmove_follow_up_x86(Ptr dst, CPtr src, size_t count) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_MEMMOVE_H
diff --git a/libc/src/string/memory_utils/x86_64/inline_memset.h b/libc/src/string/memory_utils/x86_64/inline_memset.h
index 9f8e584d2bbb4..584efcbea4be3 100644
--- a/libc/src/string/memory_utils/x86_64/inline_memset.h
+++ b/libc/src/string/memory_utils/x86_64/inline_memset.h
@@ -9,14 +9,13 @@
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_MEMSET_H
#include "src/__support/macros/attributes.h" // LIBC_INLINE
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/op_generic.h"
#include "src/string/memory_utils/op_x86.h"
#include "src/string/memory_utils/utils.h" // Ptr, CPtr
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace x86 {
// Size of one cache line for software prefetching
LIBC_INLINE_VAR constexpr size_t K_ONE_CACHELINE_SIZE = 64;
@@ -105,6 +104,6 @@ inline_memset_x86(Ptr dst, uint8_t value, size_t count) {
align_to_next_boundary<32>(dst, count);
return generic::Memset<uint256_t>::loop_and_tail(dst, value, count);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_MEMSET_H
diff --git a/libc/src/string/mempcpy.cpp b/libc/src/string/mempcpy.cpp
index 09392ceb966d6..47cc3d634d44c 100644
--- a/libc/src/string/mempcpy.cpp
+++ b/libc/src/string/mempcpy.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/string/mempcpy.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "src/__support/common.h"
#include <stddef.h> // For size_t.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, mempcpy,
(void *__restrict dst, const void *__restrict src,
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(void *, mempcpy,
return reinterpret_cast<char *>(dst) + count;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/mempcpy.h b/libc/src/string/mempcpy.h
index a6fd457d8d5a5..317e0fc1d1f30 100644
--- a/libc/src/string/mempcpy.h
+++ b/libc/src/string/mempcpy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMPCPY_H
#define LLVM_LIBC_SRC_STRING_MEMPCPY_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *mempcpy(void *__restrict dest, const void *__restrict src, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMPCPY_H
diff --git a/libc/src/string/memrchr.cpp b/libc/src/string/memrchr.cpp
index d665e225bbb7d..fad086809635f 100644
--- a/libc/src/string/memrchr.cpp
+++ b/libc/src/string/memrchr.cpp
@@ -8,10 +8,9 @@
#include "src/string/memrchr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, memrchr, (const void *src, int c, size_t n)) {
const unsigned char *str = reinterpret_cast<const unsigned char *>(src);
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(void *, memrchr, (const void *src, int c, size_t n)) {
return nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/memrchr.h b/libc/src/string/memrchr.h
index 0ab7b3b21b66b..5c32d6a3ad556 100644
--- a/libc/src/string/memrchr.h
+++ b/libc/src/string/memrchr.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMRCHR_H
#define LLVM_LIBC_SRC_STRING_MEMRCHR_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *memrchr(const void *src, int c, size_t n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMRCHR_H
diff --git a/libc/src/string/memset.cpp b/libc/src/string/memset.cpp
index c2868afa91031..a94e353421968 100644
--- a/libc/src/string/memset.cpp
+++ b/libc/src/string/memset.cpp
@@ -8,14 +8,13 @@
#include "src/string/memset.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memset.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, memset, (void *dst, int value, size_t count)) {
inline_memset(dst, static_cast<uint8_t>(value), count);
return dst;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/memset.h b/libc/src/string/memset.h
index 17062ee4c7898..4c1ef9d91c71a 100644
--- a/libc/src/string/memset.h
+++ b/libc/src/string/memset.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMSET_H
#define LLVM_LIBC_SRC_STRING_MEMSET_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *memset(void *ptr, int value, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMSET_H
diff --git a/libc/src/string/memset_explicit.cpp b/libc/src/string/memset_explicit.cpp
index a3e4dad874397..a8656d1e791e8 100644
--- a/libc/src/string/memset_explicit.cpp
+++ b/libc/src/string/memset_explicit.cpp
@@ -8,10 +8,9 @@
#include "src/string/memset_explicit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memset.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[gnu::noinline]] LLVM_LIBC_FUNCTION(void *, memset_explicit,
(void *dst, int value, size_t count)) {
@@ -23,4 +22,4 @@ namespace LIBC_NAMESPACE_DECL {
return dst;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/memset_explicit.h b/libc/src/string/memset_explicit.h
index 0c6ccc8849fa9..f6c189761a123 100644
--- a/libc/src/string/memset_explicit.h
+++ b/libc/src/string/memset_explicit.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_MEMSET_EXPLICIT_H
#define LLVM_LIBC_SRC_STRING_MEMSET_EXPLICIT_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[gnu::noinline]] void *memset_explicit(void *ptr, int value, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_MEMSET_EXPLICIT_H
diff --git a/libc/src/string/rindex.cpp b/libc/src/string/rindex.cpp
index 25879ddb07f62..2c7f8dc29ea8a 100644
--- a/libc/src/string/rindex.cpp
+++ b/libc/src/string/rindex.cpp
@@ -9,13 +9,12 @@
#include "src/string/rindex.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, rindex, (const char *src, int c)) {
return internal::strrchr_implementation(src, c);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/rindex.h b/libc/src/string/rindex.h
index cfc35daa1f4d5..a2aad85bed913 100644
--- a/libc/src/string/rindex.h
+++ b/libc/src/string/rindex.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_RINDEX_H
#define LLVM_LIBC_SRC_STRING_RINDEX_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *rindex(const char *src, int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_RINDEX_H
diff --git a/libc/src/string/stpcpy.cpp b/libc/src/string/stpcpy.cpp
index 979edd72c1f1d..bdaa6899302c0 100644
--- a/libc/src/string/stpcpy.cpp
+++ b/libc/src/string/stpcpy.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/string/stpcpy.h"
-#include "src/__support/macros/config.h"
#include "src/string/mempcpy.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, stpcpy,
(char *__restrict dest, const char *__restrict src)) {
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(char *, stpcpy,
return nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/stpcpy.h b/libc/src/string/stpcpy.h
index ea04a915b9e38..4352f5b389a24 100644
--- a/libc/src/string/stpcpy.h
+++ b/libc/src/string/stpcpy.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STPCPY_H
#define LLVM_LIBC_SRC_STRING_STPCPY_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *stpcpy(char *__restrict dest, const char *__restrict src);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STPCPY_H
diff --git a/libc/src/string/stpncpy.cpp b/libc/src/string/stpncpy.cpp
index d2a6e04749820..436e131d06872 100644
--- a/libc/src/string/stpncpy.cpp
+++ b/libc/src/string/stpncpy.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/string/stpncpy.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_bzero.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, stpncpy,
(char *__restrict dest, const char *__restrict src,
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(char *, stpncpy,
return dest + i;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/stpncpy.h b/libc/src/string/stpncpy.h
index 343ff61a582c2..5ecf65b027cab 100644
--- a/libc/src/string/stpncpy.h
+++ b/libc/src/string/stpncpy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STPNCPY_H
#define LLVM_LIBC_SRC_STRING_STPNCPY_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *stpncpy(char *__restrict dest, const char *__restrict src, size_t n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STPNCPY_H
diff --git a/libc/src/string/strcasecmp.cpp b/libc/src/string/strcasecmp.cpp
index 1274c047fc28e..87636ee369ebd 100644
--- a/libc/src/string/strcasecmp.cpp
+++ b/libc/src/string/strcasecmp.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_strcmp.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, strcasecmp, (const char *left, const char *right)) {
auto case_cmp = [](char a, char b) {
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, strcasecmp, (const char *left, const char *right)) {
return inline_strcmp(left, right, case_cmp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strcasecmp.h b/libc/src/string/strcasecmp.h
index 2916b8d417075..97b1f930f3227 100644
--- a/libc/src/string/strcasecmp.h
+++ b/libc/src/string/strcasecmp.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRCASECMP_H
#define LLVM_LIBC_SRC_STRING_STRCASECMP_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int strcasecmp(const char *left, const char *right);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRCASECMP_H
diff --git a/libc/src/string/strcasestr.cpp b/libc/src/string/strcasestr.cpp
index 1da1e3f025079..3119ed49c56d4 100644
--- a/libc/src/string/strcasestr.cpp
+++ b/libc/src/string/strcasestr.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_strstr.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: This is a simple brute force implementation. This can be
// improved upon using well known string matching algorithms.
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(char *, strcasestr,
return inline_strstr(haystack, needle, case_cmp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strcasestr.h b/libc/src/string/strcasestr.h
index 8bcd94596024e..9c8ad0fb82b28 100644
--- a/libc/src/string/strcasestr.h
+++ b/libc/src/string/strcasestr.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRCASESTR_H
#define LLVM_LIBC_SRC_STRING_STRCASESTR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strcasestr(const char *needle, const char *haystack);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRCASESTR_H
diff --git a/libc/src/string/strcat.cpp b/libc/src/string/strcat.cpp
index 0eb189ce204f0..6e1baa64e66ab 100644
--- a/libc/src/string/strcat.cpp
+++ b/libc/src/string/strcat.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/string/strcat.h"
-#include "src/__support/macros/config.h"
#include "src/string/strcpy.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strcat,
(char *__restrict dest, const char *__restrict src)) {
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(char *, strcat,
return dest;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strcat.h b/libc/src/string/strcat.h
index 90a7fd2e41337..3cf2e19e24fe9 100644
--- a/libc/src/string/strcat.h
+++ b/libc/src/string/strcat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRCAT_H
#define LLVM_LIBC_SRC_STRING_STRCAT_H
-#include "src/__support/macros/config.h"
#include <string.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strcat(char *__restrict dest, const char *__restrict src);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRCAT_H
diff --git a/libc/src/string/strchr.cpp b/libc/src/string/strchr.cpp
index d5dbaf8cd8e1b..553197b22b2ee 100644
--- a/libc/src/string/strchr.cpp
+++ b/libc/src/string/strchr.cpp
@@ -9,14 +9,13 @@
#include "src/string/strchr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Look at performance benefits of comparing words.
LLVM_LIBC_FUNCTION(char *, strchr, (const char *src, int c)) {
return internal::strchr_implementation(src, c);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strchr.h b/libc/src/string/strchr.h
index 0e8094d3c6a18..bb6a9c07b89e1 100644
--- a/libc/src/string/strchr.h
+++ b/libc/src/string/strchr.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRCHR_H
#define LLVM_LIBC_SRC_STRING_STRCHR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strchr(const char *src, int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRCHR_H
diff --git a/libc/src/string/strchrnul.cpp b/libc/src/string/strchrnul.cpp
index 6a3db9c105aa3..9b492a634a8ff 100644
--- a/libc/src/string/strchrnul.cpp
+++ b/libc/src/string/strchrnul.cpp
@@ -7,15 +7,14 @@
//===----------------------------------------------------------------------===//
#include "src/string/strchrnul.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strchrnul, (const char *src, int c)) {
return internal::strchr_implementation<false>(src, c);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strchrnul.h b/libc/src/string/strchrnul.h
index d724e73a69ea3..b847b0bda103c 100644
--- a/libc/src/string/strchrnul.h
+++ b/libc/src/string/strchrnul.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRCHRNUL_H
#define LLVM_LIBC_SRC_STRING_STRCHRNUL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strchrnul(const char *src, int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRCHRNUL_H
diff --git a/libc/src/string/strcmp.cpp b/libc/src/string/strcmp.cpp
index f303ba5c09665..0b515b76fa85c 100644
--- a/libc/src/string/strcmp.cpp
+++ b/libc/src/string/strcmp.cpp
@@ -9,14 +9,13 @@
#include "src/string/strcmp.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_strcmp.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, strcmp, (const char *left, const char *right)) {
auto comp = [](char l, char r) -> int { return l - r; };
return inline_strcmp(left, right, comp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strcmp.h b/libc/src/string/strcmp.h
index 8d8805857de88..9fc6fdb9f27ba 100644
--- a/libc/src/string/strcmp.h
+++ b/libc/src/string/strcmp.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRCMP_H
#define LLVM_LIBC_SRC_STRING_STRCMP_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int strcmp(const char *left, const char *right);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRCMP_H
diff --git a/libc/src/string/strcoll.cpp b/libc/src/string/strcoll.cpp
index eeb2c79e38074..7280688bf3d9d 100644
--- a/libc/src/string/strcoll.cpp
+++ b/libc/src/string/strcoll.cpp
@@ -9,9 +9,8 @@
#include "src/string/strcoll.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Add support for locales.
LLVM_LIBC_FUNCTION(int, strcoll, (const char *left, const char *right)) {
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, strcoll, (const char *left, const char *right)) {
return static_cast<int>(*left) - static_cast<int>(*right);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strcoll.h b/libc/src/string/strcoll.h
index 50358070e1f0f..d69b48a6642c3 100644
--- a/libc/src/string/strcoll.h
+++ b/libc/src/string/strcoll.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRCOLL_H
#define LLVM_LIBC_SRC_STRING_STRCOLL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int strcoll(const char *left, const char *right);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRCOLL_H
diff --git a/libc/src/string/strcpy.cpp b/libc/src/string/strcpy.cpp
index 60b73ab3aa823..4fbd1a38f6873 100644
--- a/libc/src/string/strcpy.cpp
+++ b/libc/src/string/strcpy.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/string/strcpy.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strcpy,
(char *__restrict dest, const char *__restrict src)) {
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(char *, strcpy,
return dest;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strcpy.h b/libc/src/string/strcpy.h
index d4f3e81fdc733..11a26a6fa6eff 100644
--- a/libc/src/string/strcpy.h
+++ b/libc/src/string/strcpy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRCPY_H
#define LLVM_LIBC_SRC_STRING_STRCPY_H
-#include "src/__support/macros/config.h"
#include <string.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strcpy(char *__restrict dest, const char *__restrict src);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRCPY_H
diff --git a/libc/src/string/strcspn.cpp b/libc/src/string/strcspn.cpp
index c4a14aa8b7dd0..ed057c3796066 100644
--- a/libc/src/string/strcspn.cpp
+++ b/libc/src/string/strcspn.cpp
@@ -9,13 +9,12 @@
#include "src/string/strcspn.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, strcspn, (const char *src, const char *segment)) {
return internal::complementary_span(src, segment);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strcspn.h b/libc/src/string/strcspn.h
index f50aeab1601af..21098feb288b8 100644
--- a/libc/src/string/strcspn.h
+++ b/libc/src/string/strcspn.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRCSPN_H
#define LLVM_LIBC_SRC_STRING_STRCSPN_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t strcspn(const char *src, const char *segment);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRCSPN_H
diff --git a/libc/src/string/strdup.cpp b/libc/src/string/strdup.cpp
index 4e09c87099425..3530a708c131b 100644
--- a/libc/src/string/strdup.cpp
+++ b/libc/src/string/strdup.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/string/strdup.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/string/allocating_string_utils.h"
#include "src/string/memory_utils/inline_memcpy.h"
@@ -16,7 +15,7 @@
#include <stdlib.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strdup, (const char *src)) {
auto dup = internal::strdup(src);
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(char *, strdup, (const char *src)) {
return nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strdup.h b/libc/src/string/strdup.h
index 45303a3efeb49..e33a24694bf17 100644
--- a/libc/src/string/strdup.h
+++ b/libc/src/string/strdup.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRDUP_H
#define LLVM_LIBC_SRC_STRING_STRDUP_H
-#include "src/__support/macros/config.h"
#include <string.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strdup(const char *src);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRDUP_H
diff --git a/libc/src/string/strerror.cpp b/libc/src/string/strerror.cpp
index 9576754172363..01cbbeb4d18f2 100644
--- a/libc/src/string/strerror.cpp
+++ b/libc/src/string/strerror.cpp
@@ -9,12 +9,11 @@
#include "src/string/strerror.h"
#include "src/__support/StringUtil/error_to_string.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strerror, (int err_num)) {
return const_cast<char *>(get_error_string(err_num).data());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strerror.h b/libc/src/string/strerror.h
index d81979580a55d..36a1348a5c737 100644
--- a/libc/src/string/strerror.h
+++ b/libc/src/string/strerror.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRERROR_H
#define LLVM_LIBC_SRC_STRING_STRERROR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strerror(int err_num);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRERROR_H
diff --git a/libc/src/string/strerror_r.cpp b/libc/src/string/strerror_r.cpp
index ba23f2752e83a..c514dbd740906 100644
--- a/libc/src/string/strerror_r.cpp
+++ b/libc/src/string/strerror_r.cpp
@@ -9,11 +9,10 @@
#include "src/string/strerror_r.h"
#include "src/__support/StringUtil/error_to_string.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This is the gnu version of strerror_r. The XSI version may be added later.
LLVM_LIBC_FUNCTION(char *, strerror_r,
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(char *, strerror_r,
return const_cast<char *>(get_error_string(err_num, {buf, buflen}).data());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strerror_r.h b/libc/src/string/strerror_r.h
index 5a17d29e31bb2..63f595866b3b6 100644
--- a/libc/src/string/strerror_r.h
+++ b/libc/src/string/strerror_r.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRERROR_R_H
#define LLVM_LIBC_SRC_STRING_STRERROR_R_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strerror_r(int err_num, char *buf, size_t buflen);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRERROR_R_H
diff --git a/libc/src/string/string_utils.h b/libc/src/string/string_utils.h
index 78381e46e480d..17efc125ea63a 100644
--- a/libc/src/string/string_utils.h
+++ b/libc/src/string/string_utils.h
@@ -15,13 +15,12 @@
#define LLVM_LIBC_SRC_STRING_STRING_UTILS_H
#include "src/__support/CPP/bitset.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
#include "src/string/memory_utils/inline_bzero.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include <stddef.h> // For size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
template <typename Word> LIBC_INLINE constexpr Word repeat_byte(Word byte) {
@@ -247,6 +246,6 @@ LIBC_INLINE constexpr static char *strrchr_implementation(const char *src,
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRING_UTILS_H
diff --git a/libc/src/string/strlcat.cpp b/libc/src/string/strlcat.cpp
index b5c4c634efa91..2943f4f67b4f9 100644
--- a/libc/src/string/strlcat.cpp
+++ b/libc/src/string/strlcat.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/string/strlcat.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, strlcat,
(char *__restrict dst, const char *__restrict src,
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(size_t, strlcat,
return first_len + internal::strlcpy(new_dst, src, size - first_len);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strlcat.h b/libc/src/string/strlcat.h
index ffe97af62a543..47f27e3ba5ac3 100644
--- a/libc/src/string/strlcat.h
+++ b/libc/src/string/strlcat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRLCAT_H
#define LLVM_LIBC_SRC_STRING_STRLCAT_H
-#include "src/__support/macros/config.h"
#include <string.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t strlcat(char *__restrict dst, const char *__restrict src, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRLCAT_H
diff --git a/libc/src/string/strlcpy.cpp b/libc/src/string/strlcpy.cpp
index 68d5b58f5002a..9b296f2cdbb05 100644
--- a/libc/src/string/strlcpy.cpp
+++ b/libc/src/string/strlcpy.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/string/strlcpy.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, strlcpy,
(char *__restrict dst, const char *__restrict src,
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(size_t, strlcpy,
return internal::strlcpy(dst, src, size);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strlcpy.h b/libc/src/string/strlcpy.h
index 058e7653b1b91..0c18d856e53f0 100644
--- a/libc/src/string/strlcpy.h
+++ b/libc/src/string/strlcpy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRLCPY_H
#define LLVM_LIBC_SRC_STRING_STRLCPY_H
-#include "src/__support/macros/config.h"
#include <string.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t strlcpy(char *__restrict dst, const char *__restrict src, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRLCPY_H
diff --git a/libc/src/string/strlen.cpp b/libc/src/string/strlen.cpp
index ff7ab14dd3134..b903928f067f9 100644
--- a/libc/src/string/strlen.cpp
+++ b/libc/src/string/strlen.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/string/strlen.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: investigate the performance of this function.
// There might be potential for compiler optimization.
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(size_t, strlen, (const char *src)) {
return internal::string_length(src);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strlen.h b/libc/src/string/strlen.h
index f07bf73ace3de..4dfaf8e98cdd2 100644
--- a/libc/src/string/strlen.h
+++ b/libc/src/string/strlen.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRLEN_H
#define LLVM_LIBC_SRC_STRING_STRLEN_H
-#include "src/__support/macros/config.h"
#include <string.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t strlen(const char *src);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRLEN_H
diff --git a/libc/src/string/strncasecmp.cpp b/libc/src/string/strncasecmp.cpp
index 45f82c98069b2..994fb258746a2 100644
--- a/libc/src/string/strncasecmp.cpp
+++ b/libc/src/string/strncasecmp.cpp
@@ -10,10 +10,9 @@
#include "src/__support/common.h"
#include "src/__support/ctype_utils.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_strcmp.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, strncasecmp,
(const char *left, const char *right, size_t n)) {
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, strncasecmp,
return inline_strncmp(left, right, n, case_cmp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strncasecmp.h b/libc/src/string/strncasecmp.h
index 15f74994ca56d..eb1155070c6ba 100644
--- a/libc/src/string/strncasecmp.h
+++ b/libc/src/string/strncasecmp.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRNCASECMP_H
#define LLVM_LIBC_SRC_STRING_STRNCASECMP_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int strncasecmp(const char *left, const char *right, size_t n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRNCASECMP_H
diff --git a/libc/src/string/strncat.cpp b/libc/src/string/strncat.cpp
index 221881f93c47a..ca86d9c0a2e41 100644
--- a/libc/src/string/strncat.cpp
+++ b/libc/src/string/strncat.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/string/strncat.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
#include "src/string/strncpy.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strncat,
(char *__restrict dest, const char *__restrict src,
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(char *, strncat,
return dest;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strncat.h b/libc/src/string/strncat.h
index 1a130799f3965..f3d9706dc23e9 100644
--- a/libc/src/string/strncat.h
+++ b/libc/src/string/strncat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRNCAT_H
#define LLVM_LIBC_SRC_STRING_STRNCAT_H
-#include "src/__support/macros/config.h"
#include <string.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strncat(char *__restrict dest, const char *__restrict src, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRNCAT_H
diff --git a/libc/src/string/strncmp.cpp b/libc/src/string/strncmp.cpp
index 16d4601fe845b..0d2a66879704c 100644
--- a/libc/src/string/strncmp.cpp
+++ b/libc/src/string/strncmp.cpp
@@ -9,12 +9,11 @@
#include "src/string/strncmp.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_strcmp.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, strncmp,
(const char *left, const char *right, size_t n)) {
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, strncmp,
return inline_strncmp(left, right, n, comp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strncmp.h b/libc/src/string/strncmp.h
index cf40d69e720a3..adb270f5cd40c 100644
--- a/libc/src/string/strncmp.h
+++ b/libc/src/string/strncmp.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRNCMP_H
#define LLVM_LIBC_SRC_STRING_STRNCMP_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int strncmp(const char *left, const char *right, size_t n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRNCMP_H
diff --git a/libc/src/string/strncpy.cpp b/libc/src/string/strncpy.cpp
index 4976ad94708c7..1408e7f0902d4 100644
--- a/libc/src/string/strncpy.cpp
+++ b/libc/src/string/strncpy.cpp
@@ -9,10 +9,9 @@
#include "src/string/strncpy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h> // For size_t.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strncpy,
(char *__restrict dest, const char *__restrict src,
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(char *, strncpy,
return dest;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strncpy.h b/libc/src/string/strncpy.h
index 5cef6d0bf0e6c..3152fef0758c7 100644
--- a/libc/src/string/strncpy.h
+++ b/libc/src/string/strncpy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRNCPY_H
#define LLVM_LIBC_SRC_STRING_STRNCPY_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strncpy(char *__restrict dest, const char *__restrict src, size_t n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRNCPY_H
diff --git a/libc/src/string/strndup.cpp b/libc/src/string/strndup.cpp
index b19d7c060baa1..6648e22ab50e0 100644
--- a/libc/src/string/strndup.cpp
+++ b/libc/src/string/strndup.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/string/strndup.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "src/string/string_utils.h"
@@ -16,7 +15,7 @@
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strndup, (const char *src, size_t size)) {
if (src == nullptr)
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(char *, strndup, (const char *src, size_t size)) {
return dest;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strndup.h b/libc/src/string/strndup.h
index 03370cc8d7dce..3e5c951f6c87a 100644
--- a/libc/src/string/strndup.h
+++ b/libc/src/string/strndup.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRNDUP_H
#define LLVM_LIBC_SRC_STRING_STRNDUP_H
-#include "src/__support/macros/config.h"
#include <string.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strndup(const char *src, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRNDUP_H
diff --git a/libc/src/string/strnlen.cpp b/libc/src/string/strnlen.cpp
index 26fcd5a04c0d7..8849fa0fdd9fa 100644
--- a/libc/src/string/strnlen.cpp
+++ b/libc/src/string/strnlen.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/string/strnlen.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, strnlen, (const char *src, size_t n)) {
const void *temp = internal::find_first_character(
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(size_t, strnlen, (const char *src, size_t n)) {
return temp ? reinterpret_cast<const char *>(temp) - src : n;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strnlen.h b/libc/src/string/strnlen.h
index 37a54850ae24d..e18d21779d94c 100644
--- a/libc/src/string/strnlen.h
+++ b/libc/src/string/strnlen.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRNLEN_H
#define LLVM_LIBC_SRC_STRING_STRNLEN_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t strnlen(const char *src, size_t n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRNLEN_H
diff --git a/libc/src/string/strpbrk.cpp b/libc/src/string/strpbrk.cpp
index 844d77ee97bd4..8bccda02418bc 100644
--- a/libc/src/string/strpbrk.cpp
+++ b/libc/src/string/strpbrk.cpp
@@ -9,14 +9,13 @@
#include "src/string/strpbrk.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strpbrk, (const char *src, const char *breakset)) {
src += internal::complementary_span(src, breakset);
return *src ? const_cast<char *>(src) : nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strpbrk.h b/libc/src/string/strpbrk.h
index a1f329f119d6c..c744d09365ff4 100644
--- a/libc/src/string/strpbrk.h
+++ b/libc/src/string/strpbrk.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRPBRK_H
#define LLVM_LIBC_SRC_STRING_STRPBRK_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strpbrk(const char *src, const char *breakset);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRPBRK_H
diff --git a/libc/src/string/strrchr.cpp b/libc/src/string/strrchr.cpp
index 66d1aaafee0de..d51808b6dd835 100644
--- a/libc/src/string/strrchr.cpp
+++ b/libc/src/string/strrchr.cpp
@@ -9,13 +9,12 @@
#include "src/string/strrchr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strrchr, (const char *src, int c)) {
return internal::strrchr_implementation(src, c);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strrchr.h b/libc/src/string/strrchr.h
index 2f95e2db29df3..d4280d85ae9b8 100644
--- a/libc/src/string/strrchr.h
+++ b/libc/src/string/strrchr.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRRCHR_H
#define LLVM_LIBC_SRC_STRING_STRRCHR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strrchr(const char *src, int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRRCHR_H
diff --git a/libc/src/string/strsep.cpp b/libc/src/string/strsep.cpp
index 4c275122de52f..5ebf2550744c3 100644
--- a/libc/src/string/strsep.cpp
+++ b/libc/src/string/strsep.cpp
@@ -8,10 +8,9 @@
#include "src/string/strsep.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strsep,
(char **__restrict stringp, const char *__restrict delim)) {
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(char *, strsep,
return internal::string_token<false>(*stringp, delim, stringp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strsep.h b/libc/src/string/strsep.h
index 9ee3081422d14..7b85202d30b2b 100644
--- a/libc/src/string/strsep.h
+++ b/libc/src/string/strsep.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRSEP_H
#define LLVM_LIBC_SRC_STRING_STRSEP_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strsep(char **__restrict stringp, const char *__restrict delim);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRSEP_H
diff --git a/libc/src/string/strsignal.cpp b/libc/src/string/strsignal.cpp
index a3206a5d1cff1..f6ca0bcdad8d2 100644
--- a/libc/src/string/strsignal.cpp
+++ b/libc/src/string/strsignal.cpp
@@ -10,12 +10,11 @@
#include "src/string/strsignal.h"
#include "src/__support/StringUtil/signal_to_string.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strsignal, (int sig_num)) {
return const_cast<char *>(get_signal_string(sig_num).data());
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strsignal.h b/libc/src/string/strsignal.h
index 9f62820a92d6e..bd3f87a201734 100644
--- a/libc/src/string/strsignal.h
+++ b/libc/src/string/strsignal.h
@@ -10,12 +10,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRSIGNAL_H
#define LLVM_LIBC_SRC_STRING_STRSIGNAL_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strsignal(int sig_num);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRSIGNAL_H
diff --git a/libc/src/string/strspn.cpp b/libc/src/string/strspn.cpp
index 66bb39903ab38..b957f8ed7f1bd 100644
--- a/libc/src/string/strspn.cpp
+++ b/libc/src/string/strspn.cpp
@@ -10,10 +10,9 @@
#include "src/__support/CPP/bitset.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(size_t, strspn, (const char *src, const char *segment)) {
const char *initial = src;
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(size_t, strspn, (const char *src, const char *segment)) {
return src - initial;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strspn.h b/libc/src/string/strspn.h
index a13b50436d228..ddb6f388e95a2 100644
--- a/libc/src/string/strspn.h
+++ b/libc/src/string/strspn.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_STRING_STRSPN_H
#define LLVM_LIBC_SRC_STRING_STRSPN_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t strspn(const char *src, const char *segment);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRSPN_H
diff --git a/libc/src/string/strstr.cpp b/libc/src/string/strstr.cpp
index 5132f06ef53f3..bfda75b2e5912 100644
--- a/libc/src/string/strstr.cpp
+++ b/libc/src/string/strstr.cpp
@@ -9,10 +9,9 @@
#include "src/string/strstr.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_strstr.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: This is a simple brute force implementation. This can be
// improved upon using well known string matching algorithms.
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(char *, strstr, (const char *haystack, const char *needle)) {
return inline_strstr(haystack, needle, comp);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strstr.h b/libc/src/string/strstr.h
index 903e02e472b15..2501b005cf9fa 100644
--- a/libc/src/string/strstr.h
+++ b/libc/src/string/strstr.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRSTR_H
#define LLVM_LIBC_SRC_STRING_STRSTR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strstr(const char *haystack, const char *needle);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRSTR_H
diff --git a/libc/src/string/strtok.cpp b/libc/src/string/strtok.cpp
index f491c641eafba..e7d30349d3a9c 100644
--- a/libc/src/string/strtok.cpp
+++ b/libc/src/string/strtok.cpp
@@ -9,10 +9,9 @@
#include "src/string/strtok.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static char *strtok_str = nullptr;
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(char *, strtok,
return internal::string_token(src, delimiter_string, &strtok_str);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strtok.h b/libc/src/string/strtok.h
index 9f44cb30e63b3..8788f333c1306 100644
--- a/libc/src/string/strtok.h
+++ b/libc/src/string/strtok.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_STRING_STRTOK_H
#define LLVM_LIBC_SRC_STRING_STRTOK_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strtok(char *__restrict src, const char *__restrict delimiter_string);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRTOK_H
diff --git a/libc/src/string/strtok_r.cpp b/libc/src/string/strtok_r.cpp
index 95942167c088f..e8847b617330e 100644
--- a/libc/src/string/strtok_r.cpp
+++ b/libc/src/string/strtok_r.cpp
@@ -9,10 +9,9 @@
#include "src/string/strtok_r.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(char *, strtok_r,
(char *__restrict src,
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(char *, strtok_r,
return internal::string_token(src, delimiter_string, saveptr);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strtok_r.h b/libc/src/string/strtok_r.h
index ae5d39ae0f3c7..b3c7b3dec162a 100644
--- a/libc/src/string/strtok_r.h
+++ b/libc/src/string/strtok_r.h
@@ -9,13 +9,11 @@
#ifndef LLVM_LIBC_SRC_STRING_STRTOK_R_H
#define LLVM_LIBC_SRC_STRING_STRTOK_R_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *strtok_r(char *__restrict src, const char *__restrict delimiter_string,
char **__restrict saveptr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRTOK_R_H
diff --git a/libc/src/string/strxfrm.cpp b/libc/src/string/strxfrm.cpp
index 212124e2d1ab6..b5eb76457f858 100644
--- a/libc/src/string/strxfrm.cpp
+++ b/libc/src/string/strxfrm.cpp
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/string/strxfrm.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "src/string/string_utils.h"
#include "src/__support/common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: Add support for locales.
LLVM_LIBC_FUNCTION(size_t, strxfrm,
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(size_t, strxfrm,
return len;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/string/strxfrm.h b/libc/src/string/strxfrm.h
index 3c19d103773eb..8178931f42dc9 100644
--- a/libc/src/string/strxfrm.h
+++ b/libc/src/string/strxfrm.h
@@ -9,12 +9,11 @@
#ifndef LLVM_LIBC_SRC_STRING_STRXFRM_H
#define LLVM_LIBC_SRC_STRING_STRXFRM_H
-#include "src/__support/macros/config.h"
#include <stddef.h> // For size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
size_t strxfrm(char *__restrict dest, const char *__restrict src, size_t n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_STRING_STRXFRM_H
diff --git a/libc/src/sys/auxv/getauxval.h b/libc/src/sys/auxv/getauxval.h
index 3e6971340bbef..7c9fb846e9198 100644
--- a/libc/src/sys/auxv/getauxval.h
+++ b/libc/src/sys/auxv/getauxval.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_AUXV_GETAUXVAL_H
#define LLVM_LIBC_SRC_SYS_AUXV_GETAUXVAL_H
-#include "src/__support/macros/config.h"
#include <sys/auxv.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
unsigned long getauxval(unsigned long id);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_AUXV_GETAUXVAL_H
diff --git a/libc/src/sys/auxv/linux/getauxval.cpp b/libc/src/sys/auxv/linux/getauxval.cpp
index 2ca894d091532..b0db36732c06e 100644
--- a/libc/src/sys/auxv/linux/getauxval.cpp
+++ b/libc/src/sys/auxv/linux/getauxval.cpp
@@ -9,7 +9,6 @@
#include "src/sys/auxv/getauxval.h"
#include "config/linux/app.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <linux/auxvec.h>
@@ -36,7 +35,7 @@
extern "C" [[gnu::weak]] int __cxa_atexit(void (*callback)(void *),
void *payload, void *);
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
constexpr static size_t MAX_AUXV_ENTRIES = 64;
@@ -215,4 +214,4 @@ LLVM_LIBC_FUNCTION(unsigned long, getauxval, (unsigned long id)) {
errno_guard.mark_failure();
return AT_NULL;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/epoll/epoll_create.h b/libc/src/sys/epoll/epoll_create.h
index 95c41223eb3b0..a1eeabd567e4c 100644
--- a/libc/src/sys/epoll/epoll_create.h
+++ b/libc/src/sys/epoll/epoll_create.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_CREATE_H
#define LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_CREATE_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int epoll_create(int size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_CREATE_H
diff --git a/libc/src/sys/epoll/epoll_create1.h b/libc/src/sys/epoll/epoll_create1.h
index c9e0e98520295..70f446b592660 100644
--- a/libc/src/sys/epoll/epoll_create1.h
+++ b/libc/src/sys/epoll/epoll_create1.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_CREATE1_H
#define LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_CREATE1_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int epoll_create1(int flags);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_CREATE1_H
diff --git a/libc/src/sys/epoll/epoll_ctl.h b/libc/src/sys/epoll/epoll_ctl.h
index 55784bcf257cb..42402949d06b3 100644
--- a/libc/src/sys/epoll/epoll_ctl.h
+++ b/libc/src/sys/epoll/epoll_ctl.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_CTL_H
#include "hdr/types/struct_epoll_event.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: event should be nullable
int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_CTL_H
diff --git a/libc/src/sys/epoll/epoll_pwait.h b/libc/src/sys/epoll/epoll_pwait.h
index 8b881cee115a8..bcae72b3e2c26 100644
--- a/libc/src/sys/epoll/epoll_pwait.h
+++ b/libc/src/sys/epoll/epoll_pwait.h
@@ -11,14 +11,13 @@
#include "hdr/types/sigset_t.h"
#include "hdr/types/struct_epoll_event.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: sigmask should be nullable
int epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
int timeout, const sigset_t *sigmask);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_PWAIT_H
diff --git a/libc/src/sys/epoll/epoll_pwait2.h b/libc/src/sys/epoll/epoll_pwait2.h
index b7a7220baeecf..7fc528b2fd25d 100644
--- a/libc/src/sys/epoll/epoll_pwait2.h
+++ b/libc/src/sys/epoll/epoll_pwait2.h
@@ -12,14 +12,13 @@
#include "hdr/types/sigset_t.h"
#include "hdr/types/struct_epoll_event.h"
#include "hdr/types/struct_timespec.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: sigmask and timeout should be nullable
int epoll_pwait2(int epfd, epoll_event *events, int maxevents,
const timespec *timeout, const sigset_t *sigmask);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_PWAIT2_H
diff --git a/libc/src/sys/epoll/epoll_wait.h b/libc/src/sys/epoll/epoll_wait.h
index cd9aa8b2d5491..b546e91e4c2ee 100644
--- a/libc/src/sys/epoll/epoll_wait.h
+++ b/libc/src/sys/epoll/epoll_wait.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_WAIT_H
#include "hdr/types/struct_epoll_event.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int epoll_wait(int epfd, epoll_event *events, int maxevents, int timeout);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_EPOLL_EPOLL_WAIT_H
diff --git a/libc/src/sys/epoll/linux/epoll_create.cpp b/libc/src/sys/epoll/linux/epoll_create.cpp
index 7196ac7410c30..d4995c476074e 100644
--- a/libc/src/sys/epoll/linux/epoll_create.cpp
+++ b/libc/src/sys/epoll/linux/epoll_create.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, epoll_create, ([[maybe_unused]] int size)) {
#ifdef SYS_epoll_create
@@ -36,4 +35,4 @@ LLVM_LIBC_FUNCTION(int, epoll_create, ([[maybe_unused]] int size)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/epoll/linux/epoll_create1.cpp b/libc/src/sys/epoll/linux/epoll_create1.cpp
index efff282e2714d..30f1a9910274d 100644
--- a/libc/src/sys/epoll/linux/epoll_create1.cpp
+++ b/libc/src/sys/epoll/linux/epoll_create1.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, epoll_create1, (int flags)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_epoll_create1, flags);
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, epoll_create1, (int flags)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/epoll/linux/epoll_ctl.cpp b/libc/src/sys/epoll/linux/epoll_ctl.cpp
index 5f7dbb77b1e5b..c111c5e4e0ee0 100644
--- a/libc/src/sys/epoll/linux/epoll_ctl.cpp
+++ b/libc/src/sys/epoll/linux/epoll_ctl.cpp
@@ -11,11 +11,10 @@
#include "hdr/types/struct_epoll_event.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, epoll_ctl,
(int epfd, int op, int fd, epoll_event *event)) {
@@ -32,4 +31,4 @@ LLVM_LIBC_FUNCTION(int, epoll_ctl,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/epoll/linux/epoll_pwait.cpp b/libc/src/sys/epoll/linux/epoll_pwait.cpp
index d7836549928c4..24b66f0721b30 100644
--- a/libc/src/sys/epoll/linux/epoll_pwait.cpp
+++ b/libc/src/sys/epoll/linux/epoll_pwait.cpp
@@ -13,13 +13,12 @@
#include "hdr/types/struct_epoll_event.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/sanitizer.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, epoll_pwait,
(int epfd, struct epoll_event *events, int maxevents,
@@ -40,4 +39,4 @@ LLVM_LIBC_FUNCTION(int, epoll_pwait,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/epoll/linux/epoll_pwait2.cpp b/libc/src/sys/epoll/linux/epoll_pwait2.cpp
index 14b419399fe9b..e13423a085a59 100644
--- a/libc/src/sys/epoll/linux/epoll_pwait2.cpp
+++ b/libc/src/sys/epoll/linux/epoll_pwait2.cpp
@@ -14,13 +14,12 @@
#include "hdr/types/struct_timespec.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/sanitizer.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, epoll_pwait2,
(int epfd, struct epoll_event *events, int maxevents,
@@ -42,4 +41,4 @@ LLVM_LIBC_FUNCTION(int, epoll_pwait2,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/epoll/linux/epoll_wait.cpp b/libc/src/sys/epoll/linux/epoll_wait.cpp
index 1a63be5e260fb..3ce4a92e79695 100644
--- a/libc/src/sys/epoll/linux/epoll_wait.cpp
+++ b/libc/src/sys/epoll/linux/epoll_wait.cpp
@@ -13,13 +13,12 @@
#include "hdr/types/struct_epoll_event.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/sanitizer.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, epoll_wait,
(int epfd, struct epoll_event *events, int maxevents,
@@ -46,4 +45,4 @@ LLVM_LIBC_FUNCTION(int, epoll_wait,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/madvise.cpp b/libc/src/sys/mman/linux/madvise.cpp
index 332d6c2db4acb..ff461c1d4cb48 100644
--- a/libc/src/sys/mman/linux/madvise.cpp
+++ b/libc/src/sys/mman/linux/madvise.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This function is currently linux only. It has to be refactored suitably if
// madvise is to be supported on non-linux operating systems also.
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(int, madvise, (void *addr, size_t size, int advice)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/mincore.cpp b/libc/src/sys/mman/linux/mincore.cpp
index b5436fda3853a..8220c69ef2cb7 100644
--- a/libc/src/sys/mman/linux/mincore.cpp
+++ b/libc/src/sys/mman/linux/mincore.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, mincore, (void *addr, size_t len, unsigned char *vec)) {
long ret = syscall_impl(SYS_mincore, reinterpret_cast<long>(addr), len,
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, mincore, (void *addr, size_t len, unsigned char *vec)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/mlock.cpp b/libc/src/sys/mman/linux/mlock.cpp
index be7eb28e29c4f..9bc5ab9a07863 100644
--- a/libc/src/sys/mman/linux/mlock.cpp
+++ b/libc/src/sys/mman/linux/mlock.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, mlock, (const void *addr, size_t len)) {
long ret = syscall_impl(SYS_mlock, cpp::bit_cast<long>(addr), len);
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, mlock, (const void *addr, size_t len)) {
}
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/mlock2.cpp b/libc/src/sys/mman/linux/mlock2.cpp
index 7bc557f9bf58f..71b2b80d99bbf 100644
--- a/libc/src/sys/mman/linux/mlock2.cpp
+++ b/libc/src/sys/mman/linux/mlock2.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#ifdef SYS_mlock2
LLVM_LIBC_FUNCTION(int, mlock2, (const void *addr, size_t len, int flags)) {
long ret = syscall_impl(SYS_mlock2, cpp::bit_cast<long>(addr), len, flags);
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, mlock2, (const void *addr, size_t len, int flags)) {
return 0;
}
#endif
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/mlockall.cpp b/libc/src/sys/mman/linux/mlockall.cpp
index eae3a9ea0a183..c4af7d8952738 100644
--- a/libc/src/sys/mman/linux/mlockall.cpp
+++ b/libc/src/sys/mman/linux/mlockall.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, mlockall, (int flags)) {
long ret = syscall_impl(SYS_mlockall, flags);
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, mlockall, (int flags)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/mmap.cpp b/libc/src/sys/mman/linux/mmap.cpp
index ee9a0a32e8f55..2aa7003f342a9 100644
--- a/libc/src/sys/mman/linux/mmap.cpp
+++ b/libc/src/sys/mman/linux/mmap.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <linux/param.h> // For EXEC_PAGESIZE.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This function is currently linux only. It has to be refactored suitably if
// mmap is to be supported on non-linux operating systems also.
@@ -64,4 +63,4 @@ LLVM_LIBC_FUNCTION(void *, mmap,
return reinterpret_cast<void *>(ret);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/mprotect.cpp b/libc/src/sys/mman/linux/mprotect.cpp
index e2351028e2c7f..2e6f2a369c1d8 100644
--- a/libc/src/sys/mman/linux/mprotect.cpp
+++ b/libc/src/sys/mman/linux/mprotect.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This function is currently linux only. It has to be refactored suitably if
// mprotect is to be supported on non-linux operating systems also.
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(int, mprotect, (void *addr, size_t size, int prot)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/msync.cpp b/libc/src/sys/mman/linux/msync.cpp
index e2b4f81d616ad..1d2544f023c2c 100644
--- a/libc/src/sys/mman/linux/msync.cpp
+++ b/libc/src/sys/mman/linux/msync.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, msync, (void *addr, size_t len, int flags)) {
long ret = syscall_impl(SYS_msync, cpp::bit_cast<long>(addr), len, flags);
if (ret < 0) {
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, msync, (void *addr, size_t len, int flags)) {
}
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/munlock.cpp b/libc/src/sys/mman/linux/munlock.cpp
index 93c25f844c6e8..9ee50805ac30e 100644
--- a/libc/src/sys/mman/linux/munlock.cpp
+++ b/libc/src/sys/mman/linux/munlock.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, munlock, (const void *addr, size_t len)) {
long ret = syscall_impl(SYS_munlock, cpp::bit_cast<long>(addr), len);
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, munlock, (const void *addr, size_t len)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/munlockall.cpp b/libc/src/sys/mman/linux/munlockall.cpp
index f5911cb01bc28..d1619d204a90d 100644
--- a/libc/src/sys/mman/linux/munlockall.cpp
+++ b/libc/src/sys/mman/linux/munlockall.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, munlockall, (void)) {
long ret = syscall_impl(SYS_munlockall);
@@ -25,4 +24,4 @@ LLVM_LIBC_FUNCTION(int, munlockall, (void)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/munmap.cpp b/libc/src/sys/mman/linux/munmap.cpp
index 9c01b15ac8dc2..6412b4136c49e 100644
--- a/libc/src/sys/mman/linux/munmap.cpp
+++ b/libc/src/sys/mman/linux/munmap.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This function is currently linux only. It has to be refactored suitably if
// mmap is to be supported on non-linux operating systems also.
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(int, munmap, (void *addr, size_t size)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/posix_madvise.cpp b/libc/src/sys/mman/linux/posix_madvise.cpp
index e980ca4d4197c..b7b4d352c1f8a 100644
--- a/libc/src/sys/mman/linux/posix_madvise.cpp
+++ b/libc/src/sys/mman/linux/posix_madvise.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This function is currently linux only. It has to be refactored suitably if
// posix_madvise is to be supported on non-linux operating systems also.
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, posix_madvise, (void *addr, size_t size, int advice)) {
return ret < 0 ? -ret : 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/shm_common.h b/libc/src/sys/mman/linux/shm_common.h
index ce75c2b5b6991..6f2a3fdc71b64 100644
--- a/libc/src/sys/mman/linux/shm_common.h
+++ b/libc/src/sys/mman/linux/shm_common.h
@@ -9,14 +9,13 @@
#include "src/__support/CPP/array.h"
#include "src/__support/CPP/optional.h"
#include "src/__support/CPP/string_view.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/string/memory_utils/inline_memcpy.h"
// TODO: Get PATH_MAX via https://github.com/llvm/llvm-project/issues/85121
#include <linux/limits.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace shm_common {
@@ -51,4 +50,4 @@ LIBC_INLINE cpp::optional<SHMPath> translate_name(cpp::string_view name) {
}
} // namespace shm_common
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/shm_open.cpp b/libc/src/sys/mman/linux/shm_open.cpp
index d235e57aefdeb..0d39b8b4e53db 100644
--- a/libc/src/sys/mman/linux/shm_open.cpp
+++ b/libc/src/sys/mman/linux/shm_open.cpp
@@ -8,11 +8,10 @@
#include "src/sys/mman/shm_open.h"
#include "llvm-libc-macros/fcntl-macros.h"
-#include "src/__support/macros/config.h"
#include "src/fcntl/open.h"
#include "src/sys/mman/linux/shm_common.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static constexpr int DEFAULT_OFLAGS = O_NOFOLLOW | O_CLOEXEC | O_NONBLOCK;
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, shm_open, (const char *name, int oflags, mode_t mode)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/linux/shm_unlink.cpp b/libc/src/sys/mman/linux/shm_unlink.cpp
index 6a76301512201..32f48d3e3e718 100644
--- a/libc/src/sys/mman/linux/shm_unlink.cpp
+++ b/libc/src/sys/mman/linux/shm_unlink.cpp
@@ -7,11 +7,10 @@
//===----------------------------------------------------------------------===//
#include "src/sys/mman/shm_unlink.h"
-#include "src/__support/macros/config.h"
#include "src/sys/mman/linux/shm_common.h"
#include "src/unistd/unlink.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, shm_unlink, (const char *name)) {
using namespace shm_common;
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(int, shm_unlink, (const char *name)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/mman/madvise.h b/libc/src/sys/mman/madvise.h
index fcc9289996ec4..59a03af79b587 100644
--- a/libc/src/sys/mman/madvise.h
+++ b/libc/src/sys/mman/madvise.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MADVISE_H
#define LLVM_LIBC_SRC_SYS_MMAN_MADVISE_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h> // For size_t and off_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int madvise(void *addr, size_t size, int advice);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MADVISE_H
diff --git a/libc/src/sys/mman/mincore.h b/libc/src/sys/mman/mincore.h
index 4b50a19e8c91e..403afaeb6af97 100644
--- a/libc/src/sys/mman/mincore.h
+++ b/libc/src/sys/mman/mincore.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MINCORE_H
#define LLVM_LIBC_SRC_SYS_MMAN_MINCORE_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h> // For size_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int mincore(void *addr, size_t len, unsigned char *vec);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MINCORE_H
diff --git a/libc/src/sys/mman/mlock.h b/libc/src/sys/mman/mlock.h
index 034a4f5c4b1f0..73f329a0d52dc 100644
--- a/libc/src/sys/mman/mlock.h
+++ b/libc/src/sys/mman/mlock.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MLOCK_H
#define LLVM_LIBC_SRC_SYS_MMAN_MLOCK_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h>
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int mlock(const void *addr, size_t len);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MLOCK_H
diff --git a/libc/src/sys/mman/mlock2.h b/libc/src/sys/mman/mlock2.h
index 9bba06a5601d3..872a7bfc5fba6 100644
--- a/libc/src/sys/mman/mlock2.h
+++ b/libc/src/sys/mman/mlock2.h
@@ -9,16 +9,15 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MLOCK2_H
#define LLVM_LIBC_SRC_SYS_MMAN_MLOCK2_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h>
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#ifdef SYS_mlock2
int mlock2(const void *addr, size_t len, int flags);
#endif
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MLOCK2_H
diff --git a/libc/src/sys/mman/mlockall.h b/libc/src/sys/mman/mlockall.h
index 8e305bb42ed8d..bb4bd834310ee 100644
--- a/libc/src/sys/mman/mlockall.h
+++ b/libc/src/sys/mman/mlockall.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MLOCKALL_H
#define LLVM_LIBC_SRC_SYS_MMAN_MLOCKALL_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int mlockall(int flags);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MLOCKALL_H
diff --git a/libc/src/sys/mman/mmap.h b/libc/src/sys/mman/mmap.h
index b33be35d7b075..4425019c4ee1a 100644
--- a/libc/src/sys/mman/mmap.h
+++ b/libc/src/sys/mman/mmap.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MMAP_H
#define LLVM_LIBC_SRC_SYS_MMAN_MMAP_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h> // For size_t and off_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *mmap(void *addr, size_t size, int prot, int flags, int fd, off_t offset);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MMAP_H
diff --git a/libc/src/sys/mman/mprotect.h b/libc/src/sys/mman/mprotect.h
index 890e9859405d5..2e59c7526b750 100644
--- a/libc/src/sys/mman/mprotect.h
+++ b/libc/src/sys/mman/mprotect.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MPROTECT_H
#define LLVM_LIBC_SRC_SYS_MMAN_MPROTECT_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h> // For size_t and off_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int mprotect(void *addr, size_t size, int prot);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MPROTECT_H
diff --git a/libc/src/sys/mman/msync.h b/libc/src/sys/mman/msync.h
index d20c3f38c3220..08afdd8c06285 100644
--- a/libc/src/sys/mman/msync.h
+++ b/libc/src/sys/mman/msync.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MSYNC_H
#define LLVM_LIBC_SRC_SYS_MMAN_MSYNC_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h>
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int msync(void *addr, size_t len, int flags);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MSYNC_H
diff --git a/libc/src/sys/mman/munlock.h b/libc/src/sys/mman/munlock.h
index 07f6b3b82ffbd..6aca82dae4533 100644
--- a/libc/src/sys/mman/munlock.h
+++ b/libc/src/sys/mman/munlock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MUNLOCK_H
#define LLVM_LIBC_SRC_SYS_MMAN_MUNLOCK_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int munlock(const void *addr, size_t len);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MUNLOCK_H
diff --git a/libc/src/sys/mman/munlockall.h b/libc/src/sys/mman/munlockall.h
index f0c632db6714b..5abd4b873465e 100644
--- a/libc/src/sys/mman/munlockall.h
+++ b/libc/src/sys/mman/munlockall.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MUNLOCKALL_H
#define LLVM_LIBC_SRC_SYS_MMAN_MUNLOCKALL_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int munlockall(void);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MUNLOCKALL_H
diff --git a/libc/src/sys/mman/munmap.h b/libc/src/sys/mman/munmap.h
index c1fd5d7b7d809..5d7c569043d1a 100644
--- a/libc/src/sys/mman/munmap.h
+++ b/libc/src/sys/mman/munmap.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_MUNMAP_H
#define LLVM_LIBC_SRC_SYS_MMAN_MUNMAP_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h> // For size_t.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int munmap(void *addr, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_MUNMAP_H
diff --git a/libc/src/sys/mman/posix_madvise.h b/libc/src/sys/mman/posix_madvise.h
index 31ec5f656b650..b8a423bfa9191 100644
--- a/libc/src/sys/mman/posix_madvise.h
+++ b/libc/src/sys/mman/posix_madvise.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_POSIX_MADVISE_H
#define LLVM_LIBC_SRC_SYS_MMAN_POSIX_MADVISE_H
-#include "src/__support/macros/config.h"
#include <sys/mman.h> // For size_t and off_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int posix_madvise(void *addr, size_t size, int advice);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_POSIX_MADVISE_H
diff --git a/libc/src/sys/mman/shm_open.h b/libc/src/sys/mman/shm_open.h
index c890304aa4acf..91796d7b5c050 100644
--- a/libc/src/sys/mman/shm_open.h
+++ b/libc/src/sys/mman/shm_open.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_SHM_OPEN_H
#define LLVM_LIBC_SRC_SYS_MMAN_SHM_OPEN_H
-#include "src/__support/macros/config.h"
#include <llvm-libc-types/mode_t.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int shm_open(const char *name, int oflag, mode_t mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_SHM_OPEN_H
diff --git a/libc/src/sys/mman/shm_unlink.h b/libc/src/sys/mman/shm_unlink.h
index 06ad42b52d4eb..c38c06adbaa29 100644
--- a/libc/src/sys/mman/shm_unlink.h
+++ b/libc/src/sys/mman/shm_unlink.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_SYS_MMAN_SHM_UNLINK_H
#define LLVM_LIBC_SRC_SYS_MMAN_SHM_UNLINK_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int shm_unlink(const char *name);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_MMAN_SHM_UNLINK_H
diff --git a/libc/src/sys/prctl/linux/prctl.cpp b/libc/src/sys/prctl/linux/prctl.cpp
index 5d4e9046b8777..b68b7621555dc 100644
--- a/libc/src/sys/prctl/linux/prctl.cpp
+++ b/libc/src/sys/prctl/linux/prctl.cpp
@@ -10,11 +10,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, prctl,
(int option, unsigned long arg2, unsigned long arg3,
@@ -35,4 +34,4 @@ LLVM_LIBC_FUNCTION(int, prctl,
return static_cast<int>(ret);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/prctl/prctl.h b/libc/src/sys/prctl/prctl.h
index c6b5797abe1c6..baa0676d4254b 100644
--- a/libc/src/sys/prctl/prctl.h
+++ b/libc/src/sys/prctl/prctl.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_SYS_PRCTL_PRCTL_H
#define LLVM_LIBC_SRC_SYS_PRCTL_PRCTL_H
-#include "src/__support/macros/config.h"
#include <sys/prctl.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int prctl(int option, unsigned long arg2, unsigned long arg3,
unsigned long arg4, unsigned long arg5);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_PRCTL_PRCTL_H
diff --git a/libc/src/sys/random/getrandom.h b/libc/src/sys/random/getrandom.h
index 134bd0cd9468d..e1577d9bf1eaa 100644
--- a/libc/src/sys/random/getrandom.h
+++ b/libc/src/sys/random/getrandom.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_RANDOM_GETRANDOM_H
#define LLVM_LIBC_SRC_SYS_RANDOM_GETRANDOM_H
-#include "src/__support/macros/config.h"
#include <sys/random.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ssize_t getrandom(void *buf, size_t buflen, unsigned int flags);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_RANDOM_GETRANDOM_H
diff --git a/libc/src/sys/random/linux/getrandom.cpp b/libc/src/sys/random/linux/getrandom.cpp
index 9a8869a2d6d38..63038ad628a10 100644
--- a/libc/src/sys/random/linux/getrandom.cpp
+++ b/libc/src/sys/random/linux/getrandom.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ssize_t, getrandom,
(void *buf, size_t buflen, unsigned int flags)) {
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(ssize_t, getrandom,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/resource/getrlimit.h b/libc/src/sys/resource/getrlimit.h
index c369744a5c4ba..f473e82f933be 100644
--- a/libc/src/sys/resource/getrlimit.h
+++ b/libc/src/sys/resource/getrlimit.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_RESOURCE_GETRLIMIT_H
#define LLVM_LIBC_SRC_SYS_RESOURCE_GETRLIMIT_H
-#include "src/__support/macros/config.h"
#include <sys/resource.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int getrlimit(int resource, struct rlimit *lim);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_RESOURCE_GETRLIMIT_H
diff --git a/libc/src/sys/resource/linux/getrlimit.cpp b/libc/src/sys/resource/linux/getrlimit.cpp
index 30c2e91b036d1..4067beba6cd30 100644
--- a/libc/src/sys/resource/linux/getrlimit.cpp
+++ b/libc/src/sys/resource/linux/getrlimit.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/resource.h> // For struct rlimit
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, getrlimit, (int res, struct rlimit *limits)) {
int ret =
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, getrlimit, (int res, struct rlimit *limits)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/resource/linux/setrlimit.cpp b/libc/src/sys/resource/linux/setrlimit.cpp
index 85f07900aaef4..0692763862342 100644
--- a/libc/src/sys/resource/linux/setrlimit.cpp
+++ b/libc/src/sys/resource/linux/setrlimit.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/resource.h> // For struct rlimit
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, setrlimit, (int res, const struct rlimit *limits)) {
int ret =
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, setrlimit, (int res, const struct rlimit *limits)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/resource/setrlimit.h b/libc/src/sys/resource/setrlimit.h
index 6f966791f09b8..d881b599833d2 100644
--- a/libc/src/sys/resource/setrlimit.h
+++ b/libc/src/sys/resource/setrlimit.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_RESOURCE_SETRLIMIT_H
#define LLVM_LIBC_SRC_SYS_RESOURCE_SETRLIMIT_H
-#include "src/__support/macros/config.h"
#include <sys/resource.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int setrlimit(int resource, const struct rlimit *lim);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_RESOURCE_SETRLIMIT_H
diff --git a/libc/src/sys/select/linux/select.cpp b/libc/src/sys/select/linux/select.cpp
index 9ccb1e95f275c..9034b75e5c29e 100644
--- a/libc/src/sys/select/linux/select.cpp
+++ b/libc/src/sys/select/linux/select.cpp
@@ -13,13 +13,12 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stddef.h> // For size_t
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct pselect6_sigset_t {
sigset_t *ss;
@@ -70,4 +69,4 @@ LLVM_LIBC_FUNCTION(int, select,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/select/select.h b/libc/src/sys/select/select.h
index be3f5eb1deb1e..65cd15cd365c4 100644
--- a/libc/src/sys/select/select.h
+++ b/libc/src/sys/select/select.h
@@ -9,14 +9,13 @@
#ifndef LLVM_LIBC_SRC_SYS_SELECT_SELECT_H
#define LLVM_LIBC_SRC_SYS_SELECT_SELECT_H
-#include "src/__support/macros/config.h"
#include <sys/select.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int select(int nfds, fd_set *__restrict read_set, fd_set *__restrict write_set,
fd_set *__restrict error_set, struct timeval *__restrict timeout);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_SELECT_SELECT_H
diff --git a/libc/src/sys/sendfile/linux/sendfile.cpp b/libc/src/sys/sendfile/linux/sendfile.cpp
index 9d4174cb8c916..5a7c012fe997d 100644
--- a/libc/src/sys/sendfile/linux/sendfile.cpp
+++ b/libc/src/sys/sendfile/linux/sendfile.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/sendfile.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ssize_t, sendfile,
(int out_fd, int in_fd, off_t *offset, size_t count)) {
@@ -38,4 +37,4 @@ LLVM_LIBC_FUNCTION(ssize_t, sendfile,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/sendfile/sendfile.h b/libc/src/sys/sendfile/sendfile.h
index 95c3fd4db470c..14673bba3fbdf 100644
--- a/libc/src/sys/sendfile/sendfile.h
+++ b/libc/src/sys/sendfile/sendfile.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_SENDFILE_SENDFILE_H
#define LLVM_LIBC_SRC_SYS_SENDFILE_SENDFILE_H
-#include "src/__support/macros/config.h"
#include <sys/sendfile.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ssize_t sendfile(int, int, off_t *, size_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_SENDFILE_SENDFILE_H
diff --git a/libc/src/sys/socket/bind.h b/libc/src/sys/socket/bind.h
index 1676ab6a003ad..62e6221bf1b2d 100644
--- a/libc/src/sys/socket/bind.h
+++ b/libc/src/sys/socket/bind.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_SOCKET_BIND_H
#define LLVM_LIBC_SRC_SYS_SOCKET_BIND_H
-#include "src/__support/macros/config.h"
#include <sys/socket.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int bind(int domain, const struct sockaddr *address, socklen_t address_len);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_SOCKET_BIND_H
diff --git a/libc/src/sys/socket/linux/bind.cpp b/libc/src/sys/socket/linux/bind.cpp
index 3289e9f0852e8..36afc646d29f6 100644
--- a/libc/src/sys/socket/linux/bind.cpp
+++ b/libc/src/sys/socket/linux/bind.cpp
@@ -11,13 +11,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <linux/net.h> // For SYS_SOCKET socketcall number.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, bind,
(int domain, const struct sockaddr *address,
@@ -41,4 +40,4 @@ LLVM_LIBC_FUNCTION(int, bind,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/socket/linux/socket.cpp b/libc/src/sys/socket/linux/socket.cpp
index 3e6df4d487a53..90a7dc632e269 100644
--- a/libc/src/sys/socket/linux/socket.cpp
+++ b/libc/src/sys/socket/linux/socket.cpp
@@ -11,13 +11,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <linux/net.h> // For SYS_SOCKET socketcall number.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, socket, (int domain, int type, int protocol)) {
#ifdef SYS_socket
@@ -39,4 +38,4 @@ LLVM_LIBC_FUNCTION(int, socket, (int domain, int type, int protocol)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/socket/socket.h b/libc/src/sys/socket/socket.h
index 253be738bf317..a6578989d2af8 100644
--- a/libc/src/sys/socket/socket.h
+++ b/libc/src/sys/socket/socket.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_SYS_SOCKET_SOCKET_H
#define LLVM_LIBC_SRC_SYS_SOCKET_SOCKET_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int socket(int domain, int type, int protocol);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_SOCKET_SOCKET_H
diff --git a/libc/src/sys/stat/chmod.h b/libc/src/sys/stat/chmod.h
index a05407a40978f..decb44222177b 100644
--- a/libc/src/sys/stat/chmod.h
+++ b/libc/src/sys/stat/chmod.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_STAT_CHMOD_H
#define LLVM_LIBC_SRC_SYS_STAT_CHMOD_H
-#include "src/__support/macros/config.h"
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int chmod(const char *path, mode_t mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STAT_CHMOD_H
diff --git a/libc/src/sys/stat/fchmod.h b/libc/src/sys/stat/fchmod.h
index 470ce3e3a03a2..611bba16fad6c 100644
--- a/libc/src/sys/stat/fchmod.h
+++ b/libc/src/sys/stat/fchmod.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_STAT_FCHMOD_H
#define LLVM_LIBC_SRC_SYS_STAT_FCHMOD_H
-#include "src/__support/macros/config.h"
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fchmod(int fd, mode_t mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STAT_FCHMOD_H
diff --git a/libc/src/sys/stat/fchmodat.h b/libc/src/sys/stat/fchmodat.h
index e4500f505bfda..e7b12693558d4 100644
--- a/libc/src/sys/stat/fchmodat.h
+++ b/libc/src/sys/stat/fchmodat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_STAT_FCHMODAT_H
#define LLVM_LIBC_SRC_SYS_STAT_FCHMODAT_H
-#include "src/__support/macros/config.h"
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fchmodat(int dirfd, const char *path, mode_t mode, int flags);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STAT_FCHMODAT_H
diff --git a/libc/src/sys/stat/fstat.h b/libc/src/sys/stat/fstat.h
index a3ec9e45384c9..7633ee60a374e 100644
--- a/libc/src/sys/stat/fstat.h
+++ b/libc/src/sys/stat/fstat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_STAT_FSTAT_H
#define LLVM_LIBC_SRC_SYS_STAT_FSTAT_H
-#include "src/__support/macros/config.h"
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fstat(int fd, struct stat *statbuf);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STAT_FSTAT_H
diff --git a/libc/src/sys/stat/linux/chmod.cpp b/libc/src/sys/stat/linux/chmod.cpp
index c91cabb514a8c..25e5e69af71a0 100644
--- a/libc/src/sys/stat/linux/chmod.cpp
+++ b/libc/src/sys/stat/linux/chmod.cpp
@@ -11,13 +11,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, chmod, (const char *path, mode_t mode)) {
#ifdef SYS_chmod
@@ -39,4 +38,4 @@ LLVM_LIBC_FUNCTION(int, chmod, (const char *path, mode_t mode)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/stat/linux/fchmod.cpp b/libc/src/sys/stat/linux/fchmod.cpp
index 7b6c7b7091a82..cdc9cbf37ba54 100644
--- a/libc/src/sys/stat/linux/fchmod.cpp
+++ b/libc/src/sys/stat/linux/fchmod.cpp
@@ -11,13 +11,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fchmod, (int fd, mode_t mode)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_fchmod, fd, mode);
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, fchmod, (int fd, mode_t mode)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/stat/linux/fchmodat.cpp b/libc/src/sys/stat/linux/fchmodat.cpp
index e76db4d160fb8..43b4cf00111ba 100644
--- a/libc/src/sys/stat/linux/fchmodat.cpp
+++ b/libc/src/sys/stat/linux/fchmodat.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fchmodat,
(int dirfd, const char *path, mode_t mode, int flags)) {
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, fchmodat,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/stat/linux/fstat.cpp b/libc/src/sys/stat/linux/fstat.cpp
index 411aa47bcda2a..516417858569c 100644
--- a/libc/src/sys/stat/linux/fstat.cpp
+++ b/libc/src/sys/stat/linux/fstat.cpp
@@ -8,7 +8,6 @@
#include "src/sys/stat/fstat.h"
#include "kernel_statx.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/__support/common.h"
@@ -16,7 +15,7 @@
#include <fcntl.h>
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fstat, (int fd, struct stat *statbuf)) {
int err = statx(fd, "", AT_EMPTY_PATH, statbuf);
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, fstat, (int fd, struct stat *statbuf)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/stat/linux/kernel_statx.h b/libc/src/sys/stat/linux/kernel_statx.h
index f26f0b826ac1e..60969160b9ba4 100644
--- a/libc/src/sys/stat/linux/kernel_statx.h
+++ b/libc/src/sys/stat/linux/kernel_statx.h
@@ -11,7 +11,6 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
#include <sys/stat.h>
@@ -68,7 +67,7 @@ constexpr unsigned int STATX_BASIC_STATS_MASK = 0x7FF;
} // Anonymous namespace
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LIBC_INLINE int statx(int dirfd, const char *__restrict path, int flags,
struct stat *__restrict statbuf) {
@@ -99,6 +98,6 @@ LIBC_INLINE int statx(int dirfd, const char *__restrict path, int flags,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STAT_LINUX_KERNEL_STATX_H
diff --git a/libc/src/sys/stat/linux/lstat.cpp b/libc/src/sys/stat/linux/lstat.cpp
index 5a6eff068d1dd..b2698148973a5 100644
--- a/libc/src/sys/stat/linux/lstat.cpp
+++ b/libc/src/sys/stat/linux/lstat.cpp
@@ -8,7 +8,6 @@
#include "src/sys/stat/lstat.h"
#include "kernel_statx.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
@@ -17,7 +16,7 @@
#include <fcntl.h>
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, lstat,
(const char *__restrict path,
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(int, lstat,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/stat/linux/mkdir.cpp b/libc/src/sys/stat/linux/mkdir.cpp
index 527c3d2058d2b..63b64ac091a87 100644
--- a/libc/src/sys/stat/linux/mkdir.cpp
+++ b/libc/src/sys/stat/linux/mkdir.cpp
@@ -11,13 +11,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, mkdir, (const char *path, mode_t mode)) {
#ifdef SYS_mkdir
@@ -36,4 +35,4 @@ LLVM_LIBC_FUNCTION(int, mkdir, (const char *path, mode_t mode)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/stat/linux/mkdirat.cpp b/libc/src/sys/stat/linux/mkdirat.cpp
index 097fc158010d1..0128d7c081cfd 100644
--- a/libc/src/sys/stat/linux/mkdirat.cpp
+++ b/libc/src/sys/stat/linux/mkdirat.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/stat.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, mkdirat, (int dfd, const char *path, mode_t mode)) {
#ifdef SYS_mkdirat
@@ -32,4 +31,4 @@ LLVM_LIBC_FUNCTION(int, mkdirat, (int dfd, const char *path, mode_t mode)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/stat/linux/stat.cpp b/libc/src/sys/stat/linux/stat.cpp
index c5149e6e3c883..c30c8b65da1e8 100644
--- a/libc/src/sys/stat/linux/stat.cpp
+++ b/libc/src/sys/stat/linux/stat.cpp
@@ -8,7 +8,6 @@
#include "src/sys/stat/stat.h"
#include "kernel_statx.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/__support/common.h"
@@ -16,7 +15,7 @@
#include <fcntl.h>
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, stat,
(const char *__restrict path,
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, stat,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/stat/lstat.h b/libc/src/sys/stat/lstat.h
index a94fc69969ab9..42bd8e932da75 100644
--- a/libc/src/sys/stat/lstat.h
+++ b/libc/src/sys/stat/lstat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_STAT_LSTAT_H
#define LLVM_LIBC_SRC_SYS_STAT_LSTAT_H
-#include "src/__support/macros/config.h"
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int lstat(const char *__restrict path, struct stat *__restrict statbuf);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STAT_LSTAT_H
diff --git a/libc/src/sys/stat/mkdir.h b/libc/src/sys/stat/mkdir.h
index 2d990bacd564e..9f2991d850cbc 100644
--- a/libc/src/sys/stat/mkdir.h
+++ b/libc/src/sys/stat/mkdir.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_STAT_MKDIR_H
#define LLVM_LIBC_SRC_SYS_STAT_MKDIR_H
-#include "src/__support/macros/config.h"
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int mkdir(const char *path, mode_t mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STAT_MKDIR_H
diff --git a/libc/src/sys/stat/mkdirat.h b/libc/src/sys/stat/mkdirat.h
index e26cf5b58b8b1..322209754fc0b 100644
--- a/libc/src/sys/stat/mkdirat.h
+++ b/libc/src/sys/stat/mkdirat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_STAT_MKDIRAT_H
#define LLVM_LIBC_SRC_SYS_STAT_MKDIRAT_H
-#include "src/__support/macros/config.h"
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int mkdirat(int dfd, const char *path, mode_t mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STAT_MKDIRAT_H
diff --git a/libc/src/sys/stat/stat.h b/libc/src/sys/stat/stat.h
index 8ec3e9b1aa9e0..5d2eba5bd74c4 100644
--- a/libc/src/sys/stat/stat.h
+++ b/libc/src/sys/stat/stat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_STAT_STAT_H
#define LLVM_LIBC_SRC_SYS_STAT_STAT_H
-#include "src/__support/macros/config.h"
#include <sys/stat.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int stat(const char *__restrict path, struct stat *__restrict statbuf);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STAT_STAT_H
diff --git a/libc/src/sys/statvfs/fstatvfs.h b/libc/src/sys/statvfs/fstatvfs.h
index 60c271c253d32..6ca76a459ae5b 100644
--- a/libc/src/sys/statvfs/fstatvfs.h
+++ b/libc/src/sys/statvfs/fstatvfs.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_SYS_STATVFS_FSTATVFS_H
#include "llvm-libc-types/struct_statvfs.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fstatvfs(int fd, struct statvfs *buf);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STATVFS_FSTATVFS_H
diff --git a/libc/src/sys/statvfs/linux/fstatvfs.cpp b/libc/src/sys/statvfs/linux/fstatvfs.cpp
index 1a2fc04a1dff9..488989abbad70 100644
--- a/libc/src/sys/statvfs/linux/fstatvfs.cpp
+++ b/libc/src/sys/statvfs/linux/fstatvfs.cpp
@@ -9,10 +9,9 @@
#include "src/sys/statvfs/fstatvfs.h"
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/sys/statvfs/linux/statfs_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fstatvfs, (int fd, struct statvfs *buf)) {
using namespace statfs_utils;
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, fstatvfs, (int fd, struct statvfs *buf)) {
return result ? 0 : -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/statvfs/linux/statfs_utils.h b/libc/src/sys/statvfs/linux/statfs_utils.h
index ca981c1364748..52f810d702d2a 100644
--- a/libc/src/sys/statvfs/linux/statfs_utils.h
+++ b/libc/src/sys/statvfs/linux/statfs_utils.h
@@ -13,11 +13,10 @@
#include "src/__support/CPP/optional.h"
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/macros/attributes.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <asm/statfs.h>
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace statfs_utils {
#ifdef SYS_statfs64
@@ -92,6 +91,6 @@ LIBC_INLINE struct statvfs statfs_to_statvfs(const LinuxStatFs &in) {
return out;
}
} // namespace statfs_utils
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STATVFS_LINUX_STATFS_TO_STATVFS_H
diff --git a/libc/src/sys/statvfs/linux/statvfs.cpp b/libc/src/sys/statvfs/linux/statvfs.cpp
index fc3c75a260ce0..a438ef1f0117e 100644
--- a/libc/src/sys/statvfs/linux/statvfs.cpp
+++ b/libc/src/sys/statvfs/linux/statvfs.cpp
@@ -9,10 +9,9 @@
#include "src/sys/statvfs/statvfs.h"
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/sys/statvfs/linux/statfs_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, statvfs,
(const char *__restrict path,
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, statvfs,
return result ? 0 : -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/statvfs/statvfs.h b/libc/src/sys/statvfs/statvfs.h
index 674a079b593c4..792c7ddd0164e 100644
--- a/libc/src/sys/statvfs/statvfs.h
+++ b/libc/src/sys/statvfs/statvfs.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_SYS_STATVFS_STATVFS_H
#include "llvm-libc-types/struct_statvfs.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int statvfs(const char *__restrict path, struct statvfs *__restrict buf);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_STATVFS_STATVFS_H
diff --git a/libc/src/sys/utsname/linux/uname.cpp b/libc/src/sys/utsname/linux/uname.cpp
index 7bb227e801e3a..f0796b63f62e9 100644
--- a/libc/src/sys/utsname/linux/uname.cpp
+++ b/libc/src/sys/utsname/linux/uname.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
#include <sys/utsname.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, uname, (struct utsname * name)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_uname, name);
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(int, uname, (struct utsname * name)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/utsname/uname.h b/libc/src/sys/utsname/uname.h
index 973df77f164d3..b347cf00f33b9 100644
--- a/libc/src/sys/utsname/uname.h
+++ b/libc/src/sys/utsname/uname.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_UTSNAME_UNAME_H
#define LLVM_LIBC_SRC_SYS_UTSNAME_UNAME_H
-#include "src/__support/macros/config.h"
#include <sys/utsname.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int uname(struct utsname *name);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_UTSNAME_UNAME_H
diff --git a/libc/src/sys/wait/linux/wait.cpp b/libc/src/sys/wait/linux/wait.cpp
index dc97d0a4ff172..02e6a34c1e8b1 100644
--- a/libc/src/sys/wait/linux/wait.cpp
+++ b/libc/src/sys/wait/linux/wait.cpp
@@ -9,11 +9,10 @@
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/sys/wait/wait.h"
#include "src/sys/wait/wait4Impl.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(pid_t, wait, (int *wait_status)) {
auto result = internal::wait4impl(-1, wait_status, 0, 0);
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(pid_t, wait, (int *wait_status)) {
return result.value();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/wait/linux/wait4.cpp b/libc/src/sys/wait/linux/wait4.cpp
index ac6d16933dc87..84036caf0a7b3 100644
--- a/libc/src/sys/wait/linux/wait4.cpp
+++ b/libc/src/sys/wait/linux/wait4.cpp
@@ -9,11 +9,10 @@
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/sys/wait/wait4.h"
#include "src/sys/wait/wait4Impl.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(pid_t, wait4,
(pid_t pid, int *wait_status, int options,
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(pid_t, wait4,
return result.value();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/wait/linux/waitpid.cpp b/libc/src/sys/wait/linux/waitpid.cpp
index cb763a686353d..b2e8229a52583 100644
--- a/libc/src/sys/wait/linux/waitpid.cpp
+++ b/libc/src/sys/wait/linux/waitpid.cpp
@@ -9,11 +9,10 @@
#include "src/__support/common.h"
#include "src/__support/libc_assert.h"
-#include "src/__support/macros/config.h"
#include "src/sys/wait/wait4Impl.h"
#include "src/sys/wait/waitpid.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(pid_t, waitpid, (pid_t pid, int *wait_status, int options)) {
auto result = internal::wait4impl(pid, wait_status, options, 0);
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(pid_t, waitpid, (pid_t pid, int *wait_status, int options)) {
return result.value();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/sys/wait/wait.h b/libc/src/sys/wait/wait.h
index 03b53a54ae888..abe5249b83c81 100644
--- a/libc/src/sys/wait/wait.h
+++ b/libc/src/sys/wait/wait.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_WAIT_WAIT_H
#define LLVM_LIBC_SRC_SYS_WAIT_WAIT_H
-#include "src/__support/macros/config.h"
#include <sys/wait.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
pid_t wait(int *waitstatus);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_WAIT_WAIT_H
diff --git a/libc/src/sys/wait/wait4.h b/libc/src/sys/wait/wait4.h
index f425feec5cb29..3205b28e968ef 100644
--- a/libc/src/sys/wait/wait4.h
+++ b/libc/src/sys/wait/wait4.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_WAIT_WAIT4_H
#define LLVM_LIBC_SRC_SYS_WAIT_WAIT4_H
-#include "src/__support/macros/config.h"
#include <sys/wait.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
pid_t wait4(pid_t pid, int *waitstatus, int options, struct rusage *usage);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_WAIT_WAIT4_H
diff --git a/libc/src/sys/wait/wait4Impl.h b/libc/src/sys/wait/wait4Impl.h
index 5c2cb3e8e0abf..956ad0f8c9c41 100644
--- a/libc/src/sys/wait/wait4Impl.h
+++ b/libc/src/sys/wait/wait4Impl.h
@@ -12,14 +12,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
#include "src/__support/error_or.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <signal.h>
#include <sys/syscall.h> // For syscall numbers.
#include <sys/wait.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
// The implementation of wait here is very minimal. We will add more
@@ -81,6 +80,6 @@ LIBC_INLINE ErrorOr<pid_t> wait4impl(pid_t pid, int *wait_status, int options,
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_WAIT_WAIT4IMPL_H
diff --git a/libc/src/sys/wait/waitpid.h b/libc/src/sys/wait/waitpid.h
index 883b5375787e2..37ebf289ff072 100644
--- a/libc/src/sys/wait/waitpid.h
+++ b/libc/src/sys/wait/waitpid.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_SYS_WAIT_WAITPID_H
#define LLVM_LIBC_SRC_SYS_WAIT_WAITPID_H
-#include "src/__support/macros/config.h"
#include <sys/wait.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
pid_t waitpid(pid_t pid, int *waitstatus, int options);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_SYS_WAIT_WAITPID_H
diff --git a/libc/src/termios/cfgetispeed.h b/libc/src/termios/cfgetispeed.h
index 56b0ab852cdb8..7ea280f69da44 100644
--- a/libc/src/termios/cfgetispeed.h
+++ b/libc/src/termios/cfgetispeed.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_CFGETISPEED_H
#define LLVM_LIBC_SRC_TERMIOS_CFGETISPEED_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
speed_t cfgetispeed(const struct termios *t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_CFGETISPEED_H
diff --git a/libc/src/termios/cfgetospeed.h b/libc/src/termios/cfgetospeed.h
index 9d8e6656b0e9b..95e3edb51b382 100644
--- a/libc/src/termios/cfgetospeed.h
+++ b/libc/src/termios/cfgetospeed.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_CFGETOSPEED_H
#define LLVM_LIBC_SRC_TERMIOS_CFGETOSPEED_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
speed_t cfgetospeed(const struct termios *t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_CFGETOSPEED_H
diff --git a/libc/src/termios/cfsetispeed.h b/libc/src/termios/cfsetispeed.h
index 89b683e560489..e03a2d1ef0cf5 100644
--- a/libc/src/termios/cfsetispeed.h
+++ b/libc/src/termios/cfsetispeed.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_CFSETISPEED_H
#define LLVM_LIBC_SRC_TERMIOS_CFSETISPEED_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int cfsetispeed(struct termios *t, speed_t speed);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_CFSETISPEED_H
diff --git a/libc/src/termios/cfsetospeed.h b/libc/src/termios/cfsetospeed.h
index 2f2c5315fb690..74d41abc5326d 100644
--- a/libc/src/termios/cfsetospeed.h
+++ b/libc/src/termios/cfsetospeed.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_CFSETOSPEED_H
#define LLVM_LIBC_SRC_TERMIOS_CFSETOSPEED_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int cfsetospeed(struct termios *t, speed_t speed);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_CFSETOSPEED_H
diff --git a/libc/src/termios/linux/cfgetispeed.cpp b/libc/src/termios/linux/cfgetispeed.cpp
index 19e9b9140aa2b..18e34b2dcb07c 100644
--- a/libc/src/termios/linux/cfgetispeed.cpp
+++ b/libc/src/termios/linux/cfgetispeed.cpp
@@ -9,14 +9,13 @@
#include "src/termios/cfgetispeed.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(speed_t, cfgetispeed, (const struct termios *t)) {
return t->c_cflag & CBAUD;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/cfgetospeed.cpp b/libc/src/termios/linux/cfgetospeed.cpp
index d633beb8061f8..1989b3feabe97 100644
--- a/libc/src/termios/linux/cfgetospeed.cpp
+++ b/libc/src/termios/linux/cfgetospeed.cpp
@@ -9,14 +9,13 @@
#include "src/termios/cfgetospeed.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(speed_t, cfgetospeed, (const struct termios *t)) {
return t->c_cflag & CBAUD;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/cfsetispeed.cpp b/libc/src/termios/linux/cfsetispeed.cpp
index 9656b714a8ed2..0e8ac55fe700e 100644
--- a/libc/src/termios/linux/cfsetispeed.cpp
+++ b/libc/src/termios/linux/cfsetispeed.cpp
@@ -9,12 +9,11 @@
#include "src/termios/cfsetispeed.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, cfsetispeed, (struct termios * t, speed_t speed)) {
constexpr speed_t NOT_SPEED_MASK = ~speed_t(CBAUD);
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, cfsetispeed, (struct termios * t, speed_t speed)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/cfsetospeed.cpp b/libc/src/termios/linux/cfsetospeed.cpp
index 6130d266dbff0..d21f629cb74b6 100644
--- a/libc/src/termios/linux/cfsetospeed.cpp
+++ b/libc/src/termios/linux/cfsetospeed.cpp
@@ -7,14 +7,13 @@
//===----------------------------------------------------------------------===//
#include "src/termios/cfsetospeed.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/__support/common.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, cfsetospeed, (struct termios * t, speed_t speed)) {
constexpr speed_t NOT_SPEED_MASK = ~speed_t(CBAUD);
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, cfsetospeed, (struct termios * t, speed_t speed)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/kernel_termios.h b/libc/src/termios/linux/kernel_termios.h
index 5a3a9722789eb..d96de72029f76 100644
--- a/libc/src/termios/linux/kernel_termios.h
+++ b/libc/src/termios/linux/kernel_termios.h
@@ -9,11 +9,10 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_LINUX_KERNEL_TERMIOS_H
#define LLVM_LIBC_SRC_TERMIOS_LINUX_KERNEL_TERMIOS_H
-#include "src/__support/macros/config.h"
#include <stddef.h>
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The kernel's struct termios is different from the libc's struct termios. The
// kernel's syscalls expect the size and layout of its definition of struct
@@ -37,6 +36,6 @@ struct kernel_termios {
cc_t c_cc[KERNEL_NCCS];
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_LINUX_KERNEL_TERMIOS_H
diff --git a/libc/src/termios/linux/tcdrain.cpp b/libc/src/termios/linux/tcdrain.cpp
index 116e3f0e0cbc5..c3826ff9a101c 100644
--- a/libc/src/termios/linux/tcdrain.cpp
+++ b/libc/src/termios/linux/tcdrain.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
#include <sys/syscall.h> // For syscall numbers
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, tcdrain, (int fd)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, TCSBRK, 1);
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, tcdrain, (int fd)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/tcflow.cpp b/libc/src/termios/linux/tcflow.cpp
index d229230b5d138..9753ef767e927 100644
--- a/libc/src/termios/linux/tcflow.cpp
+++ b/libc/src/termios/linux/tcflow.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
#include <sys/syscall.h> // For syscall numbers
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, tcflow, (int fd, int action)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_ioctl, fd, TCXONC, action);
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, tcflow, (int fd, int action)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/tcflush.cpp b/libc/src/termios/linux/tcflush.cpp
index 028a5414b1960..9c7e8f02431e8 100644
--- a/libc/src/termios/linux/tcflush.cpp
+++ b/libc/src/termios/linux/tcflush.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
#include <sys/syscall.h> // For syscall numbers
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, tcflush, (int fd, int queue_selector)) {
int ret =
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(int, tcflush, (int fd, int queue_selector)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/tcgetattr.cpp b/libc/src/termios/linux/tcgetattr.cpp
index 63c096ff88eba..254c48521bb90 100644
--- a/libc/src/termios/linux/tcgetattr.cpp
+++ b/libc/src/termios/linux/tcgetattr.cpp
@@ -11,14 +11,13 @@
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
#include <sys/syscall.h> // For syscall numbers
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, tcgetattr, (int fd, struct termios *t)) {
LIBC_NAMESPACE::kernel_termios kt;
@@ -44,4 +43,4 @@ LLVM_LIBC_FUNCTION(int, tcgetattr, (int fd, struct termios *t)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/tcgetsid.cpp b/libc/src/termios/linux/tcgetsid.cpp
index c283d0e4fda9a..7b2abf8f4cf08 100644
--- a/libc/src/termios/linux/tcgetsid.cpp
+++ b/libc/src/termios/linux/tcgetsid.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
#include <sys/syscall.h> // For syscall numbers
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(pid_t, tcgetsid, (int fd)) {
pid_t sid;
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(pid_t, tcgetsid, (int fd)) {
return sid;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/tcsendbreak.cpp b/libc/src/termios/linux/tcsendbreak.cpp
index 30bc91cf3de0a..fdd3f8adf7d8d 100644
--- a/libc/src/termios/linux/tcsendbreak.cpp
+++ b/libc/src/termios/linux/tcsendbreak.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
#include <sys/syscall.h> // For syscall numbers
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(pid_t, tcsendbreak, (int fd, int /* unused duration */)) {
// POSIX leaves the behavior for non-zero duration implementation dependent.
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(pid_t, tcsendbreak, (int fd, int /* unused duration */)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/linux/tcsetattr.cpp b/libc/src/termios/linux/tcsetattr.cpp
index 8aa1e5c57b34e..ba500a00210d9 100644
--- a/libc/src/termios/linux/tcsetattr.cpp
+++ b/libc/src/termios/linux/tcsetattr.cpp
@@ -11,14 +11,13 @@
#include "src/__support/OSUtil/syscall.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <asm/ioctls.h> // Safe to include without the risk of name pollution.
#include <sys/syscall.h> // For syscall numbers
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, tcsetattr,
(int fd, int actions, const struct termios *t)) {
@@ -60,4 +59,4 @@ LLVM_LIBC_FUNCTION(int, tcsetattr,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/termios/tcdrain.h b/libc/src/termios/tcdrain.h
index f7fcd8c734bfa..52042063108cc 100644
--- a/libc/src/termios/tcdrain.h
+++ b/libc/src/termios/tcdrain.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_TCDRAIN_H
#define LLVM_LIBC_SRC_TERMIOS_TCDRAIN_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int tcdrain(int fd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_TCDRAIN_H
diff --git a/libc/src/termios/tcflow.h b/libc/src/termios/tcflow.h
index dbe63adea1ceb..267d3f682d7b2 100644
--- a/libc/src/termios/tcflow.h
+++ b/libc/src/termios/tcflow.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_TCFLOW_H
#define LLVM_LIBC_SRC_TERMIOS_TCFLOW_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int tcflow(int fd, int action);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_TCFLOW_H
diff --git a/libc/src/termios/tcflush.h b/libc/src/termios/tcflush.h
index 5c283a0203c89..d631ca21379e9 100644
--- a/libc/src/termios/tcflush.h
+++ b/libc/src/termios/tcflush.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_TCFLUSH_H
#define LLVM_LIBC_SRC_TERMIOS_TCFLUSH_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int tcflush(int fd, int queue_selector);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_TCFLUSH_H
diff --git a/libc/src/termios/tcgetattr.h b/libc/src/termios/tcgetattr.h
index 54b169aedad88..c39aa4135256d 100644
--- a/libc/src/termios/tcgetattr.h
+++ b/libc/src/termios/tcgetattr.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_TCGETATTR_H
#define LLVM_LIBC_SRC_TERMIOS_TCGETATTR_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int tcgetattr(int fd, struct termios *t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_TCGETATTR_H
diff --git a/libc/src/termios/tcgetsid.h b/libc/src/termios/tcgetsid.h
index a69db00a5dab0..07dbb22b16775 100644
--- a/libc/src/termios/tcgetsid.h
+++ b/libc/src/termios/tcgetsid.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_TCGETSID_H
#define LLVM_LIBC_SRC_TERMIOS_TCGETSID_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
pid_t tcgetsid(int fd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_TCGETSID_H
diff --git a/libc/src/termios/tcsendbreak.h b/libc/src/termios/tcsendbreak.h
index 9edc602cff6c5..487fdad504804 100644
--- a/libc/src/termios/tcsendbreak.h
+++ b/libc/src/termios/tcsendbreak.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_TCSENDBREAK_H
#define LLVM_LIBC_SRC_TERMIOS_TCSENDBREAK_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int tcsendbreak(int fd, int duration);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_TCSENDBREAK_H
diff --git a/libc/src/termios/tcsetattr.h b/libc/src/termios/tcsetattr.h
index 05c88f104836f..d514ac71210bb 100644
--- a/libc/src/termios/tcsetattr.h
+++ b/libc/src/termios/tcsetattr.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TERMIOS_TCSETATTR_H
#define LLVM_LIBC_SRC_TERMIOS_TCSETATTR_H
-#include "src/__support/macros/config.h"
#include <termios.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int tcsetattr(int fd, int actions, const struct termios *t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TERMIOS_TCSETATTR_H
diff --git a/libc/src/threads/call_once.cpp b/libc/src/threads/call_once.cpp
index 8466cd622afeb..2d91094b12091 100644
--- a/libc/src/threads/call_once.cpp
+++ b/libc/src/threads/call_once.cpp
@@ -8,12 +8,11 @@
#include "src/threads/call_once.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/callonce.h"
#include <threads.h> // For once_flag and __call_once_func_t definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, call_once,
(once_flag * flag, __call_once_func_t func)) {
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(void, call_once,
reinterpret_cast<CallOnceCallback *>(func));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/call_once.h b/libc/src/threads/call_once.h
index b6208afd80b74..186d63cecdbdd 100644
--- a/libc/src/threads/call_once.h
+++ b/libc/src/threads/call_once.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_CALL_ONCE_H
#define LLVM_LIBC_SRC_THREADS_CALL_ONCE_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void call_once(once_flag *flag, __call_once_func_t func);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_CALL_ONCE_H
diff --git a/libc/src/threads/cnd_broadcast.h b/libc/src/threads/cnd_broadcast.h
index ab911a774573e..4e996f22748f3 100644
--- a/libc/src/threads/cnd_broadcast.h
+++ b/libc/src/threads/cnd_broadcast.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_CND_BROADCAST_H
#define LLVM_LIBC_SRC_THREADS_CND_BROADCAST_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int cnd_broadcast(cnd_t *cond);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_CND_BROADCAST_H
diff --git a/libc/src/threads/cnd_destroy.h b/libc/src/threads/cnd_destroy.h
index 224a9a4d0763e..d102e7b83e7bc 100644
--- a/libc/src/threads/cnd_destroy.h
+++ b/libc/src/threads/cnd_destroy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_CND_DESTROY_H
#define LLVM_LIBC_SRC_THREADS_CND_DESTROY_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void cnd_destroy(cnd_t *cond);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_CND_DESTROY_H
diff --git a/libc/src/threads/cnd_init.h b/libc/src/threads/cnd_init.h
index dcd4f7b918fd6..c4fc02f5f9e7e 100644
--- a/libc/src/threads/cnd_init.h
+++ b/libc/src/threads/cnd_init.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_CND_INIT_H
#define LLVM_LIBC_SRC_THREADS_CND_INIT_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int cnd_init(cnd_t *cond);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_CND_INIT_H
diff --git a/libc/src/threads/cnd_signal.h b/libc/src/threads/cnd_signal.h
index 95d4426cdc2f7..4c60a9295299c 100644
--- a/libc/src/threads/cnd_signal.h
+++ b/libc/src/threads/cnd_signal.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_CND_SIGNAL_H
#define LLVM_LIBC_SRC_THREADS_CND_SIGNAL_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int cnd_signal(cnd_t *cond);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_CND_SIGNAL_H
diff --git a/libc/src/threads/cnd_wait.h b/libc/src/threads/cnd_wait.h
index 8f9f0f3ddd382..5d2cdbb68c78f 100644
--- a/libc/src/threads/cnd_wait.h
+++ b/libc/src/threads/cnd_wait.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_CND_WAIT_H
#define LLVM_LIBC_SRC_THREADS_CND_WAIT_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int cnd_wait(cnd_t *cond, mtx_t *mutex);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_CND_WAIT_H
diff --git a/libc/src/threads/linux/Futex.h b/libc/src/threads/linux/Futex.h
index e7fde14629d53..4b426ac51ad17 100644
--- a/libc/src/threads/linux/Futex.h
+++ b/libc/src/threads/linux/Futex.h
@@ -9,10 +9,9 @@
#ifndef LLVM_LIBC_SRC_THREADS_LINUX_FUTEX_H
#define LLVM_LIBC_SRC_THREADS_LINUX_FUTEX_H
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h" // Architecture macros
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#if (defined(LIBC_TARGET_ARCH_IS_AARCH64) || \
defined(LIBC_TARGET_ARCH_IS_X86_64))
@@ -28,6 +27,6 @@ static_assert(sizeof(FutexWordType) == 4,
#error "Futex word base type not defined for the target architecture."
#endif
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_LINUX_FUTEX_H
diff --git a/libc/src/threads/linux/cnd_broadcast.cpp b/libc/src/threads/linux/cnd_broadcast.cpp
index 5c5187461bbed..a56aaa21ee122 100644
--- a/libc/src/threads/linux/cnd_broadcast.cpp
+++ b/libc/src/threads/linux/cnd_broadcast.cpp
@@ -8,13 +8,12 @@
#include "src/threads/cnd_broadcast.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/CndVar.h"
// TODO: https://github.com/llvm/llvm-project/issues/92968
#include <threads.h> // cnd_t, thrd_error, thrd_success
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(CndVar) == sizeof(cnd_t));
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, cnd_broadcast, (cnd_t * cond)) {
return thrd_success;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/linux/cnd_destroy.cpp b/libc/src/threads/linux/cnd_destroy.cpp
index 963991bddfe45..2b03b18c48e46 100644
--- a/libc/src/threads/linux/cnd_destroy.cpp
+++ b/libc/src/threads/linux/cnd_destroy.cpp
@@ -8,12 +8,11 @@
#include "src/threads/cnd_destroy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/CndVar.h"
#include <threads.h> // cnd_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(CndVar) == sizeof(cnd_t));
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(void, cnd_destroy, (cnd_t * cond)) {
CndVar::destroy(cndvar);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/linux/cnd_init.cpp b/libc/src/threads/linux/cnd_init.cpp
index 478011a5255e8..d3d2c8a57d82a 100644
--- a/libc/src/threads/linux/cnd_init.cpp
+++ b/libc/src/threads/linux/cnd_init.cpp
@@ -8,12 +8,11 @@
#include "src/threads/cnd_init.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/CndVar.h"
#include <threads.h> // cnd_t, thrd_error, thrd_success
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(CndVar) == sizeof(cnd_t));
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, cnd_init, (cnd_t * cond)) {
return CndVar::init(cndvar) ? thrd_error : thrd_success;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/linux/cnd_signal.cpp b/libc/src/threads/linux/cnd_signal.cpp
index 0d218405d3ac5..f144013e08821 100644
--- a/libc/src/threads/linux/cnd_signal.cpp
+++ b/libc/src/threads/linux/cnd_signal.cpp
@@ -8,12 +8,11 @@
#include "src/threads/cnd_signal.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/CndVar.h"
#include <threads.h> // cnd_t, thrd_error, thrd_success
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(CndVar) == sizeof(cnd_t));
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, cnd_signal, (cnd_t * cond)) {
return thrd_success;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/linux/cnd_wait.cpp b/libc/src/threads/linux/cnd_wait.cpp
index 3633cc85277b9..97cade3f231d7 100644
--- a/libc/src/threads/linux/cnd_wait.cpp
+++ b/libc/src/threads/linux/cnd_wait.cpp
@@ -8,13 +8,12 @@
#include "src/threads/cnd_wait.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/CndVar.h"
#include "src/__support/threads/mutex.h"
#include <threads.h> // cnd_t, mtx_t, thrd_error, thrd_success
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(CndVar) == sizeof(cnd_t));
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, cnd_wait, (cnd_t * cond, mtx_t *mtx)) {
return cndvar->wait(mutex) ? thrd_error : thrd_success;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/mtx_destroy.cpp b/libc/src/threads/mtx_destroy.cpp
index f5e3f828b1b0c..5ee4777f5b2c2 100644
--- a/libc/src/threads/mtx_destroy.cpp
+++ b/libc/src/threads/mtx_destroy.cpp
@@ -8,13 +8,12 @@
#include "src/threads/mtx_destroy.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <threads.h> // For mtx_t definition.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, mtx_destroy, (mtx_t *)) {}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/mtx_destroy.h b/libc/src/threads/mtx_destroy.h
index 8919008e00f1e..1abf5d572f5dc 100644
--- a/libc/src/threads/mtx_destroy.h
+++ b/libc/src/threads/mtx_destroy.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_MTX_DESTROY_H
#define LLVM_LIBC_SRC_THREADS_MTX_DESTROY_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void mtx_destroy(mtx_t *mutex);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_MTX_DESTROY_H
diff --git a/libc/src/threads/mtx_init.cpp b/libc/src/threads/mtx_init.cpp
index eb0ba5010584e..7cd848d12ee6d 100644
--- a/libc/src/threads/mtx_init.cpp
+++ b/libc/src/threads/mtx_init.cpp
@@ -8,12 +8,11 @@
#include "src/threads/mtx_init.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <threads.h> // For mtx_t definition.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(Mutex) <= sizeof(mtx_t),
"The public mtx_t type cannot accommodate the internal mutex "
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, mtx_init, (mtx_t * m, int type)) {
return err == MutexError::NONE ? thrd_success : thrd_error;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/mtx_init.h b/libc/src/threads/mtx_init.h
index 41dc807ff3841..69294d7966663 100644
--- a/libc/src/threads/mtx_init.h
+++ b/libc/src/threads/mtx_init.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_MTX_INIT_H
#define LLVM_LIBC_SRC_THREADS_MTX_INIT_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int mtx_init(mtx_t *mutex, int type);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_MTX_INIT_H
diff --git a/libc/src/threads/mtx_lock.cpp b/libc/src/threads/mtx_lock.cpp
index 5595ebd871998..013a88a8e02b7 100644
--- a/libc/src/threads/mtx_lock.cpp
+++ b/libc/src/threads/mtx_lock.cpp
@@ -8,12 +8,11 @@
#include "src/threads/mtx_lock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <threads.h> // For mtx_t definition.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The implementation currently handles only plain mutexes.
LLVM_LIBC_FUNCTION(int, mtx_lock, (mtx_t * mutex)) {
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, mtx_lock, (mtx_t * mutex)) {
return err == MutexError::NONE ? thrd_success : thrd_error;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/mtx_lock.h b/libc/src/threads/mtx_lock.h
index 110ac2763a61a..15c9e1a12545f 100644
--- a/libc/src/threads/mtx_lock.h
+++ b/libc/src/threads/mtx_lock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_MTX_LOCK_H
#define LLVM_LIBC_SRC_THREADS_MTX_LOCK_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int mtx_lock(mtx_t *mutex);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_MTX_LOCK_H
diff --git a/libc/src/threads/mtx_unlock.cpp b/libc/src/threads/mtx_unlock.cpp
index dcb2206e905da..a72ee4427c5a9 100644
--- a/libc/src/threads/mtx_unlock.cpp
+++ b/libc/src/threads/mtx_unlock.cpp
@@ -8,12 +8,11 @@
#include "src/threads/mtx_unlock.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/mutex.h"
#include <threads.h> // For mtx_t definition.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The implementation currently handles only plain mutexes.
LLVM_LIBC_FUNCTION(int, mtx_unlock, (mtx_t * mutex)) {
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, mtx_unlock, (mtx_t * mutex)) {
return err == MutexError::NONE ? thrd_success : thrd_error;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/mtx_unlock.h b/libc/src/threads/mtx_unlock.h
index 54f6f79ae213c..54fb034a04a21 100644
--- a/libc/src/threads/mtx_unlock.h
+++ b/libc/src/threads/mtx_unlock.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_MTX_UNLOCK_H
#define LLVM_LIBC_SRC_THREADS_MTX_UNLOCK_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int mtx_unlock(mtx_t *mutex);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_MTX_UNLOCK_H
diff --git a/libc/src/threads/thrd_create.cpp b/libc/src/threads/thrd_create.cpp
index 52af72b07c8a8..06cba84eb8646 100644
--- a/libc/src/threads/thrd_create.cpp
+++ b/libc/src/threads/thrd_create.cpp
@@ -8,13 +8,12 @@
#include "src/threads/thrd_create.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <errno.h>
#include <threads.h> // For thrd_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(thrd_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between thrd_t and internal Thread.");
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, thrd_create,
return thrd_error;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/thrd_create.h b/libc/src/threads/thrd_create.h
index c7b527b6e4f53..0efa6f58c47ea 100644
--- a/libc/src/threads/thrd_create.h
+++ b/libc/src/threads/thrd_create.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_THRD_CREATE_H
#define LLVM_LIBC_SRC_THREADS_THRD_CREATE_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int thrd_create(thrd_t *thread, thrd_start_t func, void *arg);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_THRD_CREATE_H
diff --git a/libc/src/threads/thrd_current.cpp b/libc/src/threads/thrd_current.cpp
index 634159712b629..b5ea0432aa523 100644
--- a/libc/src/threads/thrd_current.cpp
+++ b/libc/src/threads/thrd_current.cpp
@@ -8,12 +8,11 @@
#include "src/threads/thrd_current.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <threads.h> // For thrd_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(thrd_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between thrd_t and internal Thread.");
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(thrd_t, thrd_current, ()) {
return th;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/thrd_current.h b/libc/src/threads/thrd_current.h
index aec9cd8ed4728..2125729ccffeb 100644
--- a/libc/src/threads/thrd_current.h
+++ b/libc/src/threads/thrd_current.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_THRD_CURRENT_H
#define LLVM_LIBC_SRC_THREADS_THRD_CURRENT_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
thrd_t thrd_current();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_THRD_CURRENT_H
diff --git a/libc/src/threads/thrd_detach.cpp b/libc/src/threads/thrd_detach.cpp
index a3fe257a34560..17731c638bd52 100644
--- a/libc/src/threads/thrd_detach.cpp
+++ b/libc/src/threads/thrd_detach.cpp
@@ -8,12 +8,11 @@
#include "src/threads/thrd_detach.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <threads.h> // For thrd_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(thrd_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between thrd_t and internal Thread.");
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, thrd_detach, (thrd_t th)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/thrd_detach.h b/libc/src/threads/thrd_detach.h
index d139aad1b869b..64f2094acd65d 100644
--- a/libc/src/threads/thrd_detach.h
+++ b/libc/src/threads/thrd_detach.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_THRD_DETACH_H
#define LLVM_LIBC_SRC_THREADS_THRD_DETACH_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int thrd_detach(thrd_t thread);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_THRD_DETACH_H
diff --git a/libc/src/threads/thrd_equal.cpp b/libc/src/threads/thrd_equal.cpp
index 1d901cb697ac2..b9717cf121b04 100644
--- a/libc/src/threads/thrd_equal.cpp
+++ b/libc/src/threads/thrd_equal.cpp
@@ -8,12 +8,11 @@
#include "src/threads/thrd_equal.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <threads.h> // For thrd_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(thrd_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between thrd_t and internal Thread.");
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, thrd_equal, (thrd_t lhs, thrd_t rhs)) {
return *lhs_internal == *rhs_internal;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/thrd_equal.h b/libc/src/threads/thrd_equal.h
index 5309dbc2758c9..5878ea458ba41 100644
--- a/libc/src/threads/thrd_equal.h
+++ b/libc/src/threads/thrd_equal.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_THRD_EQUAL_H
#define LLVM_LIBC_SRC_THREADS_THRD_EQUAL_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int thrd_equal(thrd_t lhs, thrd_t rhs);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_THRD_EQUAL_H
diff --git a/libc/src/threads/thrd_exit.cpp b/libc/src/threads/thrd_exit.cpp
index 72fd95034d0ae..67a7a419cf99a 100644
--- a/libc/src/threads/thrd_exit.cpp
+++ b/libc/src/threads/thrd_exit.cpp
@@ -8,12 +8,11 @@
#include "src/threads/thrd_exit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <threads.h> // For thrd_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(thrd_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between thrd_t and internal Thread.");
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(void, thrd_exit, (int retval)) {
thread_exit(ThreadReturnValue(retval), ThreadStyle::STDC);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/thrd_exit.h b/libc/src/threads/thrd_exit.h
index 0569967d044e4..19eb027d0357a 100644
--- a/libc/src/threads/thrd_exit.h
+++ b/libc/src/threads/thrd_exit.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_THRD_EXIT_H
#define LLVM_LIBC_SRC_THREADS_THRD_EXIT_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void thrd_exit(int retval);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_THRD_EXIT_H
diff --git a/libc/src/threads/thrd_join.cpp b/libc/src/threads/thrd_join.cpp
index 74211caeb8b61..cc8ba4b97a3a5 100644
--- a/libc/src/threads/thrd_join.cpp
+++ b/libc/src/threads/thrd_join.cpp
@@ -8,12 +8,11 @@
#include "src/threads/thrd_join.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <threads.h> // For thrd_* type definitions.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static_assert(sizeof(thrd_t) == sizeof(LIBC_NAMESPACE::Thread),
"Mismatch between thrd_t and internal Thread.");
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, thrd_join, (thrd_t th, int *retval)) {
return result == 0 ? thrd_success : thrd_error;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/thrd_join.h b/libc/src/threads/thrd_join.h
index 0889d586fb665..21a398c6e8352 100644
--- a/libc/src/threads/thrd_join.h
+++ b/libc/src/threads/thrd_join.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_THRD_JOIN_H
#define LLVM_LIBC_SRC_THREADS_THRD_JOIN_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int thrd_join(thrd_t thread, int *retval);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_THRD_JOIN_H
diff --git a/libc/src/threads/tss_create.cpp b/libc/src/threads/tss_create.cpp
index 05403a37e221a..ddea44dce301d 100644
--- a/libc/src/threads/tss_create.cpp
+++ b/libc/src/threads/tss_create.cpp
@@ -9,12 +9,11 @@
#include "tss_create.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, tss_create, (tss_t * key, tss_dtor_t dtor)) {
auto k = LIBC_NAMESPACE::new_tss_key(dtor);
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, tss_create, (tss_t * key, tss_dtor_t dtor)) {
return thrd_success;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/tss_create.h b/libc/src/threads/tss_create.h
index 6f055a06ec0e5..def903e29e06e 100644
--- a/libc/src/threads/tss_create.h
+++ b/libc/src/threads/tss_create.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_TSS_CREATE_H
#define LLVM_LIBC_SRC_THREADS_TSS_CREATE_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int tss_create(tss_t *key, tss_dtor_t dtor);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_TSS_CREATE_H
diff --git a/libc/src/threads/tss_delete.cpp b/libc/src/threads/tss_delete.cpp
index c0a07d6049df1..a2a4e9aa349ba 100644
--- a/libc/src/threads/tss_delete.cpp
+++ b/libc/src/threads/tss_delete.cpp
@@ -9,15 +9,14 @@
#include "tss_delete.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, tss_delete, (tss_t key)) {
LIBC_NAMESPACE::tss_key_delete(key);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/tss_delete.h b/libc/src/threads/tss_delete.h
index 72e711147e9cc..3efc0d745dd14 100644
--- a/libc/src/threads/tss_delete.h
+++ b/libc/src/threads/tss_delete.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_TSS_DELETE_H
#define LLVM_LIBC_SRC_THREADS_TSS_DELETE_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void tss_delete(tss_t key);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_TSS_DELETE_H
diff --git a/libc/src/threads/tss_get.cpp b/libc/src/threads/tss_get.cpp
index d6a0b965a6ffb..9b8c94fbeba28 100644
--- a/libc/src/threads/tss_get.cpp
+++ b/libc/src/threads/tss_get.cpp
@@ -9,13 +9,12 @@
#include "tss_get.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, tss_get, (tss_t key)) { return get_tss_value(key); }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/tss_get.h b/libc/src/threads/tss_get.h
index c5dd9cbeaae9a..dfdb79cf122b6 100644
--- a/libc/src/threads/tss_get.h
+++ b/libc/src/threads/tss_get.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_TSS_GET_H
#define LLVM_LIBC_SRC_THREADS_TSS_GET_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void *tss_get(tss_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_TSS_GET_H
diff --git a/libc/src/threads/tss_set.cpp b/libc/src/threads/tss_set.cpp
index a159c9d4fd9f6..640896d14e1c7 100644
--- a/libc/src/threads/tss_set.cpp
+++ b/libc/src/threads/tss_set.cpp
@@ -9,12 +9,11 @@
#include "tss_set.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, tss_set, (tss_t key, void *data)) {
if (set_tss_value(key, data))
@@ -23,4 +22,4 @@ LLVM_LIBC_FUNCTION(int, tss_set, (tss_t key, void *data)) {
return thrd_error;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/threads/tss_set.h b/libc/src/threads/tss_set.h
index 68f50f922235c..249607fdc700e 100644
--- a/libc/src/threads/tss_set.h
+++ b/libc/src/threads/tss_set.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_THREADS_TSS_SET_H
#define LLVM_LIBC_SRC_THREADS_TSS_SET_H
-#include "src/__support/macros/config.h"
#include <threads.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int tss_set(tss_t, void *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_THREADS_TSS_SET_H
diff --git a/libc/src/time/asctime.cpp b/libc/src/time/asctime.cpp
index d6fbe7316ced0..9958903d043cf 100644
--- a/libc/src/time/asctime.cpp
+++ b/libc/src/time/asctime.cpp
@@ -8,10 +8,9 @@
#include "src/time/asctime.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/time/time_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using LIBC_NAMESPACE::time_utils::TimeConstants;
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(char *, asctime, (const struct tm *timeptr)) {
return time_utils::asctime(timeptr, buffer, TimeConstants::ASCTIME_MAX_BYTES);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/asctime.h b/libc/src/time/asctime.h
index 623e6dff60c33..941cd70250e36 100644
--- a/libc/src/time/asctime.h
+++ b/libc/src/time/asctime.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TIME_ASCTIME_H
#define LLVM_LIBC_SRC_TIME_ASCTIME_H
-#include "src/__support/macros/config.h"
#include <time.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *asctime(const struct tm *timeptr);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_ASCTIME_H
diff --git a/libc/src/time/asctime_r.cpp b/libc/src/time/asctime_r.cpp
index caa22f1cd7783..19a21241829ff 100644
--- a/libc/src/time/asctime_r.cpp
+++ b/libc/src/time/asctime_r.cpp
@@ -8,10 +8,9 @@
#include "src/time/asctime_r.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/time/time_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using LIBC_NAMESPACE::time_utils::TimeConstants;
@@ -20,4 +19,4 @@ LLVM_LIBC_FUNCTION(char *, asctime_r,
return time_utils::asctime(timeptr, buffer, TimeConstants::ASCTIME_MAX_BYTES);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/asctime_r.h b/libc/src/time/asctime_r.h
index 328b7dff19c2e..04d3c01ddd2b7 100644
--- a/libc/src/time/asctime_r.h
+++ b/libc/src/time/asctime_r.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TIME_ASCTIME_R_H
#define LLVM_LIBC_SRC_TIME_ASCTIME_R_H
-#include "src/__support/macros/config.h"
#include <time.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *asctime_r(const struct tm *timeptr, char *buffer);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_ASCTIME_R_H
diff --git a/libc/src/time/clock.h b/libc/src/time/clock.h
index 1a794faa958a9..f5d14d036e138 100644
--- a/libc/src/time/clock.h
+++ b/libc/src/time/clock.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_TIME_CLOCK_H
#include "hdr/types/clock_t.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
clock_t clock();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_CLOCK_H
diff --git a/libc/src/time/clock_gettime.h b/libc/src/time/clock_gettime.h
index 9f061d2255cb9..48e81a3554291 100644
--- a/libc/src/time/clock_gettime.h
+++ b/libc/src/time/clock_gettime.h
@@ -11,12 +11,11 @@
#include "hdr/types/clockid_t.h"
#include "hdr/types/struct_timespec.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int clock_gettime(clockid_t clockid, timespec *tp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_CLOCK_GETTIME_H
diff --git a/libc/src/time/difftime.cpp b/libc/src/time/difftime.cpp
index f295b83e3a3d2..95aa1be7abee1 100644
--- a/libc/src/time/difftime.cpp
+++ b/libc/src/time/difftime.cpp
@@ -8,12 +8,11 @@
#include "src/time/difftime.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(double, difftime, (time_t end, time_t beginning)) {
return static_cast<double>(end - beginning);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/difftime.h b/libc/src/time/difftime.h
index d5cd593cc5335..6498b8b943c22 100644
--- a/libc/src/time/difftime.h
+++ b/libc/src/time/difftime.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TIME_DIFFTIME_H
#define LLVM_LIBC_SRC_TIME_DIFFTIME_H
-#include "src/__support/macros/config.h"
#include <time.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
double difftime(time_t end, time_t beginning);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_DIFFTIME_H
diff --git a/libc/src/time/gettimeofday.h b/libc/src/time/gettimeofday.h
index 536d871b858d0..62ee31edcad67 100644
--- a/libc/src/time/gettimeofday.h
+++ b/libc/src/time/gettimeofday.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_TIME_GETTIMEOFDAY_H
#include "hdr/types/struct_timeval.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int gettimeofday(struct timeval *tv, void *tz);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_GETTIMEOFDAY_H
diff --git a/libc/src/time/gmtime.cpp b/libc/src/time/gmtime.cpp
index 6785d18d43e36..8597f2201c4ec 100644
--- a/libc/src/time/gmtime.cpp
+++ b/libc/src/time/gmtime.cpp
@@ -8,14 +8,13 @@
#include "src/time/gmtime.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/time/time_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(struct tm *, gmtime, (const time_t *timer)) {
static struct tm tm_out;
return time_utils::gmtime_internal(timer, &tm_out);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/gmtime.h b/libc/src/time/gmtime.h
index 3de3cebbfde2c..d361eb27febfa 100644
--- a/libc/src/time/gmtime.h
+++ b/libc/src/time/gmtime.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TIME_GMTIME_H
#define LLVM_LIBC_SRC_TIME_GMTIME_H
-#include "src/__support/macros/config.h"
#include <time.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct tm *gmtime(const time_t *timer);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_GMTIME_H
diff --git a/libc/src/time/gmtime_r.cpp b/libc/src/time/gmtime_r.cpp
index d506b526edfb0..15a0c0687158f 100644
--- a/libc/src/time/gmtime_r.cpp
+++ b/libc/src/time/gmtime_r.cpp
@@ -8,14 +8,13 @@
#include "src/time/gmtime_r.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/time/time_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(struct tm *, gmtime_r,
(const time_t *timer, struct tm *result)) {
return time_utils::gmtime_internal(timer, result);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/gmtime_r.h b/libc/src/time/gmtime_r.h
index b4f387ef443bc..f7aac287ecc36 100644
--- a/libc/src/time/gmtime_r.h
+++ b/libc/src/time/gmtime_r.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TIME_GMTIME_R_H
#define LLVM_LIBC_SRC_TIME_GMTIME_R_H
-#include "src/__support/macros/config.h"
#include <time.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct tm *gmtime_r(const time_t *timer, struct tm *result);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_GMTIME_R_H
diff --git a/libc/src/time/gpu/clock.cpp b/libc/src/time/gpu/clock.cpp
index 4cdb1d505aed2..8ddfc27975bba 100644
--- a/libc/src/time/gpu/clock.cpp
+++ b/libc/src/time/gpu/clock.cpp
@@ -7,10 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/time/clock.h"
-#include "src/__support/macros/config.h"
#include "src/time/gpu/time_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(clock_t, clock, ()) {
if (!GPU_CLOCKS_PER_SEC)
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(clock_t, clock, ()) {
return clock_t(ticks * (CLOCKS_PER_SEC / GPU_CLOCKS_PER_SEC));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/gpu/nanosleep.cpp b/libc/src/time/gpu/nanosleep.cpp
index 3f4a609dd40eb..dd669ff46c75c 100644
--- a/libc/src/time/gpu/nanosleep.cpp
+++ b/libc/src/time/gpu/nanosleep.cpp
@@ -8,10 +8,9 @@
#include "src/time/nanosleep.h"
-#include "src/__support/macros/config.h"
#include "time_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
constexpr uint64_t TICKS_PER_SEC = 1000000000UL;
@@ -71,4 +70,4 @@ LLVM_LIBC_FUNCTION(int, nanosleep,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/gpu/time_utils.cpp b/libc/src/time/gpu/time_utils.cpp
index 38e09f600f369..1a674b2fdca2e 100644
--- a/libc/src/time/gpu/time_utils.cpp
+++ b/libc/src/time/gpu/time_utils.cpp
@@ -7,9 +7,8 @@
//===----------------------------------------------------------------------===//
#include "time_utils.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#if defined(LIBC_TARGET_ARCH_IS_AMDGPU)
// This is expected to be initialized by the runtime if the default value is
@@ -19,4 +18,4 @@ namespace LIBC_NAMESPACE_DECL {
gpu::Constant<uint64_t> __llvm_libc_clock_freq = clock_freq;
#endif
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/gpu/time_utils.h b/libc/src/time/gpu/time_utils.h
index c631a38d91ba2..77eeb896f6c37 100644
--- a/libc/src/time/gpu/time_utils.h
+++ b/libc/src/time/gpu/time_utils.h
@@ -12,9 +12,7 @@
#include "hdr/time_macros.h"
#include "hdr/types/clock_t.h"
#include "src/__support/GPU/utils.h"
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#if defined(LIBC_TARGET_ARCH_IS_AMDGPU)
// AMDGPU does not have a single set frequency. Different architectures and
@@ -38,6 +36,6 @@ extern gpu::Constant<uint64_t> __llvm_libc_clock_freq;
#error "Unsupported target"
#endif
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_GPU_TIME_UTILS_H
diff --git a/libc/src/time/linux/clock.cpp b/libc/src/time/linux/clock.cpp
index f43e1bcad6a3a..2c1eee8e5d60a 100644
--- a/libc/src/time/linux/clock.cpp
+++ b/libc/src/time/linux/clock.cpp
@@ -10,12 +10,11 @@
#include "hdr/time_macros.h"
#include "src/__support/CPP/limits.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/time/linux/clock_gettime.h"
#include "src/__support/time/units.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(clock_t, clock, ()) {
using namespace time_units;
@@ -44,4 +43,4 @@ LLVM_LIBC_FUNCTION(clock_t, clock, ()) {
ts.tv_nsec / (1_s_ns / CLOCKS_PER_SEC));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/linux/clock_gettime.cpp b/libc/src/time/linux/clock_gettime.cpp
index a2b20a6dbc987..d7b8cfd245bc4 100644
--- a/libc/src/time/linux/clock_gettime.cpp
+++ b/libc/src/time/linux/clock_gettime.cpp
@@ -8,11 +8,10 @@
#include "src/time/clock_gettime.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/time/linux/clock_gettime.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO(michaelrj): Move this into time/linux with the other syscalls.
LLVM_LIBC_FUNCTION(int, clock_gettime,
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, clock_gettime,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/linux/gettimeofday.cpp b/libc/src/time/linux/gettimeofday.cpp
index 19d9988ae73a6..f868f5ff4d4b3 100644
--- a/libc/src/time/linux/gettimeofday.cpp
+++ b/libc/src/time/linux/gettimeofday.cpp
@@ -10,12 +10,11 @@
#include "hdr/time_macros.h"
#include "hdr/types/suseconds_t.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/time/linux/clock_gettime.h"
#include "src/__support/time/units.h"
#include "src/errno/libc_errno.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO(michaelrj): Move this into time/linux with the other syscalls.
LLVM_LIBC_FUNCTION(int, gettimeofday,
@@ -39,4 +38,4 @@ LLVM_LIBC_FUNCTION(int, gettimeofday,
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/linux/nanosleep.cpp b/libc/src/time/linux/nanosleep.cpp
index b267c3238b01f..bcfe567191f25 100644
--- a/libc/src/time/linux/nanosleep.cpp
+++ b/libc/src/time/linux/nanosleep.cpp
@@ -10,13 +10,12 @@
#include "src/__support/OSUtil/syscall.h" // For syscall functions.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stdint.h> // For int64_t.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, nanosleep,
(const struct timespec *req, struct timespec *rem)) {
@@ -39,4 +38,4 @@ LLVM_LIBC_FUNCTION(int, nanosleep,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/linux/time.cpp b/libc/src/time/linux/time.cpp
index 20fb86e8e29db..32f531efb6d15 100644
--- a/libc/src/time/linux/time.cpp
+++ b/libc/src/time/linux/time.cpp
@@ -8,12 +8,11 @@
#include "hdr/time_macros.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/time/linux/clock_gettime.h"
#include "src/errno/libc_errno.h"
#include "src/time/time_func.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(time_t, time, (time_t * tp)) {
// TODO: Use the Linux VDSO to fetch the time and avoid the syscall.
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(time_t, time, (time_t * tp)) {
return time_t(ts.tv_sec);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/mktime.cpp b/libc/src/time/mktime.cpp
index 9ea316d504f5b..8a4397e5eac7c 100644
--- a/libc/src/time/mktime.cpp
+++ b/libc/src/time/mktime.cpp
@@ -8,10 +8,9 @@
#include "src/time/mktime.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/time/time_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using LIBC_NAMESPACE::time_utils::TimeConstants;
@@ -113,4 +112,4 @@ LLVM_LIBC_FUNCTION(time_t, mktime, (struct tm * tm_out)) {
return static_cast<time_t>(seconds);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/mktime.h b/libc/src/time/mktime.h
index 2b4c67996555e..a50e97c52321b 100644
--- a/libc/src/time/mktime.h
+++ b/libc/src/time/mktime.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_TIME_MKTIME_H
#define LLVM_LIBC_SRC_TIME_MKTIME_H
-#include "src/__support/macros/config.h"
#include <time.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
time_t mktime(struct tm *t1);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_MKTIME_H
diff --git a/libc/src/time/nanosleep.h b/libc/src/time/nanosleep.h
index 11b7ac0e98a8d..2309666b2304b 100644
--- a/libc/src/time/nanosleep.h
+++ b/libc/src/time/nanosleep.h
@@ -10,12 +10,11 @@
#define LLVM_LIBC_SRC_TIME_NANOSLEEP_H
#include "hdr/types/struct_timespec.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int nanosleep(const timespec *req, timespec *rem);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_NANOSLEEP_H
diff --git a/libc/src/time/time_func.h b/libc/src/time/time_func.h
index 9cfd6cdfb461e..2a52392209424 100644
--- a/libc/src/time/time_func.h
+++ b/libc/src/time/time_func.h
@@ -10,14 +10,13 @@
#define LLVM_LIBC_SRC_TIME_TIME_FUNC_H
#include "hdr/types/time_t.h"
-#include "src/__support/macros/config.h"
// Note this header file is named time_func.h to avoid conflicts with the
// public header file time.h.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
time_t time(time_t *tp);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_TIME_FUNC_H
diff --git a/libc/src/time/time_utils.cpp b/libc/src/time/time_utils.cpp
index 509cad8146df8..713ed21e3191d 100644
--- a/libc/src/time/time_utils.cpp
+++ b/libc/src/time/time_utils.cpp
@@ -9,9 +9,8 @@
#include "src/time/time_utils.h"
#include "src/__support/CPP/limits.h" // INT_MIN, INT_MAX
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace time_utils {
using LIBC_NAMESPACE::time_utils::TimeConstants;
@@ -151,4 +150,4 @@ int64_t update_from_seconds(int64_t total_seconds, struct tm *tm) {
}
} // namespace time_utils
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/time/time_utils.h b/libc/src/time/time_utils.h
index 106870af72997..a5da3ad74f343 100644
--- a/libc/src/time/time_utils.h
+++ b/libc/src/time/time_utils.h
@@ -12,13 +12,12 @@
#include <stddef.h> // For size_t.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/time/mktime.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace time_utils {
enum Month : int {
@@ -152,6 +151,6 @@ LIBC_INLINE struct tm *gmtime_internal(const time_t *timer, struct tm *result) {
}
} // namespace time_utils
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_TIME_TIME_UTILS_H
diff --git a/libc/src/unistd/_exit.cpp b/libc/src/unistd/_exit.cpp
index 854bf8b8a0c3c..4b652a2c13fd1 100644
--- a/libc/src/unistd/_exit.cpp
+++ b/libc/src/unistd/_exit.cpp
@@ -9,12 +9,11 @@
#include "src/unistd/_exit.h"
#include "src/__support/OSUtil/exit.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[noreturn]] LLVM_LIBC_FUNCTION(void, _exit, (int status)) {
internal::exit(status);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/_exit.h b/libc/src/unistd/_exit.h
index e00e27cfe253f..141b875321891 100644
--- a/libc/src/unistd/_exit.h
+++ b/libc/src/unistd/_exit.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD__EXIT_H
#define LLVM_LIBC_SRC_UNISTD__EXIT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
[[noreturn]] void _exit(int status);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD__EXIT_H
diff --git a/libc/src/unistd/access.h b/libc/src/unistd/access.h
index 1471224948e5e..7623c853091fd 100644
--- a/libc/src/unistd/access.h
+++ b/libc/src/unistd/access.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_ACCESS_H
#define LLVM_LIBC_SRC_UNISTD_ACCESS_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int access(const char *path, int mode);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_ACCESS_H
diff --git a/libc/src/unistd/chdir.h b/libc/src/unistd/chdir.h
index db2b4dae9db69..ca1dd356b7cfe 100644
--- a/libc/src/unistd/chdir.h
+++ b/libc/src/unistd/chdir.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_CHDIR_H
#define LLVM_LIBC_SRC_UNISTD_CHDIR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int chdir(const char *path);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_CHDIR_H
diff --git a/libc/src/unistd/close.h b/libc/src/unistd/close.h
index 599be831c0e60..02e01c24120a0 100644
--- a/libc/src/unistd/close.h
+++ b/libc/src/unistd/close.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_CLOSE_H
#define LLVM_LIBC_SRC_UNISTD_CLOSE_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int close(int fd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_CLOSE_H
diff --git a/libc/src/unistd/dup.h b/libc/src/unistd/dup.h
index 63f093c0ee436..d6daa5a9ad74d 100644
--- a/libc/src/unistd/dup.h
+++ b/libc/src/unistd/dup.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_DUP_H
#define LLVM_LIBC_SRC_UNISTD_DUP_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int dup(int fd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_DUP_H
diff --git a/libc/src/unistd/dup2.h b/libc/src/unistd/dup2.h
index 060c112daf08f..ba8c5f4b16010 100644
--- a/libc/src/unistd/dup2.h
+++ b/libc/src/unistd/dup2.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_DUP2_H
#define LLVM_LIBC_SRC_UNISTD_DUP2_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int dup2(int oldfd, int newfd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_DUP2_H
diff --git a/libc/src/unistd/dup3.h b/libc/src/unistd/dup3.h
index f3868867123b4..2b1082403daff 100644
--- a/libc/src/unistd/dup3.h
+++ b/libc/src/unistd/dup3.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_DUP3_H
#define LLVM_LIBC_SRC_UNISTD_DUP3_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int dup3(int oldfd, int newfd, int flags);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_DUP3_H
diff --git a/libc/src/unistd/environ.cpp b/libc/src/unistd/environ.cpp
index db7faef63e0a4..2266c7203273d 100644
--- a/libc/src/unistd/environ.cpp
+++ b/libc/src/unistd/environ.cpp
@@ -6,13 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This is initialized to the correct value by the statup code.
extern "C" {
char **environ = nullptr;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/environ.h b/libc/src/unistd/environ.h
index af989675216c2..c09a04f99f883 100644
--- a/libc/src/unistd/environ.h
+++ b/libc/src/unistd/environ.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_ENVIRON_H
#define LLVM_LIBC_SRC_UNISTD_ENVIRON_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" char **environ;
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_ENVIRON_H
diff --git a/libc/src/unistd/execv.h b/libc/src/unistd/execv.h
index 86bf99978af4c..7ff366464b4c8 100644
--- a/libc/src/unistd/execv.h
+++ b/libc/src/unistd/execv.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_EXECV_H
#define LLVM_LIBC_SRC_UNISTD_EXECV_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int execv(const char *path, char *const argv[]);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_EXECV_H
diff --git a/libc/src/unistd/execve.h b/libc/src/unistd/execve.h
index fe3b93076017a..0054a47d4ddd7 100644
--- a/libc/src/unistd/execve.h
+++ b/libc/src/unistd/execve.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_EXECVE_H
#define LLVM_LIBC_SRC_UNISTD_EXECVE_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int execve(const char *path, char *const argv[], char *const envp[]);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_EXECVE_H
diff --git a/libc/src/unistd/fchdir.h b/libc/src/unistd/fchdir.h
index 8d1a53bc3f115..267785c919f55 100644
--- a/libc/src/unistd/fchdir.h
+++ b/libc/src/unistd/fchdir.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_FCHDIR_H
#define LLVM_LIBC_SRC_UNISTD_FCHDIR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fchdir(int fd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_FCHDIR_H
diff --git a/libc/src/unistd/fork.h b/libc/src/unistd/fork.h
index b6fd5763b3a5f..6b1b72a7dfc08 100644
--- a/libc/src/unistd/fork.h
+++ b/libc/src/unistd/fork.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_FORK_H
#define LLVM_LIBC_SRC_UNISTD_FORK_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
pid_t fork();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_FORK_H
diff --git a/libc/src/unistd/fpathconf.h b/libc/src/unistd/fpathconf.h
index 610e2429123e5..f3182c8123618 100644
--- a/libc/src/unistd/fpathconf.h
+++ b/libc/src/unistd/fpathconf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_FPATHCONF_H
#define LLVM_LIBC_SRC_UNISTD_FPATHCONF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long fpathconf(int fd, int name);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_FSYNC_H
diff --git a/libc/src/unistd/fsync.h b/libc/src/unistd/fsync.h
index 5bbf179a9003a..b5742de359d94 100644
--- a/libc/src/unistd/fsync.h
+++ b/libc/src/unistd/fsync.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_FSYNC_H
#define LLVM_LIBC_SRC_UNISTD_FSYNC_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int fsync(int fd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_FSYNC_H
diff --git a/libc/src/unistd/ftruncate.h b/libc/src/unistd/ftruncate.h
index cd8d363727c4a..5508ef0718e94 100644
--- a/libc/src/unistd/ftruncate.h
+++ b/libc/src/unistd/ftruncate.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_FTRUNCATE_H
#define LLVM_LIBC_SRC_UNISTD_FTRUNCATE_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int ftruncate(int, off_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_FTRUNCATE_H
diff --git a/libc/src/unistd/getcwd.h b/libc/src/unistd/getcwd.h
index 8b63a91c26b5c..ab7038e453276 100644
--- a/libc/src/unistd/getcwd.h
+++ b/libc/src/unistd/getcwd.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_GETCWD_H
#define LLVM_LIBC_SRC_UNISTD_GETCWD_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
char *getcwd(char *buf, size_t size);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_GETCWD_H
diff --git a/libc/src/unistd/geteuid.h b/libc/src/unistd/geteuid.h
index 9469797bd3d4e..f19cbaefd5792 100644
--- a/libc/src/unistd/geteuid.h
+++ b/libc/src/unistd/geteuid.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_GETEUID_H
#define LLVM_LIBC_SRC_UNISTD_GETEUID_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
uid_t geteuid();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_GETEUID_H
diff --git a/libc/src/unistd/getopt.cpp b/libc/src/unistd/getopt.cpp
index 0dba01f6bde07..2a05500b2d74f 100644
--- a/libc/src/unistd/getopt.cpp
+++ b/libc/src/unistd/getopt.cpp
@@ -11,7 +11,6 @@
#include "src/__support/CPP/string_view.h"
#include "src/__support/File/file.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/fprintf.h"
#include "hdr/types/FILE.h"
@@ -20,7 +19,7 @@
// just the re-ordering of argv elements such that unknown arguments can be
// easily iterated over.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename T> struct RefWrapper {
RefWrapper() = delete;
@@ -203,4 +202,4 @@ LLVM_LIBC_FUNCTION(int, getopt,
return getopt_r(argc, argv, optstring, impl::ctx);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/getopt.h b/libc/src/unistd/getopt.h
index 1be3331dcd98a..fe8ae5ff5b91c 100644
--- a/libc/src/unistd/getopt.h
+++ b/libc/src/unistd/getopt.h
@@ -10,10 +10,9 @@
#define LLVM_LIBC_SRC_UNISTD_GETOPT_H
#include "hdr/types/FILE.h"
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace impl {
void set_getopt_state(char **, int *, int *, unsigned *, int *, FILE *);
@@ -21,6 +20,6 @@ void set_getopt_state(char **, int *, int *, unsigned *, int *, FILE *);
int getopt(int argc, char *const argv[], const char *optstring);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_GETOPT_H
diff --git a/libc/src/unistd/getpid.h b/libc/src/unistd/getpid.h
index c3c55b0c06b10..5890dbf63681a 100644
--- a/libc/src/unistd/getpid.h
+++ b/libc/src/unistd/getpid.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_GETPID_H
#define LLVM_LIBC_SRC_UNISTD_GETPID_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
pid_t getpid();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_GETPID_H
diff --git a/libc/src/unistd/getppid.h b/libc/src/unistd/getppid.h
index d820791bc06fa..a09c7ca224187 100644
--- a/libc/src/unistd/getppid.h
+++ b/libc/src/unistd/getppid.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_GETPPID_H
#define LLVM_LIBC_SRC_UNISTD_GETPPID_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
pid_t getppid();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_GETPPID_H
diff --git a/libc/src/unistd/getuid.h b/libc/src/unistd/getuid.h
index dd82c7119d401..35163783518c7 100644
--- a/libc/src/unistd/getuid.h
+++ b/libc/src/unistd/getuid.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_GETUID_H
#define LLVM_LIBC_SRC_UNISTD_GETUID_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
uid_t getuid();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_GETUID_H
diff --git a/libc/src/unistd/isatty.h b/libc/src/unistd/isatty.h
index 6dd1b7b817171..90a169730fe04 100644
--- a/libc/src/unistd/isatty.h
+++ b/libc/src/unistd/isatty.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_ISATTY_H
#define LLVM_LIBC_SRC_UNISTD_ISATTY_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int isatty(int fd);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_ISATTY_H
diff --git a/libc/src/unistd/link.h b/libc/src/unistd/link.h
index 9b27aa1accf4e..a95111f3a7f96 100644
--- a/libc/src/unistd/link.h
+++ b/libc/src/unistd/link.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_LINK_H
#define LLVM_LIBC_SRC_UNISTD_LINK_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int link(const char *, const char *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_LINK_H
diff --git a/libc/src/unistd/linkat.h b/libc/src/unistd/linkat.h
index bb03e31b95176..c53b87e5d1194 100644
--- a/libc/src/unistd/linkat.h
+++ b/libc/src/unistd/linkat.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_LINKAT_H
#define LLVM_LIBC_SRC_UNISTD_LINKAT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int linkat(int, const char *, int, const char *, int);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_LINKAT_H
diff --git a/libc/src/unistd/linux/access.cpp b/libc/src/unistd/linux/access.cpp
index e9ad74989b056..f062ad43e75ff 100644
--- a/libc/src/unistd/linux/access.cpp
+++ b/libc/src/unistd/linux/access.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, access, (const char *path, int mode)) {
#ifdef SYS_access
@@ -35,4 +34,4 @@ LLVM_LIBC_FUNCTION(int, access, (const char *path, int mode)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/chdir.cpp b/libc/src/unistd/linux/chdir.cpp
index a30d1dc883be8..61d44ff1c8088 100644
--- a/libc/src/unistd/linux/chdir.cpp
+++ b/libc/src/unistd/linux/chdir.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, chdir, (const char *path)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_chdir, path);
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, chdir, (const char *path)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/close.cpp b/libc/src/unistd/linux/close.cpp
index 58d42a9673fbe..084334861abdc 100644
--- a/libc/src/unistd/linux/close.cpp
+++ b/libc/src/unistd/linux/close.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, close, (int fd)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_close, fd);
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, close, (int fd)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/dup.cpp b/libc/src/unistd/linux/dup.cpp
index c1710a37f6119..a2e7d3fdec429 100644
--- a/libc/src/unistd/linux/dup.cpp
+++ b/libc/src/unistd/linux/dup.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, dup, (int fd)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_dup, fd);
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, dup, (int fd)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/dup2.cpp b/libc/src/unistd/linux/dup2.cpp
index 51a19a71a7d85..f6804e2deca5c 100644
--- a/libc/src/unistd/linux/dup2.cpp
+++ b/libc/src/unistd/linux/dup2.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, dup2, (int oldfd, int newfd)) {
#ifdef SYS_dup2
@@ -53,4 +52,4 @@ LLVM_LIBC_FUNCTION(int, dup2, (int oldfd, int newfd)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/dup3.cpp b/libc/src/unistd/linux/dup3.cpp
index c096ba73c96bd..bf2c25728ca6a 100644
--- a/libc/src/unistd/linux/dup3.cpp
+++ b/libc/src/unistd/linux/dup3.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, dup3, (int oldfd, int newfd, int flags)) {
// If dup2 syscall is available, we make use of directly.
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, dup3, (int oldfd, int newfd, int flags)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/execv.cpp b/libc/src/unistd/linux/execv.cpp
index a3f2525ed7ca1..bd134ca523c77 100644
--- a/libc/src/unistd/linux/execv.cpp
+++ b/libc/src/unistd/linux/execv.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/execv.h"
-#include "src/__support/macros/config.h"
#include "src/unistd/environ.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
@@ -16,7 +15,7 @@
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, execv, (const char *path, char *const argv[])) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_execve, path, argv,
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, execv, (const char *path, char *const argv[])) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/execve.cpp b/libc/src/unistd/linux/execve.cpp
index 37162c4121782..b6de0a400c440 100644
--- a/libc/src/unistd/linux/execve.cpp
+++ b/libc/src/unistd/linux/execve.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/execve.h"
-#include "src/__support/macros/config.h"
#include "src/unistd/environ.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
@@ -16,7 +15,7 @@
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, execve,
(const char *path, char *const argv[], char *const envp[])) {
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(int, execve,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/fchdir.cpp b/libc/src/unistd/linux/fchdir.cpp
index 8196dc63ab1e1..d24b9badfe448 100644
--- a/libc/src/unistd/linux/fchdir.cpp
+++ b/libc/src/unistd/linux/fchdir.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fchdir, (int fd)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_fchdir, fd);
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, fchdir, (int fd)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/fork.cpp b/libc/src/unistd/linux/fork.cpp
index 7d47665b16d3f..6fa2b990b19a9 100644
--- a/libc/src/unistd/linux/fork.cpp
+++ b/libc/src/unistd/linux/fork.cpp
@@ -10,7 +10,6 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/fork_callbacks.h"
#include "src/__support/threads/thread.h" // For thread self object
@@ -18,7 +17,7 @@
#include <signal.h> // For SIGCHLD
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// The implementation of fork here is very minimal. We will add more
// functionality and standard compliance in future.
@@ -52,4 +51,4 @@ LLVM_LIBC_FUNCTION(pid_t, fork, (void)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/fpathconf.cpp b/libc/src/unistd/linux/fpathconf.cpp
index 8e0c8bcdfc22f..6643ed1cc9e88 100644
--- a/libc/src/unistd/linux/fpathconf.cpp
+++ b/libc/src/unistd/linux/fpathconf.cpp
@@ -9,11 +9,10 @@
#include "src/unistd/fpathconf.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/sys/statvfs/linux/statfs_utils.h"
#include "src/unistd/linux/pathconf_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, fpathconf, (int fd, int name)) {
if (cpp::optional<statfs_utils::LinuxStatFs> result =
@@ -22,4 +21,4 @@ LLVM_LIBC_FUNCTION(long, fpathconf, (int fd, int name)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/fsync.cpp b/libc/src/unistd/linux/fsync.cpp
index ae3895bab15f3..44d504ec459e3 100644
--- a/libc/src/unistd/linux/fsync.cpp
+++ b/libc/src/unistd/linux/fsync.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, fsync, (int fd)) {
int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_fsync, fd);
@@ -26,4 +25,4 @@ LLVM_LIBC_FUNCTION(int, fsync, (int fd)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/ftruncate.cpp b/libc/src/unistd/linux/ftruncate.cpp
index 39cb3b5778faa..795bb98ceae0c 100644
--- a/libc/src/unistd/linux/ftruncate.cpp
+++ b/libc/src/unistd/linux/ftruncate.cpp
@@ -11,13 +11,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stdint.h> // For uint64_t.
#include <sys/syscall.h> // For syscall numbers.
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, ftruncate, (int fd, off_t len)) {
#ifdef SYS_ftruncate
@@ -38,4 +37,4 @@ LLVM_LIBC_FUNCTION(int, ftruncate, (int fd, off_t len)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/getcwd.cpp b/libc/src/unistd/linux/getcwd.cpp
index a10c5004d0e06..11c58f1585564 100644
--- a/libc/src/unistd/linux/getcwd.cpp
+++ b/libc/src/unistd/linux/getcwd.cpp
@@ -10,7 +10,6 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/string/allocating_string_utils.h" // For strdup.
#include "src/errno/libc_errno.h"
@@ -18,7 +17,7 @@
#include <stdlib.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace {
@@ -64,4 +63,4 @@ LLVM_LIBC_FUNCTION(char *, getcwd, (char *buf, size_t size)) {
return buf;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/geteuid.cpp b/libc/src/unistd/linux/geteuid.cpp
index a4bbcc0cb312a..2a7f163fb8cd4 100644
--- a/libc/src/unistd/linux/geteuid.cpp
+++ b/libc/src/unistd/linux/geteuid.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(uid_t, geteuid, ()) {
return LIBC_NAMESPACE::syscall_impl<uid_t>(SYS_geteuid);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/getpid.cpp b/libc/src/unistd/linux/getpid.cpp
index b24c86a15990f..85730738ca2ef 100644
--- a/libc/src/unistd/linux/getpid.cpp
+++ b/libc/src/unistd/linux/getpid.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(pid_t, getpid, ()) {
return LIBC_NAMESPACE::syscall_impl<pid_t>(SYS_getpid);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/getppid.cpp b/libc/src/unistd/linux/getppid.cpp
index c55329daa9f9d..7ee11f32fd008 100644
--- a/libc/src/unistd/linux/getppid.cpp
+++ b/libc/src/unistd/linux/getppid.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(pid_t, getppid, ()) {
return LIBC_NAMESPACE::syscall_impl<pid_t>(SYS_getppid);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/getuid.cpp b/libc/src/unistd/linux/getuid.cpp
index ce818ec91bd2a..c8131803c84aa 100644
--- a/libc/src/unistd/linux/getuid.cpp
+++ b/libc/src/unistd/linux/getuid.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(uid_t, getuid, ()) {
return LIBC_NAMESPACE::syscall_impl<uid_t>(SYS_getuid);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/isatty.cpp b/libc/src/unistd/linux/isatty.cpp
index e6ea22a714c78..205013897525b 100644
--- a/libc/src/unistd/linux/isatty.cpp
+++ b/libc/src/unistd/linux/isatty.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/ioctl.h> // For ioctl numbers.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, isatty, (int fd)) {
constexpr int INIT_VAL = 0x1234abcd;
@@ -32,4 +31,4 @@ LLVM_LIBC_FUNCTION(int, isatty, (int fd)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/link.cpp b/libc/src/unistd/linux/link.cpp
index 37ca58eab1096..b5024ad7a59fb 100644
--- a/libc/src/unistd/linux/link.cpp
+++ b/libc/src/unistd/linux/link.cpp
@@ -10,13 +10,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, link, (const char *path1, const char *path2)) {
#ifdef SYS_link
@@ -34,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, link, (const char *path1, const char *path2)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/linkat.cpp b/libc/src/unistd/linux/linkat.cpp
index fcd6a5f75a196..c5d071ee83e01 100644
--- a/libc/src/unistd/linux/linkat.cpp
+++ b/libc/src/unistd/linux/linkat.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, linkat,
(int fd1, const char *path1, int fd2, const char *path2,
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(int, linkat,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/lseek.cpp b/libc/src/unistd/linux/lseek.cpp
index 9486cecf3b123..6f3d9937db245 100644
--- a/libc/src/unistd/linux/lseek.cpp
+++ b/libc/src/unistd/linux/lseek.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/lseek.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/__support/File/linux/lseekImpl.h"
@@ -17,7 +16,7 @@
#include <sys/syscall.h> // For syscall numbers.
#include <unistd.h> // For off_t.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(off_t, lseek, (int fd, off_t offset, int whence)) {
auto result = internal::lseekimpl(fd, offset, whence);
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(off_t, lseek, (int fd, off_t offset, int whence)) {
return result.value();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/pathconf.cpp b/libc/src/unistd/linux/pathconf.cpp
index ca1c10bb9f7f6..11427698232b5 100644
--- a/libc/src/unistd/linux/pathconf.cpp
+++ b/libc/src/unistd/linux/pathconf.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/unistd/pathconf.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/sys/statvfs/linux/statfs_utils.h"
#include "src/unistd/linux/pathconf_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, pathconf, (const char *path, int name)) {
if (cpp::optional<statfs_utils::LinuxStatFs> result =
@@ -21,4 +20,4 @@ LLVM_LIBC_FUNCTION(long, pathconf, (const char *path, int name)) {
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/pathconf_utils.cpp b/libc/src/unistd/linux/pathconf_utils.cpp
index 035e628dff253..3f963ab5aaaf7 100644
--- a/libc/src/unistd/linux/pathconf_utils.cpp
+++ b/libc/src/unistd/linux/pathconf_utils.cpp
@@ -14,7 +14,6 @@
#include "hdr/unistd_macros.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/sys/statvfs/linux/statfs_utils.h"
@@ -28,7 +27,7 @@
#endif
#include <linux/magic.h> // For common FS magics
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long filesizebits(const statfs_utils::LinuxStatFs &s) {
switch (s.f_type) {
@@ -125,4 +124,4 @@ long pathconfig(const statfs_utils::LinuxStatFs &s, int name) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/pathconf_utils.h b/libc/src/unistd/linux/pathconf_utils.h
index bd34de23cc38e..2c0ec0ea292f4 100644
--- a/libc/src/unistd/linux/pathconf_utils.h
+++ b/libc/src/unistd/linux/pathconf_utils.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_PATHCONF_UTILS_H
#define LLVM_LIBC_SRC_UNISTD_PATHCONF_UTILS_H
-#include "src/__support/macros/config.h"
#include "src/sys/statvfs/linux/statfs_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long pathconfig(const statfs_utils::LinuxStatFs &s, int name);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_PREAD_H
diff --git a/libc/src/unistd/linux/pipe.cpp b/libc/src/unistd/linux/pipe.cpp
index dfcd5bfdaf537..8cfb8d1d5c2c1 100644
--- a/libc/src/unistd/linux/pipe.cpp
+++ b/libc/src/unistd/linux/pipe.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/sanitizer.h" // for MSAN_UNPOISON
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pipe, (int pipefd[2])) {
#ifdef SYS_pipe
@@ -33,4 +32,4 @@ LLVM_LIBC_FUNCTION(int, pipe, (int pipefd[2])) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/pread.cpp b/libc/src/unistd/linux/pread.cpp
index 3e27857f9a2b4..247a7b4d9d509 100644
--- a/libc/src/unistd/linux/pread.cpp
+++ b/libc/src/unistd/linux/pread.cpp
@@ -10,13 +10,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/sanitizer.h" // for MSAN_UNPOISON
#include "src/errno/libc_errno.h"
#include <stdint.h> // For uint64_t.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ssize_t, pread,
(int fd, void *buf, size_t count, off_t offset)) {
@@ -45,4 +44,4 @@ LLVM_LIBC_FUNCTION(ssize_t, pread,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/pwrite.cpp b/libc/src/unistd/linux/pwrite.cpp
index 1b81b2a059494..b0540a09710e7 100644
--- a/libc/src/unistd/linux/pwrite.cpp
+++ b/libc/src/unistd/linux/pwrite.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stdint.h> // For uint64_t.
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ssize_t, pwrite,
(int fd, const void *buf, size_t count, off_t offset)) {
@@ -44,4 +43,4 @@ LLVM_LIBC_FUNCTION(ssize_t, pwrite,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/read.cpp b/libc/src/unistd/linux/read.cpp
index 4419900f2330e..41be1eb10c0de 100644
--- a/libc/src/unistd/linux/read.cpp
+++ b/libc/src/unistd/linux/read.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/sanitizer.h" // for MSAN_UNPOISON
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ssize_t, read, (int fd, void *buf, size_t count)) {
ssize_t ret = LIBC_NAMESPACE::syscall_impl<ssize_t>(SYS_read, fd, buf, count);
@@ -29,4 +28,4 @@ LLVM_LIBC_FUNCTION(ssize_t, read, (int fd, void *buf, size_t count)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/readlink.cpp b/libc/src/unistd/linux/readlink.cpp
index 7b15245004405..8dee58c8f215f 100644
--- a/libc/src/unistd/linux/readlink.cpp
+++ b/libc/src/unistd/linux/readlink.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ssize_t, readlink,
(const char *__restrict path, char *__restrict buf,
@@ -37,4 +36,4 @@ LLVM_LIBC_FUNCTION(ssize_t, readlink,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/readlinkat.cpp b/libc/src/unistd/linux/readlinkat.cpp
index 19a9ff9fbeb72..479735d4f4d3d 100644
--- a/libc/src/unistd/linux/readlinkat.cpp
+++ b/libc/src/unistd/linux/readlinkat.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ssize_t, readlinkat,
(int fd, const char *__restrict path, char *__restrict buf,
@@ -30,4 +29,4 @@ LLVM_LIBC_FUNCTION(ssize_t, readlinkat,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/rmdir.cpp b/libc/src/unistd/linux/rmdir.cpp
index 8974468ebcf16..234b0c3a09408 100644
--- a/libc/src/unistd/linux/rmdir.cpp
+++ b/libc/src/unistd/linux/rmdir.cpp
@@ -10,13 +10,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, rmdir, (const char *path)) {
#ifdef SYS_rmdir
@@ -35,4 +34,4 @@ LLVM_LIBC_FUNCTION(int, rmdir, (const char *path)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/symlink.cpp b/libc/src/unistd/linux/symlink.cpp
index 5efd4df85edab..e8983e252b8e3 100644
--- a/libc/src/unistd/linux/symlink.cpp
+++ b/libc/src/unistd/linux/symlink.cpp
@@ -10,13 +10,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, symlink, (const char *path1, const char *path2)) {
#ifdef SYS_symlink
@@ -34,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, symlink, (const char *path1, const char *path2)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/symlinkat.cpp b/libc/src/unistd/linux/symlinkat.cpp
index 63d2e6d1507a5..64f02d13f9a0c 100644
--- a/libc/src/unistd/linux/symlinkat.cpp
+++ b/libc/src/unistd/linux/symlinkat.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, symlinkat,
(const char *path1, int fd, const char *path2)) {
@@ -28,4 +27,4 @@ LLVM_LIBC_FUNCTION(int, symlinkat,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/syscall.cpp b/libc/src/unistd/linux/syscall.cpp
index 5394bff46adfa..e0070fe6d805e 100644
--- a/libc/src/unistd/linux/syscall.cpp
+++ b/libc/src/unistd/linux/syscall.cpp
@@ -11,11 +11,10 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stdarg.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, __llvm_libc_syscall,
(long number, long arg1, long arg2, long arg3, long arg4,
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(long, __llvm_libc_syscall,
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/sysconf.cpp b/libc/src/unistd/linux/sysconf.cpp
index 1540eb499ec12..d4577c8d3d769 100644
--- a/libc/src/unistd/linux/sysconf.cpp
+++ b/libc/src/unistd/linux/sysconf.cpp
@@ -10,13 +10,12 @@
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include "src/sys/auxv/getauxval.h"
#include <sys/auxv.h>
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(long, sysconf, (int name)) {
long ret = 0;
@@ -31,4 +30,4 @@ LLVM_LIBC_FUNCTION(long, sysconf, (int name)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/truncate.cpp b/libc/src/unistd/linux/truncate.cpp
index 283cf4098cf45..0120cc738a921 100644
--- a/libc/src/unistd/linux/truncate.cpp
+++ b/libc/src/unistd/linux/truncate.cpp
@@ -10,14 +10,13 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <stdint.h> // For uint64_t.
#include <sys/syscall.h> // For syscall numbers.
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, truncate, (const char *path, off_t len)) {
#ifdef SYS_truncate
@@ -37,4 +36,4 @@ LLVM_LIBC_FUNCTION(int, truncate, (const char *path, off_t len)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/unlink.cpp b/libc/src/unistd/linux/unlink.cpp
index de7cae8b826eb..e62fb8faa67af 100644
--- a/libc/src/unistd/linux/unlink.cpp
+++ b/libc/src/unistd/linux/unlink.cpp
@@ -11,12 +11,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, unlink, (const char *path)) {
#ifdef SYS_unlink
@@ -34,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, unlink, (const char *path)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/unlinkat.cpp b/libc/src/unistd/linux/unlinkat.cpp
index e794f242b9459..4ec5e38cb405c 100644
--- a/libc/src/unistd/linux/unlinkat.cpp
+++ b/libc/src/unistd/linux/unlinkat.cpp
@@ -10,13 +10,12 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <fcntl.h>
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, unlinkat, (int dfd, const char *path, int flags)) {
#ifdef SYS_unlinkat
@@ -32,4 +31,4 @@ LLVM_LIBC_FUNCTION(int, unlinkat, (int dfd, const char *path, int flags)) {
return 0;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/linux/write.cpp b/libc/src/unistd/linux/write.cpp
index 99d5ab7e480b0..bd6c9114f7877 100644
--- a/libc/src/unistd/linux/write.cpp
+++ b/libc/src/unistd/linux/write.cpp
@@ -10,12 +10,11 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/errno/libc_errno.h"
#include <sys/syscall.h> // For syscall numbers.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(ssize_t, write, (int fd, const void *buf, size_t count)) {
ssize_t ret =
@@ -27,4 +26,4 @@ LLVM_LIBC_FUNCTION(ssize_t, write, (int fd, const void *buf, size_t count)) {
return ret;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/lseek.h b/libc/src/unistd/lseek.h
index a8704ec7058dd..75e33d8a6987d 100644
--- a/libc/src/unistd/lseek.h
+++ b/libc/src/unistd/lseek.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_LSEEK_H
#define LLVM_LIBC_SRC_UNISTD_LSEEK_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
off_t lseek(int fd, off_t offset, int whence);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_LSEEK_H
diff --git a/libc/src/unistd/pathconf.h b/libc/src/unistd/pathconf.h
index d6b891ea8be68..6543d738a9b22 100644
--- a/libc/src/unistd/pathconf.h
+++ b/libc/src/unistd/pathconf.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_PATHCONF_H
#define LLVM_LIBC_SRC_UNISTD_PATHCONF_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long pathconf(const char *path, int name);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_PREAD_H
diff --git a/libc/src/unistd/pipe.h b/libc/src/unistd/pipe.h
index d5cccf3ad7b18..0e20bb49c0584 100644
--- a/libc/src/unistd/pipe.h
+++ b/libc/src/unistd/pipe.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_PIPE_H
#define LLVM_LIBC_SRC_UNISTD_PIPE_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int pipe(int pipefd[2]);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_PIPE_H
diff --git a/libc/src/unistd/pread.h b/libc/src/unistd/pread.h
index 4723675e82a20..6ecfef4c82c60 100644
--- a/libc/src/unistd/pread.h
+++ b/libc/src/unistd/pread.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_PREAD_H
#define LLVM_LIBC_SRC_UNISTD_PREAD_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ssize_t pread(int fd, void *buf, size_t count, off_t offset);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_PREAD_H
diff --git a/libc/src/unistd/pwrite.h b/libc/src/unistd/pwrite.h
index baffbe48b6437..535c9217c2353 100644
--- a/libc/src/unistd/pwrite.h
+++ b/libc/src/unistd/pwrite.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_PWRITE_H
#define LLVM_LIBC_SRC_UNISTD_PWRITE_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_PWRITE_H
diff --git a/libc/src/unistd/read.h b/libc/src/unistd/read.h
index 01231cb82e35e..05a56a2fdeaeb 100644
--- a/libc/src/unistd/read.h
+++ b/libc/src/unistd/read.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_READ_H
#define LLVM_LIBC_SRC_UNISTD_READ_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ssize_t read(int fd, void *buf, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_READ_H
diff --git a/libc/src/unistd/readlink.h b/libc/src/unistd/readlink.h
index a73e9740c7463..c93c430988c79 100644
--- a/libc/src/unistd/readlink.h
+++ b/libc/src/unistd/readlink.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_READLINK_H
#define LLVM_LIBC_SRC_UNISTD_READLINK_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ssize_t readlink(const char *__restrict, char *__restrict, size_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_READLINK_H
diff --git a/libc/src/unistd/readlinkat.h b/libc/src/unistd/readlinkat.h
index 6bdd48b537fc8..a4357efec1a1b 100644
--- a/libc/src/unistd/readlinkat.h
+++ b/libc/src/unistd/readlinkat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_READLINKAT_H
#define LLVM_LIBC_SRC_UNISTD_READLINKAT_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ssize_t readlinkat(int, const char *__restrict, char *__restrict, size_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_READLINKAT_H
diff --git a/libc/src/unistd/rmdir.h b/libc/src/unistd/rmdir.h
index abf5bf720f307..55dcbafe1f7df 100644
--- a/libc/src/unistd/rmdir.h
+++ b/libc/src/unistd/rmdir.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_RMDIR_H
#define LLVM_LIBC_SRC_UNISTD_RMDIR_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int rmdir(const char *path);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_RMDIR_H
diff --git a/libc/src/unistd/swab.cpp b/libc/src/unistd/swab.cpp
index 643079a40ab5c..5c2f5074ff978 100644
--- a/libc/src/unistd/swab.cpp
+++ b/libc/src/unistd/swab.cpp
@@ -9,9 +9,8 @@
#include "src/unistd/swab.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void, swab,
(const void *__restrict from, void *__restrict to,
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(void, swab,
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/unistd/swab.h b/libc/src/unistd/swab.h
index caa9c71001097..0a6aa49540b5b 100644
--- a/libc/src/unistd/swab.h
+++ b/libc/src/unistd/swab.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_SWAB_H
#define LLVM_LIBC_SRC_UNISTD_SWAB_H
-#include "src/__support/macros/config.h"
#include <unistd.h> // For ssize_t
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
void swab(const void *__restrict from, void *__restrict to, ssize_t n);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_SWAB_H
diff --git a/libc/src/unistd/symlink.h b/libc/src/unistd/symlink.h
index 47f04f8845b46..0a0124ccbc7ab 100644
--- a/libc/src/unistd/symlink.h
+++ b/libc/src/unistd/symlink.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_SYMLINK_H
#define LLVM_LIBC_SRC_UNISTD_SYMLINK_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int symlink(const char *, const char *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_SYMLINK_H
diff --git a/libc/src/unistd/symlinkat.h b/libc/src/unistd/symlinkat.h
index 9f8ad517af5a6..ecca4380e98eb 100644
--- a/libc/src/unistd/symlinkat.h
+++ b/libc/src/unistd/symlinkat.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_SYMLINKAT_H
#define LLVM_LIBC_SRC_UNISTD_SYMLINKAT_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int symlinkat(const char *, int, const char *);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_SYMLINKAT_H
diff --git a/libc/src/unistd/syscall.h b/libc/src/unistd/syscall.h
index db70745719cfe..a41d9778e0559 100644
--- a/libc/src/unistd/syscall.h
+++ b/libc/src/unistd/syscall.h
@@ -9,15 +9,14 @@
#ifndef LLVM_LIBC_SRC_UNISTD_SYSCALL_H
#define LLVM_LIBC_SRC_UNISTD_SYSCALL_H
-#include "src/__support/macros/config.h"
#include <stdarg.h>
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long __llvm_libc_syscall(long number, long arg1, long arg2, long arg3,
long arg4, long arg5, long arg6);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_SYSCALL_H
diff --git a/libc/src/unistd/sysconf.h b/libc/src/unistd/sysconf.h
index 1b3f39e413508..89c5efa574636 100644
--- a/libc/src/unistd/sysconf.h
+++ b/libc/src/unistd/sysconf.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_SYSCONF_H
#define LLVM_LIBC_SRC_UNISTD_SYSCONF_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
long sysconf(int name);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_SYSCONF_H
diff --git a/libc/src/unistd/truncate.h b/libc/src/unistd/truncate.h
index 9ba5cf8317529..5245b6bf2ed02 100644
--- a/libc/src/unistd/truncate.h
+++ b/libc/src/unistd/truncate.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_TRUNCATE_H
#define LLVM_LIBC_SRC_UNISTD_TRUNCATE_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int truncate(const char *, off_t);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_TRUNCATE_H
diff --git a/libc/src/unistd/unlink.h b/libc/src/unistd/unlink.h
index 71ef19fa22c1b..d1d34fa1a8ac5 100644
--- a/libc/src/unistd/unlink.h
+++ b/libc/src/unistd/unlink.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_UNLINK_H
#define LLVM_LIBC_SRC_UNISTD_UNLINK_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int unlink(const char *path);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_UNLINK_H
diff --git a/libc/src/unistd/unlinkat.h b/libc/src/unistd/unlinkat.h
index 2ce46b8ec8a8b..81d23bdf5cec3 100644
--- a/libc/src/unistd/unlinkat.h
+++ b/libc/src/unistd/unlinkat.h
@@ -9,12 +9,10 @@
#ifndef LLVM_LIBC_SRC_UNISTD_UNLINKAT_H
#define LLVM_LIBC_SRC_UNISTD_UNLINKAT_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int unlinkat(int dfd, const char *path, int flags);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_UNLINKAT_H
diff --git a/libc/src/unistd/write.h b/libc/src/unistd/write.h
index e40ce19e21769..52cdff348085f 100644
--- a/libc/src/unistd/write.h
+++ b/libc/src/unistd/write.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_UNISTD_WRITE_H
#define LLVM_LIBC_SRC_UNISTD_WRITE_H
-#include "src/__support/macros/config.h"
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
ssize_t write(int fd, const void *buf, size_t count);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_UNISTD_WRITE_H
diff --git a/libc/src/wchar/btowc.cpp b/libc/src/wchar/btowc.cpp
index 6e67f1ba02975..ea093bc5f2552 100644
--- a/libc/src/wchar/btowc.cpp
+++ b/libc/src/wchar/btowc.cpp
@@ -8,12 +8,11 @@
#include "src/wchar/btowc.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/wctype_utils.h"
#include "hdr/stdio_macros.h" // for EOF.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, btowc, (wint_t c)) {
auto result = internal::btowc(c);
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, btowc, (wint_t c)) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/wchar/btowc.h b/libc/src/wchar/btowc.h
index 1f41bd68f9c17..de67f157b5729 100644
--- a/libc/src/wchar/btowc.h
+++ b/libc/src/wchar/btowc.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_WCHAR_BTOWC_H
#define LLVM_LIBC_SRC_WCHAR_BTOWC_H
-#include "src/__support/macros/config.h"
#include <wchar.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
wint_t btowc(int c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_WCHAR_BTOWC_H
diff --git a/libc/src/wchar/wctob.cpp b/libc/src/wchar/wctob.cpp
index 33f67feb90b8d..885c526d0d634 100644
--- a/libc/src/wchar/wctob.cpp
+++ b/libc/src/wchar/wctob.cpp
@@ -8,12 +8,11 @@
#include "src/wchar/wctob.h"
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include "src/__support/wctype_utils.h"
#include "hdr/stdio_macros.h" // for EOF.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, wctob, (wint_t c)) {
auto result = internal::wctob(c);
@@ -24,4 +23,4 @@ LLVM_LIBC_FUNCTION(int, wctob, (wint_t c)) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/wchar/wctob.h b/libc/src/wchar/wctob.h
index 95f349ed8e448..1cc0c211e98a5 100644
--- a/libc/src/wchar/wctob.h
+++ b/libc/src/wchar/wctob.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_SRC_WCHAR_WCTOB_H
#define LLVM_LIBC_SRC_WCHAR_WCTOB_H
-#include "src/__support/macros/config.h"
#include <wchar.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int wctob(wint_t c);
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_SRC_WCHAR_WCTOB_H
diff --git a/libc/startup/baremetal/fini.cpp b/libc/startup/baremetal/fini.cpp
index 263d7192cc607..745bd094b24fe 100644
--- a/libc/startup/baremetal/fini.cpp
+++ b/libc/startup/baremetal/fini.cpp
@@ -6,11 +6,10 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include <stddef.h>
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" {
extern uintptr_t __fini_array_start[];
@@ -25,4 +24,4 @@ extern "C" void __libc_fini_array(void) {
reinterpret_cast<FiniCallback *>(__fini_array_start[i - 1])();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/startup/baremetal/init.cpp b/libc/startup/baremetal/init.cpp
index ce387017c4972..21ec0e5ca756d 100644
--- a/libc/startup/baremetal/init.cpp
+++ b/libc/startup/baremetal/init.cpp
@@ -6,11 +6,10 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include <stddef.h>
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" {
extern uintptr_t __preinit_array_start[];
@@ -30,4 +29,4 @@ extern "C" void __libc_init_array(void) {
reinterpret_cast<InitCallback *>(__init_array_start[i])();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/startup/gpu/amdgpu/start.cpp b/libc/startup/gpu/amdgpu/start.cpp
index 6bda151023c8f..dcef719d169d0 100644
--- a/libc/startup/gpu/amdgpu/start.cpp
+++ b/libc/startup/gpu/amdgpu/start.cpp
@@ -8,13 +8,12 @@
#include "src/__support/GPU/utils.h"
#include "src/__support/RPC/rpc_client.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/atexit.h"
#include "src/stdlib/exit.h"
extern "C" int main(int argc, char **argv, char **envp);
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" uintptr_t __init_array_start[];
extern "C" uintptr_t __init_array_end[];
@@ -36,7 +35,7 @@ static void call_fini_array_callbacks() {
reinterpret_cast<FiniCallback *>(__fini_array_start[i - 1])();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
extern "C" [[gnu::visibility("protected"), clang::amdgpu_kernel]] void
_begin(int argc, char **argv, char **env) {
diff --git a/libc/startup/gpu/nvptx/start.cpp b/libc/startup/gpu/nvptx/start.cpp
index b1ef944c4aa28..77fe921be4e02 100644
--- a/libc/startup/gpu/nvptx/start.cpp
+++ b/libc/startup/gpu/nvptx/start.cpp
@@ -8,13 +8,12 @@
#include "src/__support/GPU/utils.h"
#include "src/__support/RPC/rpc_client.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/atexit.h"
#include "src/stdlib/exit.h"
extern "C" int main(int argc, char **argv, char **envp);
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
extern "C" {
// Nvidia's 'nvlink' linker does not provide these symbols. We instead need
@@ -42,7 +41,7 @@ static void call_fini_array_callbacks() {
reinterpret_cast<FiniCallback *>(__fini_array_start[i - 1])();
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
extern "C" [[gnu::visibility("protected"), clang::nvptx_kernel]] void
_begin(int argc, char **argv, char **env) {
diff --git a/libc/startup/linux/aarch64/tls.cpp b/libc/startup/linux/aarch64/tls.cpp
index ea1b50c9fb209..9f143f962892d 100644
--- a/libc/startup/linux/aarch64/tls.cpp
+++ b/libc/startup/linux/aarch64/tls.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/__support/OSUtil/syscall.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "startup/linux/do_start.h"
@@ -19,7 +18,7 @@
// Source documentation:
// https://github.com/ARM-software/abi-aa/tree/main/sysvabi64
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#ifdef SYS_mmap2
static constexpr long MMAP_SYSCALL_NUMBER = SYS_mmap2;
@@ -95,4 +94,4 @@ bool set_thread_ptr(uintptr_t val) {
#endif
return true;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/startup/linux/do_start.cpp b/libc/startup/linux/do_start.cpp
index 824c0e1cf8f26..30ab1f0e26ea5 100644
--- a/libc/startup/linux/do_start.cpp
+++ b/libc/startup/linux/do_start.cpp
@@ -8,7 +8,6 @@
#include "startup/linux/do_start.h"
#include "include/llvm-libc-macros/link-macros.h"
#include "src/__support/OSUtil/syscall.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include "src/stdlib/atexit.h"
#include "src/stdlib/exit.h"
@@ -38,7 +37,7 @@ extern uintptr_t __fini_array_end[];
gnu::visibility("hidden")]] extern const Elf64_Dyn _DYNAMIC[]; // NOLINT
}
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
AppProperties app;
using InitCallback = void(int, char **, char **);
@@ -151,4 +150,4 @@ static ThreadAttributes main_thread_attrib;
exit(retval);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/startup/linux/do_start.h b/libc/startup/linux/do_start.h
index dd41c9bd384e7..a0e7a3cd69562 100644
--- a/libc/startup/linux/do_start.h
+++ b/libc/startup/linux/do_start.h
@@ -7,9 +7,8 @@
//===----------------------------------------------------------------------===//
#include "config/linux/app.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// setup the libc runtime and invoke the main routine.
[[noreturn]] void do_start();
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/startup/linux/riscv/tls.cpp b/libc/startup/linux/riscv/tls.cpp
index 04d44e6ca882e..997912c77e737 100644
--- a/libc/startup/linux/riscv/tls.cpp
+++ b/libc/startup/linux/riscv/tls.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/__support/OSUtil/syscall.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/thread.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "startup/linux/do_start.h"
@@ -15,7 +14,7 @@
#include <sys/mman.h>
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#ifdef SYS_mmap2
static constexpr long MMAP_SYSCALL_NUMBER = SYS_mmap2;
@@ -72,4 +71,4 @@ bool set_thread_ptr(uintptr_t val) {
LIBC_INLINE_ASM("mv tp, %0\n\t" : : "r"(val));
return true;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/startup/linux/x86_64/tls.cpp b/libc/startup/linux/x86_64/tls.cpp
index d6b549a2e6c46..8b0fa98736244 100644
--- a/libc/startup/linux/x86_64/tls.cpp
+++ b/libc/startup/linux/x86_64/tls.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/__support/OSUtil/syscall.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/inline_memcpy.h"
#include "startup/linux/do_start.h"
@@ -15,7 +14,7 @@
#include <sys/mman.h>
#include <sys/syscall.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
#ifdef SYS_mmap2
static constexpr long MMAP_SYSCALL_NUMBER = SYS_mmap2;
@@ -91,4 +90,4 @@ void cleanup_tls(uintptr_t addr, uintptr_t size) {
bool set_thread_ptr(uintptr_t val) {
return syscall_impl(SYS_arch_prctl, ARCH_SET_FS, val) != -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/IntegrationTest/test.cpp b/libc/test/IntegrationTest/test.cpp
index 871bdf0dc562b..2751f3180a8e3 100644
--- a/libc/test/IntegrationTest/test.cpp
+++ b/libc/test/IntegrationTest/test.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
#include <stdint.h>
@@ -20,7 +19,7 @@
// entrypoint to the internal implementation of the function used for testing.
// This is done manually as not all targets support aliases.
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int bcmp(const void *lhs, const void *rhs, size_t count);
void bzero(void *ptr, size_t count);
@@ -30,7 +29,7 @@ void *memmove(void *dst, const void *src, size_t count);
void *memset(void *ptr, int value, size_t count);
int atexit(void (*func)(void));
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
extern "C" {
diff --git a/libc/test/UnitTest/BazelFilePath.cpp b/libc/test/UnitTest/BazelFilePath.cpp
index ee5fcaaa63d91..79730868ecdf3 100644
--- a/libc/test/UnitTest/BazelFilePath.cpp
+++ b/libc/test/UnitTest/BazelFilePath.cpp
@@ -12,10 +12,8 @@
#include "src/__support/CPP/string.h"
#include "src/__support/c_string.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace testing {
+namespace LIBC_NAMESPACE::testing {
CString libc_make_test_file_path_func(const char *file_name) {
// This is the path to the folder bazel wants the test outputs written to.
@@ -24,5 +22,4 @@ CString libc_make_test_file_path_func(const char *file_name) {
return cpp::string(UNDECLARED_OUTPUTS_PATH) + file_name;
}
-} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::testing
diff --git a/libc/test/UnitTest/CmakeFilePath.cpp b/libc/test/UnitTest/CmakeFilePath.cpp
index b7bc5a8573dc8..2a7d1c39d3205 100644
--- a/libc/test/UnitTest/CmakeFilePath.cpp
+++ b/libc/test/UnitTest/CmakeFilePath.cpp
@@ -10,14 +10,11 @@
#include "src/__support/CPP/string.h"
#include "src/__support/c_string.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace testing {
+namespace LIBC_NAMESPACE::testing {
CString libc_make_test_file_path_func(const char *file_name) {
return cpp::string(file_name);
}
-} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::testing
diff --git a/libc/test/UnitTest/ErrnoSetterMatcher.h b/libc/test/UnitTest/ErrnoSetterMatcher.h
index a895c5044b0ad..745ba4182023e 100644
--- a/libc/test/UnitTest/ErrnoSetterMatcher.h
+++ b/libc/test/UnitTest/ErrnoSetterMatcher.h
@@ -12,12 +12,11 @@
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/fpbits_str.h"
#include "src/__support/StringUtil/error_to_string.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
#include "src/errno/libc_errno.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
namespace internal {
@@ -183,6 +182,6 @@ static ErrnoSetterMatcherBuilder<RetT> returns(internal::Comparator<RetT> cmp) {
} // namespace ErrnoSetterMatcher
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_TEST_ERRNOSETTERMATCHER_H
diff --git a/libc/test/UnitTest/ExecuteFunction.h b/libc/test/UnitTest/ExecuteFunction.h
index 511249be0f3c9..95950567e74a2 100644
--- a/libc/test/UnitTest/ExecuteFunction.h
+++ b/libc/test/UnitTest/ExecuteFunction.h
@@ -9,10 +9,9 @@
#ifndef LLVM_LIBC_TEST_UNITTEST_EXECUTEFUNCTION_H
#define LLVM_LIBC_TEST_UNITTEST_EXECUTEFUNCTION_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testutils {
class FunctionCaller {
@@ -48,6 +47,6 @@ invoke_in_subprocess(FunctionCaller *func,
const char *signal_as_string(int signum);
} // namespace testutils
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_TEST_UNITTEST_EXECUTEFUNCTION_H
diff --git a/libc/test/UnitTest/ExecuteFunctionUnix.cpp b/libc/test/UnitTest/ExecuteFunctionUnix.cpp
index 3a657c00851c7..b244337f9c6fc 100644
--- a/libc/test/UnitTest/ExecuteFunctionUnix.cpp
+++ b/libc/test/UnitTest/ExecuteFunctionUnix.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "ExecuteFunction.h"
-#include "src/__support/macros/config.h"
#include <cassert>
#include <cstdlib>
#include <cstring>
@@ -18,7 +17,7 @@
#include <sys/wait.h>
#include <unistd.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testutils {
bool ProcessStatus::exited_normally() { return WIFEXITED(platform_defined); }
@@ -79,4 +78,4 @@ ProcessStatus invoke_in_subprocess(FunctionCaller *func, unsigned timeout_ms) {
const char *signal_as_string(int signum) { return ::strsignal(signum); }
} // namespace testutils
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/UnitTest/FEnvSafeTest.cpp b/libc/test/UnitTest/FEnvSafeTest.cpp
index 168b1d4159d8d..905aa92893738 100644
--- a/libc/test/UnitTest/FEnvSafeTest.cpp
+++ b/libc/test/UnitTest/FEnvSafeTest.cpp
@@ -9,11 +9,9 @@
#include "FEnvSafeTest.h"
#include "src/__support/FPUtil/FEnvImpl.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/architectures.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace testing {
+namespace LIBC_NAMESPACE::testing {
void FEnvSafeTest::PreserveFEnv::check() {
fenv_t after;
@@ -83,5 +81,4 @@ void FEnvSafeTest::expect_fenv_eq(const fenv_t &before_fenv,
#endif
}
-} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::testing
diff --git a/libc/test/UnitTest/FEnvSafeTest.h b/libc/test/UnitTest/FEnvSafeTest.h
index a3c5e62120bc0..d5a8bb7ee667c 100644
--- a/libc/test/UnitTest/FEnvSafeTest.h
+++ b/libc/test/UnitTest/FEnvSafeTest.h
@@ -11,11 +11,9 @@
#include "hdr/types/fenv_t.h"
#include "src/__support/CPP/utility.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace testing {
+namespace LIBC_NAMESPACE::testing {
// This provides a test fixture (or base class for other test fixtures) that
// asserts that each test does not leave the FPU state represented by `fenv_t`
@@ -98,7 +96,6 @@ class FEnvSafeTest : public Test {
bool should_be_unchanged = false;
};
-} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::testing
#endif // LLVM_LIBC_TEST_UNITTEST_FPENVSAFE_H
diff --git a/libc/test/UnitTest/FPExceptMatcher.cpp b/libc/test/UnitTest/FPExceptMatcher.cpp
index 37ba0a0a7abde..c1dfc53924662 100644
--- a/libc/test/UnitTest/FPExceptMatcher.cpp
+++ b/libc/test/UnitTest/FPExceptMatcher.cpp
@@ -8,7 +8,6 @@
#include "FPExceptMatcher.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
#include "hdr/types/fenv_t.h"
@@ -19,7 +18,7 @@
#if LIBC_TEST_HAS_MATCHERS()
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
#if defined(_WIN32)
@@ -53,6 +52,6 @@ FPExceptMatcher::FPExceptMatcher(FunctionCaller *func) {
}
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_TEST_HAS_MATCHERS()
diff --git a/libc/test/UnitTest/FPExceptMatcher.h b/libc/test/UnitTest/FPExceptMatcher.h
index 978501df7e3ed..5136e381081ee 100644
--- a/libc/test/UnitTest/FPExceptMatcher.h
+++ b/libc/test/UnitTest/FPExceptMatcher.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_TEST_UNITTEST_FPEXCEPTMATCHER_H
#define LLVM_LIBC_TEST_UNITTEST_FPEXCEPTMATCHER_H
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
#include "test/UnitTest/TestLogger.h"
#if LIBC_TEST_HAS_MATCHERS()
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
// TODO: Make the matcher match specific exceptions instead of just identifying
@@ -52,7 +51,7 @@ class FPExceptMatcher : public Matcher<bool> {
};
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#define ASSERT_RAISES_FP_EXCEPT(func) \
ASSERT_THAT( \
diff --git a/libc/test/UnitTest/FPMatcher.h b/libc/test/UnitTest/FPMatcher.h
index 6b50f3d23075a..86b823260e197 100644
--- a/libc/test/UnitTest/FPMatcher.h
+++ b/libc/test/UnitTest/FPMatcher.h
@@ -14,14 +14,13 @@
#include "src/__support/FPUtil/FEnvImpl.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/fpbits_str.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/RoundingModeUtils.h"
#include "test/UnitTest/StringUtils.h"
#include "test/UnitTest/Test.h"
#include "hdr/math_macros.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
template <typename T, TestCond Condition> class FPMatcher : public Matcher<T> {
@@ -88,7 +87,7 @@ template <typename T> struct FPTest : public Test {
};
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#define DECLARE_SPECIAL_CONSTANTS(T) \
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>; \
diff --git a/libc/test/UnitTest/GTest.h b/libc/test/UnitTest/GTest.h
index fd6be9c02fd7c..d1637d3ba6583 100644
--- a/libc/test/UnitTest/GTest.h
+++ b/libc/test/UnitTest/GTest.h
@@ -9,17 +9,14 @@
#ifndef LLVM_LIBC_UTILS_UNITTEST_GTEST_H
#define LLVM_LIBC_UTILS_UNITTEST_GTEST_H
-#include "src/__support/macros/config.h"
#include <gtest/gtest.h>
-namespace LIBC_NAMESPACE_DECL {
-namespace testing {
+namespace LIBC_NAMESPACE::testing {
using ::testing::Matcher;
using ::testing::Test;
-} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::testing
#define LIBC_TEST_HAS_MATCHERS() (1)
diff --git a/libc/test/UnitTest/HermeticTestUtils.cpp b/libc/test/UnitTest/HermeticTestUtils.cpp
index 85e5cf02ff613..ca854ad94393e 100644
--- a/libc/test/UnitTest/HermeticTestUtils.cpp
+++ b/libc/test/UnitTest/HermeticTestUtils.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
#include <stddef.h>
#include <stdint.h>
@@ -15,7 +14,7 @@
#include "src/sys/auxv/getauxval.h"
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int bcmp(const void *lhs, const void *rhs, size_t count);
void bzero(void *ptr, size_t count);
@@ -31,7 +30,7 @@ int atexit(void (*func)(void));
// always returns 0 to indicate a failure.
[[gnu::weak]] unsigned long getauxval(unsigned long id) { return 0; }
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
namespace {
diff --git a/libc/test/UnitTest/LibcDeathTestExecutors.cpp b/libc/test/UnitTest/LibcDeathTestExecutors.cpp
index e43dbb19ad152..fa6d16410bb7a 100644
--- a/libc/test/UnitTest/LibcDeathTestExecutors.cpp
+++ b/libc/test/UnitTest/LibcDeathTestExecutors.cpp
@@ -8,13 +8,12 @@
#include "LibcTest.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/ExecuteFunction.h"
#include "test/UnitTest/TestLogger.h"
#include <cassert>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
bool Test::testProcessKilled(testutils::FunctionCaller *Func, int Signal,
@@ -102,4 +101,4 @@ bool Test::testProcessExits(testutils::FunctionCaller *Func, int ExitCode,
}
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/UnitTest/LibcTest.cpp b/libc/test/UnitTest/LibcTest.cpp
index 72aeaf20e1dac..539a2e4d196e2 100644
--- a/libc/test/UnitTest/LibcTest.cpp
+++ b/libc/test/UnitTest/LibcTest.cpp
@@ -12,7 +12,6 @@
#include "src/__support/CPP/string.h"
#include "src/__support/CPP/string_view.h"
#include "src/__support/fixed_point/fx_rep.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
#include "src/__support/uint128.h"
#include "test/UnitTest/TestLogger.h"
@@ -28,7 +27,7 @@ extern "C" clock_t clock() noexcept { return LIBC_NAMESPACE::clock(); }
#define LIBC_TEST_USE_CLOCK
#endif
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
namespace internal {
@@ -297,4 +296,4 @@ bool Test::testMatch(bool MatchResult, MatcherBase &Matcher, const char *LHSStr,
}
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/UnitTest/LibcTest.h b/libc/test/UnitTest/LibcTest.h
index 2b972004e9eea..42ba37af45834 100644
--- a/libc/test/UnitTest/LibcTest.h
+++ b/libc/test/UnitTest/LibcTest.h
@@ -12,7 +12,6 @@
// This is defined as a simple macro in test.h so that it exists for platforms
// that don't use our test infrastructure. It's defined as a proper function
// below.
-#include "src/__support/macros/config.h"
#ifdef libc_make_test_file_path
#undef libc_make_test_file_path
#endif // libc_make_test_file_path
@@ -33,7 +32,7 @@
#include "test/UnitTest/ExecuteFunction.h"
#include "test/UnitTest/TestLogger.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
// Only the following conditions are supported. Notice that we do not have
@@ -313,7 +312,7 @@ template <typename... Types> using TypeList = internal::TypeList<Types...>;
CString libc_make_test_file_path_func(const char *file_name);
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
// For TYPED_TEST and TYPED_TEST_F below we need to display which type was used
// to run the test. The default will return the fully qualified canonical type
diff --git a/libc/test/UnitTest/MemoryMatcher.cpp b/libc/test/UnitTest/MemoryMatcher.cpp
index 244f25572c378..c18bc4a8ab590 100644
--- a/libc/test/UnitTest/MemoryMatcher.cpp
+++ b/libc/test/UnitTest/MemoryMatcher.cpp
@@ -8,14 +8,13 @@
#include "MemoryMatcher.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
#if LIBC_TEST_HAS_MATCHERS()
using LIBC_NAMESPACE::testing::tlog;
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
template <typename T>
@@ -78,6 +77,6 @@ void MemoryMatcher::explainError() {
}
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_TEST_HAS_MATCHERS()
diff --git a/libc/test/UnitTest/MemoryMatcher.h b/libc/test/UnitTest/MemoryMatcher.h
index 617231520bf20..ab77eff153b40 100644
--- a/libc/test/UnitTest/MemoryMatcher.h
+++ b/libc/test/UnitTest/MemoryMatcher.h
@@ -11,16 +11,15 @@
#include "src/__support/CPP/span.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
using MemoryView = LIBC_NAMESPACE::cpp::span<const char>;
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#if !LIBC_TEST_HAS_MATCHERS()
@@ -42,8 +41,7 @@ using MemoryView = LIBC_NAMESPACE::cpp::span<const char>;
#else // LIBC_TEST_HAS_MATCHERS()
-namespace LIBC_NAMESPACE_DECL {
-namespace testing {
+namespace LIBC_NAMESPACE::testing {
class MemoryMatcher : public Matcher<MemoryView> {
MemoryView expected;
@@ -59,8 +57,7 @@ class MemoryMatcher : public Matcher<MemoryView> {
void explainError() override;
};
-} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::testing
#define EXPECT_MEM_EQ(expected, actual) \
EXPECT_THAT(actual, LIBC_NAMESPACE::testing::MemoryMatcher(expected))
diff --git a/libc/test/UnitTest/PrintfMatcher.cpp b/libc/test/UnitTest/PrintfMatcher.cpp
index 4fdcbf1746d22..c8303815c9229 100644
--- a/libc/test/UnitTest/PrintfMatcher.cpp
+++ b/libc/test/UnitTest/PrintfMatcher.cpp
@@ -9,7 +9,6 @@
#include "PrintfMatcher.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "test/UnitTest/StringUtils.h"
@@ -17,7 +16,7 @@
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
using printf_core::FormatFlags;
@@ -101,4 +100,4 @@ void FormatSectionMatcher::explainError() {
}
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/UnitTest/PrintfMatcher.h b/libc/test/UnitTest/PrintfMatcher.h
index e0c16cf05f281..a4fbeda4d585a 100644
--- a/libc/test/UnitTest/PrintfMatcher.h
+++ b/libc/test/UnitTest/PrintfMatcher.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_UTILS_UNITTEST_PRINTF_MATCHER_H
#define LLVM_LIBC_UTILS_UNITTEST_PRINTF_MATCHER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/printf_core/core_structs.h"
#include "test/UnitTest/Test.h"
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
class FormatSectionMatcher : public Matcher<printf_core::FormatSection> {
@@ -32,7 +31,7 @@ class FormatSectionMatcher : public Matcher<printf_core::FormatSection> {
};
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#define EXPECT_PFORMAT_EQ(expected, actual) \
EXPECT_THAT(actual, LIBC_NAMESPACE::testing::FormatSectionMatcher(expected))
diff --git a/libc/test/UnitTest/RoundingModeUtils.cpp b/libc/test/UnitTest/RoundingModeUtils.cpp
index 46ac204bcd759..cb34c5eab421e 100644
--- a/libc/test/UnitTest/RoundingModeUtils.cpp
+++ b/libc/test/UnitTest/RoundingModeUtils.cpp
@@ -11,9 +11,8 @@
#include "src/__support/FPUtil/rounding_mode.h"
#include "hdr/fenv_macros.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
namespace testing {
@@ -49,4 +48,4 @@ ForceRoundingMode::~ForceRoundingMode() {
} // namespace testing
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/UnitTest/RoundingModeUtils.h b/libc/test/UnitTest/RoundingModeUtils.h
index cdc3699d15658..b986c98fa2e5e 100644
--- a/libc/test/UnitTest/RoundingModeUtils.h
+++ b/libc/test/UnitTest/RoundingModeUtils.h
@@ -9,10 +9,9 @@
#ifndef LLVM_LIBC_TEST_UNITTEST_ROUNDINGMODEUTILS_H
#define LLVM_LIBC_TEST_UNITTEST_ROUNDINGMODEUTILS_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace fputil {
namespace testing {
@@ -33,6 +32,6 @@ template <RoundingMode R> struct ForceRoundingModeTest : ForceRoundingMode {
} // namespace testing
} // namespace fputil
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_TEST_UNITTEST_ROUNDINGMODEUTILS_H
diff --git a/libc/test/UnitTest/ScanfMatcher.cpp b/libc/test/UnitTest/ScanfMatcher.cpp
index 3e9f2a5f941a1..91cb73fb332ed 100644
--- a/libc/test/UnitTest/ScanfMatcher.cpp
+++ b/libc/test/UnitTest/ScanfMatcher.cpp
@@ -9,7 +9,6 @@
#include "ScanfMatcher.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "test/UnitTest/StringUtils.h"
@@ -17,7 +16,7 @@
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
using scanf_core::FormatFlags;
@@ -100,4 +99,4 @@ void FormatSectionMatcher::explainError() {
}
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/UnitTest/ScanfMatcher.h b/libc/test/UnitTest/ScanfMatcher.h
index d64258f3f4f2c..0b9a8868bf0b8 100644
--- a/libc/test/UnitTest/ScanfMatcher.h
+++ b/libc/test/UnitTest/ScanfMatcher.h
@@ -9,13 +9,12 @@
#ifndef LLVM_LIBC_UTILS_UNITTEST_SCANF_MATCHER_H
#define LLVM_LIBC_UTILS_UNITTEST_SCANF_MATCHER_H
-#include "src/__support/macros/config.h"
#include "src/stdio/scanf_core/core_structs.h"
#include "test/UnitTest/Test.h"
#include <errno.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
class FormatSectionMatcher : public Matcher<scanf_core::FormatSection> {
@@ -32,7 +31,7 @@ class FormatSectionMatcher : public Matcher<scanf_core::FormatSection> {
};
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#define EXPECT_SFORMAT_EQ(expected, actual) \
EXPECT_THAT(actual, LIBC_NAMESPACE::testing::FormatSectionMatcher(expected))
diff --git a/libc/test/UnitTest/StringUtils.h b/libc/test/UnitTest/StringUtils.h
index 9225881805603..61d74b49d4c98 100644
--- a/libc/test/UnitTest/StringUtils.h
+++ b/libc/test/UnitTest/StringUtils.h
@@ -12,9 +12,8 @@
#include "src/__support/CPP/string.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/big_int.h"
-#include "src/__support/macros/config.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Return the first N hex digits of an integer as a string in upper case.
template <typename T>
@@ -33,6 +32,6 @@ int_to_hex(T value, size_t length = sizeof(T) * 2) {
return "0x" + s;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_TEST_UNITTEST_STRINGUTILS_H
diff --git a/libc/test/UnitTest/TestLogger.cpp b/libc/test/UnitTest/TestLogger.cpp
index e1df7987bcd83..feba4b5ddd39b 100644
--- a/libc/test/UnitTest/TestLogger.cpp
+++ b/libc/test/UnitTest/TestLogger.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 testing {
// cpp::string_view specialization
@@ -87,4 +86,4 @@ template TestLogger &TestLogger::operator<< <UInt<320>>(UInt<320>);
TestLogger tlog;
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/UnitTest/TestLogger.h b/libc/test/UnitTest/TestLogger.h
index c4dbd3a7dc484..6188bcf4434af 100644
--- a/libc/test/UnitTest/TestLogger.h
+++ b/libc/test/UnitTest/TestLogger.h
@@ -9,9 +9,7 @@
#ifndef LLVM_LIBC_TEST_UNITTEST_TESTLOGGER_H
#define LLVM_LIBC_TEST_UNITTEST_TESTLOGGER_H
-#include "src/__support/macros/config.h"
-
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
// A class to log to standard output in the context of hermetic tests.
@@ -24,6 +22,6 @@ struct TestLogger {
extern TestLogger tlog;
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif /* LLVM_LIBC_TEST_UNITTEST_TESTLOGGER_H */
diff --git a/libc/test/UnitTest/ZxTest.h b/libc/test/UnitTest/ZxTest.h
index 0881902d62b3b..e6bd1e8b64372 100644
--- a/libc/test/UnitTest/ZxTest.h
+++ b/libc/test/UnitTest/ZxTest.h
@@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_UTILS_UNITTEST_ZXTEST_H
#define LLVM_LIBC_UTILS_UNITTEST_ZXTEST_H
-#include "src/__support/macros/config.h"
#include <zxtest/zxtest.h>
#define WITH_SIGNAL(X) #X
@@ -29,13 +28,11 @@
#define EXPECT_DEATH(FUNC, SIG) ([&] { ASSERT_DEATH(FUNC, SIG); }())
#endif
-namespace LIBC_NAMESPACE_DECL {
-namespace testing {
+namespace LIBC_NAMESPACE::testing {
using Test = ::zxtest::Test;
-} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::testing
// zxtest does not have gmock-style matchers.
#define LIBC_TEST_HAS_MATCHERS() (0)
diff --git a/libc/test/include/sys/queue_test.cpp b/libc/test/include/sys/queue_test.cpp
index a1fda903bc806..c10e48d627caa 100644
--- a/libc/test/include/sys/queue_test.cpp
+++ b/libc/test/include/sys/queue_test.cpp
@@ -8,7 +8,6 @@
#include "src/__support/CPP/string.h"
#include "src/__support/char_vector.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
#include "include/llvm-libc-macros/sys-queue-macros.h"
@@ -16,7 +15,7 @@
using LIBC_NAMESPACE::CharVector;
using LIBC_NAMESPACE::cpp::string;
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
TEST(LlvmLibcQueueTest, SList) {
struct Entry {
@@ -166,4 +165,4 @@ TEST(LlvmLibcQueueTest, STailQ) {
ASSERT_TRUE(STAILQ_EMPTY(&head));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/integration/src/pthread/pthread_rwlock_test.cpp b/libc/test/integration/src/pthread/pthread_rwlock_test.cpp
index 455003b6af811..9175efea4be95 100644
--- a/libc/test/integration/src/pthread/pthread_rwlock_test.cpp
+++ b/libc/test/integration/src/pthread/pthread_rwlock_test.cpp
@@ -9,7 +9,6 @@
#include "src/__support/CPP/atomic.h"
#include "src/__support/CPP/new.h"
#include "src/__support/OSUtil/syscall.h"
-#include "src/__support/macros/config.h"
#include "src/__support/threads/linux/raw_mutex.h"
#include "src/__support/threads/linux/rwlock.h"
#include "src/__support/threads/sleep.h"
@@ -42,16 +41,14 @@
#include <pthread.h>
#include <time.h>
-namespace LIBC_NAMESPACE_DECL {
-namespace rwlock {
+namespace LIBC_NAMESPACE::rwlock {
class RwLockTester {
public:
static constexpr int full_reader_state() {
return (~0) & (~RwState::PENDING_MASK) & (~RwState::ACTIVE_WRITER_BIT);
}
};
-} // namespace rwlock
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::rwlock
static void smoke_test() {
pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
diff --git a/libc/test/src/__support/CPP/algorithm_test.cpp b/libc/test/src/__support/CPP/algorithm_test.cpp
index 00d07bfbfbaaf..e52e5624e4a6b 100644
--- a/libc/test/src/__support/CPP/algorithm_test.cpp
+++ b/libc/test/src/__support/CPP/algorithm_test.cpp
@@ -8,13 +8,11 @@
#include "src/__support/CPP/algorithm.h"
#include "src/__support/CPP/array.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
// TODO(https://github.com/llvm/llvm-project/issues/94066): Add unittests for
// the remaining algorithm functions.
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
TEST(LlvmLibcAlgorithmTest, FindIfNot) {
array<int, 4> nums{1, 2, 3, 4};
@@ -46,5 +44,4 @@ TEST(LlvmLibcAlgorithmTest, AllOf) {
EXPECT_TRUE(all_of(nums.begin(), nums.begin(), [](int i) { return i < 0; }));
}
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
diff --git a/libc/test/src/__support/CPP/bit_test.cpp b/libc/test/src/__support/CPP/bit_test.cpp
index 9429b66ad1f98..299623d2ca240 100644
--- a/libc/test/src/__support/CPP/bit_test.cpp
+++ b/libc/test/src/__support/CPP/bit_test.cpp
@@ -8,14 +8,12 @@
#include "src/__support/CPP/bit.h"
#include "src/__support/big_int.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
#include "test/UnitTest/Test.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
using UnsignedTypes = testing::TypeList<
#if defined(LIBC_TYPES_HAS_INT128)
@@ -230,5 +228,4 @@ TYPED_TEST(LlvmLibcBitTest, CountOnes, UnsignedTypes) {
cpp::numeric_limits<T>::digits - i);
}
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
diff --git a/libc/test/src/__support/CPP/cstddef_test.cpp b/libc/test/src/__support/CPP/cstddef_test.cpp
index eceabaa815983..8337081345a02 100644
--- a/libc/test/src/__support/CPP/cstddef_test.cpp
+++ b/libc/test/src/__support/CPP/cstddef_test.cpp
@@ -7,11 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/cstddef.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
TEST(LlvmLibcByteTest, to_integer) {
const char str[] = "abc";
@@ -43,5 +41,4 @@ TEST(LlvmLibcByteTest, bitwise) {
ASSERT_EQ(b, byte{0b00001111});
}
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
diff --git a/libc/test/src/__support/CPP/limits_test.cpp b/libc/test/src/__support/CPP/limits_test.cpp
index 6c94b091f15bf..bcf7d5ed6a6e7 100644
--- a/libc/test/src/__support/CPP/limits_test.cpp
+++ b/libc/test/src/__support/CPP/limits_test.cpp
@@ -8,11 +8,10 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/big_int.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// This just checks against the C spec, almost all implementations will surpass
// this.
@@ -43,4 +42,4 @@ TEST(LlvmLibcLimitsTest, UInt128Limits) {
#endif // LIBC_TYPES_HAS_INT128
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/CPP/type_traits_test.cpp b/libc/test/src/__support/CPP/type_traits_test.cpp
index 3c6268f86fbd1..1c428e93a2fd8 100644
--- a/libc/test/src/__support/CPP/type_traits_test.cpp
+++ b/libc/test/src/__support/CPP/type_traits_test.cpp
@@ -7,13 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
// TODO: Split this file if it becomes too big.
-namespace LIBC_NAMESPACE_DECL {
-namespace cpp {
+namespace LIBC_NAMESPACE::cpp {
class Class {};
union Union {};
@@ -443,5 +441,4 @@ TEST(LlvmLibcTypeTraitsTest, true_type) { EXPECT_TRUE((true_type::value)); }
// TODO void_t
-} // namespace cpp
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE::cpp
diff --git a/libc/test/src/__support/HashTable/bitmask_test.cpp b/libc/test/src/__support/HashTable/bitmask_test.cpp
index ce56b2079d32e..5203220e9b5cf 100644
--- a/libc/test/src/__support/HashTable/bitmask_test.cpp
+++ b/libc/test/src/__support/HashTable/bitmask_test.cpp
@@ -7,9 +7,8 @@
//===----------------------------------------------------------------------===//
#include "src/__support/HashTable/bitmask.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
using ShortBitMask = BitMaskAdaptor<uint16_t, 1>;
@@ -67,4 +66,4 @@ TEST(LlvmLibcHashTableBitMaskTest, MultiBitStrideIteration) {
}
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/HashTable/group_test.cpp b/libc/test/src/__support/HashTable/group_test.cpp
index 25b15312ad668..907908335863a 100644
--- a/libc/test/src/__support/HashTable/group_test.cpp
+++ b/libc/test/src/__support/HashTable/group_test.cpp
@@ -8,12 +8,11 @@
#include "src/__support/HashTable/bitmask.h"
-#include "src/__support/macros/config.h"
#include "src/stdlib/rand.h"
#include "test/UnitTest/Test.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
struct ByteArray {
@@ -88,4 +87,4 @@ TEST(LlvmLibcHashTableBitMaskTest, MaskAvailable) {
}
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/HashTable/table_test.cpp b/libc/test/src/__support/HashTable/table_test.cpp
index f8ffa4d4123d3..dcae6f4e8fca9 100644
--- a/libc/test/src/__support/HashTable/table_test.cpp
+++ b/libc/test/src/__support/HashTable/table_test.cpp
@@ -9,10 +9,9 @@
#include "src/__support/CPP/bit.h" // bit_ceil
#include "src/__support/HashTable/randomness.h"
#include "src/__support/HashTable/table.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
TEST(LlvmLibcTableTest, AllocationAndDeallocation) {
size_t caps[] = {0, 1, 2, 3, 4, 7, 11, 37, 1024, 5261, 19999};
@@ -129,4 +128,4 @@ TEST(LlvmLibcTableTest, Insertion) {
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/big_int_test.cpp b/libc/test/src/__support/big_int_test.cpp
index 2c3d57755cd5b..84cd206b3273c 100644
--- a/libc/test/src/__support/big_int_test.cpp
+++ b/libc/test/src/__support/big_int_test.cpp
@@ -9,13 +9,12 @@
#include "src/__support/CPP/optional.h"
#include "src/__support/big_int.h"
#include "src/__support/integer_literals.h" // parse_unsigned_bigint
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
#include "hdr/math_macros.h" // HUGE_VALF, HUGE_VALF
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
enum Value { ZERO, ONE, TWO, MIN, MAX };
@@ -922,4 +921,4 @@ TEST(LlvmLibcUIntClassTest, OtherWordTypeTests) {
ASSERT_EQ(static_cast<int>(a >> 64), 1);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/endian_test.cpp b/libc/test/src/__support/endian_test.cpp
index 758c13b686946..4d95c03cf1398 100644
--- a/libc/test/src/__support/endian_test.cpp
+++ b/libc/test/src/__support/endian_test.cpp
@@ -7,10 +7,9 @@
//===----------------------------------------------------------------------===//
#include "src/__support/endian.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
struct LlvmLibcEndian : testing::Test {
template <typename T> void check(const T original, const T swapped) {
@@ -53,4 +52,4 @@ TEST_F(LlvmLibcEndian, uint64_t) {
check(original, swapped);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/freelist_heap_test.cpp b/libc/test/src/__support/freelist_heap_test.cpp
index 5815d5dfc01ab..add590f5c6d31 100644
--- a/libc/test/src/__support/freelist_heap_test.cpp
+++ b/libc/test/src/__support/freelist_heap_test.cpp
@@ -8,12 +8,11 @@
#include "src/__support/CPP/span.h"
#include "src/__support/freelist_heap.h"
-#include "src/__support/macros/config.h"
#include "src/string/memcmp.h"
#include "src/string/memcpy.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using LIBC_NAMESPACE::freelist_heap;
@@ -285,4 +284,4 @@ TEST_FOR_EACH_ALLOCATOR(InvalidAlignedAllocAlignment, 2048) {
EXPECT_EQ(ptr, static_cast<void *>(nullptr));
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/math_extras_test.cpp b/libc/test/src/__support/math_extras_test.cpp
index 08c090017c1a1..9f9036b9d5cdf 100644
--- a/libc/test/src/__support/math_extras_test.cpp
+++ b/libc/test/src/__support/math_extras_test.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/__support/integer_literals.h"
-#include "src/__support/macros/config.h"
#include "src/__support/math_extras.h"
#include "src/__support/uint128.h" // UInt<128>
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// TODO: add UInt<128> support.
using UnsignedTypesNoBigInt = testing::TypeList<
@@ -159,4 +158,4 @@ TYPED_TEST(LlvmLibcBlockMathExtrasTest, sub_overflow, UnsignedTypes) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/memory_size_test.cpp b/libc/test/src/__support/memory_size_test.cpp
index bda1571fd360a..1c8f1ce87415b 100644
--- a/libc/test/src/__support/memory_size_test.cpp
+++ b/libc/test/src/__support/memory_size_test.cpp
@@ -6,11 +6,10 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include "src/__support/memory_size.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace internal {
static inline constexpr size_t SAFE_MEM_SIZE_TEST_LIMIT =
static_cast<size_t>(cpp::numeric_limits<cpp::make_signed_t<size_t>>::max());
@@ -101,4 +100,4 @@ TEST(LlvmLibcBlockBitTest, OffsetTo) {
}
}
} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/str_to_double_test.cpp b/libc/test/src/__support/str_to_double_test.cpp
index 597227b5f3288..3c6d03978803b 100644
--- a/libc/test/src/__support/str_to_double_test.cpp
+++ b/libc/test/src/__support/str_to_double_test.cpp
@@ -1,7 +1,6 @@
-#include "src/__support/macros/config.h"
#include "str_to_fp_test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using LlvmLibcStrToDblTest = LlvmLibcStrToFloatTest<double>;
TEST_F(LlvmLibcStrToDblTest, ClingerFastPathFloat64Simple) {
@@ -103,4 +102,4 @@ TEST(LlvmLibcStrToDblTest, SimpleDecimalConversionExtraTypes) {
EXPECT_EQ(double_result.error, 0);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/str_to_float_test.cpp b/libc/test/src/__support/str_to_float_test.cpp
index efdce46391cf5..f23d8706d77da 100644
--- a/libc/test/src/__support/str_to_float_test.cpp
+++ b/libc/test/src/__support/str_to_float_test.cpp
@@ -1,7 +1,6 @@
-#include "src/__support/macros/config.h"
#include "str_to_fp_test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using LlvmLibcStrToFltTest = LlvmLibcStrToFloatTest<float>;
@@ -57,4 +56,4 @@ TEST(LlvmLibcStrToFltTest, SimpleDecimalConversionExtraTypes) {
EXPECT_EQ(float_result.error, 0);
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/str_to_fp_test.h b/libc/test/src/__support/str_to_fp_test.h
index db4e62a5cd0d1..8d6181cda884b 100644
--- a/libc/test/src/__support/str_to_fp_test.h
+++ b/libc/test/src/__support/str_to_fp_test.h
@@ -7,14 +7,13 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_float.h"
#include "src/__support/uint128.h"
#include "src/errno/libc_errno.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename T> struct LlvmLibcStrToFloatTest : public testing::Test {
using StorageType = typename fputil::FPBits<T>::StorageType;
@@ -80,4 +79,4 @@ template <typename T> struct LlvmLibcStrToFloatTest : public testing::Test {
}
};
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/__support/str_to_long_double_test.cpp b/libc/test/src/__support/str_to_long_double_test.cpp
index 3433c3725c234..c97fe27565e85 100644
--- a/libc/test/src/__support/str_to_long_double_test.cpp
+++ b/libc/test/src/__support/str_to_long_double_test.cpp
@@ -1,9 +1,8 @@
-#include "src/__support/macros/config.h"
#include "str_to_fp_test.h"
#include "src/__support/integer_literals.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using LlvmLibcStrToLongDblTest = LlvmLibcStrToFloatTest<long double>;
using LIBC_NAMESPACE::operator""_u128;
@@ -82,4 +81,4 @@ TEST_F(LlvmLibcStrToLongDblTest, EiselLemireFloat128Fallback) {
#error "Unknown long double type"
#endif
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/math/performance_testing/BinaryOpSingleOutputPerf.h b/libc/test/src/math/performance_testing/BinaryOpSingleOutputPerf.h
index 995e41ba84b03..3027932c70f40 100644
--- a/libc/test/src/math/performance_testing/BinaryOpSingleOutputPerf.h
+++ b/libc/test/src/math/performance_testing/BinaryOpSingleOutputPerf.h
@@ -7,13 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/macros/config.h"
#include "test/src/math/performance_testing/Timer.h"
#include <cstddef>
#include <fstream>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
template <typename T> class BinaryOpSingleOutputPerf {
@@ -122,7 +121,7 @@ template <typename T> class BinaryOpSingleOutputPerf {
};
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#define BINARY_OP_SINGLE_OUTPUT_PERF(T, myFunc, otherFunc, filename) \
int main() { \
diff --git a/libc/test/src/math/performance_testing/SingleInputSingleOutputPerf.h b/libc/test/src/math/performance_testing/SingleInputSingleOutputPerf.h
index 48ae43d6315e3..b5b38313a69ca 100644
--- a/libc/test/src/math/performance_testing/SingleInputSingleOutputPerf.h
+++ b/libc/test/src/math/performance_testing/SingleInputSingleOutputPerf.h
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "src/__support/FPUtil/FPBits.h"
-#include "src/__support/macros/config.h"
#include "test/src/math/performance_testing/Timer.h"
#include <fstream>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
template <typename T> class SingleInputSingleOutputPerf {
@@ -81,7 +80,7 @@ template <typename T> class SingleInputSingleOutputPerf {
};
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#define SINGLE_INPUT_SINGLE_OUTPUT_PERF(T, myFunc, otherFunc, filename) \
int main() { \
diff --git a/libc/test/src/math/performance_testing/Timer.cpp b/libc/test/src/math/performance_testing/Timer.cpp
index 6ab0063fa6ef0..979196ae6b835 100644
--- a/libc/test/src/math/performance_testing/Timer.cpp
+++ b/libc/test/src/math/performance_testing/Timer.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "Timer.h"
-#include "src/__support/macros/config.h"
#include <chrono>
#include <fstream>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
struct TimerImplementation {
@@ -40,4 +39,4 @@ uint64_t Timer::nanoseconds() const {
}
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/math/performance_testing/Timer.h b/libc/test/src/math/performance_testing/Timer.h
index 32578ade48888..2327ede260ab9 100644
--- a/libc/test/src/math/performance_testing/Timer.h
+++ b/libc/test/src/math/performance_testing/Timer.h
@@ -9,10 +9,9 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_PERFORMACE_TESTING_TIMER_H
#define LLVM_LIBC_TEST_SRC_MATH_PERFORMACE_TESTING_TIMER_H
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
class Timer {
@@ -29,6 +28,6 @@ class Timer {
};
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_TEST_SRC_MATH_PERFORMANCE_TESTING_TIMER_H
diff --git a/libc/test/src/math/sdcomp26094.h b/libc/test/src/math/sdcomp26094.h
index bb2b9f1efb909..4a77b2a4cd078 100644
--- a/libc/test/src/math/sdcomp26094.h
+++ b/libc/test/src/math/sdcomp26094.h
@@ -10,11 +10,10 @@
#define LLVM_LIBC_TEST_SRC_MATH_SDCOMP26094_H
#include "src/__support/CPP/array.h"
-#include "src/__support/macros/config.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
static constexpr LIBC_NAMESPACE::cpp::array<uint32_t, 10> SDCOMP26094_VALUES{
@@ -23,6 +22,6 @@ static constexpr LIBC_NAMESPACE::cpp::array<uint32_t, 10> SDCOMP26094_VALUES{
};
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_TEST_SRC_MATH_SDCOMP26094_H
diff --git a/libc/test/src/stdio/sprintf_test.cpp b/libc/test/src/stdio/sprintf_test.cpp
index be7c06fa918fd..1ca22f71f0f2f 100644
--- a/libc/test/src/stdio/sprintf_test.cpp
+++ b/libc/test/src/stdio/sprintf_test.cpp
@@ -6,7 +6,6 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include "src/stdio/sprintf.h"
#include "src/__support/FPUtil/FPBits.h"
@@ -17,7 +16,7 @@
// TODO: Add a comment here explaining the printf format string.
// #include <stdio.h>
-// namespace LIBC_NAMESPACE_DECL {
+// namespace LIBC_NAMESPACE {
// using ::sprintf;
// }
diff --git a/libc/test/src/stdlib/strtoint32_test.cpp b/libc/test/src/stdlib/strtoint32_test.cpp
index 17df432fc8e68..a7c9141d9f79b 100644
--- a/libc/test/src/stdlib/strtoint32_test.cpp
+++ b/libc/test/src/stdlib/strtoint32_test.cpp
@@ -8,14 +8,13 @@
#include <stdint.h>
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
#include "StrtolTest.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int32_t strtoint32(const char *__restrict str, char **__restrict str_end,
int base) {
@@ -40,7 +39,7 @@ uint32_t strtouint32(const char *__restrict str, char **__restrict str_end,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
STRTOL_TEST(Strtoint32, LIBC_NAMESPACE::strtoint32)
STRTOL_TEST(Strtouint32, LIBC_NAMESPACE::strtouint32)
diff --git a/libc/test/src/stdlib/strtoint64_test.cpp b/libc/test/src/stdlib/strtoint64_test.cpp
index b5fe69dfaa701..350b5aca4c850 100644
--- a/libc/test/src/stdlib/strtoint64_test.cpp
+++ b/libc/test/src/stdlib/strtoint64_test.cpp
@@ -8,14 +8,13 @@
#include <stdint.h>
-#include "src/__support/macros/config.h"
#include "src/__support/str_to_integer.h"
#include "src/errno/libc_errno.h"
#include "StrtolTest.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
int64_t strtoint64(const char *__restrict str, char **__restrict str_end,
int base) {
@@ -40,7 +39,7 @@ uint64_t strtouint64(const char *__restrict str, char **__restrict str_end,
return result;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
STRTOL_TEST(Strtoint64, LIBC_NAMESPACE::strtoint64)
STRTOL_TEST(Strtouint64, LIBC_NAMESPACE::strtouint64)
diff --git a/libc/test/src/string/bcmp_test.cpp b/libc/test/src/string/bcmp_test.cpp
index c639040685e19..fa89e4d7b08f1 100644
--- a/libc/test/src/string/bcmp_test.cpp
+++ b/libc/test/src/string/bcmp_test.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "memory_utils/memory_check_utils.h"
-#include "src/__support/macros/config.h"
#include "src/string/bcmp.h"
#include "test/UnitTest/Test.h"
#include "test/UnitTest/TestLogger.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
TEST(LlvmLibcBcmpTest, CmpZeroByte) {
const char *lhs = "ab";
@@ -58,4 +57,4 @@ TEST(LlvmLibcBcmpTest, SizeSweep) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/bcopy_test.cpp b/libc/test/src/string/bcopy_test.cpp
index 04772bb5d8ad7..f8cb9208838f3 100644
--- a/libc/test/src/string/bcopy_test.cpp
+++ b/libc/test/src/string/bcopy_test.cpp
@@ -6,7 +6,6 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include "src/string/bcopy.h"
#include "memory_utils/memory_check_utils.h"
@@ -17,7 +16,7 @@
using LIBC_NAMESPACE::cpp::array;
using LIBC_NAMESPACE::cpp::span;
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
TEST(LlvmLibcBcopyTest, MoveZeroByte) {
char Buffer[] = {'a', 'b', 'y', 'z'};
@@ -96,4 +95,4 @@ TEST(LlvmLibcBcopyTest, SizeSweep) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/bzero_test.cpp b/libc/test/src/string/bzero_test.cpp
index a24043613bed7..7382490e13cba 100644
--- a/libc/test/src/string/bzero_test.cpp
+++ b/libc/test/src/string/bzero_test.cpp
@@ -7,11 +7,10 @@
//===----------------------------------------------------------------------===//
#include "memory_utils/memory_check_utils.h"
-#include "src/__support/macros/config.h"
#include "src/string/bzero.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Adapt CheckMemset signature to bzero.
static inline void Adaptor(cpp::span<char> p1, uint8_t value, size_t size) {
@@ -27,4 +26,4 @@ TEST(LlvmLibcBzeroTest, SizeSweep) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/memcmp_test.cpp b/libc/test/src/string/memcmp_test.cpp
index 9f85a6d4f2229..ca7a5c7ce3702 100644
--- a/libc/test/src/string/memcmp_test.cpp
+++ b/libc/test/src/string/memcmp_test.cpp
@@ -7,12 +7,11 @@
//===----------------------------------------------------------------------===//
#include "memory_utils/memory_check_utils.h"
-#include "src/__support/macros/config.h"
#include "src/string/memcmp.h"
#include "test/UnitTest/Test.h"
#include "test/UnitTest/TestLogger.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
TEST(LlvmLibcMemcmpTest, CmpZeroByte) {
const char *lhs = "ab";
@@ -65,4 +64,4 @@ TEST(LlvmLibcMemcmpTest, SizeSweep) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/memcpy_test.cpp b/libc/test/src/string/memcpy_test.cpp
index adf6ef7e66d3f..1ac9631148441 100644
--- a/libc/test/src/string/memcpy_test.cpp
+++ b/libc/test/src/string/memcpy_test.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "memory_utils/memory_check_utils.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/os.h" // LIBC_TARGET_OS_IS_LINUX
#include "src/string/memcpy.h"
#include "test/UnitTest/Test.h"
@@ -16,7 +15,7 @@
#include "memory_utils/protected_pages.h"
#endif // !defined(LIBC_FULL_BUILD) && defined(LIBC_TARGET_OS_IS_LINUX)
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Adapt CheckMemcpy signature to memcpy.
static inline void Adaptor(cpp::span<char> dst, cpp::span<char> src,
@@ -72,4 +71,4 @@ TEST(LlvmLibcMemcpyTest, CheckAccess) {
#endif // !defined(LIBC_FULL_BUILD) && defined(LIBC_TARGET_OS_IS_LINUX)
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/memmem_test.cpp b/libc/test/src/string/memmem_test.cpp
index 539f6a136dc02..56d4b7f03c264 100644
--- a/libc/test/src/string/memmem_test.cpp
+++ b/libc/test/src/string/memmem_test.cpp
@@ -6,13 +6,12 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include "src/string/memmem.h"
#include "test/UnitTest/Test.h"
#include "src/string/string_utils.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
TEST(LlvmLibcMemmemTest, EmptyHaystackEmptyNeedleReturnsHaystck) {
char *h = nullptr;
@@ -127,4 +126,4 @@ TEST(LlvmLibcMemmemTest, ReturnNullIfInadequateHaystackLength) {
ASSERT_EQ(result, static_cast<void *>(nullptr));
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/memmove_test.cpp b/libc/test/src/string/memmove_test.cpp
index e280b5d25f6f4..b076e862b6ec7 100644
--- a/libc/test/src/string/memmove_test.cpp
+++ b/libc/test/src/string/memmove_test.cpp
@@ -6,7 +6,6 @@
//
//===----------------------------------------------------------------------===//
-#include "src/__support/macros/config.h"
#include "src/string/memmove.h"
#include "memory_utils/memory_check_utils.h"
@@ -17,7 +16,7 @@
using LIBC_NAMESPACE::cpp::array;
using LIBC_NAMESPACE::cpp::span;
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
TEST(LlvmLibcMemmoveTest, MoveZeroByte) {
char Buffer[] = {'a', 'b', 'y', 'z'};
@@ -102,4 +101,4 @@ TEST(LlvmLibcMemmoveTest, SizeSweep) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/memory_utils/memory_check_utils.h b/libc/test/src/string/memory_utils/memory_check_utils.h
index 3ddd15b181c8e..9504230e0c3aa 100644
--- a/libc/test/src/string/memory_utils/memory_check_utils.h
+++ b/libc/test/src/string/memory_utils/memory_check_utils.h
@@ -11,14 +11,13 @@
#include "src/__support/CPP/span.h"
#include "src/__support/libc_assert.h" // LIBC_ASSERT
-#include "src/__support/macros/config.h"
#include "src/__support/macros/sanitizer.h"
#include "src/string/memory_utils/utils.h"
#include <stddef.h> // size_t
#include <stdint.h> // uintxx_t
#include <stdlib.h> // malloc/free
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Simple structure to allocate a buffer of a particular size.
// When ASAN is present it also poisons the whole memory.
@@ -199,6 +198,6 @@ inline bool CheckMemmove(cpp::span<char> buffer, size_t size, int overlap) {
return true;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LIBC_TEST_SRC_STRING_MEMORY_UTILS_MEMORY_CHECK_UTILS_H
diff --git a/libc/test/src/string/memory_utils/op_tests.cpp b/libc/test/src/string/memory_utils/op_tests.cpp
index 2c7524943c0e6..703a26b16b03f 100644
--- a/libc/test/src/string/memory_utils/op_tests.cpp
+++ b/libc/test/src/string/memory_utils/op_tests.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "memory_check_utils.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT64
#include "src/string/memory_utils/op_aarch64.h"
#include "src/string/memory_utils/op_builtin.h"
@@ -16,7 +15,7 @@
#include "src/string/memory_utils/op_x86.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
template <typename T> struct has_head_tail {
template <typename C> static char sfinae(decltype(&C::head_tail));
@@ -345,4 +344,4 @@ TYPED_TEST(LlvmLibcOpTest, Memcmp, MemcmpImplementations) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/memory_utils/utils_test.cpp b/libc/test/src/string/memory_utils/utils_test.cpp
index 4c1accd551685..5ed35b08cdffd 100644
--- a/libc/test/src/string/memory_utils/utils_test.cpp
+++ b/libc/test/src/string/memory_utils/utils_test.cpp
@@ -7,11 +7,10 @@
//===----------------------------------------------------------------------===//
#include "src/__support/CPP/array.h"
-#include "src/__support/macros/config.h"
#include "src/string/memory_utils/utils.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
using UINT = uintptr_t;
@@ -138,4 +137,4 @@ TEST(LlvmLibcUtilsTest, LoadStoreAligned) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/memset_explicit_test.cpp b/libc/test/src/string/memset_explicit_test.cpp
index 4842f45791c44..bb5111bd639e3 100644
--- a/libc/test/src/string/memset_explicit_test.cpp
+++ b/libc/test/src/string/memset_explicit_test.cpp
@@ -7,11 +7,10 @@
//===----------------------------------------------------------------------===//
#include "memory_utils/memory_check_utils.h"
-#include "src/__support/macros/config.h"
#include "src/string/memset_explicit.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Apply the same tests as memset
@@ -29,4 +28,4 @@ TEST(LlvmLibcmemsetExplicitTest, SizeSweep) {
}
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/string/memset_test.cpp b/libc/test/src/string/memset_test.cpp
index 774a321ddfce6..d78b579a0edbf 100644
--- a/libc/test/src/string/memset_test.cpp
+++ b/libc/test/src/string/memset_test.cpp
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "memory_utils/memory_check_utils.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/os.h" // LIBC_TARGET_OS_IS_LINUX
#include "src/string/memset.h"
#include "test/UnitTest/Test.h"
@@ -16,7 +15,7 @@
#include "memory_utils/protected_pages.h"
#endif // !defined(LIBC_FULL_BUILD) && defined(LIBC_TARGET_OS_IS_LINUX)
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
// Adapt CheckMemset signature to memset.
static inline void Adaptor(cpp::span<char> p1, uint8_t value, size_t size) {
@@ -59,4 +58,4 @@ TEST(LlvmLibcMemsetTest, CheckAccess) {
#endif // !defined(LIBC_FULL_BUILD) && defined(LIBC_TARGET_OS_IS_LINUX)
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp b/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp
index 0895c33167151..bd5195c7969bd 100644
--- a/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp
+++ b/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp
@@ -1,5 +1,4 @@
#include "llvm-libc-macros/linux/fcntl-macros.h"
-#include "src/__support/macros/config.h"
#include "src/fcntl/open.h"
#include "src/sys/statvfs/fstatvfs.h"
#include "src/sys/statvfs/linux/statfs_utils.h"
@@ -9,7 +8,7 @@
#include <linux/magic.h>
using namespace LIBC_NAMESPACE::testing::ErrnoSetterMatcher;
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static int fstatfs(int fd, struct statfs *buf) {
using namespace statfs_utils;
if (cpp::optional<LinuxStatFs> result = linux_fstatfs(fd)) {
@@ -18,7 +17,7 @@ static int fstatfs(int fd, struct statfs *buf) {
}
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
struct PathFD {
int fd;
diff --git a/libc/test/src/sys/statvfs/linux/statvfs_test.cpp b/libc/test/src/sys/statvfs/linux/statvfs_test.cpp
index 6719c1ab26865..695d2c0d5e98d 100644
--- a/libc/test/src/sys/statvfs/linux/statvfs_test.cpp
+++ b/libc/test/src/sys/statvfs/linux/statvfs_test.cpp
@@ -1,4 +1,3 @@
-#include "src/__support/macros/config.h"
#include "src/sys/statvfs/linux/statfs_utils.h"
#include "src/sys/statvfs/statvfs.h"
#include "test/UnitTest/ErrnoSetterMatcher.h"
@@ -6,7 +5,7 @@
#include <linux/magic.h>
using namespace LIBC_NAMESPACE::testing::ErrnoSetterMatcher;
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
static int statfs(const char *path, struct statfs *buf) {
using namespace statfs_utils;
if (cpp::optional<LinuxStatFs> result = linux_statfs(path)) {
@@ -15,7 +14,7 @@ static int statfs(const char *path, struct statfs *buf) {
}
return -1;
}
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
TEST(LlvmLibcSysStatfsTest, StatfsBasic) {
struct statfs buf;
diff --git a/libc/test/src/time/TmHelper.h b/libc/test/src/time/TmHelper.h
index 5ae258461099b..16210944bf15f 100644
--- a/libc/test/src/time/TmHelper.h
+++ b/libc/test/src/time/TmHelper.h
@@ -11,12 +11,11 @@
#include <time.h>
-#include "src/__support/macros/config.h"
#include "src/time/time_utils.h"
using LIBC_NAMESPACE::time_utils::TimeConstants;
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace tmhelper {
namespace testing {
@@ -39,6 +38,6 @@ static inline void initialize_tm_data(struct tm *tm_data, int year, int month,
} // namespace testing
} // namespace tmhelper
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#endif // LLVM_LIBC_TEST_SRC_TIME_TMHELPER_H
diff --git a/libc/test/src/time/TmMatcher.h b/libc/test/src/time/TmMatcher.h
index 630956b0f08d6..7cdc2c4b90502 100644
--- a/libc/test/src/time/TmMatcher.h
+++ b/libc/test/src/time/TmMatcher.h
@@ -11,10 +11,9 @@
#include <time.h>
-#include "src/__support/macros/config.h"
#include "test/UnitTest/Test.h"
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
class StructTmMatcher : public Matcher<::tm> {
@@ -58,7 +57,7 @@ class StructTmMatcher : public Matcher<::tm> {
};
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
#define EXPECT_TM_EQ(expected, actual) \
EXPECT_THAT((actual), LIBC_NAMESPACE::testing::StructTmMatcher((expected)))
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp
index b67a9da40bd7b..99a240e555af2 100644
--- a/libc/utils/MPFRWrapper/MPFRUtils.cpp
+++ b/libc/utils/MPFRWrapper/MPFRUtils.cpp
@@ -14,7 +14,6 @@
#include "src/__support/CPP/stringstream.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/fpbits_str.h"
-#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h"
#include <stdint.h>
@@ -23,7 +22,7 @@
template <typename T> using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
namespace mpfr {
@@ -1300,4 +1299,4 @@ template float16 round<float16>(float16, RoundingMode);
} // namespace mpfr
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.h b/libc/utils/MPFRWrapper/MPFRUtils.h
index 28390af9ee6d8..fd0d72472bf7e 100644
--- a/libc/utils/MPFRWrapper/MPFRUtils.h
+++ b/libc/utils/MPFRWrapper/MPFRUtils.h
@@ -10,13 +10,12 @@
#define LLVM_LIBC_UTILS_MPFRWRAPPER_MPFRUTILS_H
#include "src/__support/CPP/type_traits.h"
-#include "src/__support/macros/config.h"
#include "test/UnitTest/RoundingModeUtils.h"
#include "test/UnitTest/Test.h"
#include <stdint.h>
-namespace LIBC_NAMESPACE_DECL {
+namespace LIBC_NAMESPACE {
namespace testing {
namespace mpfr {
@@ -373,7 +372,7 @@ template <typename T> bool round_to_long(T x, RoundingMode mode, long &result);
} // namespace mpfr
} // namespace testing
-} // namespace LIBC_NAMESPACE_DECL
+} // namespace LIBC_NAMESPACE
// GET_MPFR_DUMMY_ARG is going to be added to the end of GET_MPFR_MACRO as a
// simple way to avoid the compiler warning `gnu-zero-variadic-macro-arguments`.
diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
index 7f9a114d95775..28cc040ff4bee 100644
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -51,13 +51,6 @@ config_setting(
flag_values = {":mpfr": "system"},
)
-################################## Base Config #################################
-
-cc_library(
- name = "__support_macros_config",
- hdrs = ["src/__support/macros/config.h"],
-)
-
################################# Include Files ################################
libc_support_library(
@@ -241,6 +234,11 @@ libc_support_library(
],
)
+libc_support_library(
+ name = "__support_macros_config",
+ hdrs = ["src/__support/macros/config.h"],
+)
+
libc_support_library(
name = "__support_macros_attributes",
hdrs = ["src/__support/macros/attributes.h"],
@@ -254,6 +252,7 @@ libc_support_library(
hdrs = ["src/__support/macros/optimization.h"],
deps = [
":__support_macros_attributes",
+ ":__support_macros_config",
":__support_macros_properties_compiler",
],
)
@@ -261,6 +260,9 @@ libc_support_library(
libc_support_library(
name = "__support_macros_sanitizer",
hdrs = ["src/__support/macros/sanitizer.h"],
+ deps = [
+ ":__support_macros_config",
+ ],
)
libc_support_library(
diff --git a/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl b/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl
index cc732effb243e..ec3714407cb91 100644
--- a/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl
+++ b/utils/bazel/llvm-project-overlay/libc/libc_build_rules.bzl
@@ -43,7 +43,7 @@ def _libc_library(name, hidden, copts = [], deps = [], local_defines = [], **kwa
name = name,
copts = copts + libc_common_copts(),
local_defines = local_defines + LIBC_CONFIGURE_OPTIONS,
- deps = deps + ["//libc:__support_macros_config"],
+ deps = deps,
linkstatic = 1,
**kwargs
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/libc_test_rules.bzl b/utils/bazel/llvm-project-overlay/libc/test/libc_test_rules.bzl
index 1da0a24b7791a..ae24a41c60418 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/libc_test_rules.bzl
+++ b/utils/bazel/llvm-project-overlay/libc/test/libc_test_rules.bzl
@@ -34,7 +34,6 @@ def libc_test(name, srcs, libc_function_deps = [], copts = [], deps = [], local_
local_defines = local_defines + LIBC_CONFIGURE_OPTIONS,
deps = [libc_internal_target(d) for d in all_function_deps] + [
"//libc/test/UnitTest:LibcUnitTest",
- "//libc:__support_macros_config",
] + deps,
features = ["-link_llvmlibc"], # Do not link libllvmlibc.a
copts = copts + libc_common_copts(),
More information about the libc-commits
mailing list