From nobody Fri Jul 12 11:32:19 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 4WL8Zq6wMPz5QCQC; Fri, 12 Jul 2024 11:32:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WL8Zq3vshz4qB0; Fri, 12 Jul 2024 11:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720783939; 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=fEDmx1WbsxDoWpsPAQM2bziUGan2cD+OA0U1xq+VCmE=; b=y0lHvuKZIUC78YR1wrTp4e25TzTElTyGt9SPjODqJ2EvmHrTbNAeEqz+BfOWY/LJCqYGfM nur/PSMw3lVGfI7hsNQi6DzMyfAjXn9AFTI4qaASlAu/LNKGusVHpTfH/aUTfMRgaCF/kG SzJnIgApm1XOoZL1YGQw3xp3TtFAuCQ6kkgXi68cj8xtvt5G5AlqFrlx3GDZlUOdgNZ71z JcjQmnnOo1FVQFYi3rXfACVlLAUuFV3dQgkkKxDaY/XpZtS7kVtx/knDRCRPaTPWIun0C/ oeMQ9Wvqnv1hcLhe72qVTMi6ZUcO1UIazbPvzhxXspL6oB4M6h0jpWnrjdYB6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720783939; a=rsa-sha256; cv=none; b=n/oo5ujPUrzt10RjToHRJlwfeGr4TRruwO1ILAghe39fa7ZpkuNJLnLwyMznwwYI5O/zgW ujWqVch7jsi0DwGPnd2WzvVaG12hzdZCW64F4yajCT9hkbtVE4eHqZYNFRW/yBW/RZ8/Lw 4yd9KtI14E88Ex9pWmONfSkQ6mTPYnpbYLyxZUXvgIUQ4wda4dSh/LXQWcWrv/aguKWA/h lP+A7Y3dCXj5NB+hIadJqnzI5T9Psh8boEygROt/etqeWOqItsqoLZ1E2miKi3jcJa80xs 4DRqz+ejn9ociC4RXhVnP2VOBxGN5geBl1m2TsX8oWl5q1h0Brbw1tfNvi4FGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720783939; 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=fEDmx1WbsxDoWpsPAQM2bziUGan2cD+OA0U1xq+VCmE=; b=NKt3t35opgbKnSfp/FpT8BFpclt29TrVI17idicj8AwwLKH/SaXfiRD0V5pM2oM+B3/3S/ OVFyy88ZkwkVUCx5LmlqfAskvi+D8idxcMV93NRv4hk+HmWClEZ2i4Y7vYca+a+5neFwdk hmCzRYHqf8ktH692fUn2OSHQNiVqXBSViqaSTWvt0aqg8sUrxKHugaIYSTJCFEot37UbuF LZEWeFnI+vzBQSs0+H9VZJDLg2dfoPeqO757tzZNy3on5puqiXSnaRfAUAZUWqBU5zsx+0 ig7TZNWw9m/gILOmGh1jStZDhaedH0ZH6OXIJ3RHb+UqR78+CGeK6fqYWcc+mA== 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 4WL8Zq3Fqdzhqd; Fri, 12 Jul 2024 11:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46CBWJU9010354; Fri, 12 Jul 2024 11:32:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46CBWJ8f010351; Fri, 12 Jul 2024 11:32:19 GMT (envelope-from git) Date: Fri, 12 Jul 2024 11:32:19 GMT Message-Id: <202407121132.46CBWJ8f010351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 97dbe3e7ace2 - main - libclang_rt: Simplify the arm check 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97dbe3e7ace2c222b18f4eb787de91ee44192e76 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=97dbe3e7ace2c222b18f4eb787de91ee44192e76 commit 97dbe3e7ace2c222b18f4eb787de91ee44192e76 Author: Andrew Turner AuthorDate: 2024-07-12 11:28:50 +0000 Commit: Andrew Turner CommitDate: 2024-07-12 11:31:54 +0000 libclang_rt: Simplify the arm check We just need to check we are building for arm. Reviewed by: manu, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45644 --- lib/libclang_rt/compiler-rt-vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libclang_rt/compiler-rt-vars.mk b/lib/libclang_rt/compiler-rt-vars.mk index 5a9f115697d9..c4a33309bc89 100644 --- a/lib/libclang_rt/compiler-rt-vars.mk +++ b/lib/libclang_rt/compiler-rt-vars.mk @@ -5,7 +5,7 @@ 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. -.if ${MACHINE_ARCH:Marmv[67]*} != "" && \ +.if ${MACHINE_CPUARCH} == "arm" && \ (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") CRTARCH?= armhf .else