CVS commit: pkgsrc/lang/gcc7

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sat Nov 10 04:24:00 UTC 2018

Modified Files:
        pkgsrc/lang/gcc7: Makefile distinfo
        pkgsrc/lang/gcc7/patches: patch-gcc_config_netbsd.h
Added Files:
        pkgsrc/lang/gcc7/patches: patch-gcc_config_aarch64_aarch64-builtins.c

Log Message:
be sure to call the netbsd_patch_builtins() on arm64.  now gfortran
works and cabs*() handling is correct.

also:
- extract using bsdtar.  saves about 4 minutes during extract for me.
- remove duplicated part of gcc/config/netbsd.h -- it's already
  upstream by this version.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/gcc7/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h

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/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.20 pkgsrc/lang/gcc7/Makefile:1.21
--- pkgsrc/lang/gcc7/Makefile:1.20      Wed Aug 22 09:45:20 2018
+++ pkgsrc/lang/gcc7/Makefile   Sat Nov 10 04:24:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/08/22 09:45:20 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/11/10 04:24:00 mrg Exp $
 
 GCC_PKGNAME=           gcc7
 .include               "version.mk"
@@ -12,6 +12,7 @@ PKGREVISION=  4
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
+EXTRACT_USING= bsdtar
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://gcc.gnu.org/

Index: pkgsrc/lang/gcc7/distinfo
diff -u pkgsrc/lang/gcc7/distinfo:1.12 pkgsrc/lang/gcc7/distinfo:1.13
--- pkgsrc/lang/gcc7/distinfo:1.12      Fri Nov  9 11:22:13 2018
+++ pkgsrc/lang/gcc7/distinfo   Sat Nov 10 04:24:00 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2018/11/09 11:22:13 mrg Exp $
+$NetBSD: distinfo,v 1.13 2018/11/10 04:24:00 mrg Exp $
 
 SHA1 (gcc-7.3.0.tar.xz) = 9689b9cae7b2886fdaa08449a26701f095c04e48
 RMD160 (gcc-7.3.0.tar.xz) = 31f6934a0e0c0ca84b6668110f9afdb91c1f9023
@@ -12,6 +12,7 @@ SHA1 (patch-contrib_download__prerequisi
 SHA1 (patch-gcc_Makefile.in) = d96a57a098e49a2c5ea6478dd5d22aba584fc1bc
 SHA1 (patch-gcc_common_config_arm_arm-common.c) = 7c973cb9554a52f4b85f8fc98708f5e5cce8e8bd
 SHA1 (patch-gcc_config.gcc) = 20d1444cc2c031c8adc96289e1ccc6c1d29eb72f
+SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = b10ef4b9ad39e605fc4e2a0c8dffdae677842e94
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = ed7bc42813b33c87242f5ef0a304a621b873c9eb
 SHA1 (patch-gcc_config_aarch64_aarch64.h) = 5339d9c7ce9d040097c29cc3b7ec1d2fbfff811c
 SHA1 (patch-gcc_config_aarch64_t-aarch64-netbsd) = 0e7feb6f238b0a752ccc50e95e09b017cb368a90
@@ -22,7 +23,7 @@ SHA1 (patch-gcc_config_arm_netbsd-eabi.h
 SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 80a07645fab197969b4a6f518fdc81bda7376375
 SHA1 (patch-gcc_config_netbsd-elf.h) = 5a9b5ef26c03bec3cd58e2f446224aa6e94a30d5
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
-SHA1 (patch-gcc_config_netbsd.h) = 8861abb345b3ad72574fbe7afca2ea78b81d9632
+SHA1 (patch-gcc_config_netbsd.h) = 662226f4491f94b641f78b1273a9047434d75aed
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d

Index: pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h
diff -u pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h:1.2 pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h:1.3
--- pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h:1.2      Thu Jan 25 23:27:30 2018
+++ pkgsrc/lang/gcc7/patches/patch-gcc_config_netbsd.h  Sat Nov 10 04:24:00 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-gcc_config_netbsd.h,v 1.2 2018/01/25 23:27:30 maya Exp $
+$NetBSD: patch-gcc_config_netbsd.h,v 1.3 2018/11/10 04:24:00 mrg Exp $
 
 Handle netbsd's compatibility non-C99 cabs (causes link
 failure with gfortran)
@@ -15,16 +15,3 @@ failure with gfortran)
  /* TARGET_OS_CPP_BUILTINS() common to all NetBSD targets.  */
  #define NETBSD_OS_CPP_BUILTINS_COMMON()               \
    do                                          \
-@@ -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 {                                                                        \

Added files:

Index: pkgsrc/lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c
diff -u /dev/null pkgsrc/lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c:1.1
--- /dev/null   Sat Nov 10 04:24:00 2018
+++ pkgsrc/lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c        Sat Nov 10 04:24:00 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-gcc_config_aarch64_aarch64-builtins.c,v 1.1 2018/11/10 04:24:00 mrg Exp $
+
+initialise subtarget builtins so cabs*() are renamed.
+
+--- gcc/config/aarch64/aarch64-builtins.c.orig 2017-01-20 21:03:41.000000000 +0000
++++ gcc/config/aarch64/aarch64-builtins.c      2018-11-10 00:44:41.905576216 +0000
+@@ -991,6 +991,9 @@
+      register them.  */
+   if (!TARGET_ILP32)
+     aarch64_init_pauth_hint_builtins ();
++#ifdef SUBTARGET_INIT_BUILTINS
++  SUBTARGET_INIT_BUILTINS;
++#endif
+ }
+ 
+ tree