diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-08-19 01:07:44 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-08-19 01:07:44 +0000 |
commit | 39778c6c9e6455303979aca2dc4685bf56cdc9be (patch) | |
tree | 9dcdd44d6e7df176f7724ac8ab674a82a947947c /sysdeps/generic | |
parent | e9d258b798f0c2e46433d2bd483e4fd47cc00915 (diff) | |
download | glibc-39778c6c9e6455303979aca2dc4685bf56cdc9be.tar.gz glibc-39778c6c9e6455303979aca2dc4685bf56cdc9be.tar.xz glibc-39778c6c9e6455303979aca2dc4685bf56cdc9be.zip |
update from main archive 960818 cvs/libc-960820 cvs/libc-960819
Diffstat (limited to 'sysdeps/generic')
-rw-r--r-- | sysdeps/generic/sbrk.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sysdeps/generic/sbrk.c b/sysdeps/generic/sbrk.c index 92ad8c4102..f63195adb3 100644 --- a/sysdeps/generic/sbrk.c +++ b/sysdeps/generic/sbrk.c @@ -22,10 +22,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ extern void *__curbrk; extern int __brk (void *addr); -#ifdef PIC -extern int __libc_is_static; -weak_extern (__libc_is_static) -#endif +extern int __libc_multiple_libcs; /* Defined in init-first.c. */ /* Extend the process's data space by INCREMENT. If INCREMENT is negative, shrink data space by - INCREMENT. @@ -40,9 +37,7 @@ __sbrk (ptrdiff_t increment) __curbrk from the kernel's brk value. That way two separate instances of __brk and __sbrk can share the heap, returning interleaved pieces of it. */ -#ifdef PIC - if (__curbrk == NULL || &__libc_is_static == NULL) -#endif + if (__curbrk == NULL || __libc_multiple_libcs) if (__brk (0) < 0) return (void *) -1; |