merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3537caeb1659b76bab10cbc29938cf76095a57ce..c0c5f489fd52fb34f4b0e022111fb864900750f8 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-31  Ira Ruben  <ira@apple.com>
+
+       * aclocal.m4 (libiberty_AC_FUNC_STRNCMP): Use anon mmap as 2nd try.
+       * configure: Regenerated.
+
 2001-12-12  Craig Rodrigues  <rodrigc@gcc.gnu.org>
 
        PR other/2719

diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
index 7b1b677645e8dfcc26b7b202a39e62702be8b9e1..103e246de7ec47ee26c0b7b5ddf5322c906af6fb 100644 (file)
--- a/libiberty/aclocal.m4
+++ b/libiberty/aclocal.m4
@@ -47,6 +47,9 @@ main ()
   
   p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
                     MAP_ANON|MAP_PRIVATE, dev_zero, 0);
+  if (p == (char *)-1)
+    p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
+                      MAP_ANON|MAP_PRIVATE, -1, 0);
   if (p == (char *)-1)
     exit (2);
   else

diff --git a/libiberty/configure b/libiberty/configure
index 9291f5238c727caa65dc8611d79f0765f38e2661..8ddd98d07e335181c522c4b8629192cf0d1beafb 100755 (executable)
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -3150,6 +3150,9 @@ main ()
   
   p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
                     MAP_ANON|MAP_PRIVATE, dev_zero, 0);
+  if (p == (char *)-1)
+    p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
+                      MAP_ANON|MAP_PRIVATE, -1, 0);
   if (p == (char *)-1)
     exit (2);
   else
@@ -3167,7 +3170,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:3171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_strncmp_works=yes
 else