gcc8snapshot: update to 20180107 snapshot, cleanup patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gcc8snapshot: update to 20180107 snapshot, cleanup patches
From: coypu <coypu%sdf.org@localhost>
Date: Sat, 13 Jan 2018 00:17:27 +0000
Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Sat Jan 13 02:17:27 2018 +0200
Changeset:	acdc3cba6bab4f8f5781676b367c1558824163f6

Modified Files:
	gcc8snapshot/distinfo
	gcc8snapshot/patches/patch-gcc_lto_lto.c
	gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
	gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc
	gcc8snapshot/version.mk
Added Files:
	gcc8snapshot/patches/patch-libgfortran_io_io.h
Removed Files:
	gcc8snapshot/patches/patch-gcc_system.h
	gcc8snapshot/patches/patch-libbacktrace_elf.c
	gcc8snapshot/patches/patch-libcilkrts_configure
	gcc8snapshot/patches/patch-libcilkrts_runtime_os-unix.c
	gcc8snapshot/patches/patch-libdecnumber_decNumber.c
	gcc8snapshot/patches/patch-libgcc_config_i386_cpuinfo.h
	gcc8snapshot/patches/patch-libgfortran_configure
	gcc8snapshot/patches/patch-libgo_Makefile.in
	gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h
	gcc8snapshot/patches/patch-libstdc++-v3_libsupc++_unwind-cxx.h

Log Message:
gcc8snapshot: update to 20180107 snapshot, cleanup patches

cilk: removed upstream.

lto.c: only use workaround if WCONTINUED is not defined, and then try
to fallback to WALLEXIT. apply this for everyone.
newer netbsd (8) has WCONTINUED.

i386/cpuinfo.h: different workaround applied upstream for bug.
Maybe a problem for other OSes: we will apply the upstream variant if
necessary, not a different one.

libgfortran: limit "no weak references" support to just old_locale*

system.h: remove unnecessary patching. netbsd-7 has putc_unlocked etc.
libbacktrace: remove apparently unnecessary patch.
decNumber.c: apparently unnecessary patch.
libgo: remove unnecessary patch.
libsupc++/unwind-cxx.h: remove unnecessary patch.

sync with netbsd ctype (minimal changes needed to compile)

Tested on netbsd-8.99.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=acdc3cba6bab4f8f5781676b367c1558824163f6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gcc8snapshot/distinfo                              | 25 +++-------
 gcc8snapshot/patches/patch-gcc_lto_lto.c           | 28 +++++------
 gcc8snapshot/patches/patch-gcc_system.h            | 27 ----------
 gcc8snapshot/patches/patch-libbacktrace_elf.c      | 13 -----
 gcc8snapshot/patches/patch-libcilkrts_configure    | 13 -----
 .../patches/patch-libcilkrts_runtime_os-unix.c     | 40 ---------------
 .../patches/patch-libdecnumber_decNumber.c         | 13 -----
 .../patches/patch-libgcc_config_i386_cpuinfo.h     | 15 ------
 gcc8snapshot/patches/patch-libgfortran_configure   | 13 -----
 gcc8snapshot/patches/patch-libgfortran_io_io.h     | 18 +++++++
 gcc8snapshot/patches/patch-libgo_Makefile.in       | 17 -------
 ...libstdc++-v3_config_os_bsd_netbsd_ctype__base.h | 57 ++++++++++++++--------
 ..._config_os_bsd_netbsd_ctype__configure__char.cc | 55 +++++++++++++++------
 ...bstdc++-v3_config_os_bsd_netbsd_ctype__inline.h | 13 -----
 .../patch-libstdc++-v3_libsupc++_unwind-cxx.h      | 12 -----
 gcc8snapshot/version.mk                            |  2 +-
 16 files changed, 117 insertions(+), 244 deletions(-)

diffs:
diff --git a/gcc8snapshot/distinfo b/gcc8snapshot/distinfo
index 8be48dec8b..d4422249d6 100644
--- a/gcc8snapshot/distinfo
+++ b/gcc8snapshot/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.23 2015/05/06 05:25:00 keckhardt Exp $
 
