add inline namespace for align

Author: poor-circle

libcxx/include/__configuration/abi.h

@@ -104,12 +104,6 @@
 #  endif
 #endif
 
-// The PE/COFF format reports a linking error when encountering multiple symbol definitions where at least one is a
-// strong symbol. So we can't inline a function that also has a non-inline definition visible.
-#if defined(_LIBCPP_OBJECT_FORMAT_COFF)
-#  define _LIBCPP_DISABLE_INLINE_OPTIMIZE_BECAUSE_MULTIPLY_SYMBOLS_ERROR
-#endif
-
 // TODO(LLVM 22): Remove this check
 #if defined(_LIBCPP_ABI_NO_ITERATOR_BASES) && !defined(_LIBCPP_ABI_NO_REVERSE_ITERATOR_SECOND_MEMBER)
 #  ifndef _LIBCPP_ONLY_NO_ITERATOR_BASES

libcxx/include/__memory/align.h

@@ -19,12 +19,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-#if defined(_LIBCPP_DISABLE_INLINE_OPTIMIZE_BECAUSE_MULTIPLY_SYMBOLS_ERROR) && !defined(_LIBCPP_ABI_DO_NOT_EXPORT_ALIGN)
-
-_LIBCPP_EXPORTED_FROM_ABI void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space);
-
-#else
-
+inline namespace __align_inline {
 _LIBCPP_HIDE_FROM_ABI inline void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space) {
   void* __r = nullptr;
   if (__sz <= __space) {
@@ -40,7 +35,7 @@ _LIBCPP_HIDE_FROM_ABI inline void* align(size_t __align, size_t __sz, void*& __p
   return __r;
 }
 
-#endif
+} // namespace __align_inline
 
 _LIBCPP_END_NAMESPACE_STD
 

libcxx/src/CMakeLists.txt

@@ -31,7 +31,6 @@ set(LIBCXX_SOURCES
   include/to_chars_floating_point.h
   include/from_chars_floating_point.h
   memory.cpp
-  memory_align.cpp
   memory_resource.cpp
   new_handler.cpp
   new_helpers.cpp

libcxx/src/memory.cpp

@@ -132,4 +132,12 @@ __sp_mut& __get_sp_mut(const void* p) {
 
 #endif // _LIBCPP_HAS_THREADS
 
+#if !defined(_LIBCPP_ABI_DO_NOT_EXPORT_ALIGN)
+
+_LIBCPP_EXPORTED_FROM_ABI void* align(size_t alignment, size_t size, void*& ptr, size_t& space) {
+  return __align_inline::align(alignment, size, ptr, space);
+}
+
+#endif // _LIBCPP_ABI_DO_NOT_EXPORT_ALIGN
+
 _LIBCPP_END_NAMESPACE_STD

libcxx/src/memory_align.cpp

@@ -152,7 +152,6 @@ cxx_sources = [
   "iostream.cpp",
   "locale.cpp",
   "memory.cpp",
-  "memory_align.cpp"
   "memory_resource.cpp",
   "mutex.cpp",
   "mutex_destructor.cpp",