Skip to content

Commit 25be51d

Browse files
MartinHusemannMartinHusemann
committed
Pull up following revision(s) (requested by christos in ticket #9):
 external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/defs.mk: revision 1.12 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/earm/tm.h: revision 1.8 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/defs.mk: revision 1.13 external/gpl3/gcc/dist/libstdc++-v3/config/locale/generic/time_members.cc: revision 1.2 external/gpl3/gcc/usr.bin/gcc/arch/arm/defs.mk: revision 1.18 external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/tm.h: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/tm.h: revision 1.6 external/gpl3/gcc/lib/libstdc++-v3/arch/vax/defs.mk: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/defs.mk: revision 1.12 external/gpl3/gcc/usr.bin/gcc/arch/earmv4/tm.h: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/sparc64/tm.h: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/auto-host.h: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/sparc64/auto-host.h: revision 1.16 external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/defs.mk: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/earmv6/auto-host.h: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/defs.mk: revision 1.11 external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/c++config.h: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/auto-host.h: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/armeb/tm.h: revision 1.10 external/gpl3/gcc/usr.bin/gcc/arch/earmeb/tm.h: revision 1.8 external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk: revision 1.16 external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/defs.mk: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/defs.mk: revision 1.14 external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/defs.mk: revision 1.16 external/gpl3/gcc/usr.bin/gcc/arch/earmv7/tm.h: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/vax/defs.mk: revision 1.17 external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/defs.mk: revision 1.15 external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/tm.h: revision 1.5 external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/auto-host.h: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/symver-config.h: revision 1.3 external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/defs.mk: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/defs.mk: revision 1.11 external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb/defs.mk: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/alpha/tm.h: revision 1.5 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/tm.h: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/defs.mk: revision 1.13 external/gpl3/gcc/dist/libstdc++-v3/include/bits/locale_facets_nonio.h: revision 1.2 external/gpl3/gcc/usr.bin/gcc/arch/earmv4/defs.mk: revision 1.14 external/gpl3/gcc/usr.bin/gcc/arch/x86_64/auto-host.h: revision 1.18 external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/auto-host.h: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/hppa/tm.h: revision 1.7 external/gpl3/gcc/usr.bin/gcc/arch/powerpc/auto-host.h: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/sparc/tm.h: revision 1.5 external/gpl3/gcc/usr.bin/gcc/arch/ia64/defs.mk: revision 1.9 external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/defs.mk: revision 1.12 external/gpl3/gcc/usr.bin/gcc/arch/sparc/defs.mk: revision 1.16 external/gpl3/gcc/usr.bin/gcc/arch/x86_64/defs.mk: revision 1.19 external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/defs.mk: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/m68000/defs.mk: revision 1.15 external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/defs.mk: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/earmeb/auto-host.h: revision 1.14 external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/defs.mk: revision 1.5 external/gpl3/gcc/usr.bin/gcc/arch/earmeb/defs.mk: revision 1.15 external/gpl3/gcc/usr.bin/gcc/arch/earmv7/auto-host.h: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/defs.mk: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/earm/defs.mk: revision 1.17 external/gpl3/gcc/usr.bin/gcc/arch/sh3el/tm.h: revision 1.5 external/gpl3/gcc/usr.bin/gcc/arch/sparc64/defs.mk: revision 1.16 external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/defs.mk: revision 1.12 external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/tm.h: revision 1.6 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/defs.mk: revision 1.11 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/arm/tm.h: revision 1.9 external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/tm.h: revision 1.8 external/gpl3/gcc/usr.bin/gcc/arch/mips64el/defs.mk: revision 1.16 external/gpl3/gcc/usr.bin/gcc/arch/mipseb/defs.mk: revision 1.17 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/defs.mk: revision 1.12 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/tm.h: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/sh3el/defs.mk: revision 1.16 external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/defs.mk: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/earmv4/auto-host.h: revision 1.12 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/defs.mk: revision 1.11 external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/sparc/auto-host.h: revision 1.14 external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk: revision 1.15 external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/auto-host.h: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h: revision 1.5 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/defs.mk: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/powerpc/tm.h: revision 1.8 external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/tm.h: revision 1.6 external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk: revision 1.15 external/gpl3/gcc/lib/libiberty/defs.mk: revision 1.22 external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/mipseb/tm.h: revision 1.6 external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/defs.mk: revision 1.12 external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/symver-config.h: revision 1.2 external/gpl3/gcc/usr.bin/gcc/arch/x86_64/tm.h: revision 1.6 external/gpl3/gcc/lib/libstdc++-v3/Makefile: revision 1.48 external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk: revision 1.5 external/gpl3/gcc/dist/libstdc++-v3/src/c++11/ctype.cc: revision 1.2 external/gpl3/gcc/lib/libstdc++-v3/arch/earm/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/riscv64/multilib.h: revision 1.3 external/gpl3/gcc/usr.bin/gcc/arch/m68k/defs.mk: revision 1.17 external/gpl3/gcc/usr.bin/gcc/arch/earm/auto-host.h: revision 1.16 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/i386/tm.h: revision 1.5 external/gpl3/gcc/usr.bin/gcc/arch/armeb/defs.mk: revision 1.18 external/gpl3/gcc/usr.bin/gcc/arch/earmv6/defs.mk: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/arm/auto-host.h: revision 1.14 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/auto-host.h: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/mips64el/tm.h: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/m68k/tm.h: revision 1.7 external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/defs.mk: revision 1.12 external/gpl3/gcc/usr.bin/gcc/arch/i386/defs.mk: revision 1.17 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/tm.h: revision 1.6 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/armeb/auto-host.h: revision 1.17 external/gpl3/gcc/usr.bin/gcc/arch/earmhf/tm.h: revision 1.8 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/tm.h: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/auto-host.h: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/earmv6/tm.h: revision 1.6 external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h: revision 1.15 external/gpl3/gcc/dist/libstdc++-v3/configure: revision 1.12 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/defs.mk: revision 1.11 external/gpl3/gcc/usr.bin/gcc/arch/hppa/defs.mk: revision 1.16 external/gpl3/gcc/usr.bin/gcc/arch/alpha/defs.mk: revision 1.15 external/gpl3/gcc/usr.bin/gcc/arch/aarch64/tm.h: revision 1.3 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/defs.mk: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/mipsel/defs.mk: revision 1.17 external/gpl3/gcc/usr.bin/gcc/arch/mipsel/tm.h: revision 1.6 external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/defs.mk: revision 1.11 external/gpl3/gcc/lib/libstdc++-v3/arch/arm/defs.mk: revision 1.11 external/gpl3/gcc/dist/libstdc++-v3/acinclude.m4: revision 1.7 external/gpl3/gcc/usr.bin/gcc/arch/ia64/tm.h: revision 1.5 external/gpl3/gcc/usr.bin/gcc/arch/vax/tm.h: revision 1.6 external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h: revision 1.8 external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/c++config.h: revision 1.8 external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h: revision 1.15 external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/auto-host.h: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/powerpc/defs.mk: revision 1.19 external/gpl3/gcc/usr.bin/gcc/arch/earmv7/defs.mk: revision 1.13 external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/defs.mk: revision 1.8 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/defs.mk: revision 1.13 external/gpl3/gcc/usr.bin/gcc/arch/m68000/tm.h: revision 1.6 Arrange so that the Makefile works for both the generic and the dragonfly locale code. There is no specialized constructor for ctype<char> so the destructor ends up trying to free uninitialized memory for _M_c_locale_ctype. Add a forward declaration for the specialized __timepunct<wchar_t> destructor that the dragonfly code needs to avoid "instantiation before specialization", and an empty implementation for the generic code. Use the dragonfly locale code for NetBSD too. Manually patch the locale configuration to use the dragonfly code instead of generic. regen mknative for everyone after: - NETBSD_ENABLE_PTHREADS removed (default always) - HAVE_GNU_INDIRECT_FUNCTION enabled for some platforms - switch to dragondfly bsd locale routines after christos made them work for us
1 parent 6ddfd03 commit 25be51d

139 files changed

Lines changed: 661 additions & 742 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎external/gpl3/gcc/dist/libstdc++-v3/acinclude.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2416,7 +2416,7 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
24162416
darwin*)
24172417
enable_clocale_flag=darwin
24182418
;;
2419-
dragonfly* | freebsd*)
2419+
dragonfly* | freebsd* | netbsd*)
24202420
enable_clocale_flag=dragonfly
24212421
;;
24222422
openbsd*)
@@ -2512,7 +2512,7 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
25122512
;;
25132513
25142514
dragonfly)
2515-
AC_MSG_RESULT(dragonfly or freebsd)
2515+
AC_MSG_RESULT(dragonfly or freebsd or netbsd)
25162516
25172517
CLOCALE_H=config/locale/dragonfly/c_locale.h
25182518
CLOCALE_CC=config/locale/dragonfly/c_locale.cc

