Module Name: src Committed By: mrg Date: Tue Jan 22 23:55:54 UTC 2019
Modified Files: src/external/gpl3/gcc/lib: Makefile.gthr src/external/gpl3/gcc/lib/libgomp: Makefile src/external/gpl3/gcc/lib/libstdc++-v3: Makefile src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile src/external/gpl3/gcc/lib/libsupc++: Makefile.common Log Message: - fix Makefile.gthr CONFIG_LINKS handling. demand only that gthr-default.h source be found. fix installing the symlink. - -Wno-error=incompatible-pointer-types needed for libgomp/lock.c - build new libsupc++ files with -std=gnu++1z - install new libstdc++ bits files. (XXX use bits_sup_headers from libstdc++/include/Makefile.am with mknative-gccm) - start to get libstdc++ to build: various flag updates. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/Makefile.gthr cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gcc/lib/libgomp/Makefile cvs rdiff -u -r1.35 -r1.36 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile cvs rdiff -u -r1.21 -r1.22 \ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile cvs rdiff -u -r1.9 -r1.10 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/Makefile.gthr diff -u src/external/gpl3/gcc/lib/Makefile.gthr:1.2 src/external/gpl3/gcc/lib/Makefile.gthr:1.3 --- src/external/gpl3/gcc/lib/Makefile.gthr:1.2 Sat Jan 19 20:02:06 2019 +++ src/external/gpl3/gcc/lib/Makefile.gthr Tue Jan 22 23:55:54 2019 @@ -1,22 +1,43 @@ -# $NetBSD: Makefile.gthr,v 1.2 2019/01/19 20:02:06 mrg Exp $ +# $NetBSD: Makefile.gthr,v 1.3 2019/01/22 23:55:54 mrg Exp $ # makefile fragment to setup files selected by configure .if ${MKGCC} != "no" LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/} +LIBGCC_DIST=${DIST}/libgcc -. -include "${DIST}/../lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}/gthr-defs.mk" +. include "${DIST}/../lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}/gthr-defs.mk" -CONFIG_LINKS= \ - ${G_enable_execute_stack} enable-execute-stack.c \ - ${G_unwind_header} unwind.h \ - ${G_md_unwind_header} md-unwind-support.h \ - ${G_sfp_machine_header} sfp-machine.h \ +.if !empty(G_enable_execute_stack) +CONFIG_LINKS+= \ + ${G_enable_execute_stack} enable-execute-stack.c +.endif + +.if !empty(G_unwind_header) +CONFIG_LINKS+= \ + ${G_unwind_header} unwind.h +.endif + +.if !empty(G_md_unwind_header) +CONFIG_LINKS+= \ + ${G_md_unwind_header} md-unwind-support.h +.endif + +.if !empty(G_sfp_machine_header) +CONFIG_LINKS+= \ + ${G_sfp_machine_header} sfp-machine.h +.endif + +# Demand this one exists. +CONFIG_LINKS+= \ ${G_thread_header} gthr-default.h + BUILDSYMLINKS+= ${CONFIG_LINKS} . for _src _dst in ${CONFIG_LINKS} DPSRCS+= ${_dst} . endfor +.PATH: ${LIBGCC_DIST} ${LIBGCC_DIST}/config + .endif Index: src/external/gpl3/gcc/lib/libgomp/Makefile diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.20 src/external/gpl3/gcc/lib/libgomp/Makefile:1.21 --- src/external/gpl3/gcc/lib/libgomp/Makefile:1.20 Sun Aug 12 21:48:57 2018 +++ src/external/gpl3/gcc/lib/libgomp/Makefile Tue Jan 22 23:55:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2018/08/12 21:48:57 mrg Exp $ +# $NetBSD: Makefile,v 1.21 2019/01/22 23:55:54 mrg Exp $ # build GCC's libgomp, so that -fopenmp works. @@ -91,4 +91,7 @@ libinstall:: COPTS+= -Wno-stack-protector -Wno-missing-prototypes COPTS.oacc-mem.c+= -Wno-pointer-arith +COPTS.lock.c+= -Wno-error=incompatible-pointer-types + + .PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.35 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.36 --- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.35 Sat Jan 19 17:11:02 2019 +++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Tue Jan 22 23:55:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/01/19 17:11:02 mrg Exp $ +# $NetBSD: Makefile,v 1.36 2019/01/22 23:55:54 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -52,14 +52,16 @@ SHLIB_MINOR= 1 SUBDIR= include SRCS= ${LIBSUPCXXSRCS} ${LIBSTDCXXSRCS} + +CXXFLAGS+= -fno-implicit-templates +CPPFLAGS+= -I${DIST}/libstdc++-v3/include +CPPFLAGS+= -I${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH} +CPPFLAGS+= -D_GLIBCXX_SHARED -DGTHREAD_USE_WEAK -DSUPPORTS_WEAK + # affects profiling; can't switch it off just for profiling easily. #CXXFLAGS+= ${G_SECTION_FLAGS} #CXXFLAGS+= -ffunction-sections -fdata-sections -CXXFLAGS+= -fno-implicit-templates -fdiagnostics-show-location=once -CPPFLAGS+= -I${DIST}/libstdc++-v3/include -CPPFLAGS+= -I${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH} -# include backwards compatible code -CPPFLAGS+= -D_GLIBCXX_SHARED -DGTHREAD_USE_WEAK -DSUPPORTS_WEAK +COPTS.bitmap_allocator.cc+= -ffunction-sections -fdata-sections CONF= ${DIST}/libstdc++-v3/config @@ -82,8 +84,12 @@ COPTS.cxx11-locale-inst.cc +=-Wno-stack- COPTS.cxx11-wlocale-inst.cc +=-Wno-stack-protector COPTS.compatibility-thread-c++0x.cc += -Wno-deprecated-declarations COPTS.concept-inst.cc += -fimplicit-templates +COPTS.collate_members_cow.cc += -fimplicit-templates +COPTS.messages_members_cow.cc += -fimplicit-templates +COPTS.monetary_members_cow.cc += -fimplicit-templates +COPTS.numeric_members_cow.cc += -fimplicit-templates COPTS.hashtable_c++0x.cc += -fimplicit-templates -COPTS.bitmap_allocator.cc += -fimplicit-templates +COPTS.c++locale.cc += -fimplicit-templates COPTS.functexcept.cc += -Wno-deprecated-declarations COPTS.future.cc += -Wno-deprecated-declarations COPTS.shared_ptr.cc += -Wno-deprecated-declarations Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.21 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.22 --- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.21 Sat Jan 19 20:02:06 2019 +++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Tue Jan 22 23:55:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/01/19 20:02:06 mrg Exp $ +# $NetBSD: Makefile,v 1.22 2019/01/22 23:55:54 mrg Exp $ .include <bsd.init.mk> @@ -16,8 +16,15 @@ INCS+= gthr.h gthr-single.h gthr-posix. INCS+= ${BUILDINCS} # libsupc++ -INCS+= nested_exception.h hash_bytes.h atomic_lockfree_defines.h -INCS+= cxxabi_forced.h exception_defines.h exception_ptr.h +# XXX use bits_sup_headers from libstdc++/include/Makefile.am +INCS+= atomic_lockfree_defines.h \ + cxxabi_forced.h \ + cxxabi_init_exception.h \ + exception.h \ + exception_defines.h \ + exception_ptr.h \ + hash_bytes.h \ + nested_exception.h .if ${MKCOMPAT} != no && !empty(MACHINE_ARCH:M*64*) SUBDIR+= arch @@ -27,7 +34,7 @@ INCS+= c++config.h INCSDIR= /usr/include/g++/bits -SYMLINKS+= ${INCSDIR}/gthr-posix.h ${INCSDIR}/gthr-default.h +INCSYMLINKS+= gthr-posix.h ${INCSDIR}/gthr-default.h .include "${.CURDIR}/../Makefile.includes" Index: src/external/gpl3/gcc/lib/libsupc++/Makefile.common diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.9 src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.10 --- src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.9 Tue Mar 15 06:13:47 2016 +++ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Tue Jan 22 23:55:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2016/03/15 06:13:47 mrg Exp $ +# $NetBSD: Makefile.common,v 1.10 2019/01/22 23:55:54 mrg Exp $ DIST= ${GCCDIST} GNUHOSTDIST= ${DIST} @@ -36,3 +36,13 @@ STD_GNU14= del_ops del_opvs .for _f in ${STD_GNU14} COPTS.${_f}.cc= -std=gnu++14 -Wno-sized-deallocation .endfor + +STD_GNU1Z= new_opa new_opant \ + new_opva new_opvant \ + del_opa del_opant del_opsa \ + del_opva del_opvant del_opvsa + +.for _f in ${STD_GNU1Z} +COPTS.${_f}.cc= -std=gnu++1z +.endfor +