8 files changed, 99 insertions, 99 deletions
diff --git a/src/pkg/hash/Makefile b/src/pkg/hash/Makefile
index aaa641f7c..56071cb33 100644
--- a/src/pkg/hash/Makefile
+++ b/src/pkg/hash/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.$(GOARCH)
+include ../../Make.inc
 
 TARG=hash
 GOFILES=\
diff --git a/src/pkg/hash/adler32/Makefile b/src/pkg/hash/adler32/Makefile
index 6f6d66fd0..38ce537ba 100644
--- a/src/pkg/hash/adler32/Makefile
+++ b/src/pkg/hash/adler32/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.$(GOARCH)
+include ../../../Make.inc
 
 TARG=hash/adler32
 GOFILES=\
diff --git a/src/pkg/hash/adler32/adler32_test.go b/src/pkg/hash/adler32/adler32_test.go
index cfe9c9547..ffa5569bc 100644
--- a/src/pkg/hash/adler32/adler32_test.go
+++ b/src/pkg/hash/adler32/adler32_test.go
@@ -15,38 +15,38 @@ type _Adler32Test struct {
 }
 
 var golden = []_Adler32Test{
-	_Adler32Test{0x1, ""},
-	_Adler32Test{0x620062, "a"},
-	_Adler32Test{0x12600c4, "ab"},
-	_Adler32Test{0x24d0127, "abc"},
-	_Adler32Test{0x3d8018b, "abcd"},
-	_Adler32Test{0x5c801f0, "abcde"},
-	_Adler32Test{0x81e0256, "abcdef"},
-	_Adler32Test{0xadb02bd, "abcdefg"},
-	_Adler32Test{0xe000325, "abcdefgh"},
-	_Adler32Test{0x118e038e, "abcdefghi"},
-	_Adler32Test{0x158603f8, "abcdefghij"},
-	_Adler32Test{0x3f090f02, "Discard medicine more than two years old."},
-	_Adler32Test{0x46d81477, "He who has a shady past knows that nice guys finish last."},
-	_Adler32Test{0x40ee0ee1, "I wouldn't marry him with a ten foot pole."},
-	_Adler32Test{0x16661315, "Free! Free!/A trip/to Mars/for 900/empty jars/Burma Shave"},
-	_Adler32Test{0x5b2e1480, "The days of the digital watch are numbered.  -Tom Stoppard"},
-	_Adler32Test{0x8c3c09ea, "Nepal premier won't resign."},
-	_Adler32Test{0x45ac18fd, "For every action there is an equal and opposite government program."},
-	_Adler32Test{0x53c61462, "His money is twice tainted: 'taint yours and 'taint mine."},
-	_Adler32Test{0x7e511e63, "There is no reason for any individual to have a computer in their home. -Ken Olsen, 1977"},
-	_Adler32Test{0xe4801a6a, "It's a tiny change to the code and not completely disgusting. - Bob Manchek"},
-	_Adler32Test{0x61b507df, "size:  a.out:  bad magic"},
-	_Adler32Test{0xb8631171, "The major problem is with sendmail.  -Mark Horton"},
-	_Adler32Test{0x8b5e1904, "Give me a rock, paper and scissors and I will move the world.  CCFestoon"},
-	_Adler32Test{0x7cc6102b, "If the enemy is within range, then so are you."},
-	_Adler32Test{0x700318e7, "It's well we cannot hear the screams/That we create in others' dreams."},
-	_Adler32Test{0x1e601747, "You remind me of a TV show, but that's all right: I watch it anyway."},
-	_Adler32Test{0xb55b0b09, "C is as portable as Stonehedge!!"},
-	_Adler32Test{0x39111dd0, "Even if I could be Shakespeare, I think I should still choose to be Faraday. - A. Huxley"},
-	_Adler32Test{0x91dd304f, "The fugacity of a constituent in a mixture of gases at a given temperature is proportional to its mole fraction.  Lewis-Randall Rule"},
-	_Adler32Test{0x2e5d1316, "How can you write a big system without C++?  -Paul Glick"},
-	_Adler32Test{0xd0201df6, "'Invariant assertions' is the most elegant programming technique!  -Tom Szymanski"},
+	{0x1, ""},
+	{0x620062, "a"},
+	{0x12600c4, "ab"},
+	{0x24d0127, "abc"},
+	{0x3d8018b, "abcd"},
+	{0x5c801f0, "abcde"},
+	{0x81e0256, "abcdef"},
+	{0xadb02bd, "abcdefg"},
+	{0xe000325, "abcdefgh"},
+	{0x118e038e, "abcdefghi"},
+	{0x158603f8, "abcdefghij"},
+	{0x3f090f02, "Discard medicine more than two years old."},
+	{0x46d81477, "He who has a shady past knows that nice guys finish last."},
+	{0x40ee0ee1, "I wouldn't marry him with a ten foot pole."},
+	{0x16661315, "Free! Free!/A trip/to Mars/for 900/empty jars/Burma Shave"},
+	{0x5b2e1480, "The days of the digital watch are numbered.  -Tom Stoppard"},
+	{0x8c3c09ea, "Nepal premier won't resign."},
+	{0x45ac18fd, "For every action there is an equal and opposite government program."},
+	{0x53c61462, "His money is twice tainted: 'taint yours and 'taint mine."},
+	{0x7e511e63, "There is no reason for any individual to have a computer in their home. -Ken Olsen, 1977"},
+	{0xe4801a6a, "It's a tiny change to the code and not completely disgusting. - Bob Manchek"},
+	{0x61b507df, "size:  a.out:  bad magic"},
+	{0xb8631171, "The major problem is with sendmail.  -Mark Horton"},
+	{0x8b5e1904, "Give me a rock, paper and scissors and I will move the world.  CCFestoon"},
+	{0x7cc6102b, "If the enemy is within range, then so are you."},
+	{0x700318e7, "It's well we cannot hear the screams/That we create in others' dreams."},
+	{0x1e601747, "You remind me of a TV show, but that's all right: I watch it anyway."},
+	{0xb55b0b09, "C is as portable as Stonehedge!!"},
+	{0x39111dd0, "Even if I could be Shakespeare, I think I should still choose to be Faraday. - A. Huxley"},
+	{0x91dd304f, "The fugacity of a constituent in a mixture of gases at a given temperature is proportional to its mole fraction.  Lewis-Randall Rule"},
+	{0x2e5d1316, "How can you write a big system without C++?  -Paul Glick"},
+	{0xd0201df6, "'Invariant assertions' is the most elegant programming technique!  -Tom Szymanski"},
 }
 
 func TestGolden(t *testing.T) {
diff --git a/src/pkg/hash/crc32/Makefile b/src/pkg/hash/crc32/Makefile
index 071d89823..31b205185 100644
--- a/src/pkg/hash/crc32/Makefile
+++ b/src/pkg/hash/crc32/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.$(GOARCH)
+include ../../../Make.inc
 
 TARG=hash/crc32
 GOFILES=\
diff --git a/src/pkg/hash/crc32/crc32_test.go b/src/pkg/hash/crc32/crc32_test.go
index 45ad84be7..cf5743c99 100644
--- a/src/pkg/hash/crc32/crc32_test.go
+++ b/src/pkg/hash/crc32/crc32_test.go
@@ -15,37 +15,37 @@ type test struct {
 }
 
 var golden = []test{
-	test{0x0, ""},
-	test{0xe8b7be43, "a"},
-	test{0x9e83486d, "ab"},
-	test{0x352441c2, "abc"},
-	test{0xed82cd11, "abcd"},
-	test{0x8587d865, "abcde"},
-	test{0x4b8e39ef, "abcdef"},
-	test{0x312a6aa6, "abcdefg"},
-	test{0xaeef2a50, "abcdefgh"},
-	test{0x8da988af, "abcdefghi"},
-	test{0x3981703a, "abcdefghij"},
-	test{0x6b9cdfe7, "Discard medicine more than two years old."},
-	test{0xc90ef73f, "He who has a shady past knows that nice guys finish last."},
-	test{0xb902341f, "I wouldn't marry him with a ten foot pole."},
-	test{0x42080e8, "Free! Free!/A trip/to Mars/for 900/empty jars/Burma Shave"},
-	test{0x154c6d11, "The days of the digital watch are numbered.  -Tom Stoppard"},
-	test{0x4c418325, "Nepal premier won't resign."},
-	test{0x33955150, "For every action there is an equal and opposite government program."},
-	test{0x26216a4b, "His money is twice tainted: 'taint yours and 'taint mine."},
-	test{0x1abbe45e, "There is no reason for any individual to have a computer in their home. -Ken Olsen, 1977"},
-	test{0xc89a94f7, "It's a tiny change to the code and not completely disgusting. - Bob Manchek"},
-	test{0xab3abe14, "size:  a.out:  bad magic"},
-	test{0xbab102b6, "The major problem is with sendmail.  -Mark Horton"},
-	test{0x999149d7, "Give me a rock, paper and scissors and I will move the world.  CCFestoon"},
-	test{0x6d52a33c, "If the enemy is within range, then so are you."},
-	test{0x90631e8d, "It's well we cannot hear the screams/That we create in others' dreams."},
-	test{0x78309130, "You remind me of a TV show, but that's all right: I watch it anyway."},
-	test{0x7d0a377f, "C is as portable as Stonehedge!!"},
-	test{0x8c79fd79, "Even if I could be Shakespeare, I think I should still choose to be Faraday. - A. Huxley"},
-	test{0xa20b7167, "The fugacity of a constituent in a mixture of gases at a given temperature is proportional to its mole fraction.  Lewis-Randall Rule"},
-	test{0x8e0bb443, "How can you write a big system without C++?  -Paul Glick"},
+	{0x0, ""},
+	{0xe8b7be43, "a"},
+	{0x9e83486d, "ab"},
+	{0x352441c2, "abc"},
+	{0xed82cd11, "abcd"},
+	{0x8587d865, "abcde"},
+	{0x4b8e39ef, "abcdef"},
+	{0x312a6aa6, "abcdefg"},
+	{0xaeef2a50, "abcdefgh"},
+	{0x8da988af, "abcdefghi"},
+	{0x3981703a, "abcdefghij"},
+	{0x6b9cdfe7, "Discard medicine more than two years old."},
+	{0xc90ef73f, "He who has a shady past knows that nice guys finish last."},
+	{0xb902341f, "I wouldn't marry him with a ten foot pole."},
+	{0x42080e8, "Free! Free!/A trip/to Mars/for 900/empty jars/Burma Shave"},
+	{0x154c6d11, "The days of the digital watch are numbered.  -Tom Stoppard"},
+	{0x4c418325, "Nepal premier won't resign."},
+	{0x33955150, "For every action there is an equal and opposite government program."},
+	{0x26216a4b, "His money is twice tainted: 'taint yours and 'taint mine."},
+	{0x1abbe45e, "There is no reason for any individual to have a computer in their home. -Ken Olsen, 1977"},
+	{0xc89a94f7, "It's a tiny change to the code and not completely disgusting. - Bob Manchek"},
+	{0xab3abe14, "size:  a.out:  bad magic"},
+	{0xbab102b6, "The major problem is with sendmail.  -Mark Horton"},
+	{0x999149d7, "Give me a rock, paper and scissors and I will move the world.  CCFestoon"},
+	{0x6d52a33c, "If the enemy is within range, then so are you."},
+	{0x90631e8d, "It's well we cannot hear the screams/That we create in others' dreams."},
+	{0x78309130, "You remind me of a TV show, but that's all right: I watch it anyway."},
+	{0x7d0a377f, "C is as portable as Stonehedge!!"},
+	{0x8c79fd79, "Even if I could be Shakespeare, I think I should still choose to be Faraday. - A. Huxley"},
+	{0xa20b7167, "The fugacity of a constituent in a mixture of gases at a given temperature is proportional to its mole fraction.  Lewis-Randall Rule"},
+	{0x8e0bb443, "How can you write a big system without C++?  -Paul Glick"},
 }
 
 func TestGolden(t *testing.T) {
diff --git a/src/pkg/hash/crc64/Makefile b/src/pkg/hash/crc64/Makefile
index 01b755b3e..5f6c3de69 100644
--- a/src/pkg/hash/crc64/Makefile
+++ b/src/pkg/hash/crc64/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.$(GOARCH)
+include ../../../Make.inc
 
 TARG=hash/crc64
 GOFILES=\
diff --git a/src/pkg/hash/crc64/crc64.go b/src/pkg/hash/crc64/crc64.go
index 89e431977..844386564 100644
--- a/src/pkg/hash/crc64/crc64.go
+++ b/src/pkg/hash/crc64/crc64.go
@@ -80,7 +80,7 @@ func (d *digest) Sum64() uint64 { return d.crc }
 func (d *digest) Sum() []byte {
 	p := make([]byte, 8)
 	s := d.Sum64()
-	p[0] = byte(s >> 54)
+	p[0] = byte(s >> 56)
 	p[1] = byte(s >> 48)
 	p[2] = byte(s >> 40)
 	p[3] = byte(s >> 32)
diff --git a/src/pkg/hash/crc64/crc64_test.go b/src/pkg/hash/crc64/crc64_test.go
index 664e1aeb3..e932524e0 100644
--- a/src/pkg/hash/crc64/crc64_test.go
+++ b/src/pkg/hash/crc64/crc64_test.go
@@ -15,37 +15,37 @@ type test struct {
 }
 
 var golden = []test{
-	test{0x0, ""},
-	test{0x3420000000000000, "a"},
-	test{0x36c4200000000000, "ab"},
-	test{0x3776c42000000000, "abc"},
-	test{0x336776c420000000, "abcd"},
-	test{0x32d36776c4200000, "abcde"},
-	test{0x3002d36776c42000, "abcdef"},
-	test{0x31b002d36776c420, "abcdefg"},
-	test{0xe21b002d36776c4, "abcdefgh"},
-	test{0x8b6e21b002d36776, "abcdefghi"},
-	test{0x7f5b6e21b002d367, "abcdefghij"},
-	test{0x8ec0e7c835bf9cdf, "Discard medicine more than two years old."},
-	test{0xc7db1759e2be5ab4, "He who has a shady past knows that nice guys finish last."},
-	test{0xfbf9d9603a6fa020, "I wouldn't marry him with a ten foot pole."},
-	test{0xeafc4211a6daa0ef, "Free! Free!/A trip/to Mars/for 900/empty jars/Burma Shave"},
-	test{0x3e05b21c7a4dc4da, "The days of the digital watch are numbered.  -Tom Stoppard"},
-	test{0x5255866ad6ef28a6, "Nepal premier won't resign."},
-	test{0x8a79895be1e9c361, "For every action there is an equal and opposite government program."},
-	test{0x8878963a649d4916, "His money is twice tainted: 'taint yours and 'taint mine."},
-	test{0xa7b9d53ea87eb82f, "There is no reason for any individual to have a computer in their home. -Ken Olsen, 1977"},
-	test{0xdb6805c0966a2f9c, "It's a tiny change to the code and not completely disgusting. - Bob Manchek"},
-	test{0xf3553c65dacdadd2, "size:  a.out:  bad magic"},
-	test{0x9d5e034087a676b9, "The major problem is with sendmail.  -Mark Horton"},
-	test{0xa6db2d7f8da96417, "Give me a rock, paper and scissors and I will move the world.  CCFestoon"},
-	test{0x325e00cd2fe819f9, "If the enemy is within range, then so are you."},
-	test{0x88c6600ce58ae4c6, "It's well we cannot hear the screams/That we create in others' dreams."},
-	test{0x28c4a3f3b769e078, "You remind me of a TV show, but that's all right: I watch it anyway."},
-	test{0xa698a34c9d9f1dca, "C is as portable as Stonehedge!!"},
-	test{0xf6c1e2a8c26c5cfc, "Even if I could be Shakespeare, I think I should still choose to be Faraday. - A. Huxley"},
-	test{0xd402559dfe9b70c, "The fugacity of a constituent in a mixture of gases at a given temperature is proportional to its mole fraction.  Lewis-Randall Rule"},
-	test{0xdb6efff26aa94946, "How can you write a big system without C++?  -Paul Glick"},
+	{0x0, ""},
+	{0x3420000000000000, "a"},
+	{0x36c4200000000000, "ab"},
+	{0x3776c42000000000, "abc"},
+	{0x336776c420000000, "abcd"},
+	{0x32d36776c4200000, "abcde"},
+	{0x3002d36776c42000, "abcdef"},
+	{0x31b002d36776c420, "abcdefg"},
+	{0xe21b002d36776c4, "abcdefgh"},
+	{0x8b6e21b002d36776, "abcdefghi"},
+	{0x7f5b6e21b002d367, "abcdefghij"},
+	{0x8ec0e7c835bf9cdf, "Discard medicine more than two years old."},
+	{0xc7db1759e2be5ab4, "He who has a shady past knows that nice guys finish last."},
+	{0xfbf9d9603a6fa020, "I wouldn't marry him with a ten foot pole."},
+	{0xeafc4211a6daa0ef, "Free! Free!/A trip/to Mars/for 900/empty jars/Burma Shave"},
+	{0x3e05b21c7a4dc4da, "The days of the digital watch are numbered.  -Tom Stoppard"},
+	{0x5255866ad6ef28a6, "Nepal premier won't resign."},
+	{0x8a79895be1e9c361, "For every action there is an equal and opposite government program."},
+	{0x8878963a649d4916, "His money is twice tainted: 'taint yours and 'taint mine."},
+	{0xa7b9d53ea87eb82f, "There is no reason for any individual to have a computer in their home. -Ken Olsen, 1977"},
+	{0xdb6805c0966a2f9c, "It's a tiny change to the code and not completely disgusting. - Bob Manchek"},
+	{0xf3553c65dacdadd2, "size:  a.out:  bad magic"},
+	{0x9d5e034087a676b9, "The major problem is with sendmail.  -Mark Horton"},
+	{0xa6db2d7f8da96417, "Give me a rock, paper and scissors and I will move the world.  CCFestoon"},
+	{0x325e00cd2fe819f9, "If the enemy is within range, then so are you."},
+	{0x88c6600ce58ae4c6, "It's well we cannot hear the screams/That we create in others' dreams."},
+	{0x28c4a3f3b769e078, "You remind me of a TV show, but that's all right: I watch it anyway."},
+	{0xa698a34c9d9f1dca, "C is as portable as Stonehedge!!"},
+	{0xf6c1e2a8c26c5cfc, "Even if I could be Shakespeare, I think I should still choose to be Faraday. - A. Huxley"},
+	{0xd402559dfe9b70c, "The fugacity of a constituent in a mixture of gases at a given temperature is proportional to its mole fraction.  Lewis-Randall Rule"},
+	{0xdb6efff26aa94946, "How can you write a big system without C++?  -Paul Glick"},
 }
 
 var tab = MakeTable(ISO)