‎external/gpl3/gcc/dist/libstdc++-v3/config/locale/generic/time_members.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
205205
_M_data->_M_amonth11 = L"Nov";
206206
_M_data->_M_amonth12 = L"Dec";
207207
}
208+
template<>
209+
__timepunct<wchar_t>::~__timepunct()
210+
{
211+
}
208212
#endif
209213

210214
_GLIBCXX_END_NAMESPACE_VERSION

‎external/gpl3/gcc/dist/libstdc++-v3/configure‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15848,7 +15848,7 @@ fi
1584815848
darwin*)
1584915849
enable_clocale_flag=darwin
1585015850
;;
15851-
dragonfly* | freebsd*)
15851+
dragonfly* | freebsd* | netbsd*)
1585215852
enable_clocale_flag=dragonfly
1585315853
;;
1585415854
openbsd*)
@@ -15997,8 +15997,8 @@ $as_echo "darwin" >&6; }
1599715997
;;
1599815998

1599915999
dragonfly)
16000-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: dragonfly or freebsd" >&5
16001-
$as_echo "dragonfly or freebsd" >&6; }
16000+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: dragonfly or freebsd or netbsd" >&5
16001+
$as_echo "dragonfly or freebsd or netbsd" >&6; }
1600216002

1600316003
CLOCALE_H=config/locale/dragonfly/c_locale.h
1600416004
CLOCALE_CC=config/locale/dragonfly/c_locale.cc

