From nobody Sat May 28 13:47:10 2022 X-Original-To: dev-commits-src-main@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 9EA4F1B40853; Sat, 28 May 2022 13:47:10 +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 4L9NJZ42Q1z3FKx; Sat, 28 May 2022 13:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653745630; 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=pPR0PmxVQSwaKwYMjeYRVPK2Gw5wgRK+E1QOZNbmDQg=; b=iSQnOqNzpPWbqVFz2J1ZrFinyqyPsEENccAtilC4Y96iBAHd+DT1vmj/8jI0bpDpQwpUFM 2Oyx8fA1rKbMs6wZWTGrI/9VepxRMDsNSA7gV6GcBT6jTe2RtnQ6kJ8WDlnc72WDnpb+XJ G8emBHVUlMtvraA+fdlxZ+xQFI9xo5TbywLAUe1a/2lCY7ENZOdeuWgfxpGSJiNvE6uGI7 5g9CEGIz7KvO1LyVkpwpcAF/h674fCV4eI6L/zcfHn+3+/+n1PIp9GTzSWwhNnfQ+0VwHZ QXVtFf+6UhrO8/RgIz8k+ODXOn1H75UvKN2dZtEzXRghB/G8Ezwlm/l4hMcoBA== 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 6A5FC10394; Sat, 28 May 2022 13:47:10 +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 24SDlAES020767; Sat, 28 May 2022 13:47:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24SDlAY8020766; Sat, 28 May 2022 13:47:10 GMT (envelope-from git) Date: Sat, 28 May 2022 13:47:10 GMT Message-Id: <202205281347.24SDlAY8020766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 7b6f5ebef681 - main - Add several sanitizer ignore lists under /usr/lib/clang List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7b6f5ebef68194c09708abeb6426ca7602b6dab1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653745630; 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=pPR0PmxVQSwaKwYMjeYRVPK2Gw5wgRK+E1QOZNbmDQg=; b=ZXmznbtt8T7VyaAY1BWoRMNGnvytmk/Gj/E8umDYZIn8OFqYTy85ajpgcjCXqBJYLwPvom 8sbnGE7zwUI2JoDgdE4IP4VnAxac45lq/Nk1x25DQBP9CZnC6/yMCOeDY2WjTEgo2Q5I/F HO8iGMzXMJccEjuObIuEhRSNUfWL9XyQCTSm1o5htbb9Y2j5j4l0EDtdtCJxUVWvMaDoqk SNHzgulOHN9fasHYIidGr03mtKbUot8ilVLr/7tRcVeX6vJYBTC5ex4zzUVOMVtJOm/L04 aNWc+CHcagKZFTOY3Xr4yThOoMhLNH4brygr+pOHpW/ca6r0Ob76iq0b8h595g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653745630; a=rsa-sha256; cv=none; b=czWrU6bj0zDAyWoD+ukCyamFsiWy3VLFSgeprw3HP4TM5dKoiN+HnaocNEfeYy9Zn2cCbc ckYpR59lz4iUQszmMTnv9V/Jy5bJXIc1RF9GVyJ96Ur/OO1AMiednG8sZp43RnAPQto7UW QGFmOxdmgMCO8kqxoIu5pJsgKrguZKXQ/Lu5y/U/ESEPmp4njzfGa1401FxTILXPUtXYLv ZBLUkBiNpU91gtUFEx9fN/vKkIQGe4mgHTbrrzi1wv0fdolcAwZvfOjKy0OyYFveqDpwoB zkTIsoUlml8CW4/Gy5U0zA2paRCdFadDXVi5yXZpUkVUyHdHEhtOeqMZEvlriQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7b6f5ebef68194c09708abeb6426ca7602b6dab1 commit 7b6f5ebef68194c09708abeb6426ca7602b6dab1 Author: Dimitry Andric AuthorDate: 2022-05-27 18:23:37 +0000 Commit: Dimitry Andric CommitDate: 2022-05-28 13:46:38 +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 --- 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 3aac572a314f..aaea188d7c97 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -57,6 +57,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 78468be5f465..525f85b492ae 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 6a1776690608..3c3060166592 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1488,6 +1488,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