summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-10-12 15:29:43 +0000
committerEric Andersen <andersen@codepoet.org>2000-10-12 15:29:43 +0000
commit61885f3c4185f3aea2bd3b98f954935d221458e7 (patch)
treefdf2108d545be0bdfb76f44d697237056e86bc31
parenta99617fe8fdb56b3e877558bfd6572ce65ad39de (diff)
Screwed up non-mmu support. #define was backwards.
-Erik
-rw-r--r--libc/stdlib/Makefile2
-rw-r--r--libc/stdlib/malloc-simple/Makefile2
-rw-r--r--libc/stdlib/malloc/Makefile2
-rw-r--r--libc/stdlib/malloc/malloc.c5
4 files changed, 5 insertions, 6 deletions
diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index b4211ecf7..a6bd08710 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -21,7 +21,7 @@
# respective copyright holders.
TOPDIR=../
-include $(TOPDIR)Rules.make
+include $(TOPDIR)Rules.mak
LIBC=$(TOPDIR)libc.a
DIRS = $(MALLOC)
diff --git a/libc/stdlib/malloc-simple/Makefile b/libc/stdlib/malloc-simple/Makefile
index e46415536..765bf28d0 100644
--- a/libc/stdlib/malloc-simple/Makefile
+++ b/libc/stdlib/malloc-simple/Makefile
@@ -21,7 +21,7 @@
# respective copyright holders.
TOPDIR=../../
-include $(TOPDIR)Rules.make
+include $(TOPDIR)Rules.mak
LIBC=$(TOPDIR)libc.a
MSRC=alloc.c
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile
index 0824e71a8..920276c10 100644
--- a/libc/stdlib/malloc/Makefile
+++ b/libc/stdlib/malloc/Makefile
@@ -21,7 +21,7 @@
# respective copyright holders.
TOPDIR=../../
-include $(TOPDIR)Rules.make
+include $(TOPDIR)Rules.mak
LIBC=$(TOPDIR)libc.a
CSRC=malloc.c
diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c
index 4ed9fe873..88d8698b2 100644
--- a/libc/stdlib/malloc/malloc.c
+++ b/libc/stdlib/malloc/malloc.c
@@ -191,10 +191,9 @@ static void *hunk_alloc(int size)
{
if ((p = (Hunk_t*)mmap(HUNK_MSTART,HUNK_MSIZE,PROT_READ|PROT_WRITE,
#ifdef __HAS_NO_MMU__
- MAP_PRIVATE|MAP_ANONYMOUS
-#else
-
MAP_SHARED|MAP_ANONYMOUS
+#else
+ MAP_PRIVATE|MAP_ANONYMOUS
#endif
,0,0)) == (Hunk_t*)MAP_FAILED)
return NULL;