diff options
author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-06-04 18:31:57 +0000 |
---|---|---|
committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-06-04 18:31:57 +0000 |
commit | 09e967c2d732783b2579e4e120cd9b608404cb00 (patch) | |
tree | 8d2783a6a7e33608c6012efd6a88b8f5694df81d /mdk-stage1/dietlibc/lib/sbrk.c | |
parent | 18fcff49d3c836697d3b75a3d01d31c700e69974 (diff) | |
download | drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar.gz drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar.bz2 drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar.xz drakx-09e967c2d732783b2579e4e120cd9b608404cb00.zip |
Merge from R9_0-AMD64, most notably:
- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes
Diffstat (limited to 'mdk-stage1/dietlibc/lib/sbrk.c')
-rw-r--r-- | mdk-stage1/dietlibc/lib/sbrk.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mdk-stage1/dietlibc/lib/sbrk.c b/mdk-stage1/dietlibc/lib/sbrk.c index 945ad5a16..799ce7428 100644 --- a/mdk-stage1/dietlibc/lib/sbrk.c +++ b/mdk-stage1/dietlibc/lib/sbrk.c @@ -1,20 +1,21 @@ #include <unistd.h> -extern int __brk(void *end_data_segment); +extern int __libc_brk(void *end_data_segment); extern void* __curbrk; -void* __sbrk(ptrdiff_t increment) { +void* __libc_sbrk(ptrdiff_t increment); +void* __libc_sbrk(ptrdiff_t increment) { void* oldbrk; if (__curbrk==0) - if (__brk(0) < 0) + if (__libc_brk(0) < 0) return (void*)-1; if (increment==0) return __curbrk; oldbrk=__curbrk; - if (__brk(oldbrk+increment)<0) + if (__libc_brk((char*)oldbrk+increment)<0) return (void*)-1; return oldbrk; } -void* sbrk (ptrdiff_t increment) __attribute__((weak,alias("__sbrk"))); +void* sbrk (ptrdiff_t increment) __attribute__((weak,alias("__libc_sbrk"))); |