gcc7snapshot: update to 20161218 snapshot.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gcc7snapshot: update to 20161218 snapshot.
From: coypu <coypu%sdf.org@localhost>
Date: Sun, 25 Dec 2016 17:56:02 +0000
Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Sun Dec 25 19:56:02 2016 +0200
Changeset:	872225f414e773ed2ade97e01b8944d087c8ba1b

Modified Files:
	gcc7snapshot/Makefile
	gcc7snapshot/distinfo
	gcc7snapshot/patches/patch-gcc_config.gcc
	gcc7snapshot/patches/patch-libcilkrts_runtime_os-unix.c
	gcc7snapshot/version.mk
Removed Files:
	gcc7snapshot/patches/patch-gcc_config_netbsd-stdint.h

Log Message:
gcc7snapshot: update to 20161218 snapshot.

Finally spotted MASTER_SITES typo that made it not work, and removed
some patches that were upstreamed, thanks!

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

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

diffstat:
 gcc7snapshot/Makefile                              |  2 +-
 gcc7snapshot/distinfo                              | 13 +++--
 gcc7snapshot/patches/patch-gcc_config.gcc          | 19 +++----
 .../patches/patch-gcc_config_netbsd-stdint.h       | 63 ----------------------
 .../patches/patch-libcilkrts_runtime_os-unix.c     |  6 +--
 gcc7snapshot/version.mk                            |  2 +-
 6 files changed, 18 insertions(+), 87 deletions(-)

diffs:
diff --git a/gcc7snapshot/Makefile b/gcc7snapshot/Makefile
index 95ea78c..80dd006 100644
--- a/gcc7snapshot/Makefile
+++ b/gcc7snapshot/Makefile
@@ -10,7 +10,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC7S_DIST_VERSION}
 ## PKGREVISION of this package!
 #PKGREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU:=gcc/snapshots/${GCC7S-DIST_VERSION}/}
+MASTER_SITES=	${MASTER_SITE_GNU:=gcc/snapshots/${GCC7S_DIST_VERSION}/}
 MASTER_SITES+=	ftp://ftp.fu-berlin.de/unix/languages/gcc/snapshots/${GCC7S_DIST_VERSION}/
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/gcc7snapshot/distinfo b/gcc7snapshot/distinfo
index 17671ee..5a353be 100644
--- a/gcc7snapshot/distinfo
+++ b/gcc7snapshot/distinfo
@@ -1,17 +1,16 @@
 $NetBSD: distinfo,v 1.23 2015/05/06 05:25:00 keckhardt Exp $
 
-SHA1 (gcc-7-20161113.tar.bz2) = ab3b1c5404e9ad7442d370c1530b055e6e1df90b
-RMD160 (gcc-7-20161113.tar.bz2) = 4de6c9714f18f4d66914cd9da2f165308360fc2e
-SHA512 (gcc-7-20161113.tar.bz2) = 174acfd9664b4e362fe41f3d91ea27c407d4714f98d0ad1bf1de6a2b7c506d91e5a4ed343efe82cec4e1897aea90853f00c26e01ebe03c783ccd23b557741d16
-Size (gcc-7-20161113.tar.bz2) = 79125504 bytes
+SHA1 (gcc-7-20161218.tar.bz2) = a6cb832b190842986e9bd7e87592fa0984ee7cb0
+RMD160 (gcc-7-20161218.tar.bz2) = 985f6730deab6299ba42da3b07670e5b7dafafce
+SHA512 (gcc-7-20161218.tar.bz2) = 0a63e66ef98e61f298e0d8de5692af157bc5557e2ba11162539739db944090f4fe86519bc68a6c8e5f13cc68b7e67cf5b8297f75a2468048bd94d618297aaba6
+Size (gcc-7-20161218.tar.bz2) = 78918286 bytes
 SHA1 (isl-0.14.tar.bz2) = b09e25df265c97ed54002cd811d227a9a26c5f9c
 RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39
 SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7
 Size (isl-0.14.tar.bz2) = 1399896 bytes
 SHA1 (patch-gcc_Makefile.in) = ce366a091960d335ecb022918e2f7bfc4e3fcccf
