Re: UPDATE: GCC 8.4.0

2020-09-04 Thread Brad Smith
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 -  1.33
+++ lang/gcc/8/Makefile 3 Sep 2020 21:22:46 -
@@ -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 -   1.10
+++ lang/gcc/8/distinfo 27 Aug 2020 04:30:57 -
@@ -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 
-   1.1.1.1
+++ lang/gcc/8/patches/patch-fixincludes_fixincl_x  27 Aug 2020 04:30:57 
-
@@ -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 
-   1.1.1.1
+++ lang/gcc/8/patches/patch-fixincludes_inclhack_def   27 Aug 2020 04:30:57 
-
@@ -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_in4 Jan 2019 15:50:39 -   
1.1.1.1
+++ lang/gcc/8/patches/patch-gcc_Makefile_in27 Aug 2020 04:30:57 -
@@ -24,7 +24,7 @@ Index: gcc/Makefile.in
  
  # Native compiler that we use.  This may be C++ some day.
  COMPILER_FOR_BUILD = $(CXX_FOR

Re: UPDATE: GCC 8.4.0

2020-09-03 Thread Pascal Stumpf
On Thu, 3 Sep 2020 11:20:09 +0100, Stuart Henderson wrote:
> 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.

I am still building bootstraps, but in the meantime, this can go in ...

> > 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 -   1.32
> > +++ lang/gcc/8/Makefile 9 Aug 2020 03:18:29 -
> > @@ -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 -   1.10
> > +++ lang/gcc/8/distinfo 4 Mar 2020 15:07:14 -
> > @@ -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 
> > -   1.1.1.1
> > +++ lang/gcc/8/patches/patch-fixincludes_fixincl_x  4 Mar 2020 16:15:17 
> > -
> > @@ -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 -   1.1.1.1
> > +++ lang/gcc/8/patches/patch-fixincludes_inclhack_def   4 Mar 2020 
> > 16:14:34 -
> > @@ -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
> > 

Re: UPDATE: GCC 8.4.0

2020-09-03 Thread Dima Pasechnik
On Thu, Sep 03, 2020 at 02:08:57PM +0200, Theo Buehler wrote:
> On Thu, Sep 03, 2020 at 01:40:10PM +0200, Dima Pasechnik wrote:
> > On Thu, Sep 03, 2020 at 01:20:16PM +0200, Theo Buehler wrote:
> > > On Thu, Sep 03, 2020 at 12:59:23PM +0200, Dima Pasechnik wrote:
> > > > On Thu, Sep 03, 2020 at 11:20:09AM +0100, Stuart Henderson wrote:
> > > > > 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.
> > > > 
> > > > What will be the status of gfortran? Currently, on OpenBSD 6.7,
> > > > in order to get a functioning gfortran I have to install lapack from 
> > > > ports
> > > > and use /usr/ports/pobj/lapack-3.8.0/bin/gfortran
> > > 
> > > This is a small shell wrapper around /usr/local/bin/egfortran from the
> > > g95 package (g95-8.3.0p5 on OpenBSD 6.7-stable):
> > > 
> > > $ cat  /usr/ports/pobj/lapack-3.8.0/bin/gfortran
> > > #!/bin/sh
> > > exec  /usr/local/bin/egfortran -B /usr/ports/pobj/lapack-3.8.0/bin "$@"
> > > 
> > > 
> > > $ pkg_info -c g95
> > > Information for 
> > > https://ftp.hostserver.de/pub/OpenBSD//snapshots/packages/amd64/g95-8.3.0p7.tgz
> > > 
> > > Comment:
> > > GNU compiler collection: f95 compiler
> > > 
> > > 
> > > To find packages, I recommend using the pkglocatedb package.
> > > 
> > > $ doas pkg_add pkglocatedb
> > > $ pkglocate gfortran
> > 
> > still, it leaves in the open the question of installing (e)gfortran.
> > 
> > I got egfortran built from source (as a part of gcc-8.3.0) in the process 
> > of installation of
> > math/lapack
> >
> > Do you say that a binary package for (e)gfortan does not exist?
> 
> Apologies for adding to the the confusion...
> 
> When I wrote "/usr/local/bin/egfortran from the g95 package", I meant to
> say that you can get egfortran by installing the "g95" package.
> 
> This g95 package is built as part of gcc-8.3.0, so the gfotran packaged
> in g95 is the same as the one you built from source.
> 
> > Why is the package gfortran obsolete?
> 
> If memory serves, a gfortran package did exist independently of the gcc
> port but was not really used. There were conflicts between it and the
> gcc-libs (so basically with almost everything), so it was decided to
> remove it about 4 or 5 years ago. That's the reason for the confusing
> message you got.
> 
It's the other way around, I think.
IMHO g95 package should be called gfortran--as this is what it is, and g95 made 
obsolete.

Indeed, g95 is the name of semi-abandoned project (last release in 2013) 
providing a
Fortran compiler, http://g95.org/ - this is how every project (except OpenBSD?)
understands g95 "brand".
(IIRC g95 package used to provide g95 from g95.org, indeed).

> Brad's diff will update gcc to 8.4.0 and the g95-8.4.0 package will
> bundle the corresponding egfortran.


 



Re: UPDATE: GCC 8.4.0

2020-09-03 Thread Theo Buehler
On Thu, Sep 03, 2020 at 01:40:10PM +0200, Dima Pasechnik wrote:
> On Thu, Sep 03, 2020 at 01:20:16PM +0200, Theo Buehler wrote:
> > On Thu, Sep 03, 2020 at 12:59:23PM +0200, Dima Pasechnik wrote:
> > > On Thu, Sep 03, 2020 at 11:20:09AM +0100, Stuart Henderson wrote:
> > > > 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.
> > > 
> > > What will be the status of gfortran? Currently, on OpenBSD 6.7,
> > > in order to get a functioning gfortran I have to install lapack from ports
> > > and use /usr/ports/pobj/lapack-3.8.0/bin/gfortran
> > 
> > This is a small shell wrapper around /usr/local/bin/egfortran from the
> > g95 package (g95-8.3.0p5 on OpenBSD 6.7-stable):
> > 
> > $ cat  /usr/ports/pobj/lapack-3.8.0/bin/gfortran
> > #!/bin/sh
> > exec  /usr/local/bin/egfortran -B /usr/ports/pobj/lapack-3.8.0/bin "$@"
> > 
> > 
> > $ pkg_info -c g95
> > Information for 
> > https://ftp.hostserver.de/pub/OpenBSD//snapshots/packages/amd64/g95-8.3.0p7.tgz
> > 
> > Comment:
> > GNU compiler collection: f95 compiler
> > 
> > 
> > To find packages, I recommend using the pkglocatedb package.
> > 
> > $ doas pkg_add pkglocatedb
> > $ pkglocate gfortran
> 
> still, it leaves in the open the question of installing (e)gfortran.
> 
> I got egfortran built from source (as a part of gcc-8.3.0) in the process of 
> installation of
> math/lapack
>
> Do you say that a binary package for (e)gfortan does not exist?

Apologies for adding to the the confusion...

When I wrote "/usr/local/bin/egfortran from the g95 package", I meant to
say that you can get egfortran by installing the "g95" package.

This g95 package is built as part of gcc-8.3.0, so the gfotran packaged
in g95 is the same as the one you built from source.

> Why is the package gfortran obsolete?

If memory serves, a gfortran package did exist independently of the gcc
port but was not really used. There were conflicts between it and the
gcc-libs (so basically with almost everything), so it was decided to
remove it about 4 or 5 years ago. That's the reason for the confusing
message you got.

Brad's diff will update gcc to 8.4.0 and the g95-8.4.0 package will
bundle the corresponding egfortran.



Re: UPDATE: GCC 8.4.0

2020-09-03 Thread Dima Pasechnik
On Thu, Sep 03, 2020 at 01:20:16PM +0200, Theo Buehler wrote:
> On Thu, Sep 03, 2020 at 12:59:23PM +0200, Dima Pasechnik wrote:
> > On Thu, Sep 03, 2020 at 11:20:09AM +0100, Stuart Henderson wrote:
> > > 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.
> > 
> > What will be the status of gfortran? Currently, on OpenBSD 6.7,
> > in order to get a functioning gfortran I have to install lapack from ports
> > and use /usr/ports/pobj/lapack-3.8.0/bin/gfortran
> 
> This is a small shell wrapper around /usr/local/bin/egfortran from the
> g95 package (g95-8.3.0p5 on OpenBSD 6.7-stable):
> 
> $ cat  /usr/ports/pobj/lapack-3.8.0/bin/gfortran
> #!/bin/sh
> exec  /usr/local/bin/egfortran -B /usr/ports/pobj/lapack-3.8.0/bin "$@"
> 
> 
> $ pkg_info -c g95
> Information for 
> https://ftp.hostserver.de/pub/OpenBSD//snapshots/packages/amd64/g95-8.3.0p7.tgz
> 
> Comment:
> GNU compiler collection: f95 compiler
> 
> 
> To find packages, I recommend using the pkglocatedb package.
> 
> $ doas pkg_add pkglocatedb
> $ pkglocate gfortran

still, it leaves in the open the question of installing (e)gfortran.

I got egfortran built from source (as a part of gcc-8.3.0) in the process of 
installation of
math/lapack
Do you say that a binary package for (e)gfortan does not exist? Why is the 
package gfortran obsolete?

> would likely have led you there.

still confused,
Dima



Re: UPDATE: GCC 8.4.0

2020-09-03 Thread Theo Buehler
On Thu, Sep 03, 2020 at 12:59:23PM +0200, Dima Pasechnik wrote:
> On Thu, Sep 03, 2020 at 11:20:09AM +0100, Stuart Henderson wrote:
> > 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.
> 
> What will be the status of gfortran? Currently, on OpenBSD 6.7,
> in order to get a functioning gfortran I have to install lapack from ports
> and use /usr/ports/pobj/lapack-3.8.0/bin/gfortran

This is a small shell wrapper around /usr/local/bin/egfortran from the
g95 package (g95-8.3.0p5 on OpenBSD 6.7-stable):

$ cat  /usr/ports/pobj/lapack-3.8.0/bin/gfortran
#!/bin/sh
exec  /usr/local/bin/egfortran -B /usr/ports/pobj/lapack-3.8.0/bin "$@"


$ pkg_info -c g95
Information for 
https://ftp.hostserver.de/pub/OpenBSD//snapshots/packages/amd64/g95-8.3.0p7.tgz

Comment:
GNU compiler collection: f95 compiler


To find packages, I recommend using the pkglocatedb package.

$ doas pkg_add pkglocatedb
$ pkglocate gfortran

would likely have led you there.



Re: UPDATE: GCC 8.4.0

2020-09-03 Thread Dima Pasechnik
On Thu, Sep 03, 2020 at 11:20:09AM +0100, Stuart Henderson wrote:
> 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.

What will be the status of gfortran? Currently, on OpenBSD 6.7,
in order to get a functioning gfortran I have to install lapack from ports
and use /usr/ports/pobj/lapack-3.8.0/bin/gfortran

as the normal way to install gfortran fails: 
# pkg_add gfortran
quirks-3.326 signed on 2020-09-01T10:28:39Z
Can't find gfortran
Obsolete package: gfortran (outdated and/or no longer required by other ports)


Needless to say, gfortran 8.3 (or later) is the only (free, not sure if there 
are closed source options)
Fortran compiler for serious work on OpenBSD involving modern Fortran code, 
e.g. openblas.
(flang is a project that seems to be on its way out, as the main body 
developing it, Nvidia,
is doing another LLVM-based fortran compiler from scratch, and it's just too 
buggy ATM).

Thanks
Dima

> > > 
> > > 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 -   1.32
> > +++ lang/gcc/8/Makefile 9 Aug 2020 03:18:29 -
> > @@ -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 -   1.10
> > +++ lang/gcc/8/distinfo 4 Mar 2020 15:07:14 -
> > @@ -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 
> > -   1.1.1.1
> > +++ lang/gcc/8/patches/patch-fixincludes_fixincl_x  4 Mar 2020 16:15:17 
> > -
> > @@ -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
> > ret

Re: UPDATE: GCC 8.4.0

2020-09-03 Thread Stuart Henderson
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 -   1.32
> +++ lang/gcc/8/Makefile   9 Aug 2020 03:18:29 -
> @@ -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 -   1.10
> +++ lang/gcc/8/distinfo   4 Mar 2020 15:07:14 -
> @@ -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_x4 Jan 2019 15:50:39 
> -   1.1.1.1
> +++ lang/gcc/8/patches/patch-fixincludes_fixincl_x4 Mar 2020 16:15:17 
> -
> @@ -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 
> -   1.1.1.1
> +++ lang/gcc/8/patches/patch-fixincludes_inclhack_def 4 Mar 2020 16:14:34 
> -
> @@ -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 -   
> 1.1.1.1
> +++ lang/gcc/8/patches/patch-gcc_Makefile_in  4 Mar 20

Re: UPDATE: GCC 8.4.0

2020-08-20 Thread j

Daniel wrote:


Finally, I thought I saw some message in dmesg on about invalid 
syscalls or something \

like that on my end.


Check your /var/log/messages for "bogus syscall" by a program called 
conftest.  It
is a standard program name for multiple capability tests by ./configure 
script.  When
I rebuild gcc 8.3 on amd64 it seems to be provoked by this program from 
configure:


  __thread int a; int b; int main() { return a = b; }

tested several times.  See also

https://marc.info/?l=openbsd-misc&m=159734095825159&w=2

FYI I also have see no stdout with code built with libgomp (unsupported 
by OpenBSD) when

output is directed to a file, but not when piped, e.g.

./bad > file but ./good | cat > file.

I haven't reproduced this in a supported config (e.g. without OpenMP).


John



Re: UPDATE: GCC 8.4.0

2020-08-18 Thread Daniel Dickman


>> On Aug 18, 2020, at 1:12 PM, 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.


Hi Brad,

If we’re going to go through the effort of retesting gcc — and I think it’s 
probably better to do bulks on many platforms, not just one — then why not go 
to gcc9 or gcc10 instead? I have a port for gcc9 if there’s interest.

Secondly, any reason adastraps are not regenerated as part of the proposal? One 
nice thing to try to solve for might be to make adastrap builds reproducible. I 
think there are 4 files that have timestamps updated with every build. If that 
can be fixed, think there’s a good change to make build a bit more reproducible.

Finally, I thought I saw some message in dmesg on about invalid syscalls or 
something like that on my end. Do you see the same? I will have to dig through 
my logs to find the message. Wondering what the cause is. I think it’s with 
every version of gcc I’ve looked at recently (ie 8.x and 9.x series).




Re: UPDATE: GCC 8.4.0

2020-08-18 Thread Brad Smith
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.


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 -   1.32
+++ lang/gcc/8/Makefile 9 Aug 2020 03:18:29 -
@@ -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 -   1.10
+++ lang/gcc/8/distinfo 4 Mar 2020 15:07:14 -
@@ -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 
-   1.1.1.1
+++ lang/gcc/8/patches/patch-fixincludes_fixincl_x  4 Mar 2020 16:15:17 
-
@@ -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 
-   1.1.1.1
+++ lang/gcc/8/patches/patch-fixincludes_inclhack_def   4 Mar 2020 16:14:34 
-
@@ -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_in4 Jan 2019 15:50:39 -   
1.1.1.1
+++ lang/gcc/8/patches/patch-gcc_Makefile_in4 Mar 2020 16:14:34 -
@@ -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)
  

