Update known test failures and waterfall revision (#854)

8 files changed, 20 insertions, 18 deletions

diff --git a/test/revision b/test/revision
index b4aa4be4e..b72cde812 100644
--- a/test/revision
+++ b/test/revision
@@ -1 +1 @@
-11453
+13645
diff --git a/test/s2wasm_known_binaryen_shell_test_failures.txt b/test/s2wasm_known_binaryen_shell_test_failures.txt
index e007e305a..210e338a1 100644
--- a/test/s2wasm_known_binaryen_shell_test_failures.txt
+++ b/test/s2wasm_known_binaryen_shell_test_failures.txt
@@ -148,3 +148,7 @@ va-arg-22.c.s.wast # memcpy
 va-arg-21.c.s.wast # malloc
 vprintf-chk-1.c.s.wast # vprintf
 vprintf-1.c.s.wast # vprintf
+fprintf-1.c.s.wast # stdout
+fprintf-chk-1.c.s.wast # stdout
+vfprintf-1.c.s.wast # stdout
+vfprintf-chk-1.c.s.wast # stdout
diff --git a/test/s2wasm_known_gcc_test_failures.txt b/test/s2wasm_known_gcc_test_failures.txt
index 2609ca18a..496893ef7 100644
--- a/test/s2wasm_known_gcc_test_failures.txt
+++ b/test/s2wasm_known_gcc_test_failures.txt
@@ -1,13 +1,6 @@
 # Expected failures from running s2wasm on the linked GCC torture test output
 # files.
 
-# Unknown symbol ($abort, $stdout, $stderr).
-fprintf-1.c.s
-gofast.c.s
-fprintf-chk-1.c.s
-vfprintf-1.c.s
-vfprintf-chk-1.c.s
-
 # Block address taken.
 20071220-1.c.s
 20071220-2.c.s
diff --git a/test/torture-s/fprintf-1.c.s b/test/torture-s/fprintf-1.c.s
index 542fc84e8..11f350329 100644
--- a/test/torture-s/fprintf-1.c.s
+++ b/test/torture-s/fprintf-1.c.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/fprintf-1.c"
+	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/fprintf-1.c"
 	.section	.text.main,"ax",@progbits
 	.hidden	main
 	.globl	main
@@ -201,8 +201,9 @@ main:                                   # @main
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 4.0.0 "
 	.functype	fprintf, i32, i32, i32
 	.functype	abort, void
 	.functype	fwrite, i32, i32, i32, i32, i32
 	.functype	fputc, i32, i32, i32
+	.import_global	stdout
diff --git a/test/torture-s/fprintf-chk-1.c.s b/test/torture-s/fprintf-chk-1.c.s
index 58ada854e..014cdb183 100644
--- a/test/torture-s/fprintf-chk-1.c.s
+++ b/test/torture-s/fprintf-chk-1.c.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/fprintf-chk-1.c"
+	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/fprintf-chk-1.c"
 	.section	.text.__fprintf_chk,"ax",@progbits
 	.hidden	__fprintf_chk
 	.globl	__fprintf_chk
@@ -445,6 +445,7 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 4.0.0 "
 	.functype	abort, void
 	.functype	vfprintf, i32, i32, i32, i32
+	.import_global	stdout
diff --git a/test/torture-s/gofast.c.s b/test/torture-s/gofast.c.s
index 236b798b2..fa181aafc 100644
--- a/test/torture-s/gofast.c.s
+++ b/test/torture-s/gofast.c.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/gofast.c"
+	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/gofast.c"
 	.section	.text.fp_add,"ax",@progbits
 	.hidden	fp_add
 	.globl	fp_add
@@ -496,7 +496,8 @@ fail_count:
 	.size	.L.str, 17
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 4.0.0 "
 	.functype	fprintf, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
+	.import_global	stderr
diff --git a/test/torture-s/vfprintf-1.c.s b/test/torture-s/vfprintf-1.c.s
index 694998a9f..f92d47b7b 100644
--- a/test/torture-s/vfprintf-1.c.s
+++ b/test/torture-s/vfprintf-1.c.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vfprintf-1.c"
+	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vfprintf-1.c"
 	.section	.text.inner,"ax",@progbits
 	.hidden	inner
 	.globl	inner
@@ -363,6 +363,7 @@ main:                                   # @main
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 4.0.0 "
 	.functype	vfprintf, i32, i32, i32, i32
 	.functype	abort, void
+	.import_global	stdout
diff --git a/test/torture-s/vfprintf-chk-1.c.s b/test/torture-s/vfprintf-chk-1.c.s
index 78338cd7a..6f3e671a2 100644
--- a/test/torture-s/vfprintf-chk-1.c.s
+++ b/test/torture-s/vfprintf-chk-1.c.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"/usr/local/google/home/dschuff/s/wasm-waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vfprintf-chk-1.c"
+	.file	"/usr/local/google/home/jgravelle/code/wasm/waterfall/src/work/gcc/gcc/testsuite/gcc.c-torture/execute/vfprintf-chk-1.c"
 	.section	.text.__vfprintf_chk,"ax",@progbits
 	.hidden	__vfprintf_chk
 	.globl	__vfprintf_chk
@@ -560,6 +560,7 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 4.0.0 (trunk 283460) (llvm/trunk 283507)"
+	.ident	"clang version 4.0.0 "
 	.functype	abort, void
 	.functype	vfprintf, i32, i32, i32, i32
+	.import_global	stdout