‎external/gpl3/gcc/dist/libstdc++-v3/include/bits/locale_facets_nonio.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
327327
__timepunct<char>::_M_put(char*, size_t, const char*, const tm*) const throw ();
328328

329329
#ifdef _GLIBCXX_USE_WCHAR_T
330+
template<>
331+
__timepunct<wchar_t>::~__timepunct();
330332
template<>
331333
void
332334
__timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc);

‎external/gpl3/gcc/dist/libstdc++-v3/src/c++11/ctype.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
5353

5454
ctype<char>::~ctype()
5555
{
56+
#if 0
57+
// There is no constructor for the char specialization, and
58+
// _M_c_locale_ctype is uninitialized, found by jemalloc
5659
_S_destroy_c_locale(_M_c_locale_ctype);
60+
#endif
5761
if (_M_del)
5862
delete[] this->table();
5963
}

‎external/gpl3/gcc/lib/libiberty/defs.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
#
55
G_ALLOCA=
66
G_EXTRA_OFILES=
7-
G_LIBOBJS=mempcpy.o strverscmp.o vfork.o
7+
G_LIBOBJS=mempcpy.o strverscmp.o
88
G_REQUIRED_OFILES=regex.o cplus-dem.o cp-demangle.o md5.o sha1.o alloca.o argv.o choose-temp.o concat.o cp-demint.o crc32.o d-demangle.o dwarfnames.o dyn-string.o fdmatch.o fibheap.o filename_cmp.o floatformat.o fnmatch.o fopen_unlocked.o getopt.o getopt1.o getpwd.o getruntime.o hashtab.o hex.o lbasename.o lrealpath.o make-relative-prefix.o make-temp-file.o objalloc.o obstack.o partition.o pexecute.o physmem.o pex-common.o pex-one.o pex-unix.o vprintf-support.o rust-demangle.o safe-ctype.o simple-object.o simple-object-coff.o simple-object-elf.o simple-object-mach-o.o simple-object-xcoff.o sort.o spaces.o splay-tree.o stack-limit.o strerror.o strsignal.o timeval-utils.o unlink-if-ordinary.o xasprintf.o xatexit.o xexit.o xmalloc.o xmemdup.o xstrdup.o xstrerror.o xstrndup.o xvasprintf.o

