From 3ec00fe3bae26e896e40ad61cd6791c23d2f5088 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 29 Dec 2016 21:35:48 -0700
Subject: [PATCH] Organize targets, export variables

---
 Makefile                                      | 39 ++++++++++---------
 syscall                                       |  2 +-
 .../arm-unknown-none.json                     |  0
 .../arm-unknown-redox.json                    |  0
 .../x86_64-unknown-none.json                  |  0
 .../x86_64-unknown-redox.json                 |  0
 6 files changed, 22 insertions(+), 19 deletions(-)
 rename arm-unknown-none.json => targets/arm-unknown-none.json (100%)
 rename arm-unknown-redox.json => targets/arm-unknown-redox.json (100%)
 rename x86_64-unknown-none.json => targets/x86_64-unknown-none.json (100%)
 rename x86_64-unknown-redox.json => targets/x86_64-unknown-redox.json (100%)

diff --git a/Makefile b/Makefile
index f2a91ea..259a624 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,28 @@
 ARCH?=x86_64
 
+ROOT=$(PWD)
+export RUST_TARGET_PATH=$(ROOT)/targets
+
+#TODO: Use libssp
+export CFLAGS=-fno-stack-protector -U_FORTIFY_SOURCE
+
 # Kernel variables
 KTARGET=$(ARCH)-unknown-none
 KBUILD=build/kernel
 KRUSTC=./krustc.sh
-KRUSTCFLAGS=--target $(KTARGET).json -C opt-level=2 -C debuginfo=0 -C soft-float
+KRUSTCFLAGS=--target $(KTARGET) -C opt-level=2 -C debuginfo=0 -C soft-float
 KRUSTDOC=./krustdoc.sh
 KCARGO=RUSTC="$(KRUSTC)" RUSTDOC="$(KRUSTDOC)" cargo
-KCARGOFLAGS=--target $(KTARGET).json --release -- -C soft-float
+KCARGOFLAGS=--target $(KTARGET) --release -- -C soft-float
 
 # Userspace variables
 TARGET=$(ARCH)-unknown-redox
 BUILD=build/userspace
 RUSTC=./rustc.sh
-RUSTCFLAGS=--target $(TARGET).json -C opt-level=2 -C debuginfo=0
+RUSTCFLAGS=--target $(TARGET) -C opt-level=2 -C debuginfo=0
 RUSTDOC=./rustdoc.sh
 CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
-CARGOFLAGS=--target $(TARGET).json --release --
-
-#TODO: Use libssp
-export CFLAGS=-fno-stack-protector -U_FORTIFY_SOURCE
+CARGOFLAGS=--target $(TARGET) --release --
 
 # Default targets
 .PHONY: all live iso clean doc ref test update pull qemu bochs drivers schemes binutils coreutils extrautils netutils userutils wireshark FORCE
@@ -169,9 +172,9 @@ ifeq ($(ARCH),arm)
 	QEMUFLAGS+=-cpu arm1176 -machine integratorcp
 	QEMUFLAGS+=-nographic
 
-	CC=$(ARCH)-none-eabi-gcc
-	CXX=$(ARCH)-none-eabi-g++
-	LD=$(ARCH)-none-eabi-ld
+	export CC=$(ARCH)-none-eabi-gcc
+	export CXX=$(ARCH)-none-eabi-g++
+	export LD=$(ARCH)-none-eabi-ld
 
 	KRUSTCFLAGS+=-C linker=$(CC)
 	KCARGOFLAGS+=-C linker=$(CC)
@@ -209,21 +212,21 @@ else
 
 	UNAME := $(shell uname)
 	ifeq ($(UNAME),Darwin)
-		CC=$(ARCH)-elf-gcc
-		CXX=$(ARCH)-elf-g++
+		export CC=$(ARCH)-elf-gcc
+		export CXX=$(ARCH)-elf-g++
 		ECHO=/bin/echo
 		FUMOUNT=sudo umount
-		LD=$(ARCH)-elf-ld
-		LDFLAGS=--gc-sections
+		export LD=$(ARCH)-elf-ld
+		export LDFLAGS=--gc-sections
 		VB_AUDIO=coreaudio
 		VBM="/Applications/VirtualBox.app/Contents/MacOS/VBoxManage"
 	else
-		CC=gcc
-		CXX=g++
+		export CC=gcc
+		export CXX=g++
 		ECHO=echo
 		FUMOUNT=fusermount -u
-		LD=ld
-		LDFLAGS=--gc-sections
+		export LD=ld
+		export LDFLAGS=--gc-sections
 		ifneq ($(kvm),no)
 			QEMUFLAGS+=-enable-kvm -cpu host
 		endif
diff --git a/syscall b/syscall
index e79e54d..1193791 160000
--- a/syscall
+++ b/syscall
@@ -1 +1 @@
-Subproject commit e79e54d2f5ad6492b4452f74e60c54325997823f
+Subproject commit 1193791d642795840d7f22967249bad8bdef1a32
diff --git a/arm-unknown-none.json b/targets/arm-unknown-none.json
similarity index 100%
rename from arm-unknown-none.json
rename to targets/arm-unknown-none.json
diff --git a/arm-unknown-redox.json b/targets/arm-unknown-redox.json
similarity index 100%
rename from arm-unknown-redox.json
rename to targets/arm-unknown-redox.json
diff --git a/x86_64-unknown-none.json b/targets/x86_64-unknown-none.json
similarity index 100%
rename from x86_64-unknown-none.json
rename to targets/x86_64-unknown-none.json
diff --git a/x86_64-unknown-redox.json b/targets/x86_64-unknown-redox.json
similarity index 100%
rename from x86_64-unknown-redox.json
rename to targets/x86_64-unknown-redox.json