Make gcc-inplace-math work with new mpfr.

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51935

8 files changed, 76 insertions, 14 deletions

diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index bd7482b7a39..ff24a2f6a4e 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2012/04/13 11:01:32 hans Exp $
+$NetBSD: distinfo,v 1.14 2012/05/03 12:20:18 hans Exp $
 
 SHA1 (gcc-4.4.7.tar.bz2) = a6c834b0c2f58583da1d093de7a81a20ede9af75
 RMD160 (gcc-4.4.7.tar.bz2) = 481609ebff38bf8a1fdf9a300dc460c1f425836a
 Size (gcc-4.4.7.tar.bz2) = 63179340 bytes
 SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
-SHA1 (patch-ad) = b36357efde53ee3e1a7b18f30b7ae9d9ab837325
+SHA1 (patch-ad) = 96722d5af63a955e3d9c934b1249e5e8a1173a8c
 SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621
 SHA1 (patch-ag) = 0897b7ed75b4dc7d6ad50ecfa886edca7e29703b
 SHA1 (patch-ai) = 96ffd5c07761a53dbb036930c49e4c84574455c7
diff --git a/lang/gcc44/patches/patch-ad b/lang/gcc44/patches/patch-ad
index 0e3425143c6..035784d36ef 100644
--- a/lang/gcc44/patches/patch-ad
+++ b/lang/gcc44/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2012/04/13 11:01:32 hans Exp $
+$NetBSD: patch-ad,v 1.4 2012/05/03 12:20:19 hans Exp $
 
 --- configure.orig	2010-10-02 11:40:32.000000000 +0000
 +++ configure
-@@ -4532,7 +4532,7 @@ if test "${with_mpfr_lib+set}" = set; th
+@@ -4534,7 +4534,7 @@ if test "${with_mpfr_lib+set}" = set; th
  fi;
  
  if test "x$with_mpfr" != x; then
@@ -11,7 +11,20 @@ $NetBSD: patch-ad,v 1.3 2012/04/13 11:01:32 hans Exp $
    gmpinc="-I$with_mpfr/include"
  fi
  if test "x$with_mpfr_include" != x; then
-@@ -4596,7 +4596,7 @@
+@@ -4544,8 +4544,10 @@ if test "x$with_mpfr_lib" != x; then
+   gmplibs="-L$with_mpfr_lib $gmplibs"
+ fi
+ if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
+-  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/.libs -L$$r/$(HOST_SUBDIR)/mpfr/_libs '"$gmplibs"
+-  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
++  sdir=
++  test -d "${srcdir}/mpfr/src" && sdir=/src
++  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"${sdir}"'/.libs -L$$r/$(HOST_SUBDIR)/mpfr'"${sdir}/_libs $gmplibs"
++  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"${sdir} "'-I$$s/mpfr'"${sdir} $gmpinc"
+   # Do not test the mpfr version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+   # but it would be included on the link line in the version check below
+@@ -4598,7 +4600,7 @@ fi
  if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
    gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
    gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
@@ -20,4 +33,3 @@ $NetBSD: patch-ad,v 1.3 2012/04/13 11:01:32 hans Exp $
    # Do not test the gmp version.  Assume that it is sufficient, since
    # it is in the source tree, and the library has not been built yet
    # but it would be included on the link line in the version check below
-
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 2905da0545c..6ce0378a486 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/12/22 14:14:22 wiz Exp $
+$NetBSD: distinfo,v 1.5 2012/05/03 12:20:19 hans Exp $
 
 SHA1 (gcc-4.5.3.tar.bz2) = 73c45dfda5eef6b124be53e56828b5925198cc1b
 RMD160 (gcc-4.5.3.tar.bz2) = d07aa90f2186b4e082dfd5ad5d5188c097fb6247
@@ -6,7 +6,7 @@ Size (gcc-4.5.3.tar.bz2) = 66374586 bytes
 SHA1 (patch-aa) = c488dc25e038d97c737c8c72437660598d9e15d3
 SHA1 (patch-ab) = 61bc2ebf150c6e471917e145d74e7795dc162194
 SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
-SHA1 (patch-ad) = e26ba1275f5dc294b4412c55ddb540712e705cb5
+SHA1 (patch-ad) = b72c93d8477a567363616717e20eef1b33e7d307
 SHA1 (patch-af) = 54fb9fb3438eb7c646b9d51b6b0cf3ded27d4989
 SHA1 (patch-ag) = b58f8b82fcf17c60eb2700bc54d6625ca45e542b
 SHA1 (patch-ah) = a963394b0434b82494b7510d4b2705f77acfb668
diff --git a/lang/gcc45/patches/patch-ad b/lang/gcc45/patches/patch-ad
index b63d6fdcfb6..a35c0bd5222 100644
--- a/lang/gcc45/patches/patch-ad
+++ b/lang/gcc45/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2012/05/03 12:20:19 hans Exp $
 
 --- configure.orig	2010-04-02 13:35:47.000000000 -0400
 +++ configure
@@ -11,3 +11,18 @@ $NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
    gmpinc="-I$with_mpfr/include $gmpinc"
  fi
  if test "x$with_mpfr_include" != x; then