‎external/gpl3/gcc/lib/libstdc++-v3/Makefile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.47 2019/04/23 20:55:53 christos Exp $
1+
# $NetBSD: Makefile,v 1.47.2.1 2019/08/04 19:09:24 martin Exp $
22

33
REQUIRETOOLS= yes
44
NOLINT= # defined
@@ -66,6 +66,12 @@ CXXFLAGS+= -fno-implicit-templates
6666
CPPFLAGS+= -I${DIST}/libstdc++-v3/include
6767
CPPFLAGS+= -I${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}
6868
CPPFLAGS+= -D_GLIBCXX_SHARED -DGTHREAD_USE_WEAK -DSUPPORTS_WEAK
69+
.if ${G_CLOCALE_CC:M*dragonfly*} != ""
70+
CPPFLAGS+= -I${CONF}/locale/dragonfly
71+
LOCALETYPE= dragonfly
72+
.else
73+
LOCALETYPE= generic
74+
.endif
6975

7076
# affects profiling; can't switch it off just for profiling easily.
7177
#CXXFLAGS+= ${G_SECTION_FLAGS}
@@ -92,6 +98,7 @@ COPTS.snprintf_lite.cc += -Wno-stack-protector
9298
COPTS.cxx11-wlocale-inst.cc +=-Wno-stack-protector
9399
COPTS.cxx11-locale-inst.cc +=-Wno-stack-protector
94100
COPTS.cxx11-wlocale-inst.cc +=-Wno-stack-protector
101+
COPTS.codecvt_members.cc +=-Wno-stack-protector
95102
COPTS.compatibility-thread-c++0x.cc += -Wno-deprecated-declarations
96103
COPTS.concept-inst.cc += -fimplicit-templates
97104
COPTS.collate_members_cow.cc += -fimplicit-templates
@@ -186,7 +193,7 @@ COPTS.${f}.cc+= -fimplicit-templates ${G_GLIBCXX_ABI_FLAGS}
186193
${DIST}/libstdc++-v3/src/filesystem \
187194
${DIST}/libstdc++-v3/libsupc++ \
188195
${DIST}/libstdc++-v3/config/os/bsd/netbsd \
189-
${CONF}/locale/generic \
196+
${CONF}/locale/${LOCALETYPE} \
190197
${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}
191198

192199
${OBJS}: ${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}/defs.mk

‎external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/defs.mk‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ G_CPP98_SOURCES=bitmap_allocator.cc pool_allocator.cc mt_allocator.cc c98-codecv
1616
G_FILESYSTEM_SOURCES=dir.cc ops.cc path.cc cow-dir.cc cow-ops.cc cow-path.cc
1717
G_ATOMICITY_SRCDIR=config/cpu/generic/atomicity_builtins
1818
G_BASIC_FILE_CC=config/io/basic_file_stdio.cc
19-
G_CLOCALE_CC=config/locale/generic/c_locale.cc
20-
G_CCODECVT_CC=config/locale/generic/codecvt_members.cc
21-
G_CCOLLATE_CC=config/locale/generic/collate_members.cc
22-
G_CCTYPE_CC=config/locale/generic/ctype_members.cc
19+
G_CLOCALE_CC=config/locale/dragonfly/c_locale.cc
20+
G_CCODECVT_CC=config/locale/dragonfly/codecvt_members.cc
21+
G_CCOLLATE_CC=config/locale/dragonfly/collate_members.cc
22+
G_CCTYPE_CC=config/locale/dragonfly/ctype_members.cc
2323
G_CMESSAGES_CC=config/locale/generic/messages_members.cc
24-
G_CMONEY_CC=config/locale/generic/monetary_members.cc
25-
G_CNUMERIC_CC=config/locale/generic/numeric_members.cc
26-
G_CTIME_CC=config/locale/generic/time_members.cc
24+
G_CMONEY_CC=config/locale/dragonfly/monetary_members.cc
25+
G_CNUMERIC_CC=config/locale/dragonfly/numeric_members.cc
26+
G_CTIME_CC=config/locale/dragonfly/time_members.cc
2727
G_CPU_OPT_BITS_RANDOM=config/cpu/generic/opt/bits/opt_random.h
2828
G_backward_headers=backward/auto_ptr.h backward/backward_warning.h backward/binders.h backward/hash_map backward/hash_set backward/hash_fun.h backward/hashtable.h backward/strstream
2929
G_c_base_headers_extra=
@@ -50,6 +50,6 @@ G_profile_impl_headers=impl/profiler.h impl/profiler_algos.h impl/profiler_conta
5050
G_BASIC_FILE_H=config/io/basic_file_stdio.h
5151
G_ALLOCATOR_H=config/allocator/new_allocator_base.h
5252
G_CSTDIO_H=config/io/c_io_stdio.h
53-
G_CLOCALE_H=config/locale/generic/c_locale.h
53+
G_CLOCALE_H=config/locale/dragonfly/c_locale.h
5454
G_CMESSAGES_H=config/locale/generic/messages_members.h
55-
G_CTIME_H=config/locale/generic/time_members.h
55+
G_CTIME_H=config/locale/dragonfly/time_members.h

