From nobody Tue Jan 30 17:55:20 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 4TPXrS5PqVz59GPt; Tue, 30 Jan 2024 17:55:20 +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 4TPXrS4t8yz4N5d; Tue, 30 Jan 2024 17:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706637320; 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=xlYmRDYLKHrNg9hbwYuhuYsBhxazLlaci88QulhgCTA=; b=fDkbVXgBS17hX5B0JA5oSYy5FZCS0MOfZ+6N78G2V4IgUqltJYskpyTVNsMINLrTaT0pZd Wr05Dp1Qu9pE14ZZMhKuSrKw5SCmNoIhkhLFmLq++fo6vi/eDl4XKZ2TzeoDZNdBtobR4W EvOSK57B3tJPsm+bd2Z/KOpcMlHY8nsoy9t4JdjiBaYfgJWZu3JY6mVpfPgAnd8RBzk34m n+WY8mUrJGTTsG2bRYV6W6iWx+YZnYynkinRbG3DA7alaqpYRjKrlMiXnGXYYGOTdcpQdh MCnRCeCrRYab6iuuNpHygfUgdSMI5IUxIZGXvg/g4NW6rjHicF4sXP3w+sUCNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706637320; 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=xlYmRDYLKHrNg9hbwYuhuYsBhxazLlaci88QulhgCTA=; b=E7oUs52/TY/ZaDZZQlkv8SQxA3LfovycnTc9iJsctUyAJCp+QMhCdIwbirBp5O0A7NPRJX OGo4mJaQ1qVB6m6A6pSgdw9t/5KfpCZ1P64zcV/IrnN3DaiIge+Uidx1Wp9Qz+WTJnV4FY v54l2YV0TCTcLGbYu8RvZG4fmYRXC2MoMlrBwaJ9oZ1+RrdSusuxS6+KqnqMPzFcFQilA1 6Q+l3twFBIOVaJsxEaoB6ABtbaLW9yqIkXwhty0a6kBgZNOOWJJWAFJ6hYOelNweahWii7 NWY+n8uIPZzXNcQBHOi/bt8icWZb4e7DHbQxM4gUbF+zLpNLxPJZ4tVpZ09iuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706637320; a=rsa-sha256; cv=none; b=SQlVxmC9DQXEkJI8zKI0r/5vQmshHn44hQsYIbzwiw65ZQzMliIKBVG3DZVgOX8X0FzsCG s5NFDOS44lo4YTp/yIF8Ga6EWGD67rrG1+9DlY5zmrsg4KT2Q2y6X9xp1eRfLV1RflP+ug 4ky4D8qat5NvG9v+rGn9LC3M/Mil6EZp+T5SMdUOZLjEtb6Ptmlt8s/JMcU/uUIsQLcmmF roZ2cONFbVjRh9jOdaqAearWNwmfyYdJsHJlgntYEIkDqXS3czjyeUy8zvokR81UEZCIX4 Wo421ml+fgxgc41rZqmEwwTmLRDmSQUKbn5SU0jAbWpwZVPE70QkhaJr4u0xkA== 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 4TPXrS3zxGzlT0; Tue, 30 Jan 2024 17:55:20 +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 40UHtKw3066713; Tue, 30 Jan 2024 17:55:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UHtKxh066710; Tue, 30 Jan 2024 17:55:20 GMT (envelope-from git) Date: Tue, 30 Jan 2024 17:55:20 GMT Message-Id: <202401301755.40UHtKxh066710@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: 3bd3724e4c86 - stable/13 - Merge commit 16a1ef86cbc5 from llvm-project (by David CARLIER): 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: 3bd3724e4c8685d98bfc6feb3024b8bb213eed49 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3bd3724e4c8685d98bfc6feb3024b8bb213eed49 commit 3bd3724e4c8685d98bfc6feb3024b8bb213eed49 Author: Dimitry Andric AuthorDate: 2024-01-27 21:48:58 +0000 Commit: Dimitry Andric CommitDate: 2024-01-30 17:53:39 +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 (cherry picked from commit 31aedef26fc0613f5d61204c624451d57e716ed9) --- .../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