diff --git a/kernel b/kernel index 04d9d6b..0d3aa23 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 04d9d6b40a8fbd5e21200dabfdaa128a4c809727 +Subproject commit 0d3aa234ff5243b72b6b4e8eee8c0837c5848972 diff --git a/mk/config.mk b/mk/config.mk index acc8921..b8e049a 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -3,7 +3,7 @@ ARCH?=x86_64 # Automatic variables ROOT=$(PWD) -export RUST_TARGET_PATH=$(ROOT)/targets +export RUST_TARGET_PATH=$(ROOT)/kernel/targets export CC=$(ROOT)/libc-artifacts/gcc.sh export CFLAGS=-fno-stack-protector -U_FORTIFY_SOURCE diff --git a/targets/arm-unknown-none.json b/targets/arm-unknown-none.json deleted file mode 100644 index 292fa64..0000000 --- a/targets/arm-unknown-none.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "llvm-target": "arm-unknown-none", - "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": "none", - "env": "", - "vendor": "unknown", - "target-family": "redox", - "pre-link-args": ["-nostdlib", "-static"], - "features": "+soft-float", - "dynamic-linking": false, - "executables": false, - "relocation-model": "static", - "code-model": "kernel", - "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 -} diff --git a/targets/x86_64-unknown-none.json b/targets/x86_64-unknown-none.json deleted file mode 100644 index 10ff541..0000000 --- a/targets/x86_64-unknown-none.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "llvm-target": "x86_64-unknown-none", - "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": "none", - "env": "", - "vendor": "unknown", - "target-family": "redox", - "pre-link-args": ["-m64", "-nostdlib", "-static"], - "features": "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float", - "dynamic-linking": false, - "executables": false, - "relocation-model": "pic", - "code-model": "kernel", - "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 -}