-SHA1 (patch-gcc_config.gcc) = 0e44e9a5f5436a0684937acda2f6d3dcdfd4f591
+SHA1 (patch-gcc_config.gcc) = fea8288c22bb2c4dd44a5e77c8f92dee8f8f6b18
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
-SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
 SHA1 (patch-gcc_config_netbsd.c) = 85f786bce881ef2fc348f98ef81fdbc001076183
 SHA1 (patch-gcc_config_netbsd.h) = 81891a83bb17b99fdb2c9381b8e8a1767391c695
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
@@ -21,7 +20,7 @@ SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
 SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
 SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
 SHA1 (patch-libcilkrts_configure) = 0d88069173cba34158f5b6b91d2d12ca81b0300c
-SHA1 (patch-libcilkrts_runtime_os-unix.c) = 7985df8877515214c14670f06ebc59bcb720cc47
+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
diff --git a/gcc7snapshot/patches/patch-gcc_config.gcc b/gcc7snapshot/patches/patch-gcc_config.gcc
index a66d1b7..944ccd6 100644
--- a/gcc7snapshot/patches/patch-gcc_config.gcc
+++ b/gcc7snapshot/patches/patch-gcc_config.gcc
@@ -1,37 +1,32 @@
 $NetBSD: patch-gcc_config.gcc,v 1.2 2014/12/17 21:51:02 keckhardt Exp $
 
---- gcc/config.gcc.orig	2014-11-21 16:04:20.000000000 +0000
+--- gcc/config.gcc.orig	2016-12-10 21:07:10.000000000 +0000
 +++ gcc/config.gcc
-@@ -762,10 +762,16 @@ case ${target} in
+@@ -765,10 +765,15 @@ case ${target} in
    target_has_targetcm=yes
    ;;
  *-*-netbsd*)
 -  tmake_file="t-slibgcc"
-+  use_gcc_stdint=wrap
 +  tmake_file="t-slibgcc t-netbsd"
    gas=yes
    gnu_ld=yes
- 
+   use_gcc_stdint=wrap
 +  # cabs/cabsf are renamed to __c99_cabs/cabsf
 +  tm_p_file="${tm_p_file} netbsd-protos.h"
 +  target_gtfiles="${target_gtfiles} \$(srcdir)/config/netbsd.c"
 +  extra_objs="${extra_objs} netbsd.o"
 +
+ 
    # NetBSD 2.0 and later get POSIX threads enabled by default.
    # Allow them to be explicitly enabled on any other version.
-   case ${enable_threads} in
-@@ -1434,12 +1440,14 @@ x86_64-*-freebsd*)
- 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
- 	;;
+@@ -1460,10 +1465,12 @@ x86_64-*-freebsd*)
  i[34567]86-*-netbsdelf*)
--	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h netbsd-stdint.h"
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-stdint.h netbsd-elf.h i386/netbsd-elf.h"
  	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 +	tmake_file="${tmake_file} i386/t-crtstuff"
  	;;
  x86_64-*-netbsd*)
--	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h netbsd-stdint.h"
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-stdint.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
  	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 +	tmake_file="${tmake_file} i386/t-crtstuff"
  	;;
