[src/netbsd-1-4]: src/libexec/ld.aout_so Pull up revisions 1.6-1.7 (requested...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5a00fd675757
branches:  netbsd-1-4
changeset: 471265:5a00fd675757
user:      he <he%NetBSD.org@localhost>
date:      Sun Apr 01 15:47:54 2001 +0000

description:
Pull up revisions 1.6-1.7 (requested by itohy)
  Several changes to consolidate with main trunk:
   o Use MAP_PRIVATE instead of MAP_COPY.
   o A few minor fixes.

diffstat:

 libexec/ld.aout_so/malloc.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 23406c020302 -r 5a00fd675757 libexec/ld.aout_so/malloc.c
--- a/libexec/ld.aout_so/malloc.c       Sun Apr 01 15:04:07 2001 +0000
+++ b/libexec/ld.aout_so/malloc.c       Sun Apr 01 15:47:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: malloc.c,v 1.5 1998/12/15 21:33:00 pk Exp $    */
+/*     $NetBSD: malloc.c,v 1.5.2.1 2001/04/01 15:47:54 he Exp $        */
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -38,7 +38,7 @@
 #if 0
 static char *sccsid = "from: @(#)malloc.c      5.11 (Berkeley) 2/23/91";
 #else
-__RCSID("$NetBSD: malloc.c,v 1.5 1998/12/15 21:33:00 pk Exp $");
+__RCSID("$NetBSD: malloc.c,v 1.5.2.1 2001/04/01 15:47:54 he Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -61,7 +61,6 @@
 #include <sys/param.h>
 #include <sys/mman.h>
 #ifndef BSD
-#define MAP_COPY       MAP_PRIVATE
 #define MAP_FILE       0
 #define MAP_ANON       0
 #endif
@@ -139,7 +138,8 @@
 #if defined(DEBUG) || defined(RCHECK)
 #define        ASSERT(p)   if (!(p)) botch("p")
 #include <stdio.h>
-static
+static void botch __P((char *));
+static void
 botch(s)
        char *s;
 {
@@ -468,7 +468,7 @@
 
        if ((pagepool_start = mmap(0, n * pagesz,
                        PROT_READ|PROT_WRITE,
-                       MAP_ANON|MAP_COPY, fd, 0)) == (caddr_t)-1) {
+                       MAP_ANON|MAP_PRIVATE, fd, 0)) == (caddr_t)-1) {
                char *str = "ld.so: malloc: cannot map pages\n";
                (void)write(2, str, strlen(str));
                return 0;