From nobody Sun Mar 24 00:40:14 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 4V2HKC1Sn9z5GD4S; Sun, 24 Mar 2024 00:40:15 +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 4V2HKC0lW9z4fCq; Sun, 24 Mar 2024 00:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240815; 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=dnMi3TS/5njDKa/+vfwJjrfBrND/gSic41YGUFe9N4A=; b=c44kKmq2piX6xRJg7ztPvI6M2LxQKW2o/V+2fqTFllsH+W1HEL6X5Ca2Uj6Dz+9SwJVgte 9pgJ8mKny73IraaSQbXrch/SOEE4JoDJSP4k+UAf5EaJLtjxMTAIsBnNV07F2X4Mq5Mj8s RxNvWBd5JRMxLYSdM/q1h0aLzIDaXUfa1FuzZiaGxhEyQi9h4DLCgYKoKVY/L+3HxjEusP m2/CO2y90w3Cqmoy0VK/XlGiUycVDp1GfGs8o8h2RNXyy0jZNaUDe3ISb3h/6ZG35l5EVu aZp65O4feANo0bkINzj9nnZydNaXj6fVXo7JtalW2toLukfkMFp7TcKRYUlTPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711240815; a=rsa-sha256; cv=none; b=cgBd/DZXkTkFDEH2CaSXg9Pzy7JMbCxpO3PHTVFnpMaqlIzOLTVW/un6ur36cmYb8AODlH 6HsP985lB1Ny+VJyMkBhrARoj1fc6dZMU9ujAKo+dKB6QZWFa6jKkZ8e8d4eirhtuK5edS mi1uufY/cp7I2Tcajt8wZdouBziuqzYEQq9Ozm2r69DEWSSZGuyoyuBRpPQVDk5bnoTyB8 g3sXArCluTayoE16EA8z63Al5jHa1k3haEvieZAA1tBxkrmDuXOgYNTyruGUKnl+7YzGps EdZWLlRi4aMLpRT+UqnPh0dzw/g74wtCzkhR/08DWWv6XZ573MW54r/OAYOwpg== 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=1711240815; 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=dnMi3TS/5njDKa/+vfwJjrfBrND/gSic41YGUFe9N4A=; b=lZ3IawJFrWnEAHoDrWqzpZZXBh//5wvYopiw6DtGWQ1zx+VDStWliUjz/Kz7y/iMyf7q9Z rPD0PeuUiuvMg8n7VuBWw2Q+aDvu8bJX8u6nH2d2fneRiZK45lpfAZ0mJQ7/q2SFrBzq9C 6rd7ADs/Z6antf4RSQSo2LgarytT486YqwJN0YpqOMuusYk7CbsllRwwyx0qNjtFwL5wAs ytSWXl5lQ9o+aIpzsfECumc1P6jAI6tO14uzbcjkOHqAjgycOeN6GZHNdnfrcsj5oxhFne nKzdoqN23PnlBt+/RYFADxiomfne0G1MbcktdtGpIfqY+Ux0+mayBXCCIBmPeA== 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 4V2HKC0MpWz19TR; Sun, 24 Mar 2024 00:40:15 +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 42O0eEex090986; Sun, 24 Mar 2024 00:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0eEjB090975; Sun, 24 Mar 2024 00:40:14 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:40:14 GMT Message-Id: <202403240040.42O0eEjB090975@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: 35a61f4a25ac - stable/14 - Slightly reorganize libclang_rt Makefile again 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/14 X-Git-Reftype: branch X-Git-Commit: 35a61f4a25ac5301b83d2c4835081d60de5b8b1e Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=35a61f4a25ac5301b83d2c4835081d60de5b8b1e commit 35a61f4a25ac5301b83d2c4835081d60de5b8b1e Author: Dimitry Andric AuthorDate: 2024-03-21 20:44:46 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:36:26 +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}