Add more comments for the asm workaround.
diff --git a/encode_amd64.s b/encode_amd64.s
index 0c2a41d..8856be3 100644
--- a/encode_amd64.s
+++ b/encode_amd64.s
@@ -8,10 +8,17 @@
 #include "textflag.h"
-// TODO: figure out why the XXX lines compile with Go 1.4 and Go tip but not
-// Go 1.6.
+// The XXX lines assemble on Go 1.4, 1.5 and 1.7, but not 1.6, due to a
+// Go toolchain regression. See and
-// This is
+// As a workaround, the package was built with a known good assembler, and
+// those instructions were disassembled by "objdump -d" to yield the
+//	4e 0f b7 7c 5c 78       movzwq 0x78(%rsp,%r11,2),%r15
+// style comments, in AT&T asm syntax. Note that rsp here is a physical
+// register, not Go/asm's SP pseudo-register (see
+// The instructions were then encoded as "BYTE $0x.." sequences, which assemble
+// fine on Go 1.6.
 // The asm code generally follows the pure Go code in encode_other.go, except
 // where marked with a "!!!".
diff --git a/snappy.test b/snappy.test
new file mode 100755
index 0000000..7171d40
--- /dev/null
+++ b/snappy.test
Binary files differ