+@@ -5279,9 +5279,11 @@ if test "x$with_mpfr_lib" != x; then
+   gmplibs="-L$with_mpfr_lib $gmplibs"
+ fi
+ if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
+-  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
+-  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
+-  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
++  sdir=
++  test -d "${srcdir}/mpfr/src" && sdir=/src
++  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir $gmplibs"
++  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"$sdir "'-I$$s/mpfr'"$sdir $gmpinc"
++  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr'"$sdir "'--with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir"
+   # Do not test the mpfr version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+   # but it would be included on the link line in the version check below
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index d89769ae8ce..566d6c9efc3 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2012/04/17 08:24:54 wiz Exp $
+$NetBSD: distinfo,v 1.10 2012/05/03 12:20:19 hans Exp $
 
 SHA1 (gcc-4.6.3.tar.bz2) = ce317ca5c8185b58bc9300182b534608c578637f
 RMD160 (gcc-4.6.3.tar.bz2) = 9abb2f940d08fc84f2d91b6a6ce8d662ca889269
@@ -6,7 +6,7 @@ Size (gcc-4.6.3.tar.bz2) = 71999439 bytes
 SHA1 (patch-aa) = e68232cd14d6be31dd2c45aefb454dde75d0bbba
 SHA1 (patch-ab) = 419dbd3e80b960ac391dba123d8de68abdd35355
 SHA1 (patch-ac) = 0f708412670eca90c2c8e3fa675cffb14be768cd
-SHA1 (patch-ad) = cd560eba165fe0c8d43a336d6674bdc95cd00fb1
+SHA1 (patch-ad) = b5e17219e7b7ba158b9f3e1a67e155fb158b4484
 SHA1 (patch-af) = e4e194ef29924eb986536972c5f5e9f37d98eba3
 SHA1 (patch-ag) = 1753d08075de8527d8f14afc3df4afeacb10d507
 SHA1 (patch-ah) = 8df9292331e68a69481aaabc894f285199a7eb05
diff --git a/lang/gcc46/patches/patch-ad b/lang/gcc46/patches/patch-ad
index c02f6df0c06..66b788c7152 100644
--- a/lang/gcc46/patches/patch-ad
+++ b/lang/gcc46/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2012/05/03 12:20:19 hans Exp $
 
 --- configure.orig	2011-03-16 18:27:36.000000000 +0000
 +++ configure
-@@ -5275,7 +5275,7 @@ fi
+@@ -5269,7 +5269,7 @@ fi
  
  
  if test "x$with_mpfr" != x; then
@@ -11,3 +11,18 @@ $NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
    gmpinc="-I$with_mpfr/include $gmpinc"
  fi
  if test "x$with_mpfr_include" != x; then
+@@ -5279,9 +5279,11 @@ if test "x$with_mpfr_lib" != x; then
+   gmplibs="-L$with_mpfr_lib $gmplibs"
+ fi
+ if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
+-  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
+-  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
+-  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
++  sdir=
++  test -d "${srcdir}/mpfr/src" && sdir=/src
++  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir $gmplibs"
++  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"$sdir "'-I$$s/mpfr'"$sdir $gmpinc"
++  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr'"$sdir "'--with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir"
+   # Do not test the mpfr version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+   # but it would be included on the link line in the version check below
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 6655100eec0..b65dd81c4a1 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2012/04/30 09:12:28 sbd Exp $
+$NetBSD: distinfo,v 1.5 2012/05/03 12:20:19 hans Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -6,6 +6,7 @@ Size (ecj-4.5.jar) = 1470676 bytes
 SHA1 (gcc-4.7.0.tar.bz2) = 03b8241477a9f8a34f6efe7273d92b9b6dd9fe82
 RMD160 (gcc-4.7.0.tar.bz2) = 4ed660b281cdb9bcf98f5c2cf2da105c71db5be4
 Size (gcc-4.7.0.tar.bz2) = 82518546 bytes
+SHA1 (patch-configure) = 3482c45096a3c100c68c1b56947a12197b141292
 SHA1 (patch-gcc_Makefile.in) = 2372899a37259c89281e6bd1223e39df9b53a7e3
 SHA1 (patch-gcc_config.gcc) = 0fd91e83b97886589280d94457a71c0c551e93a3
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
diff --git a/lang/gcc47/patches/patch-configure b/lang/gcc47/patches/patch-configure
new file mode 100644
index 00000000000..08a5be9848e
--- /dev/null
+++ b/lang/gcc47/patches/patch-configure
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure,v 1.1 2012/05/03 12:20:19 hans Exp $
+
+--- configure.orig	2011-03-16 18:27:36.000000000 +0000
++++ configure
+@@ -5279,9 +5279,11 @@ if test "x$with_mpfr_lib" != x; then
+   gmplibs="-L$with_mpfr_lib $gmplibs"
+ fi
+ if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
+-  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
+-  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
+-  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
++  sdir=
++  test -d "${srcdir}/mpfr/src" && sdir=/src
++  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir $gmplibs"
++  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"$sdir "'-I$$s/mpfr'"$sdir $gmpinc"
++  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr'"$sdir "'--with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir"
+   # Do not test the mpfr version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+   # but it would be included on the link line in the version check below