From 3b499345dfef5583cb7e5d8504ca8004ea4c0b1f Mon Sep 17 00:00:00 2001 From: "Feng.YJ" Date: Sat, 19 Jul 2025 12:32:03 +0800 Subject: [PATCH 1/2] libstdc++: move libc++23convenience.la from experimental to main libstdc++ Move libc++23convenience.la from libstdc++exp to the main libstdc++ static library to ensure C++23 features are properly linked into the standard static library. --- libstdc++-v3/src/Makefile.am | 6 ++++-- libstdc++-v3/src/experimental/Makefile.am | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index dd31e5b2f6eb9..653842a725cb1 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -145,7 +145,8 @@ libstdc___la_LIBADD = \ $(top_builddir)/src/c++98/libc++98convenience.la \ $(top_builddir)/src/c++11/libc++11convenience.la \ $(top_builddir)/src/c++17/libc++17convenience.la \ - $(top_builddir)/src/c++20/libc++20convenience.la + $(top_builddir)/src/c++20/libc++20convenience.la \ + $(top_builddir)/src/c++23/libc++23convenience.la libstdc___la_DEPENDENCIES = \ ${version_dep} \ @@ -153,7 +154,8 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++98/libc++98convenience.la \ $(top_builddir)/src/c++11/libc++11convenience.la \ $(top_builddir)/src/c++17/libc++17convenience.la \ - $(top_builddir)/src/c++20/libc++20convenience.la + $(top_builddir)/src/c++20/libc++20convenience.la \ + $(top_builddir)/src/c++23/libc++23convenience.la if ENABLE_DARWIN_AT_RPATH libstdc___darwin_rpath = -Wc,-nodefaultrpaths diff --git a/libstdc++-v3/src/experimental/Makefile.am b/libstdc++-v3/src/experimental/Makefile.am index 3ecb76e1cc1ef..030b2b7a00082 100644 --- a/libstdc++-v3/src/experimental/Makefile.am +++ b/libstdc++-v3/src/experimental/Makefile.am @@ -46,12 +46,10 @@ sources = \ libstdc__exp_la_SOURCES = $(sources) libstdc__exp_la_LIBADD = \ - $(top_builddir)/src/c++23/libc++23convenience.la \ $(top_builddir)/src/c++26/libc++26convenience.la \ $(filesystem_lib) $(backtrace_lib) libstdc__exp_la_DEPENDENCIES = \ - $(top_builddir)/src/c++23/libc++23convenience.la \ $(top_builddir)/src/c++26/libc++26convenience.la \ $(filesystem_lib) $(backtrace_lib) From a8f569d4817301ed341dde0f9076fa64e62a4456 Mon Sep 17 00:00:00 2001 From: "Feng.YJ" Date: Sat, 19 Jul 2025 12:32:44 +0800 Subject: [PATCH 2/2] chore: regenerate makefile.in files --- libstdc++-v3/src/Makefile.in | 6 ++++-- libstdc++-v3/src/experimental/Makefile.in | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 106b96995aa65..7882735cdad18 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -552,7 +552,8 @@ libstdc___la_LIBADD = \ $(top_builddir)/src/c++98/libc++98convenience.la \ $(top_builddir)/src/c++11/libc++11convenience.la \ $(top_builddir)/src/c++17/libc++17convenience.la \ - $(top_builddir)/src/c++20/libc++20convenience.la + $(top_builddir)/src/c++20/libc++20convenience.la \ + $(top_builddir)/src/c++23/libc++23convenience.la libstdc___la_DEPENDENCIES = \ ${version_dep} \ @@ -560,7 +561,8 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++98/libc++98convenience.la \ $(top_builddir)/src/c++11/libc++11convenience.la \ $(top_builddir)/src/c++17/libc++17convenience.la \ - $(top_builddir)/src/c++20/libc++20convenience.la + $(top_builddir)/src/c++20/libc++20convenience.la \ + $(top_builddir)/src/c++23/libc++23convenience.la @ENABLE_DARWIN_AT_RPATH_TRUE@libstdc___darwin_rpath = \ @ENABLE_DARWIN_AT_RPATH_TRUE@ -Wc,-nodefaultrpaths \ diff --git a/libstdc++-v3/src/experimental/Makefile.in b/libstdc++-v3/src/experimental/Makefile.in index f7b4ee299f337..1cdf3a69235a1 100644 --- a/libstdc++-v3/src/experimental/Makefile.in +++ b/libstdc++-v3/src/experimental/Makefile.in @@ -461,12 +461,10 @@ sources = \ # vpath % $(top_srcdir)/src/experimental libstdc__exp_la_SOURCES = $(sources) libstdc__exp_la_LIBADD = \ - $(top_builddir)/src/c++23/libc++23convenience.la \ $(top_builddir)/src/c++26/libc++26convenience.la \ $(filesystem_lib) $(backtrace_lib) libstdc__exp_la_DEPENDENCIES = \ - $(top_builddir)/src/c++23/libc++23convenience.la \ $(top_builddir)/src/c++26/libc++26convenience.la \ $(filesystem_lib) $(backtrace_lib)