Re: CVS commit: pkgsrc/lang/gcc12

[Jason Bacon <jtocino%gmx.com@localhost>]

On 12/28/24 06:44, Jason Bacon wrote:
> On 12/27/24 11:03, Adam wrote:
> > > > Is this patch fixing a critical problem on Darwin-x86?  If so, perhaps
> > > > it could be limited to that platform by using PATCHFILES, similar to 
> > > > the
> > > > aarch64 patches it collides with.
> > >
> > > Yes.  The package (or any of gcc13/14) will not build without the fix.
> > >
> > > I feel we are facing a trade-off between which of the two Darwin 
> > > platforms is to be supported in the immediate short term of this 
> > > pkgsrc release.
> > >
> > > It seems that the only way to do both is to follow your suggestion of 
> > > using PATCHFILES and hosting a second patchset.  Another, perhaps 
> > > less long-term hacky, solution would be to include a special patch 
> > > file in FILESDIR and a special conditional patch command in the 
> > > Makefile.  Those could be removed once the bigger issue of two 
> > > conflicting patch sets is addressed in a better way, and there would 
> > > be no need for long-term hosting of a separate patch file as it would 
> > > all be self-contained within the package.
> > >
> > > This is messing with the release process, though, and I am leaving 
> > > the call to others.  Postponing until after the release leaves Darwin 
> > > x86 broken, but that may be an appropriate cost.
> > >
> > > Cheers,
> > > Brook
> >
> > gcc12, gcc13 and gcc14 are still broken on Darwin aarch64. Is anybody 
> > going to clean up this mess? I need one of these urgently.
> >
> >
> > ERROR: Patching failed due to modified or broken patch file(s):
> > ERROR: /dist/pkgsrc/lang/gcc14/../../lang/gcc14/patches/patch- 
> > libgcc_config.host
> > ERROR: 
> > ==========================================================================
> > ERROR:
> > ERROR: Some of the selected build options and/or local patches may be 
> > incompatible.
> > ERROR: Please try building with fewer options or patches.
> > ERROR:
> > ERROR: 
> > ==========================================================================
> > *** Error code 1
> >
> >
> >
> > ERROR: Patching failed due to modified or broken patch file(s):
> > ERROR: /dist/pkgsrc/lang/gcc13/../../lang/gcc13/patches/patch- 
> > libgcc_config.host
> > ERROR: 
> > ==========================================================================
> > ERROR:
> > ERROR: Some of the selected build options and/or local patches may be 
> > incompatible.
> > ERROR: Please try building with fewer options or patches.
> > ERROR:
> > ERROR: 
> > ==========================================================================
> > *** Error code 1
> >
> >
> >
> > <instantiation>:5:1: error: non-private labels cannot appear 
> > between .cfi_startproc / .cfi_endproc pairs
> > ___aarch64_cas1_relax:
> > ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas1_relax
> > ^
> > <instantiation>:4:2: error: previous .cfi_startproc was here
> >   .cfi_startproc
> >   ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas1_relax
> > ^
> > gmake[2]: *** [../../../gcc-12.4.0/libgcc/config/aarch64/t-lse:44: 
> > cas_1_1.o] Error 1
> > gmake[2]: *** Waiting for unfinished jobs....
> > <instantiation>:5:1: error: non-private labels cannot appear 
> > between .cfi_startproc / .cfi_endproc pairs
> > ___aarch64_cas2_relax:
> > ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas2_relax
> > ^
> > <instantiation>:4:2: error: previous .cfi_startproc was here
> >   .cfi_startproc
> >   ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas2_relax
> > ^
> > gmake[2]: *** [../../../gcc-12.4.0/libgcc/config/aarch64/t-lse:44: 
> > cas_2_1.o] Error 1
> > <instantiation>:5:1: error: non-private labels cannot appear 
> > between .cfi_startproc / .cfi_endproc pairs
> > ___aarch64_cas4_relax:
> > ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas4_relax
> > ^
> > <instantiation>:4:2: error: previous .cfi_startproc was here
> >   .cfi_startproc
> >   ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas4_relax
> > ^
> > gmake[2]: *** [../../../gcc-12.4.0/libgcc/config/aarch64/t-lse:44: 
> > cas_4_1.o] Error 1
> > <instantiation>:5:1: error: non-private labels cannot appear 
> > between .cfi_startproc / .cfi_endproc pairs
> > ___aarch64_cas8_relax:
> > ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas8_relax
> > ^
> > <instantiation>:4:2: error: previous .cfi_startproc was here
> >   .cfi_startproc
> >   ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas8_relax
> > ^
> > <instantiation>:5:1: error: non-private labels cannot appear 
> > between .cfi_startproc / .cfi_endproc pairs
> > ___aarch64_cas16_relax:
> > ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas16_relax
> > ^
> > <instantiation>:4:2: error: previous .cfi_startproc was here
> >   .cfi_startproc
> >   ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas16_relax
> > ^
> > gmake[2]: *** [../../../gcc-12.4.0/libgcc/config/aarch64/t-lse:44: 
> > cas_8_1.o] Error 1
> > gmake[2]: *** [../../../gcc-12.4.0/libgcc/config/aarch64/t-lse:44: 
> > cas_16_1.o] Error 1
> > <instantiation><instantiation>::55::11: : error: error: non-private 
> > labels cannot appear between .cfi_startproc / .cfi_endproc pairsnon- 
> > private labels cannot appear between .cfi_startproc / .cfi_endproc pairs
> >
> > ___aarch64_cas2_acq:___aarch64_cas1_acq:
> >
> > ^^
> >
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1../../../ 
> > gcc-12.4.0/libgcc/config/aarch64/lse.S: :220:note: 1: while in macro 
> > instantiation
> > note: STARTFN __aarch64_cas2_acq
> > ^while in macro instantiation
> >
> > <instantiation>:STARTFN __aarch64_cas1_acq4
> > :2^:  error: <instantiation>:previous .cfi_startproc was here4
> > :2 .cfi_startproc:   error: ^
> > previous .cfi_startproc was here
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S .cfi_startproc:
> > 220: 1^:  note: ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:while 
> > in macro instantiation220
> > :1STARTFN __aarch64_cas2_acq:  ^note:  while in macro instantiation
> > STARTFN __aarch64_cas1_acq
> > ^
> > gmake[2]: *** [../../../gcc-12.4.0/libgcc/config/aarch64/t-lse:44: 
> > cas_2_2.o] Error 1
> > gmake[2]: *** [../../../gcc-12.4.0/libgcc/config/aarch64/t-lse:44: 
> > cas_1_2.o] Error 1
> > <instantiation>:5:1: error: non-private labels cannot appear 
> > between .cfi_startproc / .cfi_endproc pairs
> > ___aarch64_cas4_acq:
> > ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas4_acq
> > ^
> > <instantiation>:4:2: error: previous .cfi_startproc was here
> >   .cfi_startproc
> >   ^
> > ../../../gcc-12.4.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
> > macro instantiation
> > STARTFN __aarch64_cas4_acq
> > ^
> > gmake[2]: *** [../../../gcc-12.4.0/libgcc/config/aarch64/t-lse:44: 
> > cas_4_2.o] Error 1
>
> Was gcc12 working as of revision 1.8?
>
> Apparently, 1.9 was not the cause of the breakage, at least on macOS
> 15.0 aarch64.  Jonathan backed out those changes, and it still doesn't
> build for me.
>
>
> --
> Life is a game.  Play hard.  Play fair.  Have fun.

