Patch from James Graves <jgraves@deltamobile.com> to better handle m68k.

Also fixes 2 very important malloc bugs!  Anyone using malloc (esp mmu-less)
should update and recompile.
 -Erik

2 files changed, 17 insertions, 4 deletions

diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c
index f31105d4e..f278a9583 100644
--- a/libc/stdlib/malloc-simple/alloc.c
+++ b/libc/stdlib/malloc-simple/alloc.c
@@ -99,10 +99,12 @@ void *realloc(void *ptr, size_t size)
 
 	if (size > 0) {
 		newptr = malloc(size);
-		if (newptr && ptr)
+		if (newptr && ptr) {
 			memcpy(newptr, ptr, size);
+			free(ptr);
+		}
 	}
-	if (ptr)
+	else
 		free(ptr);
 	return newptr;
 }
diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c
index b20c09390..fce529d80 100644
--- a/libc/stdlib/malloc/malloc.c
+++ b/libc/stdlib/malloc/malloc.c
@@ -495,7 +495,13 @@ static Block_t *bl_mapnew(size_t size)
 
 	map_size = PAGE_ALIGN(size);
 	pt = mmap(LARGE_MSTART, map_size, PROT_READ | PROT_WRITE | PROT_EXEC,
-			  MAP_PRIVATE | MAP_ANON, 0, 0);
+#ifdef __HAS_NO_MMU__
+							 MAP_SHARED | MAP_ANONYMOUS
+#else
+							 MAP_PRIVATE | MAP_ANONYMOUS
+#endif
+							 0, 0);
+
 	if (pt == MAP_FAILED)
 		return (Block_t *) NULL;
 
@@ -517,7 +523,12 @@ void __bl_uncommit(Block_t * b)
 
 #if M_DOTRIMMING
 	mmap(u_start, u_end - u_start, PROT_READ | PROT_WRITE | PROT_EXEC,
-		 MAP_PRIVATE | MAP_ANON | MAP_FIXED, 0, 0);
+#ifdef __HAS_NO_MMU__
+							 MAP_SHARED | MAP_ANONYMOUS |MAP_FIXED
+#else
+							 MAP_PRIVATE | MAP_ANONYMOUS |MAP_FIXED
+#endif
+							 0, 0);
 #endif
 }