[x86] Initial support for Rust on x86_64

The starting json file and flags were taken from an x86_64 linux build,
and may need further tweaks.

But, this is able to build and run the initial hook from the rust code.

Change-Id: If421f08fa70eb479343f7ac646c231f811ba99d0
Signed-off-by: David Brown <davidb@davidb.org>

Author: d3zd3z

arch/x86/64/x86_64-llvm.json

@@ -0,0 +1,12 @@
+{
+    "arch": "x86_64",
+    "rustc-abi": "x86-softfloat",
+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
+    "features": "-mmx,+soft-float,-retpoline-external-thunk,-retpoline-indirect-branches,-retpoline-indirect-calls,+harden-sls-ijmp,+harden-sls-ret",
+    "llvm-target": "x86_64-linux-gnu",
+    "supported-sanitizers": ["kcfi","kernel-address"],
+    "target-pointer-width": 64,
+    "emit-debug-gdb-scripts": false,
+    "frame-pointer": "may-omit",
+    "stack-probes": {"kind": "none"}
+}

lib/rust_support/Cargo.toml.in

@@ -1,5 +1,7 @@
 # Rust meta crate
 
+cargo-features = ["panic-immediate-abort"]
+
 # This crate brings in the other dependencies needed so that cargo builds all of the Rust code that
 # we need.
 
@@ -22,9 +24,11 @@ debug-assertions = true
 overflow-checks = true
 debug = true
 codegen-units = 1
+panic = "immediate-abort"
 
 [profile.dev]
 opt-level = 2
 codegen-units = 1
+panic = "immediate-abort"
 
 @DEPCRATES@

lib/rust_support/rules.mk

@@ -46,10 +46,19 @@ ifeq ($(RUST_TARGET_PATH),)
 RUST_TARGET_PATH := $(RUST_TARGET)
 endif
 
+ifndef RUST_CFLAGS
+RUST_CFLAGS :=
+endif
+
 define TOML_ESC
 $(subst \,\\,$(subst ",\",$1))
 endef
 
+# Expand a make "list" (space separated) into a quoted version appropriate for inserting into TOML.
+define TOML_ARRAY
+[$(foreach w,$(1),\"$(w)\",)]
+endef
+
 CARGO_CONFIG := $(MODULE_BUILDDIR)/.cargo/config.toml
 
 # TODO: Allow debug/release builds
@@ -97,6 +106,9 @@ $(CARGO_CONFIG): $(CARGO_CONFIG).phony
 		echo "[env]"; \
 		echo 'GLOBAL_INCLUDES = { value = "$(call TOML_ESC,$(GLOBAL_INCLUDES))", force = true }'; \
 		echo; \
+		echo "[target.'cfg(all())']"; \
+		echo "rustflags = $(call TOML_ARRAY,$(RUST_CFLAGS))"; \
+		echo; \
 		echo "[unstable]"; \
 		echo 'build-std = ["core", "alloc"]'; \
 	} > "$$tmp"; \

platform/pc/rules.mk

@@ -35,5 +35,22 @@ LK_HEAP_IMPLEMENTATION ?= dlmalloc
 GLOBAL_DEFINES += \
 	PLATFORM_HAS_DYNAMIC_TIMER=1
 
-include make/module.mk
+# TODO: This probably needs to be different for 32 and 64 bit.
+RUST_TARGET := x86_64-llvm
+RUST_TARGET_PATH := $(abspath $(BUILDROOT))/arch/x86/64/x86_64-llvm.json
+
+RUST_CFLAGS := \
+    -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2 \
+    -Ctarget-cpu=x86-64 \
+    -Ztune-cpu=generic \
+    -Cno-redzone=y \
+    -Copt-level=2 \
+    -Cdebug-assertions=n \
+    -Coverflow-checks=y \
+    -Ccode-model=kernel \
+    -Cforce-frame-pointers=y
+    #  -Zdwarf-version=5 -Cdebuginfo=2
+    # -Zfunction-return=thunk-extern
+    # -Zpatchable-function-entry=16,16
 
+include make/module.mk

project/pc-x86-64-test.mk

@@ -7,3 +7,10 @@ include project/target/pc.mk
 include project/virtual/fs.mk
 include project/virtual/minip.mk
 include project/virtual/test.mk
+
+USE_RUST ?= 0
+
+ifeq ($(call TOBOOL,$(USE_RUST)),true)
+$(info "Including rust support")
+include project/virtual/rust.mk
+endif