Tue Apr 21 05:23:42 2020 UTC ()
pull in atomicity.h (atomicity.cc) on sparc.  3 of the objects
use these interfaces and this avoids link errors

fixes PR#54660.


(mrg)
diff -r1.12 -r1.13 src/external/gpl3/gcc/lib/libsupc++/Makefile
cvs diff -r1.12 -r1.13 src/external/gpl3/gcc/lib/libsupc++/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libsupc++/Makefile 2019/01/19 17:11:02 1.12
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile 2020/04/21 05:23:41 1.13
@@ -1,40 +1,49 @@ @@ -1,40 +1,49 @@
1# $NetBSD: Makefile,v 1.12 2019/01/19 17:11:02 mrg Exp $ 1# $NetBSD: Makefile,v 1.13 2020/04/21 05:23:41 mrg Exp $
2 2
3REQUIRETOOLS= yes 3REQUIRETOOLS= yes
4NOLINT= # defined 4NOLINT= # defined
5NOPIC= # defined 5NOPIC= # defined
6NOPROFILE= # defined 6NOPROFILE= # defined
7 7
8CWARNFLAGS.clang+= -Wno-parentheses 8CWARNFLAGS.clang+= -Wno-parentheses
9UNSUPPORTED_COMPILER.clang= # defined 9UNSUPPORTED_COMPILER.clang= # defined
10 10
11.include <bsd.init.mk> 11.include <bsd.init.mk>
12 12
13GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/} 13GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
14 14
15LIB= supc++ 15LIB= supc++
16 16
17.if exists(${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no" 17.if exists(${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
18.include "${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}/defs.mk" 18.include "${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}/defs.mk"
19 19
20SHLIB_MAJOR= 2 20SHLIB_MAJOR= 2
21SHLIB_MINOR= 0 21SHLIB_MINOR= 0
22 22
23.include "${.CURDIR}/../libsupc++/Makefile.common" 23.include "${.CURDIR}/../libsupc++/Makefile.common"
24 24
25SRCS= ${LIBSUPCXXSRCS} xmalloc.c 25SRCS= ${LIBSUPCXXSRCS} xmalloc.c
26CXXFLAGS+= ${G_SECTION_FLAGS} 26CXXFLAGS+= ${G_SECTION_FLAGS}
27 27
 28# XXX PR#54660
 29.if ${MACHINE} == "sparc"
 30SRCS+= atomicity.cc
 31DIST= ${GCCDIST}
 32GLIBCXX_SRCDIR= ${DIST}/libstdc++-v3
 33BUILDSYMLINKS+= \
 34 ${GLIBCXX_SRCDIR}/${G_ATOMICITY_SRCDIR}/atomicity.h atomicity.cc
 35.endif
 36
28COPTS.cp-demangle.c = -Wno-stack-protector -Wno-unused-function 37COPTS.cp-demangle.c = -Wno-stack-protector -Wno-unused-function
29 38
30.include "../Makefile.gthr" 39.include "../Makefile.gthr"
31 40
32.include <bsd.lib.mk> 41.include <bsd.lib.mk>
33 42
34.PATH: ${DIST}/libstdc++-v3/src \ 43.PATH: ${DIST}/libstdc++-v3/src \
35 ${DIST}/libstdc++-v3/libsupc++ \ 44 ${DIST}/libstdc++-v3/libsupc++ \
36 ${DIST}/libiberty \ 45 ${DIST}/libiberty \
37 ${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH} 46 ${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}
38 47
39${OBJS}: ${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}/defs.mk 48${OBJS}: ${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}/defs.mk
40.else 49.else