History

Merge tag 'loongarch-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch updates from Huacai Chen: - Select some options in Kconfig - Give a chance to build with !CONFIG_SMP - Switch to use built-in rustc target - Add new supported device nodes to dts - Some bug fixes and other small changes - Update the default config file * tag 'loongarch-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson: LoongArch: Update Loongson-3 default config file LoongArch: dts: Add new supported device nodes to Loongson-2K2000 LoongArch: dts: Add new supported device nodes to Loongson-2K0500 LoongArch: dts: Remove "disabled" state of clock controller node LoongArch: rust: Switch to use built-in rustc target LoongArch: Fix callchain parse error with kernel tracepoint events again LoongArch: Give a chance to build with !CONFIG_SMP LoongArch: Select THP_SWAP if HAVE_ARCH_TRANSPARENT_HUGEPAGE LoongArch: Select ARCH_WANT_DEFAULT_BPF_JIT LoongArch: Select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 LoongArch: Select ARCH_HAS_FAST_MULTIPLIER

Linus Torvalds committed 2 years ago

Commit 4f05e822 parents f33fda2 9cc1df419 files · +243 −29Browse files

Showing the changes to scripts (2 of 19 files). Show all

Unified · Split

2 files
  1. scripts/Makefile +1 −1
  2. scripts/generate_rust_target.rs +1 −6
scripts/Makefile+1−1
@@ -12,7 +12,7 @@ hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert · 11 unmodified lines
1212 hostprogs-always-$(CONFIG_RUST_KERNEL_DOCTESTS) += rustdoc_test_builder
1313 hostprogs-always-$(CONFIG_RUST_KERNEL_DOCTESTS) += rustdoc_test_gen
1414
15−ifneq ($(or $(CONFIG_X86_64),$(CONFIG_LOONGARCH)),)
15+ifdef CONFIG_X86_64
1616 always-$(CONFIG_RUST) += target.json
1717 filechk_rust_target = $< < include/config/auto.conf
1818
scripts/generate_rust_target.rs+1−6
@@ -164,12 +164,7 @@ fn main() { · 163 unmodified lines
164164 ts.push("llvm-target", "x86_64-linux-gnu");
165165 ts.push("target-pointer-width", "64");
166166 } else if cfg.has("LOONGARCH") {
167− ts.push("arch", "loongarch64");
168− ts.push("data-layout", "e-m:e-p:64:64-i64:64-i128:128-n64-S128");
169− ts.push("features", "-f,-d");
170− ts.push("llvm-target", "loongarch64-linux-gnusf");
171− ts.push("llvm-abiname", "lp64s");
172− ts.push("target-pointer-width", "64");
167+ panic!("loongarch uses the builtin rustc loongarch64-unknown-none-softfloat target");
173168 } else {
174169 panic!("Unsupported architecture");
175170 }