From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jakub@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2153)
 id 1A3283858C2C; Thu, 18 Nov 2021 09:08:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1A3283858C2C
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jakub Jelinek <jakub@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-5367] libsanitizer: Fix bootstrap on FreeBSD [PR102675]
X-Act-Checkin: gcc
X-Git-Author: Jakub Jelinek <jakub@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 206b22d021d94adbaa79e1d443c87415254b15de
X-Git-Newrev: edd2249b17fb7150da66b03adb1a4e381926047d
Message-Id: <20211118090813.1A3283858C2C@sourceware.org>
Date: Thu, 18 Nov 2021 09:08:13 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Nov 2021 09:08:13 -0000

https://gcc.gnu.org/g:edd2249b17fb7150da66b03adb1a4e381926047d

commit r12-5367-gedd2249b17fb7150da66b03adb1a4e381926047d
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Thu Nov 18 10:06:01 2021 +0100

    libsanitizer: Fix bootstrap on FreeBSD [PR102675]
    
    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.
    
    2021-11-18  Jakub Jelinek  <jakub@redhat.com>
    
            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.

Diff:
---
 libsanitizer/sanitizer_common/Makefile.am | 1 +
 libsanitizer/sanitizer_common/Makefile.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libsanitizer/sanitizer_common/Makefile.am b/libsanitizer/sanitizer_common/Makefile.am
index 57d7f02da92..a70dae4389f 100644
--- a/libsanitizer/sanitizer_common/Makefile.am
+++ b/libsanitizer/sanitizer_common/Makefile.am
@@ -17,6 +17,7 @@ AM_CXXFLAGS += -DSANITIZER_LIBBACKTRACE -DSANITIZER_CP_DEMANGLE \
 endif
 AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
+sanitizer_platform_limits_freebsd.lo: AM_CXXFLAGS += -DUSE_SYSTEM_MD5
 
 noinst_LTLIBRARIES = libsanitizer_common.la
 
diff --git a/libsanitizer/sanitizer_common/Makefile.in b/libsanitizer/sanitizer_common/Makefile.in
index ce24f6e7bc6..2cc116ee10f 100644
--- a/libsanitizer/sanitizer_common/Makefile.in
+++ b/libsanitizer/sanitizer_common/Makefile.in
@@ -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.