Migrate arm-sel4-fel4 target to armv7-sel4-fel4

PolySync · May 22, 2018 · 3f49872 · 3f49872
1 parent 905761a
commit 3f49872
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ RUST_TARGET_PATH=$PWD/test_configs FEL4_MANIFEST_PATH=$PWD/test_configs/fel4.tom
 ## Output Artifacts
 
 The generated bindings should be treated as relatively ephemeral and dynamic compared
-to most Rust libraries. The output is context-specific to the target (e.g. "arm-sel4-fel4")
+to most Rust libraries. The output is context-specific to the target (e.g. "armv7-sel4-fel4")
 and the set of configuration
 flags derived from the input fel4 manifest file.
 

diff --git a/Xargo.toml b/Xargo.toml
@@ -1,4 +1,4 @@
 [target.x86_64-sel4-fel4.dependencies]
 alloc = {}
-[target.arm-sel4-fel4.dependencies]
+[target.armv7-sel4-fel4.dependencies]
 alloc = {}
diff --git a/build.rs b/build.rs
@@ -165,7 +165,7 @@ fn copy_artifacts(artifact_path: PathBuf, output_path: PathBuf) {
 fn generate_bindings(fel4: &Fel4Config, include_path: PathBuf) {
     let bindgen_include_config = get_bindgen_include_config(fel4);
 
-    let target_args = if fel4.target == SupportedTarget::ArmSel4Fel4 {
+    let target_args = if fel4.target == SupportedTarget::Armv7Sel4Fel4 {
         String::from("-mfloat-abi=hard")
     } else {
         String::from("")
@@ -219,7 +219,7 @@ fn get_bindgen_include_config(
                 platform: fel4.platform.full_name().to_string(),
             }
         },
-        t @ &SupportedTarget::ArmSel4Fel4 => {
+        t @ &SupportedTarget::Armv7Sel4Fel4 => {
             // TODO - add more mappings as platform options expand
             //"exynos5410" => "exynos5",
             //"exynos5422" => "exynos5",

diff --git a/src/lib.rs b/src/lib.rs
@@ -80,7 +80,7 @@ pub unsafe extern "C" fn strcpy(
 /// #define seL4_WordBits (sizeof(seL4_Word) * 8)
 /// ```
 ///
-/// For our `arm-sel4-fel4` target see file:
+/// For our `armv7-sel4-fel4` target see file:
 /// `libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/constants.h`
 ///
 /// However due to bindgen not being able to expand functional

diff --git a/test_configs/arm-sel4-fel4.json → test_configs/armv7-sel4-fel4.json b/test_configs/arm-sel4-fel4.json → test_configs/armv7-sel4-fel4.json
@@ -1,6 +1,6 @@
 {
     "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64",
-    "llvm-target": "arm-linux-gnueabihf",
+    "llvm-target": "armv7-unknown-linux-gnueabihf",
     "target-endian": "little",
     "target-pointer-width": "32",
     "target-c-int-width": "32",
@@ -16,9 +16,13 @@
     "has-elf-tls": true,
     "panic-strategy": "abort",
     "no-default-libraries": true,
+    "features": "+v7,+vfp3,+d16,+thumb2,-neon",
     "linker-flavor": "gcc",
     "pre-link-args": {
         "gcc": ["-ffreestanding", "-nodefaultlibs", "-nostdlib"]
     },
+    "post-link-args": {
+        "gcc": ["-lm", "-lgcc_s", "-lgcc"]
+    },
     "default-codegen-units": 1
 }
diff --git a/test_configs/fel4.toml b/test_configs/fel4.toml
@@ -1,15 +1,14 @@
 [fel4]
 artifact-path = "artifacts"
-target-specs-path = "targets"
+target-specs-path = "target_specs"
 target = "x86_64-sel4-fel4"
 platform = "pc99"
 
 [x86_64-sel4-fel4]
 BuildWithCommonSimulationSettings = true
-KernelOptimisation = "-02"
+KernelOptimisation = "-O2"
 KernelVerificationBuild = false
 KernelBenchmarks = "none"
-KernelDangerousCodeInjection = false
 KernelFastpath = true
 LibSel4FunctionAttributes = "public"
 KernelNumDomains = 1
@@ -71,12 +70,11 @@ KernelPrinting = true
 KernelDebugBuild = false
 KernelPrinting = false
 
-[arm-sel4-fel4]
+[armv7-sel4-fel4]
 BuildWithCommonSimulationSettings = true
-KernelOptimisation = "-02"
+KernelOptimisation = "-O2"
 KernelVerificationBuild = false
 KernelBenchmarks = "none"
-KernelDangerousCodeInjection = false
 KernelFastpath = true
 LibSel4FunctionAttributes = "public"
 KernelNumDomains = 1
@@ -91,8 +89,7 @@ KernelStackBits = 12
 KernelTimeSlice = 5
 KernelTimerTickMS = 2
 KernelUserStackTraceLength = 16
-# the following keys are specific to arm-sel4-fel4 targets
-CROSS_COMPILER_PREFIX = "arm-linux-gnueabihf-"
+# the following keys are specific to armv7-sel4-fel4 targets
 KernelArch = "arm"
 KernelArmSel4Arch = "aarch32"
 KernelMaxNumNodes = 1
@@ -107,15 +104,15 @@ KernelMaxNumWorkUnitsPerPreemption = 100
 LinkPageSize = 4096
 UserLinkerGCSections = false
 
-[arm-sel4-fel4.debug]
+[armv7-sel4-fel4.debug]
 KernelDebugBuild = true
 KernelPrinting = true
 
-[arm-sel4-fel4.release]
+[armv7-sel4-fel4.release]
 KernelDebugBuild = false
 KernelPrinting = false
 
-[arm-sel4-fel4.sabre]
+[armv7-sel4-fel4.sabre]
 KernelARMPlatform = "sabre"
 ElfloaderImage = "elf"
 ElfloaderMode = "secure supervisor"