merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 141246a1248b0abcb0970eb66fb12523855bd99b..2e0a27c66aa54416a73eb6d18e55658283de36aa 100644 (file)
--- 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 4d0aeae4e5ca1a93d206e47715fa00d4d52876bb..ee8fbb02a66983ee942ab2ddc5c135e8075cb559 100755 (executable)
--- 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 7d167c35a8a82b43a4524832abc284de50b1874a..6cfe335c687256ab73f1fd3a8109d980bb35603c 100644 (file)
--- 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