fix abi break changed in aix

poor-circle · poor-circle · commit d3fbce770f58 · 2025-11-13T14:09:17.000+08:00
diff --git a/libcxx/include/__memory/align.h b/libcxx/include/__memory/align.h
@@ -35,7 +35,10 @@ __align_impl(size_t __align, size_t __sz, void*& __ptr, size_t& __space) {
   return __r;
 }
 
-#ifndef _LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS
+#ifdef _LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS
+_LIBCPP_EXPORTED_FROM_ABI _LIBCPP_HIDE_FROM_ABI void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space);
+
+#else
 
 inline _LIBCPP_HIDE_FROM_ABI void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space) {
   return __align_impl(__align, __sz, __ptr, __space);
diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp
@@ -135,7 +135,7 @@ __sp_mut& __get_sp_mut(const void* p) {
 
 #if defined(_LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS)
 
-_LIBCPP_EXPORTED_FROM_ABI void* align(size_t alignment, size_t size, void*& ptr, size_t& space) {
+void* align(size_t alignment, size_t size, void*& ptr, size_t& space) {
   return __align_impl(alignment, size, ptr, space);
 }
 #endif // _LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ __sp_mut& __get_sp_mut(const void* p) {`
`135`	`135`
`136`	`136`	`#if defined(_LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS)`
`137`	`137`
`138`		`-_LIBCPP_EXPORTED_FROM_ABI void* align(size_t alignment, size_t size, void*& ptr, size_t& space) {`
	`138`	`+void* align(size_t alignment, size_t size, void*& ptr, size_t& space) {`
`139`	`139`	`return __align_impl(alignment, size, ptr, space);`
`140`	`140`	`}`
`141`	`141`	`#endif // _LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS`