Date: Thu, 9 Mar 2023 09:49:29 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2f784ffe3b4c - main - devel/llvm16: fix patching on powerpc64 Message-ID: <202303090949.3299nTMd056650@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f784ffe3b4c6f884d85d5ef2c9401f63213667c commit 2f784ffe3b4c6f884d85d5ef2c9401f63213667c Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2023-03-09 09:49:02 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2023-03-09 09:49:02 +0000 devel/llvm16: fix patching on powerpc64 Remove the upstreamed patch. --- devel/llvm16/Makefile | 4 ---- .../files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 70161bda7030..76af24c50068 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -226,10 +226,6 @@ MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP .include <bsd.port.options.mk> -.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp -.endif - # keep in sync with /usr/src/lib/clang/clang.build.mk # ----------- start of sync block ------------------ # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it. diff --git a/devel/llvm16/files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp b/devel/llvm16/files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp deleted file mode 100644 index 37304e59f444..000000000000 --- a/devel/llvm16/files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- clang/lib/Driver/ToolChains/Clang.cpp.orig 2021-08-11 19:51:00.122735000 +0200 -+++ clang/lib/Driver/ToolChains/Clang.cpp 2021-08-11 19:51:24.346107000 +0200 -@@ -1921,8 +1921,7 @@ - if (T.isOSBinFormatELF()) { - switch (getToolChain().getArch()) { - case llvm::Triple::ppc64: { -- if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) || -- T.isOSOpenBSD() || T.isMusl()) -+ if (T.isOSFreeBSD() || T.isOSOpenBSD() || T.isMusl()) - ABIName = "elfv2"; - else - ABIName = "elfv1";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303090949.3299nTMd056650>