Re: UPDATE: GCC 8.4.0

On Tue, Aug 18, 2020 at 01:10:43PM -0400, 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.

An updated diff with just the clang-tools-extra GCC version bump
to keep everything in sync.



Index: lang/gcc/8/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- lang/gcc/8/Makefile 31 Aug 2020 22:20:49 -0000 1.33
+++ lang/gcc/8/Makefile 3 Sep 2020 21:22:46 -0000
@@ -15,17 +15,16 @@ USE_LLD = No

DPB_PROPERTIES = parallel

-V = 8.3.0
-REVISION = 7
+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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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 27 Aug 2020 04:30:57 -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);
-