caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[libc++] Re-enable std::pair trivial copy constructor for FreeBSD >= 14" (#142204)

Browse Source 
The ABI bump to adopt the conforming ABI v1 std::pair implementation did
not end up happening for FreeBSD 14, and instead this diff was reverted
downstream in FreeBSD[1]. Align the upstream ABI config with FreeBSD's
actual ABI.

[1] ce4f1f49e036 ("Revert commit 6255157d24 from llvm-project (by
Dimitry Andric):")

This reverts commit 6255157d24.
This commit is contained in:
Jessica Clarke
2025-05-31 08:07:15 +01:00
committed by GitHub
parent d6a2ca3eb8
commit 35757d67ba
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/include/__configuration/abi.h
View File

@@ -130,7 +130,7 @@
# endif # endif
// Feature macros for disabling pre ABI v1 features. All of these options // Feature macros for disabling pre ABI v1 features. All of these options
// are deprecated. // are deprecated.
# if defined(__FreeBSD__) && __FreeBSD__ < 14 # if defined(__FreeBSD__)
# define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR # define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
# endif # endif
#endif #endif

2
libcxx/include/__cxx03/__configuration/abi.h
View File

@@ -116,7 +116,7 @@
# endif # endif
// Feature macros for disabling pre ABI v1 features. All of these options // Feature macros for disabling pre ABI v1 features. All of these options
// are deprecated. // are deprecated.
# if defined(__FreeBSD__) && __FreeBSD__ < 14 # if defined(__FreeBSD__)
# define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR # define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
# endif # endif
#endif #endif