Module Name: src
Committed By: mrg
Date: Fri Jul 22 21:28:32 UTC 2022
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile
Log Message:
atomicity.cc has moved into libsupc++ for everyone.
this was a workaround we applied for sparc in PR#54660, and
now is used for all platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/lib/libsupc++/Makefile
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.51 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.52
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.51 Fri Jul 22 07:09:21 2022
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Fri Jul 22 21:28:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2022/07/22 07:09:21 mrg Exp $
+# $NetBSD: Makefile,v 1.52 2022/07/22 21:28:32 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -145,7 +145,6 @@ BUILDSYMLINKS+= \
${GLIBCXX_SRCDIR}/${G_CMONEY_CC} monetary_members.cc \
${GLIBCXX_SRCDIR}/${G_CNUMERIC_CC} numeric_members.cc \
${GLIBCXX_SRCDIR}/${G_CTIME_CC} time_members.cc \
- ${GLIBCXX_SRCDIR}/${G_ATOMICITY_SRCDIR}/atomicity.h atomicity.cc \
${GLIBCXX_SRCDIR}/${G_CLOCALE_CC} c++locale.cc \
${GLIBCXX_SRCDIR}/${G_BASIC_FILE_CC} basic_file.cc \
${DIST}/libiberty/cp-demangle.c cp-demangle.c \
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile:1.13 src/external/gpl3/gcc/lib/libsupc++/Makefile:1.14
--- src/external/gpl3/gcc/lib/libsupc++/Makefile:1.13 Tue Apr 21 05:23:41 2020
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile Fri Jul 22 21:28:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/04/21 05:23:41 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2022/07/22 21:28:32 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -25,14 +25,9 @@ SHLIB_MINOR= 0
SRCS= ${LIBSUPCXXSRCS} xmalloc.c
CXXFLAGS+= ${G_SECTION_FLAGS}
-# XXX PR#54660
-.if ${MACHINE} == "sparc"
-SRCS+= atomicity.cc
-DIST= ${GCCDIST}
GLIBCXX_SRCDIR= ${DIST}/libstdc++-v3
BUILDSYMLINKS+= \
${GLIBCXX_SRCDIR}/${G_ATOMICITY_SRCDIR}/atomicity.h atomicity.cc
-.endif
COPTS.cp-demangle.c = -Wno-stack-protector -Wno-unused-function
