Revert change to redox userspace targets

Makefile

@@ -19,10 +19,10 @@ KCARGOFLAGS=--target $(KTARGET) --release -- -C soft-float
 TARGET=$(ARCH)-unknown-redox
 BUILD=build/userspace
 RUSTC=./rustc.sh
-RUSTCFLAGS=--target targets/$(TARGET).json -C opt-level=2 -C debuginfo=0
+RUSTCFLAGS=--target $(TARGET).json -C opt-level=2 -C debuginfo=0
 RUSTDOC=./rustdoc.sh
 CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
-CARGOFLAGS=--target targets/$(TARGET).json --release --
+CARGOFLAGS=--target $(TARGET).json --release --
 
 # Default targets
 .PHONY: all live iso clean doc ref test update pull qemu bochs drivers schemes binutils coreutils extrautils netutils userutils wireshark FORCE

arm-unknown-redox.json

@@ -0,0 +1,26 @@
+{
+    "llvm-target": "arm-unknown-redox",
+    "target-endian": "little",
+    "target-pointer-width": "32",
+    "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64",
+    "arch": "arm",
+    "os": "redox",
+    "env": "",
+    "vendor": "unknown",
+    "target-family": "redox",
+    "pre-link-args": ["-nostdlib", "-static"],
+    "features": "+soft-float",
+    "dynamic-linking": false,
+    "executables": true,
+    "relocation-model": "static",
+    "code-model": "default",
+    "disable-redzone": true,
+    "eliminate-frame-pointer": false,
+    "exe-suffix": "",
+    "has-rpath": false,
+    "no-compiler-rt": true,
+    "no-default-libraries": true,
+    "position-independent-executables": false,
+    "has-elf-tls": true,
+    "panic-strategy": "abort"
+}

x86_64-unknown-redox.json

@@ -0,0 +1,29 @@
+{
+    "llvm-target": "x86_64-unknown-redox",
+    "target-endian": "little",
+    "target-pointer-width": "64",
+    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+    "arch": "x86_64",
+    "os": "redox",
+    "env": "",
+    "vendor": "unknown",
+    "target-family": "redox",
+    "pre-link-args": ["-m64", "-Wl,--as-needed", "-Wl,-z,noexecstack", "-nostartfiles", "-nostdlib", "-static"],
+    "late-link-args": ["libc-artifacts/lib/crt0.o", "libc-artifacts/lib/libm.a", "libc-artifacts/lib/libc.a", "libc-artifacts/lib/libgcc.a"],
+    "features": "",
+    "dynamic-linking": false,
+    "executables": true,
+    "relocation-model": "static",
+    "code-model": "default",
+    "disable-redzone": true,
+    "eliminate-frame-pointer": false,
+    "exe-suffix": "",
+    "has-rpath": false,
+    "no-compiler-rt": true,
+    "no-default-libraries": true,
+    "position-independent-executables": false,
+    "lib-allocation-crate": "alloc_system",
+    "exe-allocation-crate": "alloc_system",
+    "has-elf-tls": true,
+    "panic-strategy": "abort"
+}