From cb6a6b25e409efd06ad7ffb87cf73bbe243d704a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 31 Jan 2018 14:43:37 +0000 Subject: net: rename TestAddr6 to avoid gotest confusion On ppc64 gotest treats data variables whose names begin with "Test" as tests to run. This is to support the function descriptors used for ppc64 ELF ABI v1. This causes gotest to think that TestAddr6 is a test, when it is actually a variable. For a simple fix until we can figure out how to write gotest properly, rename the variable. Fixes golang/go#23623 Reviewed-on: https://go-review.googlesource.com/90995 From-SVN: r257235 --- gcc/go/gofrontend/MERGE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc') 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. -- cgit v1.1