From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 16 Jan 2017 01:05:10 +0000 (+0000)
Subject: libgo: correct golang_org Makefile variables not used on all systems
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=58a3a26bbdc5f5158b004c761fb054168cd044df;p=gcc.git

libgo: correct golang_org Makefile variables not used on all systems

    Patch by Rainer Orth.

    Reviewed-on: https://go-review.googlesource.com/35238

From-SVN: r244483
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 61359d33d48..35c0275f2ee 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ea73a80a6047f477d92fccc7de143a3ee1021c65
+a28b04adaeff8de61c336374db66b24ed96c30f0
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 0d9b7a7f6ad..14ee9bec211 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1132,7 +1132,7 @@ if LIBGO_IS_BSD
 $(eval $(call PACKAGE_template,golang_org/x/net/route))
 
 golang_org_x_net_route_lo = \
-	golang_org/x/net/route/route.lo
+	golang_org/x/net/route.lo
 golang_org_x_net_route_check = \
 	golang_org/x/net/route/check
 
@@ -1145,7 +1145,7 @@ if LIBGO_IS_SOLARIS
 $(eval $(call PACKAGE_template,golang_org/x/net/lif))
 
 golang_org_x_net_lif_lo = \
-	golang_org/x/net/lif/lif.lo
+	golang_org/x/net/lif.lo
 golang_org_x_net_lif_check = \
 	golang_org/x/net/lif/check
 
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 4b46076b010..e3e396caaeb 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1172,13 +1172,13 @@ extra_go_files_runtime_internal_sys = version.go
 @HAVE_STAT_TIMESPEC_TRUE@@LIBGO_IS_SOLARIS_TRUE@matchargs_os = --tag=solaristag
 @LIBGO_IS_SOLARIS_FALSE@matchargs_os = 
 @LIBGO_IS_BSD_TRUE@golang_org_x_net_route_lo = \
-@LIBGO_IS_BSD_TRUE@	golang_org/x/net/route/route.lo
+@LIBGO_IS_BSD_TRUE@	golang_org/x/net/route.lo
 
 @LIBGO_IS_BSD_TRUE@golang_org_x_net_route_check = \
 @LIBGO_IS_BSD_TRUE@	golang_org/x/net/route/check
 
 @LIBGO_IS_SOLARIS_TRUE@golang_org_x_net_lif_lo = \
-@LIBGO_IS_SOLARIS_TRUE@	golang_org/x/net/lif/lif.lo
+@LIBGO_IS_SOLARIS_TRUE@	golang_org/x/net/lif.lo
 
 @LIBGO_IS_SOLARIS_TRUE@golang_org_x_net_lif_check = \
 @LIBGO_IS_SOLARIS_TRUE@	golang_org/x/net/lif/check