On Thu, 1 Sep 2016 16:13:14 +0200, David Coppa wrote:
> On Thu, 01 Sep 2016, Christian Weisgerber wrote:
>
> > On 2016-08-22, Pascal Stumpf <pas...@stumpf.co> wrote:
> >
> > > Last bugfix update for GCC 4.9. Works fine here so far, but should
> > > probably go into at least one bulk.
> >
> > Also needs this:
> >
> > Index: devel/llvm/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/llvm/Makefile,v
> > retrieving revision 1.116
> > diff -u -r1.116 Makefile
> > --- devel/llvm/Makefile 31 Jul 2016 17:49:38 -0000 1.116
> > +++ devel/llvm/Makefile 1 Sep 2016 09:35:21 -0000
> > @@ -11,6 +11,7 @@
> > LLVM_V = 3.8.1
> > DISTNAME = llvm-${LLVM_V}.src
> > PKGNAME = llvm-${LLVM_V}
> > +REVISION = 0
> > CATEGORIES = devel
> > DISTFILES = llvm-${LLVM_V}.src${EXTRACT_SUFX} \
> > cfe-${LLVM_V}.src${EXTRACT_SUFX}
> > @@ -63,7 +64,7 @@
> > TEST_TARGET = check
> >
> > # XXX sync
> > -GCC_VER = 4.9.3
> > +GCC_VER = 4.9.4
> > .if ${MACHINE_ARCH} == "amd64"
> > GCC_CONFIG = x86_64-unknown-openbsd${OSREV}
> > .else
>
>
> Here's a rebased version of your update to gcc-4.9.4 plus my gfortran
> patch.
Not sure if we want to do the fortran thing. I don't care either way.
Any opinions?
> Index: 4.6/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.6/Makefile,v
> retrieving revision 1.92
> diff -u -p -r1.92 Makefile
> --- 4.6/Makefile 1 Sep 2016 11:01:32 -0000 1.92
> +++ 4.6/Makefile 1 Sep 2016 14:02:32 -0000
> @@ -30,7 +30,7 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
> PKGNAME-go = gccgo-${FULL_PKGVERSION}
> PKGSPEC-main = gcc->=4.6,<4.7
>
> -REVISION = 19
> +REVISION = 20
>
> SHARED_LIBS = estdc++ 14.0 \
> gfortran 3.0 \
> @@ -232,6 +232,10 @@ post-install:
> .if ${BUILD_PACKAGES:M-ada}
> chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adainclude
> chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adalib
> +.endif
> +.if ${BUILD_PACKAGES:M-f95}
> + ln -sf ${TRUEPREFIX}/bin/egfortran ${PREFIX}/bin/gfortran
> + ln -sf ${TRUEPREFIX}/bin/${CONFIG}-egfortran
> ${PREFIX}/bin/${CONFIG}-gfortran
> .endif
> chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/include
> chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/include-fixed
> Index: 4.6/pkg/PLIST-f95
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.6/pkg/PLIST-f95,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-f95
> --- 4.6/pkg/PLIST-f95 29 Jun 2016 16:14:41 -0000 1.3
> +++ 4.6/pkg/PLIST-f95 1 Sep 2016 14:02:32 -0000
> @@ -3,7 +3,9 @@
> @conflict gfortran-*
> @conflict libgfortran-*
> @bin bin/egfortran
> +bin/gfortran
> @bin bin/${CONFIG}-egfortran
> +bin/${CONFIG}-gfortran
> @info info/gfortran.info
> lib/gcc/${CONFIG}/${V}/finclude/
> lib/gcc/${CONFIG}/${V}/libgfortranbegin.a
> Index: 4.9/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- 4.9/Makefile 1 Sep 2016 10:56:58 -0000 1.35
> +++ 4.9/Makefile 1 Sep 2016 14:02:32 -0000
> @@ -3,30 +3,29 @@
> ONLY_FOR_ARCHS = amd64 arm hppa i386 mips64 mips64el powerpc sparc64
> DPB_PROPERTIES = parallel
>
> -V = 4.9.3
> -REVISION = 10
> +V = 4.9.4
> FULL_VERSION = $V
> FULL_PKGVERSION = $V
>
> -ADASTRAP_LIBC-amd64 = 80.0
> +ADASTRAP_LIBC-amd64 = 88.0
> ADASTRAP_LIBM-amd64 = 9.0
> ADASTRAP-amd64 = adastrap-amd64-$V-0.tar.xz
> -ADASTRAP_LIBC-arm = 84.1
> +ADASTRAP_LIBC-arm = 88.0
> ADASTRAP_LIBM-arm = 9.0
> ADASTRAP-arm = adastrap-arm-$V-0.tar.xz
> ADASTRAP_LIBC-hppa = 80.0
> ADASTRAP_LIBM-hppa = 9.0
> -ADASTRAP-hppa = adastrap-hppa-$V-0.tar.xz
> +ADASTRAP-hppa = adastrap-hppa-4.9.3-0.tar.xz
> ADASTRAP_LIBC-i386 = 80.0
> ADASTRAP_LIBM-i386 = 9.0
> -ADASTRAP-i386 = adastrap-i386-$V-0.tar.xz
> +ADASTRAP-i386 = adastrap-i386-4.9.3-0.tar.xz
> ADASTRAP_LIBC-mips64 = 83.0
> ADASTRAP_LIBM-mips64 = 9.0
> -ADASTRAP-mips64 = adastrap-mips64-$V-0.tar.xz
> +ADASTRAP-mips64 = adastrap-mips64-4.9.3-0.tar.xz
> ADASTRAP_LIBC-powerpc = 83.0
> ADASTRAP_LIBM-powerpc = 9.0
> -ADASTRAP-powerpc = adastrap-powerpc-$V-0.tar.xz
> -ADASTRAP_LIBC-sparc64 = 80.0
> +ADASTRAP-powerpc = adastrap-powerpc-4.9.3-0.tar.xz
> +ADASTRAP_LIBC-sparc64 = 88.0
> ADASTRAP_LIBM-sparc64 = 9.0
> ADASTRAP-sparc64 = adastrap-sparc64-$V-0.tar.xz
>
> @@ -86,7 +85,8 @@ TEST_DEPENDS = devel/dejagnu \
> ${BUILD_PKGPATH},-libs>=4.9,<4.10
>
> MASTER_SITES = ${MASTER_SITE_GCC:=releases/gcc-$(FULL_VERSION)/}
> -MASTER_SITES0 = https://spacehopper.org/mirrors/ \
> +MASTER_SITES0 = http://distfiles.stumpf.co/ \
> + https://spacehopper.org/mirrors/ \
> http://distfiles.tmux.org/adastrap/ \
> https://distfiles.bsdfrog.org/
> MASTER_SITES1 = ftp://sources.redhat.com/pub/java/
> @@ -245,6 +245,10 @@ post-install:
> .if ${BUILD_PACKAGES:M-ada}
> chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adainclude
> chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adalib
> +.endif
> +.if ${BUILD_PACKAGES:M-f95}
> + ln -sf ${TRUEPREFIX}/bin/egfortran ${PREFIX}/bin/gfortran
> + ln -sf ${TRUEPREFIX}/bin/${CONFIG}-egfortran
> ${PREFIX}/bin/${CONFIG}-gfortran
> .endif
> chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/include
> chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/include-fixed
> Index: 4.9/distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- 4.9/distinfo 1 Sep 2016 10:56:58 -0000 1.8
> +++ 4.9/distinfo 1 Sep 2016 14:02:32 -0000
> @@ -1,18 +1,18 @@
> -SHA256 (gcc/adastrap-amd64-4.9.3-0.tar.xz) =
> +VAAkLu2F7G+TFb8X5v12enuIjpTxL7pzKAUZdwJOSk=
> -SHA256 (gcc/adastrap-arm-4.9.3-0.tar.xz) =
> WrNk4nFe22t1aCe7F2n3hTYTdwsIJOKbGqYmyL1ZR7E=
> +SHA256 (gcc/adastrap-amd64-4.9.4-0.tar.xz) =
> YuTenZ/vM1QBj6r70EGWtNU8oUDbxX35YH4GTbJQSrw=
> +SHA256 (gcc/adastrap-arm-4.9.4-0.tar.xz) =
> sadBk8tP/65RDDIHlWE1yo9MnSUP/44Ou9064RXonto=
> SHA256 (gcc/adastrap-hppa-4.9.3-0.tar.xz) =
> mJRZenhNOzdgHxAAGqLP/snPxWtf5RZ4XV+ARabCeaw=
> SHA256 (gcc/adastrap-i386-4.9.3-0.tar.xz) =
> 26Hlt5rjEeVqlt1+VSzXccDg/3p6RrBiT8IdoyZq9tI=
> SHA256 (gcc/adastrap-mips64-4.9.3-0.tar.xz) =
> Dla1ddr9oX8uI1vFLdiKLoqiWdOBIhlwVZvQ1+hjlrA=
> SHA256 (gcc/adastrap-powerpc-4.9.3-0.tar.xz) =
> aXh2Q6fYpjqgAxt0o5ggkyjrJdAjI6Vn+CTX+ees0XU=
> -SHA256 (gcc/adastrap-sparc64-4.9.3-0.tar.xz) =
> LOCpsi4/MM0yJlkLYKeP4oA4pNsaQZ84scZQEjnrBC8=
> +SHA256 (gcc/adastrap-sparc64-4.9.4-0.tar.xz) =
> JW39xpcfy1VLWbCefUVSJsTAKdzivE18a7LwjMJVsgQ=
> SHA256 (gcc/ecj-4.5.jar) = mP0Sjx03TZ5C/Z1INr3SScbVEevGwN8X+8G535bD14E=
> -SHA256 (gcc/gcc-4.9.3.tar.bz2) = IzKypaMhtXUIuQMTVKhQOvb9+4aLjBdI0zAo0QCotn4=
> -SIZE (gcc/adastrap-amd64-4.9.3-0.tar.xz) = 38900540
> -SIZE (gcc/adastrap-arm-4.9.3-0.tar.xz) = 31197452
> +SHA256 (gcc/gcc-4.9.4.tar.bz2) = bBHSks0BspT5+EyaWcIw2A6eSkflxjVfBGuzbU81gJI=
> +SIZE (gcc/adastrap-amd64-4.9.4-0.tar.xz) = 38868508
> +SIZE (gcc/adastrap-arm-4.9.4-0.tar.xz) = 31142168
> SIZE (gcc/adastrap-hppa-4.9.3-0.tar.xz) = 32438872
> SIZE (gcc/adastrap-i386-4.9.3-0.tar.xz) = 39214284
> SIZE (gcc/adastrap-mips64-4.9.3-0.tar.xz) = 33204876
> SIZE (gcc/adastrap-powerpc-4.9.3-0.tar.xz) = 33866800
> -SIZE (gcc/adastrap-sparc64-4.9.3-0.tar.xz) = 31163612
> +SIZE (gcc/adastrap-sparc64-4.9.4-0.tar.xz) = 31102892
> SIZE (gcc/ecj-4.5.jar) = 1470676
> -SIZE (gcc/gcc-4.9.3.tar.bz2) = 90006707
> +SIZE (gcc/gcc-4.9.4.tar.bz2) = 90097606
> Index: 4.9/patches/patch-fixincludes_fixincl_x
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-fixincludes_fixincl_x,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-fixincludes_fixincl_x
> --- 4.9/patches/patch-fixincludes_fixincl_x 26 Jun 2014 16:30:15 -0000
> 1.1.1.1
> +++ 4.9/patches/patch-fixincludes_fixincl_x 1 Sep 2016 14:02:32 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-fixincludes_fixincl_x,v 1.1.1.1 2014/06/26 16:30:15 pascal
> Exp $
> ---- fixincludes/fixincl.x.orig Sun Dec 8 22:55:46 2013
> -+++ fixincludes/fixincl.x Fri Feb 14 20:24:53 2014
> -@@ -6349,11 +6349,11 @@ static const char* apzSolaris_Complex_CxxPatch[] = {
> s
> +--- fixincludes/fixincl.x.orig Mon Feb 1 21:27:47 2016
> ++++ fixincludes/fixincl.x Sat Aug 6 19:19:03 2016
> +@@ -6386,11 +6386,11 @@ static const char* apzSolaris_Complex_CxxPatch[] = {
> s
> "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
> #ifdef\t__cplusplus\\\n\
> extern \"C\" {\\\n\
> Index: 4.9/patches/patch-fixincludes_inclhack_def
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-fixincludes_inclhack_def,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-fixincludes_inclhack_def
> --- 4.9/patches/patch-fixincludes_inclhack_def 26 Jun 2014 16:30:15
> -0000 1.1.1.1
> +++ 4.9/patches/patch-fixincludes_inclhack_def 1 Sep 2016 14:02:32
> -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-fixincludes_inclhack_def,v 1.1.1.1 2014/06/26 16:30:15
> pascal Exp $
> ---- fixincludes/inclhack.def.orig Sun Dec 8 22:55:46 2013
> -+++ fixincludes/inclhack.def Fri Feb 14 20:24:53 2014
> -@@ -3293,9 +3293,9 @@ fix = {
> +--- fixincludes/inclhack.def.orig Mon Feb 1 21:27:47 2016
> ++++ fixincludes/inclhack.def Sat Aug 6 19:19:03 2016
> +@@ -3307,9 +3307,9 @@ fix = {
> mach = "*-*-solaris2.*";
> files = complex.h;
> sed = "/#if[ \t]*!defined(__cplusplus)/c\\\n"
> Index: 4.9/patches/patch-gcc_ada_gcc-interface_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/lang/gcc/4.9/patches/patch-gcc_ada_gcc-interface_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-gcc_ada_gcc-interface_Makefile_in
> --- 4.9/patches/patch-gcc_ada_gcc-interface_Makefile_in 5 Dec 2015
> 22:00:29 -0000 1.4
> +++ 4.9/patches/patch-gcc_ada_gcc-interface_Makefile_in 1 Sep 2016
> 14:02:32 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-gcc_ada_gcc-interface_Makefile_in,v 1.4 2015/12/05 22:00:29
> tobiasu Exp $
> ---- gcc/ada/gcc-interface/Makefile.in.orig Mon Jan 5 11:17:28 2015
> -+++ gcc/ada/gcc-interface/Makefile.in Mon Nov 23 02:00:51 2015
> +--- gcc/ada/gcc-interface/Makefile.in.orig Sun Dec 6 15:11:54 2015
> ++++ gcc/ada/gcc-interface/Makefile.in Sat Aug 6 19:19:04 2016
> @@ -431,6 +431,10 @@ ATOMICS_TARGET_PAIRS = \
> a-szunau.adb<a-szunau-shared.adb \
> a-szuzti.adb<a-szuzti-shared.adb
> @@ -12,7 +12,7 @@ $OpenBSD: patch-gcc_ada_gcc-interface_Ma
> ATOMICS_BUILTINS_TARGET_PAIRS = \
> s-atocou.adb<s-atocou-builtin.adb
>
> -@@ -1378,6 +1382,249 @@ ifeq ($(strip $(filter-out %86_64
> freebsd%,$(target_cp
> +@@ -1374,6 +1378,249 @@ ifeq ($(strip $(filter-out %86_64
> freebsd%,$(target_cp
> EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
>
> EH_MECHANISM=-gcc
> Index: 4.9/patches/patch-gcc_config_alpha_alpha_md
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_config_alpha_alpha_md,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-gcc_config_alpha_alpha_md
> --- 4.9/patches/patch-gcc_config_alpha_alpha_md 26 Jun 2014 16:30:16
> -0000 1.1.1.1
> +++ 4.9/patches/patch-gcc_config_alpha_alpha_md 1 Sep 2016 14:02:32
> -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-gcc_config_alpha_alpha_md,v 1.1.1.1 2014/06/26 16:30:16
> pascal Exp $
> ---- gcc/config/alpha/alpha.md.orig Fri Jun 7 08:26:42 2013
> -+++ gcc/config/alpha/alpha.md Wed Oct 16 18:56:48 2013
> -@@ -4887,7 +4887,8 @@
> +--- gcc/config/alpha/alpha.md.orig Wed May 18 21:53:16 2016
> ++++ gcc/config/alpha/alpha.md Sat Aug 6 19:19:04 2016
> +@@ -4888,7 +4888,8 @@
> if (CONST_INT_P (operands[1])
> && INTVAL (operands[1]) < 32768)
> {
> Index: 4.9/patches/patch-gcc_config_gcc
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_config_gcc,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-gcc_config_gcc
> --- 4.9/patches/patch-gcc_config_gcc 16 Sep 2015 10:59:25 -0000 1.7
> +++ 4.9/patches/patch-gcc_config_gcc 1 Sep 2016 14:02:32 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-gcc_config_gcc,v 1.7 2015/09/16 10:59:25 pascal Exp $
> ---- gcc/config.gcc.orig Thu May 21 22:50:59 2015
> -+++ gcc/config.gcc Tue Aug 25 21:42:44 2015
> +--- gcc/config.gcc.orig Mon Mar 14 11:03:12 2016
> ++++ gcc/config.gcc Sat Aug 6 19:19:04 2016
> @@ -771,6 +771,14 @@ case ${target} in
> default_use_cxa_atexit=yes
> ;;
> @@ -62,7 +62,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
> tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
> tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h
> i386/x86-64.h i386/openbsdelf.h"
> extra_options="${extra_options} openbsd.opt"
> -@@ -1949,6 +1966,18 @@ microblaze*-*-elf)
> +@@ -1946,6 +1963,18 @@ microblaze*-*-elf)
> cxx_target_objs="${cxx_target_objs} microblaze-c.o"
> tmake_file="${tmake_file} microblaze/t-microblaze"
> ;;
> @@ -81,7 +81,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
> mips*-*-netbsd*) # NetBSD/mips, either endian.
> target_cpu_default="MASK_ABICALLS"
> tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h
> mips/netbsd.h"
> -@@ -2176,11 +2205,12 @@ picochip-*)
> +@@ -2173,11 +2202,12 @@ picochip-*)
> use_gcc_stdint=wrap
> tmake_file="picochip/t-picochip t-pnt16-warn"
> ;;
> @@ -99,7 +99,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
> powerpc-*-darwin*)
> extra_options="${extra_options} rs6000/darwin.opt"
> case ${target} in
> -@@ -2750,11 +2780,19 @@ sparc64-*-netbsd*)
> +@@ -2747,11 +2777,19 @@ sparc64-*-netbsd*)
> extra_options="${extra_options} sparc/long-double-switch.opt"
> tmake_file="${tmake_file} sparc/t-sparc sparc/t-netbsd64"
> ;;
> @@ -120,7 +120,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 201
> gas=yes gnu_ld=yes
> with_cpu=ultrasparc
> tmake_file="${tmake_file} sparc/t-sparc"
> -@@ -2941,6 +2979,12 @@ case ${target} in
> +@@ -2938,6 +2976,12 @@ case ${target} in
> else
> arch=i386
> fi
> Index: 4.9/patches/patch-gcc_config_i386_i386_c
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_config_i386_i386_c,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-gcc_config_i386_i386_c
> --- 4.9/patches/patch-gcc_config_i386_i386_c 19 Jul 2015 21:22:49 -0000
> 1.3
> +++ 4.9/patches/patch-gcc_config_i386_i386_c 1 Sep 2016 14:02:32 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-gcc_config_i386_i386_c,v 1.3 2015/07/19 21:22:49 pascal Exp $
> ---- gcc/config/i386/i386.c.orig Wed Jun 10 11:26:06 2015
> -+++ gcc/config/i386/i386.c Sat Jun 27 11:26:33 2015
> +--- gcc/config/i386/i386.c.orig Mon Aug 1 18:03:41 2016
> ++++ gcc/config/i386/i386.c Sat Aug 6 19:19:04 2016
> @@ -2307,6 +2307,8 @@ struct ix86_frame
> HOST_WIDE_INT reg_save_offset;
> HOST_WIDE_INT sse_reg_save_offset;
> @@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_config_i386_i386_c,v
> /* When save_regs_using_mov is set, emit prologue using
> move instead of push instructions. */
> bool save_regs_using_mov;
> -@@ -9516,6 +9518,7 @@ ix86_compute_frame_layout (struct ix86_frame *frame)
> +@@ -9527,6 +9529,7 @@ ix86_compute_frame_layout (struct ix86_frame *frame)
> HOST_WIDE_INT size = get_frame_size ();
> HOST_WIDE_INT to_allocate;
>
> @@ -18,7 +18,7 @@ $OpenBSD: patch-gcc_config_i386_i386_c,v
> frame->nregs = ix86_nsaved_regs ();
> frame->nsseregs = ix86_nsaved_sseregs ();
>
> -@@ -10880,6 +10883,9 @@ ix86_expand_prologue (void)
> +@@ -10903,6 +10906,9 @@ ix86_expand_prologue (void)
> m->fs.sp_offset = INCOMING_FRAME_SP_OFFSET;
> m->fs.realigned = true;
> }
> Index: 4.9/patches/patch-gcc_config_pa_pa_c
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_config_pa_pa_c,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-gcc_config_pa_pa_c
> --- 4.9/patches/patch-gcc_config_pa_pa_c 19 Jul 2015 21:22:49 -0000
> 1.4
> +++ 4.9/patches/patch-gcc_config_pa_pa_c 1 Sep 2016 14:02:32 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-gcc_config_pa_pa_c,v 1.4 2015/07/19 21:22:49 pascal Exp $
> ---- gcc/config/pa/pa.c.orig Fri Jun 12 01:24:30 2015
> -+++ gcc/config/pa/pa.c Sat Jun 27 11:26:33 2015
> -@@ -3828,6 +3828,9 @@ pa_expand_prologue (void)
> +--- gcc/config/pa/pa.c.orig Tue Jan 12 02:41:59 2016
> ++++ gcc/config/pa/pa.c Sat Aug 6 19:19:05 2016
> +@@ -3875,6 +3875,9 @@ pa_expand_prologue (void)
> if (flag_stack_usage_info)
> current_function_static_stack_size = actual_fsize;
>
> @@ -11,7 +11,7 @@ $OpenBSD: patch-gcc_config_pa_pa_c,v 1.4
> /* Compute a few things we will use often. */
> tmpreg = gen_rtx_REG (word_mode, 1);
>
> -@@ -10156,8 +10159,8 @@ pa_trampoline_init (rtx m_tramp, tree fndecl, rtx
> chai
> +@@ -10195,8 +10198,8 @@ pa_trampoline_init (rtx m_tramp, tree fndecl, rtx
> chai
> }
>
> #ifdef HAVE_ENABLE_EXECUTE_STACK
> Index: 4.9/patches/patch-gcc_config_rs6000_rs6000_c
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_config_rs6000_rs6000_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-gcc_config_rs6000_rs6000_c
> --- 4.9/patches/patch-gcc_config_rs6000_rs6000_c 6 Aug 2015 18:38:34
> -0000 1.1
> +++ 4.9/patches/patch-gcc_config_rs6000_rs6000_c 1 Sep 2016 14:02:32
> -0000
> @@ -6,9 +6,9 @@ Mozilla ports including xulrunner.
>
> Borrowed from
> https://github.com/sba1/adtools/commit/b24ae065714a2390d7718d2c348fe5cfa40c2b48
>
> ---- gcc/config/rs6000/rs6000.c.orig Wed Aug 5 20:54:32 2015
> -+++ gcc/config/rs6000/rs6000.c Wed Aug 5 20:55:36 2015
> -@@ -4983,6 +4983,8 @@ rs6000_file_start (void)
> +--- gcc/config/rs6000/rs6000.c.orig Thu Feb 4 14:59:27 2016
> ++++ gcc/config/rs6000/rs6000.c Sat Aug 6 19:19:05 2016
> +@@ -5006,6 +5006,8 @@ rs6000_file_start (void)
> if (rs6000_default_cpu == 0 || rs6000_default_cpu[0] == '\0'
> || !global_options_set.x_rs6000_cpu_index)
> {
> @@ -17,7 +17,7 @@ Borrowed from https://github.com/sba1/ad
> fputs ("\t.machine ", asm_out_file);
> if ((rs6000_isa_flags & OPTION_MASK_DIRECT_MOVE) != 0)
> fputs ("power8\n", asm_out_file);
> -@@ -4998,6 +5000,7 @@ rs6000_file_start (void)
> +@@ -5021,6 +5023,7 @@ rs6000_file_start (void)
> fputs ("ppc64\n", asm_out_file);
> else
> fputs ("ppc\n", asm_out_file);
> Index: 4.9/patches/patch-gcc_config_sparc_sparc_c
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_config_sparc_sparc_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-gcc_config_sparc_sparc_c
> --- 4.9/patches/patch-gcc_config_sparc_sparc_c 19 Jul 2015 21:22:49
> -0000 1.2
> +++ 4.9/patches/patch-gcc_config_sparc_sparc_c 1 Sep 2016 14:02:32
> -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-gcc_config_sparc_sparc_c,v 1.2 2015/07/19 21:22:49 pascal
> Exp $
> ---- gcc/config/sparc/sparc.c.orig Thu Jun 11 17:59:27 2015
> -+++ gcc/config/sparc/sparc.c Sat Jun 27 11:26:33 2015
> -@@ -5576,6 +5576,9 @@ sparc_expand_prologue (void)
> +--- gcc/config/sparc/sparc.c.orig Tue Apr 12 22:56:11 2016
> ++++ gcc/config/sparc/sparc.c Sat Aug 6 19:19:05 2016
> +@@ -5581,6 +5581,9 @@ sparc_expand_prologue (void)
> if (crtl->uses_pic_offset_table)
> load_got_register ();
>
> Index: 4.9/patches/patch-gcc_configure
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_configure,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-gcc_configure
> --- 4.9/patches/patch-gcc_configure 19 Jul 2015 21:22:49 -0000 1.4
> +++ 4.9/patches/patch-gcc_configure 1 Sep 2016 14:02:32 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-gcc_configure,v 1.4 2015/07/19 21:22:49 pascal Exp $
> ---- gcc/configure.orig Tue May 12 10:55:54 2015
> -+++ gcc/configure Sat Jun 27 11:26:33 2015
> +--- gcc/configure.orig Sun May 22 10:53:32 2016
> ++++ gcc/configure Sat Aug 6 19:19:05 2016
> @@ -17367,7 +17367,7 @@ openbsd*)
> *) need_version=no ;;
> esac
> @@ -19,7 +19,7 @@ $OpenBSD: patch-gcc_configure,v 1.4 2015
> shlibpath_var=LD_LIBRARY_PATH
> if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test
> "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
> case $host_os in
> -@@ -27491,6 +27491,7 @@ else
> +@@ -27522,6 +27522,7 @@ else
> fi
>
> ;;
> Index: 4.9/patches/patch-libatomic_configure_tgt
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-libatomic_configure_tgt,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-libatomic_configure_tgt
> --- 4.9/patches/patch-libatomic_configure_tgt 12 Nov 2014 10:56:59 -0000
> 1.2
> +++ 4.9/patches/patch-libatomic_configure_tgt 1 Sep 2016 14:02:32 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-libatomic_configure_tgt,v 1.2 2014/11/12 10:56:59 tobiasu
> Exp $
> ---- libatomic/configure.tgt.orig Thu Jan 2 23:24:30 2014
> -+++ libatomic/configure.tgt Wed Sep 24 18:26:31 2014
> -@@ -43,7 +43,7 @@ case "${target_cpu}" in
> +--- libatomic/configure.tgt.orig Mon May 9 08:13:05 2016
> ++++ libatomic/configure.tgt Sat Aug 6 19:19:16 2016
> +@@ -47,7 +47,7 @@ case "${target_cpu}" in
> ;;
> *)
> if test -z "$with_cpu"; then
> Index: 4.9/patches/patch-libgcc_config_host
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-libgcc_config_host,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-libgcc_config_host
> --- 4.9/patches/patch-libgcc_config_host 24 Sep 2015 22:29:59 -0000
> 1.4
> +++ 4.9/patches/patch-libgcc_config_host 1 Sep 2016 14:02:32 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-libgcc_config_host,v 1.4 2015/09/24 22:29:59 tobiasu Exp $
> ---- libgcc/config.host.orig Thu Mar 27 16:40:31 2014
> -+++ libgcc/config.host Thu Sep 17 08:19:38 2015
> +--- libgcc/config.host.orig Tue May 17 08:22:28 2016
> ++++ libgcc/config.host Sat Aug 6 19:19:20 2016
> @@ -364,6 +364,10 @@ arm-wrs-vxworks)
> arm*-*-netbsdelf*)
> tmake_file="$tmake_file arm/t-arm arm/t-netbsd t-slibgcc-gld-nover"
> @@ -25,7 +25,7 @@ $OpenBSD: patch-libgcc_config_host,v 1.4
> mips*-*-linux*) # Linux MIPS, either endian.
> extra_parts="$extra_parts crtfastmath.o"
> tmake_file="${tmake_file} t-crtfm"
> -@@ -947,6 +957,9 @@ powerpc*-*-freebsd*)
> +@@ -942,6 +952,9 @@ powerpc*-*-freebsd*)
> powerpc-*-netbsd*)
> tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"
> ;;
> @@ -35,7 +35,7 @@ $OpenBSD: patch-libgcc_config_host,v 1.4
> powerpc-*-eabispe*)
> tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-savresfgpr
> rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
> extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o
> crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
> -@@ -1093,6 +1106,8 @@ sh-wrs-vxworks)
> +@@ -1088,6 +1101,8 @@ sh-wrs-vxworks)
> tmake_file="$tmake_file sh/t-sh t-crtstuff-pic t-fdpbit"
> ;;
> sparc-*-netbsdelf*)
> Index: 4.9/patches/patch-libiberty_cp-demangle_c
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-libiberty_cp-demangle_c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-libiberty_cp-demangle_c
> --- 4.9/patches/patch-libiberty_cp-demangle_c 26 Jun 2014 16:30:17 -0000
> 1.1.1.1
> +++ 4.9/patches/patch-libiberty_cp-demangle_c 1 Sep 2016 14:02:32 -0000
> @@ -1,16 +1,16 @@
> $OpenBSD: patch-libiberty_cp-demangle_c,v 1.1.1.1 2014/06/26 16:30:17 pascal
> Exp $
> ---- libiberty/cp-demangle.c.orig Tue Jan 28 20:06:44 2014
> -+++ libiberty/cp-demangle.c Fri Feb 14 20:24:55 2014
> -@@ -4005,7 +4005,7 @@ static inline void
> - d_append_num (struct d_print_info *dpi, long l)
> +--- libiberty/cp-demangle.c.orig Thu May 19 14:05:41 2016
> ++++ libiberty/cp-demangle.c Sat Aug 6 19:33:19 2016
> +@@ -4057,7 +4057,7 @@ static inline void
> + d_append_num (struct d_print_info *dpi, int l)
> {
> char buf[25];
> -- sprintf (buf,"%ld", l);
> -+ snprintf (buf, 25, "%ld", l);
> +- sprintf (buf,"%d", l);
> ++ snprintf (buf, 25, "%d", l);
> d_append_string (dpi, buf);
> }
>
> -@@ -5949,7 +5949,7 @@ __cxa_demangle (const char *mangled_name, char *output
> +@@ -6052,7 +6052,7 @@ __cxa_demangle (const char *mangled_name, char *output
> {
> if (strlen (demangled) < *length)
> {
> Index: 4.9/patches/patch-libstdc++-v3_configure
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-libstdc++-v3_configure,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-libstdc++-v3_configure
> --- 4.9/patches/patch-libstdc++-v3_configure 24 Sep 2015 22:29:59 -0000
> 1.2
> +++ 4.9/patches/patch-libstdc++-v3_configure 1 Sep 2016 14:02:33 -0000
> @@ -2,8 +2,8 @@ $OpenBSD: patch-libstdc++-v3_configure,v
>
> *-openbsd* required for cross compiling libstdc++
>
> ---- libstdc++-v3/configure.orig Thu Mar 20 19:57:07 2014
> -+++ libstdc++-v3/configure Tue Sep 15 13:15:34 2015
> +--- libstdc++-v3/configure.orig Tue Feb 23 13:15:20 2016
> ++++ libstdc++-v3/configure Sat Aug 6 19:19:24 2016
> @@ -10933,7 +10933,7 @@ openbsd*)
> *) need_version=no ;;
> esac
> @@ -22,7 +22,7 @@ $OpenBSD: patch-libstdc++-v3_configure,v
> shlibpath_var=LD_LIBRARY_PATH
> if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test
> "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
> case $host_os in
> -@@ -64726,7 +64726,7 @@ done
> +@@ -64788,7 +64788,7 @@ done
> CXXFLAGS="$ac_save_CXXFLAGS"
>
> ;;
> Index: 4.9/pkg/PLIST-f95
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/4.9/pkg/PLIST-f95,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-f95
> --- 4.9/pkg/PLIST-f95 29 Jun 2016 16:14:41 -0000 1.3
> +++ 4.9/pkg/PLIST-f95 1 Sep 2016 14:02:33 -0000
> @@ -3,7 +3,9 @@
> @conflict gfortran-*
> @conflict libgfortran-*
> @bin bin/egfortran
> +bin/gfortran
> @bin bin/${CONFIG}-egfortran
> +bin/${CONFIG}-gfortran
> @info info/gfortran.info
> lib/gcc/${CONFIG}/${V}/finclude/
> lib/gcc/${CONFIG}/${V}/libcaf_single.a
>
