On Thu, Nov 4, 2021 at 1:20 AM Jakub Jelinek <ja...@redhat.com> wrote: > > On Thu, Nov 04, 2021 at 06:43:26AM +0100, Gerald Pfeifer wrote: > > On Tue, 2 Nov 2021, H.J. Lu wrote: > > > On Tue, Nov 2, 2021 at 5:11 AM Jakub Jelinek <ja...@redhat.com> wrote: > > >> include/md5.h is a header we have control over, can't we just add to it > > >> something like: > > >> #ifdef USE_SYSTEM_MD5 > > >> #include_next <md5.h> > > >> #else > > >> Current header content > > >> #endif > > >> and arrange for that macro to be -DUSE_SYSTEM_MD5 when building that > > >> libsanitizer source file? > > > Gerald, can you try this suggestion? You can add "#define > > > USE_SYSTEM_MD5" in sanitizer_platform_limits_freebsd.cpp for testing. > > > > Yes, the patch below restores bootstrap on x86_64-unkown-freebsd12. > > > > Okay for now (or does anyone want to / can anyone help with Makefile > > trickery to -Define USE_SYSTEM_MD5 there)? > > > > Thanks, > > Gerald > > > > > > include: > > * md5.h (USE_SYSTEM_MD5): Introduce. > > > > libsanitizer: > > * sanitizer_common/sanitizer_platform_limits_freebsd.cpp > > (USE_SYSTEM_MD5): Define. > > Ok. But please after committing mention the revision in > libsanitizer/LOCAL_PATCHES. > > Jakub >
include and libsanitizer should use 2 separate patches. The libsanitizer patch should be in libsanitizer/LOCAL_PATCHES. -- H.J.
