From nobody Thu Mar 21 20:45:19 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 4V0yC36QMBz5FTSh; Thu, 21 Mar 2024 20:45: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0yC35qFQz4Zh0; Thu, 21 Mar 2024 20:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711053919; 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=a3QF5kg/YxQoBs6qzMxbcSv9cCCbU6AHHbwre8tDfrs=; b=Xoj+Skpmb10EA0ZJlJeReXOikUbZsbw+3hfE3tC32K2A5yi7by0nn78NE/rtKlIboMxflK uYS2/ipQGF1YgJJYNvtD/zQIeI3uMx/khPTM6U9n1j80S1yNyA4lsUdpushiAdOKr0scJf PO/icBowjoTHzHp7mlA9sXb/tfniJLmh5vJqR/dIb2aOJjA9TlQjdvXrkvSeX29claCYdS U/dxqDN5EaXfWpGU6mS+qGjQXkKal9Ml5pshnZAlyn+zt1+paIxQ85klrHiF5D3Dn3qElp 6KRFOgcYH6Wl8hfy/h9YxSt9e7jApWvZw2Iwlcmp0R7vQdApmz8wR3sB41Zcbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711053919; a=rsa-sha256; cv=none; b=vVbkiwDhTCChcW7h4U1RHJeK3oZ7E1Sya0h6wVngmYJb0dp66+Yj+EtqsY7KANfOnX+CwI 10QU5AZwYuOIxNK3A86EVYZSXqcwcFcBCIpVcXJgjm00Dpl2bLzqYW47ubtJ6iOGzEcjxA uZLdXJ/BdwsqwPiPAmFzmX0UpGNDvjIxyEosNOXPWqaXDLNk26BFG1mryzD3AQuQanliFj ZxLOK4T5dCY6MlNN+2kbtM9YGyKR1Q8Uih6zlCNUuJqkTZm/vXuzmgvQgFm6F2oEXzNcmM PlzVenZVPwwm9s9ULs0GxxVVL1qk6iE9tDJzQK9zO8AQ3Mc9jBMpxQ8oywMqrA== 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=1711053919; 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=a3QF5kg/YxQoBs6qzMxbcSv9cCCbU6AHHbwre8tDfrs=; b=m2Of2Wgw1Ay7cX/QVERT7CtBXlS4K7ELViGOdTbBlT3kGfA4fdGmx/BDOtVtna+EuyH1At IrPKJM8j1ieBmV84VZ+76ZE8z7pQY0e58kOMG1y6a1YCQZlX5POlgjeRTfbGIC1HnssG/r UuVR/IjIp/HG9G9XaxTiSMKPbsihg2WdyQqte2A66qr2wSHYMHDkVk+jH+fgsOSWZQP5I/ rD8LFwDLK83DU4F+avnh5WIiJkUJYUc0cKiPyJ96GxgF7Lqzrd/NLm3PYiEzjmv1j6d1wB emq7RDVpwz/nObKVMaMElOccO5lfE4Axv8zm6v50Nv32yX00nJDGj3V733h1Ew== 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 4V0yC35JFzzqrd; Thu, 21 Mar 2024 20:45:19 +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 42LKjJMT097693; Thu, 21 Mar 2024 20:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LKjJp5097690; Thu, 21 Mar 2024 20:45:19 GMT (envelope-from git) Date: Thu, 21 Mar 2024 20:45:19 GMT Message-Id: <202403212045.42LKjJp5097690@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: 897a485c3446 - main - Slightly reorganize libclang_rt Makefile again 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/main X-Git-Reftype: branch X-Git-Commit: 897a485c34464a44b768f13127d94137229eb83d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=897a485c34464a44b768f13127d94137229eb83d commit 897a485c34464a44b768f13127d94137229eb83d Author: Dimitry Andric AuthorDate: 2024-03-21 20:44:46 +0000 Commit: Dimitry Andric CommitDate: 2024-03-21 20:44:46 +0000 Slightly reorganize libclang_rt Makefile again Make a separate .elif section for MACHINE_ARCH==powerpc, and subdivide the MACHINE_CPUARCH values under it. If at some point more sanitizer libraries become available for powerpc CPU architectures, they can be added before the "nothing for other powerpc yet" case. Similar for the MACHINE_ARCH==arm case. PR: 262706 Fixes: e77a1bb27574 MFC after: 3 days --- lib/libclang_rt/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 984da3f34156..79ccd288a845 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -60,28 +60,30 @@ SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} .elif ${MACHINE_CPUARCH} == "arm" -# nothing for 32-bit arm +# nothing for 32-bit arm yet .elif ${MACHINE_CPUARCH} == "i386" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc" -# nothing for 32-bit powerpc -.elif ${MACHINE_ARCH} == "powerpc64" +.elif ${MACHINE_CPUARCH} == "powerpc" +. if ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc64le" +. elif ${MACHINE_ARCH} == "powerpc64le" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} +. else +# nothing for other powerpc yet +. endif .elif ${MACHINE_CPUARCH} == "riscv" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_STATS}