rust/comprehensive-rust
1
0
Fork 0
mirror of https://github.com/google/comprehensive-rust.git synced 2025-04-21 23:45:42 +02:00
Code Issues Releases Activity

Use Clang rather than GCC for assembly. (#2377)

Browse Source 
This avoids the hack for using aarch64-linux-gnu on Linux, and also
removes a dependency.

Also switched to using `cargo-objcopy`, as we require `cargo-binutils`
already and it makes the Makefiles simpler.
This commit is contained in:
Andrew Walbran 2024-09-24 10:19:29 +01:00 committed by GitHub
parent f64edfc1f7
commit 2713ea3475
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bare-metal.md
View File

@ -29,7 +29,7 @@ To get started, install some tools we'll need later. On gLinux or Debian:
<!-- mdbook-xgettext: skip --> <!-- mdbook-xgettext: skip -->
```bash ```bash
sudo apt install gcc-aarch64-linux-gnu gdb-multiarch libudev-dev picocom pkg-config qemu-system-arm sudo apt install gdb-multiarch libudev-dev picocom pkg-config qemu-system-arm
rustup update rustup update
rustup target add aarch64-unknown-none thumbv7em-none-eabihf rustup target add aarch64-unknown-none thumbv7em-none-eabihf
rustup component add llvm-tools-preview rustup component add llvm-tools-preview
@ -54,7 +54,6 @@ On MacOS:
```bash ```bash
xcode-select --install xcode-select --install
brew install gdb picocom qemu brew install gdb picocom qemu
brew install --cask gcc-aarch64-embedded
rustup update rustup update
rustup target add aarch64-unknown-none thumbv7em-none-eabihf rustup target add aarch64-unknown-none thumbv7em-none-eabihf
rustup component add llvm-tools-preview rustup component add llvm-tools-preview

16
src/bare-metal/aps/examples/Makefile
View File

@ -12,14 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
UNAME := $(shell uname -s)
ifeq ($(UNAME),Linux)
TARGET = aarch64-linux-gnu
else
TARGET = aarch64-none-elf
endif
OBJCOPY = $(TARGET)-objcopy
.PHONY: build qemu qemu_logger qemu_minimal qemu_psci .PHONY: build qemu qemu_logger qemu_minimal qemu_psci
all: minimal.bin improved.bin logger.bin all: minimal.bin improved.bin logger.bin
@ -28,13 +20,13 @@ build:
cargo build cargo build
improved.bin: build improved.bin: build
$(OBJCOPY) -O binary target/aarch64-unknown-none/debug/improved $@ cargo objcopy --bin improved -- -O binary $@
logger.bin: build logger.bin: build
$(OBJCOPY) -O binary target/aarch64-unknown-none/debug/logger $@ cargo objcopy --bin logger -- -O binary $@
minimal.bin: build minimal.bin: build
$(OBJCOPY) -O binary target/aarch64-unknown-none/debug/minimal $@ cargo objcopy --bin minimal -- -O binary $@
psci.bin: build psci.bin: build
$(OBJCOPY) -O binary target/aarch64-unknown-none/debug/psci $@ cargo objcopy --bin psci -- -O binary $@
qemu: improved.bin qemu: improved.bin
qemu-system-aarch64 -machine virt -cpu max -serial mon:stdio -display none -kernel $< -s qemu-system-aarch64 -machine virt -cpu max -serial mon:stdio -display none -kernel $< -s

4
src/bare-metal/aps/examples/build.rs
View File

@ -16,10 +16,8 @@ use cc::Build;
use std::env; use std::env;
fn main() { fn main() {
#[cfg(target_os = "linux")]
env::set_var("CROSS_COMPILE", "aarch64-linux-gnu");
#[cfg(not(target_os = "linux"))]
env::set_var("CROSS_COMPILE", "aarch64-none-elf"); env::set_var("CROSS_COMPILE", "aarch64-none-elf");
env::set_var("CC", "clang");
Build::new() Build::new()
.file("entry.S") .file("entry.S")

10
src/exercises/bare-metal/rtc/Makefile
View File

@ -12,14 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
UNAME := $(shell uname -s)
ifeq ($(UNAME),Linux)
TARGET = aarch64-linux-gnu
else
TARGET = aarch64-none-elf
endif
OBJCOPY = $(TARGET)-objcopy
.PHONY: build qemu_minimal qemu qemu_logger .PHONY: build qemu_minimal qemu qemu_logger
all: rtc.bin all: rtc.bin
@ -28,7 +20,7 @@ build:
cargo build cargo build
rtc.bin: build rtc.bin: build
$(OBJCOPY) -O binary target/aarch64-unknown-none/debug/rtc $@ cargo objcopy -- -O binary $@
qemu: rtc.bin qemu: rtc.bin
qemu-system-aarch64 -machine virt,gic-version=3 -cpu max -serial mon:stdio -display none -kernel $< -s qemu-system-aarch64 -machine virt,gic-version=3 -cpu max -serial mon:stdio -display none -kernel $< -s

4
src/exercises/bare-metal/rtc/build.rs
View File

@ -16,10 +16,8 @@ use cc::Build;
use std::env; use std::env;
fn main() { fn main() {
#[cfg(target_os = "linux")]
env::set_var("CROSS_COMPILE", "aarch64-linux-gnu");
#[cfg(not(target_os = "linux"))]
env::set_var("CROSS_COMPILE", "aarch64-none-elf"); env::set_var("CROSS_COMPILE", "aarch64-none-elf");
env::set_var("CC", "clang");
Build::new() Build::new()
.file("entry.S") .file("entry.S")