[src/trunk]: src/lib/libc Revert to commits as they broke few rump tests

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/lib/libc Revert to commits as they broke few rump tests
From: kamil <kamil%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 09:16:42 +0000

details:   https://anonhg.NetBSD.org/src/rev/79cff2293054
branches:  trunk
changeset: 829102:79cff2293054
user:      kamil <kamil%NetBSD.org@localhost>
date:      Wed Jan 17 01:24:29 2018 +0000

description:
Revert to commits as they broke few rump tests

"Include namespace.h in a few of libc source files
[...]
    This change finishes elimination of usage of the global name of the
    following symbols:
      - close -> _close
      - execve -> _execve
      - fcntl -> _fcntl
      - setcontext -> _setcontext
      - wait6 -> _wait6
      - write -> _write
      - writev -> _writev"

"Register more syscalls in namespace.h (of libc)

    Add weak symbols for:
     - fcntl
     - close
     - execve
     - setcontext
     - wait6
     - write
     - writev"

These changes broke:

    fs/nfs/t_rquotad:get_nfs_be_1_both
    fs/nfs/t_rquotad:get_nfs_be_1_group
    fs/nfs/t_rquotad:get_nfs_be_1_user
    fs/nfs/t_rquotad:get_nfs_le_1_both
    fs/nfs/t_rquotad:get_nfs_le_1_group
    fs/nfs/t_rquotad:get_nfs_le_1_user
    lib/librumphijack/t_config:fdoff
    lib/librumphijack/t_tcpip:http
    lib/librumphijack/t_tcpip:nfs
    lib/librumphijack/t_vfs:cpcopy
    lib/librumphijack/t_vfs:mv_x
    lib/librumphijack/t_vfs:paxcopy
    net/net/t_forwarding:ipforwarding_fastforward_v4
    net/net/t_forwarding:ipforwarding_fastforward_v6
    net/net/t_forwarding:ipforwarding_fragment_v4
    net/net/t_forwarding:ipforwarding_misc
    net/net/t_mtudisc6:mtudisc6_basic

This revert fixes the failures, except lib/librumphijack/t_vfs.

The original changes were added in order to facilitate a usage of
sanitizers against programs linked with NetBSD's libc. It is no longer
needed, so abandon these changes.

Sponsored by <The NetBSD Foundation>

diffstat:

 lib/libc/gen/closefrom.c     |  5 ++---
 lib/libc/gen/exect.c         |  5 ++---
 lib/libc/include/namespace.h |  9 +--------
 lib/libc/stdio/fopen.c       |  5 ++---
 lib/libc/stdio/freopen.c     |  5 ++---
 5 files changed, 9 insertions(+), 20 deletions(-)

diffs (144 lines):

diff -r e616cb892448 -r 79cff2293054 lib/libc/gen/closefrom.c
--- a/lib/libc/gen/closefrom.c  Wed Jan 17 00:29:22 2018 +0000
+++ b/lib/libc/gen/closefrom.c  Wed Jan 17 01:24:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: closefrom.c,v 1.3 2018/01/05 19:01:36 kamil Exp $      */
+/*     $NetBSD: closefrom.c,v 1.4 2018/01/17 01:24:29 kamil Exp $      */
 
 /*
  * Copyright (C) 2004 WIDE Project.
@@ -31,10 +31,9 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: closefrom.c,v 1.3 2018/01/05 19:01:36 kamil Exp $");
+__RCSID("$NetBSD: closefrom.c,v 1.4 2018/01/17 01:24:29 kamil Exp $");
 #endif /* LIBC_SCCS and not lint */
 
-#include "namespace.h"
 #include <fcntl.h>
 #include <unistd.h>
 
diff -r e616cb892448 -r 79cff2293054 lib/libc/gen/exect.c
--- a/lib/libc/gen/exect.c      Wed Jan 17 00:29:22 2018 +0000
+++ b/lib/libc/gen/exect.c      Wed Jan 17 01:24:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exect.c,v 1.2 2018/01/05 19:01:36 kamil Exp $  */
+/*     $NetBSD: exect.c,v 1.3 2018/01/17 01:24:29 kamil Exp $  */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -28,10 +28,9 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: exect.c,v 1.2 2018/01/05 19:01:36 kamil Exp $");
+__RCSID("$NetBSD: exect.c,v 1.3 2018/01/17 01:24:29 kamil Exp $");
 #endif
 
