From 8daf306b1410a2879c038f34274c241efdd64dfd Mon Sep 17 00:00:00 2001
From: martin <martin@NetBSD.org>
Date: Wed, 22 Apr 2020 18:25:10 +0000
Subject: [PATCH] Pull up following revision(s) (requested by mrg in ticket
 #843):

	external/gpl3/gcc/lib/libsupc++/Makefile: revision 1.13

pull in atomicity.h (atomicity.cc) on sparc.  3 of the objects
use these interfaces and this avoids link errors

fixes PR#54660.
---
 external/gpl3/gcc/lib/libsupc++/Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/external/gpl3/gcc/lib/libsupc++/Makefile b/external/gpl3/gcc/lib/libsupc++/Makefile
index e2ced4c0c648..3b993e650ff3 100644
--- a/external/gpl3/gcc/lib/libsupc++/Makefile
+++ b/external/gpl3/gcc/lib/libsupc++/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2019/01/19 17:11:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.12.2.1 2020/04/22 18:25:10 martin Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -25,6 +25,15 @@ 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
 
 .include "../Makefile.gthr"