Reverting gcc13 didn't help either (latest macOS and command-line-tools):

# cvs log | grep -C 1 revision | more

[snip]

revision 1.4
date: 2024-12-14 21:07:57 -0600;  author: brook;  state: Exp;  lines: +6 
-2;  commitid: BjAXiuRGteFZQxBF;
--
----------------------------
revision 1.3
date: 2024-06-07 05:28:55 -0500;  author: adam;  state: Exp;  lines: +8 
-5;  commitid: K8jVVOY6eizDq2dF;

# cvs up -A -C -D '2024-06-07 05:28:55'

# sw_vers
ProductName:            macOS
ProductVersion:         15.1.1
BuildVersion:           24B91

# pkgutil --pkg-info=com.apple.pkg.CLTools_Executables
package-id: com.apple.pkg.CLTools_Executables
version: 16.1.0.0.1.1729049160

# bmake

[snip]

<instantiation>:5:1: error: non-private labels cannot appear between 
.cfi_startproc / .cfi_endproc pairs
___aarch64_cas1_acq:
^
../../../gcc-13.3.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
macro instantiation
STARTFN __aarch64_cas1_acq
^
<instantiation>:4:2: error: previous .cfi_startproc was here 

 .cfi_startproc
 ^
../../../gcc-13.3.0/libgcc/config/aarch64/lse.S:220:1: note: while in 
macro instantiation
STARTFN __aarch64_cas1_acq
^
gmake[2]: *** [../../../gcc-13.3.0/libgcc/config/aarch64/t-lse:44: 
cas_1_2.o] Error 1

Reverting gcc14 did lead to a successful build, though:

# cvs up -A -C -D '2024-09-29 11:51:55'

# bmake install

[snip]

e.python/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9/lib/python3.9/threading.cpython-39.pyc
 
/Users/bacon/Pkgsrc/pkgsrc/lang/gcc14/work/.home/Library/Caches/com.apple.python/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9/lib/python3.9/codecs.cpython-39.pyc
=> Creating binary package 
/Users/bacon/Pkgsrc/pkgsrc/lang/gcc14/work/.packages/gcc14-14.2.0.tgz
===> Building binary package for gcc14-14.2.0
=> Creating binary package 
/Users/bacon/Pkgsrc/pkgsrc/packages/All/gcc14-14.2
===> Installing binary package of gcc14-14.2.0
0.tgz

--
Life is a game.  Play hard.  Play fair.  Have fun.