Commit 8f8d74ee authored by WANG Rui's avatar WANG Rui Committed by Huacai Chen
Browse files

LoongArch: rust: Switch to use built-in rustc target 



This commit switches to use the LoongArch's built-in rustc target
'loongarch64-unknown-none-softfloat'. The Rust samples have been tested.

Acked-by: default avatarMiguel Ojeda <ojeda@kernel.org>
Tested-by: default avatarMiguel Ojeda <ojeda@kernel.org>
Signed-off-by: default avatarWANG Rui <wangrui@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent d6af2c76

arch/loongarch/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ifdef CONFIG_OBJTOOL 
KBUILD_CFLAGS			+= -fno-jump-tables

endif



KBUILD_RUSTFLAGS			+= --target=$(objtree)/scripts/target.json

KBUILD_RUSTFLAGS		+= --target=loongarch64-unknown-none-softfloat

KBUILD_RUSTFLAGS_MODULE		+= -Crelocation-model=pic



ifeq ($(CONFIG_RELOCATABLE),y)

rust/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--re 
$(obj)/core.o: private rustc_target_flags = $(core-cfgs)

$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs FORCE

	+$(call if_changed_dep,rustc_library)

ifneq ($(or $(CONFIG_X86_64),$(CONFIG_LOONGARCH)),)

ifdef CONFIG_X86_64

$(obj)/core.o: scripts/target.json

endif

scripts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert 
hostprogs-always-$(CONFIG_RUST_KERNEL_DOCTESTS)		+= rustdoc_test_builder

hostprogs-always-$(CONFIG_RUST_KERNEL_DOCTESTS)		+= rustdoc_test_gen



ifneq ($(or $(CONFIG_X86_64),$(CONFIG_LOONGARCH)),)

ifdef CONFIG_X86_64

always-$(CONFIG_RUST)					+= target.json

filechk_rust_target = $< < include/config/auto.conf

scripts/generate_rust_target.rs

+1 −6
Original line number Diff line number Diff line
@@ -164,12 +164,7 @@ fn main() { 
        ts.push("llvm-target", "x86_64-linux-gnu");

        ts.push("target-pointer-width", "64");

    } else if cfg.has("LOONGARCH") {

        ts.push("arch", "loongarch64");

        ts.push("data-layout", "e-m:e-p:64:64-i64:64-i128:128-n64-S128");

        ts.push("features", "-f,-d");

        ts.push("llvm-target", "loongarch64-linux-gnusf");

        ts.push("llvm-abiname", "lp64s");

        ts.push("target-pointer-width", "64");

        panic!("loongarch uses the builtin rustc loongarch64-unknown-none-softfloat target");

    } else {

        panic!("Unsupported architecture");

    }