From nobody Sun Jan 7 17:50:33 2024
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 4T7PqZ3sdVz55XNd;
Sun, 7 Jan 2024 17:50:34 +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 4T7PqZ14QXz4MKy;
Sun, 7 Jan 2024 17:50:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1704649834;
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=g8nTvtFmumGX6GFEfi8uCoeggsWqIFEw4fX8oMN325A=;
b=qGNroousd4ThkCBoge4PwpRPdqGe8yRWUwJrj3P1pWeLPI02SHkGyAlDO+lE8QZ72vjcG+
1PYKJQDEFDyruu0Op2BjIE1tbzJZFIQiuC/HkrlgQYqVHm9GRv7r2exoJQN0u0/dx0CuT8
wBOaeZZVogpM9mz7k92wcfv7vN+JLQtsHskWPBnwao598x6G1rlwe1OD+K6Od3bMCqKo9M
m9Y2UVlUGUQV+VwdkRXFJ0tsHb8tQqZyLwOQkEHFzCmQPVitv0E2QtFb1cA4bk41wXlKJu
/v5cQMZA287iT+pZd8lBg2YPhigRqL7Ie8sJfprzl4EsQzSldTF02RLJaOZ99w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1704649834;
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=g8nTvtFmumGX6GFEfi8uCoeggsWqIFEw4fX8oMN325A=;
b=X4OWmVdgrzQN3vXfosmNQ3QXSE/AXvRhVQ2jtYNRZarvR8921yxn7vbga7AoaTTIA/B6jw
qaxfx/fpQdzzGBDMeYUi8SQ9ScIt3JP5DqH8siTs2KWjZ1ADrIq5wN8qrICsreD7guZ1WC
F6OgN+pWBZqWWzZPY28XsfHZEmQsDZge3nlY5ha+a2SHfhEd1XMQqF394/P3LF9BtUIFSB
bu3OGKRbVVUXoC+QNPuepHC9YIQaAiqW9v7F7OXNf16EJtZ39WbL2h3ZIEdtaPQVF1Tf5c
ucgrjuCXai1ESuYHhkqwhZSWVyDG7quHCA2GRcBaSRazLCemKUJYACX/Wpvzyg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704649834; a=rsa-sha256; cv=none;
b=iTu8XsDh/yDxUePHMXCGOCZZ6O7PnhinaeqRGRmeGduE6djGvVunnNKSb3cRRr8hhp2QOR
NNEJ5ZZwgFf29YbXfhclkhfzpZVrphfBcNeHpTT3yoSOjgYVZ83BE4BPUDbTB/FCoDbHf3
8uyW+N6BhapSHjIkQzlxXCk4BXwfiKx1mZYWOFUd//g/dIfHbFb/A+pVTDxYv0QsvSiIw3
py7y1EjmxdQzhrdd0no8qPqqny2J5vEDAEFnSZ2LCasz1tq/kiP/IoiiUQ+X5WEXlenXrA
5gz88vXlNkmOVsPTm+/2TtSLf2CQhtS8zPpPIUzN26sP7QP5WbWJcF42LpRyPg==
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 4T7PqY60JWzYyy;
Sun, 7 Jan 2024 17:50:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 407HoXv8022267;
Sun, 7 Jan 2024 17:50:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407HoXEP022264;
Sun, 7 Jan 2024 17:50:33 GMT
(envelope-from git)
Date: Sun, 7 Jan 2024 17:50:33 GMT
Message-Id: <202401071750.407HoXEP022264@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Dimitry Andric <dim@FreeBSD.org>
Subject: git: 4883ad3ada84 - stable/14 - Add missing sources to
libclang_rt Makefiles, clean up unneeded ones
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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/14
X-Git-Reftype: branch
X-Git-Commit: 4883ad3ada84d4fee7372ac30b80eb1dfeca0d80
Auto-Submitted: auto-generated
The branch stable/14 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=4883ad3ada84d4fee7372ac30b80eb1dfeca0d80
commit 4883ad3ada84d4fee7372ac30b80eb1dfeca0d80
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-12-20 16:08:26 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-01-07 17:46:19 +0000
Add missing sources to libclang_rt Makefiles, clean up unneeded ones
During the llvm-17 merge, a few new source files were not added to the
libclang_rt Makefiles, in particular sanitizer_thread_arg_retval.cpp
which is now required for AddressSanitizer and MemorySanitizer. Also,
MemorySanitizer now requires msan_dl.cpp.
While here, clean out a number of source files that compile into nothing
(because they only contain non-FreeBSD parts). Also, remove a duplicated
instance of tsan_new_delete.cpp from libclang_rt.tsan, since it is only
supposed to live in libclang_rt.tsan_cxx.
PR: 275854
Reported by: jbeich
MFC after: 1 month
(cherry picked from commit 0c3af23961e170538f375c392b043903c1397780)
---
lib/libclang_rt/asan/Makefile | 3 +--
lib/libclang_rt/asan_dynamic/Makefile | 3 +--
lib/libclang_rt/cfi/Makefile | 2 +-
lib/libclang_rt/cfi_diag/Makefile | 2 +-
lib/libclang_rt/dd/Makefile | 2 +-
lib/libclang_rt/msan/Makefile | 3 ++-
lib/libclang_rt/safestack/Makefile | 1 -
lib/libclang_rt/stats/Makefile | 1 +
lib/libclang_rt/tsan/Makefile | 3 ---
lib/libclang_rt/ubsan_standalone/Makefile | 2 +-
lib/libclang_rt/xray/Makefile | 1 +
11 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index 02b5471afc91..6156371241da 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -19,7 +19,6 @@ SRCS+= asan/asan_memory_profile.cpp
SRCS+= asan/asan_poisoning.cpp
SRCS+= asan/asan_posix.cpp
SRCS+= asan/asan_preinit.cpp
-SRCS+= asan/asan_premap_shadow.cpp
SRCS+= asan/asan_report.cpp
SRCS+= asan/asan_rtl.cpp
SRCS+= asan/asan_shadow_setup.cpp
@@ -28,7 +27,6 @@ SRCS+= asan/asan_stats.cpp
SRCS+= asan/asan_suppressions.cpp
SRCS+= asan/asan_thread.cpp
SRCS+= interception/interception_linux.cpp
-SRCS+= interception/interception_type_test.cpp
SRCS+= sanitizer_common/sancov_flags.cpp
SRCS+= sanitizer_common/sanitizer_allocator.cpp
SRCS+= sanitizer_common/sanitizer_allocator_checks.cpp
@@ -66,6 +64,7 @@ SRCS+= sanitizer_common/sanitizer_symbolizer_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_report.cpp
SRCS+= sanitizer_common/sanitizer_termination.cpp
+SRCS+= sanitizer_common/sanitizer_thread_arg_retval.cpp
SRCS+= sanitizer_common/sanitizer_thread_registry.cpp
SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp
SRCS+= sanitizer_common/sanitizer_type_traits.cpp
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index 81b68d883ecc..1ba9840946b6 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -22,7 +22,6 @@ SRCS+= asan/asan_memory_profile.cpp
SRCS+= asan/asan_poisoning.cpp
SRCS+= asan/asan_posix.cpp
SRCS+= asan/asan_preinit.cpp
-SRCS+= asan/asan_premap_shadow.cpp
SRCS+= asan/asan_report.cpp
SRCS+= asan/asan_rtl.cpp
SRCS+= asan/asan_shadow_setup.cpp
@@ -31,7 +30,6 @@ SRCS+= asan/asan_stats.cpp
SRCS+= asan/asan_suppressions.cpp
SRCS+= asan/asan_thread.cpp
SRCS+= interception/interception_linux.cpp
-SRCS+= interception/interception_type_test.cpp
SRCS+= sanitizer_common/sancov_flags.cpp
SRCS+= sanitizer_common/sanitizer_allocator.cpp
SRCS+= sanitizer_common/sanitizer_allocator_checks.cpp
@@ -69,6 +67,7 @@ SRCS+= sanitizer_common/sanitizer_symbolizer_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_report.cpp
SRCS+= sanitizer_common/sanitizer_termination.cpp
+SRCS+= sanitizer_common/sanitizer_thread_arg_retval.cpp
SRCS+= sanitizer_common/sanitizer_thread_registry.cpp
SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp
SRCS+= sanitizer_common/sanitizer_type_traits.cpp
diff --git a/lib/libclang_rt/cfi/Makefile b/lib/libclang_rt/cfi/Makefile
index 85db642fdab8..604c3cd9a593 100644
--- a/lib/libclang_rt/cfi/Makefile
+++ b/lib/libclang_rt/cfi/Makefile
@@ -5,7 +5,6 @@ LIB= clang_rt.cfi-${CRTARCH}
SRCS+= cfi/cfi.cpp
SRCS+= interception/interception_linux.cpp
-SRCS+= interception/interception_type_test.cpp
SRCS+= sanitizer_common/sanitizer_allocator.cpp
SRCS+= sanitizer_common/sanitizer_allocator_checks.cpp
SRCS+= sanitizer_common/sanitizer_common.cpp
@@ -29,6 +28,7 @@ SRCS+= sanitizer_common/sanitizer_procmaps_bsd.cpp
SRCS+= sanitizer_common/sanitizer_procmaps_common.cpp
SRCS+= sanitizer_common/sanitizer_suppressions.cpp
SRCS+= sanitizer_common/sanitizer_termination.cpp
+SRCS+= sanitizer_common/sanitizer_thread_arg_retval.cpp
SRCS+= sanitizer_common/sanitizer_thread_registry.cpp
SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp
SRCS+= sanitizer_common/sanitizer_type_traits.cpp
diff --git a/lib/libclang_rt/cfi_diag/Makefile b/lib/libclang_rt/cfi_diag/Makefile
index b2a0b5b7a38f..4f4bb9472bb7 100644
--- a/lib/libclang_rt/cfi_diag/Makefile
+++ b/lib/libclang_rt/cfi_diag/Makefile
@@ -5,7 +5,6 @@ LIB= clang_rt.cfi_diag-${CRTARCH}
SRCS+= cfi/cfi.cpp
SRCS+= interception/interception_linux.cpp
-SRCS+= interception/interception_type_test.cpp
SRCS+= sanitizer_common/sancov_flags.cpp
SRCS+= sanitizer_common/sanitizer_allocator.cpp
SRCS+= sanitizer_common/sanitizer_allocator_checks.cpp
@@ -43,6 +42,7 @@ SRCS+= sanitizer_common/sanitizer_symbolizer_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_report.cpp
SRCS+= sanitizer_common/sanitizer_termination.cpp
+SRCS+= sanitizer_common/sanitizer_thread_arg_retval.cpp
SRCS+= sanitizer_common/sanitizer_thread_registry.cpp
SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp
SRCS+= sanitizer_common/sanitizer_type_traits.cpp
diff --git a/lib/libclang_rt/dd/Makefile b/lib/libclang_rt/dd/Makefile
index 80ae9037cfe6..80ed7e497797 100644
--- a/lib/libclang_rt/dd/Makefile
+++ b/lib/libclang_rt/dd/Makefile
@@ -4,7 +4,6 @@
LIB= clang_rt.dd-${CRTARCH}
SRCS+= interception/interception_linux.cpp
-SRCS+= interception/interception_type_test.cpp
SRCS+= sanitizer_common/sanitizer_allocator.cpp
SRCS+= sanitizer_common/sanitizer_allocator_checks.cpp
SRCS+= sanitizer_common/sanitizer_common.cpp
@@ -28,6 +27,7 @@ SRCS+= sanitizer_common/sanitizer_procmaps_bsd.cpp
SRCS+= sanitizer_common/sanitizer_procmaps_common.cpp
SRCS+= sanitizer_common/sanitizer_suppressions.cpp
SRCS+= sanitizer_common/sanitizer_termination.cpp
+SRCS+= sanitizer_common/sanitizer_thread_arg_retval.cpp
SRCS+= sanitizer_common/sanitizer_thread_registry.cpp
SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp
SRCS+= sanitizer_common/sanitizer_type_traits.cpp
diff --git a/lib/libclang_rt/msan/Makefile b/lib/libclang_rt/msan/Makefile
index 2771ac578bc3..474b08a640a7 100644
--- a/lib/libclang_rt/msan/Makefile
+++ b/lib/libclang_rt/msan/Makefile
@@ -4,10 +4,10 @@
LIB= clang_rt.msan-${CRTARCH}
SRCS+= interception/interception_linux.cpp
-SRCS+= interception/interception_type_test.cpp
SRCS+= msan/msan.cpp
SRCS+= msan/msan_allocator.cpp
SRCS+= msan/msan_chained_origin_depot.cpp
+SRCS+= msan/msan_dl.cpp
SRCS+= msan/msan_interceptors.cpp
SRCS+= msan/msan_linux.cpp
SRCS+= msan/msan_poisoning.cpp
@@ -50,6 +50,7 @@ SRCS+= sanitizer_common/sanitizer_symbolizer_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_report.cpp
SRCS+= sanitizer_common/sanitizer_termination.cpp
+SRCS+= sanitizer_common/sanitizer_thread_arg_retval.cpp
SRCS+= sanitizer_common/sanitizer_thread_registry.cpp
SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp
SRCS+= sanitizer_common/sanitizer_type_traits.cpp
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index 75246a1295c6..bbf4a665c37f 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -4,7 +4,6 @@
LIB= clang_rt.safestack-${CRTARCH}
SRCS+= interception/interception_linux.cpp
-SRCS+= interception/interception_type_test.cpp
SRCS+= safestack/safestack.cpp
.include <bsd.lib.mk>
diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile
index b2ba12ce0b6d..2fd929575123 100644
--- a/lib/libclang_rt/stats/Makefile
+++ b/lib/libclang_rt/stats/Makefile
@@ -38,6 +38,7 @@ SRCS+= sanitizer_common/sanitizer_symbolizer_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_report.cpp
SRCS+= sanitizer_common/sanitizer_termination.cpp
+SRCS+= sanitizer_common/sanitizer_thread_arg_retval.cpp
SRCS+= sanitizer_common/sanitizer_thread_registry.cpp
SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp
SRCS+= sanitizer_common/sanitizer_type_traits.cpp
diff --git a/lib/libclang_rt/tsan/Makefile b/lib/libclang_rt/tsan/Makefile
index d97d6592cfb6..f3f5bd41668c 100644
--- a/lib/libclang_rt/tsan/Makefile
+++ b/lib/libclang_rt/tsan/Makefile
@@ -4,7 +4,6 @@
LIB= clang_rt.tsan-${CRTARCH}
SRCS+= interception/interception_linux.cpp
-SRCS+= interception/interception_type_test.cpp
SRCS+= sanitizer_common/sancov_flags.cpp
SRCS+= sanitizer_common/sanitizer_allocator.cpp
SRCS+= sanitizer_common/sanitizer_allocator_checks.cpp
@@ -30,7 +29,6 @@ SRCS+= sanitizer_common/sanitizer_posix_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_printf.cpp
SRCS+= sanitizer_common/sanitizer_procmaps_bsd.cpp
SRCS+= sanitizer_common/sanitizer_procmaps_common.cpp
-SRCS+= sanitizer_common/sanitizer_range.cpp
SRCS+= sanitizer_common/sanitizer_stack_store.cpp
SRCS+= sanitizer_common/sanitizer_stackdepot.cpp
SRCS+= sanitizer_common/sanitizer_stacktrace.cpp
@@ -62,7 +60,6 @@ SRCS+= tsan/rtl/tsan_interface_java.cpp
SRCS+= tsan/rtl/tsan_md5.cpp
SRCS+= tsan/rtl/tsan_mman.cpp
SRCS+= tsan/rtl/tsan_mutexset.cpp
-SRCS+= tsan/rtl/tsan_new_delete.cpp
SRCS+= tsan/rtl/tsan_platform_linux.cpp
SRCS+= tsan/rtl/tsan_platform_posix.cpp
SRCS+= tsan/rtl/tsan_preinit.cpp
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index 584a32ca3d45..95d1c0405e2d 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -4,7 +4,6 @@
LIB= clang_rt.ubsan_standalone-${CRTARCH}
SRCS+= interception/interception_linux.cpp
-SRCS+= interception/interception_type_test.cpp
SRCS+= sanitizer_common/sancov_flags.cpp
SRCS+= sanitizer_common/sanitizer_allocator.cpp
SRCS+= sanitizer_common/sanitizer_allocator_checks.cpp
@@ -42,6 +41,7 @@ SRCS+= sanitizer_common/sanitizer_symbolizer_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
SRCS+= sanitizer_common/sanitizer_symbolizer_report.cpp
SRCS+= sanitizer_common/sanitizer_termination.cpp
+SRCS+= sanitizer_common/sanitizer_thread_arg_retval.cpp
SRCS+= sanitizer_common/sanitizer_thread_registry.cpp
SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp
SRCS+= sanitizer_common/sanitizer_type_traits.cpp
diff --git a/lib/libclang_rt/xray/Makefile b/lib/libclang_rt/xray/Makefile
index fabaabca9646..91abbb743667 100644
--- a/lib/libclang_rt/xray/Makefile
+++ b/lib/libclang_rt/xray/Makefile
@@ -28,6 +28,7 @@ SRCS+= sanitizer_common/sanitizer_procmaps_bsd.cpp
SRCS+= sanitizer_common/sanitizer_procmaps_common.cpp
SRCS+= sanitizer_common/sanitizer_suppressions.cpp
SRCS+= sanitizer_common/sanitizer_termination.cpp
+SRCS+= sanitizer_common/sanitizer_thread_arg_retval.cpp
SRCS+= sanitizer_common/sanitizer_thread_registry.cpp
SRCS+= sanitizer_common/sanitizer_tls_get_addr.cpp
SRCS+= sanitizer_common/sanitizer_type_traits.cpp