On Wed, Dec 03, 2025 at 01:14:30PM +0100, Rainer Orth wrote:
> > Committed to trunk.
> >
> > * LOCAL_PATCHES: Update.
> >
> > diff --git a/libsanitizer/LOCAL_PATCHES b/libsanitizer/LOCAL_PATCHES
> > index ffbaefbe95b..e10a625e0c9 100644
> > --- a/libsanitizer/LOCAL_PATCHES
> > +++ b/libsanitizer/LOCAL_PATCHES
> > @@ -1,2 +1,2 @@
> > -b53f7de3e6205f76a794e159a282193e2afaad16
> > -4d2cd304714fddc8a995fc0311090fce7e70c122
> > +r16-5832-g89130a50108077e81a11a60007de6830c9f23b34
> > +r16-5839-g2249f6143717d9d5d6801e25867a2f826b1132de
>
> it seems something went amiss applying local patches: the recent merge
> (both of those commits above) undid
>
> diff --git a/libsanitizer/sanitizer_common/sanitizer_redefine_builtins.h
> b/libsanitizer/sanitizer_common/sanitizer_redefine_builtins.h
> index 7b34e781b6d..7d889111765 100644
> --- a/libsanitizer/sanitizer_common/sanitizer_redefine_builtins.h
> +++ b/libsanitizer/sanitizer_common/sanitizer_redefine_builtins.h
> @@ -15,7 +15,7 @@
> # define SANITIZER_REDEFINE_BUILTINS_H
>
> // The asm hack only works with GCC and Clang.
> -# if !defined(_WIN32) && defined(HAVE_AS_SYM_ASSIGN)
> +# if !defined(_WIN32) && !defined(_AIX) && !defined(__APPLE__)
>
>
> which broke Solaris/SPARC bootstrap with /bin/as.
I thought it was for Darwin and the addition of !defined(__APPLE__) upstream
cured it.
If that is not the case, feel free to readd this in a separate commit and
adjust LOCAL_PATCHES afterwards.
Jakub