-SHA1 (gcc-8-20171022.tar.xz) = 72ad535230682e42f9102cd5fa33c9d17182d33c
-RMD160 (gcc-8-20171022.tar.xz) = 652f498ecf6f54aaa2b935093d1de8d347d80ef8
-SHA512 (gcc-8-20171022.tar.xz) = 815e278b30889d18d74fc8d6984df232f727dcccfe504e7ff7ec592723784d9a45a833fb479141af65cfcd25eb57207fa291649867190525c502cb12ae4391c7
-Size (gcc-8-20171022.tar.xz) = 60335204 bytes
+SHA1 (gcc-8-20180107.tar.xz) = 0a1b721564cc302a90997c8caf3dc8bce7c08eef
+RMD160 (gcc-8-20180107.tar.xz) = 01c6e7d0fee44f1367f298d9a85d047f7dffb35e
+SHA512 (gcc-8-20180107.tar.xz) = 3646cad0a7159ce90b7caa8e1996f54c0a2d39df0872ba61557588671d22da8a3c5c3e50038b3a9b5c3bf7d910feda832cdacede18667a4514a74fd2d00e1a8e
+Size (gcc-8-20180107.tar.xz) = 60588956 bytes
 SHA1 (isl-0.16.1.tar.bz2) = c5a2b201bf05229647e73203c0bf2d9679d4d21f
 RMD160 (isl-0.16.1.tar.bz2) = 5a99db3fe0d0a1f6bbac1ed4448f2403495c55b2
 SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
@@ -17,24 +17,15 @@ SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
 SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
-SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
-SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
+SHA1 (patch-gcc_lto_lto.c) = 7bd85ac8ade76a28c394f6fbe5d495f91824f79f
 SHA1 (patch-isl_configure) = 36b37778ee13c0b364fb24d5864d6a9e65b29b7d
-SHA1 (patch-libbacktrace_elf.c) = d356661933e3cd9ef694b8472c3d03feca8b44cd
-SHA1 (patch-libcilkrts_configure) = 6c2d0f897c4a451d5b4b4fb5b3415d04704c0b0d
-SHA1 (patch-libcilkrts_runtime_os-unix.c) = b25632587d9fbe8ff38377fe34cb16225355b521
-SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762
 SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f
 SHA1 (patch-libgcc_config.host) = bdd4cd27249c8b62793204428d95c977d58f06fb
-SHA1 (patch-libgcc_config_i386_cpuinfo.h) = 2c55385a9440d4991eb265f24e98ba68eef266e1
 SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe
-SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394
-SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
+SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
 SHA1 (patch-libsanitizer_configure.tgt) = 0a47782f01631d1c91e28a8735865c8571fbcf7d
 SHA1 (patch-libsanitizer_sanitizer__common_Makefile.am) = 4cf6c4f5189078e8f092bfefc1f57ff32d5319ee
 SHA1 (patch-libsanitizer_sanitizer__common_Makefile.in) = 62382c683e98bd8f2f27bd07ef01bdfadcdf256a
-SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d1a4af05205279c274a9559d
-SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = 06bba6da02344f76c26eed765a7cb022c035994e
-SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = 626fc1f9c035ac5cef30a92d525af4e778835ebf
-SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1
+SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 1b907114f8b3477400fabc7b84ca5c16cd9c2930
+SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = d498ce411dfcd57652f87957778fab66dd4ab9a0
diff --git a/gcc8snapshot/patches/patch-gcc_lto_lto.c b/gcc8snapshot/patches/patch-gcc_lto_lto.c
index 6c98473427..24548d1d2f 100644
--- a/gcc8snapshot/patches/patch-gcc_lto_lto.c
+++ b/gcc8snapshot/patches/patch-gcc_lto_lto.c
@@ -1,19 +1,19 @@
-$NetBSD: patch-gcc_lto_lto.c,v 1.1 2017/05/03 00:21:03 maya Exp $
+$NetBSD$
 
---- gcc/lto/lto.c.orig	2015-01-30 16:15:00.000000000 +0000
+Better fallback for netbsd<8 lacking WALLSIG.
+
+--- gcc/lto/lto.c.orig	2018-01-03 21:42:12.000000000 +0000
 +++ gcc/lto/lto.c
-@@ -2495,7 +2495,13 @@ wait_for_child ()
+@@ -2321,7 +2321,11 @@ wait_for_child ()
+   do
+     {
  #ifndef WCONTINUED
- #define WCONTINUED 0
+-#define WCONTINUED 0
++#  ifdef WALLSIG
++#    define WCONTINUED WALLSIG
++#  else
++#    define WCONTINUED 0
++#  endif
  #endif
--      int w = waitpid (0, &status, WUNTRACED | WCONTINUED);
-+
-+#if defined(__NetBSD__)
-+      int w = waitpid(0, &status, WUNTRACED | WALLSIG);
-+#else
-+      int w = waitpid(0, &status, WUNTRACED | WCONTINUED);
-+#endif
-+ 
+       int w = waitpid (0, &status, WUNTRACED | WCONTINUED);
        if (w == -1)
- 	fatal_error (input_location, "waitpid failed");
- 
diff --git a/gcc8snapshot/patches/patch-gcc_system.h b/gcc8snapshot/patches/patch-gcc_system.h
deleted file mode 100644
index ea416b0abb..0000000000
--- a/gcc8snapshot/patches/patch-gcc_system.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-gcc_system.h,v 1.1 2017/05/03 00:21:03 maya Exp $
-
---- gcc/system.h.orig	2013-04-29 18:37:29.000000000 +0000
-+++ gcc/system.h
-@@ -72,18 +72,22 @@ along with GCC; see the file COPYING3.  
- 
- #if defined HAVE_DECL_PUTC_UNLOCKED && HAVE_DECL_PUTC_UNLOCKED
- 
-+# if !defined(__NetBSD__)
- # ifdef HAVE_PUTC_UNLOCKED
- #  undef putc
- #  define putc(C, Stream) putc_unlocked (C, Stream)
- # endif
-+# endif
- # ifdef HAVE_PUTCHAR_UNLOCKED
- #  undef putchar
- #  define putchar(C) putchar_unlocked (C)
- # endif
-+# if !defined(__NetBSD__)
- # ifdef HAVE_GETC_UNLOCKED
- #  undef getc
- #  define getc(Stream) getc_unlocked (Stream)
- # endif
-+# endif
- # ifdef HAVE_GETCHAR_UNLOCKED
- #  undef getchar
- #  define getchar() getchar_unlocked ()
diff --git a/gcc8snapshot/patches/patch-libbacktrace_elf.c b/gcc8snapshot/patches/patch-libbacktrace_elf.c
deleted file mode 100644
index 2999f141e9..0000000000
--- a/gcc8snapshot/patches/patch-libbacktrace_elf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- libbacktrace/elf.c.orig	2017-10-05 16:39:38.000000000 +0000
-+++ libbacktrace/elf.c
-@@ -733,7 +733,7 @@ elf_syminfo (struct backtrace_state *sta
- static int
- elf_is_symlink (const char *filename)
- {
--  struct stat st;
-+  struct stat st = {0};
- 
-   if (lstat (filename, &st) < 0)
-     return 0;
diff --git a/gcc8snapshot/patches/patch-libcilkrts_configure b/gcc8snapshot/patches/patch-libcilkrts_configure
deleted file mode 100644
index a48fcaa3b6..0000000000
--- a/gcc8snapshot/patches/patch-libcilkrts_configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libcilkrts_configure,v 1.2 2017/05/04 17:38:23 maya Exp $
-
---- libcilkrts/configure.orig	2014-08-12 11:06:44.000000000 +0000
-+++ libcilkrts/configure
-@@ -14519,7 +14519,7 @@ esac
- CFLAGS="$save_CFLAGS"
- 
- if test $enable_shared = yes; then
--  link_cilkrts="-lcilkrts %{static: $LIBS}"
-+  link_cilkrts="-rpath ${PREFIX}/gcc7/lib --as-needed -lgcc_s -lcilkrts %{static $LIBS}"
- else
-   link_cilkrts="-lcilkrts $LIBS"
- fi
diff --git a/gcc8snapshot/patches/patch-libcilkrts_runtime_os-unix.c b/gcc8snapshot/patches/patch-libcilkrts_runtime_os-unix.c
deleted file mode 100644
index 9e4d75af1c..0000000000
--- a/gcc8snapshot/patches/patch-libcilkrts_runtime_os-unix.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-libcilkrts_runtime_os-unix.c,v 1.1 2017/05/03 00:21:03 maya Exp $
-
-NetBSD doesn't need additional include files too
-NetBSD can also obtain number of online cpus from sysconf
-NetBSD can use sched_yield for sleeping
-
---- libcilkrts/runtime/os-unix.c.orig	2016-12-01 14:48:49.000000000 +0000
-+++ libcilkrts/runtime/os-unix.c
-@@ -73,6 +73,7 @@
- #elif defined __CYGWIN__ || \
-       defined __DragonFly__ || \
-       defined __FreeBSD__ || \
-+      defined __NetBSD__ || \
-       defined __GNU__
- // No additional include files
- 
-@@ -397,6 +398,7 @@ COMMON_SYSDEP int __cilkrts_hardware_cpu
-     defined __CYGWIN__   || \
-     defined __DragonFly__  || \
-     defined __FreeBSD__  || \
-+    defined __NetBSD__ || \
-     (defined(__sun__) && defined(__svr4__))
-     return (int)sysconf(_SC_NPROCESSORS_ONLN);
- #elif defined __MIC__
-@@ -426,6 +428,7 @@ COMMON_SYSDEP void __cilkrts_idle(void)
-     // silencing workers that are not stealing work.
- #if defined(__ANDROID__)  || \
-     defined(__FreeBSD__)  || \
-+    defined(__NetBSD__)   || \
-     defined(__VXWORKS__)  || \
-     (defined(__sun__) && defined(__svr4__))
-     sched_yield();
-@@ -456,6 +459,7 @@ COMMON_SYSDEP void __cilkrts_yield(void)
-     defined(__APPLE__)    || \
-     defined(__CYGWIN__)   || \
-     defined(__FreeBSD__)  || \
-+    defined(__NetBSD__)   || \
-     defined(__VXWORKS__)  || \
-     (defined(__sun__) && defined(__svr4__))
-     // Call sched_yield to yield quantum.  I'm not sure why we
diff --git a/gcc8snapshot/patches/patch-libdecnumber_decNumber.c b/gcc8snapshot/patches/patch-libdecnumber_decNumber.c
deleted file mode 100644
index 68b17c373f..0000000000
--- a/gcc8snapshot/patches/patch-libdecnumber_decNumber.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libdecnumber_decNumber.c,v 1.1 2017/05/03 00:21:03 maya Exp $
-
---- libdecnumber/decNumber.c.orig	2013-08-14 08:42:04.000000000 +0000
-+++ libdecnumber/decNumber.c
-@@ -770,7 +770,7 @@ decNumber * decNumberAbs(decNumber *res,
- decNumber * decNumberAdd(decNumber *res, const decNumber *lhs,
- 			 const decNumber *rhs, decContext *set) {
-   uInt status=0;			/* accumulator */
--  decAddOp(res, lhs, rhs, set, 0, &status);
-+  decAddOp(res, lhs, rhs, set, (uByte)0, &status);
-   if (status!=0) decStatus(res, status, set);
-   #if DECCHECK
-   decCheckInexact(res, set);
diff --git a/gcc8snapshot/patches/patch-libgcc_config_i386_cpuinfo.h b/gcc8snapshot/patches/patch-libgcc_config_i386_cpuinfo.h
deleted file mode 100644
index ca52db184a..0000000000
--- a/gcc8snapshot/patches/patch-libgcc_config_i386_cpuinfo.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libgcc_config_i386_cpuinfo.h,v 1.1 2017/05/04 17:38:23 maya Exp $
-
-Fix GCC bug #80600
-
---- libgcc/config/i386/cpuinfo.h.orig	2017-01-10 12:55:41.000000000 +0000
-+++ libgcc/config/i386/cpuinfo.h
-@@ -108,7 +108,7 @@ enum processor_features
-   FEATURE_AVX512VPOPCNTDQ
- };
- 
--extern struct __processor_model
-+struct __processor_model
- {
-   unsigned int __cpu_vendor;
-   unsigned int __cpu_type;
diff --git a/gcc8snapshot/patches/patch-libgfortran_configure b/gcc8snapshot/patches/patch-libgfortran_configure
deleted file mode 100644
index 931e3a5997..0000000000
--- a/gcc8snapshot/patches/patch-libgfortran_configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libgfortran_configure,v 1.1 2017/05/03 00:21:03 maya Exp $
-
---- libgfortran/configure.orig	2015-10-04 22:33:03.000000000 +0000
-+++ libgfortran/configure
-@@ -25992,7 +25992,7 @@ $as_echo "#define SUPPORTS_WEAK 1" >>con
- 
-   fi
-   case "$host" in
--    *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* )
-+    *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* | *-*-netbsd* )
- 
- $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h
- 
diff --git a/gcc8snapshot/patches/patch-libgfortran_io_io.h b/gcc8snapshot/patches/patch-libgfortran_io_io.h
new file mode 100644
index 0000000000..995f2d296e
--- /dev/null
+++ b/gcc8snapshot/patches/patch-libgfortran_io_io.h
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Don't declare old_locale* an internal_proto to avoid linking problems
+
+--- libgfortran/io/io.h.orig	2018-01-07 10:17:52.000000000 +0000
++++ libgfortran/io/io.h
+@@ -57,11 +57,8 @@ extern locale_t c_locale;
+ internal_proto(c_locale);
+ #else
+ extern char* old_locale;
+-internal_proto(old_locale);
+ extern int old_locale_ctr;
+-internal_proto(old_locale_ctr);
+ extern __gthread_mutex_t old_locale_lock;
+-internal_proto(old_locale_lock);
+ #endif
+ 
+ 
diff --git a/gcc8snapshot/patches/patch-libgo_Makefile.in b/gcc8snapshot/patches/patch-libgo_Makefile.in
deleted file mode 100644
index 73b3ca3222..0000000000
--- a/gcc8snapshot/patches/patch-libgo_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-libgo_Makefile.in,v 1.1 2017/05/03 00:21:03 maya Exp $
-
-proc.c will not compile with inline-functions (implied by -O3) 
-so add -fno-inline-functions to it's cflags.
-
-
---- libgo/Makefile.in.orig	2012-08-06 14:34:27.000000000 +0000
-+++ libgo/Makefile.in
-@@ -3051,7 +3051,7 @@ print.lo: runtime/print.c
- @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print.lo `test -f 'runtime/print.c' || echo '$(srcdir)/'`runtime/print.c
- 
- proc.lo: runtime/proc.c
--@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT proc.lo -MD -MP -MF $(DEPDIR)/proc.Tpo -c -o proc.lo `test -f 'runtime/proc.c' || echo '$(srcdir)/'`runtime/proc.c
-+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) -fno-inline-functions $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT proc.lo -MD -MP -MF $(DEPDIR)/proc.Tpo -c -o proc.lo `test -f 'runtime/proc.c' || echo '$(srcdir)/'`runtime/proc.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/proc.Tpo $(DEPDIR)/proc.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/proc.c' object='proc.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff --git a/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h b/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
index 282fc34ae2..563a057d25 100644
--- a/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
+++ b/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
@@ -1,37 +1,54 @@
 $NetBSD: patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h,v 1.1 2017/05/03 00:21:03 maya Exp $
 
---- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2013-02-03 17:54:05.000000000 +0000
+Sync with netbsd ctype_base.h
+
+--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2018-01-03 10:03:58.000000000 +0000
 +++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
-@@ -43,9 +43,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -38,14 +38,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+   /// @brief  Base class for ctype.
+   struct ctype_base
+   {
+-    // Non-standard typedefs.
+-    typedef const unsigned char*	__to_type;
  
      // NB: Offsets into ctype<char>::_M_table force a particular size
      // on the mask type. Because of this, we don't use an enum.
 -    typedef unsigned char      	mask;
  
--#ifndef _CTYPE_U
-+#if defined(_CTYPE_BL)
-+    typedef unsigned short      mask;
-+    static const mask upper     = _CTYPE_U;
-+    static const mask lower     = _CTYPE_L;
-+    static const mask alpha     = _CTYPE_A;
-+    static const mask digit     = _CTYPE_D;
-+    static const mask xdigit    = _CTYPE_X;
-+    static const mask space     = _CTYPE_S;
-+    static const mask print     = _CTYPE_R;
-+    static const mask graph     = _CTYPE_G;
-+    static const mask cntrl     = _CTYPE_C;
-+    static const mask punct     = _CTYPE_P;
-+    static const mask alnum     = _CTYPE_A | _CTYPE_D;
-+#elif !defined(_CTYPE_U)
+ #ifndef _CTYPE_U
++    // Non-standard typedefs.
++    typedef const unsigned char*	__to_type;
++
 +    typedef unsigned char      	mask;
++
      static const mask upper    	= _U;
      static const mask lower 	= _L;
      static const mask alpha 	= _U | _L;
-@@ -58,6 +71,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -58,17 +60,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
      static const mask punct 	= _P;
      static const mask alnum 	= _U | _L | _N;
  #else
-+    typedef unsigned char      	mask;
++    typedef const unsigned short*	__to_type;
++
++    typedef unsigned short     	mask;
++
      static const mask upper    	= _CTYPE_U;
      static const mask lower 	= _CTYPE_L;
-     static const mask alpha 	= _CTYPE_U | _CTYPE_L;
+-    static const mask alpha 	= _CTYPE_U | _CTYPE_L;
+-    static const mask digit 	= _CTYPE_N;
+-    static const mask xdigit 	= _CTYPE_N | _CTYPE_X;
++    static const mask alpha 	= _CTYPE_A;
++    static const mask digit 	= _CTYPE_D;
++    static const mask xdigit 	= _CTYPE_X;
+     static const mask space 	= _CTYPE_S;
+-    static const mask print 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B;
+-    static const mask graph 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N;
++    static const mask print 	= _CTYPE_R;
++    static const mask graph 	= _CTYPE_G;
+     static const mask cntrl 	= _CTYPE_C;
+     static const mask punct 	= _CTYPE_P;
+-    static const mask alnum 	= _CTYPE_U | _CTYPE_L | _CTYPE_N;
++    static const mask alnum 	= _CTYPE_A | _CTYPE_D;
+ #endif
+ #if __cplusplus >= 201103L
+     static const mask blank 	= space;
diff --git a/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc b/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc
index f5628922f1..8ccd4c8be1 100644
--- a/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc
+++ b/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc
@@ -1,28 +1,50 @@
 $NetBSD: patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc,v 1.1 2017/05/03 00:21:03 maya Exp $
 
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64271
+Sync with netbsd ctype_configure_char.cc
 
---- libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc.orig	2013-02-03 17:54:05.000000000 +0000
+--- libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc.orig	2018-01-03 10:03:58.000000000 +0000
 +++ libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc
-@@ -38,11 +38,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -38,29 +38,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
  
  // Information as gleaned from /usr/include/ctype.h
  
-+#ifndef _CTYPE_BL
-   extern "C" const u_int8_t _C_ctype_[];
-+#endif
- 
+-  extern "C" const u_int8_t _C_ctype_[];
+-
    const ctype_base::mask*
    ctype<char>::classic_table() throw()
-+#ifdef _CTYPE_BL
+-  { return _C_ctype_ + 1; }
 +  { return _C_ctype_tab_ + 1; }
-+#else
-   { return _C_ctype_ + 1; }
-+#endif
  
-   ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
- 		     size_t __refs)
-@@ -69,14 +75,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+-  ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
+-		     size_t __refs)
+-  : facet(__refs), _M_del(__table != 0 && __del),
+-  _M_toupper(NULL), _M_tolower(NULL),
++  ctype<char>::ctype(__c_locale, const mask* __table, bool __del, 
++		     size_t __refs) 
++  : facet(__refs), _M_del(__table != 0 && __del), 
++  _M_toupper(NULL), _M_tolower(NULL), 
+   _M_table(__table ? __table : classic_table())
+-  {
++  { 
+     memset(_M_widen, 0, sizeof(_M_widen));
+     _M_widen_ok = 0;
+     memset(_M_narrow, 0, sizeof(_M_narrow));
+     _M_narrow_ok = 0;
+   }
+ 
+-  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
+-  : facet(__refs), _M_del(__table != 0 && __del),
+-  _M_toupper(NULL), _M_tolower(NULL),
++  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
++  : facet(__refs), _M_del(__table != 0 && __del), 
++  _M_toupper(NULL), _M_tolower(NULL), 
+   _M_table(__table ? __table : classic_table())
+-  {
++  { 
+     memset(_M_widen, 0, sizeof(_M_widen));
+     _M_widen_ok = 0;
+     memset(_M_narrow, 0, sizeof(_M_narrow));
+@@ -69,14 +67,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
  
    char
    ctype<char>::do_toupper(char __c) const
@@ -39,14 +61,15 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64271
  	++__low;
        }
      return __high;
-@@ -84,14 +90,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -84,14 +82,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
  
    char
    ctype<char>::do_tolower(char __c) const
 -  { return ::tolower((int) __c); }
 +  { return ::tolower((int)(unsigned char) __c); }
  
-   const char*
+-  const char*
++  const char* 
    ctype<char>::do_tolower(char* __low, const char* __high) const
    {
      while (__low < __high)
diff --git a/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h b/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h
deleted file mode 100644
index 6c5b5349bf..0000000000
--- a/gcc8snapshot/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h,v 1.1 2017/05/03 00:21:03 maya Exp $
-
---- libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h.orig	2013-02-03 17:54:05.000000000 +0000
-+++ libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h
-@@ -48,7 +48,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-   is(const char* __low, const char* __high, mask* __vec) const
-   {
-     while (__low < __high)
--      *__vec++ = _M_table[*__low++];
-+      *__vec++ = _M_table[(unsigned char)*__low++];
-     return __high;
-   }
- 
diff --git a/gcc8snapshot/patches/patch-libstdc++-v3_libsupc++_unwind-cxx.h b/gcc8snapshot/patches/patch-libstdc++-v3_libsupc++_unwind-cxx.h
deleted file mode 100644
index 904d730b55..0000000000
--- a/gcc8snapshot/patches/patch-libstdc++-v3_libsupc++_unwind-cxx.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-libstdc++-v3_libsupc++_unwind-cxx.h,v 1.1 2017/05/03 00:21:03 maya Exp $
-
---- libstdc++-v3/libsupc++/unwind-cxx.h.orig	2013-03-19 17:04:44.000000000 +0000
-+++ libstdc++-v3/libsupc++/unwind-cxx.h
-@@ -38,6 +38,7 @@
- #include <cxxabi.h>
- 
- #ifdef _GLIBCXX_HAVE_SYS_SDT_H
-+#include <cstdlib>
- #include <sys/sdt.h>
- /* We only want to use stap probes starting with v3.  Earlier versions
-    added too much startup cost.  */
diff --git a/gcc8snapshot/version.mk b/gcc8snapshot/version.mk
index 88fef1944d..886f81120d 100644
--- a/gcc8snapshot/version.mk
+++ b/gcc8snapshot/version.mk
@@ -1,2 +1,2 @@
 # $NetBSD: version.mk,v 1.21 2015/05/06 05:25:00 keckhardt Exp $
-GCC8S_DIST_VERSION:=8-20171022
+GCC8S_DIST_VERSION:=8-20180107
Prev by Date: compiler-rt-netbsd: Sync local patches
Next by Date: gnucash-git: sync PLIST
Previous by Thread: compiler-rt-netbsd: Sync local patches
Next by Thread: gnucash-git: sync PLIST
Indexes:
Home | Main Index | Thread Index | Old Index