From 27375c89c24fa82fa863f3fbf66e52fd28ba21a1 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 31 Oct 2016 12:37:29 -0600
Subject: [PATCH] Update libstd, remove openlibm (now inside of libstd)

---
 .gitmodules | 3 ---
 Makefile    | 6 +++---
 libstd      | 2 +-
 openlibm    | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 160000 openlibm

diff --git a/.gitmodules b/.gitmodules
index 1aed5e4..4fcfda4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "ion"]
 	path = programs/ion
 	url = https://github.com/redox-os/ion.git
-[submodule "openlibm"]
-	path = openlibm
-	url = https://github.com/redox-os/openlibm.git
 [submodule "programs/coreutils"]
 	path = programs/coreutils
 	url = https://github.com/redox-os/coreutils.git
diff --git a/Makefile b/Makefile
index 6968bc8..c605355 100644
--- a/Makefile
+++ b/Makefile
@@ -227,10 +227,10 @@ $(BUILD)/librand.rlib: rust/src/librand/lib.rs $(BUILD)/libcore.rlib
 $(BUILD)/librustc_unicode.rlib: rust/src/librustc_unicode/lib.rs $(BUILD)/libcore.rlib
 	$(RUSTC) $(RUSTCFLAGS) -o $@ $<
 
-openlibm/libopenlibm.a:
-	CROSSCC=$(CC) CFLAGS=-fno-stack-protector make -C openlibm libopenlibm.a
+libstd/openlibm/libopenlibm.a:
+	CROSSCC=$(CC) CFLAGS=-fno-stack-protector make -C libstd/openlibm libopenlibm.a
 
-$(BUILD)/libopenlibm.a: openlibm/libopenlibm.a
+$(BUILD)/libopenlibm.a: libstd/openlibm/libopenlibm.a
 	mkdir -p $(BUILD)
 	cp $< $@
 
diff --git a/libstd b/libstd
index 263ed59..b42d1d7 160000
--- a/libstd
+++ b/libstd
@@ -1 +1 @@
-Subproject commit 263ed59929e68073bd4e47ba07f2fbe283ee2854
+Subproject commit b42d1d72320a5f75e547d1dbfc8b9cf9fa124056
diff --git a/openlibm b/openlibm
deleted file mode 160000
index 3c837e7..0000000
--- a/openlibm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3c837e79655c4be724efb945a6345ec97c07635c