Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src MAP_COPY -> MAP_PRIVATE
details: https://anonhg.NetBSD.org/src/rev/a69a2d88cfa4
branches: trunk
changeset: 473742:a69a2d88cfa4
user: thorpej <thorpej%NetBSD.org@localhost>
date: Thu Jun 17 21:09:47 1999 +0000
description:
MAP_COPY -> MAP_PRIVATE
diffstat:
lib/csu/common_aout/common.c | 8 ++++----
lib/csu/common_aout/common.h | 3 +--
lib/libc/gen/nlist_aout.c | 6 +++---
lib/libc/gen/nlist_ecoff.c | 6 +++---
lib/libc/gen/nlist_elf32.c | 4 ++--
libexec/ld.aout_so/malloc.c | 7 +++----
libexec/ld.aout_so/rtld.c | 11 ++++-------
libexec/ld.elf_so/malloc.c | 4 ++--
sbin/ldconfig/ldconfig.c | 6 +++---
9 files changed, 25 insertions(+), 30 deletions(-)
diffs (251 lines):
diff -r 686cf8bbe3e3 -r a69a2d88cfa4 lib/csu/common_aout/common.c
--- a/lib/csu/common_aout/common.c Thu Jun 17 21:07:55 1999 +0000
+++ b/lib/csu/common_aout/common.c Thu Jun 17 21:09:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.15 1999/05/19 14:50:50 kleink Exp $ */
+/* $NetBSD: common.c,v 1.16 1999/06/17 21:09:47 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
/* Map in ld.so */
crt.crt_ba = mmap(0, hdr.a_text+hdr.a_data+hdr.a_bss,
PROT_READ|PROT_EXEC,
- MAP_FILE|MAP_COPY,
+ MAP_FILE|MAP_PRIVATE,
crt.crt_ldfd, N_TXTOFF(hdr));
if (crt.crt_ba == -1) {
_FATAL("Cannot map ld.so\n");
@@ -112,7 +112,7 @@
/* Map in data segment of ld.so writable */
if (mmap(crt.crt_ba+N_DATADDR(hdr), hdr.a_data,
PROT_READ|PROT_WRITE,
- MAP_FILE|MAP_COPY|MAP_FIXED,
+ MAP_FILE|MAP_PRIVATE|MAP_FIXED,
crt.crt_ldfd, N_DATOFF(hdr)) == -1) {
_FATAL("Cannot map ld.so\n");
}
@@ -120,7 +120,7 @@
/* Map bss segment of ld.so zero */
if (hdr.a_bss && mmap(crt.crt_ba+N_BSSADDR(hdr), hdr.a_bss,
PROT_READ|PROT_WRITE,
- MAP_ANON|MAP_COPY|MAP_FIXED,
+ MAP_ANON|MAP_PRIVATE|MAP_FIXED,
crt.crt_dzfd, 0) == -1) {
_FATAL("Cannot map ld.so\n");
}
diff -r 686cf8bbe3e3 -r a69a2d88cfa4 lib/csu/common_aout/common.h
--- a/lib/csu/common_aout/common.h Thu Jun 17 21:07:55 1999 +0000
+++ b/lib/csu/common_aout/common.h Thu Jun 17 21:09:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.10 1998/09/05 13:27:48 pk Exp $ */
+/* $NetBSD: common.h,v 1.11 1999/06/17 21:09:48 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,7 +51,6 @@
#include <sys/mman.h>
#ifdef sun
-#define MAP_COPY MAP_PRIVATE
#define MAP_ANON 0
#endif
diff -r 686cf8bbe3e3 -r a69a2d88cfa4 lib/libc/gen/nlist_aout.c
--- a/lib/libc/gen/nlist_aout.c Thu Jun 17 21:07:55 1999 +0000
+++ b/lib/libc/gen/nlist_aout.c Thu Jun 17 21:09:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_aout.c,v 1.8 1998/11/13 10:26:19 christos Exp $ */
+/* $NetBSD: nlist_aout.c,v 1.9 1999/06/17 21:15:52 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: nlist_aout.c,v 1.8 1998/11/13 10:26:19 christos Exp $");
+__RCSID("$NetBSD: nlist_aout.c,v 1.9 1999/06/17 21:15:52 thorpej Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -92,7 +92,7 @@
* (i.e., munmap will return it to the system).
*/
strsize = (size_t)(st.st_size - stroff);
- strtab = mmap(NULL, strsize, PROT_READ, MAP_COPY|MAP_FILE,
+ strtab = mmap(NULL, strsize, PROT_READ, MAP_PRIVATE|MAP_FILE,
fd, stroff);
if (strtab == (char *)-1)
return (-1);
diff -r 686cf8bbe3e3 -r a69a2d88cfa4 lib/libc/gen/nlist_ecoff.c
--- a/lib/libc/gen/nlist_ecoff.c Thu Jun 17 21:07:55 1999 +0000
+++ b/lib/libc/gen/nlist_ecoff.c Thu Jun 17 21:09:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_ecoff.c,v 1.7 1998/10/14 12:05:14 kleink Exp $ */
+/* $NetBSD: nlist_ecoff.c,v 1.8 1999/06/17 21:15:52 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_ecoff.c,v 1.7 1998/10/14 12:05:14 kleink Exp $");
+__RCSID("$NetBSD: nlist_ecoff.c,v 1.8 1999/06/17 21:15:52 thorpej Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -90,7 +90,7 @@
BAD;
}
mappedsize = st.st_size;
- mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_COPY|MAP_FILE,
+ mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_PRIVATE|MAP_FILE,
fd, 0);
if (mappedfile == (char *)-1)
BAD;
diff -r 686cf8bbe3e3 -r a69a2d88cfa4 lib/libc/gen/nlist_elf32.c
--- a/lib/libc/gen/nlist_elf32.c Thu Jun 17 21:07:55 1999 +0000
+++ b/lib/libc/gen/nlist_elf32.c Thu Jun 17 21:09:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_elf32.c,v 1.12 1998/11/13 10:26:19 christos Exp $ */
+/* $NetBSD: nlist_elf32.c,v 1.13 1999/06/17 21:15:52 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -106,7 +106,7 @@
BAD;
}
mappedsize = (size_t)st.st_size;
- mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_COPY|MAP_FILE,
+ mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_PRIVATE|MAP_FILE,
fd, (off_t)0);
if (mappedfile == (char *)-1)
BAD;
diff -r 686cf8bbe3e3 -r a69a2d88cfa4 libexec/ld.aout_so/malloc.c
--- a/libexec/ld.aout_so/malloc.c Thu Jun 17 21:07:55 1999 +0000
+++ b/libexec/ld.aout_so/malloc.c Thu Jun 17 21:09:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: malloc.c,v 1.5 1998/12/15 21:33:00 pk Exp $ */
+/* $NetBSD: malloc.c,v 1.6 1999/06/17 21:11:42 thorpej 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.6 1999/06/17 21:11:42 thorpej 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
@@ -468,7 +467,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;
diff -r 686cf8bbe3e3 -r a69a2d88cfa4 libexec/ld.aout_so/rtld.c
--- a/libexec/ld.aout_so/rtld.c Thu Jun 17 21:07:55 1999 +0000
+++ b/libexec/ld.aout_so/rtld.c Thu Jun 17 21:09:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.74 1999/04/23 19:29:30 tv Exp $ */
+/* $NetBSD: rtld.c,v 1.75 1999/06/17 21:11:42 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,9 +42,6 @@
#include <sys/time.h>
#include <sys/errno.h>
#include <sys/mman.h>
-#ifndef MAP_COPY
-#define MAP_COPY MAP_PRIVATE
-#endif
#include <err.h>
#include <dlfcn.h>
#include <fcntl.h>
@@ -712,7 +709,7 @@
if ((addr = mmap(0, hdr.a_text + hdr.a_data + hdr.a_bss,
PROT_READ|PROT_EXEC,
- MAP_FILE|MAP_COPY, fd, 0)) == (caddr_t)-1) {
+ MAP_FILE|MAP_PRIVATE, fd, 0)) == (caddr_t)-1) {
(void)close(fd);
return NULL;
}
@@ -728,7 +725,7 @@
if (mmap(addr + hdr.a_text + hdr.a_data, hdr.a_bss,
PROT_READ|PROT_WRITE|PROT_EXEC,
- MAP_ANON|MAP_COPY|MAP_FIXED,
+ MAP_ANON|MAP_PRIVATE|MAP_FIXED,
anon_fd, 0) == (caddr_t)-1) {
(void)close(fd);
return NULL;
@@ -1409,7 +1406,7 @@
hsize = (hsize + PAGSIZ - 1) & -PAGSIZ;
- addr = mmap(0, hsize, PROT_READ, MAP_FILE|MAP_COPY, hfd, 0);
+ addr = mmap(0, hsize, PROT_READ, MAP_FILE|MAP_PRIVATE, hfd, 0);
if (addr == (caddr_t)-1)
goto nohints;
diff -r 686cf8bbe3e3 -r a69a2d88cfa4 libexec/ld.elf_so/malloc.c
--- a/libexec/ld.elf_so/malloc.c Thu Jun 17 21:07:55 1999 +0000
+++ b/libexec/ld.elf_so/malloc.c Thu Jun 17 21:09:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: malloc.c,v 1.4 1999/03/03 21:18:00 christos Exp $ */
+/* $NetBSD: malloc.c,v 1.5 1999/06/17 21:13:14 thorpej Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -457,7 +457,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) {
xprintf("Cannot map anonymous memory");
return 0;
}
diff -r 686cf8bbe3e3 -r a69a2d88cfa4 sbin/ldconfig/ldconfig.c
--- a/sbin/ldconfig/ldconfig.c Thu Jun 17 21:07:55 1999 +0000
+++ b/sbin/ldconfig/ldconfig.c Thu Jun 17 21:09:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ldconfig.c,v 1.25 1999/04/09 07:29:43 agc Exp $ */
+/* $NetBSD: ldconfig.c,v 1.26 1999/06/17 21:15:10 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -498,7 +498,7 @@
}
msize = getpagesize();
- addr = mmap(0, msize, PROT_READ, MAP_FILE|MAP_COPY, fd, 0);
+ addr = mmap(0, msize, PROT_READ, MAP_FILE|MAP_PRIVATE, fd, 0);
if (addr == (caddr_t)-1) {
warn("%s", _PATH_LD_HINTS);
@@ -519,7 +519,7 @@
if (hdr->hh_ehints > msize) {
if (mmap(addr+msize, hdr->hh_ehints - msize,
- PROT_READ, MAP_FILE|MAP_COPY|MAP_FIXED,
+ PROT_READ, MAP_FILE|MAP_PRIVATE|MAP_FIXED,
fd, msize) != (caddr_t)(addr+msize)) {
warn("%s", _PATH_LD_HINTS);
Home |
Main Index |
Thread Index |
Old Index