diff --git a/0003-Rename-loongarch64_unknown_linux_gnuf64-to-loongarch.patch b/0003-Rename-loongarch64_unknown_linux_gnuf64-to-loongarch.patch new file mode 100644 index 0000000000000000000000000000000000000000..c86424c6ac18762d1a98f9f46891eb969d2116a9 --- /dev/null +++ b/0003-Rename-loongarch64_unknown_linux_gnuf64-to-loongarch.patch @@ -0,0 +1,122 @@ +From 44edf0be5bfd41e4f1250b81cec674a680c44a7c Mon Sep 17 00:00:00 2001 +From: yangxiaojuan +Date: Wed, 8 Feb 2023 10:40:13 +0800 +Subject: [PATCH] Rename loongarch64_unknown_linux_gnuf64 to + loongarch64_unknown_linux_gnu + +--- + ...known_linux_gnuf64.rs => loongarch64_unknown_linux_gnu.rs} | 2 +- + compiler/rustc_target/src/spec/mod.rs | 2 +- + src/doc/rustc/src/platform-support.md | 2 +- + src/test/assembly/asm/loongarch-types.rs | 2 +- + src/test/run-make-fulldeps/atomic-lock-free/Makefile | 2 +- + src/tools/build-manifest/src/main.rs | 4 ++-- + vendor/cc-1.0.69/src/lib.rs | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + rename compiler/rustc_target/src/spec/{loongarch64_unknown_linux_gnuf64.rs => loongarch64_unknown_linux_gnu.rs} (89%) + +diff --git a/compiler/rustc_target/src/spec/loongarch64_unknown_linux_gnuf64.rs b/compiler/rustc_target/src/spec/loongarch64_unknown_linux_gnu.rs +similarity index 89% +rename from compiler/rustc_target/src/spec/loongarch64_unknown_linux_gnuf64.rs +rename to compiler/rustc_target/src/spec/loongarch64_unknown_linux_gnu.rs +index 83114e3e5..1c3e99435 100644 +--- a/compiler/rustc_target/src/spec/loongarch64_unknown_linux_gnuf64.rs ++++ b/compiler/rustc_target/src/spec/loongarch64_unknown_linux_gnu.rs +@@ -2,7 +2,7 @@ use crate::spec::{CodeModel, Target, TargetOptions}; + + pub fn target() -> Target { + Target { +- llvm_target: "loongarch64-unknown-linux-gnuf64".into(), ++ llvm_target: "loongarch64-unknown-linux-gnu".into(), + pointer_width: 64, + data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".into(), + arch: "loongarch64".into(), +diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs +index 772cc4274..0b6125ac4 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -790,7 +790,7 @@ supported_targets! { + ("mips64-unknown-linux-muslabi64", mips64_unknown_linux_muslabi64), + ("mips64el-unknown-linux-muslabi64", mips64el_unknown_linux_muslabi64), + ("hexagon-unknown-linux-musl", hexagon_unknown_linux_musl), +- ("loongarch64-unknown-linux-gnuf64", loongarch64_unknown_linux_gnuf64), ++ ("loongarch64-unknown-linux-gnu", loongarch64_unknown_linux_gnu), + + ("mips-unknown-linux-uclibc", mips_unknown_linux_uclibc), + ("mipsel-unknown-linux-uclibc", mipsel_unknown_linux_uclibc), +diff --git a/src/doc/rustc/src/platform-support.md b/src/doc/rustc/src/platform-support.md +index 3cb8ecaed..b91696268 100644 +--- a/src/doc/rustc/src/platform-support.md ++++ b/src/doc/rustc/src/platform-support.md +@@ -83,7 +83,7 @@ target | notes + `arm-unknown-linux-gnueabi` | ARMv6 Linux (kernel 3.2, glibc 2.17) + `arm-unknown-linux-gnueabihf` | ARMv6 Linux, hardfloat (kernel 3.2, glibc 2.17) + `armv7-unknown-linux-gnueabihf` | ARMv7 Linux, hardfloat (kernel 3.2, glibc 2.17) +-`loongarch64-unknown-linux-gnuf64` | LOONGARCH64 Linux (kernel 4.19, glibc 2.28) ++`loongarch64-unknown-linux-gnu` | LOONGARCH64 Linux (kernel 4.19, glibc 2.28) + `mips-unknown-linux-gnu` | MIPS Linux (kernel 4.4, glibc 2.23) + `mips64-unknown-linux-gnuabi64` | MIPS64 Linux, n64 ABI (kernel 4.4, glibc 2.23) + `mips64el-unknown-linux-gnuabi64` | MIPS64 (LE) Linux, n64 ABI (kernel 4.4, glibc 2.23) +diff --git a/src/test/assembly/asm/loongarch-types.rs b/src/test/assembly/asm/loongarch-types.rs +index 34973b942..d6677c5fd 100644 +--- a/src/test/assembly/asm/loongarch-types.rs ++++ b/src/test/assembly/asm/loongarch-types.rs +@@ -1,6 +1,6 @@ + // min-llvm-version: 10.0.1 + // assembly-output: emit-asm +-// compile-flags: --target loongarch64-unknown-linux-gnuf64 ++// compile-flags: --target loongarch64-unknown-linux-gnu + // needs-llvm-components: loongarch + + #![feature(no_core, lang_items, rustc_attrs)] +diff --git a/src/test/run-make-fulldeps/atomic-lock-free/Makefile b/src/test/run-make-fulldeps/atomic-lock-free/Makefile +index 7091371c1..8e9b46ef4 100644 +--- a/src/test/run-make-fulldeps/atomic-lock-free/Makefile ++++ b/src/test/run-make-fulldeps/atomic-lock-free/Makefile +@@ -26,7 +26,7 @@ ifeq ($(filter aarch64,$(LLVM_COMPONENTS)),aarch64) + nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add + endif + ifeq ($(filter loongarch64,$(LLVM_COMPONENTS)),loongarch64) +- $(RUSTC) --target=loongarch64-unknown-linux-gnuf64 atomic_lock_free.rs ++ $(RUSTC) --target=loongarch64-unknown-linux-gnu atomic_lock_free.rs + nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add + endif + ifeq ($(filter mips,$(LLVM_COMPONENTS)),mips) +diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs +index f90311c58..c56dde8a0 100644 +--- a/src/tools/build-manifest/src/main.rs ++++ b/src/tools/build-manifest/src/main.rs +@@ -28,7 +28,7 @@ static HOSTS: &[&str] = &[ + "i686-pc-windows-gnu", + "i686-pc-windows-msvc", + "i686-unknown-linux-gnu", +- "loongarch64-unknown-linux-gnuf64", ++ "loongarch64-unknown-linux-gnu", + "mips-unknown-linux-gnu", + "mips64-unknown-linux-gnuabi64", + "mips64el-unknown-linux-gnuabi64", +@@ -100,7 +100,7 @@ static TARGETS: &[&str] = &[ + "i686-unknown-freebsd", + "i686-unknown-linux-gnu", + "i686-unknown-linux-musl", +- "loongarch64-unknown-linux-gnuf64", ++ "loongarch64-unknown-linux-gnu", + "m68k-unknown-linux-gnu", + "mips-unknown-linux-gnu", + "mips-unknown-linux-musl", +diff --git a/vendor/cc-1.0.69/src/lib.rs b/vendor/cc-1.0.69/src/lib.rs +index aebf234cd..7957112a9 100644 +--- a/vendor/cc-1.0.69/src/lib.rs ++++ b/vendor/cc-1.0.69/src/lib.rs +@@ -2408,7 +2408,7 @@ impl Build { + "i686-uwp-windows-gnu" => Some("i686-w64-mingw32"), + "i686-unknown-linux-musl" => Some("musl"), + "i686-unknown-netbsd" => Some("i486--netbsdelf"), +- "loongarch64-unknown-linux-gnuf64" => Some("loongarch64-linux-gnuf64"), ++ "loongarch64-unknown-linux-gnu" => Some("loongarch64-linux-gnu"), + "mips-unknown-linux-gnu" => Some("mips-linux-gnu"), + "mips-unknown-linux-musl" => Some("mips-linux-musl"), + "mipsel-unknown-linux-gnu" => Some("mipsel-linux-gnu"), +-- +2.33.0 + diff --git a/rust.spec b/rust.spec index 66f14f655fdf51f516ec0b0f9538db0acdc0aa5a..c207f3165ed56267fab1b2705a2b24cc6b6d3c90 100644 --- a/rust.spec +++ b/rust.spec @@ -32,6 +32,7 @@ Patch0004: fix-a-println-wrong-format.patch Patch0005: remove-field-is-never-read-warning.patch Patch0006: 0001-Add-loongarch64-support-for-rust-1.57.patch Patch0007: 0002-vendor-Add-loongarch64-support.patch +Patch0008: 0003-Rename-loongarch64_unknown_linux_gnuf64-to-loongarch.patch %{lua: function rust_triple(arch) local abi = "gnu" if arch == "armv7hl" then @@ -43,8 +44,6 @@ Patch0007: 0002-vendor-Add-loongarch64-support.patch arch = "powerpc64le" elseif arch == "riscv64" then arch = "riscv64gc" - elseif arch == "loongarch64" then - return arch.."-unknown-linux-"..abi.."f64" end return arch.."-unknown-linux-"..abi end} @@ -267,6 +266,7 @@ sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure %ifarch loongarch64 %patch0006 -p1 %patch0007 -p1 +%patch0008 -p1 %endif rm -rf vendor/curl-sys/curl/ rm -rf vendor/jemalloc-sys/jemalloc/