From nobody Wed Nov 22 16:38:40 2023 X-Original-To: dev-commits-ports-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 4Sb6Ps0Q71z52FKy; Wed, 22 Nov 2023 16:38: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 4Sb6Pr75n6z3Jxd; Wed, 22 Nov 2023 16:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700671121; 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=3LwECeet6+VyqCGlLvR/qNqLsh822378vRjzYMxbAPw=; b=SB3oNg6INLTb2DAz5koSgiiZzQS67SMfgR6qHLnAZFXeaGGIEkxIc9O1XqmDu7mVg6frH0 NvKes9mjGtmwp6/to7N3c/ZADhlwxlZ/yyVjKrqi9Nd0CZxOuleYWrSECIwuHaU7yBb73Q +kY6iV7ybIZGNdHj4X+kiGDW/pNbijALCbyVAzQi24tbx+leiIdnROU1/1PeBhhpYdoICr vRndrWt2LYUA8GQWJ7C2K3wed6Yjmokp3clGKl/Oa7ydUKWMKPgH719PP841XJvfgtYMjM lJzoA8SZWk/5GGRb1aMSYZCYYevJ8s1IsAjeZZXoG6AMST9C/a1tg57Q8FinfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700671121; 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=3LwECeet6+VyqCGlLvR/qNqLsh822378vRjzYMxbAPw=; b=o0dgfOkryGlH3RksGvvCcTULUy281QYvBlo5QCZzEoMx5eHJLRCfOFkDNPghQdNduUBV8+ FFdXiztAeHm1iiN4JRnU89jLfuIVryA3doTI0sz1SFPS/sOtxZvAbiNWO3IwGgM7vb5sgs nXqJmUHV1VoDJaYqsMLoPOpTEH7bXJ24/XgyVzENhl7jlQHrhnfaP7YZYYG/yyRLRqUvqQ Bs38wGQkq152SdFVmCOv5iVzjanlzeAUVd6qC+IVS+ndaRFiM13YR6OGFQ5w2FdV8Jc1HO 5EHHV1MiU4XgFzBGKgvgSfl9m9NIgBrkSyQLFegRjTubgc7VfyPkhDCVbe8RCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700671121; a=rsa-sha256; cv=none; b=Xh7gNAoNTffIJYksMeDEd6dvYBd9Rif/7UIe9jj6Mp2rtkM3hGJoSZ+hwBqmNlD9fJT8EK 5NJI4FOoDuAEVsGUJC1cv842gJmbdIrBMRQ+QrYVV95wMk9PqIueNy/qXpxM0JZ7PATrkQ urtlj2LZfG3tu3t41HaS9gwjyqMI3u5Ce6khmhT4aT6qxcVtfY+VTkDWk0jH0dTTduWHgA OfZQ2S1gzCloDw+j4gNLbtYG1H6XE0WsrHicLK8gFRIJfMOMm94aVR0g6+FzPSnEWcZ3he yAF1Ot2Hpd8qWO3bVqEaZlVaZQ4NjU/l5b4+rznVf/ZTLvZOe3r/Dq/ccBXekA== 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 4Sb6Pr651xz9fl; Wed, 22 Nov 2023 16:38: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 3AMGceYS051945; Wed, 22 Nov 2023 16:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AMGcehB051942; Wed, 22 Nov 2023 16:38:40 GMT (envelope-from git) Date: Wed, 22 Nov 2023 16:38:40 GMT Message-Id: <202311221638.3AMGcehB051942@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 3966e6733b0b - main - lang/rust: Garbage collect powerpc patches List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3966e6733b0b54a503a6c14574dfbeffb7bdeabd Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3966e6733b0b54a503a6c14574dfbeffb7bdeabd commit 3966e6733b0b54a503a6c14574dfbeffb7bdeabd Author: Mikael Urankar AuthorDate: 2023-11-22 16:37:00 +0000 Commit: Piotr Kubaj CommitDate: 2023-11-22 16:38:26 +0000 lang/rust: Garbage collect powerpc patches PR: 273753 --- ...project_llvm_lib_Driver_ToolChains_Arch_PPC.cpp | 12 ---------- ...roject_llvm_lib_Target_PowerPC_PPCSubtarget.cpp | 13 ----------- ...c__target_src_spec_powerpc__unknown__freebsd.rs | 27 ---------------------- 3 files changed, 52 deletions(-) diff --git a/lang/rust/files/powerpc/patch-src_llvm__project_llvm_lib_Driver_ToolChains_Arch_PPC.cpp b/lang/rust/files/powerpc/patch-src_llvm__project_llvm_lib_Driver_ToolChains_Arch_PPC.cpp deleted file mode 100644 index 1792812b212d..000000000000 --- a/lang/rust/files/powerpc/patch-src_llvm__project_llvm_lib_Driver_ToolChains_Arch_PPC.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/llvm-project/clang/lib/Driver/ToolChains/Arch/PPC.cpp.orig 2021-04-27 07:29:31.811399000 -0500 -+++ src/llvm-project/clang/lib/Driver/ToolChains/Arch/PPC.cpp 2021-04-27 07:40:14.185257000 -0500 -@@ -126,7 +126,8 @@ ppc::ReadGOTPtrMode ppc::getPPCReadGOTPtrMode(const Dr - const ArgList &Args) { - if (Args.getLastArg(options::OPT_msecure_plt)) - return ppc::ReadGOTPtrMode::SecurePlt; -- if ((Triple.isOSFreeBSD() && Triple.getOSMajorVersion() >= 13) || -+ if ((Triple.isOSFreeBSD() && -+ (Triple.getOSMajorVersion() == 0 || Triple.getOSMajorVersion() >= 13)) || - Triple.isOSNetBSD() || Triple.isOSOpenBSD() || Triple.isMusl()) - return ppc::ReadGOTPtrMode::SecurePlt; - else diff --git a/lang/rust/files/powerpc/patch-src_llvm__project_llvm_lib_Target_PowerPC_PPCSubtarget.cpp b/lang/rust/files/powerpc/patch-src_llvm__project_llvm_lib_Target_PowerPC_PPCSubtarget.cpp deleted file mode 100644 index 363094b72fae..000000000000 --- a/lang/rust/files/powerpc/patch-src_llvm__project_llvm_lib_Target_PowerPC_PPCSubtarget.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/llvm-project/llvm/lib/Target/PowerPC/PPCSubtarget.cpp.orig 2021-04-27 07:17:18.744914000 -0500 -+++ src/llvm-project/llvm/lib/Target/PowerPC/PPCSubtarget.cpp 2021-04-27 07:25:23.450714000 -0500 -@@ -151,7 +151,9 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU - if (IsPPC64 && has64BitSupport()) - Use64BitRegs = true; - -- if ((TargetTriple.isOSFreeBSD() && TargetTriple.getOSMajorVersion() >= 13) || -+ if ((TargetTriple.isOSFreeBSD() && -+ (TargetTriple.getOSMajorVersion() == 0 || -+ TargetTriple.getOSMajorVersion() >= 13)) || - TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() || - TargetTriple.isMusl()) - SecurePlt = true; diff --git a/lang/rust/files/powerpc/patch-vendor_rustc__ap__rustc__target_src_spec_powerpc__unknown__freebsd.rs b/lang/rust/files/powerpc/patch-vendor_rustc__ap__rustc__target_src_spec_powerpc__unknown__freebsd.rs deleted file mode 100644 index cdaaef7f84f6..000000000000 --- a/lang/rust/files/powerpc/patch-vendor_rustc__ap__rustc__target_src_spec_powerpc__unknown__freebsd.rs +++ /dev/null @@ -1,27 +0,0 @@ ---- /dev/null 2021-04-24 17:00:30.889028000 -0500 -+++ vendor/rustc-ap-rustc_target/src/spec/powerpc_unknown_freebsd.rs 2021-04-24 17:00:25.903298000 -0500 -@@ -0,0 +1,24 @@ -+use crate::abi::Endian; -+use crate::spec::{LinkerFlavor, RelocModel, Target, TargetOptions}; -+ -+pub fn target() -> Target { -+ let mut base = super::freebsd_base::opts(); -+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".to_string()); -+ // Extra hint to linker that we are generating secure-PLT code. -+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("--target=powerpc-unknown-freebsd13.0".to_string()); -+ base.max_atomic_width = Some(32); -+ -+ Target { -+ llvm_target: "powerpc-unknown-freebsd13.0".to_string(), -+ pointer_width: 32, -+ data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(), -+ arch: "powerpc".to_string(), -+ options: TargetOptions { -+ endian: Endian::Big, -+ features: "+secure-plt".to_string(), -+ relocation_model: RelocModel::Pic, -+ mcount: "_mcount".to_string(), -+ ..base -+ }, -+ } -+}