- add new filesystem/ sources.

- sync paths.
- remove -Wno-error, doesn't seem to be needed anymore
This commit is contained in:
mrg 2019-01-31 06:50:51 +00:00
parent 7eeb305428
commit fdd0358caf
2 changed files with 43 additions and 19 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.36 2019/01/22 23:55:54 mrg Exp $
# $NetBSD: Makefile,v 1.37 2019/01/31 06:50:51 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -62,6 +62,7 @@ CPPFLAGS+= -D_GLIBCXX_SHARED -DGTHREAD_USE_WEAK -DSUPPORTS_WEAK
#CXXFLAGS+= ${G_SECTION_FLAGS}
#CXXFLAGS+= -ffunction-sections -fdata-sections
COPTS.bitmap_allocator.cc+= -ffunction-sections -fdata-sections
COPTS.pool_allocator.cc+= -ffunction-sections -fdata-sections
CONF= ${DIST}/libstdc++-v3/config
@ -151,18 +152,21 @@ CXX11_ALWAYS= localename.cc \
compatibility-chrono.cc \
compatibility-condvar.cc \
ios_failure.cc
.for _s in ${G_CPP11_SOURCES:M*.cc} ${CXX11_ALWAYS}
COPTS.${_s}+= -std=gnu++11
.endfor
.for _s in ${G_FILESYSTEM_SOURCES:M*.cc}
COPTS.${_s}+= -std=gnu++14
.endfor
.for _s in ${SRCS:M*.cc}
. if empty(COPTS.${_s}:M-std=*)
COPTS.${_s}+= -std=gnu++98
. endif
.endfor
.for _s in ${G_CPP11_SOURCES:M*.cc} ${CXX11_ALWAYS}
# XXX error: 'template<class> class std::auto_ptr' is deprecated
COPTS.${_s}+= -std=gnu++11 -Wno-error
.endfor
COPTS.del_ops.cc += -Wno-c++14-compat
COPTS.del_opvs.cc += -Wno-c++14-compat
COPTS.cp-demangle.c += -Wno-unused-function
COPTS.ext-inst.cc+= -Wno-error
@ -182,6 +186,7 @@ COPTS.${f}.cc+= -fimplicit-templates ${G_GLIBCXX_ABI_FLAGS}
.PATH: ${DIST}/libstdc++-v3/src \
${DIST}/libstdc++-v3/src/c++98 \
${DIST}/libstdc++-v3/src/c++11 \
${DIST}/libstdc++-v3/src/filesystem \
${DIST}/libstdc++-v3/libsupc++ \
${DIST}/libstdc++-v3/config/os/bsd/netbsd \
${CONF}/locale/generic \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.10 2019/01/22 23:55:54 mrg Exp $
# $NetBSD: Makefile.common,v 1.11 2019/01/31 06:50:51 mrg Exp $
DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
@ -12,7 +12,7 @@ LIBSTDCXX_MACHINE_ARCH=${MLIBDIR}
LIBSTDCXX_MACHINE_ARCH=${GCC_MACHINE_ARCH}
.endif
LIBSTDCXXSRCS= ${G_SRC_SOURCES} ${G_CPP98_SOURCES} ${G_CPP11_SOURCES}
LIBSTDCXXSRCS= ${G_SRC_SOURCES} ${G_CPP98_SOURCES} ${G_CPP11_SOURCES} ${G_FILESYSTEM_SOURCES}
LIBSUPCXXSRCS= ${G_LIBSUPCXX_SOURCES} ${G_LIBSUPCXX_C_SOURCES}
CPPFLAGS+= -I${DIST}/gcc
@ -24,25 +24,44 @@ CPPFLAGS+= -DHAVE_STDLIB_H -DHAVE_STRING_H
CPPFLAGS.cp-demangle.c=-DIN_GLIBCPP_V3
STD_GNU11= bad_array_length bad_array_new \
eh_aux_runtime eh_ptr eh_terminate eh_throw \
guard atexit_thread nested_exception \
new_handler new_op new_opnt
STD_GNU11= \
bad_array_length \
bad_array_new \
eh_aux_runtime \
eh_ptr \
eh_terminate \
eh_throw \
guard \
atexit_thread \
nested_exception \
new_handler \
new_op \
new_opnt
.for _f in ${STD_GNU11}
COPTS.${_f}.cc= -std=gnu++11
.endfor
STD_GNU14= del_ops del_opvs
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
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