From ad559bfec56a1dcb2b13b458a1c758b2362e67b0 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 14 Dec 2018 16:01:31 -0700
Subject: [PATCH] Update to add pthread support to gcc and c++

---
 cookbook     |  2 +-
 mk/prefix.mk | 29 +++++++++++++++++++++++++----
 relibc       |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/cookbook b/cookbook
index f60171e..d34e163 160000
--- a/cookbook
+++ b/cookbook
@@ -1 +1 @@
-Subproject commit f60171e17b3561ce4b9ed229b70bbc88ae29f1a2
+Subproject commit d34e163074751a76a75d00a15ef22b9f6f1cecf4
diff --git a/mk/prefix.mk b/mk/prefix.mk
index 16806db..199b704 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -30,7 +30,12 @@ $(PREFIX)/binutils-install: $(PREFIX)/binutils
 	rm -rf "$<-build" "$@"
 	mkdir -p "$<-build" "$@"
 	cd "$<-build" && \
-	"$</configure" --target="$(TARGET)" --program-prefix="$(TARGET)-" --prefix="$@" --disable-werror && \
+	"$</configure" \
+		--target="$(TARGET)" \
+		--program-prefix="$(TARGET)-" \
+		--prefix="$@" \
+		--disable-werror \
+		&& \
 	make all -j `nproc` && \
 	make install -j `nproc`
 	touch "$@"
@@ -53,7 +58,14 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc | $(PREFIX)/binutils-install
 	cp -r "$(PREFIX)/binutils-install" "$@"
 	cd "$<-freestanding-build" && \
 	export PATH="$@/bin:$$PATH" && \
-	"$</configure" --target="$(TARGET)" --program-prefix="$(TARGET)-" --prefix="$@" --disable-nls --enable-languages=c,c++ --without-headers && \
+	"$</configure" \
+		--target="$(TARGET)" \
+		--program-prefix="$(TARGET)-" \
+		--prefix="$@" \
+		--disable-nls \
+		--enable-languages=c,c++ \
+		--without-headers \
+		&& \
 	make all-gcc all-target-libgcc -j `nproc` && \
 	make install-gcc install-target-libgcc -j `nproc`
 	touch "$@"
@@ -82,10 +94,19 @@ $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX_FREESTANDING_INSTALL)
 $(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-install
 	rm -rf "$<-build" "$@"
 	mkdir -p "$<-build"
-	cp -r "$(PREFIX_FREESTANDING_INSTALL)" "$@"
+	cp -r "$(PREFIX)/binutils-install" "$@"
 	cd "$<-build" && \
 	export PATH="$@/bin:$$PATH" && \
-	"$</configure" --target="$(TARGET)" --program-prefix="$(TARGET)-" --prefix="$@" --with-sysroot="$(PREFIX)/relibc-install" --disable-nls --disable-werror --enable-languages=c,c++ && \
+	"$</configure" \
+		--target="$(TARGET)" \
+		--program-prefix="$(TARGET)-" \
+		--prefix="$@" \
+		--with-sysroot="$(PREFIX)/relibc-install" \
+		--disable-nls \
+		--disable-werror \
+		--enable-languages=c,c++ \
+		--enable-threads=posix \
+		&& \
 	make all-gcc all-target-libgcc all-target-libstdc++-v3 -j `nproc` && \
 	make install-gcc install-target-libgcc install-target-libstdc++-v3 -j `nproc`
 	touch "$@"
diff --git a/relibc b/relibc
index 0d2332d..f04ac73 160000
--- a/relibc
+++ b/relibc
@@ -1 +1 @@
-Subproject commit 0d2332d3680aef474f05f94f76686524d9e3530a
+Subproject commit f04ac7343a0b2fc7fd1125b9725a39c0efa86ddf