merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index e6060a76309a53bc88bca34e6643f63e8a89a287..1e9b95aa397211640f7b84b468600227e7fb78cc 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-22  Douglas B Rupp  <rupp@gnat.com>
+
+       * configure: Regenerate.
+
 2012-01-10  Jason Merrill  <jason@redhat.com>
 
        * cp-demangle.c (d_print_comp) [DEMANGLE_COMPONENT_OPERATOR]:

diff --git a/libiberty/configure b/libiberty/configure
index b0edb0b2994590f8e43fde6e73a6b14fec9b2b61..6e98352f356ffdc22ecdba010b6378a1d307b659 100755 (executable)
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -4867,7 +4867,7 @@ case "${host}" in
        ;;
     i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
        ;;
-    i[34567]86-*-interix3*)
+    i[34567]86-*-interix[3-9]*)
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
        ;;