From nobody Tue Jan 30 17:55:02 2024 X-Original-To: dev-commits-src-all@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 4TPXr63sGYz59GkG; Tue, 30 Jan 2024 17:55:02 +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 4TPXr63HxNz4M58; Tue, 30 Jan 2024 17:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706637302; 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=7Ny6NywoWunmzBhBBNySUcKZc+wNrxnrl/30NE5mnGY=; b=n/zvUKdcCkUPBWbSy94Xmd0vCvPv6DMqaSH5t9HJbl39Dz6sBfn0ntunNF/iLIDQt0FUI5 ucQDK/f/JXiRszRNoIKEhK7fcnkQhKn/wIQ+rHsXruVQBaQzBFOwKKBOe4EaDdOZMSSPnm AS+XXANa5k27/zd5J7MW6qiWkuKQmQ06tDHRSVUpJbyPKS4SuvkuqHGcjJ2ynta2uTLOga o42CBrZiHXRtXXnIE7MKCWK+7AJ4vMoTGRUTcbtgHEkI/IcKzrEhCb9jYZcZu4waayLmGj 8QxGIvHSdnW90KjIyBKy3qZqLSl0aqOn/LAmLncm9kpT77+Kpfe++6eK43sb6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706637302; 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=7Ny6NywoWunmzBhBBNySUcKZc+wNrxnrl/30NE5mnGY=; b=qFggtmSsq1VLJCo4fI/9B0BG3S571Mh+Dn4rdZV9j+fdzl5I7L++oipCCAX5JPRmJ0Vn+K GwgwjXIe66ofhsVMELk+wMR0uo9VmE7vL5N1I5NLgLxrnD8JTqkEhIgy5fIxR8RJJcbWHE i1lO5zzNk3IKmZ4NETGfZXMN9Lfi7Hnoq5t6W9AVpOKwDY0P2JMLnUVLeq6sND7zVbgFwk TUJm5AYSox2Tz/DXLq57705yqzefTarUn64WUSAXPGOquE1SO0/nq+ssHj0S+COCC6BUWR wDZjwchGVzyADGzyHU4AnODpE1kiQyA5hlc8SI1Ov02UTWNkY1GIaIHeQJ5hSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706637302; a=rsa-sha256; cv=none; b=FAvmuedU9Y7lPwX5/xmNFOCAiEQ+zO6WDqViwE89OMzUBClbRBqV2CyvQfj+alPSXYK1h9 Jo4GiZD026sdg3yBlMOXZKXqg+gQtf5K2j8FNr2PVH/z0QIR4ZXcWrATtBvyZ7EZtinp4/ c3dY6yEPGOacLSz0ykJGrbTmga6QVyZLukWcA2M2mCBZLC0uSQ1F8VIMyLgB42bF3Latkc sP5k5iL7k7aMrbb1Ep/SiA5mUrtosI/YPc+kkm2JSU2nsBrLrGzUPIINyrl8BDiNV8jOjY HDfr0PQyE+ifLEZYSeYny6DGVrDKnhWmu3/70KJpXLEbRa8BrcA8kYdJy8f5og== 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 4TPXr62DQLzl39; Tue, 30 Jan 2024 17:55:02 +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 40UHt2wH066388; Tue, 30 Jan 2024 17:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UHt2tW066385; Tue, 30 Jan 2024 17:55:02 GMT (envelope-from git) Date: Tue, 30 Jan 2024 17:55:02 GMT Message-Id: <202401301755.40UHt2tW066385@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: 31c3fc40dedd - stable/14 - Merge commit 16a1ef86cbc5 from llvm-project (by David CARLIER): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 31c3fc40dedddadaaa143f0ddf3d61ee7b2493ee Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=31c3fc40dedddadaaa143f0ddf3d61ee7b2493ee commit 31c3fc40dedddadaaa143f0ddf3d61ee7b2493ee Author: Dimitry Andric AuthorDate: 2024-01-27 21:48:58 +0000 Commit: Dimitry Andric CommitDate: 2024-01-30 17:53:14 +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