From 3f6c4f83a3cb3a3a8b63b4e6fd09e02c26c14634 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Wed, 24 Apr 2019 13:59:45 -0700
Subject: [PATCH] Distribute updated config.sub and config.guess.

Distribute versions of config.sub and config.guess with wasm and wasi
support.

Fixes #16.
---
 .gitmodules | 3 +++
 Makefile    | 7 ++++++-
 README.md   | 9 +++++++++
 src/config  | 1 +
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 160000 src/config

diff --git a/.gitmodules b/.gitmodules
index 6439e6d..13970a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "src/wasi-sysroot"]
 	path = src/wasi-sysroot
 	url = https://github.com/CraneStation/wasi-sysroot
+[submodule "src/config"]
+	path = src/config
+	url = https://git.savannah.gnu.org/git/config.git
diff --git a/Makefile b/Makefile
index 0aee359..f9b8a05 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,12 @@ build/libcxxabi.BUILT: build/libcxx.BUILT build/llvm.BUILT
 	mv $(PREFIX)/share/sysroot/lib/libc++abi.a $(PREFIX)/share/sysroot/lib/wasm32-wasi/
 	touch build/libcxxabi.BUILT
 
-build: build/llvm.BUILT build/wasi-sysroot.BUILT build/compiler-rt.BUILT build/libcxxabi.BUILT build/libcxx.BUILT
+build/config.BUILT:
+	mkdir -p $(PREFIX)/share/misc
+	cp src/config/config.sub src/config/config.guess $(PREFIX)/share/misc
+	touch build/config.BUILT
+
+build: build/llvm.BUILT build/wasi-sysroot.BUILT build/compiler-rt.BUILT build/libcxxabi.BUILT build/libcxx.BUILT build/config.BUILT
 
 strip: build/llvm.BUILT
 	cd $(PREFIX)/bin; strip clang-8 llc lld llvm-ar
diff --git a/README.md b/README.md
index 79aa327..ebb144f 100644
--- a/README.md
+++ b/README.md
@@ -20,3 +20,12 @@ builds configured to set the default target and sysroot for convenience.
 One could also use a standard Clang 8.0, build a sysroot from the sources
 mentioned above, and compile with
 "--target=wasm32-unknown-wasi --sysroot=/path/to/sysroot".
+
+## Notes for Autoconf
+
+Upstream autoconf now
+[recognizes WASI](http://lists.gnu.org/archive/html/config-patches/2019-04/msg00001.html).
+
+For convenience when building packages that aren't yet updated, updated
+config.sub and config.guess files are installed at share/misc/config.\*
+in the install directory.
diff --git a/src/config b/src/config
new file mode 160000
index 0000000..a8d79c3
--- /dev/null
+++ b/src/config
@@ -0,0 +1 @@
+Subproject commit a8d79c3130da83c7cacd6fee31b9acc53799c406