Re: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith):

On Fri, 31 Oct 2025 14:48:06 +0100, Jose Luis Duran wrote:
> 
> On Wed, Oct 29, 2025 at 3:50 PM Dimitry Andric <dim@freebsd.org> wrote:
> >
> > The branch main has been updated by dim:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=51e8e8b0f36933814b1be08913857727876aece5
> >
> > commit 51e8e8b0f36933814b1be08913857727876aece5
> > Author:     Dimitry Andric <dim@FreeBSD.org>
> > AuthorDate: 2025-10-29 18:49:54 +0000
> > Commit:     Dimitry Andric <dim@FreeBSD.org>
> > CommitDate: 2025-10-29 18:49:54 +0000
> >
> >     Merge commit e24f90190c77 from llvm git (by Brad Smith):
> >
> >         [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089)
> >
> >     The compiler_rt helper functions have been built since 12.4, 13.1, 14
> >     and anything newer.
> >
> >     MFC after:      3 days
> > ---
> >  contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h
> > index 7ab63905ed4f..7d090ba682b3 100644
> > --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h
> > +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h
> > @@ -78,6 +78,11 @@ public:
> >    void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs,
> >                           llvm::opt::ArgStringList &CC1Args) const override;
> >
> > +  bool IsAArch64OutlineAtomicsDefault(
> > +      const llvm::opt::ArgList &Args) const override {
> > +    return true;
> > +  }
> > +
> >    UnwindTableLevel
> >    getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override;
> >    bool isPIEDefault(const llvm::opt::ArgList &Args) const override;
> 
> I'm sure you're probably aware by now, but aarch64 builds are failing
> after this commit:
> 
> https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/

I am now getting this error on stable/15 (aarch64) after this change was
reverted in f6a81b18a467.

I have already tried:

% rm -rf /usr/obj/usr
% rm -rf ~/.cache/ccache
% make SRCCONF=/dev/null __MAKE_CONF=/dev/null buildworld

I am now trying to rebuild world with llvm19 from ports.