summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-02-04 14:02:15 +0000
committerEric Andersen <andersen@codepoet.org>2002-02-04 14:02:15 +0000
commite0ab12bcbfd3ac270b4fb6b35cb8d33c2212ffe2 (patch)
tree056093c8b8a442fd8f177d1927b7346b702fb306
parent473a7dd3d8c4ae64956db05872e35a0336f447ab (diff)
Fix naming error in brk.c, enable faster malloc by default
-rw-r--r--extra/Configs/Config.mips4
-rw-r--r--libc/sysdeps/linux/mips/brk.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index 0e85cfe80..0e044e4da 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -97,9 +97,9 @@ LOCALE_DIR = "/usr/share/uClibc-locale/"
# "malloc-930716" is from libc-5.3.12 and was/is the standard gnu malloc.
# It is actually smaller than "malloc", at least on i386. Right now, it
# only works on i386 (and maybe m68k) because it needs sbrk.
-MALLOC = malloc-simple
+#MALLOC = malloc-simple
#MALLOC = malloc
-#MALLOC = malloc-930716
+MALLOC = malloc-930716
# If you want to collect common syscall code into one function, set to this to
# `true'. Set it to false otherwise.
diff --git a/libc/sysdeps/linux/mips/brk.c b/libc/sysdeps/linux/mips/brk.c
index 15026e102..82e44e461 100644
--- a/libc/sysdeps/linux/mips/brk.c
+++ b/libc/sysdeps/linux/mips/brk.c
@@ -21,9 +21,9 @@
#include <unistd.h>
#include <sys/syscall.h>
-void *__curbrk = 0;
+void *___brk_addr = 0;
-int __brk (void *addr)
+int brk (void *addr)
{
void *newbrk;
@@ -37,7 +37,7 @@ int __brk (void *addr)
: "$4", "$7");
newbrk = (void *) res;
}
- __curbrk = newbrk;
+ ___brk_addr = newbrk;
if (newbrk < addr)
{