From 1f97354f55ea61c2b783d69f503245b666f962d6 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 17 Mar 2026 16:36:39 +0000 Subject: [PATCH] Revert "libstdc++: Add module initialization functions to the library [PR124268]" This reverts commit c362a260ca203207309cf77a3928854cabf2ac01. --- libstdc++-v3/config/abi/pre/gnu.ver | 4 --- libstdc++-v3/src/Makefile.am | 6 ++-- libstdc++-v3/src/Makefile.in | 6 ++-- libstdc++-v3/src/c++23/Makefile.am | 25 ++----------- libstdc++-v3/src/c++23/Makefile.in | 56 ++++++++--------------------- 5 files changed, 20 insertions(+), 77 deletions(-) diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index 323fff28c25..fb968e122d8 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -2592,10 +2592,6 @@ GLIBCXX_3.4.35 { _ZSt15__get_once_callv; #endif - # Module inititialization symbols for std and std.compat modules. - _ZGIW3std; - _ZGIW3stdW6compat; - } GLIBCXX_3.4.34; # Symbols in the support library (libsupc++) have their own tag. diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 35a497a1588..55a8c88a0e1 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -145,8 +145,7 @@ 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++23/libmodulesconvenience.la + $(top_builddir)/src/c++20/libc++20convenience.la libstdc___la_DEPENDENCIES = \ ${version_dep} \ @@ -154,8 +153,7 @@ 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++23/libmodulesconvenience.la + $(top_builddir)/src/c++20/libc++20convenience.la if ENABLE_DARWIN_AT_RPATH libstdc___darwin_rpath = -Wc,-nodefaultrpaths diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 811d0a5ce4a..f0ad019a71f 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -555,8 +555,7 @@ 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++23/libmodulesconvenience.la + $(top_builddir)/src/c++20/libc++20convenience.la libstdc___la_DEPENDENCIES = \ ${version_dep} \ @@ -564,8 +563,7 @@ 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++23/libmodulesconvenience.la + $(top_builddir)/src/c++20/libc++20convenience.la @ENABLE_DARWIN_AT_RPATH_TRUE@libstdc___darwin_rpath = \ @ENABLE_DARWIN_AT_RPATH_TRUE@ -Wc,-nodefaultrpaths \ diff --git a/libstdc++-v3/src/c++23/Makefile.am b/libstdc++-v3/src/c++23/Makefile.am index 019241b884d..b031ec69576 100644 --- a/libstdc++-v3/src/c++23/Makefile.am +++ b/libstdc++-v3/src/c++23/Makefile.am @@ -23,13 +23,10 @@ include $(top_srcdir)/fragment.am # Convenience library for C++23 runtime. -# This libc++23convenience.la one isn't linked into libstdc++.la yet, -# so build an additional libmodulesconvenience.la which is linked in. -noinst_LTLIBRARIES = libc++23convenience.la libmodulesconvenience.la +noinst_LTLIBRARIES = libc++23convenience.la -# Module std support. +# Module std support. Not compiled for now, only installed. # Let's install the interface units in the bits subdirectory. -# We also compile them and include them in libmodulesconvenience.la toolexeclib_DATA = libstdc++.modules.json includebitsdir = $(gxx_include_dir)/bits includebits_DATA = std.cc std.compat.cc @@ -62,9 +59,6 @@ stamp-modules-bits: $(includebits_DATA) all-local: stamp-module-manifest stamp-modules-bits -clean-local: - rm -rf stamp* libstdc++.modules.json std.cc std.compat.cc gcm.cache - headers = if ENABLE_EXTERN_TEMPLATE @@ -86,27 +80,12 @@ else libc__23convenience_la_SOURCES = endif -libmodulesconvenience_la_SOURCES = std.cc std.compat.cc - # Use C++26 so that std::filebuf::native_handle() is available. print.lo: print.cc $(LTCXXCOMPILE) -std=gnu++26 -c $< print.o: print.cc $(CXXCOMPILE) -std=gnu++26 -c $< -MODULES_FLAGS = -isystem ${glibcxx_srcdir}/include/backward -fmodules \ - -Wno-unknown-pragmas - -# These go into libmodulesconvenience.la and are linked into libstdc++ -std.lo: std.cc - $(LTCXXCOMPILE) $(MODULES_FLAGS) -c $< -std.o: std.cc - $(CXXCOMPILE) $(MODULES_FLAGS) -c $< -std.compat.lo: std.compat.cc std.lo - $(LTCXXCOMPILE) $(MODULES_FLAGS) -c $< -std.compat.o: std.compat.cc std.o - $(CXXCOMPILE) $(MODULES_FLAGS) -c $< - # AM_CXXFLAGS needs to be in each subdirectory so that it can be # modified in a per-library or per-sub-library way. Need to manually # set this option because CONFIG_CXXFLAGS has to be after diff --git a/libstdc++-v3/src/c++23/Makefile.in b/libstdc++-v3/src/c++23/Makefile.in index ac3830f569f..fd9110ab8ad 100644 --- a/libstdc++-v3/src/c++23/Makefile.in +++ b/libstdc++-v3/src/c++23/Makefile.in @@ -133,10 +133,6 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -libmodulesconvenience_la_LIBADD = -am_libmodulesconvenience_la_OBJECTS = std.lo std.compat.lo -libmodulesconvenience_la_OBJECTS = \ - $(am_libmodulesconvenience_la_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -163,8 +159,7 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(libc__23convenience_la_SOURCES) \ - $(libmodulesconvenience_la_SOURCES) +SOURCES = $(libc__23convenience_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -462,13 +457,10 @@ WARN_CXXFLAGS = \ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) # Convenience library for C++23 runtime. -# This libc++23convenience.la one isn't linked into libstdc++.la yet, -# so build an additional libmodulesconvenience.la which is linked in. -noinst_LTLIBRARIES = libc++23convenience.la libmodulesconvenience.la +noinst_LTLIBRARIES = libc++23convenience.la -# Module std support. +# Module std support. Not compiled for now, only installed. # Let's install the interface units in the bits subdirectory. -# We also compile them and include them in libmodulesconvenience.la toolexeclib_DATA = libstdc++.modules.json includebitsdir = $(gxx_include_dir)/bits includebits_DATA = std.cc std.compat.cc @@ -481,10 +473,6 @@ headers = sources = stacktrace.cc print.cc @GLIBCXX_HOSTED_FALSE@libc__23convenience_la_SOURCES = @GLIBCXX_HOSTED_TRUE@libc__23convenience_la_SOURCES = $(sources) $(inst_sources) -libmodulesconvenience_la_SOURCES = std.cc std.compat.cc -MODULES_FLAGS = -isystem ${glibcxx_srcdir}/include/backward -fmodules \ - -Wno-unknown-pragmas - # AM_CXXFLAGS needs to be in each subdirectory so that it can be # modified in a per-library or per-sub-library way. Need to manually @@ -598,9 +586,6 @@ clean-noinstLTLIBRARIES: libc++23convenience.la: $(libc__23convenience_la_OBJECTS) $(libc__23convenience_la_DEPENDENCIES) $(EXTRA_libc__23convenience_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libc__23convenience_la_OBJECTS) $(libc__23convenience_la_LIBADD) $(LIBS) -libmodulesconvenience.la: $(libmodulesconvenience_la_OBJECTS) $(libmodulesconvenience_la_DEPENDENCIES) $(EXTRA_libmodulesconvenience_la_DEPENDENCIES) - $(AM_V_CXXLD)$(CXXLINK) $(libmodulesconvenience_la_OBJECTS) $(libmodulesconvenience_la_LIBADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -754,8 +739,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-local \ - clean-noinstLTLIBRARIES mostlyclean-am +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -824,15 +809,15 @@ uninstall-am: uninstall-includebitsDATA uninstall-toolexeclibDATA .MAKE: install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ - clean-generic clean-libtool clean-local \ - clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-includebitsDATA install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip install-toolexeclibDATA \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags dvi dvi-am \ + html html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am \ + install-includebitsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip install-toolexeclibDATA \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ @@ -870,9 +855,6 @@ stamp-modules-bits: $(includebits_DATA) all-local: stamp-module-manifest stamp-modules-bits -clean-local: - rm -rf stamp* libstdc++.modules.json std.cc std.compat.cc gcm.cache - vpath % $(top_srcdir)/src/c++23 # Use C++26 so that std::filebuf::native_handle() is available. @@ -881,16 +863,6 @@ print.lo: print.cc print.o: print.cc $(CXXCOMPILE) -std=gnu++26 -c $< -# These go into libmodulesconvenience.la and are linked into libstdc++ -std.lo: std.cc - $(LTCXXCOMPILE) $(MODULES_FLAGS) -c $< -std.o: std.cc - $(CXXCOMPILE) $(MODULES_FLAGS) -c $< -std.compat.lo: std.compat.cc std.lo - $(LTCXXCOMPILE) $(MODULES_FLAGS) -c $< -std.compat.o: std.compat.cc std.o - $(CXXCOMPILE) $(MODULES_FLAGS) -c $< - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: