From 9fc845283566ece865314c2a8a19c2bf47f9d3e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 23 Dec 2016 16:58:40 +0100
Subject: [PATCH] gcc: update to 6.3.0

---
 common/shlibs                                      | 14 +++++++-------
 .../{gcc-6.2.1-musl.diff => gcc-6.3.0-musl.diff}   | 14 +++++++-------
 srcpkgs/gcc/template                               | 10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename srcpkgs/gcc/files/{gcc-6.2.1-musl.diff => gcc-6.3.0-musl.diff} (98%)

diff --git a/common/shlibs b/common/shlibs
index 7431456ad44..f8b049d289f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -56,7 +56,7 @@ libitm.so.1 libitm-4.7.3_1
 libgcj_bc.so.1 libgcj-4.7.3_1
 liblto_plugin.so.0 gcc-4.7.3_1
 libgcc_s.so.1 libgcc-4.4.0_1
-libgcj.so.17 libgcj-6.2.0_1
+libgcj.so.17 libgcj-6.3.0_1
 libgcj-tools.so.17 libgcj-6.2.1_1
 libgij.so.17 libgcj-6.2.1_1
 libgo.so.9 libgo-6.2.1_1
@@ -1657,12 +1657,12 @@ libmitlm.so.0 mitlm-0.4.1_1
 libextractor.so.3 libextractor-1.1_1
 libextractor_common.so.1 libextractor-1.1_1
 libpano13.so.3 libpano13-2.9.19_1
-libubsan.so.0 libsanitizer-4.9.0_1
-libtsan.so.0 libsanitizer-4.9.0_1
-libasan.so.3 libsanitizer-6.2.0_1
-liblsan.so.0 libsanitizer-4.9.0_1
-libcilkrts.so.5 libcilkrts-4.9.0_1
-libvtv.so.0 libvtv-4.9.0_1
+libubsan.so.0 libsanitizer-6.3.0_1
+libtsan.so.0 libsanitizer-6.3.0_1
+libasan.so.3 libsanitizer-6.3.0_1
+liblsan.so.0 libsanitizer-6.3.0_1
+libcilkrts.so.5 libcilkrts-6.3.0_1
+libvtv.so.0 libvtv-6.3.0_1
 libatomic.so.1 libatomic-4.9.0_1
 libpcsclite.so.1 libpcsclite-1.8.11_1
 libpcscspy.so.0 libpcsclite-1.8.11_1
diff --git a/srcpkgs/gcc/files/gcc-6.2.1-musl.diff b/srcpkgs/gcc/files/gcc-6.3.0-musl.diff
similarity index 98%
rename from srcpkgs/gcc/files/gcc-6.2.1-musl.diff
rename to srcpkgs/gcc/files/gcc-6.3.0-musl.diff
index 053d1eae79e..a891dc3d44f 100644
--- a/srcpkgs/gcc/files/gcc-6.2.1-musl.diff
+++ b/srcpkgs/gcc/files/gcc-6.3.0-musl.diff
@@ -19,7 +19,7 @@ diff -r 90a7a3809a7c libstdc++-v3/configure.host
      if [ "$uclibc" = "yes" ]; then
        os_include_dir="os/uclibc"
      elif [ "$bionic" = "yes" ]; then
-@@ -281,6 +281,9 @@
+@@ -274,6 +274,9 @@
        os_include_dir="os/gnu-linux"
      fi
      ;;
@@ -126,7 +126,7 @@ Support for powerpc-linux-musl.
 diff -r 971d41041173 gcc/config.gcc
 --- a/gcc/config.gcc	Fri Dec 25 08:44:09 2015 -0500
 +++ b/gcc/config.gcc	Fri Dec 25 09:42:16 2015 -0500
-@@ -2464,6 +2464,10 @@
+@@ -2475,6 +2475,10 @@
  	    powerpc*-*-linux*paired*)
  		tm_file="${tm_file} rs6000/750cl.h" ;;
  	esac
@@ -243,7 +243,7 @@ diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
 index 861a029..1c97d72 100644
 --- a/gcc/config/i386/i386.c
 +++ b/gcc/config/i386/i386.c
-@@ -40323,10 +40323,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -40497,10 +40497,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
      {
      case IX86_BUILTIN_CPU_INIT:
        {
@@ -310,7 +310,7 @@ index 11bb46e..4f47f7b 100644
  /* It may still not be available in the library on the target system.   */
 --- a/boehm-gc/include/private/gcconfig.h
 +++ b/boehm-gc/include/private/gcconfig.h
-@@ -684,7 +684,7 @@
+@@ -696,7 +696,7 @@
  #       ifdef __ELF__
  #            define DYNAMIC_LOADING
  #	     include <features.h>
@@ -319,7 +319,7 @@ index 11bb46e..4f47f7b 100644
  #              define SEARCH_FOR_DATA_START
  #	     else /* !GLIBC2 */
                 extern char **__environ;
-@@ -1147,7 +1147,7 @@
+@@ -1167,7 +1167,7 @@
  #              define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff))
  #	     endif
  #	     include <features.h>
@@ -328,7 +328,7 @@ index 11bb46e..4f47f7b 100644
  #		 define SEARCH_FOR_DATA_START
  #	     else
       	         extern char **__environ;
-@@ -1367,7 +1367,7 @@
+@@ -1387,7 +1387,7 @@
  #       define HBLKSIZE 4096
  #     endif
  #     define USE_GENERIC_PUSH_REGS
@@ -337,7 +337,7 @@ index 11bb46e..4f47f7b 100644
  #        define LINUX_STACKBOTTOM
  #     else
  #        define STACKBOTTOM 0x80000000
-@@ -1858,7 +1858,7 @@
+@@ -1909,7 +1909,7 @@
  #       ifdef __ELF__
  #            define DYNAMIC_LOADING
  #	     include <features.h>
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 2b464ded0f6..507af66090d 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,16 +1,16 @@
 # Template build file for 'gcc'
-_majorver=6.2
+_majorver=6.3
 _gcjrel=17
 
 pkgname=gcc
-version=${_majorver}.1
-revision=3
+version=${_majorver}.0
+revision=1
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://gcc.gnu.org"
 license="GFDL-1.2, GPL-3, LGPL-2.1"
-distfiles="https://repo.voidlinux.eu/distfiles/gcc-$version.tar.xz"
-checksum=a7addd2d4e42e66c3b56ced8baee5a11ef7fb577e23615a4f43877273eaf9409
+distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.bz2"
+checksum=f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f
 
 nopie=yes
 lib32disabled=yes