From 29e6283840a875469ec0a4f42c9269cc8053ff78 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 5 Apr 2017 20:11:30 -0600
Subject: [PATCH] Update submodules

---
 Cargo.toml        | 2 +-
 README.md         | 2 +-
 kernel            | 2 +-
 mk/kernel.mk      | 8 ++++----
 programs/ion      | 2 +-
 programs/orbutils | 2 +-
 programs/pkgutils | 2 +-
 programs/smith    | 2 +-
 rust              | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 25f3d9b..8ec8394 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,4 +39,4 @@ members = [
 
 [replace]
 "jpeg-decoder:0.1.11" = { git = "https://github.com/redox-os/jpeg-decoder.git", branch = "single_thread" }
-"liner:0.1.3" = { git = "https://github.com/redox-os/liner.git", branch = "redox" }
+"termion:1.3.0" = { git = "https://github.com/redox-os/termion.git" }
diff --git a/README.md b/README.md
index d43194e..71c3501 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Please make sure you use the **latest nightly** of `rustc` before building (for
 [![Travis Build Status](https://travis-ci.org/redox-os/redox.svg?branch=master)](https://travis-ci.org/redox-os/redox)
 [![Downloads](https://img.shields.io/github/downloads/redox-os/redox/total.svg)](https://github.com/redox-os/redox/releases)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md)
-![Rust Version](https://img.shields.io/badge/rust-nightly%202017--03--23-lightgrey.svg)
+![Rust Version](https://img.shields.io/badge/rust-nightly%202017--04--04-lightgrey.svg)
 
 ## Contents
 
diff --git a/kernel b/kernel
index be7f8d6..d26a9ee 160000
--- a/kernel
+++ b/kernel
@@ -1 +1 @@
-Subproject commit be7f8d64e665498f290a5422a019edc519c36b64
+Subproject commit d26a9ee990016c9721a0748abd0329946dc63552
diff --git a/mk/kernel.mk b/mk/kernel.mk
index b4370b2..5d56370 100644
--- a/mk/kernel.mk
+++ b/mk/kernel.mk
@@ -3,14 +3,14 @@ $(KBUILD)/libcollections.rlib: rust/src/libcollections/Cargo.toml rust/src/libco
 	$(KCARGO) rustc --manifest-path $< $(KCARGOFLAGS) -o $@
 	cp rust/src/target/$(KTARGET)/release/deps/*.rlib $(KBUILD)
 
-$(KBUILD)/libkernel.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(KBUILD)/initfs.tag
+$(KBUILD)/libkernel.a: kernel/Cargo.toml kernel/src/** $(KBUILD)/libcollections.rlib $(KBUILD)/initfs.tag
 	$(KCARGO) rustc --manifest-path $< --lib $(KCARGOFLAGS) -o $@
 
-$(KBUILD)/libkernel_live.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(KBUILD)/initfs.tag build/filesystem.bin
+$(KBUILD)/libkernel_live.a: kernel/Cargo.toml kernel/src/** $(KBUILD)/libcollections.rlib $(KBUILD)/initfs.tag build/filesystem.bin
 	$(KCARGO) rustc --manifest-path $< --lib --features live $(KCARGOFLAGS) -o $@
 
 $(KBUILD)/kernel: $(KBUILD)/libkernel.a
-	$(LD) $(LDFLAGS) -z max-page-size=0x1000 -T kernel/arch/$(ARCH)/src/linker.ld -o $@ $<
+	$(LD) $(LDFLAGS) -z max-page-size=0x1000 -T kernel/linkers/$(ARCH).ld -o $@ $<
 
 $(KBUILD)/kernel_live: $(KBUILD)/libkernel_live.a
-	$(LD) $(LDFLAGS) -z max-page-size=0x1000 -T kernel/arch/$(ARCH)/src/linker.ld -o $@ $<
+	$(LD) $(LDFLAGS) -z max-page-size=0x1000 -T kernel/linkers/$(ARCH).ld -o $@ $<
diff --git a/programs/ion b/programs/ion
index 3b26bb0..dd052ae 160000
--- a/programs/ion
+++ b/programs/ion
@@ -1 +1 @@
-Subproject commit 3b26bb0847ff3e9720a357e9c3d25736a46d4ce0
+Subproject commit dd052ae9591bfd83b9cb9210927e917e5ebbc4f6
diff --git a/programs/orbutils b/programs/orbutils
index 644203b..eeafcf1 160000
--- a/programs/orbutils
+++ b/programs/orbutils
@@ -1 +1 @@
-Subproject commit 644203b5e3b8d27496e6df29987f3fc6096965cc
+Subproject commit eeafcf19c9fcd212c8881686511208e90322bbbf
diff --git a/programs/pkgutils b/programs/pkgutils
index ffb3069..a93e7d6 160000
--- a/programs/pkgutils
+++ b/programs/pkgutils
@@ -1 +1 @@
-Subproject commit ffb30696a86de68c0c26563957fadaab8f9f657c
+Subproject commit a93e7d658e7b6120614bca2f1b8ade5073c23621
diff --git a/programs/smith b/programs/smith
index aae147e..8f68825 160000
--- a/programs/smith
+++ b/programs/smith
@@ -1 +1 @@
-Subproject commit aae147ec680994e3a849a7816bcaafa8327dc5a5
+Subproject commit 8f68825b06d14309eb3723f9c76f77b0e90ebee9
diff --git a/rust b/rust
index 8c4f2c6..91ae22a 160000
--- a/rust
+++ b/rust
@@ -1 +1 @@
-Subproject commit 8c4f2c64c6759a82f143e23964a46a65c67509c9
+Subproject commit 91ae22a012fae7fa7589b1bba77bf4579708ee33