aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/net/dnsclient_unix_test.go6
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b5d5a28..ba140ef 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-a347356d0f432cafb69f0cc5833d27663736a042
+973ae0a30c17e736f57377fa32371719b9ebccf6
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/go/net/dnsclient_unix_test.go b/libgo/go/net/dnsclient_unix_test.go
index 82a6c65..9e4015f 100644
--- a/libgo/go/net/dnsclient_unix_test.go
+++ b/libgo/go/net/dnsclient_unix_test.go
@@ -27,7 +27,7 @@ var goResolver = Resolver{PreferGo: true}
const TestAddr uint32 = 0xc0000201
// Test address from 2001:db8::/32 block, reserved by RFC 3849 for documentation.
-var TestAddr6 = [16]byte{0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
+var VarTestAddr6 = [16]byte{0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
var dnsTransportFallbackTests = []struct {
server string
@@ -506,7 +506,7 @@ func TestGoLookupIPWithResolverConfig(t *testing.T) {
Class: dnsClassINET,
Rdlength: 16,
},
- AAAA: TestAddr6,
+ AAAA: VarTestAddr6,
})
}
}
@@ -1230,7 +1230,7 @@ func TestStrictErrorsLookupIP(t *testing.T) {
Class: dnsClassINET,
Rdlength: 16,
},
- AAAA: TestAddr6,
+ AAAA: VarTestAddr6,
},
}
default: