From nobody Sat Jun 4 12:01:25 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6F2701B56BBE; Sat, 4 Jun 2022 12:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFddL6LPtz4cWZ; Sat, 4 Jun 2022 12:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EavJJ2TDwGQWQCeGgt0srBDYBWI8Uapmrt/XYt2U3Og=; b=twe144LLgTGuWe7XJNhUYV5EQzoTk0Erz+AMUxviw0FtYpENdSi/AHk8YF6DWPksXqvnMH LAXXB8YrTYURIGlsi8rk/3t47vGqdtundah+QpHs/vJ7xbyM1h5vQHpWuwp2td3DSwPcKf VX8dJeYhNqqbr+PyL1DOe1AbBrEo83k7/cH4LJQ+AnM0zMMK5svo/vGXNtvyt4zUdeOlZk yX+5UEjNd7NWH9P64TYpq0nf2wfGC6Hbg7beUuDfLFZNh8Y8L3N0oj/OwC32HFzyTf5CaQ WrKLx58rxB5IajtdEtc2eWNL3p5pU9eJA+rJnIcw5iZA1I8wClf7ByIMWrzU0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 240111D53F; Sat, 4 Jun 2022 12:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 254C1PNj093960; Sat, 4 Jun 2022 12:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254C1Prf093959; Sat, 4 Jun 2022 12:01:25 GMT (envelope-from git) Date: Sat, 4 Jun 2022 12:01:25 GMT Message-Id: <202206041201.254C1Prf093959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 36c1a99ff45f - stable/13 - Add several sanitizer ignore lists under /usr/lib/clang List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 36c1a99ff45fe279d478a615f8c66aa10b003cea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EavJJ2TDwGQWQCeGgt0srBDYBWI8Uapmrt/XYt2U3Og=; b=vRhZCl1zBWS7w37BnTHMpUmqPGlGK6u0MMzu/cDu1h0rGocn86nSPE3quiY7dNGkhS5Hcd DZ9R6zWXvQII7ZRCHlsVbzTSZrsJUsztyDwJLxQo8B7QvikzzdUt5wUFBa4Xr4Scfokl24 TuWtm2xfh0sOWbhRQzP7LOPkTLFu57RohfnKsoRKbOMP//H5YyFeXAni/nuBgj1VAX5BHE PLNLSSCdumeoXFaHFDDDkHvTaGqtB/BABGFKFMd1VSQHkPPDXLmSnDrRfxAUBQxaC1uBYE Jxfs5KWtwOcn+QIUXRL9NcG26bnguAbZoL6CiUx26xolCvZmc1A8bxNgy7Qmhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654344087; a=rsa-sha256; cv=none; b=tQmO/tsXy1bZQ3olPLAUKEPYMEkLja3+/gZzXTbXLga055TWRuELst47CLEYgpw/G/z/Mv xkFt4Gtwq8t39uXaHrFPWo0wgNVd9Rhtd8oTVVChdl41jkX3t2uyQ/2GKrlL+LIqHVl4oy 04G4syPbqXrpmbNDUvWxP3dUGF8nFzaWBR1lywtt7bv/zlJjVulDUBHTsmPNxpJX6plcnN GhKzGOfW6RbU//uXfRxAw0WddWJ2HvJ1NSrdp0YiWMmannxxfpwogP3nuJA2m5sY07IEIO CHUZTOuZCGdGA+WQahzNYlwnVwpXUSv7yi/Q4CIILjpyGPRt1EERvV6VYB7opw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=36c1a99ff45fe279d478a615f8c66aa10b003cea commit 36c1a99ff45fe279d478a615f8c66aa10b003cea Author: Dimitry Andric AuthorDate: 2022-05-27 18:23:37 +0000 Commit: Dimitry Andric CommitDate: 2022-06-04 12:00:20 +0000 Add several sanitizer ignore lists under /usr/lib/clang Some of the sanitizers from compiler-rt can use ignore lists, which are loosely modeled on valgrind's example. Upstream provides default lists for AddressSanitizer, CFI, and MemorySanitizer, so install these in the expected location, /usr/lib/clang/14.0.3/share. Reviewed by: emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35338 (cherry picked from commit 7b6f5ebef68194c09708abeb6426ca7602b6dab1) --- etc/mtree/BSD.usr.dist | 2 ++ lib/libclang_rt/asan/Makefile | 3 +++ lib/libclang_rt/cfi/Makefile | 3 +++ lib/libclang_rt/compiler-rt-vars.mk | 1 + lib/libclang_rt/msan/Makefile | 3 +++ tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++ 6 files changed, 16 insertions(+) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 2c9d793676f7..fc201efb5c26 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -55,6 +55,8 @@ lib freebsd .. + share + .. .. .. .. diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile index 66641c7e9121..3ad706cd3c9d 100644 --- a/lib/libclang_rt/asan/Makefile +++ b/lib/libclang_rt/asan/Makefile @@ -80,4 +80,7 @@ SRCS+= ubsan/ubsan_init.cpp SRCS+= ubsan/ubsan_monitor.cpp SRCS+= ubsan/ubsan_value.cpp +FILESDIR= ${SANITIZER_SHAREDIR} +FILES+= asan/asan_ignorelist.txt + .include diff --git a/lib/libclang_rt/cfi/Makefile b/lib/libclang_rt/cfi/Makefile index 9910565b2f38..fffd62ab0d3e 100644 --- a/lib/libclang_rt/cfi/Makefile +++ b/lib/libclang_rt/cfi/Makefile @@ -36,4 +36,7 @@ SRCS+= sanitizer_common/sanitizer_thread_registry.cpp SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp SRCS+= sanitizer_common/sanitizer_type_traits.cpp +FILESDIR= ${SANITIZER_SHAREDIR} +FILES+= cfi/cfi_ignorelist.txt + .include diff --git a/lib/libclang_rt/compiler-rt-vars.mk b/lib/libclang_rt/compiler-rt-vars.mk index dc89ded251ba..ab97cbb0c0b5 100644 --- a/lib/libclang_rt/compiler-rt-vars.mk +++ b/lib/libclang_rt/compiler-rt-vars.mk @@ -1,6 +1,7 @@ CLANG_SUBDIR=clang/14.0.3 CLANGDIR= /usr/lib/${CLANG_SUBDIR} SANITIZER_LIBDIR= ${CLANGDIR}/lib/freebsd +SANITIZER_SHAREDIR= ${CLANGDIR}/share # armv[67] is a bit special since we allow a soft-floating version via # CPUTYPE matching *soft*. This variant may not actually work though. diff --git a/lib/libclang_rt/msan/Makefile b/lib/libclang_rt/msan/Makefile index 76e05af7462c..12a6f035d71f 100644 --- a/lib/libclang_rt/msan/Makefile +++ b/lib/libclang_rt/msan/Makefile @@ -64,4 +64,7 @@ SRCS+= ubsan/ubsan_init.cpp SRCS+= ubsan/ubsan_monitor.cpp SRCS+= ubsan/ubsan_value.cpp +FILESDIR= ${SANITIZER_SHAREDIR} +FILES+= msan/msan_ignorelist.txt + .include diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 78cc6ee8e126..be20223309b4 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1551,6 +1551,10 @@ OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-x86_64.a OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-x86_64.a OLD_DIRS+=usr/lib/clang/14.0.3/lib/freebsd OLD_DIRS+=usr/lib/clang/14.0.3/lib +OLD_FILES+=usr/lib/clang/14.0.3/share/asan_ignorelist.txt +OLD_FILES+=usr/lib/clang/14.0.3/share/cfi_ignorelist.txt +OLD_FILES+=usr/lib/clang/14.0.3/share/msan_ignorelist.txt +OLD_DIRS+=usr/lib/clang/14.0.3/share OLD_DIRS+=usr/lib/clang/14.0.3 OLD_DIRS+=usr/lib/clang OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT