remove pkgdiff leftovers, improve patch comment, fix build

4 files changed, 14 insertions, 52 deletions

diff --git a/lang/gcc5/distinfo b/lang/gcc5/distinfo
index 1bf84e719de..57ccb66bbda 100644
--- a/lang/gcc5/distinfo
+++ b/lang/gcc5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2017/08/25 16:33:53 he Exp $
+$NetBSD: distinfo,v 1.17 2017/08/28 18:26:38 maya Exp $
 
 SHA1 (gcc-5.4.0.tar.bz2) = 07524df2b4ab9070bad9c49ab668da72237b8115
 RMD160 (gcc-5.4.0.tar.bz2) = 7ae3413ca7e90bb21e65e637c02ddf2b675b45f4
@@ -9,10 +9,10 @@ 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) = b2bceb34537de1cf704f18a59aa4e4d4a4551c62
-SHA1 (patch-gcc_config.gcc) = 5e39c8d095b4d3bcd6d48dfb76bacdcd028bbe36
+SHA1 (patch-gcc_config.gcc) = edd35ee857bc322f3b0acac02c4023a50d1b1fef
 SHA1 (patch-gcc_config.host) = 1b1e11cd199eb93f49443d51c0063b09b7327858
-SHA1 (patch-gcc_config_alpha_elf.h) = 53c55b37b39fe31d765e256910f80061a32479de
-SHA1 (patch-gcc_config_alpha_linux.h) = 3cb56095557c28119d58ae13d451ec4497c6f612
+SHA1 (patch-gcc_config_alpha_elf.h) = b57869055ae4f316105e214274f6f0856361a1d0
+SHA1 (patch-gcc_config_alpha_linux.h) = aefe10f20c8e96a5e2e2771d41241ddfdc0ed58c
 SHA1 (patch-gcc_config_arm_arm.h) = 769a4939c0601d4f24ecff4374538b3a388e6013
 SHA1 (patch-gcc_config_host-netbsd.c) = 765295f07edb8a68f1910e3a9b4dd2a7dcd491a5
 SHA1 (patch-gcc_config_i386_i386.c) = 4bec843a876dd71d756ee757d69e4649a109bc64
diff --git a/lang/gcc5/patches/patch-gcc_config.gcc b/lang/gcc5/patches/patch-gcc_config.gcc
index 60a73db1a56..147e0b9216a 100644
--- a/lang/gcc5/patches/patch-gcc_config.gcc
+++ b/lang/gcc5/patches/patch-gcc_config.gcc
@@ -1,8 +1,8 @@
-$NetBSD: patch-gcc_config.gcc,v 1.3 2017/08/25 16:33:54 he Exp $
+$NetBSD: patch-gcc_config.gcc,v 1.4 2017/08/28 18:26:38 maya Exp $
 
-Make some adjustments to the NetBSD sections of this file,
-ensure include file order is correct also for alpha and powerpc,
-and do the same for i386 and amd64.
+Add netbsd-stdint for netbsd/{alpha,powerpc,x86}
+workaround netbsd libc's non-c99 cabs{,f} and the c99 version
+actually being called __c99_cabs{,f}
 
 --- gcc/config.gcc.orig	2014-11-21 16:04:20.000000000 +0000
 +++ gcc/config.gcc
@@ -67,42 +67,4 @@ and do the same for i386 and amd64.
  	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
  	tmake_file="${tmake_file} rs6000/t-netbsd"
  	extra_options="${extra_options} rs6000/sysv4.opt"
-$NetBSD: patch-gcc_config.gcc,v 1.3 2017/08/25 16:33:54 he Exp $
 
---- gcc/config.gcc.orig	2014-11-21 16:04:20.000000000 +0000
-+++ gcc/config.gcc
-@@ -745,10 +745,16 @@ 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
- 
-+  # 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
-@@ -1372,12 +1378,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"
- 	;;
- 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"
- 	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"
- 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
-+	tmake_file="${tmake_file} i386/t-crtstuff"
- 	;;
- i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
- 	tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
diff --git a/lang/gcc5/patches/patch-gcc_config_alpha_elf.h b/lang/gcc5/patches/patch-gcc_config_alpha_elf.h
index 7c922fd4181..f13455af3c3 100644
--- a/lang/gcc5/patches/patch-gcc_config_alpha_elf.h
+++ b/lang/gcc5/patches/patch-gcc_config_alpha_elf.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-gcc_config_alpha_elf.h,v 1.1 2017/08/25 16:33:54 he Exp $
+$NetBSD: patch-gcc_config_alpha_elf.h,v 1.2 2017/08/28 18:26:38 maya Exp $
 
 Move Linux-specific spec definitions to the linux file.
 
---- work/gcc-5.4.0/gcc/config/alpha/elf.h.orig	2015-01-05 12:33:28.000000000 +0000
-+++ work/gcc-5.4.0/gcc/config/alpha/elf.h
+--- gcc/config/alpha/elf.h.orig	2015-01-05 12:33:28.000000000 +0000
++++ gcc/config/alpha/elf.h
 @@ -100,32 +100,6 @@ do {									\
      ASM_OUTPUT_DEF (FILE, alias, name);				\
    } while (0)
diff --git a/lang/gcc5/patches/patch-gcc_config_alpha_linux.h b/lang/gcc5/patches/patch-gcc_config_alpha_linux.h
index aa7e334885e..30a03e998c5 100644
--- a/lang/gcc5/patches/patch-gcc_config_alpha_linux.h
+++ b/lang/gcc5/patches/patch-gcc_config_alpha_linux.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-gcc_config_alpha_linux.h,v 1.1 2017/08/25 16:33:54 he Exp $
+$NetBSD: patch-gcc_config_alpha_linux.h,v 1.2 2017/08/28 18:26:38 maya Exp $
 
 Move Linux-specific spec definitions to the Linux file.
 
---- work/gcc-5.4.0/gcc/config/alpha/linux.h.orig	2015-01-05 12:33:28.000000000 +0000
-+++ work/gcc-5.4.0/gcc/config/alpha/linux.h
+--- gcc/config/alpha/linux.h.orig	2015-01-05 12:33:28.000000000 +0000
++++ gcc/config/alpha/linux.h
 @@ -74,6 +74,32 @@ along with GCC; see the file COPYING3.  
  
  #define TARGET_POSIX_IO