From b65e579bbed0be723cb1e59b7b7501f561f52993 Mon Sep 17 00:00:00 2001
From: dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 11 Feb 2003 05:50:01 +0000
Subject: [PATCH] * acinclude.m4: Check for native targets that can't link at
 this point in the build. * aclocal.m4: Regenerate. * configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62679 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/ChangeLog    | 7 +++++++
 libstdc++-v3/acinclude.m4 | 8 +++++++-
 libstdc++-v3/aclocal.m4   | 8 +++++++-
 libstdc++-v3/configure    | 8 +++++++-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 703000de407..2712b3a13a3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-11  DJ Delorie  <dj@redhat.com>
+
+	* acinclude.m4: Check for native targets that can't link at
+	this point in the build.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
 2003-02-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* hppa/atomicity.h (__Atomicity_lock<__inst>::_S_atomicity_lock):
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 2c705625d03..c7f69c82051 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -2128,9 +2128,15 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_triplet}/baseline_symbols.txt"
   AC_SUBST(baseline_file)
 
+  case "$target" in
+    *-*-cygwin* ) enable_abi_check=no ;;
+    * ) enable_abi_check=yes ;;
+  esac
+
   # Don't do ABI checking unless native.
   AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK,
-                 test x"$build" = x"$host" && test -z "$with_cross_host")
+                 test x"$build" = x"$host" && test -z "$with_cross_host" \
+		 && test "$enable_abi_check" = yes )
 ])
 
 
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 311bc45f325..24657eed029 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -2140,9 +2140,15 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_triplet}/baseline_symbols.txt"
   AC_SUBST(baseline_file)
 
+  case "$target" in
+    *-*-cygwin* ) enable_abi_check=no ;;
+    * ) enable_abi_check=yes ;;
+  esac
+
   # Don't do ABI checking unless native.
   AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK,
-                 test x"$build" = x"$host" && test -z "$with_cross_host")
+                 test x"$build" = x"$host" && test -z "$with_cross_host" \
+		 && test "$enable_abi_check" = yes )
 ])
 
 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 3e32041ad6e..eadc4be2b61 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -23525,7 +23525,13 @@ done
   # Don't do ABI checking unless native.
   
 
-if test x"$build" = x"$host" && test -z "$with_cross_host"; then
+  case "$target" in
+    *-*-cygwin* ) enable_abi_check=no ;;
+    * ) enable_abi_check=yes ;;
+  esac
+
+if test x"$build" = x"$host" && test -z "$with_cross_host" \
+		 && test "$enable_abi_check" = yes ; then
   GLIBCPP_BUILD_ABI_CHECK_TRUE=
   GLIBCPP_BUILD_ABI_CHECK_FALSE='#'
 else
-- 
2.11.4.GIT