CVS commit: pkgsrc/lang/gcc7

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Jan 25 23:27:30 UTC 2018

Modified Files:
        pkgsrc/lang/gcc7: distinfo version.mk
        pkgsrc/lang/gcc7/patches: patch-gcc_config.gcc
            patch-gcc_config_netbsd.h
Removed Files:
        pkgsrc/lang/gcc7/patches: patch-gcc_config_netbsd.c

Log Message:
gcc7: update to 7.3.0

Local changes:
Remove patch hunks merged upstream (non-c99 compatibility cabs workaround,
linking to libc by default on netbsd).

GCC changes:
Added code generation options to mitigate Spectre variant 2 (CVE-2017-5715)
for the powerpc and x86 targets.

RTEMS: Support has been added for Epiphany target.

List of bugs fixed:
https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&list_id=199567&resolution=FIXED&target_milestone=7.3


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc7/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc7/version.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc7/patches/patch-gcc_config.gcc \
    pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.c

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

Modified files:

Index: pkgsrc/lang/gcc7/distinfo
diff -u pkgsrc/lang/gcc7/distinfo:1.7 pkgsrc/lang/gcc7/distinfo:1.8
--- pkgsrc/lang/gcc7/distinfo:1.7       Tue Sep 26 06:10:27 2017
+++ pkgsrc/lang/gcc7/distinfo   Thu Jan 25 23:27:30 2018
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.7 2017/09/26 06:10:27 maya Exp $
+$NetBSD: distinfo,v 1.8 2018/01/25 23:27:30 maya Exp $
 
-SHA1 (gcc-7.2.0.tar.xz) = 08a88199ed94fdf4940d118ba3c07028245cd5b7
-RMD160 (gcc-7.2.0.tar.xz) = fa8eed36c78cf135f9cc88e60845996b5cfaba52
-SHA512 (gcc-7.2.0.tar.xz) = f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1
-Size (gcc-7.2.0.tar.xz) = 62312628 bytes
+SHA1 (gcc-7.3.0.tar.xz) = 9689b9cae7b2886fdaa08449a26701f095c04e48
+RMD160 (gcc-7.3.0.tar.xz) = 31f6934a0e0c0ca84b6668110f9afdb91c1f9023
+SHA512 (gcc-7.3.0.tar.xz) = ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
+Size (gcc-7.3.0.tar.xz) = 62462388 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
 Size (isl-0.16.1.tar.bz2) = 1626446 bytes
 SHA1 (patch-contrib_download__prerequisites) = 86c6c16e0e3e3a0bcb38579a8b4004f603fac1ca
 SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
-SHA1 (patch-gcc_config.gcc) = fea8288c22bb2c4dd44a5e77c8f92dee8f8f6b18
+SHA1 (patch-gcc_config.gcc) = 943797cbbdbf25885b4f16a1a027d137ef68357e
 SHA1 (patch-gcc_config_arm_arm.h) = 92c8bff1063e153fec4454e6dea5334a42b0dad6
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
-SHA1 (patch-gcc_config_netbsd.c) = 85f786bce881ef2fc348f98ef81fdbc001076183
-SHA1 (patch-gcc_config_netbsd.h) = 81891a83bb17b99fdb2c9381b8e8a1767391c695
+SHA1 (patch-gcc_config_netbsd.h) = 8861abb345b3ad72574fbe7afca2ea78b81d9632
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d

Index: pkgsrc/lang/gcc7/version.mk
diff -u pkgsrc/lang/gcc7/version.mk:1.3 pkgsrc/lang/gcc7/version.mk:1.4
--- pkgsrc/lang/gcc7/version.mk:1.3     Tue Sep 26 06:10:27 2017
+++ pkgsrc/lang/gcc7/version.mk Thu Jan 25 23:27:30 2018
@@ -1,2 +1,2 @@
-# $NetBSD: version.mk,v 1.3 2017/09/26 06:10:27 maya Exp $
-GCC7_DIST_VERSION:=7.2.0
+# $NetBSD: version.mk,v 1.4 2018/01/25 23:27:30 maya Exp $
+GCC7_DIST_VERSION:=7.3.0

