From nobody Sat Jan 27 21:51:41 2024 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 4TMpDY2z8fz590RF; Sat, 27 Jan 2024 21:51:41 +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 4TMpDY2KF9z45jC; Sat, 27 Jan 2024 21:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706392301; 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=AXYlXA25JUU/t2Q6VW1QvWHagZoN5eFD7INyBU/jE3A=; b=LhUVhYORA3+GdtuGHKDcYXKFx17u1Ro0/3oa73puxYjEb3NdIKe8R0+Q0il3/gMWpGbt3P 6pYwjDPejMkTF5/yNAUeX8J521S8SSr1Ii62R3hnM0huu4wl3ErVceNbVPirqBAbPwU4v+ YW70QGUt+lnvj1c7IH6qjEZiFWbFDDxh4eWpAkoZi375o3xTif/7AZdGyeujrXDnSA0MHg uQ9xS7AmCrHinoujFCf3sENqeFvW+voCJyYRAVbzd8CeBnoDHYjcLGhtkcP0nERXiqgZiI mZmHE6DtJahhd+tLjtcU9FtkzAmtm4Tv03D/vH4rWq83hFCudCwOvIp8ekI18A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706392301; 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=AXYlXA25JUU/t2Q6VW1QvWHagZoN5eFD7INyBU/jE3A=; b=hJauGkU7MQghCfK5b9f9nfUV0oFiiTrMOAtfaSeoTHc4lI7x6ooaDTtk+CSgCLf9BKWiEQ JLFiPcNncZVUY0KXrKSP3mS31Qbm/mmeXvf8wG7Uy1DQrOobbg5m2U7OGnEoj8W8PaUS17 tUWUuE3Ava0jNor9vm10hFz74lO3hvS7yX2RF2qTWCxHV6ZC8SvtniyfBCFX3zz/RtLDG9 MeKb5PcKOHFHJnucMPnQjhBEh98oxYztfkJAncby2yJavPdtEaa77bRI2TEVGy5zPbJQP0 bl2V6Snlny6yX1ilhHn3qMxu/Z3JG/Ab+vZt0QSBaBEqLQ7yttHSZpTC1FgcfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706392301; a=rsa-sha256; cv=none; b=OJjyeIRJzOgnB8QupbKeUxWZPRw2/hDJPDlMRW9+A1zvl5TJUZFJiuTvWPzOJvvrsDmJHJ +H+p45FLHH9p06UIlKnVVeCsLN2Zl3CeDynmp5Av7dMhNHl+GQEp4c6PQwDezLKj4miAi3 nkIGFS5ES2B82EL8C9V0g88FolZsL1ALYtbNFyQQAI/eg3o0BCeULL0nOBBsMH+p4PiLBs jCRUmAgqy0kNUV8NVOrsgAp6wyhufTViPvFwlUblgiZjqRsfF8WXA+bfmZJbl96pmRoOxE h976JbybptWTeMTn9Whpsa5KggAhEV/CcdisraRnSpZNvPCz83VHVbN/AW+HwQ== 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 4TMpDY0vKvzht1; Sat, 27 Jan 2024 21:51:41 +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 40RLpfIC085314; Sat, 27 Jan 2024 21:51:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RLpfxN085312; Sat, 27 Jan 2024 21:51:41 GMT (envelope-from git) Date: Sat, 27 Jan 2024 21:51:41 GMT Message-Id: <202401272151.40RLpfxN085312@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: 31aedef26fc0 - main - Merge commit 16a1ef86cbc5 from llvm-project (by David CARLIER): 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: 31aedef26fc0613f5d61204c624451d57e716ed9 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=31aedef26fc0613f5d61204c624451d57e716ed9 commit 31aedef26fc0613f5d61204c624451d57e716ed9 Author: Dimitry Andric AuthorDate: 2024-01-27 21:48:58 +0000 Commit: Dimitry Andric CommitDate: 2024-01-27 21:48:58 +0000 Merge commit 16a1ef86cbc5 from llvm-project (by David CARLIER): [compiler-rt] remove hexdump interception. (#79378) a freebsd dev member reported a symbol conflict and intercepting this had little value anyway. This is one part of fixing the WITH_ASAN build. Some executables in the base system define their own hexdump() symbol, which would otherwise conflict with the ASan-intercepted one. Reported by: markj PR: 276597 MFC after: 3 days --- .../sanitizer_common/sanitizer_common_interceptors.inc | 15 --------------- .../sanitizer_common/sanitizer_platform_interceptors.h | 1 - 2 files changed, 16 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index 0e563fa12022..a6cda8c6bd4f 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -10180,20 +10180,6 @@ INTERCEPTOR(int, __xuname, int size, void *utsname) { #define INIT___XUNAME #endif -#if SANITIZER_INTERCEPT_HEXDUMP -INTERCEPTOR(void, hexdump, const void *ptr, int length, const char *header, int flags) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, hexdump, ptr, length, header, flags); - COMMON_INTERCEPTOR_READ_RANGE(ctx, ptr, length); - COMMON_INTERCEPTOR_READ_RANGE(ctx, header, internal_strlen(header) + 1); - REAL(hexdump)(ptr, length, header, flags); -} - -#define INIT_HEXDUMP COMMON_INTERCEPT_FUNCTION(hexdump); -#else -#define INIT_HEXDUMP -#endif - #if SANITIZER_INTERCEPT_ARGP_PARSE INTERCEPTOR(int, argp_parse, const struct argp *argp, int argc, char **argv, unsigned flags, int *arg_index, void *input) { @@ -10543,7 +10529,6 @@ static void InitializeCommonInterceptors() { INIT_PROCCTL INIT_UNAME; INIT___XUNAME; - INIT_HEXDUMP; INIT_ARGP_PARSE; INIT_CPUSET_GETAFFINITY; diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h index c740778b6228..d7fe7e29b105 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -594,7 +594,6 @@ #define SANITIZER_INTERCEPT___XUNAME SI_FREEBSD #define SANITIZER_INTERCEPT_FLOPEN SI_FREEBSD #define SANITIZER_INTERCEPT_PROCCTL SI_FREEBSD -#define SANITIZER_INTERCEPT_HEXDUMP SI_FREEBSD #define SANITIZER_INTERCEPT_ARGP_PARSE SI_GLIBC #define SANITIZER_INTERCEPT_CPUSET_GETAFFINITY SI_FREEBSD