‎external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* Generated from: NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp */
33
/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
44

5-
/* generated for aarch64--netbsd-gcc (NetBSD nb2 20190226) 7.4.0 */
5+
/* generated for aarch64--netbsd-gcc (NetBSD nb3 20190319) 7.4.0 */
66

77
#ifndef GCC_GENERATED_STDINT_H
88
#define GCC_GENERATED_STDINT_H 1

‎external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/defs.mk‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ G_CPP98_SOURCES=bitmap_allocator.cc pool_allocator.cc mt_allocator.cc c98-codecv
1616
G_FILESYSTEM_SOURCES=dir.cc ops.cc path.cc cow-dir.cc cow-ops.cc cow-path.cc
1717
G_ATOMICITY_SRCDIR=config/cpu/generic/atomicity_builtins
1818
G_BASIC_FILE_CC=config/io/basic_file_stdio.cc
19-
G_CLOCALE_CC=config/locale/generic/c_locale.cc
20-
G_CCODECVT_CC=config/locale/generic/codecvt_members.cc
21-
G_CCOLLATE_CC=config/locale/generic/collate_members.cc
22-
G_CCTYPE_CC=config/locale/generic/ctype_members.cc
19+
G_CLOCALE_CC=config/locale/dragonfly/c_locale.cc
20+
G_CCODECVT_CC=config/locale/dragonfly/codecvt_members.cc
21+
G_CCOLLATE_CC=config/locale/dragonfly/collate_members.cc
22+
G_CCTYPE_CC=config/locale/dragonfly/ctype_members.cc
2323
G_CMESSAGES_CC=config/locale/generic/messages_members.cc
24-
G_CMONEY_CC=config/locale/generic/monetary_members.cc
25-
G_CNUMERIC_CC=config/locale/generic/numeric_members.cc
26-
G_CTIME_CC=config/locale/generic/time_members.cc
24+
G_CMONEY_CC=config/locale/dragonfly/monetary_members.cc
25+
G_CNUMERIC_CC=config/locale/dragonfly/numeric_members.cc
26+
G_CTIME_CC=config/locale/dragonfly/time_members.cc
2727
G_CPU_OPT_BITS_RANDOM=config/cpu/generic/opt/bits/opt_random.h
2828
G_backward_headers=backward/auto_ptr.h backward/backward_warning.h backward/binders.h backward/hash_map backward/hash_set backward/hash_fun.h backward/hashtable.h backward/strstream
2929
G_c_base_headers_extra=
@@ -50,6 +50,6 @@ G_profile_impl_headers=impl/profiler.h impl/profiler_algos.h impl/profiler_conta
5050
G_BASIC_FILE_H=config/io/basic_file_stdio.h
5151
G_ALLOCATOR_H=config/allocator/new_allocator_base.h
5252
G_CSTDIO_H=config/io/c_io_stdio.h
53-
G_CLOCALE_H=config/locale/generic/c_locale.h
53+
G_CLOCALE_H=config/locale/dragonfly/c_locale.h
5454
G_CMESSAGES_H=config/locale/generic/messages_members.h
55-
G_CTIME_H=config/locale/generic/time_members.h
55+
G_CTIME_H=config/locale/dragonfly/time_members.h

0 commit comments

Comments
 (0)