From 1335a8caf760e49d687866541cda051bd9651289 Mon Sep 17 00:00:00 2001
From: Jan-Benedict Glaw <jbglaw@lug-owl.de>
Date: Fri, 31 Oct 2014 11:03:57 +0000
Subject: [PATCH] configure.ac: Update comment.

2014-10-31  Jan-Benedict Glaw  <jbglaw@lug-owl.de>

./	* configure.ac: Update comment.
	* configure: Regenerate.

./contrib	* config-list.mk: Don't build Go for certain targets.

From-SVN: r216957
---
 ChangeLog              |  5 +++++
 configure              |  3 ++-
 configure.ac           |  5 +++--
 contrib/ChangeLog      |  4 ++++
 contrib/config-list.mk | 23 ++++++++++++++++++-----
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b7d0649541..c9f79623f81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-31  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+	* configure.ac: Update comment.
+	* configure: Regenerate.
+
 2014-10-31  Ilya Enkovich  <ilya.enkovich@intel.com>
 
 	* MAINTAINERS (Write After Approval): Add myself.
diff --git a/configure b/configure
index 3eab122bdc9..d0c760bba49 100755
--- a/configure
+++ b/configure
@@ -3413,7 +3413,8 @@ case "${target}" in
     ;;
 esac
 
-# Disable the go frontend on systems where it is known to not work.
+# Disable the go frontend on systems where it is known to not work. Please keep
+# this in sync with contrib/config-list.mk.
 case "${target}" in
 *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)
     unsupported_languages="$unsupported_languages go"
diff --git a/configure.ac b/configure.ac
index d8262f8a910..2f0af4a836f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -769,10 +769,11 @@ case "${target}" in
     ;;
   *-*-lynxos*)
     noconfigdirs="$noconfigdirs ${libgcj}"
-    ;; 
+    ;;
 esac
 
-# Disable the go frontend on systems where it is known to not work.
+# Disable the go frontend on systems where it is known to not work. Please keep
+# this in sync with contrib/config-list.mk.
 case "${target}" in
 *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)
     unsupported_languages="$unsupported_languages go"
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b340f875f36..3878803bdf2 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-31  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+	* config-list.mk: Don't build Go for certain targets.
+
 2014-10-04  Trevor Saunders  <tsaunders@mozilla.com>
 
 	* compare-all-tests: Don't test score-*.
diff --git a/contrib/config-list.mk b/contrib/config-list.mk
index 94884d9b255..16900e19e53 100644
--- a/contrib/config-list.mk
+++ b/contrib/config-list.mk
@@ -95,11 +95,24 @@ make-log-dir: ../gcc/MAINTAINERS
 
 $(LIST): make-log-dir
 	-mkdir $@
-	(cd $@ && \
-	../../gcc/configure \
-	--target=$(subst SCRIPTS,`pwd`/../scripts/,$(subst OPT,$(empty) -,$@)) \
-	--enable-werror-always ${host_options} --enable-languages=all,ada,go) \
-	> log/$@-config.out 2>&1
+	(											\
+		cd $@ &&									\
+		echo $@ &&									\
+		TGT=`echo $@ | sed -e 's/^\(.*\)OPT.*$$/\1/'` &&				\
+		TGT=`../../gcc/config.sub $$TGT` &&						\
+		case $$TGT in									\
+			*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)			\
+				ADDITIONAL_LANGUAGES="";					\
+				;;								\
+			*)									\
+				ADDITIONAL_LANGUAGES=",go";					\
+				;;								\
+		esac &&										\
+		../../gcc/configure								\
+			--target=$(subst SCRIPTS,`pwd`/../scripts/,$(subst OPT,$(empty) -,$@))	\
+			--enable-werror-always ${host_options}					\
+			--enable-languages=all,ada$$ADDITIONAL_LANGUAGES;			\
+	) > log/$@-config.out 2>&1
 
 $(LOGFILES) : log/%-make.out : %
 	-$(MAKE) -C $< $(TEST) > $@ 2>&1 && rm -rf $<
-- 
2.30.2