788f91c677
This PR fixes the build for Rust Apps and D Apps on QEMU RISC-V. Previously the Rust Build selected the [incorrect Rust Target riscv64i-unknown-none-elf](https://lupyuen.github.io/articles/rust5#rust-target-is-incorrect). Now the Rust Build selects the correct Rust Target: riscv64gc-unknown-none-elf. This PR also fixes the 32-bit RISC-V Target for D Apps. D Targets ("riscv32") are named differently from Rust Targets ("riscv32gc"), this PR restores the correct Target Names. Note that Rust Apps won't build correctly for QEMU RISC-V 32-bit. This requires a [Rust Custom Target for riscv32gc](https://lupyuen.github.io/articles/rust4#custom-target-for-rust), which will make the NuttX Makefiles much more complicated. Also note that `hello_d` won't build correctly for 64-bit `rv-virt:nsh64`. To date, NuttX has never supported 64-bit RISC-V for D Apps. Modified Files: `tools/Rust.defs`: Rename the RISC-V ISA `imafdc` to `gc` for Rust Targets `tools/D.defs`: Exclude the RISC-V ISA for D Targets
78 lines
2.6 KiB
Plaintext
78 lines
2.6 KiB
Plaintext
############################################################################
|
|
# tools/Rust.defs
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright ownership. The
|
|
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance with the
|
|
# License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
############################################################################
|
|
|
|
RUSTC := rustc --edition 2021
|
|
|
|
RUSTFLAGS :=
|
|
|
|
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
|
|
RUSTFLAGS += -g
|
|
endif
|
|
|
|
ifeq ($(CONFIG_DEBUG_NOOPT),y)
|
|
RUSTFLAGS += -C opt-level=0
|
|
endif
|
|
|
|
# Special handling for the SIM
|
|
|
|
ifeq ($(CONFIG_ARCH_SIM),y)
|
|
ifeq ($(CONFIG_HOST_LINUX),y)
|
|
ifeq ($(LLVM_ARCHTYPE),x86)
|
|
# Only for x86 based host or x64 but m32 build
|
|
RUSTFLAGS += --target i686-unknown-linux-$(LLVM_ABITYPE)
|
|
else
|
|
# For other archs, such as aarch64, arm etc
|
|
RUSTFLAGS += --target $(LLVM_ARCHTYPE)-unknown-linux-$(LLVM_ABITYPE)
|
|
endif
|
|
else ifeq ($(CONFIG_HOST_MACOS),y)
|
|
RUSTFLAGS += --target $(LLVM_ARCHTYPE)-apple-$(LLVM_ABITYPE)
|
|
endif
|
|
else ifeq ($(CONFIG_ARCH_RISCV),y)
|
|
# Target triple is riscv[32|64][isa]-unknown-none-elf
|
|
# "imafdc" becomes "gc"
|
|
|
|
ifeq ($(CONFIG_ARCH_RV_ISA_M)$(CONFIG_ARCH_RV_ISA_A)$(CONFIG_ARCH_FPU)$(CONFIG_ARCH_DPFPU)$(CONFIG_ARCH_RV_ISA_C),yyyyy)
|
|
RUST_ARCHTYPE = $(LLVM_ARCHTYPE)gc
|
|
else
|
|
RUST_ARCHTYPE = $(LLVM_ARCHTYPE)i
|
|
ifeq ($(CONFIG_ARCH_RV_ISA_M),y)
|
|
RUST_ARCHTYPE := $(RUST_ARCHTYPE)m
|
|
endif
|
|
ifeq ($(CONFIG_ARCH_RV_ISA_A),y)
|
|
RUST_ARCHTYPE := $(RUST_ARCHTYPE)a
|
|
endif
|
|
ifeq ($(CONFIG_ARCH_FPU),y)
|
|
RUST_ARCHTYPE := $(RUST_ARCHTYPE)f
|
|
endif
|
|
ifeq ($(CONFIG_ARCH_DPFPU),y)
|
|
RUST_ARCHTYPE := $(RUST_ARCHTYPE)d
|
|
endif
|
|
ifeq ($(CONFIG_ARCH_RV_ISA_C),y)
|
|
RUST_ARCHTYPE := $(RUST_ARCHTYPE)c
|
|
endif
|
|
endif
|
|
|
|
RUSTFLAGS += --target $(RUST_ARCHTYPE)-unknown-none-elf
|
|
else
|
|
# For arm, but there are some other archs not support yet,
|
|
# such as xtensa, x86 bare metal, etc.
|
|
RUSTFLAGS += --target $(LLVM_ARCHTYPE)-none-$(LLVM_ABITYPE)
|
|
endif
|