-#include "namespace.h"
 #include <unistd.h>
 
 __warn_references(exect,
diff -r e616cb892448 -r 79cff2293054 lib/libc/include/namespace.h
--- a/lib/libc/include/namespace.h      Wed Jan 17 00:29:22 2018 +0000
+++ b/lib/libc/include/namespace.h      Wed Jan 17 01:24:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: namespace.h,v 1.195 2018/01/07 21:19:35 kamil Exp $    */
+/*     $NetBSD: namespace.h,v 1.196 2018/01/17 01:24:29 kamil Exp $    */
 
 /*-
  * Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -45,7 +45,6 @@
 #define err            _err
 #define errc           _errc
 #define errx           _errx
-#define fcntl          _fcntl
 #ifdef _REENTRANT
 #define fileno         _fileno
 #endif /* _REENTRANT */
@@ -275,7 +274,6 @@
 #define clock_gettime          _clock_gettime
 #define clock_getres           _clock_getres
 #define clock_settime          _clock_settime
-#define close                  _close
 #define closedir               _closedir
 #define closelog               _closelog
 #define closelog_r             _closelog_r
@@ -320,7 +318,6 @@
 #define execlp                 _execlp
 #define execlpe                        _execlpe
 #define execv                  _execv
-#define execve                 _execve
 #define execvp                 _execvp
 #define execvpe                        _execvpe
 #define explicit_memset                _explicit_memset
@@ -620,7 +617,6 @@
 #define seekdir                        _seekdir
 #define select                 _select
 #define send                   _send
-#define setcontext             _setcontext
 #define setdomainname          _setdomainname
 #define setenv                 _setenv
 #define setfsent               _setfsent
@@ -798,7 +794,6 @@
 #define wait                   _wait
 #define wait3                  _wait3
 #define wait4                  _wait4
-#define wait6                  _wait6
 #define waitid                 _waitid
 #define waitpid                        _waitpid
 #define wcscasecmp             _wcscasecmp
@@ -816,8 +811,6 @@
 #define wcwidth                        _wcwidth
 #define wcwidth_l              _wcwidth_l
 #define wprintf_l              _wprintf_l
-#define write                  _write
-#define writev                 _writev
 #define wscanf_l               _wscanf_l
 #define xdr_accepted_reply     _xdr_accepted_reply
 #define xdr_array              _xdr_array
diff -r e616cb892448 -r 79cff2293054 lib/libc/stdio/fopen.c
--- a/lib/libc/stdio/fopen.c    Wed Jan 17 00:29:22 2018 +0000
+++ b/lib/libc/stdio/fopen.c    Wed Jan 17 01:24:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fopen.c,v 1.18 2018/01/05 19:01:36 kamil Exp $ */
+/*     $NetBSD: fopen.c,v 1.19 2018/01/17 01:24:30 kamil Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,11 +37,10 @@
 #if 0
 static char sccsid[] = "@(#)fopen.c    8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: fopen.c,v 1.18 2018/01/05 19:01:36 kamil Exp $");
+__RCSID("$NetBSD: fopen.c,v 1.19 2018/01/17 01:24:30 kamil Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <assert.h>
diff -r e616cb892448 -r 79cff2293054 lib/libc/stdio/freopen.c
--- a/lib/libc/stdio/freopen.c  Wed Jan 17 00:29:22 2018 +0000
+++ b/lib/libc/stdio/freopen.c  Wed Jan 17 01:24:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: freopen.c,v 1.21 2018/01/05 19:01:36 kamil Exp $       */
+/*     $NetBSD: freopen.c,v 1.22 2018/01/17 01:24:30 kamil Exp $       */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,11 +37,10 @@
 #if 0
 static char sccsid[] = "@(#)freopen.c  8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: freopen.c,v 1.21 2018/01/05 19:01:36 kamil Exp $");
+__RCSID("$NetBSD: freopen.c,v 1.22 2018/01/17 01:24:30 kamil Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>

Prev by Date: [src/trunk]: src/tests/fs/tmpfs Use sysctl -n rather than parse the output.
Next by Date: [src/trunk]: src/sys/dev/pci Fix duplicated "rxintr" evcnt counting. Pointed ...
Previous by Thread: [src/trunk]: src/tests/fs/tmpfs Use sysctl -n rather than parse the output.
Next by Thread: [src/trunk]: src/sys/dev/pci Fix duplicated "rxintr" evcnt counting. Pointed ...
Indexes:

Home | Main Index | Thread Index | Old Index