Some renaming

Author: phil-opp

real_mode/.cargo/config

@@ -1,2 +1,2 @@
 [build]
-target = "x86_64-bootloader.json"
+target = "x86-32bit.json"

real_mode/build.rs

@@ -8,11 +8,11 @@ fn main() {
     let llvm_tools = LlvmTools::new().expect("LLVM tools not found");
     let objcopy = llvm_tools.tool(&exe("llvm-objcopy")).expect("llvm-objcopy not found");
 
-    build_subproject(Path::new("first_stage"), &["_start", "print_char"], &out_dir, &objcopy);
-    build_subproject(Path::new("real_mode"), &["second_stage"], &out_dir, &objcopy);
+    build_subproject(Path::new("first_stage"), &["_start", "print_char"], "x86-16bit.json", &out_dir, &objcopy);
+    build_subproject(Path::new("real_mode"), &["second_stage"], "x86-16bit.json", &out_dir, &objcopy);
 }
 
-fn build_subproject(dir: &Path, global_symbols: &[&str], out_dir: &str, objcopy: &Path) {
+fn build_subproject(dir: &Path, global_symbols: &[&str], target: &str, out_dir: &str, objcopy: &Path) {
     let dir_name = dir.file_name().unwrap().to_str().unwrap();
     let manifest_path = dir.join("Cargo.toml");
     let out_path = Path::new(&out_dir);
@@ -23,7 +23,7 @@ fn build_subproject(dir: &Path, global_symbols: &[&str], out_dir: &str, objcopy:
     cmd.arg("xbuild").arg("--release");
     cmd.arg("--verbose");
     cmd.arg(format!("--manifest-path={}", manifest_path.display()));
-    cmd.arg(format!("--target={}", dir.join("x86_64-target.json").display()));
+    cmd.arg(format!("--target={}", dir.join(target).display()));
     cmd.arg("-Z").arg("unstable-options");
     cmd.arg("--out-dir").arg(&out_dir);
     cmd.arg("--target-dir").arg(out_path.join("target").join(dir_name));
@@ -41,12 +41,15 @@ fn build_subproject(dir: &Path, global_symbols: &[&str], out_dir: &str, objcopy:
     let status = cmd.status().unwrap();
     assert!(status.success());
 
+    /*
+    // FIXME: it seems like this messes up relocations
     // convert to ELF64
     let mut cmd = Command::new(objcopy);
     cmd.arg("-I").arg("elf32-i386").arg("-O").arg("elf64-x86-64");
-    cmd.arg(out_path.join(format!("lib{}.a", dir_name)));
+    cmd.arg(out_path.join(format!("lib{}.a", dir_name)));    
     let status = cmd.status().unwrap();
     assert!(status.success());
+    */
 
     // emit linker flags
     println!("cargo:rustc-link-search=native={}", out_dir);

real_mode/first_stage/x86_64-target.json renamed to real_mode/first_stage/x86-16bit.json

@@ -7,11 +7,6 @@
 	"linker-flavor": "ld.lld",
 	"linker": "rust-lld",
 	"llvm-target": "i386-unknown-none-code16",
-	"pre-link-args": {
-		"ld.lld": [
-			"-Tlinker.ld"
-		]
-	},
 	"max-atomic-width": 64,
 	"position-independent-executables": false,
 	"disable-redzone": true,

real_mode/real_mode/x86_64-target.json renamed to real_mode/real_mode/x86-16bit.json

@@ -7,11 +7,6 @@
 	"linker-flavor": "ld.lld",
 	"linker": "rust-lld",
 	"llvm-target": "i386-unknown-none-code16",
-	"pre-link-args": {
-		"ld.lld": [
-			"-Tlinker.ld"
-		]
-	},
 	"max-atomic-width": 64,
 	"position-independent-executables": false,
 	"disable-redzone": true,

real_mode/tmp-libreal_mode.a

@@ -6,12 +6,12 @@
 	"executables": true,
 	"linker-flavor": "ld.lld",
 	"linker": "rust-lld",
-	"llvm-target": "i386-unknown-none-code16",
 	"pre-link-args": {
-		"ld.lld": [
-			"-Tlinker.ld"
-		]
-	},
+        "ld.lld": [
+	    "--script=linker.ld"
+	    ]
+    },
+	"llvm-target": "i386-unknown-none",
 	"max-atomic-width": 64,
 	"position-independent-executables": false,
 	"disable-redzone": true,