From 48e21b40b5549ddcf2a3e20cde612ed5c52ed3c2 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Sun, 30 Oct 2016 16:45:34 +0000
Subject: libgo: eliminate a lot of duplication in Makefile.am

    I read through the GNU make manual.  I knew there had to be a way to do it.

    Remove the special netgo library.  The essential feature--using the Go
    DNS resolver--is now available by setting GODEBUG=netdns=go.

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

From-SVN: r241687
---
 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 4d04705..f1520e4 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-fe38baff61b9b9426a4f60ff078cf3c8722bf94d
+4ca21c94f00c620bfde2f924e214c78fe2e1ff69
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1