diff --git a/gcc7snapshot/patches/patch-gcc_config_netbsd-stdint.h b/gcc7snapshot/patches/patch-gcc_config_netbsd-stdint.h
deleted file mode 100644
index 94ee640..0000000
--- a/gcc7snapshot/patches/patch-gcc_config_netbsd-stdint.h
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-gcc_config_netbsd-stdint.h,v 1.1 2014/10/19 10:50:57 keckhardt Exp $
-
-Copy gcc/config/freebsd-stdint.h to gcc/config/netbsd-stdint.h.
-
---- gcc/config/netbsd-stdint.h.orig	2012-04-02 09:19:19.577200540 +0000
-+++ gcc/config/netbsd-stdint.h
-@@ -0,0 +1,56 @@
-+/* Definitions for <stdint.h> types for NetBSD systems.
-+   Copyright (C) 2009 Free Software Foundation, Inc.
-+   Contributed by Gerald Pfeifer <gerald%pfeifer.com@localhost>.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+Under Section 7 of GPL version 3, you are granted additional
-+permissions described in the GCC Runtime Library Exception, version
-+3.1, as published by the Free Software Foundation.
-+
-+You should have received a copy of the GNU General Public License and
-+a copy of the GCC Runtime Library Exception along with this program;
-+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#define SIG_ATOMIC_TYPE   "int"
-+
-+#define INT8_TYPE         "signed char"
-+#define INT16_TYPE        "short int"
-+#define INT32_TYPE        "int"
-+#define INT64_TYPE        (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
-+#define UINT8_TYPE        "unsigned char"
-+#define UINT16_TYPE       "short unsigned int"
-+#define UINT32_TYPE       "unsigned int"
-+#define UINT64_TYPE       (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
-+
-+#define INT_LEAST8_TYPE   "signed char"
-+#define INT_LEAST16_TYPE  "short int"
-+#define INT_LEAST32_TYPE  "int"
-+#define INT_LEAST64_TYPE  (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
-+#define UINT_LEAST8_TYPE  "unsigned char"
-+#define UINT_LEAST16_TYPE "short unsigned int"
-+#define UINT_LEAST32_TYPE "unsigned int"
-+#define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
-+
-+#define INT_FAST8_TYPE    "int"
-+#define INT_FAST16_TYPE   "int"
-+#define INT_FAST32_TYPE   "int"
-+#define INT_FAST64_TYPE   (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
-+#define UINT_FAST8_TYPE   "unsigned int"
-+#define UINT_FAST16_TYPE  "unsigned int"
-+#define UINT_FAST32_TYPE  "unsigned int"
-+#define UINT_FAST64_TYPE  (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
-+
-+#define INTPTR_TYPE       (LONG_TYPE_SIZE == 64 ? "long int" : "int")
-+#define UINTPTR_TYPE      (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
diff --git a/gcc7snapshot/patches/patch-libcilkrts_runtime_os-unix.c b/gcc7snapshot/patches/patch-libcilkrts_runtime_os-unix.c
index 885b55d..7f91002 100644
--- a/gcc7snapshot/patches/patch-libcilkrts_runtime_os-unix.c
+++ b/gcc7snapshot/patches/patch-libcilkrts_runtime_os-unix.c
@@ -4,7 +4,7 @@ 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	2014-05-21 11:08:58.000000000 +0000
+--- 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__ || \
@@ -30,9 +30,9 @@ NetBSD can use sched_yield for sleeping
      defined(__VXWORKS__)  || \
      (defined(__sun__) && defined(__svr4__))
      sched_yield();
-@@ -453,6 +456,7 @@ COMMON_SYSDEP void __cilkrts_yield(void)
- #if defined(__ANDROID__)  || \
+@@ -456,6 +459,7 @@ COMMON_SYSDEP void __cilkrts_yield(void)
      defined(__APPLE__)    || \
+     defined(__CYGWIN__)   || \
      defined(__FreeBSD__)  || \
 +    defined(__NetBSD__)   || \
      defined(__VXWORKS__)  || \
diff --git a/gcc7snapshot/version.mk b/gcc7snapshot/version.mk
index 4123fe4..53b2d0a 100644
--- a/gcc7snapshot/version.mk
+++ b/gcc7snapshot/version.mk
@@ -1,2 +1,2 @@
 # $NetBSD: version.mk,v 1.21 2015/05/06 05:25:00 keckhardt Exp $
-GCC7S_DIST_VERSION:=7-20161113
+GCC7S_DIST_VERSION:=7-20161218
Prev by Date: (tc-git) wrong path on patch-lisp_tc-pre-base.in, regen distinfo
Next by Date: lldb-netbsd: Add notes about debugging
Previous by Thread: (tc-git) wrong path on patch-lisp_tc-pre-base.in, regen distinfo
Next by Thread: lldb-netbsd: Add notes about debugging
Indexes:
Home | Main Index | Thread Index | Old Index