Index: pkgsrc/lang/gcc7/patches/patch-gcc_config.gcc
diff -u pkgsrc/lang/gcc7/patches/patch-gcc_config.gcc:1.1 pkgsrc/lang/gcc7/patches/patch-gcc_config.gcc:1.2
--- pkgsrc/lang/gcc7/patches/patch-gcc_config.gcc:1.1   Wed May  3 00:21:03 2017
+++ pkgsrc/lang/gcc7/patches/patch-gcc_config.gcc       Thu Jan 25 23:27:30 2018
@@ -1,25 +1,21 @@
-$NetBSD: patch-gcc_config.gcc,v 1.1 2017/05/03 00:21:03 maya Exp $
+$NetBSD: patch-gcc_config.gcc,v 1.2 2018/01/25 23:27:30 maya Exp $
 
---- gcc/config.gcc.orig        2016-12-10 21:07:10.000000000 +0000
+Workaround netbsd's compatibility non-C99 cabs (causes gfortran link failures)
+
+--- gcc/config.gcc.orig        2018-01-08 13:39:11.000000000 +0000
 +++ gcc/config.gcc
-@@ -765,10 +765,15 @@ case ${target} in
-   target_has_targetcm=yes
-   ;;
- *-*-netbsd*)
--  tmake_file="t-slibgcc"
-+  tmake_file="t-slibgcc t-netbsd"
+@@ -781,6 +781,10 @@ case ${target} in
    gas=yes
    gnu_ld=yes
    use_gcc_stdint=wrap
-+  # cabs/cabsf are renamed to __c99_cabs/cabsf
++# 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.
-@@ -1460,10 +1465,12 @@ x86_64-*-freebsd*)
+@@ -1487,10 +1491,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-stdint.h netbsd-elf.h i386/netbsd-elf.h"
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
Index: pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h
diff -u pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h:1.1 pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h:1.2
--- pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h:1.1      Wed May  3 00:21:03 2017
+++ pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h  Thu Jan 25 23:27:30 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2017/05/03 00:21:03 maya Exp $
+$NetBSD: patch-gcc_config_netbsd.h,v 1.2 2018/01/25 23:27:30 maya Exp $
 
-when using shared, link against libc
-another unexplained change`
+Handle netbsd's compatibility non-C99 cabs (causes link
+failure with gfortran)
 
---- gcc/config/netbsd.h.orig   2014-01-02 22:23:26.000000000 +0000
+--- gcc/config/netbsd.h.orig   2017-09-29 21:34:00.000000000 +0000
 +++ gcc/config/netbsd.h
 @@ -17,6 +17,9 @@ You should have received a copy of the G
  along with GCC; see the file COPYING3.  If not see
@@ -15,29 +15,16 @@ another unexplained change`
  /* TARGET_OS_CPP_BUILTINS() common to all NetBSD targets.  */
  #define NETBSD_OS_CPP_BUILTINS_COMMON()               \
    do                                          \
-@@ -96,6 +99,7 @@ along with GCC; see the file COPYING3.  
-        %{!pg:-lposix}}                \
-      %{p:-lposix_p}           \
-      %{pg:-lposix_p}}         \
-+   %{shared:-lc}              \
-    %{!shared:                 \
-      %{!symbolic:             \
-        %{!p:                  \
-@@ -109,6 +113,7 @@ along with GCC; see the file COPYING3.  
-        %{!pg:-lposix}}                \
-      %{p:-lposix_p}           \
-      %{pg:-lposix_p}}         \
-+   %{shared:-lc}              \
-    %{!shared:                 \
-      %{!symbolic:             \
-        %{!p:                  \
-@@ -175,3 +180,9 @@ along with GCC; see the file COPYING3.  
- 
+@@ -181,6 +184,12 @@ along with GCC; see the file COPYING3.  
  #undef WINT_TYPE
  #define WINT_TYPE "int"
-+
+ 
 +#undef SUBTARGET_INIT_BUILTINS
 +#define SUBTARGET_INIT_BUILTINS                       \
 +do {                                          \
 +  netbsd_patch_builtins ();                   \
 +} while(0)
++
+ #undef  SUBTARGET_INIT_BUILTINS
+ #define SUBTARGET_INIT_BUILTINS                                               \
+   do {                                                                        \