From nobody Sun Mar 24 00:43:20 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 4V2HNm1WyLz5GDM5; Sun, 24 Mar 2024 00:43: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 4V2HNm10M7z4gYt; Sun, 24 Mar 2024 00:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711241000; 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=3KpOGSpsmZsa9WSXEEoJ2l3kvD/UIF+ZhhEg9cCFI80=; b=H1FXEdnqHz3l1a1SX1WdmN57mNGaJ/mOokx1lBuj7p88W0jAiSW6gc0JOBnMnYT2137ktJ NR6plTqHnXyFmZ5v4ortkjVpryBTHGEeybw36Xi/b46EGwpdVXB+5c7xV25rhnzyDTKLcS OgU7diyuGopaU0fRkaVw38hnLt6QU9TGG9Yspsu3R1WE8h+VkRAH7s+x57coKSer8bXSKz YkU7yMEFzhy3y6d8dCx29FMbY4sipMbzTRxrDnDtPoTE11ycZtEBssglyLaDubmssNP0TW vkyKiqJGGLJgb2EW+H+U+V1e+jP2rUKF2lKEP2M4LVGVzYU6FZbRBtIHVLb69g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711241000; a=rsa-sha256; cv=none; b=cE2+J9bkMDA792S5CgwXC2C37J9n0JAK6biBM1A5PgGiEYN9Vhd2RBpQv0CYCrRt7VhhMx IWwRXpo/nfnDcowlaVKEEOxKzVl+M6YFP/xb1DlC4DOZC+XiLmrUd4SiABvmXy6sQkbUoA QmaoBwKKq5j6Wps2KBUACz8+SEuL6cG3VYRdIWx/qvJa9I2EuUhjvyUpF3ICvHA1S9aWA6 DhTm7gRODKvnaUMn0Q2Gxp216fjoGMc2gl1r1a4eUMkZHOly1fv5VFMl+BVBMyhHP+p0BB OjnvoIA+GTKq5mjN2MfwUIAc88D7UL9FYViR5ND5l2f43jZhb/P538Ohyqs1rQ== 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=1711241000; 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=3KpOGSpsmZsa9WSXEEoJ2l3kvD/UIF+ZhhEg9cCFI80=; b=gPOEH4V+5m6AYjUg+wQNKb+CVHW+cZX4xJ60CEQhIlAZ204GIEKTwkgdzKrqaLeK0bXuQJ cADDBmIvzgE2SlPdOburET8ZdLlhMJt/FoZePpgcf/ee9OT79UU2GrJG07SQKHn/1g4lx6 18sdsvY6BsEj5pD88N/1ohOPl0mCbFsG+G6t7tI0fL5qb7xzvjOChnsdtqtQe2tGpNTC0H p1TXLEcDPYfw06EQ40CRCbHextTPQGR4C0IxwmNOPh9Ps0PdxI71XWjRX5CpY7zaSJLogU tM+syAqpxAl+sVgwVd/O7/QQh2VbZQtz3Y+eNhT437/3jqqnBIcPpk0zaO7j6Q== 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 4V2HNm0cSHz19C1; Sun, 24 Mar 2024 00:43: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 42O0hK58000285; Sun, 24 Mar 2024 00:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0hKgD000282; Sun, 24 Mar 2024 00:43:20 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:43:20 GMT Message-Id: <202403240043.42O0hKgD000282@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: 5c588a23c96b - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5c588a23c96b88327f87bb8ef6c795c442d56c2a Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5c588a23c96b88327f87bb8ef6c795c442d56c2a commit 5c588a23c96b88327f87bb8ef6c795c442d56c2a Author: Dimitry Andric AuthorDate: 2024-03-21 20:44:46 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:37:29 +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 (cherry picked from commit 897a485c34464a44b768f13127d94137229eb83d) --- 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}