merge from gcc

This commit is contained in:
DJ Delorie 2002-01-01 01:03:22 +00:00
parent 6d01e7be20
commit f348a7b160
3 changed files with 12 additions and 1 deletions

View File

@ -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

View File

@ -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

5
libiberty/configure vendored
View File

@ -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