UPDATE: GCC 8.4.0

2020-03-14 Thread Brad Smith
Here is a start at an update to GCC 8.4.0.

I e-mailed Pascal 10 days ago but no response.



Index: Makefile
===
RCS file: /home/cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile12 Jan 2020 11:37:28 -  1.30
+++ Makefile4 Mar 2020 14:59:27 -
@@ -15,17 +15,16 @@ USE_LLD = No
 
 DPB_PROPERTIES = parallel
 
-V = 8.3.0
-REVISION = 4
+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: distinfo
===
RCS file: /home/cvs/ports/lang/gcc/8/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo3 Dec 2019 21:18:26 -   1.10
+++ distinfo4 Mar 2020 15:07:14 -
@@ -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: 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
--- patches/patch-fixincludes_fixincl_x 4 Jan 2019 15:50:39 -   1.1.1.1
+++ patches/patch-fixincludes_fixincl_x 4 Mar 2020 16:15:17 -
@@ -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: 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
--- patches/patch-fixincludes_inclhack_def  4 Jan 2019 15:50:40 -   
1.1.1.1
+++ patches/patch-fixincludes_inclhack_def  4 Mar 2020 16:14:34 -
@@ -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: 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
--- patches/patch-gcc_Makefile_in   4 Jan 2019 15:50:39 -   1.1.1.1
+++ patches/patch-gcc_Makefile_in   4 Mar 2020 16:14:34 -
@@ -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_di