From nobody Mon Jan 01 16:42:40 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 4T3hc10W1zz573ng; Mon, 1 Jan 2024 16:42:41 +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 4T3hc075lfz3DWg; Mon, 1 Jan 2024 16:42:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704127361; 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=NuOjcMQHStxPdHpm47Jo9jEDJvbeKnTlc+cPpqMZXUI=; b=m6kh58NKlTZN0XET8k3PLM4Kx4++FzmNwKJ4ws+2/VC2iw2RAiRIQRfTflNH/mv9HkN2ux Wf5H/pzn9aqZRHCcQMeMpoGi8e0onpzfES48En5P1k9ZSLjV5DdYfP6XaXCwZgcOjTZosp Dahn2V14h2ABPbYX4+wN76DpFV59nG7F8e5zzXMYOd1lNzBvB0DTKgD6efddJe3PoL+UeL LSkTL5/FDfaCxJvT8sB/ClX8fOQJmrTbtFEp9kP0bsFFYuYntdinr+lgX6c1z44IMnRUI6 FIg2DaKQRcNeqI/yWjZNXkWhuaICnhAhF6EjID7LLE60nD2fh44bawN+boTKMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704127361; a=rsa-sha256; cv=none; b=QwyIUfm1xTsNCzJCksvVrygOBJrSPKbWhX+Ivg9mh4qQaTChIzRXVR3YtlCzQwsx1RNK7l OBRxoTsPqk/p1Xe3Z6tUxfEIzn/L4Lldn/QwmKtZ+Jj533lts6mkVjjZ4Xzt7l4lOFkt/e CdwXoLm1PCGIS5vzODuq47dcIkgHsZnUs8dae07Niqebwx0Wv5uYXJZTJ38nrKD52bBgIa 6GnGNamLPmDrX6fVauQuBOxh9El9WWE5JCIuBOhW6Osb2M2xAACpBHMnxnmOeS9KqrJWQE m0j2w2epJ0KMbdw0E6KC2HoLYID4KYMJ+/I/lFTdgwNHBwFsunzIs95muT5Kew== 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=1704127361; 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=NuOjcMQHStxPdHpm47Jo9jEDJvbeKnTlc+cPpqMZXUI=; b=qF4Yws1zHPnANH4zkFWpcyqj9dUHIf0TZtBZSTtGmIcqJ9o8P4gJKoPLLxXCqjywKqrtAp X9Nvv4erTgK80gEG1wbuPMmmQBCaY9gwj3exr1+A1V3HA9yj0X70jlgJXnsx2k7WGP8RTM WdjwFDIOAU9J22HfvCD5C/3AO3tkDyFbQq6lktC7zMq/i5aZVGN6ElEa81qrzAOYlQyLDf 7Nthp73bg4jxWIvLg7KWpAoT7lxPXhuEk2E2e+Db0HMnarnfAHZDETdn0WR4gu8nC6NcYT LOryXtXmEn6M3fPBq1p8VyHvyxokznvOaiiyMfNTG0CAbZiyexjymbZLtlcq/A== 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 4T3hc068HJz9sT; Mon, 1 Jan 2024 16:42:40 +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 401Gge0t089305; Mon, 1 Jan 2024 16:42:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 401Gges9089302; Mon, 1 Jan 2024 16:42:40 GMT (envelope-from git) Date: Mon, 1 Jan 2024 16:42:40 GMT Message-Id: <202401011642.401Gges9089302@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: 8334205c84cf - stable/14 - Reorganize libclang_rt Makefile and make more lib/arch combos available 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: 8334205c84cf8fb2006cc9dc9fdeecaa855242b3 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8334205c84cf8fb2006cc9dc9fdeecaa855242b3 commit 8334205c84cf8fb2006cc9dc9fdeecaa855242b3 Author: Dimitry Andric AuthorDate: 2023-12-28 12:57:41 +0000 Commit: Dimitry Andric CommitDate: 2024-01-01 16:34:04 +0000 Reorganize libclang_rt Makefile and make more lib/arch combos available Upstream has made more clang runtime libraries available for more architectures, so add them. To make this easier, split up subdir lists into functional parts (asan, tsan, etc), and put each architecture into its own .if block. Effectively, this adds the following libraries for aarch64: asan, cfi, fuzzer, msan, safestack, stats, tsan, ubsan, xray. PR: 262706 MFC after: 3 days (cherry picked from commit e77a1bb2757471ab3fed0750b76eeb15d0c7b10a) --- lib/libclang_rt/Makefile | 162 ++++++++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 71 deletions(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 40fd7dfab8fb..46f7fdf814be 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -1,75 +1,95 @@ -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -SUBDIR+= include -SUBDIR+= asan -SUBDIR+= asan-preinit -SUBDIR+= asan_cxx -SUBDIR+= asan_dynamic -SUBDIR+= asan_static -SUBDIR+= cfi -SUBDIR+= cfi_diag -SUBDIR+= safestack -SUBDIR+= stats -SUBDIR+= stats_client -SUBDIR+= ubsan_minimal -SUBDIR+= ubsan_standalone -SUBDIR+= ubsan_standalone_cxx -.endif # amd64 || i386 - -.if ${MACHINE_CPUARCH} == "amd64" -SUBDIR+= dd -SUBDIR+= fuzzer -SUBDIR+= fuzzer_interceptors -SUBDIR+= fuzzer_no_main -SUBDIR+= msan -SUBDIR+= msan_cxx -SUBDIR+= tsan -SUBDIR+= tsan_cxx -SUBDIR+= xray -SUBDIR+= xray-basic -SUBDIR+= xray-fdr -SUBDIR+= xray-profiling -.endif # amd64 - -.if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le" -SUBDIR+= include -SUBDIR+= asan -SUBDIR+= asan-preinit -SUBDIR+= asan_cxx -SUBDIR+= asan_dynamic -SUBDIR+= asan_static -SUBDIR+= msan -SUBDIR+= msan_cxx -SUBDIR+= stats -SUBDIR+= stats_client -SUBDIR+= tsan -SUBDIR+= tsan_cxx -SUBDIR+= ubsan_minimal -SUBDIR+= ubsan_standalone -SUBDIR+= ubsan_standalone_cxx -.endif # powerpc64 || powerpc64le - -.if ${MACHINE_ARCH} == "powerpc64le" -SUBDIR+= xray -SUBDIR+= xray-basic -SUBDIR+= xray-fdr -SUBDIR+= xray-profiling -.endif # powerpc64le - -.if ${MACHINE_CPUARCH} == "riscv" -SUBDIR+= include -SUBDIR+= asan -SUBDIR+= asan-preinit -SUBDIR+= asan_cxx -SUBDIR+= asan_dynamic -SUBDIR+= stats -SUBDIR+= stats_client -SUBDIR+= ubsan_minimal -SUBDIR+= ubsan_standalone -SUBDIR+= ubsan_standalone_cxx -.endif # riscv - -SUBDIR+= profile +SD_ASAN+= asan +SD_ASAN+= asan-preinit +SD_ASAN+= asan_cxx +SD_ASAN+= asan_dynamic +SD_ASAN+= asan_static + +SD_CFI+= cfi +SD_CFI+= cfi_diag + +SD_DD+= dd + +SD_FUZZER+= fuzzer +SD_FUZZER+= fuzzer_interceptors +SD_FUZZER+= fuzzer_no_main + +SD_INCLUDE+= include + +SD_MSAN+= msan +SD_MSAN+= msan_cxx + +SD_PROFILE+= profile + +SD_SAFESTACK+= safestack + +SD_STATS+= stats +SD_STATS+= stats_client + +SD_TSAN+= tsan +SD_TSAN+= tsan_cxx + +SD_UBSAN+= ubsan_minimal +SD_UBSAN+= ubsan_standalone +SD_UBSAN+= ubsan_standalone_cxx + +SD_XRAY+= xray +SD_XRAY+= xray-basic +SD_XRAY+= xray-fdr +SD_XRAY+= xray-profiling + +.if ${MACHINE_CPUARCH} == "aarch64" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_CFI} +SUBDIR+= ${SD_FUZZER} +SUBDIR+= ${SD_MSAN} +SUBDIR+= ${SD_SAFESTACK} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_TSAN} +SUBDIR+= ${SD_UBSAN} +SUBDIR+= ${SD_XRAY} +.elif ${MACHINE_CPUARCH} == "amd64" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_CFI} +SUBDIR+= ${SD_DD} +SUBDIR+= ${SD_FUZZER} +SUBDIR+= ${SD_MSAN} +SUBDIR+= ${SD_SAFESTACK} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_TSAN} +SUBDIR+= ${SD_UBSAN} +SUBDIR+= ${SD_XRAY} +.elif ${MACHINE_CPUARCH} == "arm" +# nothing for 32-bit arm +.elif ${MACHINE_CPUARCH} == "i386" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_CFI} +SUBDIR+= ${SD_SAFESTACK} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_UBSAN} +.elif ${MACHINE_CPUARCH} == "powerpc" +# nothing for 32-bit powerpc +.elif ${MACHINE_ARCH} == "powerpc64" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_MSAN} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_TSAN} +SUBDIR+= ${SD_UBSAN} +.elif ${MACHINE_ARCH} == "powerpc64le" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_MSAN} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_TSAN} +SUBDIR+= ${SD_UBSAN} +SUBDIR+= ${SD_XRAY} +.elif ${MACHINE_CPUARCH} == "riscv" +SUBDIR+= ${SD_ASAN} +SUBDIR+= ${SD_STATS} +SUBDIR+= ${SD_UBSAN} +.endif + +SUBDIR+= ${SD_INCLUDE} +SUBDIR+= ${SD_PROFILE} SUBDIR_PARALLEL=