Re: [PATCH] libsanitizer: Fix bootstrap on FreeBSD [PR102675]

2021-11-18 Thread Richard Biener via Gcc-patches
On Wed, 17 Nov 2021, Jakub Jelinek wrote:

> On Mon, Nov 08, 2021 at 08:50:41AM +0100, Gerald Pfeifer wrote:
> > This is the first part I committed on Friday, the second will 
> > follow today.
> 
> Here is an alternative to the patch changing a file imported from
> compiler-rt upstream, so that we don't need to cary a local patch for that
> particular problem.
> 
> Bootstrapped/regtested on x86_64-linux and i686-linux (verified that
> -DUSE_SYSTEM_MD5 is passed only when compiling
> sanitizer_platform_limits_freebsd.cpp) and Gerald in the PR said
> it passed bootstrap on FreeBSD as well.
> 
> Ok for trunk?

OK.

> 2021-11-17  Jakub Jelinek  
> 
>   PR bootstrap/102675
>   * sanitizer_common/Makefile.am: Use -DUSE_SYSTEM_MD5 in AM_CXXFLAGS
>   of sanitizer_platform_limits_freebsd.cpp.
>   * sanitizer_common/Makefile.in: Regenerated.
> 
> --- libsanitizer/sanitizer_common/Makefile.am.jj  2021-11-05 
> 00:43:22.647623646 +0100
> +++ libsanitizer/sanitizer_common/Makefile.am 2021-11-16 12:29:58.574930436 
> +0100
> @@ -17,6 +17,7 @@ AM_CXXFLAGS += -DSANITIZER_LIBBACKTRACE
>  endif
>  AM_CCASFLAGS = $(EXTRA_ASFLAGS)
>  ACLOCAL_AMFLAGS = -I m4
> +sanitizer_platform_limits_freebsd.lo: AM_CXXFLAGS += -DUSE_SYSTEM_MD5
>  
>  noinst_LTLIBRARIES = libsanitizer_common.la
>  
> --- libsanitizer/sanitizer_common/Makefile.in.jj  2021-11-05 
> 00:43:22.647623646 +0100
> +++ libsanitizer/sanitizer_common/Makefile.in 2021-11-16 12:30:58.611088913 
> +0100
> @@ -796,6 +796,7 @@ uninstall-am:
>  
>  .PRECIOUS: Makefile
>  
> +sanitizer_platform_limits_freebsd.lo: AM_CXXFLAGS += -DUSE_SYSTEM_MD5
>  
>  # Tell versions [3.59,3.63) of GNU make to not export all variables.
>  # Otherwise a system limit (for SysV at least) may be exceeded.
> 
>   Jakub
> 
> 

-- 
Richard Biener 
SUSE Software Solutions Germany GmbH, Maxfeldstrasse 5, 90409 Nuernberg,
Germany; GF: Ivo Totev; HRB 36809 (AG Nuernberg)


[PATCH] libsanitizer: Fix bootstrap on FreeBSD [PR102675]

2021-11-17 Thread Jakub Jelinek via Gcc-patches
On Mon, Nov 08, 2021 at 08:50:41AM +0100, Gerald Pfeifer wrote:
> This is the first part I committed on Friday, the second will 
> follow today.

Here is an alternative to the patch changing a file imported from
compiler-rt upstream, so that we don't need to cary a local patch for that
particular problem.

Bootstrapped/regtested on x86_64-linux and i686-linux (verified that
-DUSE_SYSTEM_MD5 is passed only when compiling
sanitizer_platform_limits_freebsd.cpp) and Gerald in the PR said
it passed bootstrap on FreeBSD as well.

Ok for trunk?

2021-11-17  Jakub Jelinek  

PR bootstrap/102675
* sanitizer_common/Makefile.am: Use -DUSE_SYSTEM_MD5 in AM_CXXFLAGS
of sanitizer_platform_limits_freebsd.cpp.
* sanitizer_common/Makefile.in: Regenerated.

--- libsanitizer/sanitizer_common/Makefile.am.jj2021-11-05 
00:43:22.647623646 +0100
+++ libsanitizer/sanitizer_common/Makefile.am   2021-11-16 12:29:58.574930436 
+0100
@@ -17,6 +17,7 @@ AM_CXXFLAGS += -DSANITIZER_LIBBACKTRACE
 endif
 AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
+sanitizer_platform_limits_freebsd.lo: AM_CXXFLAGS += -DUSE_SYSTEM_MD5
 
 noinst_LTLIBRARIES = libsanitizer_common.la
 
--- libsanitizer/sanitizer_common/Makefile.in.jj2021-11-05 
00:43:22.647623646 +0100
+++ libsanitizer/sanitizer_common/Makefile.in   2021-11-16 12:30:58.611088913 
+0100
@@ -796,6 +796,7 @@ uninstall-am:
 
 .PRECIOUS: Makefile
 
+sanitizer_platform_limits_freebsd.lo: AM_CXXFLAGS += -DUSE_SYSTEM_MD5
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

Jakub