diff options
author | DJ Delorie <dj@redhat.com> | 2002-01-01 01:03:22 +0000 |
---|---|---|
committer | DJ Delorie <dj@redhat.com> | 2002-01-01 01:03:22 +0000 |
commit | f348a7b160d3c55a2c42294149a4d1138c1c8df3 (patch) | |
tree | bee6e84a84a5052e141b84eeaba6e7947851c226 | |
parent | 6d01e7be20dd4e9e595cac35375ce2063cf0374f (diff) | |
download | gdb-f348a7b160d3c55a2c42294149a4d1138c1c8df3.zip gdb-f348a7b160d3c55a2c42294149a4d1138c1c8df3.tar.gz gdb-f348a7b160d3c55a2c42294149a4d1138c1c8df3.tar.bz2 |
merge from gcc
-rw-r--r-- | libiberty/ChangeLog | 5 | ||||
-rw-r--r-- | libiberty/aclocal.m4 | 3 | ||||
-rwxr-xr-x | libiberty/configure | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 3537cae..c0c5f48 100644 --- 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 7b1b677..103e246 100644 --- a/libiberty/aclocal.m4 +++ b/libiberty/aclocal.m4 @@ -48,6 +48,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 9291f52..8ddd98d 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -3151,6 +3151,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 |