Module Name: src
Committed By: mrg
Date: Wed Feb 21 09:06:57 UTC 2024
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile.common
Log Message:
build the C++20 sstream-inst.cc.
fixes link errors in libreoffice reported by rjs on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/gpl3/gcc/lib/libsupc++/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.54 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.55
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.54 Tue Aug 1 05:57:57 2023
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Wed Feb 21 09:06:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2023/08/01 05:57:57 mrg Exp $
+# $NetBSD: Makefile,v 1.55 2024/02/21 09:06:56 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -161,7 +161,8 @@ BUILDSYMLINKS+= \
codecvt 98 11 \
cow-string-inst 11 17 \
ostream-inst 11 17 \
- string-inst 11 17
+ string-inst 11 17 \
+ sstream-inst 11 20
BUILDSYMLINKS+= \
${GLIBCXX_SRCDIR}/src/c++${_V1}/${_N}.cc c${_V1}-${_N}.cc
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile.common
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.20 src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.21
--- src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.20 Fri Jul 22 07:09:25 2022
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Wed Feb 21 09:06:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2022/07/22 07:09:25 mrg Exp $
+# $NetBSD: Makefile.common,v 1.21 2024/02/21 09:06:56 mrg Exp $
DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
@@ -18,20 +18,24 @@ LIBSTDCXX_MACHINE_ARCH=${GCC_MACHINE_ARC
# Deal with renamed sources. Needs to match a loop in libstdc++-v3/Makefile.
BUILD_CPP98_SOURCES= ${G_CPP98_SOURCES:Ncodecvt.cc} \
c98-codecvt.cc
-BUILD_CPP11_SOURCES= ${G_CPP11_SOURCES:Ncodecvt.cc:Ncow-string-inst.cc:Nostream-inst.cc:Nstring-inst.cc} \
+BUILD_CPP11_SOURCES= ${G_CPP11_SOURCES:Ncodecvt.cc:Ncow-string-inst.cc:Nostream-inst.cc:Nstring-inst.cc:Nsstream-inst.cc} \
c11-codecvt.cc \
c11-cow-string-inst.cc \
c11-ostream-inst.cc \
- c11-string-inst.cc
+ c11-string-inst.cc \
+ c11-sstream-inst.cc
BUILD_CPP17_SOURCES= ${G_CPP17_SOURCES:Ncow-string-inst.cc:Nostream-inst.cc:Nstring-inst.cc} \
c17-cow-string-inst.cc \
c17-ostream-inst.cc \
c17-string-inst.cc
+BUILD_CPP20_SOURCES= ${G_CPP20_SOURCES:Nsstream-inst.cc} \
+ c20-sstream-inst.cc
LIBSTDCXXSRCS= ${G_SRC_SOURCES} \
${BUILD_CPP98_SOURCES} \
${BUILD_CPP11_SOURCES} \
- ${BUILD_CPP17_SOURCES}
+ ${BUILD_CPP17_SOURCES} \
+ ${BUILD_CPP20_SOURCES}
# XXX XXX dir.o doesn't have <deque> stuff properly, leave it out for now
#LIBSTDCXXSRCS+= ${G_FILESYSTEM_SOURCES}
@@ -94,6 +98,10 @@ COPTS.${_f}+= -std=gnu++1z
COPTS.${_f}+= -std=gnu++17 -fimplicit-templates
.endfor
+.for _f in ${BUILD_CPP20_SOURCES}
+COPTS.${_f}+= -std=gnu++20 -fimplicit-templates
+.endfor
+
.for _f in dir ops fs_dir fs_ops cow-fs_dir cow-fs_ops
${_f}.o ${_f}.d ${_f}.pico ${_f}.po: bits/largefile-config.h
.endfor
