From 28204e0849f38d7c984a189c44a80573de52bedc Mon Sep 17 00:00:00 2001
From: Jan-Benedict Glaw <jbglaw@lug-owl.de>
Date: Tue, 30 Apr 2013 12:40:42 +0000
Subject: [PATCH] 2013-04-30  Jan-Benedict Glaw  <jbglaw@lug-owl.de>

config/
	* picflag.m4: Merge from GCC.
	* dfp.m4: Ditto.
	* bootstrap-asan.mk: Ditto.
	* ChangeLog: Ditto.
---
 config/ChangeLog         | 10 ++++++++++
 config/bootstrap-asan.mk |  1 +
 config/dfp.m4            |  2 +-
 config/picflag.m4        |  4 +++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/config/ChangeLog b/config/ChangeLog
index c6e8b256e..cdc733c70 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-27  Kai Tietz  <ktietz@redhat.com>
+
+	* dfp.m4: Add support for cygwin x64 target.
+	* picflag.m4: Likewise.
+
+2013-02-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bootstrap-asan.mk (POSTSTAGE1_LDFLAGS): Add
+	-B$$r/prev-$(TARGET_SUBDIR)/libsanitizer/asan/.
+
 2013-01-15  Richard Biener  <rguenther@suse.de>
 
 	PR other/55973
diff --git a/config/bootstrap-asan.mk b/config/bootstrap-asan.mk
index d37a9da6b..e3f34f5ad 100644
--- a/config/bootstrap-asan.mk
+++ b/config/bootstrap-asan.mk
@@ -3,4 +3,5 @@
 STAGE2_CFLAGS += -fsanitize=address
 STAGE3_CFLAGS += -fsanitize=address
 POSTSTAGE1_LDFLAGS += -fsanitize=address -static-libasan \
+		      -B$$r/prev-$(TARGET_SUBDIR)/libsanitizer/asan/ \
 		      -B$$r/prev-$(TARGET_SUBDIR)/libsanitizer/asan/.libs
diff --git a/config/dfp.m4 b/config/dfp.m4
index e971db4dc..48683f0f9 100644
--- a/config/dfp.m4
+++ b/config/dfp.m4
@@ -23,7 +23,7 @@ Valid choices are 'yes', 'bid', 'dpd', and 'no'.]) ;;
     powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
     i?86*-*-gnu* | \
     i?86*-*-mingw* | x86_64*-*-mingw* | \
-    i?86*-*-cygwin*)
+    i?86*-*-cygwin* | x86_64*-*-cygwin*)
       enable_decimal_float=yes
       ;;
     *)
diff --git a/config/picflag.m4 b/config/picflag.m4
index bd818125a..2ee5cd078 100644
--- a/config/picflag.m4
+++ b/config/picflag.m4
@@ -17,7 +17,9 @@ case "${$2}" in
     hppa*64*-*-hpux*)
 	# PIC is the default for 64-bit PA HP-UX.
 	;;
-    i[[34567]]86-*-cygwin* | i[[34567]]86-*-mingw* | x86_64-*-mingw*)
+    i[[34567]]86-*-cygwin* | x86_64-*-cygwin*)
+	;;
+    i[[34567]]86-*-mingw* | x86_64-*-mingw*)
 	;;
     i[[34567]]86-*-interix[[3-9]]*)
 	# Interix 3.x gcc -fpic/-fPIC options generate broken code.