From nobody Thu Sep 29 22:48:49 2022 X-Original-To: dev-commits-ports-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 4MdpSL1P1yz4YMp9; Thu, 29 Sep 2022 22:48:50 +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 4MdpSL0wW0z3Tnr; Thu, 29 Sep 2022 22:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664491730; 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=fwucXmGapRPCxdkTV+6S73o8JF+sN6busvf44hM8NR4=; b=xkmOIyeW0obBegvo8TB9lq9Lr1Cf5qrCPUluC1d9QwN6wg5xKNhio2BihpicXn/4agczIx AWdrS704zbWZTnJYH2GoWib5UZfZqmUMDGFsBNo3iNtib3OynNHRT+ZL9Qiwx6MQDbXMEV xnYBDWfpgXIg49q+hww/nJ9hnj1110k+QUcbQbP9aScvsZNcvVAh90N1pT94fsuhKsxzP3 5NgB7FTrBNm69BDzcS025p9Q+WRjjq+FN1w2/q5qvlt7Sh5/iLnJqZMVr+fAjjbTev3xoS fnVwMG8IqSLr459rc/+H2soAbz9GUcotYtfHFaVKvXAn8BkgHe1bFl1cZMGvrw== 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 4MdpSL024jzyJY; Thu, 29 Sep 2022 22:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28TMmnuI052243; Thu, 29 Sep 2022 22:48:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TMmnFa052242; Thu, 29 Sep 2022 22:48:49 GMT (envelope-from git) Date: Thu, 29 Sep 2022 22:48:49 GMT Message-Id: <202209292248.28TMmnFa052242@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: bf050595e31d - main - devel/llvm-devel: deduplicate information (NFC) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf050595e31dcb6c8cb7292ac5ad875b5839cc02 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664491730; 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=fwucXmGapRPCxdkTV+6S73o8JF+sN6busvf44hM8NR4=; b=LwNuaBfdJFtqNElnib16GpEbHOBOwKABTb78fsqepR5dH4duUFDibRfnzJdjdgyc6id8e2 7fI85/QjhFGEQLPyzf/TrCDcUhLLOYDKsWjGER5ahb8jYXriUAAzb5X7Gs+0bxHqNTsIGS iUMt5ZJDh8WREjUi6Yk0Bjl+1HCmrtNomldKVw7B/uwJXJxPRyk50T92KbPAYcOnmeLrCU OAO+FmkYq4kM9JxGOTrW+ZkhbhRXid7w2XooJbCiV9o563Xvcd7KLgzLsPak/71iYeDcD3 0QHxo/ycIE03zNXLPw+rsZ8YorGuMaIoh03WntxTGW/GoyyCyA89YwnU/Z9oQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664491730; a=rsa-sha256; cv=none; b=rjiDcBW+ZoF7YrokdlO1sOH8lp1xgWipq+5S0cWtxcxIdfxUN7+bXEEiGKN3otyqMuooaC Q8OGhagLQVrd9nBWJ6J3Z0m5Oh58glsjAUrB6mKgcQVf3Ko9AHDIBKrjuLDlKP3knqSCec 7HiitEmz5rUFkOb9cV8cGPWYQF1xMuw+QRwYCFj7z8bnt9JIvJf7obr/zt3AL+MPW8eNZx xrsXc7xW+gnVKgR5EVtdibHlVby79x0FHyEIgAhieJxMl4OvND6gcdOsEX4IjzikqKP+9B wmbypQkEiKbcgITmXjyhCHL1zwC9T+37RwHya8f1FZ8GaTt1+Fbxa2RCvjSt4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf050595e31dcb6c8cb7292ac5ad875b5839cc02 commit bf050595e31dcb6c8cb7292ac5ad875b5839cc02 Author: Brooks Davis AuthorDate: 2022-09-29 22:48:41 +0000 Commit: Brooks Davis CommitDate: 2022-09-29 22:48:41 +0000 devel/llvm-devel: deduplicate information (NFC) In COMPILER_RT, key the existance of _ignorelist.txt files on libclang_rt..a in the set of installed runtimes. This avoids needing to maintain per-architecture list of ignore lists. --- devel/llvm-devel/Makefile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 0058f2713183..624c4fb862aa 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -301,21 +301,13 @@ STRIP= .if ${ARCH} == "aarch64" COMPILER_RT_ARCHS= aarch64 -COMPILER_RT_IGNORELISTS= asan_ignorelist.txt -COMPILER_RT_IGNORELISTS+= cfi_ignorelist.txt -COMPILER_RT_IGNORELISTS+= msan_ignorelist.txt .elif ${ARCH} == "amd64" COMPILER_RT_ARCHS= x86_64 -COMPILER_RT_IGNORELISTS= asan_ignorelist.txt -COMPILER_RT_IGNORELISTS+= cfi_ignorelist.txt -COMPILER_RT_IGNORELISTS+= msan_ignorelist.txt .if exists(/usr/lib32/libc.so.7) COMPILER_RT_ARCHS+= i386 .endif .elif ${ARCH} == "i386" COMPILER_RT_ARCHS= i386 -COMPILER_RT_IGNORELISTS= asan_ignorelist.txt -COMPILER_RT_IGNORELISTS+= cfi_ignorelist.txt .elif ${ARCH} == "powerpc" COMPILER_RT_ARCHS= powerpc .elif ${ARCH} == "powerpc64" @@ -323,15 +315,10 @@ COMPILER_RT_ARCHS= powerpc64 .if exists(/usr/lib32/libc.so.7) COMPILER_RT_ARCHS+= powerpc .endif -COMPILER_RT_IGNORELISTS= asan_ignorelist.txt -COMPILER_RT_IGNORELISTS+= msan_ignorelist.txt .elif ${ARCH} == "powerpc64le" COMPILER_RT_ARCHS= powerpc64le -COMPILER_RT_IGNORELISTS= asan_ignorelist.txt -COMPILER_RT_IGNORELISTS+= msan_ignorelist.txt .elif ${ARCH} == "riscv64" COMPILER_RT_ARCHS= riscv64 -COMPILER_RT_IGNORELISTS= asan_ignorelist.txt .endif _CRTBASEDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE} @@ -345,6 +332,15 @@ _COMPILER_RT_LIBS= _COMPILER_RT_LIBS:= ${_COMPILER_RT_LIBS} ${COMPILER_RT_LIBS_${CRT_ARCH}:S|^|${_CRTLIBDIR}/${CRT_ARCH}-portbld-${OPSYS:tl}${OSREL}/|} .endfor +COMPILER_RT_IGNORELISTS= +.for RT in asan cfi msan +.if ${_COMPILER_RT_LIBS:M*/libclang_rt.${RT}.a} +COMPILER_RT_IGNORELISTS:= ${COMPILER_RT_IGNORELISTS} ${RT}_ignorelist.txt +.endif +.endfor +# Strip empty element +COMPILER_RT_IGNORELISTS:=${COMPILER_RT_IGNORELISTS:N^$$} + # Comment out plist entries for unsupported options. .for opt in ${_ALL_OPTIONS} .if !${OPTIONS_DEFINE:M${opt}}