On 2020/08/18 13:10, Brad Smith wrote:
> On Sat, Mar 14, 2020 at 03:58:12AM -0400, Brad Smith wrote:
> > Here is a start at an update to GCC 8.4.0.
> >
> > I e-mailed Pascal 10 days ago but no response.
>
> Added the version bump for LLVM.
>
> Has been run through a bulk build on sparc64 without issue.
Also has been through a bulk build on i386 without issue.
> Index: lang/gcc/8/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/Makefile,v
> retrieving revision 1.32
> diff -u -p -u -p -r1.32 Makefile
> --- lang/gcc/8/Makefile 8 Aug 2020 16:48:48 -0000 1.32
> +++ lang/gcc/8/Makefile 9 Aug 2020 03:18:29 -0000
> @@ -15,17 +15,16 @@ USE_LLD = No
>
> DPB_PROPERTIES = parallel
>
> -V = 8.3.0
> -REVISION = 6
> +V = 8.4.0
> FULL_VERSION = $V
> FULL_PKGVERSION = $V
>
> -ADASTRAP-amd64 = adastrap-amd64-$V-2.tar.xz
> +ADASTRAP-amd64 = adastrap-amd64-8.3.0-2.tar.xz
> ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
> -ADASTRAP-hppa = adastrap-hppa-$V-1.tar.xz
> -ADASTRAP-i386 = adastrap-i386-$V-2.tar.xz
> -ADASTRAP-mips64 = adastrap-mips64-$V-1.tar.xz
> -ADASTRAP-powerpc = adastrap-powerpc-$V-2.tar.xz
> +ADASTRAP-hppa = adastrap-hppa-8.3.0-1.tar.xz
> +ADASTRAP-i386 = adastrap-i386-8.3.0-2.tar.xz
> +ADASTRAP-mips64 = adastrap-mips64-8.3.0-1.tar.xz
> +ADASTRAP-powerpc = adastrap-powerpc-8.3.0-2.tar.xz
> ADASTRAP-sparc64 = adastrap-sparc64-6.5.0-0.tar.xz
>
> PKGNAME-main = gcc-${FULL_PKGVERSION}
> Index: lang/gcc/8/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/distinfo,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 distinfo
> --- lang/gcc/8/distinfo 3 Dec 2019 21:18:26 -0000 1.10
> +++ lang/gcc/8/distinfo 4 Mar 2020 15:07:14 -0000
> @@ -5,7 +5,7 @@ SHA256 (gcc/adastrap-i386-8.3.0-2.tar.xz
> SHA256 (gcc/adastrap-mips64-8.3.0-1.tar.xz) =
> 0KoMJYD/HZO/b9H0d7oBxYxN/NLfgnb5tug9v0mpu3o=
> SHA256 (gcc/adastrap-powerpc-8.3.0-2.tar.xz) =
> agAk8BvVOlwvIygLlg22GZq36+55n+exWUqKFk4wC7A=
> SHA256 (gcc/adastrap-sparc64-6.5.0-0.tar.xz) =
> cqpGS2beYV+CFf7X+P4voVHHT78v6SCgtksHXjP/B4E=
> -SHA256 (gcc/gcc-8.3.0.tar.xz) = ZLqt/mzA9JR6hMsS1/Dfr0W7WLfpJGFjlZbCHgLZfSw=
> +SHA256 (gcc/gcc-8.4.0.tar.xz) = 4wpuUtEOHyftVRBK0jPDC9HpnPtf+YqwItyUHt0bLdQ=
> SIZE (gcc/adastrap-amd64-8.3.0-2.tar.xz) = 58534592
> SIZE (gcc/adastrap-arm-4.9.4-0.tar.xz) = 31142168
> SIZE (gcc/adastrap-hppa-8.3.0-1.tar.xz) = 48044496
> @@ -13,4 +13,4 @@ SIZE (gcc/adastrap-i386-8.3.0-2.tar.xz)
> SIZE (gcc/adastrap-mips64-8.3.0-1.tar.xz) = 49736364
> SIZE (gcc/adastrap-powerpc-8.3.0-2.tar.xz) = 53062880
> SIZE (gcc/adastrap-sparc64-6.5.0-0.tar.xz) = 38704976
> -SIZE (gcc/gcc-8.3.0.tar.xz) = 63694700
> +SIZE (gcc/gcc-8.4.0.tar.xz) = 63713440
> Index: lang/gcc/8/patches/patch-fixincludes_fixincl_x
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-fixincludes_fixincl_x,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-fixincludes_fixincl_x
> --- lang/gcc/8/patches/patch-fixincludes_fixincl_x 4 Jan 2019 15:50:39
> -0000 1.1.1.1
> +++ lang/gcc/8/patches/patch-fixincludes_fixincl_x 4 Mar 2020 16:15:17
> -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-fixincludes_fixincl_x,v
> Index: fixincludes/fixincl.x
> --- fixincludes/fixincl.x.orig
> +++ fixincludes/fixincl.x
> -@@ -7019,11 +7019,11 @@ static const char* apzSolaris_Complex_CxxPatch[] = {
> s
> +@@ -7276,11 +7276,11 @@ static const char* apzSolaris_Complex_CxxPatch[] = {
> s
> "-e", "/#if[ \t]*!defined(__cplusplus)/c\\\n\
> #ifdef\t__cplusplus\\\n\
> extern \"C\" {\\\n\
> Index: lang/gcc/8/patches/patch-fixincludes_inclhack_def
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-fixincludes_inclhack_def,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-fixincludes_inclhack_def
> --- lang/gcc/8/patches/patch-fixincludes_inclhack_def 4 Jan 2019 15:50:40
> -0000 1.1.1.1
> +++ lang/gcc/8/patches/patch-fixincludes_inclhack_def 4 Mar 2020 16:14:34
> -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-fixincludes_inclhack_def
> Index: fixincludes/inclhack.def
> --- fixincludes/inclhack.def.orig
> +++ fixincludes/inclhack.def
> -@@ -3490,9 +3490,9 @@ fix = {
> +@@ -3621,9 +3621,9 @@ fix = {
> mach = "*-*-solaris2.*";
> files = complex.h;
> sed = "/#if[ \t]*!defined(__cplusplus)/c\\\n"
> Index: lang/gcc/8/patches/patch-gcc_Makefile_in
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-gcc_Makefile_in
> --- lang/gcc/8/patches/patch-gcc_Makefile_in 4 Jan 2019 15:50:39 -0000
> 1.1.1.1
> +++ lang/gcc/8/patches/patch-gcc_Makefile_in 4 Mar 2020 16:14:34 -0000
> @@ -24,7 +24,7 @@ Index: gcc/Makefile.in
>
> # Native compiler that we use. This may be C++ some day.
> COMPILER_FOR_BUILD = $(CXX_FOR_BUILD)
> -@@ -2195,6 +2190,12 @@ DRIVER_DEFINES = \
> +@@ -2196,6 +2191,12 @@ DRIVER_DEFINES = \
> CFLAGS-gcc.o += $(DRIVER_DEFINES) -DBASEVER=$(BASEVER_s)
> gcc.o: $(BASEVER)
>
> @@ -37,7 +37,7 @@ Index: gcc/Makefile.in
> specs.h : s-specs ; @true
> s-specs : Makefile
> lsf="$(lang_specs_files)"; for f in $$lsf; do \
> -@@ -3089,7 +3090,7 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \
> +@@ -3090,7 +3091,7 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \
> gcc_dir=`${PWD_COMMAND}` ; \
> export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
> cd $(build_objdir)/fixincludes && \
> Index: lang/gcc/8/patches/patch-gcc_ada_osint_adb
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_ada_osint_adb,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-gcc_ada_osint_adb
> --- lang/gcc/8/patches/patch-gcc_ada_osint_adb 4 Jan 2019 15:50:39
> -0000 1.1.1.1
> +++ lang/gcc/8/patches/patch-gcc_ada_osint_adb 4 Mar 2020 16:14:34
> -0000
> @@ -9,7 +9,7 @@ least amount of files.
> Index: gcc/ada/osint.adb
> --- gcc/ada/osint.adb.orig
> +++ gcc/ada/osint.adb
> -@@ -2244,6 +2244,13 @@ package body Osint is
> +@@ -2243,6 +2243,13 @@ package body Osint is
> Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
> end if;
>
> Index: lang/gcc/8/patches/patch-gcc_c_c-decl_c
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_c_c-decl_c,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-gcc_c_c-decl_c
> --- lang/gcc/8/patches/patch-gcc_c_c-decl_c 25 Mar 2019 20:17:47 -0000
> 1.2
> +++ lang/gcc/8/patches/patch-gcc_c_c-decl_c 4 Mar 2020 16:14:34 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-gcc_c_c-decl_c,v 1.2 201
> Index: gcc/c/c-decl.c
> --- gcc/c/c-decl.c.orig
> +++ gcc/c/c-decl.c
> -@@ -5545,6 +5545,8 @@ warn_variable_length_array (tree name, tree size)
> +@@ -5565,6 +5565,8 @@ warn_variable_length_array (tree name, tree size)
> pedwarn_c90 (input_location, OPT_Wvla, "ISO C90 forbids variable "
> "length array");
> }
> Index: lang/gcc/8/patches/patch-gcc_common_config_aarch64_aarch64-common_c
> ===================================================================
> RCS file:
> /home/cvs/ports/lang/gcc/8/patches/patch-gcc_common_config_aarch64_aarch64-common_c,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-gcc_common_config_aarch64_aarch64-common_c
> --- lang/gcc/8/patches/patch-gcc_common_config_aarch64_aarch64-common_c
> 4 Jan 2019 15:50:39 -0000 1.1.1.1
> +++ lang/gcc/8/patches/patch-gcc_common_config_aarch64_aarch64-common_c
> 4 Mar 2020 16:14:34 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-gcc_common_config_aarch6
> Index: gcc/common/config/aarch64/aarch64-common.c
> --- gcc/common/config/aarch64/aarch64-common.c.orig
> +++ gcc/common/config/aarch64/aarch64-common.c
> -@@ -45,8 +45,6 @@
> +@@ -47,8 +47,6 @@
> /* Set default optimization options. */
> static const struct default_options aarch_option_optimization_table[] =
> {
> Index: lang/gcc/8/patches/patch-gcc_config_alpha_alpha_c
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_alpha_alpha_c,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-gcc_config_alpha_alpha_c
> --- lang/gcc/8/patches/patch-gcc_config_alpha_alpha_c 25 Mar 2019 20:17:47
> -0000 1.2
> +++ lang/gcc/8/patches/patch-gcc_config_alpha_alpha_c 4 Mar 2020 16:14:34
> -0000
> @@ -154,4 +154,4 @@ Index: gcc/config/alpha/alpha.c
> + /* (e) would be violated */
> goto close_shadow;
>
> - default:
> + case DEBUG_INSN:
> Index: lang/gcc/8/patches/patch-gcc_config_gcc
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_gcc,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-gcc_config_gcc
> --- lang/gcc/8/patches/patch-gcc_config_gcc 8 Aug 2020 16:48:48 -0000
> 1.3
> +++ lang/gcc/8/patches/patch-gcc_config_gcc 9 Aug 2020 03:18:02 -0000
> @@ -64,7 +64,7 @@ Index: gcc/config.gcc
> tm_file="${tm_file} dbxelf.h elfos.h openbsd.h openbsd-stdint.h
> openbsd-libpthread.h \
> pa/pa-openbsd.h pa/pa32-regs.h pa/pa32-openbsd.h"
> extra_options="${extra_options} openbsd.opt"
> -@@ -1532,6 +1556,7 @@ x86_64-*-netbsd*)
> +@@ -1541,6 +1565,7 @@ x86_64-*-netbsd*)
> extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
> ;;
> i[34567]86-*-openbsd*)
> @@ -72,7 +72,7 @@ Index: gcc/config.gcc
> 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/openbsdelf.h"
> extra_options="${extra_options} openbsd.opt"
> -@@ -1539,12 +1564,25 @@ i[34567]86-*-openbsd*)
> +@@ -1548,12 +1573,25 @@ i[34567]86-*-openbsd*)
> gnu_ld=yes
> ;;
> x86_64-*-openbsd*)
> @@ -98,7 +98,7 @@ Index: gcc/config.gcc
> i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-gnu* |
> i[34567]86-*-kopensolaris*-gnu)
> # Intel 80386's running GNU/*
> # with ELF format using glibc 2
> -@@ -2385,6 +2423,12 @@ pdp11-*-*)
> +@@ -2394,6 +2432,12 @@ pdp11-*-*)
> # tmake_file="${tmake_file} rs6000/t-fprules"
> # extra_headers=
> # ;;
> @@ -109,9 +109,9 @@ Index: gcc/config.gcc
> + extra_options="${extra_options} rs6000/sysv4.opt openbsd.opt"
> + ;;
> powerpc-*-darwin*)
> - extra_options="${extra_options} rs6000/darwin.opt"
> + extra_options="${extra_options} ${cpu_type}/darwin.opt"
> case ${target} in
> -@@ -2978,10 +3022,10 @@ sparc64-*-netbsd*)
> +@@ -2994,10 +3038,10 @@ sparc64-*-netbsd*)
> tmake_file="${tmake_file} sparc/t-sparc sparc/t-netbsd64"
> ;;
> sparc64-*-openbsd*)
> @@ -123,7 +123,7 @@ Index: gcc/config.gcc
> gas=yes gnu_ld=yes
> with_cpu=ultrasparc
> tmake_file="${tmake_file} sparc/t-sparc"
> -@@ -3210,6 +3254,12 @@ case ${target} in
> +@@ -3226,6 +3270,12 @@ case ${target} in
> else
> arch=i386
> fi
> Index: lang/gcc/8/patches/patch-gcc_config_i386_i386_c
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_i386_i386_c,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-gcc_config_i386_i386_c
> --- lang/gcc/8/patches/patch-gcc_config_i386_i386_c 7 Sep 2019 19:32:44
> -0000 1.3
> +++ lang/gcc/8/patches/patch-gcc_config_i386_i386_c 4 Mar 2020 16:14:34
> -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-gcc_config_i386_i386_c,v
> Index: gcc/config/i386/i386.c
> --- gcc/config/i386/i386.c.orig
> +++ gcc/config/i386/i386.c
> -@@ -11716,6 +11716,7 @@ ix86_compute_frame_layout (void)
> +@@ -11628,6 +11628,7 @@ ix86_compute_frame_layout (void)
> }
> }
>
> @@ -11,7 +11,7 @@ Index: gcc/config/i386/i386.c
> frame->nregs = ix86_nsaved_regs ();
> frame->nsseregs = ix86_nsaved_sseregs ();
>
> -@@ -13783,6 +13784,9 @@ ix86_expand_prologue (void)
> +@@ -13695,6 +13696,9 @@ ix86_expand_prologue (void)
> RTX_FRAME_RELATED_P (insn) = 1;
> }
> }
> Index: lang/gcc/8/patches/patch-gcc_config_i386_i386_h
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_i386_i386_h,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-gcc_config_i386_i386_h
> --- lang/gcc/8/patches/patch-gcc_config_i386_i386_h 25 Mar 2019 20:17:47
> -0000 1.2
> +++ lang/gcc/8/patches/patch-gcc_config_i386_i386_h 4 Mar 2020 16:14:34
> -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-gcc_config_i386_i386_h,v
> Index: gcc/config/i386/i386.h
> --- gcc/config/i386/i386.h.orig
> +++ gcc/config/i386/i386.h
> -@@ -2467,6 +2467,8 @@ struct GTY(()) ix86_frame
> +@@ -2492,6 +2492,8 @@ struct GTY(()) ix86_frame
> HOST_WIDE_INT stack_realign_offset;
> HOST_WIDE_INT sse_reg_save_offset;
>
> Index: lang/gcc/8/patches/patch-gcc_config_pa_pa_c
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_pa_pa_c,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-gcc_config_pa_pa_c
> --- lang/gcc/8/patches/patch-gcc_config_pa_pa_c 4 Jan 2019 15:50:39
> -0000 1.1.1.1
> +++ lang/gcc/8/patches/patch-gcc_config_pa_pa_c 4 Mar 2020 16:14:34
> -0000
> @@ -10,22 +10,13 @@ Index: gcc/config/pa/pa.c
> #include "alias.h"
> #include "fold-const.h"
> #include "stor-layout.h"
> -@@ -3926,6 +3927,9 @@ pa_expand_prologue (void)
> +@@ -3930,6 +3931,9 @@ pa_expand_prologue (void)
> + actual_fsize = pa_compute_frame_size (size, &save_fregs);
> if (flag_stack_usage_info)
> current_function_static_stack_size = actual_fsize;
> -
> ++
> + if (warn_stack_larger_than && actual_fsize > stack_larger_than_size)
> + warning (OPT_Wstack_larger_than_, "stack usage is %lld bytes",
> actual_fsize);
> -+
> +
> /* Compute a few things we will use often. */
> tmpreg = gen_rtx_REG (word_mode, 1);
> -
> -@@ -10234,7 +10238,7 @@ pa_trampoline_init (rtx m_tramp, tree fndecl, rtx
> chai
> - }
> -
> - #ifdef HAVE_ENABLE_EXECUTE_STACK
> -- emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__enable_execute_stack"),
> -+ emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__enable_execute_stack"),
> - LCT_NORMAL, VOIDmode, XEXP (m_tramp, 0), Pmode);
> - #endif
> - }
> Index: lang/gcc/8/patches/patch-gcc_config_rs6000_rs6000_c
> ===================================================================
> RCS file:
> /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_rs6000_rs6000_c,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-gcc_config_rs6000_rs6000_c
> --- lang/gcc/8/patches/patch-gcc_config_rs6000_rs6000_c 25 Mar 2019
> 20:17:47 -0000 1.2
> +++ lang/gcc/8/patches/patch-gcc_config_rs6000_rs6000_c 4 Mar 2020
> 16:14:34 -0000
> @@ -9,7 +9,7 @@ Borrowed from https://github.com/sba1/ad
> Index: gcc/config/rs6000/rs6000.c
> --- gcc/config/rs6000/rs6000.c.orig
> +++ gcc/config/rs6000/rs6000.c
> -@@ -6157,6 +6157,8 @@ rs6000_file_start (void)
> +@@ -6169,6 +6169,8 @@ rs6000_file_start (void)
> if (!(rs6000_default_cpu && rs6000_default_cpu[0])
> && !global_options_set.x_rs6000_cpu_index)
> {
> @@ -18,7 +18,7 @@ Index: gcc/config/rs6000/rs6000.c
> fputs ("\t.machine ", asm_out_file);
> if ((rs6000_isa_flags & OPTION_MASK_MODULO) != 0)
> fputs ("power9\n", asm_out_file);
> -@@ -6174,6 +6176,7 @@ rs6000_file_start (void)
> +@@ -6186,6 +6188,7 @@ rs6000_file_start (void)
> fputs ("ppc64\n", asm_out_file);
> else
> fputs ("ppc\n", asm_out_file);
> Index: lang/gcc/8/patches/patch-gcc_config_sparc_sparc_c
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_sparc_sparc_c,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-gcc_config_sparc_sparc_c
> --- lang/gcc/8/patches/patch-gcc_config_sparc_sparc_c 25 Mar 2019 20:17:47
> -0000 1.2
> +++ lang/gcc/8/patches/patch-gcc_config_sparc_sparc_c 4 Mar 2020 16:14:34
> -0000
> @@ -10,7 +10,7 @@ Index: gcc/config/sparc/sparc.c
> #include "explow.h"
> #include "expr.h"
> #include "debug.h"
> -@@ -6058,8 +6059,8 @@ sparc_expand_prologue (void)
> +@@ -6084,8 +6085,8 @@ sparc_expand_prologue (void)
> at the end of the function prologue, and moving instructions that
> access the stack via the frame pointer between the instructions
> that decrement the stack pointer could result in accessing the
> @@ -21,7 +21,7 @@ Index: gcc/config/sparc/sparc.c
> }
> else
> {
> -@@ -6085,6 +6086,9 @@ sparc_expand_prologue (void)
> +@@ -6111,6 +6112,9 @@ sparc_expand_prologue (void)
> sparc_frame_base_offset
> - sparc_apparent_frame_size,
> SORR_SAVE);
> Index: lang/gcc/8/patches/patch-gcc_configure
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_configure,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-gcc_configure
> --- lang/gcc/8/patches/patch-gcc_configure 4 Jan 2019 15:50:39 -0000
> 1.1.1.1
> +++ lang/gcc/8/patches/patch-gcc_configure 4 Mar 2020 16:14:34 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-gcc_configure,v 1.1.1.1
> Index: gcc/configure
> --- gcc/configure.orig
> +++ gcc/configure
> -@@ -17870,7 +17870,7 @@ openbsd*)
> +@@ -17871,7 +17871,7 @@ openbsd*)
> *) need_version=no ;;
> esac
> library_names_spec='${libname}${release}${shared_ext}$versuffix
> ${libname}${shared_ext}$versuffix'
> @@ -11,7 +11,7 @@ Index: gcc/configure
> 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
> -@@ -21530,7 +21530,7 @@ openbsd*)
> +@@ -21531,7 +21531,7 @@ openbsd*)
> *) need_version=no ;;
> esac
> library_names_spec='${libname}${release}${shared_ext}$versuffix
> ${libname}${shared_ext}$versuffix'
> @@ -20,7 +20,7 @@ Index: gcc/configure
> 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
> -@@ -29245,6 +29245,7 @@ else
> +@@ -29242,6 +29242,7 @@ else
> fi
>
> ;;
> @@ -28,7 +28,7 @@ Index: gcc/configure
> *) gcc_cv_libc_provides_ssp=no ;;
> esac
> fi
> -@@ -29265,6 +29266,7 @@ if test "${enable_default_ssp+set}" = set; then :
> +@@ -29262,6 +29263,7 @@ if test "${enable_default_ssp+set}" = set; then :
> if test x$gcc_cv_libc_provides_ssp = xyes; then
> case "$target" in
> ia64*-*-*) enable_default_ssp=no ;;
> Index: lang/gcc/8/patches/patch-gcc_opts_c
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_opts_c,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-gcc_opts_c
> --- lang/gcc/8/patches/patch-gcc_opts_c 25 Mar 2019 20:17:47 -0000
> 1.2
> +++ lang/gcc/8/patches/patch-gcc_opts_c 4 Mar 2020 16:14:34 -0000
> @@ -37,7 +37,7 @@ Index: gcc/opts.c
> opts->x_flag_opts_finished = true;
> }
>
> -@@ -2077,6 +2082,11 @@ common_handle_option (struct gcc_options *opts,
> +@@ -2085,6 +2090,11 @@ common_handle_option (struct gcc_options *opts,
> case OPT_Wframe_larger_than_:
> opts->x_frame_larger_than_size = value;
> opts->x_warn_frame_larger_than = value != -1;
> Index: lang/gcc/8/patches/patch-libstdc++-v3_configure
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-libstdc++-v3_configure,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-libstdc++-v3_configure
> --- lang/gcc/8/patches/patch-libstdc++-v3_configure 25 Mar 2019 20:17:47
> -0000 1.2
> +++ lang/gcc/8/patches/patch-libstdc++-v3_configure 4 Mar 2020 16:14:34
> -0000
> @@ -5,7 +5,7 @@ $OpenBSD: patch-libstdc++-v3_configure,v
> Index: libstdc++-v3/configure
> --- libstdc++-v3/configure.orig
> +++ libstdc++-v3/configure
> -@@ -11015,7 +11015,7 @@ openbsd*)
> +@@ -11217,7 +11217,7 @@ openbsd*)
> *) need_version=no ;;
> esac
> library_names_spec='${libname}${release}${shared_ext}$versuffix
> ${libname}${shared_ext}$versuffix'
> @@ -14,7 +14,7 @@ Index: libstdc++-v3/configure
> 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
> -@@ -14699,7 +14699,7 @@ openbsd*)
> +@@ -14901,7 +14901,7 @@ openbsd*)
> *) need_version=no ;;
> esac
> library_names_spec='${libname}${release}${shared_ext}$versuffix
> ${libname}${shared_ext}$versuffix'
> @@ -23,7 +23,7 @@ Index: libstdc++-v3/configure
> 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
> -@@ -66126,7 +66126,7 @@ fi
> +@@ -66365,7 +66365,7 @@ fi
> done
>
> ;;
> Index: lang/gcc/8/patches/patch-libstdc++-v3_libsupc++_Makefile_in
> ===================================================================
> RCS file:
> /home/cvs/ports/lang/gcc/8/patches/patch-libstdc++-v3_libsupc++_Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-libstdc++-v3_libsupc++_Makefile_in
> --- lang/gcc/8/patches/patch-libstdc++-v3_libsupc++_Makefile_in 4 Jan
> 2019 15:50:40 -0000 1.1.1.1
> +++ lang/gcc/8/patches/patch-libstdc++-v3_libsupc++_Makefile_in 4 Mar
> 2020 16:14:34 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-libstdc++-v3_libsupc++_M
> Index: libstdc++-v3/libsupc++/Makefile.in
> --- libstdc++-v3/libsupc++/Makefile.in.orig
> +++ libstdc++-v3/libsupc++/Makefile.in
> -@@ -392,7 +392,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
> +@@ -393,7 +393,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
> # Need this library to both be part of libstdc++.a, and installed
> # separately too.
> # 1) separate libsupc++.la
> @@ -11,7 +11,7 @@ Index: libstdc++-v3/libsupc++/Makefile.i
>
> # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
> noinst_LTLIBRARIES = libsupc++convenience.la
> -@@ -639,7 +639,7 @@ clean-toolexeclibLTLIBRARIES:
> +@@ -640,7 +640,7 @@ clean-toolexeclibLTLIBRARIES:
> echo "rm -f \"$${dir}/so_locations\""; \
> rm -f "$${dir}/so_locations"; \
> done
> Index: lang/gcc/8/patches/patch-libstdc++-v3_src_Makefile_in
> ===================================================================
> RCS file:
> /home/cvs/ports/lang/gcc/8/patches/patch-libstdc++-v3_src_Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-libstdc++-v3_src_Makefile_in
> --- lang/gcc/8/patches/patch-libstdc++-v3_src_Makefile_in 4 Jan 2019
> 15:50:40 -0000 1.1.1.1
> +++ lang/gcc/8/patches/patch-libstdc++-v3_src_Makefile_in 4 Mar 2020
> 16:14:34 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-libstdc++-v3_src_Makefil
> Index: libstdc++-v3/src/Makefile.in
> --- libstdc++-v3/src/Makefile.in.orig
> +++ libstdc++-v3/src/Makefile.in
> -@@ -375,13 +375,14 @@ CONFIG_CXXFLAGS = \
> +@@ -376,13 +376,14 @@ CONFIG_CXXFLAGS = \
> WARN_CXXFLAGS = \
> $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once
>
> @@ -18,7 +18,7 @@ Index: libstdc++-v3/src/Makefile.in
>
> # Cross compiler support.
> @VTV_CYGMIN_TRUE@toolexeclib_LTLIBRARIES = libvtv.la libstdc++.la
> -@@ -429,7 +430,7 @@ libstdc___la_DEPENDENCIES = \
> +@@ -430,7 +431,7 @@ libstdc___la_DEPENDENCIES = \
> $(top_builddir)/src/c++11/libc++11convenience.la
>
> libstdc___la_LDFLAGS = \
> @@ -27,7 +27,7 @@ Index: libstdc++-v3/src/Makefile.in
>
> libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
>
> -@@ -606,7 +607,7 @@ clean-toolexeclibLTLIBRARIES:
> +@@ -607,7 +608,7 @@ clean-toolexeclibLTLIBRARIES:
> echo "rm -f \"$${dir}/so_locations\""; \
> rm -f "$${dir}/so_locations"; \
> done
> Index: lang/gcc/8/pkg/PFRAG.ITM-main
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/pkg/PFRAG.ITM-main,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PFRAG.ITM-main
> --- lang/gcc/8/pkg/PFRAG.ITM-main 4 Jan 2019 15:50:40 -0000 1.1.1.1
> +++ lang/gcc/8/pkg/PFRAG.ITM-main 4 Mar 2020 23:24:43 -0000
> @@ -1,4 +1,4 @@
> @comment $OpenBSD: PFRAG.ITM-main,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
> @info info/libitm.info
> -lib/libitm.a
> +@static-lib lib/libitm.a
> lib/libitm.spec
> Index: lang/gcc/8/pkg/PFRAG.QUADMATH-main
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/pkg/PFRAG.QUADMATH-main,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PFRAG.QUADMATH-main
> --- lang/gcc/8/pkg/PFRAG.QUADMATH-main 4 Jan 2019 15:50:40 -0000
> 1.1.1.1
> +++ lang/gcc/8/pkg/PFRAG.QUADMATH-main 4 Mar 2020 23:24:43 -0000
> @@ -1,3 +1,3 @@
> @comment $OpenBSD: PFRAG.QUADMATH-main,v 1.1.1.1 2019/01/04 15:50:40 pascal
> Exp $
> @info info/libquadmath.info
> -lib/libquadmath.a
> +@static-lib lib/libquadmath.a
> Index: lang/gcc/8/pkg/PLIST-ada
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/pkg/PLIST-ada,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST-ada
> --- lang/gcc/8/pkg/PLIST-ada 27 Apr 2019 21:26:35 -0000 1.2
> +++ lang/gcc/8/pkg/PLIST-ada 4 Mar 2020 23:24:44 -0000
> @@ -1703,15 +1703,15 @@ lib/gcc/${CONFIG}/${V}/adalib/i-fortra.a
> lib/gcc/${CONFIG}/${V}/adalib/i-pacdec.ali
> lib/gcc/${CONFIG}/${V}/adalib/interfac.ali
> lib/gcc/${CONFIG}/${V}/adalib/ioexcept.ali
> -lib/gcc/${CONFIG}/${V}/adalib/libgmem.a
> -lib/gcc/${CONFIG}/${V}/adalib/libgnarl-8.so
> -lib/gcc/${CONFIG}/${V}/adalib/libgnarl.a
> -lib/gcc/${CONFIG}/${V}/adalib/libgnarl.so
> -lib/gcc/${CONFIG}/${V}/adalib/libgnarl_pic.a
> -lib/gcc/${CONFIG}/${V}/adalib/libgnat-8.so
> -lib/gcc/${CONFIG}/${V}/adalib/libgnat.a
> -lib/gcc/${CONFIG}/${V}/adalib/libgnat.so
> -lib/gcc/${CONFIG}/${V}/adalib/libgnat_pic.a
> +@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgmem.a
> +@so lib/gcc/${CONFIG}/${V}/adalib/libgnarl-8.so
> +@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgnarl.a
> +@so lib/gcc/${CONFIG}/${V}/adalib/libgnarl.so
> +@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgnarl_pic.a
> +@so lib/gcc/${CONFIG}/${V}/adalib/libgnat-8.so
> +@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgnat.a
> +@so lib/gcc/${CONFIG}/${V}/adalib/libgnat.so
> +@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgnat_pic.a
> lib/gcc/${CONFIG}/${V}/adalib/machcode.ali
> lib/gcc/${CONFIG}/${V}/adalib/memtrack.ali
> lib/gcc/${CONFIG}/${V}/adalib/s-addima.ali
> Index: lang/gcc/8/pkg/PLIST-c++
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/pkg/PLIST-c++,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST-c++
> --- lang/gcc/8/pkg/PLIST-c++ 27 Apr 2019 21:26:35 -0000 1.2
> +++ lang/gcc/8/pkg/PLIST-c++ 4 Mar 2020 23:24:43 -0000
> @@ -801,11 +801,11 @@ include/c++/${V}/${CONFIG}/bits/stdtr1c+
> include/c++/${V}/${CONFIG}/bits/time_members.h
> include/c++/${V}/${CONFIG}/ext/
> include/c++/${V}/${CONFIG}/ext/opt_random.h
> -lib/libestdc++.a
> -lib/libesupc++.a
> +@static-lib lib/libestdc++.a
> +@static-lib lib/libesupc++.a
> lib/libesupc++.la
> lib/libstdc++.*-gdb.py
> -lib/libstdc++fs.a
> +@static-lib lib/libstdc++fs.a
> lib/libstdc++fs.la
> @bin libexec/gcc/${CONFIG}/${V}/cc1plus
> @man man/man1/eg++.1
> Index: lang/gcc/8/pkg/PLIST-f95
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/pkg/PLIST-f95,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST-f95
> --- lang/gcc/8/pkg/PLIST-f95 27 Apr 2019 21:26:35 -0000 1.2
> +++ lang/gcc/8/pkg/PLIST-f95 4 Mar 2020 23:24:43 -0000
> @@ -11,9 +11,9 @@ lib/gcc/${CONFIG}/${V}/finclude/
> lib/gcc/${CONFIG}/${V}/finclude/ieee_arithmetic.mod
> lib/gcc/${CONFIG}/${V}/finclude/ieee_exceptions.mod
> lib/gcc/${CONFIG}/${V}/finclude/ieee_features.mod
> -lib/gcc/${CONFIG}/${V}/libcaf_single.a
> +@static-lib lib/gcc/${CONFIG}/${V}/libcaf_single.a
> lib/gcc/${CONFIG}/${V}/libcaf_single.la
> -lib/libgfortran.a
> +@static-lib lib/libgfortran.a
> lib/libgfortran.spec
> @bin libexec/gcc/${CONFIG}/${V}/f951
> @man man/man1/egfortran.1
> Index: lang/gcc/8/pkg/PLIST-main
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/pkg/PLIST-main,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST-main
> --- lang/gcc/8/pkg/PLIST-main 27 Apr 2019 21:26:35 -0000 1.2
> +++ lang/gcc/8/pkg/PLIST-main 4 Mar 2020 23:27:07 -0000
> @@ -41,8 +41,8 @@ lib/gcc/${CONFIG}/${V}/install-tools/inc
> lib/gcc/${CONFIG}/${V}/install-tools/include/limits.h
> lib/gcc/${CONFIG}/${V}/install-tools/macro_list
> lib/gcc/${CONFIG}/${V}/install-tools/mkheaders.conf
> -lib/gcc/${CONFIG}/${V}/libgcc.a
> -lib/gcc/${CONFIG}/${V}/libgcov.a
> +@static-lib lib/gcc/${CONFIG}/${V}/libgcc.a
> +@static-lib lib/gcc/${CONFIG}/${V}/libgcov.a
> lib/gcc/${CONFIG}/${V}/plugin/
> lib/gcc/${CONFIG}/${V}/plugin/gtype.state
> lib/gcc/${CONFIG}/${V}/plugin/include/
> @@ -450,7 +450,7 @@ lib/gcc/${CONFIG}/${V}/plugin/libcc1plug
> @lib lib/gcc/${CONFIG}/${V}/plugin/libcc1plugin.so.${LIBcc1plugin_VERSION}
> lib/gcc/${CONFIG}/${V}/plugin/libcp1plugin.la
> @lib lib/gcc/${CONFIG}/${V}/plugin/libcp1plugin.so.${LIBcp1plugin_VERSION}
> -lib/libatomic.a
> +@static-lib lib/libatomic.a
> %%aarch64%%
> %%alpha%%
> %%amd64%%
> Index: lang/gcc/8/pkg/PLIST-objc
> ===================================================================
> RCS file: /home/cvs/ports/lang/gcc/8/pkg/PLIST-objc,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST-objc
> --- lang/gcc/8/pkg/PLIST-objc 27 Apr 2019 21:26:35 -0000 1.2
> +++ lang/gcc/8/pkg/PLIST-objc 4 Mar 2020 23:24:43 -0000
> @@ -13,5 +13,5 @@ lib/gcc/${CONFIG}/${V}/include/objc/objc
> lib/gcc/${CONFIG}/${V}/include/objc/objc.h
> lib/gcc/${CONFIG}/${V}/include/objc/runtime.h
> lib/gcc/${CONFIG}/${V}/include/objc/thr.h
> -lib/libobjc.a
> +@static-lib lib/libobjc.a
> @bin libexec/gcc/${CONFIG}/${V}/cc1obj
> Index: devel/llvm/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/devel/llvm/Makefile,v
> retrieving revision 1.260
> diff -u -p -u -p -r1.260 Makefile
> --- devel/llvm/Makefile 11 Aug 2020 08:28:53 -0000 1.260
> +++ devel/llvm/Makefile 11 Aug 2020 20:34:19 -0000
> @@ -19,7 +19,7 @@ PKGNAME-main = llvm-${LLVM_V}
> PKGNAME-python = py3-llvm-${LLVM_V}
> PKGNAME-lldb = lldb-${LLVM_V}
>
> -REVISION-main = 0
> +REVISION-main = 1
>
> CATEGORIES = devel
>
> @@ -120,7 +120,7 @@ CONFIGURE_ARGS += -DCMAKE_SHARED_LINKER_
> TEST_TARGET = check check-clang
>
> # XXX sync
> -GCC_VER = 8.3.0
> +GCC_VER = 8.4.0
> .if ${MACHINE_ARCH} == "amd64"
> GCC_CONFIG = x86_64-unknown-openbsd${OSREV}
> .else
>
