summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2009-04-08 16:42:57 +0000
committerDJ Delorie <dj@redhat.com>2009-04-08 16:42:57 +0000
commit3c72fdec4e1915da62fbb6c279f3c9c0cd486873 (patch)
treeeedfdeefab85fa573153ea24b0ffcdb2f46d2184
parenta0c402a5641d9229b552066d526190252b0ee968 (diff)
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rwxr-xr-xlibiberty/configure2
-rw-r--r--libiberty/configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 141246a124..2e0a27c66a 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 4d0aeae4e5..ee8fbb02a6 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 7d167c35a8..6cfe335c68 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