From: DJ Delorie <dj@redhat.com>
Date: Wed, 8 Apr 2009 16:42:57 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3c72fdec4e1915da62fbb6c279f3c9c0cd486873;p=binutils-gdb.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 141246a1248..2e0a27c66aa 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-07  Arnaud Patard <apatard@mandriva.com>
+
+       * libiberty/configure.ac: Fix Linux/MIPS matching rule.
+       * libiberty/configure: Regenerate.
+
 2008-03-27  Ian Lance Taylor  <iant@google.com>
 
 	* memmem.c: New file, from gnulib.
diff --git a/libiberty/configure b/libiberty/configure
index 4d0aeae4e5c..ee8fbb02a66 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -4112,7 +4112,7 @@ if [ "${shared}" = "yes" ]; then
     i[34567]86-*-* | x86_64-*-*)
 			PICFLAG=-fpic ;;
     m68k-*-*)		PICFLAG=-fpic ;;
-    mips*-*-linux)	PICFLAG=-fPIC ;;
+    mips*-*-linux*)	PICFLAG=-fPIC ;;
     powerpc*-*-aix*)	;;
     powerpc*-*-*)	PICFLAG=-fPIC ;;
     sparc*-*-*)		case "${CFLAGS}" in
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index 7d167c35a8a..6cfe335c687 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -209,7 +209,7 @@ if [[ "${shared}" = "yes" ]]; then
     i[[34567]]86-*-* | x86_64-*-*)
 			PICFLAG=-fpic ;;
     m68k-*-*)		PICFLAG=-fpic ;;
-    mips*-*-linux)	PICFLAG=-fPIC ;;
+    mips*-*-linux*)	PICFLAG=-fPIC ;;
     powerpc*-*-aix*)	;;
     powerpc*-*-*)	PICFLAG=-fPIC ;;
     sparc*-*-*)		case "${CFLAGS}" in