CVS commit: src/sys/net
Module Name:src Committed By: yamaguchi Date: Mon Apr 26 02:36:46 UTC 2021 Modified Files: src/sys/net: if_spppsubr.c Log Message: Fix locking order since IFNET_LOCK must be held before acquiring SPPP_LOCK To generate a diff of this commit: cvs rdiff -u -r1.220 -r1.221 src/sys/net/if_spppsubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/if_spppsubr.c diff -u src/sys/net/if_spppsubr.c:1.220 src/sys/net/if_spppsubr.c:1.221 --- src/sys/net/if_spppsubr.c:1.220 Fri Apr 23 03:36:13 2021 +++ src/sys/net/if_spppsubr.c Mon Apr 26 02:36:45 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_spppsubr.c,v 1.220 2021/04/23 03:36:13 yamaguchi Exp $ */ +/* $NetBSD: if_spppsubr.c,v 1.221 2021/04/26 02:36:45 yamaguchi Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.220 2021/04/23 03:36:13 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.221 2021/04/26 02:36:45 yamaguchi Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -5542,7 +5542,10 @@ sppp_set_ip_addrs(struct sppp *sp) uint32_t myaddr = 0, hisaddr = 0; int s; + KASSERT(SPPP_WLOCKED(sp)); + SPPP_UNLOCK(sp); IFNET_LOCK(ifp); + SPPP_LOCK(sp, RW_WRITER); /* * Pick the first AF_INET address from the list, @@ -5614,7 +5617,10 @@ sppp_clear_ip_addrs(struct sppp *sp) struct sockaddr_in *si, *dest; int s; + KASSERT(SPPP_WLOCKED(sp)); + SPPP_UNLOCK(sp); IFNET_LOCK(ifp); + SPPP_LOCK(sp, RW_WRITER); /* * Pick the first AF_INET address from the list, @@ -5740,7 +5746,10 @@ sppp_set_ip6_addr(struct sppp *sp, const int s; struct psref psref; + KASSERT(SPPP_WLOCKED(sp)); + SPPP_UNLOCK(sp); IFNET_LOCK(ifp); + SPPP_LOCK(sp, RW_WRITER); /* * Pick the first link-local AF_INET6 address from the list,
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Apr 26 00:38:23 UTC 2021
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Revert the AFLAGS change since it affects kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.305 -r1.306 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.305 src/share/mk/bsd.sys.mk:1.306
--- src/share/mk/bsd.sys.mk:1.305 Sun Apr 25 10:32:20 2021
+++ src/share/mk/bsd.sys.mk Sun Apr 25 20:38:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.305 2021/04/25 14:32:20 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.306 2021/04/26 00:38:23 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -197,12 +197,10 @@ COPTS+= ${${ACTIVE_CC} == "gcc":? --para
.if ${MACHINE_CPU} != "sh3"
COPTS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
FOPTS+= -msoft-float
-AFLAGS+= -msoft-float
.endif
.elif ${MACHINE_ARCH} == "coldfire"
COPTS+= -mhard-float
FOPTS+= -mhard-float
-AFLAGS+= -mhard-float
.endif
#.if !empty(MACHINE_ARCH:Mearmv7*)
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: christos
Date: Mon Apr 26 00:28:01 UTC 2021
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
Produce elf32 images for mipsn64eb too
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/mips/conf/Makefile.mips
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.71 src/sys/arch/mips/conf/Makefile.mips:1.72
--- src/sys/arch/mips/conf/Makefile.mips:1.71 Sun Apr 25 19:24:00 2021
+++ src/sys/arch/mips/conf/Makefile.mips Sun Apr 25 20:28:01 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.71 2021/04/25 23:24:00 christos Exp $
+# $NetBSD: Makefile.mips,v 1.72 2021/04/26 00:28:01 christos Exp $
# Makefile for NetBSD
#
@@ -58,7 +58,7 @@ CFLAGS+= ${GP} -mno-abicalls -msoft-floa
CFLAGS+= -msym32 -mabi=64
AFLAGS+= -msym32 -mabi=64
.endif
-.if ${MACHINE_ARCH} == "mips64eb"
+.if !empty(MACHINE_ARCH:Mmips*64eb)
LDFLAGS+= -Wl,-m,elf64btsmip
LINKFORMAT+= -m elf64btsmip
SYSTEM_LD_TAIL_EXTRA+= \
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el
Module Name:src Committed By: christos Date: Sun Apr 25 23:58:23 UTC 2021 Added Files: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h srcs.mk Log Message: Copied from mips64el To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/Makefile.inc \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/gmp-mparam.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/gmp.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/srcs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/Makefile.inc diff -u /dev/null src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/Makefile.inc:1.1 --- /dev/null Sun Apr 25 19:58:23 2021 +++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/Makefile.inc Sun Apr 25 19:58:23 2021 @@ -0,0 +1,7 @@ +# $NetBSD: Makefile.inc,v 1.1 2021/04/25 23:58:23 christos Exp $ + +COPTS+= -Wno-error + +GMP_LIMB_BITS=64 + +.include "srcs.mk" Index: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/config.h diff -u /dev/null src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/config.h:1.1 --- /dev/null Sun Apr 25 19:58:23 2021 +++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/config.h Sun Apr 25 19:58:23 2021 @@ -0,0 +1,668 @@ +/* config.h. Generated from config.in by configure. */ +/* config.in. Generated from configure.ac by autoheader. */ + +/* + +Copyright 1996-2020 Free Software Foundation, Inc. + +This file is part of the GNU MP Library. + +The GNU MP Library is free software; you can redistribute it and/or modify +it under the terms of either: + + * the GNU Lesser General Public License as published by the Free +Software Foundation; either version 3 of the License, or (at your +option) any later version. + +or + + * the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any +later version. + +or both in parallel, as here. + +The GNU MP Library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received copies of the GNU General Public License and the +GNU Lesser General Public License along with the GNU MP Library. If not, +see https://www.gnu.org/licenses/. +*/ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* The gmp-mparam.h file (a string) the tune program should suggest updating. + */ +#define GMP_MPARAM_H_SUGGEST "./mpn/mips64/gmp-mparam.h" + +/* Define to 1 if you have the `alarm' function. */ +#define HAVE_ALARM 1 + +/* Define to 1 if alloca() works (via gmp-impl.h). */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if the compiler accepts gcc style __attribute__ ((const)) */ +#define HAVE_ATTRIBUTE_CONST 1 + +/* Define to 1 if the compiler accepts gcc style __attribute__ ((malloc)) */ +#define HAVE_ATTRIBUTE_MALLOC 1 + +/* Define to 1 if the compiler accepts gcc style __attribute__ ((mode (XX))) + */ +#define HAVE_ATTRIBUTE_MODE 1 + +/* Define to 1 if the compiler accepts gcc style __attribute__ ((noreturn)) */ +#define HAVE_ATTRIBUTE_NORETURN 1 + +/* Define to 1 if you have the `attr_get' function. */ +/* #undef HAVE_ATTR_GET */ + +/* Define to 1 if tests/libtests has calling conventions checking for the CPU + */ +/* #undef HAVE_CALLING_CONVENTIONS */ + +/* Define to 1 if you have the `clock' function. */ +#define HAVE_CLOCK 1 + +/* Define to 1 if you have the `clock_gettime' function */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define to 1 if you have the `cputime' function. */ +/* #undef HAVE_CPUTIME */ + +/* Define to 1 if you have the declaration of `fgetc', and to 0 if you don't. + */ +#define HAVE_DECL_FGETC 1 + +/* Define to 1 if you have the declaration of `fscanf', and to 0 if you don't. + */ +#define HAVE_DECL_FSCANF 1 + +/* Define to 1 if you have the declaration of `optarg', and to 0 if you don't. + */ +#define HAVE_DECL_OPTARG 1 + +/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_ERRLIST 1 + +/* Define to 1 if you have the declaration of `sys_nerr', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_NERR 1 + +/* Define to 1 if you have the declaration of `ungetc', and to 0 if you don't. + */ +#define HAVE_DECL_UNGETC 1 + +/* Define to 1 if you have the declaration of `vfprintf', and to 0 if you + don't. */ +#define HAVE_DECL_VFPRINTF 1 + +/* Define to 1
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb
Module Name:src Committed By: christos Date: Sun Apr 25 23:57:47 UTC 2021 Added Files: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb: Makefile.inc config.h config.m4 gmp-mparam.h gmp.h srcs.mk Log Message: copied from mips64eb To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/Makefile.inc \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp-mparam.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/srcs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/Makefile.inc diff -u /dev/null src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/Makefile.inc:1.1 --- /dev/null Sun Apr 25 19:57:48 2021 +++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/Makefile.inc Sun Apr 25 19:57:47 2021 @@ -0,0 +1,7 @@ +# $NetBSD: Makefile.inc,v 1.1 2021/04/25 23:57:47 christos Exp $ + +COPTS+= -Wno-error + +GMP_LIMB_BITS=64 + +.include "srcs.mk" Index: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h diff -u /dev/null src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h:1.1 --- /dev/null Sun Apr 25 19:57:48 2021 +++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h Sun Apr 25 19:57:47 2021 @@ -0,0 +1,668 @@ +/* config.h. Generated from config.in by configure. */ +/* config.in. Generated from configure.ac by autoheader. */ + +/* + +Copyright 1996-2020 Free Software Foundation, Inc. + +This file is part of the GNU MP Library. + +The GNU MP Library is free software; you can redistribute it and/or modify +it under the terms of either: + + * the GNU Lesser General Public License as published by the Free +Software Foundation; either version 3 of the License, or (at your +option) any later version. + +or + + * the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any +later version. + +or both in parallel, as here. + +The GNU MP Library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received copies of the GNU General Public License and the +GNU Lesser General Public License along with the GNU MP Library. If not, +see https://www.gnu.org/licenses/. +*/ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* The gmp-mparam.h file (a string) the tune program should suggest updating. + */ +#define GMP_MPARAM_H_SUGGEST "./mpn/mips64/gmp-mparam.h" + +/* Define to 1 if you have the `alarm' function. */ +#define HAVE_ALARM 1 + +/* Define to 1 if alloca() works (via gmp-impl.h). */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if the compiler accepts gcc style __attribute__ ((const)) */ +#define HAVE_ATTRIBUTE_CONST 1 + +/* Define to 1 if the compiler accepts gcc style __attribute__ ((malloc)) */ +#define HAVE_ATTRIBUTE_MALLOC 1 + +/* Define to 1 if the compiler accepts gcc style __attribute__ ((mode (XX))) + */ +#define HAVE_ATTRIBUTE_MODE 1 + +/* Define to 1 if the compiler accepts gcc style __attribute__ ((noreturn)) */ +#define HAVE_ATTRIBUTE_NORETURN 1 + +/* Define to 1 if you have the `attr_get' function. */ +/* #undef HAVE_ATTR_GET */ + +/* Define to 1 if tests/libtests has calling conventions checking for the CPU + */ +/* #undef HAVE_CALLING_CONVENTIONS */ + +/* Define to 1 if you have the `clock' function. */ +#define HAVE_CLOCK 1 + +/* Define to 1 if you have the `clock_gettime' function */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define to 1 if you have the `cputime' function. */ +/* #undef HAVE_CPUTIME */ + +/* Define to 1 if you have the declaration of `fgetc', and to 0 if you don't. + */ +#define HAVE_DECL_FGETC 1 + +/* Define to 1 if you have the declaration of `fscanf', and to 0 if you don't. + */ +#define HAVE_DECL_FSCANF 1 + +/* Define to 1 if you have the declaration of `optarg', and to 0 if you don't. + */ +#define HAVE_DECL_OPTARG 1 + +/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_ERRLIST 1 + +/* Define to 1 if you have the declaration of `sys_nerr', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_NERR 1 + +/* Define to 1 if you have the declaration of `ungetc', and to 0 if you don't. + */ +#define HAVE_DECL_UNGETC 1 + +/* Define to 1 if you have the declaration of `vfprintf', and to 0 if you + don't. */ +#define HAVE_DECL_VFPRINTF 1 + +/* Define to 1
CVS commit: src/external/lgpl3/mpfr/lib/libmpfr
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:55:55 UTC 2021
Modified Files:
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
Handle mipsn64
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/lgpl3/mpfr/lib/libmpfr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.21 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.22
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.21 Sat Sep 26 03:50:41 2020
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Sun Apr 25 19:55:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/09/26 07:50:41 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2021/04/25 23:55:55 christos Exp $
.include
@@ -297,14 +297,14 @@ CPPFLAGS+= -I${MPFRDIST}/src
CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_EXT_LITTLE=1
.endif
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_QUAD_LITTLE=1
.endif
.if ${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "powerpc64" || \
-${MACHINE_ARCH} == "mips64eb"
+!empty(MACHINE_ARCH:Mmips*64eb)
CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_QUAD_BIG=1
.endif
CVS commit: src/usr.bin/ldd
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:52:59 UTC 2021
Modified Files:
src/usr.bin/ldd: Makefile.inc
src/usr.bin/ldd/build: Makefile
src/usr.bin/ldd/elf64: Makefile
Log Message:
Handle mipsn64
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/ldd/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/ldd/build/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/ldd/elf64/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ldd/Makefile.inc
diff -u src/usr.bin/ldd/Makefile.inc:1.7 src/usr.bin/ldd/Makefile.inc:1.8
--- src/usr.bin/ldd/Makefile.inc:1.7 Sat Jan 23 16:22:49 2016
+++ src/usr.bin/ldd/Makefile.inc Sun Apr 25 19:52:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2016/01/23 21:22:49 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2021/04/25 23:52:59 christos Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
@@ -16,12 +16,19 @@ MLIBDIR= i386
MLIBDIR= powerpc
.endif
+.if !empty(MACHINE_ARCH:Mmips64*)
# For now make "elf32" look for native (n32)
-.if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
MLIBDIR= 64
COMPAT_MLIBDIR= o32
CPPFLAGS+= -DLDD_ELF64 -DMIPS_N32
.endif
+
+.if !empty(MACHINE_ARCH:Mmipsn64*)
+MLIBDIR= n32
+COMPAT_MLIBDIR= o32
+CPPFLAGS+= -DMIPS_N32
+.endif
+
CPPFLAGS+= -D_KERNTYPES
.endif # MKCOMPAT
Index: src/usr.bin/ldd/build/Makefile
diff -u src/usr.bin/ldd/build/Makefile:1.6 src/usr.bin/ldd/build/Makefile:1.7
--- src/usr.bin/ldd/build/Makefile:1.6 Sun Feb 3 19:05:20 2019
+++ src/usr.bin/ldd/build/Makefile Sun Apr 25 19:52:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/02/04 00:05:20 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2021/04/25 23:52:59 christos Exp $
NOSANITIZER= # defined
@@ -18,7 +18,7 @@ CPPFLAGS.ldd.c+= -DELF64_ONLY
.endif
.if ${MKCOMPAT} != "no"
-. if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+. if ${MACHINE_MIPS64}
LIB_ELF32COMPATDIR!= cd ${.CURDIR}/../elf32_compat && ${PRINTOBJDIR}
EXTRA_LIBS+= ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
. endif
Index: src/usr.bin/ldd/elf64/Makefile
diff -u src/usr.bin/ldd/elf64/Makefile:1.12 src/usr.bin/ldd/elf64/Makefile:1.13
--- src/usr.bin/ldd/elf64/Makefile:1.12 Sun Feb 3 19:05:20 2019
+++ src/usr.bin/ldd/elf64/Makefile Sun Apr 25 19:52:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/02/04 00:05:20 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2021/04/25 23:52:59 christos Exp $
NOSANITIZER= # defined
@@ -41,7 +41,7 @@ CPPFLAGS+= -D${_d}=_elf64_${_d}
.endfor
.if ${MKCOMPAT} != "no"
-. if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+. if ${MACHINE_MIPS64}
CPPFLAGS+= -DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\"
. endif
.endif
CVS commit: src/lib/libc/arch/mips
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:45:58 UTC 2021
Modified Files:
src/lib/libc/arch/mips: Makefile.inc
src/lib/libc/arch/mips/gdtoa: Makefile.inc
Log Message:
Use ${MACHINE_MIPS64}
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/mips/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/mips/gdtoa/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/mips/Makefile.inc
diff -u src/lib/libc/arch/mips/Makefile.inc:1.14 src/lib/libc/arch/mips/Makefile.inc:1.15
--- src/lib/libc/arch/mips/Makefile.inc:1.14 Sun Jan 24 10:55:34 2016
+++ src/lib/libc/arch/mips/Makefile.inc Sun Apr 25 19:45:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2016/01/24 15:55:34 christos Exp $
+# $NetBSD: Makefile.inc,v 1.15 2021/04/25 23:45:58 christos Exp $
.include
@@ -14,13 +14,11 @@ CPPFLAGS+= -DSOFTFLOAT
SRCS+= fixunsgen_ieee754.c
SRCS+= fixunsgen64_ieee754.c #fixunssfdi.c fixunsdfdi.c
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") \
-&& (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
+.if ${MACHINE_MIPS64} && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
SRCS+= fixunstfsi_ieee754.c fixunstfdi_ieee754.c
.endif
.endif
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") \
-&& (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
+.if ${MACHINE_MIPS64} && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
SRCS+= floatunditf_ieee754.c
.endif
Index: src/lib/libc/arch/mips/gdtoa/Makefile.inc
diff -u src/lib/libc/arch/mips/gdtoa/Makefile.inc:1.4 src/lib/libc/arch/mips/gdtoa/Makefile.inc:1.5
--- src/lib/libc/arch/mips/gdtoa/Makefile.inc:1.4 Thu Jan 20 13:41:39 2011
+++ src/lib/libc/arch/mips/gdtoa/Makefile.inc Sun Apr 25 19:45:58 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.4 2011/01/20 18:41:39 matt Exp $
+# $NetBSD: Makefile.inc,v 1.5 2021/04/25 23:45:58 christos Exp $
SRCS+= strtof.c
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
+.if ${MACHINE_MIPS64}
.if !defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32)
SRCS+= strtold_pQ.c
SRCS+= strtopQ.c
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:43:48 UTC 2021
Modified Files:
src/lib: Makefile
Log Message:
Use ${MACHINE_MIPS64}
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.291 src/lib/Makefile:1.292
--- src/lib/Makefile:1.291 Fri Apr 9 16:49:05 2021
+++ src/lib/Makefile Sun Apr 25 19:43:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.291 2021/04/09 20:49:05 jkoshy Exp $
+# $NetBSD: Makefile,v 1.292 2021/04/25 23:43:48 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -40,7 +40,7 @@ LIBC_MACHINE_CPU?=${MACHINE_CPU}
SUBDIR+= libc_vfp
.endif
.endif
-.if ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.if ${MACHINE_MIPS64}
SUBDIR+= libc_fp
.endif
.if (${MKRUMP} != "no")
CVS commit: src/lib/libm
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:43:20 UTC 2021
Modified Files:
src/lib/libm: Makefile
Log Message:
Use ${MACHINE_MIPS64}
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.212 src/lib/libm/Makefile:1.213
--- src/lib/libm/Makefile:1.212 Mon Nov 11 17:45:27 2019
+++ src/lib/libm/Makefile Sun Apr 25 19:43:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.212 2019/11/11 22:45:27 joerg Exp $
+# $NetBSD: Makefile,v 1.213 2021/04/25 23:43:20 christos Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -200,8 +200,7 @@ COMMON_SRCS += fenv.c
COMMON_SRCS += fenv.c
.endif
COMMON_SRCS+= s_rintl.c
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") \
-&& (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
+.if ${MACHINE_MIPS64} && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
COMMON_SRCS+= s_nexttoward.c
.endif
CVS commit: src/sys/arch/pmax/stand
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:42:08 UTC 2021
Modified Files:
src/sys/arch/pmax/stand: Makefile.booters
Log Message:
Handle mipsn64
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/pmax/stand/Makefile.booters
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/pmax/stand/Makefile.booters
diff -u src/sys/arch/pmax/stand/Makefile.booters:1.64 src/sys/arch/pmax/stand/Makefile.booters:1.65
--- src/sys/arch/pmax/stand/Makefile.booters:1.64 Tue Jan 1 14:41:04 2019
+++ src/sys/arch/pmax/stand/Makefile.booters Sun Apr 25 19:42:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.64 2019/01/01 19:41:04 christos Exp $
+# $NetBSD: Makefile.booters,v 1.65 2021/04/25 23:42:08 christos Exp $
NOMAN= # defined
NOPIE= # defined
@@ -29,7 +29,7 @@ CFLAGS+= -Wall -Wmissing-prototypes -Wst
CFLAGS+= -Werror
LDBUG= -T $S/arch/mips/conf/stand.ldscript
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
AFLAGS+= -mips3 -mabi=32
CFLAGS+= -mips3 -mabi=32
LDBUG+= -m elf32ltsmip
CVS commit: src/sys/modules/dtrace
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:41:23 UTC 2021
Modified Files:
src/sys/modules/dtrace: Makefile
Log Message:
Handle mipsn64
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/dtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/dtrace/Makefile
diff -u src/sys/modules/dtrace/Makefile:1.9 src/sys/modules/dtrace/Makefile:1.10
--- src/sys/modules/dtrace/Makefile:1.9 Sat Apr 10 11:34:05 2021
+++ src/sys/modules/dtrace/Makefile Sun Apr 25 19:41:23 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2021/04/10 15:34:05 simonb Exp $
+# $NetBSD: Makefile,v 1.10 2021/04/25 23:41:23 christos Exp $
# $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
.include
SUBDIR= dtrace sdt fbt lockstat profile syscall
-.if ${MACHINE_ARCH} == "x86_64" || !empty(MACHINE_ARCH:Mmips64*)
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_MIPS64}
SUBDIR+= netbsd32_syscall
.endif
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:40:52 UTC 2021
Modified Files:
src/etc/etc.cobalt: Makefile.inc
src/etc/etc.evbmips: Makefile.inc
src/etc/mtree: Makefile
Log Message:
Handle mipsn64
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/etc/etc.cobalt/Makefile.inc
cvs rdiff -u -r1.25 -r1.26 src/etc/etc.evbmips/Makefile.inc
cvs rdiff -u -r1.44 -r1.45 src/etc/mtree/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.cobalt/Makefile.inc
diff -u src/etc/etc.cobalt/Makefile.inc:1.5 src/etc/etc.cobalt/Makefile.inc:1.6
--- src/etc/etc.cobalt/Makefile.inc:1.5 Sun Feb 20 03:27:32 2011
+++ src/etc/etc.cobalt/Makefile.inc Sun Apr 25 19:40:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2011/02/20 08:27:32 matt Exp $
+# $NetBSD: Makefile.inc,v 1.6 2021/04/25 23:40:51 christos Exp $
#
# etc.cobalt/Makefile.inc -- cobalt-specific etc Makefile targets
#
@@ -6,7 +6,7 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
KERNEL_SETS= GENERIC32 GENERIC64 INSTALL32 INSTALL64
BUILD_KERNELS= RAMDISK32 RAMDISK64
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.25 src/etc/etc.evbmips/Makefile.inc:1.26
--- src/etc/etc.evbmips/Makefile.inc:1.25 Sat Aug 15 01:03:06 2020
+++ src/etc/etc.evbmips/Makefile.inc Sun Apr 25 19:40:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.25 2020/08/15 05:03:06 simonb Exp $
+# $NetBSD: Makefile.inc,v 1.26 2021/04/25 23:40:52 christos Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -15,12 +15,12 @@ BUILD_KERNELS= INSTALL_CI20 INSTALL_OMS
KERNEL_SETS+= P4032 P5064 P6032
-.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.elif ${MACHINE_MIPS64}
KERNEL_SETS= MALTA32 MALTA64 XLSATX32 XLSATX64
BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
BUILD_KERNELS+= INSTALL_XLSATX32 INSTALL_XLSATX64
-. if ${MACHINE_ARCH} == "mips64el"
+. if !empty(MACHINE_ARCH:Mmips*64el)
KERNEL_SETS+= P5064-64
KERNEL_SETS+= LOONGSON
BUILD_KERNELS+= INSTALL_LOONGSON
@@ -36,7 +36,7 @@ BUILD_KERNELS= INSTALL_MALTA
.endif
# SBMIPS has a kernel for all targets
-KERNEL_SETS+= SBMIPS${MACHINE_ARCH:S/mips//:C/e[lb]//}
+KERNEL_SETS+= SBMIPS${MACHINE_ARCH:S/mipsn//:S/mips//:C/e[lb]//}
# Support for mkimage
MKIMAGE= ${NETBSDSRCDIR}/distrib/utils/embedded/mkimage
@@ -68,7 +68,7 @@ __mkimage: .USE
-S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \
${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
-.if ${MACHINE_ARCH} == "mips64eb"
+.if !empty(MACHINE_ARCH:Mmips*64eb)
smp_octeon: __mkimage
MKI_OPTS.smp_octeon= -K ${IMAGE.kern}
SNAP_MD_POST_DEPS+= smp_octeon
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.44 src/etc/mtree/Makefile:1.45
--- src/etc/mtree/Makefile:1.44 Fri Jun 12 10:12:20 2020
+++ src/etc/mtree/Makefile Sun Apr 25 19:40:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2020/06/12 14:12:20 roy Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/25 23:40:52 christos Exp $
.include
@@ -9,7 +9,7 @@ EXTRA_DIST_FILES+= NetBSD.dist.Xorg
.endif
# Derived from MACHINE_CPU, but keeping 32/64bit for most.
-MTREE_MACHINE_ARCH=${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips64/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/aarch64eb/aarch64/:S/or1knd/or1k/}
+MTREE_MACHINE_ARCH=${MACHINE_ARCH:C/mipse[bl]/mips/:C/mipsn?64e[bl]/mips64/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/e?arm.*/arm/:S/aarch64eb/aarch64/:S/or1knd/or1k/}
# The compat specific files
CVS commit: src/distrib
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:40:06 UTC 2021
Modified Files:
src/distrib/cobalt/instkernel: Makefile
src/distrib/evbmips/instkernel/instkernel: Makefile
src/distrib/evbmips/instkernel/ramdisk: Makefile
src/distrib/pmax/instkernel: Makefile
src/distrib/pmax/miniroot: Makefile.inc
src/distrib/pmax/ramdisk: Makefile
Log Message:
handle mipsn64
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/cobalt/instkernel/Makefile
cvs rdiff -u -r1.7 -r1.8 src/distrib/evbmips/instkernel/instkernel/Makefile
cvs rdiff -u -r1.14 -r1.15 src/distrib/evbmips/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.44 -r1.45 src/distrib/pmax/instkernel/Makefile
cvs rdiff -u -r1.25 -r1.26 src/distrib/pmax/miniroot/Makefile.inc
cvs rdiff -u -r1.54 -r1.55 src/distrib/pmax/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cobalt/instkernel/Makefile
diff -u src/distrib/cobalt/instkernel/Makefile:1.2 src/distrib/cobalt/instkernel/Makefile:1.3
--- src/distrib/cobalt/instkernel/Makefile:1.2 Sun Feb 20 03:26:08 2011
+++ src/distrib/cobalt/instkernel/Makefile Sun Apr 25 19:40:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/20 08:26:08 matt Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/25 23:40:05 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,7 +6,7 @@
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
SFX= 64
.endif
Index: src/distrib/evbmips/instkernel/instkernel/Makefile
diff -u src/distrib/evbmips/instkernel/instkernel/Makefile:1.7 src/distrib/evbmips/instkernel/instkernel/Makefile:1.8
--- src/distrib/evbmips/instkernel/instkernel/Makefile:1.7 Wed Jul 15 08:15:30 2020
+++ src/distrib/evbmips/instkernel/instkernel/Makefile Sun Apr 25 19:40:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/07/15 12:15:30 simonb Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/25 23:40:05 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,12 +12,12 @@ MDSETTARGETS= INSTALL_CI20 ${RAMDISK}
MDSETTARGETS+= INSTALL_OMSAL400 ${RAMDISK} -
MDSETTARGETS+= INSTALL_MALTA ${RAMDISK} -
-.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.elif ${MACHINE_MIPS64}
MDSETTARGETS= INSTALL_MALTA32 ${RAMDISK} -
MDSETTARGETS+= INSTALL_MALTA64 ${RAMDISK} -
MDSETTARGETS+= INSTALL_XLSATX32 ${RAMDISK} -
MDSETTARGETS+= INSTALL_XLSATX64 ${RAMDISK} -
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
MDSETTARGETS+= INSTALL_LOONGSON ${RAMDISK} -
.else
MDSETTARGETS+= INSTALL_OCTEON ${RAMDISK} -
Index: src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -u src/distrib/evbmips/instkernel/ramdisk/Makefile:1.14 src/distrib/evbmips/instkernel/ramdisk/Makefile:1.15
--- src/distrib/evbmips/instkernel/ramdisk/Makefile:1.14 Thu Jan 9 15:07:46 2020
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile Sun Apr 25 19:40:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/01/09 20:07:46 martin Exp $
+# $NetBSD: Makefile,v 1.15 2021/04/25 23:40:05 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -13,7 +13,7 @@ DBG= -Os
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
-.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:M*el)
IMAGEENDIAN= le
.else
IMAGEENDIAN= be
Index: src/distrib/pmax/instkernel/Makefile
diff -u src/distrib/pmax/instkernel/Makefile:1.44 src/distrib/pmax/instkernel/Makefile:1.45
--- src/distrib/pmax/instkernel/Makefile:1.44 Sun Aug 16 07:43:36 2020
+++ src/distrib/pmax/instkernel/Makefile Sun Apr 25 19:40:05 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2020/08/16 11:43:36 mrg Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/25 23:40:05 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
SFX= 64
.endif
Index: src/distrib/pmax/miniroot/Makefile.inc
diff -u src/distrib/pmax/miniroot/Makefile.inc:1.25 src/distrib/pmax/miniroot/Makefile.inc:1.26
--- src/distrib/pmax/miniroot/Makefile.inc:1.25 Tue Jan 24 13:04:04 2017
+++ src/distrib/pmax/miniroot/Makefile.inc Sun Apr 25 19:40:05 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.25 2017/01/24 18:04:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.26 2021/04/25 23:40:05 christos Exp $
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
SFX= 64
.endif
Index: src/distrib/pmax/ramdisk/Makefile
diff -u src/distrib/pmax/ramdisk/Makefile:1.54 src/distrib/pmax/ramdisk/Makefile:1.55
--- src/distrib/pmax/ramdisk/Makefile:1.54 Mon Sep
CVS commit: src/external/gpl3/binutils
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:35:52 UTC 2021
Modified Files:
src/external/gpl3/binutils/dist: config.sub
src/external/gpl3/binutils/dist/gas: configure configure.ac
src/external/gpl3/binutils/dist/ld: configure.tgt
src/external/gpl3/binutils/usr.bin/ld: Makefile
Log Message:
Add a mipsn64 target
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/binutils/dist/config.sub
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/gas/configure
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/gas/configure.ac
cvs rdiff -u -r1.35 -r1.36 src/external/gpl3/binutils/dist/ld/configure.tgt
cvs rdiff -u -r1.33 -r1.34 src/external/gpl3/binutils/usr.bin/ld/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/config.sub
diff -u src/external/gpl3/binutils/dist/config.sub:1.14 src/external/gpl3/binutils/dist/config.sub:1.15
--- src/external/gpl3/binutils/dist/config.sub:1.14 Fri Apr 3 19:48:45 2020
+++ src/external/gpl3/binutils/dist/config.sub Sun Apr 25 19:35:52 2021
@@ -1191,6 +1191,7 @@ case $cpu-$vendor in
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64eb | mips64el \
+ | mipsn64 | mipsn64eb | mipsn64el \
| mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
| mips64r5900 | mips64r5900el \
Index: src/external/gpl3/binutils/dist/gas/configure
diff -u src/external/gpl3/binutils/dist/gas/configure:1.9 src/external/gpl3/binutils/dist/gas/configure:1.10
--- src/external/gpl3/binutils/dist/gas/configure:1.9 Fri Apr 3 19:48:47 2020
+++ src/external/gpl3/binutils/dist/gas/configure Sun Apr 25 19:35:52 2021
@@ -12689,7 +12689,7 @@ _ACEOF
mips)
# Set mips_cpu to the name of the default CPU.
case ${target_cpu} in
- mips | mipsbe | mipseb | mipsle | mipsel | mips64 | mips64el)
+ mips | mipsbe | mipseb | mipsle | mipsel | mips64 | mips64el | mips64eb | mipsn64el | mipsn64eb)
mips_cpu=from-abi
;;
mipsisa32 | mipsisa32el)
Index: src/external/gpl3/binutils/dist/gas/configure.ac
diff -u src/external/gpl3/binutils/dist/gas/configure.ac:1.7 src/external/gpl3/binutils/dist/gas/configure.ac:1.8
--- src/external/gpl3/binutils/dist/gas/configure.ac:1.7 Fri Apr 3 19:48:47 2020
+++ src/external/gpl3/binutils/dist/gas/configure.ac Sun Apr 25 19:35:52 2021
@@ -292,7 +292,7 @@ changequote([,])dnl
mips)
# Set mips_cpu to the name of the default CPU.
case ${target_cpu} in
- mips | mipsbe | mipseb | mipsle | mipsel | mips64 | mips64el)
+ mips | mipsbe | mipseb | mipsle | mipsel | mips64 | mips64el | mips64eb | mipsn64el | mipsn64eb )
mips_cpu=from-abi
;;
mipsisa32 | mipsisa32el)
Index: src/external/gpl3/binutils/dist/ld/configure.tgt
diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.35 src/external/gpl3/binutils/dist/ld/configure.tgt:1.36
--- src/external/gpl3/binutils/dist/ld/configure.tgt:1.35 Sun Sep 13 17:14:01 2020
+++ src/external/gpl3/binutils/dist/ld/configure.tgt Sun Apr 25 19:35:52 2021
@@ -506,10 +506,18 @@ mips*-sgi-irix6*) targ_emul=elf32bmipn32
mips64*el-*-netbsd*) targ_emul=elf32ltsmipn32
targ_extra_emuls="elf64btsmip elf64ltsmip elf32ltsmip elf32btsmipn32 elf32btsmip"
targ_extra_libpath=$targ_extra_emuls
+ ;;
+mipsn64*el-*-netbsd*) targ_emul=elf64ltsmip
+ targ_extra_emuls="elf64btsmip elf64ltsmip elf32ltsmip elf32btsmip elf32btsmipn32 elf32ltsmip32"
+ targ_extra_libpath=$targ_extra_emuls
;;
mips64*-*-netbsd*) targ_emul=elf32btsmipn32
targ_extra_emuls="elf64ltsmip elf64btsmip elf32btsmip elf32ltsmipn32 elf32ltsmip"
targ_extra_libpath=$targ_extra_emuls
+ ;;
+mipsn64*-*-netbsd*) targ_emul=elf64btsmip
+ targ_extra_emuls="elf64ltsmip elf64btsmip elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32"
+ targ_extra_libpath=$targ_extra_emuls
;;
mips*el-*-netbsd*) targ_emul=elf32ltsmip
targ_extra_emuls="elf32btsmip elf64ltsmip elf64btsmip"
Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.33 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.34
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.33 Fri Apr 3 21:34:30 2020
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile Sun Apr 25 19:35:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2020/04/04 01:34:30 christos Exp $
+# $NetBSD: Makefile,v 1.34 2021/04/25 23:35:52 christos Exp $
CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/ld \
@@ -79,7 +79,8 @@ e${f}.c: ${DIST}/ld/genscripts.sh ${.CUR
!empty(BINUTILS_MACHINE_ARCH:Maarch64*) || \
!empty(BINUTILS_MACHINE_ARCH:Mearm*) || \
!empty(BINUTILS_MACHINE_ARCH:Marm*) || \
-!empty(BINUTILS_MACHINE_ARCH:Mmips64*)
+!empty(BINUTILS_MACHINE_ARCH:Mmips64*) || \
+!empty(BINUTILS_MACHINE_ARCH:Mmipsn64*)
. fo
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:24:00 UTC 2021
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
use ${MACHINE_MIPS64}
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/mips/conf/Makefile.mips
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.70 src/sys/arch/mips/conf/Makefile.mips:1.71
--- src/sys/arch/mips/conf/Makefile.mips:1.70 Tue Jan 1 14:41:04 2019
+++ src/sys/arch/mips/conf/Makefile.mips Sun Apr 25 19:24:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.70 2019/01/01 19:41:04 christos Exp $
+# $NetBSD: Makefile.mips,v 1.71 2021/04/25 23:24:00 christos Exp $
# Makefile for NetBSD
#
@@ -54,7 +54,7 @@ AFLAGS.fp.S+= -Wa,-mhard-float
CFLAGS+= ${GP} -mno-abicalls -msoft-float -ffixed-24
.if defined(LP64) && ${LP64} == "yes"
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_MIPS64}
CFLAGS+= -msym32 -mabi=64
AFLAGS+= -msym32 -mabi=64
.endif
@@ -65,7 +65,7 @@ SYSTEM_LD_TAIL_EXTRA+= \
;echo ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32; \
${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32
.endif
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
LDFLAGS+= -Wl,-m,elf64ltsmip
LINKFORMAT+= -m elf64ltsmip
SYSTEM_LD_TAIL_EXTRA+= \
@@ -96,7 +96,7 @@ locore_machdep.o: ${THISMIPS}/${MACHINE}
##
## (5) link settings
##
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_MIPS64}
TEXTADDR?= ${DEFTEXTADDR:C/0x8/0x8/}
.else
TEXTADDR?= ${DEFTEXTADDR}
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:23:19 UTC 2021
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
handle mipsn64el
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/external/mit/xorg/lib/pixman/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.36 src/external/mit/xorg/lib/pixman/Makefile:1.37
--- src/external/mit/xorg/lib/pixman/Makefile:1.36 Tue Sep 15 01:14:19 2020
+++ src/external/mit/xorg/lib/pixman/Makefile Sun Apr 25 19:23:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2020/09/15 05:14:19 mrg Exp $
+# $NetBSD: Makefile,v 1.37 2021/04/25 23:23:19 christos Exp $
NOLINT= 1 # defined
@@ -90,7 +90,7 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f
#CPPFLAGS+= -DUSE_ARM_IWMMXT
.endif
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
# Loongson MMI
SRCS+= pixman-mmx.c
CPPFLAGS+= -DUSE_LOONGSON_MMI
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Sun Apr 25 23:21:10 UTC 2021 Added Files: src/external/gpl3/gdb/lib/libbfd/arch/mipsn64eb: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk src/external/gpl3/gdb/lib/libctf/arch/mipsn64eb: config.h defs.mk src/external/gpl3/gdb/lib/libdecnumber/arch/mipsn64eb: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/mipsn64eb: config.h defs.mk init.c jit-reader.h observer.h observer.inc version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdbsupport/arch/mipsn64eb: defs.mk src/external/gpl3/gdb/lib/libgdbsupport/arch/mipsn64eb/gdbsupport: config.h src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb: defs.mk src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib: config.h src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb/lib/libiberty/arch/mipsn64eb: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/mipsn64eb: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/mipsn64eb: config.h defs.mk Log Message: regen for mipsn64eb To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libbfd/arch/mipsn64eb/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipsn64eb/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipsn64eb/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipsn64eb/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipsn64eb/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/mipsn64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libctf/arch/mipsn64eb/config.h \ src/external/gpl3/gdb/lib/libctf/arch/mipsn64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libdecnumber/arch/mipsn64eb/config.h \ src/external/gpl3/gdb/lib/libdecnumber/arch/mipsn64eb/defs.mk \ src/external/gpl3/gdb/lib/libdecnumber/arch/mipsn64eb/gstdint.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdb/arch/mipsn64eb/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/mipsn64eb/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/mipsn64eb/init.c \ src/external/gpl3/gdb/lib/libgdb/arch/mipsn64eb/jit-reader.h \ src/external/gpl3/gdb/lib/libgdb/arch/mipsn64eb/observer.h \ src/external/gpl3/gdb/lib/libgdb/arch/mipsn64eb/observer.inc \ src/external/gpl3/gdb/lib/libgdb/arch/mipsn64eb/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/mipsn64eb/xml-builtin.c cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdbsupport/arch/mipsn64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdbsupport/arch/mipsn64eb/gdbsupport/config.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/config.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/alloca.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/ctype.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/dirent.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/fcntl.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/fnmatch.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/glob.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/inttypes.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/limits.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/locale.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/math.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/signal.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/stdint.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/stdio.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/stdlib.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/string.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/time.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/unistd.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/wchar.h \ src/external/gpl3/gdb/lib/libgnulib/arch/mipsn64eb/gnulib/import/wctype.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libiberty/arch/mipsn64eb/config.h \ src/external/gpl3/gdb/lib/libiberty/arch/mipsn64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libopcodes/arch/mipsn64eb/config.h \ src/external/gpl3/gdb/lib/libopcodes/arch/mipsn64eb/defs.mk cvs
CVS commit: [thorpej-i2c-spi-conf] src/sys/arch/sandpoint/sandpoint
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 23:19:16 UTC 2021
Modified Files:
src/sys/arch/sandpoint/sandpoint [thorpej-i2c-spi-conf]: autoconf.c
Log Message:
Use a private devhandle to implement i2c device enumeration on the
Sandpoint-based NAS devices.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.6.1 src/sys/arch/sandpoint/sandpoint/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/sandpoint/autoconf.c
diff -u src/sys/arch/sandpoint/sandpoint/autoconf.c:1.29 src/sys/arch/sandpoint/sandpoint/autoconf.c:1.29.6.1
--- src/sys/arch/sandpoint/sandpoint/autoconf.c:1.29 Thu Jul 9 05:12:09 2020
+++ src/sys/arch/sandpoint/sandpoint/autoconf.c Sun Apr 25 23:19:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.29 2020/07/09 05:12:09 nisimura Exp $ */
+/* $NetBSD: autoconf.c,v 1.29.6.1 2021/04/25 23:19:16 thorpej Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29 2020/07/09 05:12:09 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29.6.1 2021/04/25 23:19:16 thorpej Exp $");
#include
#include
@@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include
#include
+#include
#include
#include
@@ -57,31 +58,167 @@ static struct btinfo_net *bi_net;
static struct btinfo_prodfamily *bi_pfam;
static struct btinfo_model *bi_model;
-struct i2c_dev {
- const char *name;
- unsigned addr;
- /* only attach when one of these bits in the model flags is set */
+struct sandpoint_i2cdev {
+ const char * name;
+ const char * compat;
uint32_t model_mask;
+ i2c_addr_t addr;
};
-#define MAXI2CDEVS 4
-struct model_i2c {
- const char *family;
- struct i2c_dev i2c_devs[MAXI2CDEVS];
-};
-
-static struct model_i2c model_i2c_list[] = {
- { "dlink", { { "strtc", 0x68, 0 } } },
- { "iomega", { { "dsrtc", 0x68, 0 } } },
- { "kurobox", { { "rs5c372rtc", 0x32, 0 } } },
- { "kurot4", { { "rs5c372rtc", 0x32, 0 } } },
- { "nhnas", { { "pcf8563rtc", 0x51, 0 } } },
- { "qnap", { { "s390rtc",0x30, 0 } } },
- { "synology", { { "rs5c372rtc", 0x32, 0 },
-{ "lmtemp", 0x48, BI_MODEL_THERMAL } } },
+static const struct sandpoint_i2cdev dlink_i2cdevs[] = {
+[0] = {
+ .name = "strtc",
+ .compat = "st,m41t80",
+ .addr = 0x68,
+ },
+[1] = {
+ .name = NULL
+ }
+};
+
+static const struct sandpoint_i2cdev iomega_i2cdevs[] = {
+[0] = {
+ .name = "dsrtc",
+ .compat = "dallas,ds1307",
+ .addr = 0x68,
+ },
+[1] = {
+ .name = NULL
+ }
+};
+
+static const struct sandpoint_i2cdev kurobox_i2cdevs[] = {
+[0] = {
+ .name = "rs5c372rtc",
+ .compat = "ricoh,rs5c372a",
+ .addr = 0x32,
+ },
+[1] = {
+ .name = NULL
+ }
+};
+
+static const struct sandpoint_i2cdev nhnas_i2cdevs[] = {
+[0] = {
+ .name = "pcf8563rtc",
+ .compat = "nxp,pcf8563",
+ .addr = 0x51,
+ },
+[1] = {
+ .name = NULL
+ }
+};
+
+static const struct sandpoint_i2cdev qnap_i2cdevs[] = {
+[0] = {
+ .name = "s390rtc",
+ .compat = "sii,s35390a",
+ .addr = 0x30,
+ },
+[1] = {
+ .name = NULL
+ }
+};
+
+static const struct sandpoint_i2cdev synology_i2cdevs[] = {
+[0] = {
+ .name = "rs5c372rtc",
+ .compat = "ricoh,rs5c372a",
+ .addr = 0x32,
+ },
+[1] = {
+ .name = "lmtemp",
+ .compat = "national,lm75",
+ .addr = 0x48,
+ .model_mask = BI_MODEL_THERMAL,
+ },
+[2] = {
+ .name = NULL
+ }
};
-static void add_i2c_child_devices(device_t, const char *);
+static const struct device_compatible_entry sandpoint_i2c_compat[] = {
+ { .compat = "dlink", .data = &dlink_i2cdevs },
+ { .compat = "iomega", .data = &iomega_i2cdevs },
+ { .compat = "kurobox", .data = &kurobox_i2cdevs },
+ /* kurot4 has same i2c devices as kurobox */
+ { .compat = "kurot4", .data = &kurobox_i2cdevs },
+ { .compat = "nhnas", .data = &nhnas_i2cdevs },
+ { .compat = "qnap", .data = &qnap_i2cdevs },
+ { .compat = "synology", .data = &synology_i2cdevs },
+ DEVICE_COMPAT_EOL
+};
+
+/*
+ * We provide a device handle implementation for i2c device enumeration.
+ */
+static int
+sandpoint_i2c_enumerate_devices(device_t dev, devhandle_t call_handle, void *v)
+{
+ struct i2c_enumerate_devices_args *args = v;
+ const struct device_compatible_entry *dce;
+ const struct sandpoint_i2cdev *i2cdev;
+ prop_dictionary_t props;
+ bool cbrv;
+
+ KASSERT(bi_pfam != NULL);
+
+ const char *fam_name = bi_pfam->name;
+ dce = device_compatible_lookup(&fam_name, 1, sandpoint_i2c_compat);
+ if (dce == NULL) {
+ /* no i2c devices for this model. */
+ return 0;
+ }
+ i2cdev = dce->data;
+ KASSERT(i2cdev != NULL);
+
+ for (; i2cdev->name != NULL; i2cdev++) {
+ if (i2cdev->model_mask != 0) {
+ KASSERT(bi_model != NULL);
+ if ((i2cdev->model_mask & bi_model->flags) == 0) {
+/* skip this device. */
+continue;
+ }
+ }
+
+ props = prop_dictionary_create();
+
+ args->ia->ia_addr = i2cdev->addr;
+ args-
CVS commit: src/external/gpl3/gdb/dist
Module Name:src Committed By: christos Date: Sun Apr 25 23:18:42 UTC 2021 Modified Files: src/external/gpl3/gdb/dist: config.sub Log Message: add mipsn64 targets To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/dist/config.sub Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/dist/config.sub diff -u src/external/gpl3/gdb/dist/config.sub:1.12 src/external/gpl3/gdb/dist/config.sub:1.13 --- src/external/gpl3/gdb/dist/config.sub:1.12 Mon Sep 14 22:05:15 2020 +++ src/external/gpl3/gdb/dist/config.sub Sun Apr 25 19:18:42 2021 @@ -1191,6 +1191,7 @@ case $cpu-$vendor in | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64eb | mips64el \ + | mipsn64 | mipsn64eb | mipsn64el \ | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ | mips64r5900 | mips64r5900el \
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: christos
Date: Sun Apr 25 23:12:54 UTC 2021
Modified Files:
src/external/gpl3/gcc/dist: config.sub
src/external/gpl3/gcc/dist/gcc: config.gcc
src/external/gpl3/gcc/dist/gcc/config/mips: netbsd64.h t-netbsd64
src/external/gpl3/gcc/dist/libgcc: config.host
src/external/gpl3/gcc/lib/crtstuff: Makefile
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/mipso32:
Makefile
src/external/gpl3/gcc/lib/libtsan: Makefile
Log Message:
Add support for mipsn64 targets which build 64 bit binaries by default
on instead of n32
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/dist/config.sub
cvs rdiff -u -r1.68 -r1.69 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/mips/t-netbsd64
cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/gcc/dist/libgcc/config.host
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/lib/crtstuff/Makefile
cvs rdiff -u -r1.50 -r1.51 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/mipso32/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/lib/libtsan/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/config.sub
diff -u src/external/gpl3/gcc/dist/config.sub:1.16 src/external/gpl3/gcc/dist/config.sub:1.17
--- src/external/gpl3/gcc/dist/config.sub:1.16 Sat Apr 10 20:02:10 2021
+++ src/external/gpl3/gcc/dist/config.sub Sun Apr 25 19:12:53 2021
@@ -1191,6 +1191,7 @@ case $cpu-$vendor in
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64eb | mips64el \
+ | mipsn64 | mipsn64eb | mipsn64el \
| mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
| mips64r5900 | mips64r5900el \
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.68 src/external/gpl3/gcc/dist/gcc/config.gcc:1.69
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.68 Mon Apr 12 05:03:39 2021
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Sun Apr 25 19:12:53 2021
@@ -2570,6 +2570,13 @@ riscv*-*-netbsd*) # NetBSD RISC-V
gas=yes
gcc_cv_initfini_array=yes
;;
+mipsn64*-*-netbsd*) # NetBSD/mips64, either endian.
+ target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_SOFT_FLOAT_ABI"
+ tm_file="elfos.h ${tm_file} mips/elf.h ${nbsd_tm_file} mips/netbsd.h mips/netbsd64.h"
+ tmake_file="${tmake_file} mips/t-netbsd64"
+ tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_64"
+ extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
+ ;;
mips64*-*-netbsd*) # NetBSD/mips64, either endian.
target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_SOFT_FLOAT_ABI"
tm_file="elfos.h ${tm_file} mips/elf.h ${nbsd_tm_file} mips/netbsd.h mips/netbsd64.h"
Index: src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h:1.5 src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h:1.6
--- src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h:1.5 Sun Mar 28 21:33:12 2021
+++ src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h Sun Apr 25 19:12:54 2021
@@ -22,11 +22,19 @@ Boston, MA 02110-1301, USA. */
/* Force the default endianness and ABI flags onto the command line
in order to make the other specs easier to write. */
+#if MIPS_ABI_DEFAULT == ABI_N32
+# define MIPS64_ABI "%{!mabi=*: -mabi=n32}"
+# elif MIPS_ABI_DEFAULT == ABI_64
+# define MIPS64_ABI "%{!mabi=*: -mabi=64}"
+#else
+# error "Missing MIPS_ABI_DEFAULT " # MIPS_ABI_DEFAULT
+#endif
+
#undef DRIVER_SELF_SPECS
#define DRIVER_SELF_SPECS \
BASE_DRIVER_SELF_SPECS \
"%{!EB:%{!EL:%(endian_spec)}}", \
- "%{!mabi=*: -mabi=n32}"
+ MIPS64_ABI
/* Define default target values. */
Index: src/external/gpl3/gcc/dist/gcc/config/mips/t-netbsd64
diff -u src/external/gpl3/gcc/dist/gcc/config/mips/t-netbsd64:1.1 src/external/gpl3/gcc/dist/gcc/config/mips/t-netbsd64:1.2
--- src/external/gpl3/gcc/dist/gcc/config/mips/t-netbsd64:1.1 Wed Jun 29 00:59:10 2011
+++ src/external/gpl3/gcc/dist/gcc/config/mips/t-netbsd64 Sun Apr 25 19:12:54 2021
@@ -1,9 +1,17 @@
# NetBSD has (will have) "non-native" libraries in /usr/lib/.
-# For NetBSD/mips64 we thus have /usr/lib (n32), /usr/lib/o32 and /usr/lib/64.
MULTILIB_OPTIONS = mabi=n32/mabi=64/mabi=32
MULTILIB_DIRNAMES = n32 n64 o32
+
+# For NetBSD/mips64 we thus have /usr/lib (n32), /usr/lib/o32 and /usr/lib/64.
+ifneq ($(filter MIPS_ABI_DEFAULT=ABI_N32,$(tm_defines)),)
MULTILIB_OSDIRNAMES = . ../lib/64 ..
CVS commit: src/common/lib/libc/arch/mips/atomic
Module Name:src
Committed By: christos
Date: Sun Apr 25 22:45:16 UTC 2021
Modified Files:
src/common/lib/libc/arch/mips/atomic: Makefile.inc
Log Message:
use ${MACHINE_MIPS64}
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/common/lib/libc/arch/mips/atomic/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/mips/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.14 src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.15
--- src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.14 Wed Feb 27 21:35:37 2019
+++ src/common/lib/libc/arch/mips/atomic/Makefile.inc Sun Apr 25 18:45:16 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.14 2019/02/28 02:35:37 isaki Exp $
+# $NetBSD: Makefile.inc,v 1.15 2021/04/25 22:45:16 christos Exp $
.if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" \
|| ${LIB} == "rump")
-.if ${MACHINE_ARCH:Mmips64*} == ""
+.if !${MACHINE_MIPS64}
SRCS+= atomic_add_32_cas.c atomic_add_32_nv_cas.c \
atomic_and_32_cas.c atomic_and_32_nv_cas.c \
atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \
@@ -30,7 +30,7 @@ SRCS+= membar_ops.S
.if defined(LIB) && (${LIB} == "c" || ${LIB} == "pthread")
-.if ${MACHINE_ARCH:Mmips64*} == ""
+.if !${MACHINE_MIPS64}
SRCS+= atomic_init_testset.c atomic_cas_up.S
.else
SRCS+= atomic_cas.S atomic_init_cas.c atomic_cas_by_cas32.c
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Apr 25 22:30:30 UTC 2021 Modified Files: src/distrib/sets/lists/base: ad.mips src/distrib/sets/lists/comp: ad.mips src/distrib/sets/lists/debug: ad.mips Log Message: Choose the right compat sets for the platform: mipsn64 -> o32 n32 mips64 -> o32 64 To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/debug/ad.mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.82 src/distrib/sets/lists/base/ad.mips:1.83 --- src/distrib/sets/lists/base/ad.mips:1.82 Sun Apr 11 22:08:59 2021 +++ src/distrib/sets/lists/base/ad.mips Sun Apr 25 18:30:29 2021 @@ -1,12 +1,13 @@ -# $NetBSD: ad.mips,v 1.82 2021/04/12 02:08:59 mrg Exp $ +# $NetBSD: ad.mips,v 1.83 2021/04/25 22:30:29 christos Exp $ ./lib/libc_fp.sobase-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0base-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0.0base-sys-shlib dynamicroot,softfloat,arch64 -./libexec/ld.elf_so-64base-compat-shlib compat,pic,arch64 +./libexec/ld.elf_so-64base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./libexec/ld.elf_so-n32base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb ./libexec/ld.elf_so-o32base-compat-shlib compat,pic,arch64 -./usr/lib/64/libc_fp.sobase-compat-shlib compat,pic,arch64 -./usr/lib/64/libc_fp.so.0 base-compat-shlib compat,pic,arch64 -./usr/lib/64/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64 +./usr/lib/64/libc_fp.sobase-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/lib/64/libc_fp.so.0 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/lib/64/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb ./usr/lib/libc_fp.sobase-sys-shlib softfloat,arch64 ./usr/lib/libc_fp.so.0base-sys-shlib softfloat,arch64 ./usr/lib/libc_fp.so.0.0 base-sys-shlib softfloat,arch64 @@ -17,6 +18,10 @@ ./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=9 ./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=10,obsolete ./usr/lib/o32/libgomp.so.2.1 base-compat-shlib compat,pic,arch64,gcc=10 -./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64 +./usr/lib/n32/libc_fp.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/lib/n32/libc_fp.so.0 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/lib/n32/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/libexec/ld.elf_so-n32 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb ./usr/libexec/ld.elf_so-o32 base-sysutil-bin compat,pic,arch64 ./usr/lkm/ldscriptbase-obsolete obsolete Index: src/distrib/sets/lists/comp/ad.mips diff -u src/distrib/sets/lists/comp/ad.mips:1.88 src/distrib/sets/lists/comp/ad.mips:1.89 --- src/distrib/sets/lists/comp/ad.mips:1.88 Sun Apr 11 22:08:59 2021 +++ src/distrib/sets/lists/comp/ad.mips Sun Apr 25 18:30:29 2021 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.88 2021/04/12 02:08:59 mrg Exp $ +# $NetBSD: ad.mips,v 1.89 2021/04/25 22:30:29 christos Exp $ -./usr/lib/64/libgomp.a -./usr/lib/64/libgomp.so -./usr/lib/64/libgomp.so.1 @@ -104,15 +104,18 @@ ./usr/include/mips/varargs.h comp-obsolete obsolete ./usr/include/mips/vmparam.h comp-c-include ./usr/include/mips/wchar_limits.h comp-c-include -./usr/lib/64/libc_fp.acomp-c-lib softfloat,compat,arch64 -./usr/lib/64/libc_fp_p.a comp-c-lib profile,softfloat,compat,arch64 -./usr/lib/64/libc_fp_pic.a comp-c-piclib softfloat,picinstall,compat,arch64 +./usr/lib/64/libc_fp.acomp-c-lib softfloat,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el +./usr/lib/64/libc_fp_p.a comp-c-lib profile,softfloat,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el +./usr/lib/64/libc_fp_pic.a comp-c-piclib softfloat,picinstall,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el ./usr/lib/libc_fp.acomp-c-lib softfloat,arch64 ./usr/lib/libc_fp_p.acomp-c-lib profile,softfloat,arch64 ./usr/lib/libc_fp_pic.acomp-c-piclib softfloat,picinstall,arch64 ./usr/lib/o32/libc_fp.acomp-c-lib softfloat,compat,arch64 ./usr/lib/o32/libc_fp_p.a comp-c-lib profile,softfloat,compat,arch64 ./usr/lib/o32/libc_fp_pic.a comp-c-piclib softfloat,picinstall,compat,arch6
CVS commit: src
Module Name:src Committed By: christos Date: Sun Apr 25 22:29:22 UTC 2021 Modified Files: src: build.sh Log Message: Add mipsn64e[bl] targets which use 64 bit binaries instead of n32 ones. To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.346 src/build.sh:1.347 --- src/build.sh:1.346 Thu Jan 28 05:36:27 2021 +++ src/build.sh Sun Apr 25 18:29:22 2021 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.346 2021/01/28 10:36:27 martin Exp $ +# $NetBSD: build.sh,v 1.347 2021/04/25 22:29:22 christos Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -660,6 +660,8 @@ MACHINE=evbmips MACHINE_ARCH=mips64eb A MACHINE=evbmips MACHINE_ARCH=mips64el ALIAS=evbmips64-el MACHINE=evbmips MACHINE_ARCH=mipseb ALIAS=evbmips-eb MACHINE=evbmips MACHINE_ARCH=mipsel ALIAS=evbmips-el +MACHINE=evbmips MACHINE_ARCH=mipsn64eb ALIAS=evbmipsn64-eb +MACHINE=evbmips MACHINE_ARCH=mipsn64el ALIAS=evbmipsn64-el MACHINE=evbppc MACHINE_ARCH=powerpc DEFAULT MACHINE=evbppc MACHINE_ARCH=powerpc64 ALIAS=evbppc64 MACHINE=evbsh3 MACHINE_ARCH= NO_DEFAULT @@ -1971,7 +1973,7 @@ createmakewrapper() eval cat <
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: christos
Date: Sun Apr 25 22:27:08 UTC 2021
Modified Files:
src/sys/compat/netbsd32: netbsd32.mk
Log Message:
All mips64 has compat_netbsd32
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/netbsd32/netbsd32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32.mk
diff -u src/sys/compat/netbsd32/netbsd32.mk:1.2 src/sys/compat/netbsd32/netbsd32.mk:1.3
--- src/sys/compat/netbsd32/netbsd32.mk:1.2 Thu Mar 5 23:54:08 2020
+++ src/sys/compat/netbsd32/netbsd32.mk Sun Apr 25 18:27:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: netbsd32.mk,v 1.2 2020/03/06 04:54:08 pgoyette Exp $
+# $NetBSD: netbsd32.mk,v 1.3 2021/04/25 22:27:08 christos Exp $
# makefile fragment that tells you if you should support netbsd32 or not.
# include this and check ${COMPAT_USE_NETBSD32} != "no".
@@ -7,7 +7,7 @@
|| ${MACHINE_CPU} == "arm" \
|| ${MACHINE_CPU} == "aarch64" \
|| ${MACHINE_ARCH} == "sparc64" \
-|| (!empty(MACHINE_ARCH:Mmips64*) && !defined(BSD_MK_COMPAT_FILE))
+|| (${MACHINE_MIPS64} && !defined(BSD_MK_COMPAT_FILE))
COMPAT_USE_NETBSD32?=yes
.else
COMPAT_USE_NETBSD32?=no
CVS commit: src/external/gpl3/gcc/usr.bin/cc1plus
Module Name:src
Committed By: christos
Date: Sun Apr 25 22:25:55 UTC 2021
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
Log Message:
Limit no-error to stack-protector
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.15 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.16
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.15 Sun Apr 11 20:05:56 2021
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Sun Apr 25 18:25:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/04/12 00:05:56 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2021/04/25 22:25:55 christos Exp $
PROG= cc1plus
SRCS= ${G_CXX_OBJS:S,c-family/,,:S,cp/,,:S,constraint.o,constraint.cc,:S,logic.o,logic.cc,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:S,coroutines.o,coroutines.cc,:Nlibcpp.a:.o=.c}
@@ -29,9 +29,7 @@ CHECKSUM_OBJS= ${LIBBACKTRACEOBJ}/libbac
# XXX check this out
# LDFLAGS+= -rdynamic
-# YUCK. but see timevar.h:POP_TIMEVAR_AND_RETURN
-CFLAGS+= -Wno-error # not good enough: -Wno-return-type
-COPTS+= -Wno-stack-protector
+CFLAGS+= -Wno-error=stack-protector
.if ${MACHINE_ARCH} == "vax"
COPTS.call.c+=-O0
@@ -50,7 +48,7 @@ COPTS.c-ubsan.c+=-O0
COPTS.cc1plus-checksum.c+=-O0
.endif
-.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
+.if ${MACHINE_MIPS64}
COPTS.c-common.c+=-O3
.endif
CVS commit: src/external/gpl3/gcc/usr.bin/cc1objplus
Module Name:src
Committed By: christos
Date: Sun Apr 25 22:25:00 UTC 2021
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1objplus: Makefile
Log Message:
- Disable stack-protector errors like we did for cc1plus
- use ${MACHINE_MIPS64}
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.1 src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.1 Fri Apr 23 18:50:06 2021
+++ src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile Sun Apr 25 18:25:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/04/23 22:50:06 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2021/04/25 22:25:00 christos Exp $
# XXX: Pull this (G_OBJCXX_OBJS) out with mknative-gcc. Needs some
# minor re-org of cc1plus and perhaps cc1obj. G_CXX_AND_OBJCXX_OBJS
@@ -51,6 +51,9 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.
.include "../Makefile.checksum"
+# XXX: like cc1plus
+CFLAGS+=-Wno-error=stack-protector
+
COPTS.c-ada-spec.c+= -Wno-stack-protector
COPTS.c-attribs.c+= -Wno-stack-protector
COPTS.c-aux-info.c+= -Wno-stack-protector
@@ -78,7 +81,7 @@ COPTS.cc1obj-checksum.c+=-O0
COPTS.decl.c+=-O0
.endif
-.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
+.if ${MACHINE_MIPS64}
COPTS.c-common.c+=-O3
.endif
CVS commit: [thorpej-i2c-spi-conf] src/sys/dev/fdt
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 22:20:08 UTC 2021
Modified Files:
src/sys/dev/fdt [thorpej-i2c-spi-conf]: fdt_i2c.c
Log Message:
- Don't call of_enter_i2c_devs() -- it no longer exists.
- Pass along the provided devhandle to the i2c bus instance.
XXX fdtbus_attach_i2cbus() is now just a thin wrapper around config_found()
and should probably just go away in favor of making FDT-attached i2c
controller drivers consistent with everyone else.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/dev/fdt/fdt_i2c.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fdt/fdt_i2c.c
diff -u src/sys/dev/fdt/fdt_i2c.c:1.10 src/sys/dev/fdt/fdt_i2c.c:1.10.2.1
--- src/sys/dev/fdt/fdt_i2c.c:1.10 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/fdt_i2c.c Sun Apr 25 22:20:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_i2c.c,v 1.10 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: fdt_i2c.c,v 1.10.2.1 2021/04/25 22:20:08 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.10 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.10.2.1 2021/04/25 22:20:08 thorpej Exp $");
#include
#include
@@ -102,31 +102,12 @@ device_t
fdtbus_attach_i2cbus(device_t dev, int phandle, i2c_tag_t tag, cfprint_t print)
{
struct i2cbus_attach_args iba;
- prop_dictionary_t devs, props;
- device_t ret;
- u_int address_cells;
-
- devs = prop_dictionary_create();
- if (of_getprop_uint32(phandle, "#address-cells", &address_cells))
- address_cells = 1;
-
- of_enter_i2c_devs(devs, phandle, address_cells * 4, 0);
memset(&iba, 0, sizeof(iba));
iba.iba_tag = tag;
- iba.iba_child_devices = prop_dictionary_get(devs, "i2c-child-devices");
- if (iba.iba_child_devices)
- prop_object_retain(iba.iba_child_devices);
- prop_object_release(devs);
-
- props = device_properties(dev);
- prop_dictionary_set_bool(props, "i2c-no-indirect-config", true);
- ret = config_found(dev, &iba, print,
+ return config_found(dev, &iba, print,
CFARG_IATTR, "i2cbus",
+ CFARG_DEVHANDLE, devhandle_from_of(phandle),
CFARG_EOL);
- if (iba.iba_child_devices)
- prop_object_release(iba.iba_child_devices);
-
- return ret;
}
CVS commit: [thorpej-i2c-spi-conf] src/sys/dev/ofw
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 22:16:05 UTC 2021
Modified Files:
src/sys/dev/ofw [thorpej-i2c-spi-conf]: ofw_i2c_subr.c openfirm.h
Log Message:
Implement "i2c-enumerate-devices" for OFW / FDT.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 src/sys/dev/ofw/ofw_i2c_subr.c
cvs rdiff -u -r1.47 -r1.47.2.1 src/sys/dev/ofw/openfirm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ofw/ofw_i2c_subr.c
diff -u src/sys/dev/ofw/ofw_i2c_subr.c:1.1 src/sys/dev/ofw/ofw_i2c_subr.c:1.1.6.1
--- src/sys/dev/ofw/ofw_i2c_subr.c:1.1 Thu Feb 4 20:19:09 2021
+++ src/sys/dev/ofw/ofw_i2c_subr.c Sun Apr 25 22:16:05 2021
@@ -1,4 +1,30 @@
-/* $NetBSD: ofw_i2c_subr.c,v 1.1 2021/02/04 20:19:09 thorpej Exp $ */
+/* $NetBSD: ofw_i2c_subr.c,v 1.1.6.1 2021/04/25 22:16:05 thorpej Exp $ */
+
+/*
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
/*
* Copyright 1998
@@ -34,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_i2c_subr.c,v 1.1 2021/02/04 20:19:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_i2c_subr.c,v 1.1.6.1 2021/04/25 22:16:05 thorpej Exp $");
#include
#include
@@ -44,66 +70,81 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_i2c_subr
#include
/*
- * Iterate over the subtree of a i2c controller node.
- * Add all sub-devices into an array as part of the controller's
- * device properties.
- * This is used by the i2c bus attach code to do direct configuration.
+ * Standard routine for fetching an i2c device address, according
+ * to the standard OpenFirmware / Device Tree bindings.
*/
-void
-of_enter_i2c_devs(prop_dictionary_t props, int ofnode, size_t cell_size,
-int addr_shift)
+static bool
+of_i2c_get_address(int node, uint32_t *addrp)
+{
+ uint32_t reg;
+
+ if (of_getprop_uint32(node, "reg", ®) == -1) {
+ return false;
+ }
+
+ *addrp = reg;
+ return true;
+}
+
+static int
+of_i2c_enumerate_devices(device_t dev, devhandle_t call_handle, void *v)
{
- int node, len;
- char name[32];
- uint64_t reg64;
- uint32_t reg32;
- uint64_t addr;
- prop_array_t array = NULL;
- prop_dictionary_t dev;
+ return of_i2c_enumerate_devices_ext(dev, call_handle, v,
+ of_i2c_get_address);
+}
+OF_DEVICE_CALL_REGISTER("i2c-enumerate-devices", of_i2c_enumerate_devices);
- for (node = OF_child(ofnode); node; node = OF_peer(node)) {
- if (OF_getprop(node, "name", name, sizeof(name)) <= 0)
+int
+of_i2c_enumerate_devices_ext(device_t dev, devhandle_t call_handle, void *v,
+bool (*get_address)(int, uint32_t *))
+{
+ struct i2c_enumerate_devices_args *args = v;
+ int i2c_node, node;
+ char name[32], compat_buf[32];
+ prop_dictionary_t props;
+ uint32_t addr;
+ char *clist;
+ int clist_size;
+ bool cbrv;
+
+ i2c_node = devhandle_to_of(call_handle);
+
+ for (node = OF_child(i2c_node); node != 0; node = OF_peer(node)) {
+ if (OF_getprop(node, "name", name, sizeof(name)) <= 0) {
continue;
- len = OF_getproplen(node, "reg");
- addr = 0;
- if (cell_size == 8 && len >= sizeof(reg64)) {
- if (OF_getprop(node, "reg", ®64, sizeof(reg64))
- < sizeof(reg64))
-continue;
- addr = be64toh(reg64);
- /*
- * The i2c bus number (0 or 1) is encoded in bit 33
- * of the register, but we encode it in bit 8 of
- * i2c_addr_t.
- */
- if (addr & 0x1)
-addr = (addr & 0xff) | 0x100;
- } else if (cell_size == 4 && len >= sizeof(reg32)) {
- if (OF_getprop(node, "reg", ®32, sizeof(reg32))
- < sizeof(reg32))
-continue;
- addr = be32toh(reg32);
- } else {
+ }
+ if (!get_address(node, &
CVS commit: [thorpej-i2c-spi-conf] src/sys
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 22:02:59 UTC 2021
Modified Files:
src/sys/arch/arm/broadcom [thorpej-i2c-spi-conf]: bcm2835_bsc_acpi.c
src/sys/arch/x86/pci [thorpej-i2c-spi-conf]: dwiic_pci.c
src/sys/dev/acpi [thorpej-i2c-spi-conf]: dwiic_acpi.c nxpiic_acpi.c
src/sys/dev/i2c [thorpej-i2c-spi-conf]: motoi2c.c motoi2cvar.h
Log Message:
- Don't use acpi_enter_i2c_devs() -- it no longer exists.
- Pass along our devhandle to the i2c bus instance.
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/arch/x86/pci/dwiic_pci.c
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/dev/acpi/dwiic_acpi.c
cvs rdiff -u -r1.4.6.1 -r1.4.6.2 src/sys/dev/acpi/nxpiic_acpi.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/dev/i2c/motoi2c.c
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/dev/i2c/motoi2cvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c
diff -u src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c:1.3.2.1 src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c:1.3.2.2
--- src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c:1.3.2.1 Sun Apr 25 21:52:28 2021
+++ src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c Sun Apr 25 22:02:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_bsc_acpi.c,v 1.3.2.1 2021/04/25 21:52:28 thorpej Exp $ */
+/* $NetBSD: bcm2835_bsc_acpi.c,v 1.3.2.2 2021/04/25 22:02:59 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_acpi.c,v 1.3.2.1 2021/04/25 21:52:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_acpi.c,v 1.3.2.2 2021/04/25 22:02:59 thorpej Exp $");
#include
#include
@@ -159,8 +159,9 @@ bsciic_acpi_attach(device_t parent, devi
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
- iba.iba_child_devices = acpi_enter_i2c_devs(self, aa->aa_node);
- config_found(self, &iba, iicbus_print, CFARG_EOL);
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
done:
acpi_resource_cleanup(&res);
Index: src/sys/arch/x86/pci/dwiic_pci.c
diff -u src/sys/arch/x86/pci/dwiic_pci.c:1.4.2.1 src/sys/arch/x86/pci/dwiic_pci.c:1.4.2.2
--- src/sys/arch/x86/pci/dwiic_pci.c:1.4.2.1 Sun Apr 25 21:52:28 2021
+++ src/sys/arch/x86/pci/dwiic_pci.c Sun Apr 25 22:02:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_pci.c,v 1.4.2.1 2021/04/25 21:52:28 thorpej Exp $ */
+/* $NetBSD: dwiic_pci.c,v 1.4.2.2 2021/04/25 22:02:59 thorpej Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.4.2.1 2021/04/25 21:52:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.4.2.2 2021/04/25 22:02:59 thorpej Exp $");
#include
#include
@@ -42,10 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,
#include
#include
-#include
-#include
-#include
-
#include
#include
@@ -61,7 +57,6 @@ struct pci_dwiic_softc {
struct dwiic_softc sc_dwiic;
pci_chipset_tag_t sc_pc;
pcitag_t sc_ptag;
- struct acpi_devnode *sc_acpinode;
};
static uint32_t
@@ -164,19 +159,11 @@ pci_dwiic_attach(device_t parent, device
lpss_write(sc, LPSS_REMAP_HI,
pci_conf_read(sc->sc_pc, sc->sc_ptag, PCI_BAR0 + 0x4));
- sc->sc_acpinode = acpi_pcidev_find(0 /*XXX segment*/,
- pa->pa_bus, pa->pa_device, pa->pa_function);
-
- if (sc->sc_acpinode) {
- sc->sc_dwiic.sc_iba.iba_child_devices =
- acpi_enter_i2c_devs(NULL, sc->sc_acpinode);
- } else {
- aprint_verbose_dev(self, "no matching ACPI node\n");
- }
-
dwiic_attach(&sc->sc_dwiic);
- config_found(self, &sc->sc_dwiic.sc_iba, iicbus_print, CFARG_EOL);
+ config_found(self, &sc->sc_dwiic.sc_iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
pmf_device_register(self, dwiic_suspend, dwiic_resume);
Index: src/sys/dev/acpi/dwiic_acpi.c
diff -u src/sys/dev/acpi/dwiic_acpi.c:1.8.2.1 src/sys/dev/acpi/dwiic_acpi.c:1.8.2.2
--- src/sys/dev/acpi/dwiic_acpi.c:1.8.2.1 Sun Apr 25 21:52:28 2021
+++ src/sys/dev/acpi/dwiic_acpi.c Sun Apr 25 22:02:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_acpi.c,v 1.8.2.1 2021/04/25 21:52:28 thorpej Exp $ */
+/* $NetBSD: dwiic_acpi.c,v 1.8.2.2 2021/04/25 22:02:59 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.8.2.1 2021/04/25 21:52:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.8.2.2 2021/04/25 22:02:59 thorpej Exp $");
#include
#include
@@ -124,11 +124,11 @@ dwiic_acpi_attach(device_t parent, devic
dwiic_acpi_configure(sc, aa->aa_node->ad_handle);
- sc->sc_iba.iba_child_devices = acpi_enter_i2c_devs(self, aa->aa_node);
-
dwiic_attach(sc);
- config_found(self, &sc->sc_iba, iicbus_pr
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: mrg Date: Sun Apr 25 21:59:38 UTC 2021 Modified Files: src/sys/arch/sparc/sparc: locore.s Log Message: fix a comment to match the code. To generate a diff of this commit: cvs rdiff -u -r1.279 -r1.280 src/sys/arch/sparc/sparc/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/sparc/locore.s diff -u src/sys/arch/sparc/sparc/locore.s:1.279 src/sys/arch/sparc/sparc/locore.s:1.280 --- src/sys/arch/sparc/sparc/locore.s:1.279 Sun Jan 24 07:36:54 2021 +++ src/sys/arch/sparc/sparc/locore.s Sun Apr 25 21:59:38 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.279 2021/01/24 07:36:54 mrg Exp $ */ +/* $NetBSD: locore.s,v 1.280 2021/04/25 21:59:38 mrg Exp $ */ /* * Copyright (c) 1996 Paul Kranenburg @@ -2662,7 +2662,7 @@ sparc_interrupt4m_bogus: bnz,a 1f ! splhigh(); or %l0, 0xf00, %l0 ! } else - call _C_LABEL(bogusintr) ! strayintr(&intrframe) + call _C_LABEL(bogusintr) ! bogusintr(&intrframe) add %sp, CCFSZ, %o0 /* all done: restore registers and go return */ 1:
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Apr 25 21:55:58 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
make MACHINE_MIPS a boolean not a condition
To generate a diff of this commit:
cvs rdiff -u -r1.1245 -r1.1246 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1245 src/share/mk/bsd.own.mk:1.1246
--- src/share/mk/bsd.own.mk:1.1245 Sun Apr 25 11:33:15 2021
+++ src/share/mk/bsd.own.mk Sun Apr 25 17:55:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1245 2021/04/25 15:33:15 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1246 2021/04/25 21:55:58 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -16,10 +16,14 @@ MAKECONF?= /etc/mk.conf
#
MACHINE_CPU= ${MACHINE_ARCH:C/mips.*e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/e?arm.*/arm/:S/powerpc64/powerpc/:S/aarch64eb/aarch64/:S/or1knd/or1k/:C/riscv../riscv/}
-MACHINE_MIPS64= (${MACHINE_ARCH} == "mips64el" || \
- ${MACHINE_ARCH} == "mips64eb" || \
- ${MACHINE_ARCH} == "mipsn64el" || \
- ${MACHINE_ARCH} == "mipsn64eb")
+.if (${MACHINE_ARCH} == "mips64el" || \
+ ${MACHINE_ARCH} == "mips64eb" || \
+ ${MACHINE_ARCH} == "mipsn64el" || \
+ ${MACHINE_ARCH} == "mipsn64eb")
+MACHINE_MIPS64= 1
+.else
+MACHINE_MIPS64= 0
+.endif
#
# Subdirectory used below ${RELEASEDIR} when building a release
CVS commit: [thorpej-i2c-spi-conf] src/sys
Module Name:src Committed By: thorpej Date: Sun Apr 25 21:52:28 UTC 2021 Modified Files: src/sys/arch/arm/broadcom [thorpej-i2c-spi-conf]: bcm2835_bsc_acpi.c src/sys/arch/x86/pci [thorpej-i2c-spi-conf]: dwiic_pci.c src/sys/dev/acpi [thorpej-i2c-spi-conf]: dwiic_acpi.c nxpiic_acpi.c Log Message: acpi_i2c.h is no more. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/x86/pci/dwiic_pci.c cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/acpi/dwiic_acpi.c cvs rdiff -u -r1.4 -r1.4.6.1 src/sys/dev/acpi/nxpiic_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c diff -u src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c:1.3 src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c:1.3.2.1 --- src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c:1.3 Sat Apr 24 23:36:26 2021 +++ src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c Sun Apr 25 21:52:28 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_bsc_acpi.c,v 1.3 2021/04/24 23:36:26 thorpej Exp $ */ +/* $NetBSD: bcm2835_bsc_acpi.c,v 1.3.2.1 2021/04/25 21:52:28 thorpej Exp $ */ /*- * Copyright (c) 2020 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_acpi.c,v 1.3 2021/04/24 23:36:26 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_acpi.c,v 1.3.2.1 2021/04/25 21:52:28 thorpej Exp $"); #include #include @@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_ #include #include #include -#include #include #include Index: src/sys/arch/x86/pci/dwiic_pci.c diff -u src/sys/arch/x86/pci/dwiic_pci.c:1.4 src/sys/arch/x86/pci/dwiic_pci.c:1.4.2.1 --- src/sys/arch/x86/pci/dwiic_pci.c:1.4 Sat Apr 24 23:36:51 2021 +++ src/sys/arch/x86/pci/dwiic_pci.c Sun Apr 25 21:52:28 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: dwiic_pci.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $ */ +/* $NetBSD: dwiic_pci.c,v 1.4.2.1 2021/04/25 21:52:28 thorpej Exp $ */ /*- * Copyright (c) 2017 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.4.2.1 2021/04/25 21:52:28 thorpej Exp $"); #include #include @@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c, #include #include #include -#include #include #include Index: src/sys/dev/acpi/dwiic_acpi.c diff -u src/sys/dev/acpi/dwiic_acpi.c:1.8 src/sys/dev/acpi/dwiic_acpi.c:1.8.2.1 --- src/sys/dev/acpi/dwiic_acpi.c:1.8 Sat Apr 24 23:36:52 2021 +++ src/sys/dev/acpi/dwiic_acpi.c Sun Apr 25 21:52:28 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: dwiic_acpi.c,v 1.8 2021/04/24 23:36:52 thorpej Exp $ */ +/* $NetBSD: dwiic_acpi.c,v 1.8.2.1 2021/04/25 21:52:28 thorpej Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.8 2021/04/24 23:36:52 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.8.2.1 2021/04/25 21:52:28 thorpej Exp $"); #include #include @@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c #include #include #include -#include #include Index: src/sys/dev/acpi/nxpiic_acpi.c diff -u src/sys/dev/acpi/nxpiic_acpi.c:1.4 src/sys/dev/acpi/nxpiic_acpi.c:1.4.6.1 --- src/sys/dev/acpi/nxpiic_acpi.c:1.4 Fri Jan 29 02:26:58 2021 +++ src/sys/dev/acpi/nxpiic_acpi.c Sun Apr 25 21:52:28 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: nxpiic_acpi.c,v 1.4 2021/01/29 02:26:58 thorpej Exp $ */ +/* $NetBSD: nxpiic_acpi.c,v 1.4.6.1 2021/04/25 21:52:28 thorpej Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nxpiic_acpi.c,v 1.4 2021/01/29 02:26:58 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nxpiic_acpi.c,v 1.4.6.1 2021/04/25 21:52:28 thorpej Exp $"); #include #include @@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: nxpiic_acpi. #include #include #include -#include #include #include
CVS commit: [thorpej-i2c-spi-conf] src/sys/dev/acpi
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 21:49:56 UTC 2021
Modified Files:
src/sys/dev/acpi [thorpej-i2c-spi-conf]: acpi_i2c.c
Removed Files:
src/sys/dev/acpi [thorpej-i2c-spi-conf]: acpi_i2c.h
Log Message:
Implement "i2c-enumerate-devices" for ACPI.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/dev/acpi/acpi_i2c.c
cvs rdiff -u -r1.2 -r0 src/sys/dev/acpi/acpi_i2c.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_i2c.c
diff -u src/sys/dev/acpi/acpi_i2c.c:1.11 src/sys/dev/acpi/acpi_i2c.c:1.11.4.1
--- src/sys/dev/acpi/acpi_i2c.c:1.11 Tue Jan 26 01:23:08 2021
+++ src/sys/dev/acpi/acpi_i2c.c Sun Apr 25 21:49:56 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: acpi_i2c.c,v 1.11 2021/01/26 01:23:08 thorpej Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.11.4.1 2021/04/25 21:49:56 thorpej Exp $ */
/*-
* Copyright (c) 2017, 2021 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Manuel Bouyer.
+ * by Manuel Bouyer and Jason R. Thorpe.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,11 +30,10 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.11 2021/01/26 01:23:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.11.4.1 2021/04/25 21:49:56 thorpej Exp $");
#include
#include
-#include
#include
#include
@@ -69,15 +68,16 @@ acpi_i2c_resource_parse_callback(ACPI_RE
return_ACPI_STATUS(AE_OK);
}
-static void
-acpi_enter_i2c_device(struct acpi_devnode *ad, prop_array_t array)
+static bool
+acpi_i2c_enumerate_device(device_t dev, struct acpi_devnode *ad,
+struct i2c_enumerate_devices_args * const args)
{
- prop_dictionary_t dev;
- struct acpi_i2c_context i2cc;
- ACPI_STATUS rv;
- const char *name;
char *clist;
size_t clist_size;
+ prop_dictionary_t props;
+ struct acpi_i2c_context i2cc;
+ bool cbrv;
+ ACPI_STATUS rv;
memset(&i2cc, 0, sizeof(i2cc));
rv = AcpiWalkResources(ad->ad_handle, "_CRS",
@@ -86,58 +86,61 @@ acpi_enter_i2c_device(struct acpi_devnod
aprint_error("ACPI: unable to get resources "
"for %s: %s\n", ad->ad_name,
AcpiFormatException(rv));
- return;
+ return true; /* keep enumerating */
}
if (i2cc.i2c_addr == 0)
- return;
- dev = prop_dictionary_create();
- if (dev == NULL) {
- aprint_error("ignoring device %s (no memory)\n",
- ad->ad_name);
- return;
- }
+ return true; /* keep enumerating */
+
clist = acpi_pack_compat_list(ad->ad_devinfo, &clist_size);
if (clist == NULL) {
- prop_object_release(dev);
- aprint_error("ignoring device %s (no _HID or _CID)\n",
+ aprint_error("ACPI: ignoring device %s (no _HID or _CID)\n",
ad->ad_name);
- return;
+ return true; /* keep enumerating */
}
- if ((ad->ad_devinfo->Valid & ACPI_VALID_HID) == 0)
- name = ad->ad_name;
- else
- name = ad->ad_devinfo->HardwareId.String;
- prop_dictionary_set_string(dev, "name", name);
- prop_dictionary_set_uint32(dev, "addr", i2cc.i2c_addr);
- prop_dictionary_set_uint64(dev, "cookie", (uintptr_t)ad->ad_handle);
- prop_dictionary_set_uint32(dev, "cookietype", I2C_COOKIE_ACPI);
- prop_dictionary_set_data(dev, "compatible", clist, clist_size);
+ props = prop_dictionary_create();
+
+ args->ia->ia_addr = i2cc.i2c_addr;
+ args->ia->ia_name = ad->ad_name;
+ args->ia->ia_clist = clist;
+ args->ia->ia_clist_size = clist_size;
+ args->ia->ia_prop = props;
+ args->ia->ia_devhandle = devhandle_from_acpi(ad->ad_handle);
+ args->ia->ia_cookie = (uint64_t)ad->ad_handle; /* XXX */
+ args->ia->ia_cookietype = I2C_COOKIE_ACPI; /* XXX */
+
+ cbrv = args->callback(dev, args);
+
+ prop_object_release(props);
kmem_free(clist, clist_size);
- prop_array_add(array, dev);
- prop_object_release(dev);
+ return cbrv; /* callback decides if we keep enumerating */
}
-prop_array_t
-acpi_enter_i2c_devs(device_t dev, struct acpi_devnode *devnode)
+static int
+acpi_i2c_enumerate_devices(device_t dev, devhandle_t call_handle, void *v)
{
- struct acpi_devnode *ad;
- prop_array_t array = prop_array_create();
-
- if (array == NULL)
- return NULL;
+ struct i2c_enumerate_devices_args *args = v;
+ struct acpi_devnode *ad, *devnode;
+ ACPI_HANDLE *hdl = devhandle_to_acpi(call_handle);
+
+ devnode = acpi_match_node(hdl);
+ if (devnode == NULL) {
+ aprint_verbose_dev(dev, "%s: no devnode matching handle\n",
+ __func__);
+ return 0;
+ }
SIMPLEQ_FOREACH(ad, &devnode->ad_child_head, ad_child_list) {
if (ad->ad_devinfo->Type != ACPI_TYPE_DEVICE)
continue;
if (!acpi_device_present(ad->ad_handle))
continue;
- acpi_enter_i2c_device(ad, array);
+ if (!acpi_i2c_enumerate_device(dev, ad, args))
+ break;
}
- if (dev != NULL) {
- acpi_claim_childdevs(dev, devnode);
- }
+ acpi_claim_childdevs(
CVS commit: [thorpej-i2c-spi-conf] src/sys/dev/i2c
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 21:45:16 UTC 2021
Modified Files:
src/sys/dev/i2c [thorpej-i2c-spi-conf]: i2c.c i2cvar.h
Log Message:
Stop using a prop_array of child device data to perform direct
configuration of i2c devices. Instead, introduce and use a new
device call "i2c-enumerate-devices" that can be implemented by
devhandle providers that have I2C bindings. This device call
gathers up the data into i2c_attach_args and invoked a callback
(back to the i2c layer) to attach the device. The I2C controller
device supplies its devhandle (or the appropriate devhandle for
the I2C bus) when attaching the i2c bus instance using CFARG_DEVHANDLE.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/dev/i2c/i2cvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.78 src/sys/dev/i2c/i2c.c:1.78.2.1
--- src/sys/dev/i2c/i2c.c:1.78 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/i2c.c Sun Apr 25 21:45:15 2021
@@ -1,4 +1,33 @@
-/* $NetBSD: i2c.c,v 1.78 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: i2c.c,v 1.78.2.1 2021/04/25 21:45:15 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +69,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.78 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.78.2.1 2021/04/25 21:45:15 thorpej Exp $");
#include
#include
@@ -99,8 +128,6 @@ const struct cdevsw iic_cdevsw = {
};
static void iic_smbus_intr_thread(void *);
-static void iic_fill_compat(struct i2c_attach_args*, const char*,
- size_t, char **);
static int
iic_print_direct(void *aux, const char *pnp)
@@ -287,8 +314,8 @@ iic_search(device_t parent, cfdata_t cf,
ia.ia_tag = sc->sc_tag;
ia.ia_name = NULL;
- ia.ia_ncompat = 0;
- ia.ia_compat = NULL;
+ ia.ia_clist = NULL;
+ ia.ia_clist_size = 0;
ia.ia_prop = NULL;
if (cf->cf_loc[IICCF_ADDR] == IICCF_ADDR_DEFAULT) {
@@ -387,6 +414,34 @@ iic_rescan(device_t self, const char *if
return 0;
}
+static bool
+iic_enumerate_devices_callback(device_t self,
+struct i2c_enumerate_devices_args *args)
+{
+ struct iic_softc *sc = device_private(self);
+ int loc[IICCF_NLOCS] = { 0 };
+
+ args->count++;
+
+ loc[IICCF_ADDR] = args->ia->ia_addr;
+
+ if (args->ia->ia_addr > I2C_MAX_ADDR) {
+ aprint_error_dev(self,
+ "WARNING: ignoring bad device address @ 0x%02x\n",
+ args->ia->ia_addr);
+ return true; /* keep enumerating */
+ }
+ if (sc->sc_devices[args->ia->ia_addr] == NULL) {
+ sc->sc_devices[args->ia->ia_addr] =
+ config_found(self, args->ia, iic_print_direct,
+ /* CFARG_SUBMATCH, config_stdsubmatch, XXX */
+ CFARG_LOCATORS, loc,
+ CFARG_DEVHANDLE, args->ia->ia_devhandle,
+ CFARG_EOL);
+ }
+ return true;/* keep enumerating */
+}
+
static int
iic_match(device_t parent, cfdata_t cf, void *aux)
{
@@ -399,18 +454,15 @@ iic_attach(device_t parent, device_t sel
{
struct iic_softc *sc = device_private(self);
struct i2cbus_attach_args *iba = aux;
- prop_array_t child_devices;
- prop_dictionary_t props;
- char *buf;
i2c_tag_t ic;
int rv;
- bool no_indirect_config = false;
aprint_naive("\n");
aprint_normal(": I2C bus\n");
sc->sc_dev = self;
sc->sc_tag = iba->iba_tag;
+
ic = sc->sc_tag;
ic->ic_d
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Apr 25 21:05:38 UTC 2021
Modified Files:
src/usr.bin/make/unit-tests: cond-token-var.mk
Log Message:
tests/make: add tests for ${...} without operator in conditions
These tests are already covered in cond-cmp-unary.mk, but my first guess
was to search for these tests in cond-token-var.mk, so keep them in both
tests.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cond-token-var.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/cond-token-var.mk
diff -u src/usr.bin/make/unit-tests/cond-token-var.mk:1.5 src/usr.bin/make/unit-tests/cond-token-var.mk:1.6
--- src/usr.bin/make/unit-tests/cond-token-var.mk:1.5 Sun Nov 15 14:58:14 2020
+++ src/usr.bin/make/unit-tests/cond-token-var.mk Sun Apr 25 21:05:38 2021
@@ -1,4 +1,4 @@
-# $NetBSD: cond-token-var.mk,v 1.5 2020/11/15 14:58:14 rillig Exp $
+# $NetBSD: cond-token-var.mk,v 1.6 2021/04/25 21:05:38 rillig Exp $
#
# Tests for variable expressions in .if conditions.
#
@@ -46,3 +46,24 @@ DEF= defined
# Since the expression is defined now, it doesn't generate any parse error.
.if ${UNDEF:U}
.endif
+
+# If the value of the variable expression is a number, it is compared against
+# zero.
+.if ${:U0}
+. error
+.endif
+.if !${:U1}
+. error
+.endif
+
+# If the value of the variable expression is not a number, any non-empty
+# value evaluates to true, even if there is only whitespace.
+.if ${:U}
+. error
+.endif
+.if !${:U }
+. error
+.endif
+.if !${:Uanything}
+. error
+.endif
CVS commit: src/games/cgram
Module Name:src
Committed By: rillig
Date: Sun Apr 25 20:38:03 UTC 2021
Modified Files:
src/games/cgram: cgram.c
Log Message:
cgram: use ASCII-only implementation of functions
The function 'encode' already assumes that all letter characters are
contiguous and that there are only 26 letters of each case. At the
moment, cgram cannot handle UTF-8 anyway since it reads the input
byte-wise, assuming that each byte is exacty one character.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/games/cgram/cgram.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/cgram/cgram.c
diff -u src/games/cgram/cgram.c:1.20 src/games/cgram/cgram.c:1.21
--- src/games/cgram/cgram.c:1.20 Sun Apr 25 20:19:19 2021
+++ src/games/cgram/cgram.c Sun Apr 25 20:38:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cgram.c,v 1.20 2021/04/25 20:19:19 rillig Exp $ */
+/* $NetBSD: cgram.c,v 1.21 2021/04/25 20:38:03 rillig Exp $ */
/*-
* Copyright (c) 2013, 2021 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.c,v 1.20 2021/04/25 20:19:19 rillig Exp $");
+__RCSID("$NetBSD: cgram.c,v 1.21 2021/04/25 20:38:03 rillig Exp $");
#endif
#include
@@ -46,42 +46,41 @@ __RCSID("$NetBSD: cgram.c,v 1.20 2021/04
#include "pathnames.h"
-
-static char
-ch_toupper(char ch)
+static bool
+ch_isspace(char ch)
{
- return (char)toupper((unsigned char)ch);
+ return isspace((unsigned char)ch) != 0;
}
-static char
-ch_tolower(char ch)
+static bool
+ch_islower(char ch)
{
- return (char)tolower((unsigned char)ch);
+ return ch >= 'a' && ch <= 'z';
}
static bool
-ch_isalpha(char ch)
+ch_isupper(char ch)
{
- return isalpha((unsigned char)ch) != 0;
+ return ch >= 'A' && ch <= 'Z';
}
static bool
-ch_islower(char ch)
+ch_isalpha(char ch)
{
- return islower((unsigned char)ch) != 0;
+ return ch_islower(ch) || ch_isupper(ch);
}
-static bool
-ch_isspace(char ch)
+static char
+ch_toupper(char ch)
{
- return isspace((unsigned char)ch) != 0;
+ return ch_islower(ch) ? (char)(ch - 'a' + 'A') : ch;
}
-static bool
-ch_isupper(char ch)
+static char
+ch_tolower(char ch)
{
- return isupper((unsigned char)ch) != 0;
+ return ch_isupper(ch) ? (char)(ch - 'A' + 'a') : ch;
}
static int
CVS commit: src/games/cgram
Module Name:src
Committed By: rillig
Date: Sun Apr 25 20:19:19 UTC 2021
Modified Files:
src/games/cgram: cgram.c
Log Message:
cgram: provide usage on incorrect invocation
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/games/cgram/cgram.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/cgram/cgram.c
diff -u src/games/cgram/cgram.c:1.19 src/games/cgram/cgram.c:1.20
--- src/games/cgram/cgram.c:1.19 Sun Apr 25 20:14:29 2021
+++ src/games/cgram/cgram.c Sun Apr 25 20:19:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cgram.c,v 1.19 2021/04/25 20:14:29 rillig Exp $ */
+/* $NetBSD: cgram.c,v 1.20 2021/04/25 20:19:19 rillig Exp $ */
/*-
* Copyright (c) 2013, 2021 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.c,v 1.19 2021/04/25 20:14:29 rillig Exp $");
+__RCSID("$NetBSD: cgram.c,v 1.20 2021/04/25 20:19:19 rillig Exp $");
#endif
#include
@@ -594,11 +594,23 @@ clean_up(void)
stringarray_cleanup(&lines);
}
-
+
+static void __dead
+usage(void)
+{
+
+ fprintf(stderr, "usage: %s [file]\n", getprogname());
+ exit(1);
+}
int
main(int argc, char *argv[])
{
+
+ setprogname(argv[0]);
+ if (argc != 1 && argc != 2)
+ usage();
+
init(argc > 1 ? argv[1] : NULL);
loop();
clean_up();
CVS commit: src/games/cgram
Module Name:src
Committed By: rillig
Date: Sun Apr 25 20:14:29 UTC 2021
Modified Files:
src/games/cgram: cgram.c
Log Message:
cgram: conform to lint's strict bool mode, KNF
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/games/cgram/cgram.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/cgram/cgram.c
diff -u src/games/cgram/cgram.c:1.18 src/games/cgram/cgram.c:1.19
--- src/games/cgram/cgram.c:1.18 Thu Apr 22 14:57:36 2021
+++ src/games/cgram/cgram.c Sun Apr 25 20:14:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cgram.c,v 1.18 2021/04/22 14:57:36 wiz Exp $ */
+/* $NetBSD: cgram.c,v 1.19 2021/04/25 20:14:29 rillig Exp $ */
/*-
* Copyright (c) 2013, 2021 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.c,v 1.18 2021/04/22 14:57:36 wiz Exp $");
+__RCSID("$NetBSD: cgram.c,v 1.19 2021/04/25 20:14:29 rillig Exp $");
#endif
#include
@@ -216,7 +216,9 @@ char_at_cursor(void)
return lines.v[cursor_y].s[cursor_x];
}
-static void getquote(FILE *f) {
+static void
+getquote(FILE *f)
+{
struct string line;
string_init(&line);
@@ -255,7 +257,7 @@ readfile(const char *name)
getquote(f);
if (fclose(f) != 0)
- exit(1);
+ err(1, "%s", name);
}
@@ -558,7 +560,7 @@ init(const char *filename)
stringarray_init(&lines);
stringarray_init(&sollines);
srandom((unsigned int)time(NULL));
- if (filename) {
+ if (filename != NULL) {
readfile(filename);
} else {
readquote();
CVS commit: src/compat/mips64
Module Name:src
Committed By: christos
Date: Sun Apr 25 18:44:05 UTC 2021
Modified Files:
src/compat/mips64/n32: bsd.n32.mk
src/compat/mips64/o32: bsd.o32.mk
Log Message:
define BFD_MACHINE_ARCH. This worked by accident before since the default
64 bit target was 32 bits.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/mips64/n32/bsd.n32.mk
cvs rdiff -u -r1.15 -r1.16 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/n32/bsd.n32.mk
diff -u src/compat/mips64/n32/bsd.n32.mk:1.1 src/compat/mips64/n32/bsd.n32.mk:1.2
--- src/compat/mips64/n32/bsd.n32.mk:1.1 Sun Apr 25 11:18:23 2021
+++ src/compat/mips64/n32/bsd.n32.mk Sun Apr 25 14:44:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.n32.mk,v 1.1 2021/04/25 15:18:23 christos Exp $
+# $NetBSD: bsd.n32.mk,v 1.2 2021/04/25 18:44:04 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
LD+= -m elf32btsmipn32
@@ -12,6 +12,7 @@ LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/mips
LIBGCC_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
XORG_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+BFD_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
COPTS+= -mabi=n32
CPUFLAGS+= -mabi=n32
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.15 src/compat/mips64/o32/bsd.o32.mk:1.16
--- src/compat/mips64/o32/bsd.o32.mk:1.15 Sun Apr 25 11:18:23 2021
+++ src/compat/mips64/o32/bsd.o32.mk Sun Apr 25 14:44:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.15 2021/04/25 15:18:23 christos Exp $
+# $NetBSD: bsd.o32.mk,v 1.16 2021/04/25 18:44:04 christos Exp $
.if !empty(MACHINE_ARCH:M*eb)
LD+= -m elf32btsmip
@@ -12,6 +12,7 @@ LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/mips
LIBGCC_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
XORG_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+BFD_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
COPTS+= -mabi=32 -march=mips3
CPUFLAGS+= -mabi=32 -march=mips3
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Apr 25 18:30:58 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Ticket #1253 To generate a diff of this commit: cvs rdiff -u -r1.1.2.69 -r1.1.2.70 src/doc/CHANGES-9.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.2 diff -u src/doc/CHANGES-9.2:1.1.2.69 src/doc/CHANGES-9.2:1.1.2.70 --- src/doc/CHANGES-9.2:1.1.2.69 Sun Apr 25 11:15:14 2021 +++ src/doc/CHANGES-9.2 Sun Apr 25 18:30:58 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.69 2021/04/25 11:15:14 martin Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.70 2021/04/25 18:30:58 martin Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -2975,3 +2975,8 @@ sys/arch/arm/sunxi/sun8i_h3_ccu.c 1.18 arm/sunxi: Wire up sun8icrypto(4) on Allwinner H5. [riastradh, ticket #1252] +external/gpl2/texinfo/dist/configure 1.3 + + Fix cross build from newer clang versions on Darwin/Mac OS. + [cjep, ticket #1253] +
CVS commit: [netbsd-9] src/external/gpl2/texinfo/dist
Module Name:src
Committed By: martin
Date: Sun Apr 25 18:29:56 UTC 2021
Modified Files:
src/external/gpl2/texinfo/dist [netbsd-9]: configure
Log Message:
Pull up following revision(s) (requested by cjep in ticket #1253):
external/gpl2/texinfo/dist/configure: revision 1.3
Hack to get the "has ANSI C headers" check to pass on newer versions
of clang as bundled with Xcode. If someone really cares about ensuring
NetBSD's host tools build on a system without , then I'm sure
that enterprising individual will also find a super #correct fix for
this specific problem.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.18.1 src/external/gpl2/texinfo/dist/configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/texinfo/dist/configure
diff -u src/external/gpl2/texinfo/dist/configure:1.2 src/external/gpl2/texinfo/dist/configure:1.2.18.1
--- src/external/gpl2/texinfo/dist/configure:1.2 Thu Jan 14 00:34:52 2016
+++ src/external/gpl2/texinfo/dist/configure Sun Apr 25 18:29:56 2021
@@ -3657,6 +3657,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include
+#include
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 18:26:15 UTC 2021
Modified Files:
src/sys/arch/hpcmips/dev: it8368.c
Log Message:
it8368_attach_socket(): Pass the device_t to config_found(), not the
softc. This was missed due to a (void *) cast when the device_t / softc
split changes occurred.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcmips/dev/it8368.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/dev/it8368.c
diff -u src/sys/arch/hpcmips/dev/it8368.c:1.25 src/sys/arch/hpcmips/dev/it8368.c:1.26
--- src/sys/arch/hpcmips/dev/it8368.c:1.25 Sat Apr 24 23:36:38 2021
+++ src/sys/arch/hpcmips/dev/it8368.c Sun Apr 25 18:26:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: it8368.c,v 1.25 2021/04/24 23:36:38 thorpej Exp $ */
+/* $NetBSD: it8368.c,v 1.26 2021/04/25 18:26:15 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.25 2021/04/24 23:36:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.26 2021/04/25 18:26:15 thorpej Exp $");
#undef WINCE_DEFAULT_SETTING /* for debug */
#undef IT8368DEBUG
@@ -381,7 +381,8 @@ it8368_attach_socket(struct it8368e_soft
paa.pct = (pcmcia_chipset_tag_t)&it8368_functions;
paa.pch = (pcmcia_chipset_handle_t)sc;
- if ((sc->sc_pcmcia = config_found(sc, &paa, it8368_print, CFARG_EOL))) {
+ if ((sc->sc_pcmcia = config_found(sc->sc_dev, &paa, it8368_print,
+ CFARG_EOL))) {
it8368_init_socket(sc);
}
}
CVS commit: src/doc
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 18:16:25 UTC 2021
Modified Files:
src/doc: BRANCHES
Log Message:
Document thorpej-i2c-spi-conf branch.
To generate a diff of this commit:
cvs rdiff -u -r1.358 -r1.359 src/doc/BRANCHES
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/BRANCHES
diff -u src/doc/BRANCHES:1.358 src/doc/BRANCHES:1.359
--- src/doc/BRANCHES:1.358 Sun Apr 25 01:01:09 2021
+++ src/doc/BRANCHES Sun Apr 25 18:16:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: BRANCHES,v 1.358 2021/04/25 01:01:09 thorpej Exp $
+# $NetBSD: BRANCHES,v 1.359 2021/04/25 18:16:25 thorpej Exp $
#
# This file contains a list of branches that exist in the NetBSD CVS
# tree and their current state.
@@ -751,6 +751,16 @@ Notes: Normal futex operataions pass th
Also includes implementations of eventfd and timerfd, as
well as some additional improvements to COMPAT_LINUX{,32}.
+Branch: thorpej-i2c-spi-conf
+Description: Improve device tree-based I2C and SPI enumeration.
+Status: Active
+Start Date: Sun April 25, 2021
+End Date:
+Base Tag: thorpej-i2c-spi-conf-base
+Maintainer: Jason Thorpe
+Scope: src/sys
+Notes:
+
Branch: wrstuden-fixsa
Description: Fix a number of issues present with Scheduler Activations.
Status: Active
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Sun Apr 25 15:33:15 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add missing \ for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.1244 -r1.1245 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1244 src/share/mk/bsd.own.mk:1.1245
--- src/share/mk/bsd.own.mk:1.1244 Sun Apr 25 14:32:20 2021
+++ src/share/mk/bsd.own.mk Sun Apr 25 15:33:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1244 2021/04/25 14:32:20 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1245 2021/04/25 15:33:15 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1044,7 +1044,7 @@ MK${var}:= yes
# aarch64eb is not yet supported.
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
-|| ${MACHINE_MIPS64}
+|| ${MACHINE_MIPS64} \
|| ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "aarch64" \
|| ${MACHINE_ARCH} == "riscv64" || !empty(MACHINE_ARCH:Mearm*)
MKCOMPAT?= yes
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: rin
Date: Sun Apr 25 15:32:25 UTC 2021
Modified Files:
src/external/gpl3/gcc: README.gcc10
Log Message:
Update as(1) failure on armv6; it occurs also for earmv6hfeb, whereas it
does not for earmv6{,eb}.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/README.gcc10
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/README.gcc10
diff -u src/external/gpl3/gcc/README.gcc10:1.19 src/external/gpl3/gcc/README.gcc10:1.20
--- src/external/gpl3/gcc/README.gcc10:1.19 Sun Apr 25 10:08:25 2021
+++ src/external/gpl3/gcc/README.gcc10 Sun Apr 25 15:32:24 2021
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc10,v 1.19 2021/04/25 10:08:25 mrg Exp $
+$NetBSD: README.gcc10,v 1.20 2021/04/25 15:32:24 rin Exp $
new stuff:
@@ -39,10 +39,10 @@ earmv5 y b y y y y y n
earmv5eb y b y y y ? ? ?
earmv5hf y y y y y ? ? ?
earmv5hfeb y b y y y ? ? ?
-earmv6 y b y y y y[2] ? ?
+earmv6 y b y y y y ? ?
earmv6eb y b y y y y ? ?
earmv6hf y y y y y y[2] ? ?
-earmv6hfeb y b y y y y ? ?
+earmv6hfeb y b y y y y[2] ? ?
earmv7 y b y y y ? ? ?
earmv7eb y b y y y ? ? ?
earmv7hf y y y y y y y n
@@ -72,7 +72,7 @@ coldfire ? N/A ? ? ? N/A N/A
architecture tools kernels libgcc native-gcc make release runs atf
[1] - ramdisk.fs is too large, needs fixing.
-[2] - armv6 little endian has new problems:
+[2] - armv6hf (both little and big endian) has new problems:
rpi# cat bar.s
.cfi_startproc
.cfi_endproc
CVS commit: src/compat
Module Name:src
Committed By: christos
Date: Sun Apr 25 15:18:23 UTC 2021
Modified Files:
src/compat: archdirs.mk
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
Added Files:
src/compat/mips64/n32: Makefile bsd.n32.mk
Log Message:
mips64 -> o32 64
mipsn64 -> o32 n32
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/compat/archdirs.mk
cvs rdiff -u -r1.12 -r1.13 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r0 -r1.1 src/compat/mips64/n32/Makefile \
src/compat/mips64/n32/bsd.n32.mk
cvs rdiff -u -r1.14 -r1.15 src/compat/mips64/o32/bsd.o32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.12 src/compat/archdirs.mk:1.13
--- src/compat/archdirs.mk:1.12 Thu Jun 13 17:17:54 2019
+++ src/compat/archdirs.mk Sun Apr 25 11:18:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.12 2019/06/13 21:17:54 christos Exp $
+# $NetBSD: archdirs.mk,v 1.13 2021/04/25 15:18:23 christos Exp $
# list of subdirs used per-platform
@@ -14,11 +14,16 @@ ARCHDIR_SUBDIR+= amd64/i386
ARCHDIR_SUBDIR+= arm/oabi
.endif
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
+.if !empty(MACHINE_ARCH:Mmips64*)
ARCHDIR_SUBDIR+= mips64/64
ARCHDIR_SUBDIR+= mips64/o32
.endif
+.if !empty(MACHINE_ARCH:Mmipsn64*)
+ARCHDIR_SUBDIR+= mips64/n32
+ARCHDIR_SUBDIR+= mips64/o32
+.endif
+
.if ${MACHINE_ARCH} == "powerpc64"
ARCHDIR_SUBDIR+= powerpc64/powerpc
.endif
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.12 src/compat/mips64/64/bsd.64.mk:1.13
--- src/compat/mips64/64/bsd.64.mk:1.12 Tue Feb 6 05:00:00 2018
+++ src/compat/mips64/64/bsd.64.mk Sun Apr 25 11:18:23 2021
@@ -1,6 +1,6 @@
-# $NetBSD: bsd.64.mk,v 1.12 2018/02/06 10:00:00 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.13 2021/04/25 15:18:23 christos Exp $
-.if ${MACHINE_ARCH} == "mips64eb"
+.if !empty(MACHINE_ARCH:M*eb)
LD+= -m elf64btsmip
.else
LD+= -m elf64ltsmip
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.14 src/compat/mips64/o32/bsd.o32.mk:1.15
--- src/compat/mips64/o32/bsd.o32.mk:1.14 Fri Oct 7 15:10:37 2016
+++ src/compat/mips64/o32/bsd.o32.mk Sun Apr 25 11:18:23 2021
@@ -1,6 +1,6 @@
-# $NetBSD: bsd.o32.mk,v 1.14 2016/10/07 19:10:37 christos Exp $
+# $NetBSD: bsd.o32.mk,v 1.15 2021/04/25 15:18:23 christos Exp $
-.if ${MACHINE_ARCH} == "mips64eb"
+.if !empty(MACHINE_ARCH:M*eb)
LD+= -m elf32btsmip
.else
LD+= -m elf32ltsmip
@@ -8,10 +8,10 @@ LD+= -m elf32ltsmip
.ifndef MLIBDIR
MLIBDIR= o32
-LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
-LIBGCC_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
-GOMP_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
-XORG_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
+LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/mipsn/mips/:S/64//}
+LIBGCC_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+GOMP_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
COPTS+= -mabi=32 -march=mips3
CPUFLAGS+= -mabi=32 -march=mips3
Added files:
Index: src/compat/mips64/n32/Makefile
diff -u /dev/null src/compat/mips64/n32/Makefile:1.1
--- /dev/null Sun Apr 25 11:18:23 2021
+++ src/compat/mips64/n32/Makefile Sun Apr 25 11:18:23 2021
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2021/04/25 15:18:23 christos Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.n32.mk
+
+.include "../../compatsubdir.mk"
Index: src/compat/mips64/n32/bsd.n32.mk
diff -u /dev/null src/compat/mips64/n32/bsd.n32.mk:1.1
--- /dev/null Sun Apr 25 11:18:23 2021
+++ src/compat/mips64/n32/bsd.n32.mk Sun Apr 25 11:18:23 2021
@@ -0,0 +1,23 @@
+# $NetBSD: bsd.n32.mk,v 1.1 2021/04/25 15:18:23 christos Exp $
+
+.if !empty(MACHINE_ARCH:M*eb)
+LD+= -m elf32btsmipn32
+.else
+LD+= -m elf32ltsmipn32
+.endif
+.ifndef MLIBDIR
+MLIBDIR= n32
+
+LIBC_MACHINE_ARCH= ${MACHINE_ARCH:S/mipsn/mips/:S/64//}
+LIBGCC_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+GOMP_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${LIBC_MACHINE_ARCH}
+
+COPTS+= -mabi=n32
+CPUFLAGS+= -mabi=n32
+LDADD+= -mabi=n32
+LDFLAGS+= -mabi=n32
+MKDEPFLAGS+= -mabi=n32
+.endif
+
+.include "${.PARSEDIR}/../../Makefile.compat"
CVS commit: src/sys/rump
Module Name:src
Committed By: christos
Date: Sun Apr 25 15:16:56 UTC 2021
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
use MACHINE_MIPS64
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.131 src/sys/rump/Makefile.rump:1.132
--- src/sys/rump/Makefile.rump:1.131 Tue Apr 13 18:23:42 2021
+++ src/sys/rump/Makefile.rump Sun Apr 25 11:16:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.131 2021/04/13 22:23:42 christos Exp $
+# $NetBSD: Makefile.rump,v 1.132 2021/04/25 15:16:56 christos Exp $
#
.if !defined(_RUMP_MK)
@@ -33,7 +33,7 @@ CFLAGS+=${${ACTIVE_CC} == "clang":?
# Define baseline cpu for mips ports, required for
# rumpcomp_sync_icache() hypercall.
.if !empty(MACHINE_ARCH:Mmips*)
-.if !empty(MACHINE_ARCH:Mmips64*)
+.if ${MACHINE_MIPS64}
CPPFLAGS+= -DMIPS64=1
.else
CPPFLAGS+= -DMIPS1=1
CVS commit: src/sys/rump/librump/rumpkern/arch/mips
Module Name:src
Committed By: christos
Date: Sun Apr 25 15:12:02 UTC 2021
Modified Files:
src/sys/rump/librump/rumpkern/arch/mips: Makefile.inc
Log Message:
mipsn64* is native 64
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc
diff -u src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc:1.3 src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc:1.4
--- src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc:1.3 Wed Apr 22 16:10:56 2015
+++ src/sys/rump/librump/rumpkern/arch/mips/Makefile.inc Sun Apr 25 11:12:02 2021
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.3 2015/04/22 20:10:56 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.4 2021/04/25 15:12:02 christos Exp $
+.if empty(MACHINE_ARCH:Mmipsn64*)
CPPFLAGS+= -DARCH_ELFSIZE=32
+.endif
.PATH: ${RUMPTOP}/librump/rumpkern/arch/generic
SRCS+= rump_generic_abi.c
CVS commit: src/tools
Module Name:src
Committed By: christos
Date: Sun Apr 25 15:11:28 UTC 2021
Modified Files:
src/tools: Makefile
Log Message:
Make mips-elf2ecoff available for all mips
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.207 src/tools/Makefile:1.208
--- src/tools/Makefile:1.207 Sat Feb 6 11:14:55 2021
+++ src/tools/Makefile Sun Apr 25 11:11:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2021/02/06 16:14:55 dbj Exp $
+# $NetBSD: Makefile,v 1.208 2021/04/25 15:11:28 christos Exp $
.include
.include
@@ -180,8 +180,7 @@ SUBDIR+= arm-elf2aout
SUBDIR+= m68k-elf2aout
.endif
-.if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
- ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb")
+.if !empty(MACHINE_ARCH:Mmips*)
SUBDIR+= mips-elf2ecoff
.endif
CVS commit: src/external/gpl3/gcc.old/lib/libstdc++-v3/include/bits/arch/riscv64
Module Name:src
Committed By: christos
Date: Sun Apr 25 15:09:40 UTC 2021
Modified Files:
src/external/gpl3/gcc.old/lib/libstdc++-v3/include/bits/arch/riscv64:
Makefile
Log Message:
fix cargo-cult
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc.old/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile
diff -u src/external/gpl3/gcc.old/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile:1.7 src/external/gpl3/gcc.old/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile:1.8
--- src/external/gpl3/gcc.old/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile:1.7 Fri Apr 9 19:15:49 2021
+++ src/external/gpl3/gcc.old/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile Sun Apr 25 11:09:40 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2021/04/09 23:15:49 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/25 15:09:40 christos Exp $
GCC_MACHINE_ARCH=riscv64
.include "../Makefile.arch_bits"
-# mips64 files are in mips64e[lb] subdirs.
+# riscv64 files are in riscv64 subdirs.
.PATH: ${.CURDIR}/../../../../arch/${MACHINE_ARCH}
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/riscv64
Module Name:src
Committed By: christos
Date: Sun Apr 25 15:09:08 UTC 2021
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/riscv64:
Makefile
Log Message:
fix cargo-cult
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile:1.1 Fri Sep 19 13:23:24 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/riscv64/Makefile Sun Apr 25 11:09:08 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2014/09/19 17:23:24 matt Exp $
+# $NetBSD: Makefile,v 1.2 2021/04/25 15:09:08 christos Exp $
GCC_MACHINE_ARCH=riscv64
.include "../Makefile.arch_bits"
-# mips64 files are in mips64e[lb] subdirs.
+# riscv64 files are in riscv64 subdirs.
.PATH: ${.CURDIR}/../../../../arch/${MACHINE_ARCH}
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch
Module Name:src
Committed By: christos
Date: Sun Apr 25 15:08:28 UTC 2021
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch: Makefile
Log Message:
- include
- use MACHINE_MIPS64
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.5 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.6
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.5 Fri Feb 8 21:36:56 2019
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile Sun Apr 25 11:08:28 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2019/02/09 02:36:56 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/25 15:08:28 christos Exp $
# install multilib c++config.h files
+.include
.if ${MACHINE_ARCH} == "sparc64"
SUBDIR= sparc sparc64
@@ -12,7 +13,7 @@ SUBDIR= i386 x86_64
CXXCONFIGARGS= x86_64 _LP64 i386
.endif
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_MIPS64}
SUBDIR= mips64 mips32 mipso32
CXXCONFIGARGS= mips64 _ABI64 mipso32 _ABIO32 mips32
.endif
CVS commit: src/external/apache2/llvm/include
Module Name:src
Committed By: christos
Date: Sun Apr 25 15:06:49 UTC 2021
Modified Files:
src/external/apache2/llvm/include: Makefile
Log Message:
MACHINE_CPU is always mips (no functional change)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/apache2/llvm/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/llvm/include/Makefile
diff -u src/external/apache2/llvm/include/Makefile:1.1 src/external/apache2/llvm/include/Makefile:1.2
--- src/external/apache2/llvm/include/Makefile:1.1 Mon Nov 11 17:45:02 2019
+++ src/external/apache2/llvm/include/Makefile Sun Apr 25 11:06:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/11/11 22:45:02 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2021/04/25 15:06:49 christos Exp $
.include
@@ -101,7 +101,7 @@ INCS= arm_acle.h \
. if ${MACHINE_CPU} == "aarch64"
INCS+= arm64intr.h
. endif
-.elif ${MACHINE_CPU} == "mips" || ${MACHINE_CPU} == "mips64"
+.elif ${MACHINE_CPU} == "mips"
INCS= msa.h
.endif
INCS+= stdatomic.h
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Apr 25 14:32:20 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk bsd.sys.mk
Log Message:
- since we are using regex already, shorten by merging arm and mips entries
- add a MACHINE_MIPS64 macro shorthand
- pass -m{soft,hard}-float to the assembler when we are passing it to the
compiler
To generate a diff of this commit:
cvs rdiff -u -r1.1243 -r1.1244 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.304 -r1.305 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1243 src/share/mk/bsd.own.mk:1.1244
--- src/share/mk/bsd.own.mk:1.1243 Sun Apr 25 04:01:54 2021
+++ src/share/mk/bsd.own.mk Sun Apr 25 10:32:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1243 2021/04/25 08:01:54 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1244 2021/04/25 14:32:20 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -14,7 +14,12 @@ MAKECONF?= /etc/mk.conf
#
# CPU model, derived from MACHINE_ARCH
#
-MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/:S/aarch64eb/aarch64/:S/or1knd/or1k/:C/riscv../riscv/}
+MACHINE_CPU= ${MACHINE_ARCH:C/mips.*e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/e?arm.*/arm/:S/powerpc64/powerpc/:S/aarch64eb/aarch64/:S/or1knd/or1k/:C/riscv../riscv/}
+
+MACHINE_MIPS64= (${MACHINE_ARCH} == "mips64el" || \
+ ${MACHINE_ARCH} == "mips64eb" || \
+ ${MACHINE_ARCH} == "mipsn64el" || \
+ ${MACHINE_ARCH} == "mipsn64eb")
#
# Subdirectory used below ${RELEASEDIR} when building a release
@@ -1039,7 +1044,7 @@ MK${var}:= yes
# aarch64eb is not yet supported.
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
-|| ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
+|| ${MACHINE_MIPS64}
|| ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "aarch64" \
|| ${MACHINE_ARCH} == "riscv64" || !empty(MACHINE_ARCH:Mearm*)
MKCOMPAT?= yes
@@ -1053,7 +1058,7 @@ MKCOMPATTESTS:= no
MKCOMPATX11:= no
.endif
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
+.if ${MACHINE_MIPS64} \
|| (${MACHINE} == "evbppc" && ${MACHINE_ARCH} == "powerpc")
MKCOMPATMODULES?= yes
.else
@@ -1063,7 +1068,7 @@ MKCOMPATMODULES:= no
#
# These platforms use softfloat by default.
#
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_MIPS64}
MKSOFTFLOAT?= yes
.endif
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.304 src/share/mk/bsd.sys.mk:1.305
--- src/share/mk/bsd.sys.mk:1.304 Mon Nov 9 11:15:05 2020
+++ src/share/mk/bsd.sys.mk Sun Apr 25 10:32:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.304 2020/11/09 16:15:05 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.305 2021/04/25 14:32:20 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -197,10 +197,12 @@ COPTS+= ${${ACTIVE_CC} == "gcc":? --para
.if ${MACHINE_CPU} != "sh3"
COPTS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
FOPTS+= -msoft-float
+AFLAGS+= -msoft-float
.endif
.elif ${MACHINE_ARCH} == "coldfire"
COPTS+= -mhard-float
FOPTS+= -mhard-float
+AFLAGS+= -mhard-float
.endif
#.if !empty(MACHINE_ARCH:Mearmv7*)
@@ -220,7 +222,7 @@ CFLAGS+= -Wa,-Av8plus
.endif
.if !defined(NOGCCERROR)
-.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+.if ${MACHINE_MIPS64}
CPUFLAGS+= -Wa,--fatal-warnings
.endif
.endif
@@ -229,8 +231,7 @@ CPUFLAGS+= -Wa,--fatal-warnings
#CFLAGS+= -mips64 -mtune=sb1
#.endif
-#.if (${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
-#(defined(MKPIC) && ${MKPIC} == "no")
+#.if ${MACHINE_MIPS64} && defined(MKPIC) && ${MKPIC} == "no"
#CPUFLAGS+= -mno-abicalls -fno-PIC
#.endif
CFLAGS+= ${CPUFLAGS}
CVS commit: src/sys/arch/landisk/conf
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 13:33:27 UTC 2021
Modified Files:
src/sys/arch/landisk/conf: files.landisk
Log Message:
PCI busses do not attach directly to mainbus (they attach to shpcic,
which in turn attaches to mainbus), so there is no need for mainbus
to carry the "pcibus" interface attribute.
Fixes kern/56126.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/landisk/conf/files.landisk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/landisk/conf/files.landisk
diff -u src/sys/arch/landisk/conf/files.landisk:1.6 src/sys/arch/landisk/conf/files.landisk:1.7
--- src/sys/arch/landisk/conf/files.landisk:1.6 Thu Jun 22 20:11:17 2017
+++ src/sys/arch/landisk/conf/files.landisk Sun Apr 25 13:33:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.landisk,v 1.6 2017/06/22 20:11:17 uwe Exp $
+# $NetBSD: files.landisk,v 1.7 2021/04/25 13:33:27 thorpej Exp $
# maxpartitions must be first item in files.${MACHINE}
maxpartitions 16
@@ -35,7 +35,7 @@ file dev/md_root.cmemory_disk_hooks
# System bus types
#
-device mainbus {}: pcibus
+device mainbus { }
attach mainbus at root
file arch/landisk/landisk/mainbus.c mainbus
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 13:22:49 UTC 2021
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
Log Message:
PCI busses do not attach to "ebus", therefore there is no need for
it to carry the "pcibus" interface attribute.
Fixes kern/56124.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/arch/sparc64/conf/files.sparc64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.164 src/sys/arch/sparc64/conf/files.sparc64:1.165
--- src/sys/arch/sparc64/conf/files.sparc64:1.164 Thu Mar 4 20:17:00 2021
+++ src/sys/arch/sparc64/conf/files.sparc64 Sun Apr 25 13:22:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.164 2021/03/04 20:17:00 palle Exp $
+# $NetBSD: files.sparc64,v 1.165 2021/04/25 13:22:49 thorpej Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -67,7 +67,7 @@ file arch/sparc64/dev/iommu.c sbus | ps
include "dev/ata/files.ata"
-device ebus {[addr = -1]}: pcibus
+device ebus {[addr = -1]}
attach ebus at pci
file arch/sparc64/dev/ebus.c ebus
attach ebus at mainbus with ebus_mainbus
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sun Apr 25 11:26:01 UTC 2021 Modified Files: othersrc/usr.bin/tnftp: configure Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 othersrc/usr.bin/tnftp/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/configure diff -u othersrc/usr.bin/tnftp/configure:1.55 othersrc/usr.bin/tnftp/configure:1.56 --- othersrc/usr.bin/tnftp/configure:1.55 Sun Apr 25 09:40:34 2021 +++ othersrc/usr.bin/tnftp/configure Sun Apr 25 11:26:01 2021 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.39 . +# From configure.ac Revision: 1.40 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for tnftp 20200705. #
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Apr 25 11:15:14 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Tickets #1251 and #1252 To generate a diff of this commit: cvs rdiff -u -r1.1.2.68 -r1.1.2.69 src/doc/CHANGES-9.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.2 diff -u src/doc/CHANGES-9.2:1.1.2.68 src/doc/CHANGES-9.2:1.1.2.69 --- src/doc/CHANGES-9.2:1.1.2.68 Thu Apr 22 10:08:46 2021 +++ src/doc/CHANGES-9.2 Sun Apr 25 11:15:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.68 2021/04/22 10:08:46 martin Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.69 2021/04/25 11:15:14 martin Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -2962,3 +2962,16 @@ external/cddl/osnet/dist/uts/common/fs/z zfs: prevent blocking l2arc_feed_thread() forever. [hannken, ticket #1250] +usr.sbin/hdaudioctl/hdaudioctl.8 1.8 + + hdaudioctl(8): fix documentation for the "show" command, + add missing arguments. + [nia, ticket #1251] + +sys/arch/arm/dts/sun50i-h5.dtsi 1.2 (patch) +sys/arch/arm/sunxi/sun8i_crypto.c 1.24 (patch) +sys/arch/arm/sunxi/sun8i_h3_ccu.c 1.18 (patch) + + arm/sunxi: Wire up sun8icrypto(4) on Allwinner H5. + [riastradh, ticket #1252] +
CVS commit: [netbsd-9] src/sys/arch/arm
Module Name:src
Committed By: martin
Date: Sun Apr 25 11:13:03 UTC 2021
Modified Files:
src/sys/arch/arm/dts [netbsd-9]: sun50i-h5.dtsi
src/sys/arch/arm/sunxi [netbsd-9]: sun8i_crypto.c sun8i_h3_ccu.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1252):
sys/arch/arm/sunxi/sun8i_h3_ccu.c: revision 1.18 (patch)
sys/arch/arm/sunxi/sun8i_crypto.c: revision 1.24 (patch)
sys/arch/arm/dts/sun50i-h5.dtsi: revision 1.2 (patch)
arm/sunxi: Wire up sun8icrypto(4) on Allwinner H5.
Tested on NanoPi Neo PLUS2.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/arm/dts/sun50i-h5.dtsi
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/sys/arch/arm/sunxi/sun8i_crypto.c
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/dts/sun50i-h5.dtsi
diff -u src/sys/arch/arm/dts/sun50i-h5.dtsi:1.1 src/sys/arch/arm/dts/sun50i-h5.dtsi:1.1.8.1
--- src/sys/arch/arm/dts/sun50i-h5.dtsi:1.1 Sun Jan 28 18:31:15 2018
+++ src/sys/arch/arm/dts/sun50i-h5.dtsi Sun Apr 25 11:13:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-h5.dtsi,v 1.1 2018/01/28 18:31:15 jmcneill Exp $ */
+/* $NetBSD: sun50i-h5.dtsi,v 1.1.8.1 2021/04/25 11:13:03 martin Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -28,6 +28,19 @@
#include "sun8i-h3.dtsi"
+/ {
+ soc {
+ crypto: crypto@1c15000 {
+ compatible = "allwinner,sun50i-h5-crypto";
+ reg = <0x01c15000 0x1000>;
+ interrupts = ;
+ clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>;
+ clock-names = "bus", "mod";
+ resets = <&ccu RST_BUS_CE>;
+ };
+ };
+};
+
&rtp {
compatible = "allwinner,sun50i-h5-ts";
};
Index: src/sys/arch/arm/sunxi/sun8i_crypto.c
diff -u src/sys/arch/arm/sunxi/sun8i_crypto.c:1.14.2.2 src/sys/arch/arm/sunxi/sun8i_crypto.c:1.14.2.3
--- src/sys/arch/arm/sunxi/sun8i_crypto.c:1.14.2.2 Mon May 18 18:45:40 2020
+++ src/sys/arch/arm/sunxi/sun8i_crypto.c Sun Apr 25 11:13:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_crypto.c,v 1.14.2.2 2020/05/18 18:45:40 martin Exp $ */
+/* $NetBSD: sun8i_crypto.c,v 1.14.2.3 2021/04/25 11:13:03 martin Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.14.2.2 2020/05/18 18:45:40 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.14.2.3 2021/04/25 11:13:03 martin Exp $");
#include
#include
@@ -209,6 +209,7 @@ CFATTACH_DECL_NEW(sun8i_crypto, sizeof(s
static const struct of_compat_data compat_data[] = {
{"allwinner,sun50i-a64-crypto", 0},
+ {"allwinner,sun50i-h5-crypto", 0},
{NULL}
};
Index: src/sys/arch/arm/sunxi/sun8i_h3_ccu.c
diff -u src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.16 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.16.4.1
--- src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.16 Thu Jan 31 01:49:28 2019
+++ src/sys/arch/arm/sunxi/sun8i_h3_ccu.c Sun Apr 25 11:13:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_h3_ccu.c,v 1.16 2019/01/31 01:49:28 jmcneill Exp $ */
+/* $NetBSD: sun8i_h3_ccu.c,v 1.16.4.1 2021/04/25 11:13:03 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -29,7 +29,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.16 2019/01/31 01:49:28 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.16.4.1 2021/04/25 11:13:03 martin Exp $");
#include
#include
@@ -60,6 +60,7 @@ __KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu
#define SDMMC0_CLK_REG 0x088
#define SDMMC1_CLK_REG 0x08c
#define SDMMC2_CLK_REG 0x090
+#define CE_CLK_REG 0x09c
#define SPI0_CLK_REG 0x0a0
#define SPI1_CLK_REG 0x0a4
#define USBPHY_CFG_REG 0x0cc
@@ -154,6 +155,7 @@ static const char *ahb1_parents[] = { "l
static const char *ahb2_parents[] = { "ahb1", "pll_periph0" };
static const char *apb1_parents[] = { "ahb1" };
static const char *apb2_parents[] = { "losc", "hosc", "pll_periph0" };
+static const char *ce_parents[] = { "hosc", "pll_periph0_2x", "pll_periph1_2x" };
static const char *mod_parents[] = { "hosc", "pll_periph0", "pll_periph1" };
static const char *ths_parents[] = { "hosc" };
static const char *de_parents[] = { "pll_periph0_2x", "pll_de" };
@@ -329,6 +331,14 @@ static struct sunxi_ccu_clk sun8i_h3_ccu
0, /* enable */
SUNXI_CCU_NM_POWER_OF_TWO),
+ SUNXI_CCU_NM(H3_CLK_CE, "ce", ce_parents,
+ CE_CLK_REG, /* reg */
+ __BITS(17,16), /* n */
+ __BITS(3,0), /* m */
+ __BITS(25,24), /* sel */
+ __BIT(31), /* enable */
+ SUNXI_CCU_NM_POWER_OF_TWO|SUNXI_CCU_NM_ROUND_DOWN),
+
SUNXI_CCU_DIV_GATE(H3_CLK_THS, "ths", ths_parents,
THS_CLK_REG, /* reg */
__BITS(1,0), /* div */
@@ -400,6 +410,8 @@ static struct sunxi_ccu_clk sun8i_h3_ccu
__BIT(31), /* enable */
0),
+ SUNXI_CCU_GATE(H3_CLK_BUS_CE, "bus-ce", "ahb1",
+ BUS_CLK_GATING_REG0, 5),
SUNXI_CCU_GATE(H3_CLK_BUS_DMA, "b
CVS commit: [netbsd-9] src/usr.sbin/hdaudioctl
Module Name:src Committed By: martin Date: Sun Apr 25 11:07:45 UTC 2021 Modified Files: src/usr.sbin/hdaudioctl [netbsd-9]: hdaudioctl.8 Log Message: Pull up following revision(s) (requested by nia in ticket #1251): usr.sbin/hdaudioctl/hdaudioctl.8: revision 1.8 hdaudioctl.8: add missing arguments pointed out by RVP To generate a diff of this commit: cvs rdiff -u -r1.6.28.1 -r1.6.28.2 src/usr.sbin/hdaudioctl/hdaudioctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/hdaudioctl/hdaudioctl.8 diff -u src/usr.sbin/hdaudioctl/hdaudioctl.8:1.6.28.1 src/usr.sbin/hdaudioctl/hdaudioctl.8:1.6.28.2 --- src/usr.sbin/hdaudioctl/hdaudioctl.8:1.6.28.1 Sat Jun 20 16:08:57 2020 +++ src/usr.sbin/hdaudioctl/hdaudioctl.8 Sun Apr 25 11:07:45 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: hdaudioctl.8,v 1.6.28.1 2020/06/20 16:08:57 martin Exp $ +.\" $NetBSD: hdaudioctl.8,v 1.6.28.2 2021/04/25 11:07:45 martin Exp $ .\" .\" Copyright (c) 2009 Precedence Technologies Ltd .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 12, 2020 +.Dd April 12, 2021 .Dt HDAUDIOCTL 8 .Os .Sh NAME @@ -55,7 +55,7 @@ Valid commands are: For each child codec of the chosen .Xr hdaudio 4 device, display the nid, vendor, product, subsystem and device IDs. -.It show +.It show Ar codecid Ar nid Retrieve and display the current codec configuration in human-readable form. .It get Ar codecid Ar nid Retrieve and display the current codec configuration as a
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Sun Apr 25 10:08:25 UTC 2021 Modified Files: src/external/gpl3/gcc: README.gcc10 Log Message: armv6 little endian has problems with GCC 10. rpi# cat bar.s .cfi_startproc .cfi_endproc rpi# as bar.s bar.s: Assembler messages: bar.s: Internal error (Illegal instruction). Please report this bug. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gcc/README.gcc10 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/README.gcc10 diff -u src/external/gpl3/gcc/README.gcc10:1.18 src/external/gpl3/gcc/README.gcc10:1.19 --- src/external/gpl3/gcc/README.gcc10:1.18 Sun Apr 25 08:01:54 2021 +++ src/external/gpl3/gcc/README.gcc10 Sun Apr 25 10:08:25 2021 @@ -1,4 +1,4 @@ -$NetBSD: README.gcc10,v 1.18 2021/04/25 08:01:54 mrg Exp $ +$NetBSD: README.gcc10,v 1.19 2021/04/25 10:08:25 mrg Exp $ new stuff: @@ -39,9 +39,9 @@ earmv5 y b y y y y y n earmv5eb y b y y y ? ? ? earmv5hf y y y y y ? ? ? earmv5hfeb y b y y y ? ? ? -earmv6 y b y y y y ? ? +earmv6 y b y y y y[2] ? ? earmv6eb y b y y y y ? ? -earmv6hf y y y y y y ? ? +earmv6hf y y y y y y[2] ? ? earmv6hfeb y b y y y y ? ? earmv7 y b y y y ? ? ? earmv7eb y b y y y ? ? ? @@ -72,6 +72,14 @@ coldfire ? N/A ? ? ? N/A N/A architecture tools kernels libgcc native-gcc make release runs atf [1] - ramdisk.fs is too large, needs fixing. +[2] - armv6 little endian has new problems: + rpi# cat bar.s + .cfi_startproc + .cfi_endproc + rpi# as bar.s + bar.s: Assembler messages: + bar.s: Internal error (Illegal instruction). + Please report this bug. [6] - vax vs c++ exceptions issue, same as it ever was [7] - fails just as poorly in gxemul/landisk as GCC 9 [8] - i386 seems to have a signal delivery issue. pthread tests hang and then
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc
Committed By: lukem
Date: Sun Apr 25 09:40:34 UTC 2021
Modified Files:
othersrc/usr.bin/tnftp: configure configure.ac
Log Message:
configure: check all glob flags we use
Also check GLOB_NOCHECK, even though it's standard.
Makes the autoconf check consistent with the usage within src/*.
Suggseted by Christos on 2020-07-05.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.39 -r1.40 othersrc/usr.bin/tnftp/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.54 othersrc/usr.bin/tnftp/configure:1.55
--- othersrc/usr.bin/tnftp/configure:1.54 Fri Feb 12 12:43:04 2021
+++ othersrc/usr.bin/tnftp/configure Sun Apr 25 09:40:34 2021
@@ -14353,8 +14353,8 @@ fi
use_local_glob=yes
ac_fn_c_check_header_mongrel "$LINENO" "glob.h" "ac_cv_header_glob_h" "$ac_includes_default"
if test "x$ac_cv_header_glob_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking glob supports required extensions" >&5
-$as_echo_n "checking glob supports required extensions... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking glob supports required flags" >&5
+$as_echo_n "checking glob supports required flags... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14363,7 +14363,7 @@ int
main ()
{
-int f = GLOB_BRACE | GLOB_TILDE;
+int f = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE;
;
return 0;
Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.39 othersrc/usr.bin/tnftp/configure.ac:1.40
--- othersrc/usr.bin/tnftp/configure.ac:1.39 Fri Feb 12 12:39:18 2021
+++ othersrc/usr.bin/tnftp/configure.ac Sun Apr 25 09:40:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.39 2021/02/12 12:39:18 lukem Exp $
+# $NetBSD: configure.ac,v 1.40 2021/04/25 09:40:34 lukem Exp $
#
# Process this file with autoconf to produce a configure script.
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
Copyright (c) 1999-2021 The NetBSD Foundation, Inc.
All rights reserved.
])
-AC_REVISION([$Revision: 1.39 $])
+AC_REVISION([$Revision: 1.40 $])
AS_SHELL_SANITIZE()
@@ -338,10 +338,10 @@ AS_IF([test "$ac_cv_func_strptime" = yes
#
use_local_glob=yes
AC_CHECK_HEADER([glob.h],
-[AC_MSG_CHECKING([glob supports required extensions])
+[AC_MSG_CHECKING([glob supports required flags])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include ]], [[
-int f = GLOB_BRACE | GLOB_TILDE;
+int f = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE;
]])],
[AC_MSG_RESULT([yes])
use_local_glob=no],
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sun Apr 25 09:29:43 UTC 2021 Modified Files: othersrc/usr.bin/tnftp: ChangeLog othersrc/usr.bin/tnftp/src: Makefile.am Makefile.in Log Message: Change tnftp(1) to refer to "tnftp" instead of "ftp". To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 othersrc/usr.bin/tnftp/ChangeLog cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/src/Makefile.am cvs rdiff -u -r1.16 -r1.17 othersrc/usr.bin/tnftp/src/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/ChangeLog diff -u othersrc/usr.bin/tnftp/ChangeLog:1.74 othersrc/usr.bin/tnftp/ChangeLog:1.75 --- othersrc/usr.bin/tnftp/ChangeLog:1.74 Sun Apr 25 08:05:49 2021 +++ othersrc/usr.bin/tnftp/ChangeLog Sun Apr 25 09:29:43 2021 @@ -1,6 +1,8 @@ -$NetBSD: ChangeLog,v 1.74 2021/04/25 08:05:49 lukem Exp $ +$NetBSD: ChangeLog,v 1.75 2021/04/25 09:29:43 lukem Exp $ -Sun Apr 25 08:00:14 UTC 2021 lukem +Sun Apr 25 09:24:51 UTC 2021 lukem + + * Change tnftp(1) to refer to "tnftp" instead of "ftp". * Merge NetBSD ftp from 20200608 to 20210131: * Fix signal handler restoration. Avoids intermittent crash. Index: othersrc/usr.bin/tnftp/src/Makefile.am diff -u othersrc/usr.bin/tnftp/src/Makefile.am:1.5 othersrc/usr.bin/tnftp/src/Makefile.am:1.6 --- othersrc/usr.bin/tnftp/src/Makefile.am:1.5 Sun Jul 5 09:37:53 2020 +++ othersrc/usr.bin/tnftp/src/Makefile.am Sun Apr 25 09:29:43 2021 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.5 2020/07/05 09:37:53 lukem Exp $ +## $NetBSD: Makefile.am,v 1.6 2021/04/25 09:29:43 lukem Exp $ bin_PROGRAMS = tnftp @@ -56,7 +56,8 @@ man1_MANS = \ tnftp.1 tnftp.1: ftp.1 - cp $(srcdir)/ftp.1 tnftp.1 + sed -e 's/^.Dt FTP/.Dt TNFTP/' -e 's/^.Nm ftp/.Nm tnftp/' \ + $(srcdir)/ftp.1 > tnftp.1 CLEANFILES = \ tnftp.1 Index: othersrc/usr.bin/tnftp/src/Makefile.in diff -u othersrc/usr.bin/tnftp/src/Makefile.in:1.16 othersrc/usr.bin/tnftp/src/Makefile.in:1.17 --- othersrc/usr.bin/tnftp/src/Makefile.in:1.16 Sun Jul 5 10:19:32 2020 +++ othersrc/usr.bin/tnftp/src/Makefile.in Sun Apr 25 09:29:43 2021 @@ -859,7 +859,8 @@ uninstall-man: uninstall-man1 tnftp.1: ftp.1 - cp $(srcdir)/ftp.1 tnftp.1 + sed -e 's/^.Dt FTP/.Dt TNFTP/' -e 's/^.Nm ftp/.Nm tnftp/' \ + $(srcdir)/ftp.1 > tnftp.1 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Sun Apr 25 09:09:55 UTC 2021 Modified Files: src/usr.bin/ftp: ftp.1 Log Message: ftp(1): consistently use FTP for protocol use. To generate a diff of this commit: cvs rdiff -u -r1.145 -r1.146 src/usr.bin/ftp/ftp.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ftp/ftp.1 diff -u src/usr.bin/ftp/ftp.1:1.145 src/usr.bin/ftp/ftp.1:1.146 --- src/usr.bin/ftp/ftp.1:1.145 Sun Apr 25 08:46:19 2021 +++ src/usr.bin/ftp/ftp.1 Sun Apr 25 09:09:55 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: ftp.1,v 1.145 2021/04/25 08:46:19 lukem Exp $ +.\" $NetBSD: ftp.1,v 1.146 2021/04/25 09:09:55 lukem Exp $ .\" .\" Copyright (c) 1996-2021 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -184,10 +184,13 @@ Forces .Nm to only use IPv6 addresses. .It Fl A -Force active mode ftp. +Force active mode +.Tn FTP . By default, .Nm -will try to use passive mode ftp and fall back to active mode +will try to use passive mode +.Tn FTP +and fall back to active mode if passive is not supported by the server. This option causes .Nm @@ -300,7 +303,9 @@ Upload files on the command line to .Ar url where .Ar url -is one of the ftp URL types as supported by auto-fetch +is one of the +.Sq Li ftp:// +URL types as supported by auto-fetch (with an optional target filename for single file uploads), and .Ar file is one or more local files to be uploaded. @@ -542,7 +547,9 @@ A synonym for .Ic open . .It Ic gate Op Ar host Op Ar port Toggle gate-ftp mode, which used to connect through the -TIS FWTK and Gauntlet ftp proxies. +TIS FWTK and Gauntlet +.Tn FTP +proxies. This will not be permitted if the gate-ftp server hasn't been set (either explicitly by the user, or from the .Ev FTPSERVER @@ -600,7 +607,9 @@ each remote file name is expanded separately on the remote machine and the lists are not merged. Expansion of a directory name is likely to be different from expansion of the name of an ordinary file: -the exact result depends on the foreign operating system and ftp server, +the exact result depends on the foreign operating system and +.Tn FTP +server, and can be previewed by doing .Sq Li mls remote-files \- . Note: @@ -1112,7 +1121,9 @@ Any other response will answer .Sq yes to the current file. .It Ic proxy Ar ftp-command -Execute an ftp command on a secondary control connection. +Execute an +.Tn FTP +command on a secondary control connection. This command allows simultaneous connection to two remote .Tn FTP servers for transferring files between the two servers.
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Sun Apr 25 08:46:19 UTC 2021 Modified Files: src/usr.bin/ftp: ftp.1 Log Message: ftp(1): consistent Ic (not Nm) for commands To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/usr.bin/ftp/ftp.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ftp/ftp.1 diff -u src/usr.bin/ftp/ftp.1:1.144 src/usr.bin/ftp/ftp.1:1.145 --- src/usr.bin/ftp/ftp.1:1.144 Sun Jan 31 08:59:40 2021 +++ src/usr.bin/ftp/ftp.1 Sun Apr 25 08:46:19 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: ftp.1,v 1.144 2021/01/31 08:59:40 lukem Exp $ +.\" $NetBSD: ftp.1,v 1.145 2021/04/25 08:46:19 lukem Exp $ .\" .\" Copyright (c) 1996-2021 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -57,7 +57,7 @@ .\" .\" @(#)ftp.1 8.3 (Berkeley) 10/9/94 .\" -.Dd January 31, 2021 +.Dd April 25, 2021 .Dt FTP 1 .Os .Sh NAME @@ -1886,9 +1886,9 @@ proxies will be restarted. For .Tn FTP , this is implemented by using -.Nm reget +.Ic reget instead of -.Nm get . +.Ic get . For .Tn HTTP , this is implemented by using the
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: lukem
Date: Sun Apr 25 08:26:35 UTC 2021
Modified Files:
src/usr.bin/ftp: util.c
Log Message:
better XXX comment for buggy ftp server
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/usr.bin/ftp/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/util.c
diff -u src/usr.bin/ftp/util.c:1.161 src/usr.bin/ftp/util.c:1.162
--- src/usr.bin/ftp/util.c:1.161 Mon Jun 8 01:33:27 2020
+++ src/usr.bin/ftp/util.c Sun Apr 25 08:26:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.161 2020/06/08 01:33:27 lukem Exp $ */
+/* $NetBSD: util.c,v 1.162 2021/04/25 08:26:35 lukem Exp $ */
/*-
* Copyright (c) 1997-2020 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.161 2020/06/08 01:33:27 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.162 2021/04/25 08:26:35 lukem Exp $");
#endif /* not lint */
/*
@@ -731,7 +731,7 @@ remotemodtime(const char *file, int nois
*frac++ = '\0';
if (strlen(timestr) == 15 && strncmp(timestr, "191", 3) == 0) {
/*
- * XXX: Workaround for lame ftpd's that return
+ * XXX: Workaround for buggy ftp servers that return
* `19100' instead of `2000'
*/
fprintf(ttyout,
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc
Committed By: lukem
Date: Sun Apr 25 08:23:22 UTC 2021
Modified Files:
othersrc/usr.bin/tnftp/src: progressbar.c
Log Message:
nicer XXX comment
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/src/progressbar.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/src/progressbar.c
diff -u othersrc/usr.bin/tnftp/src/progressbar.c:1.17 othersrc/usr.bin/tnftp/src/progressbar.c:1.18
--- othersrc/usr.bin/tnftp/src/progressbar.c:1.17 Sun Apr 25 07:50:37 2021
+++ othersrc/usr.bin/tnftp/src/progressbar.c Sun Apr 25 08:23:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: progressbar.c,v 1.17 2021/04/25 07:50:37 lukem Exp $ */
+/* $NetBSD: progressbar.c,v 1.18 2021/04/25 08:23:22 lukem Exp $ */
/* from NetBSD: progressbar.c,v 1.24 2021/01/06 04:43:14 lukem Exp */
/*-
@@ -421,7 +421,7 @@ alarmtimer(int wait)
sigfunc
xsignal(int sig, sigfunc func)
{
-#ifdef ultrix /* XXX: this is lame - how do we test sigvec vs. sigaction? */
+#ifdef ultrix /* XXX: this is suboptimal - how do we test sigvec vs. sigaction? */
struct sigvec vec, ovec;
vec.sv_handler = func;
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sun Apr 25 08:05:49 UTC 2021 Modified Files: othersrc/usr.bin/tnftp: ChangeLog Log Message: ChangeLog: previous va_copy fix. today's import To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 othersrc/usr.bin/tnftp/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/ChangeLog diff -u othersrc/usr.bin/tnftp/ChangeLog:1.73 othersrc/usr.bin/tnftp/ChangeLog:1.74 --- othersrc/usr.bin/tnftp/ChangeLog:1.73 Sun Jul 5 11:37:02 2020 +++ othersrc/usr.bin/tnftp/ChangeLog Sun Apr 25 08:05:49 2021 @@ -1,4 +1,22 @@ -$NetBSD: ChangeLog,v 1.73 2020/07/05 11:37:02 lukem Exp $ +$NetBSD: ChangeLog,v 1.74 2021/04/25 08:05:49 lukem Exp $ + +Sun Apr 25 08:00:14 UTC 2021 lukem + + * Merge NetBSD ftp from 20200608 to 20210131: + * Fix signal handler restoration. Avoids intermittent crash. + Bug class reported by Joyu Liao from Juniper Networks. + * Improve ftp(1) manual page formatting, "debug" command + description, and $https_proxy documentation. + NetBSD PR/51883. + * Add -? to display synopsis and usage to stdout. + * Don't use restartable signals (SA_RESTART). + Should fix intermittent failures with -q QUITTIME. + NetBSD PR/55857. + +Fri Feb 12 12:39:18 UTC 2021 lukem + + * configure: soft-fail (instead of hard fail) when cross-compile + checking for va_copy(). Sun Jul 5 11:18:52 UTC 2020 lukem
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sun Apr 25 08:01:54 UTC 2021
Modified Files:
src/doc: CHANGES
src/external/gpl3/gcc: README.gcc10
src/share/mk: bsd.own.mk
Log Message:
switch powerpc and arm64 to GCC 10.
To generate a diff of this commit:
cvs rdiff -u -r1.2798 -r1.2799 src/doc/CHANGES
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/README.gcc10
cvs rdiff -u -r1.1242 -r1.1243 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2798 src/doc/CHANGES:1.2799
--- src/doc/CHANGES:1.2798 Mon Apr 19 14:42:18 2021
+++ src/doc/CHANGES Sun Apr 25 08:01:54 2021
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2798 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2799 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -361,4 +361,7 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
sparc64: Switch to GCC 10. [mrg 20200416]
vax: Switch to GCC 10. [mrg 20200416]
tmux(1): Imported 3.2. [christos 20210417]
+ hppa: Switch to GCC 10. [skrll 20200418]
OpenSSH: Import 8.6. [christos 20210419]
+ powerpc: Switch to GCC 10. [mrg 20200425]
+ aarch64: Switch to GCC 10. [mrg 20200425]
Index: src/external/gpl3/gcc/README.gcc10
diff -u src/external/gpl3/gcc/README.gcc10:1.17 src/external/gpl3/gcc/README.gcc10:1.18
--- src/external/gpl3/gcc/README.gcc10:1.17 Fri Apr 23 22:53:03 2021
+++ src/external/gpl3/gcc/README.gcc10 Sun Apr 25 08:01:54 2021
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc10,v 1.17 2021/04/23 22:53:03 mrg Exp $
+$NetBSD: README.gcc10,v 1.18 2021/04/25 08:01:54 mrg Exp $
new stuff:
@@ -30,19 +30,19 @@ switched: has port switched? y (yes), n
architecture tools kernels libgcc native-gcc make release runs atf switched
- --- -- -- ---
-aarch64 y y y y y y y n
-aarch64eb y y y y y y y n
+aarch64 y y y y y y y y
+aarch64eb y y y y y y y y
alpha y y y y y y y y
earmv4 y y y y y y ? n
earmv4eb y b y y y ? ? ?
earmv5 y b y y y y y n
earmv5eb y b y y y ? ? ?
-earmv5hf y b y y y ? ? ?
+earmv5hf y y y y y ? ? ?
earmv5hfeb y b y y y ? ? ?
-earmv6 y b y y y ? ? ?
-earmv6eb y b y y y ? ? ?
-earmv6hf y b y y y ? ? ?
-earmv6hfeb y b y y y ? ? ?
+earmv6 y b y y y y ? ?
+earmv6eb y b y y y y ? ?
+earmv6hf y y y y y y ? ?
+earmv6hfeb y b y y y y ? ?
earmv7 y b y y y ? ? ?
earmv7eb y b y y y ? ? ?
earmv7hf y y y y y y y n
@@ -54,10 +54,10 @@ m68000 y b y y n[1] ? ? ?
m68k y y y y y[9] y ? n
mipseb y y y y y y ? ?
mipsel y y y y y y ? ?
-mips64eb y y y y y y ? ?
+mips64eb y y y y y y y ?
mips64el y b y y y y ? ?
-powerpc y b y y y y ? n
-powerpc64 y b y y y N/A N/A n
+powerpc y b y y y y y y
+powerpc64 y b y y y N/A N/A y
sh3eb y b y y y ? ? ?
sh3el y y y y y y y[7] n
sparc y y y y y y y y
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1242 src/share/mk/bsd.own.mk:1.1243
--- src/share/mk/bsd.own.mk:1.1242 Sun Apr 18 20:32:49 2021
+++ src/share/mk/bsd.own.mk Sun Apr 25 08:01:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1242 2021/04/18 20:32:49 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1243 2021/04/25 08:01:54 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -64,14 +64,15 @@ TOOLCHAIN_MISSING?= no
# What GCC is used?
#
.if ${MACHINE} == "alpha" || \
-${MACHINE_ARCH} == "x86_64" || \
${MACHINE} == "hppa" || \
${MACHINE} == "ia64" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "vax" || \
-${MACHINE_ARCH} == "riscv32" || \
-${MACHINE_ARCH} == "riscv64"
+${MACHINE_ARCH} == "x86_64" || \
+${MACHINE_CPU} == "aarch64" || \
+${MACHINE_CPU} == "powerpc" || \
+${MACHINE_CPU} == "riscv"
HAVE_GCC?= 10
.else
HAVE_GCC?= 9
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc
Committed By: lukem
Date: Sun Apr 25 07:50:37 UTC 2021
Modified Files:
othersrc/usr.bin/tnftp/src: cmds.c fetch.c ftp.1 ftp.c main.c
progressbar.c progressbar.h ssl.c version.h
Log Message:
Merge differences between NetBSD-20200608 and NetBSD-2021-01-31
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 othersrc/usr.bin/tnftp/src/cmds.c
cvs rdiff -u -r1.24 -r1.25 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -u -r1.16 -r1.17 othersrc/usr.bin/tnftp/src/ftp.1 \
othersrc/usr.bin/tnftp/src/progressbar.c
cvs rdiff -u -r1.22 -r1.23 othersrc/usr.bin/tnftp/src/ftp.c
cvs rdiff -u -r1.21 -r1.22 othersrc/usr.bin/tnftp/src/main.c
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/src/progressbar.h
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/src/ssl.c
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/src/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/src/cmds.c
diff -u othersrc/usr.bin/tnftp/src/cmds.c:1.19 othersrc/usr.bin/tnftp/src/cmds.c:1.20
--- othersrc/usr.bin/tnftp/src/cmds.c:1.19 Sat Jul 4 09:59:07 2020
+++ othersrc/usr.bin/tnftp/src/cmds.c Sun Apr 25 07:50:37 2021
@@ -1,8 +1,8 @@
-/* $NetBSD: cmds.c,v 1.19 2020/07/04 09:59:07 lukem Exp $ */
-/* from NetBSD: cmds.c,v 1.140 2019/02/06 07:56:42 martin Exp */
+/* $NetBSD: cmds.c,v 1.20 2021/04/25 07:50:37 lukem Exp $ */
+/* from NetBSD: cmds.c,v 1.141 2021/01/06 09:15:59 lukem Exp */
/*-
- * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -101,7 +101,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID(" NetBSD: cmds.c,v 1.140 2019/02/06 07:56:42 martin Exp ");
+__RCSID(" NetBSD: cmds.c,v 1.141 2021/01/06 09:15:59 lukem Exp ");
#endif
#endif /* not lint */
@@ -1138,7 +1138,7 @@ setdebug(int argc, char *argv[])
options |= SO_DEBUG;
else
options &= ~SO_DEBUG;
- fprintf(ttyout, "Debugging %s (ftp_debug=%d).\n", onoff(ftp_debug), ftp_debug);
+ fprintf(ttyout, "Debugging %s (debug=%d).\n", onoff(ftp_debug), ftp_debug);
code = ftp_debug > 0;
}
Index: othersrc/usr.bin/tnftp/src/fetch.c
diff -u othersrc/usr.bin/tnftp/src/fetch.c:1.24 othersrc/usr.bin/tnftp/src/fetch.c:1.25
--- othersrc/usr.bin/tnftp/src/fetch.c:1.24 Sat Jul 4 09:59:07 2020
+++ othersrc/usr.bin/tnftp/src/fetch.c Sun Apr 25 07:50:37 2021
@@ -1,5 +1,5 @@
-/* $NetBSD: fetch.c,v 1.24 2020/07/04 09:59:07 lukem Exp $ */
-/* from NetBSD: fetch.c,v 1.231 2019/04/04 00:36:09 christos Exp */
+/* $NetBSD: fetch.c,v 1.25 2021/04/25 07:50:37 lukem Exp $ */
+/* from NetBSD: fetch.c,v 1.232 2020/07/11 00:29:38 lukem Exp */
/*-
* Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include
#ifndef lint
-__RCSID(" NetBSD: fetch.c,v 1.231 2019/04/04 00:36:09 christos Exp ");
+__RCSID(" NetBSD: fetch.c,v 1.232 2020/07/11 00:29:38 lukem Exp ");
#endif /* not lint */
/*
@@ -1302,7 +1302,7 @@ fetch_url(const char *url, const char *p
DPRINTF("%s: `%s' proxyenv `%s'\n", __func__, url, STRorNULL(penv));
- oldquit = oldalrm = oldint = oldpipe = NULL;
+ oldquit = oldalrm = oldint = oldpipe = SIG_ERR;
closefunc = NULL;
fin = NULL;
fout = NULL;
@@ -1579,9 +1579,9 @@ fetch_url(const char *url, const char *p
bytes = 0;
hashbytes = mark;
- if (oldalrm) {
+ if (oldalrm != SIG_ERR) {
(void)xsignal(SIGALRM, oldalrm);
- oldalrm = NULL;
+ oldalrm = SIG_ERR;
}
progressmeter(-1);
@@ -1743,14 +1743,14 @@ chunkerror:
warnx("Improper response from `%s:%s'", ui.host, ui.port);
cleanup_fetch_url:
- if (oldint)
+ if (oldint != SIG_ERR)
(void)xsignal(SIGINT, oldint);
- if (oldpipe)
+ if (oldpipe != SIG_ERR)
(void)xsignal(SIGPIPE, oldpipe);
- if (oldalrm)
+ if (oldalrm != SIG_ERR)
(void)xsignal(SIGALRM, oldalrm);
- if (oldquit)
- (void)xsignal(SIGQUIT, oldpipe);
+ if (oldquit != SIG_ERR)
+ (void)xsignal(SIGQUIT, oldquit);
if (fin != NULL)
fetch_close(fin);
else if (s != -1)
Index: othersrc/usr.bin/tnftp/src/ftp.1
diff -u othersrc/usr.bin/tnftp/src/ftp.1:1.16 othersrc/usr.bin/tnftp/src/ftp.1:1.17
--- othersrc/usr.bin/tnftp/src/ftp.1:1.16 Sat Jul 4 09:59:07 2020
+++ othersrc/usr.bin/tnftp/src/ftp.1 Sun Apr 25 07:50:37 2021
@@ -1,7 +1,7 @@
-.\" $NetBSD: ftp.1,v 1.16 2020/07/04 09:59:07 lukem Exp $
-.\" from NetBSD: ftp.1,v 1.136 2017/07/03 21:34:57 wiz Exp
+.\" $NetBSD: ftp.1,v 1.17 2021/04/25 07:50:37 lukem Exp $
+.\" from NetBSD: ftp.1,v 1.144 2021/01/31 08:59:40 lukem Exp
.\"
-.\" Copyright (c) 1996-2015 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
@@ -58,7 +58,7 @@
.\"
.\" @(#)ftp.1 8.3 (Berke
CVS import: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Sun Apr 25 07:46:26 UTC 2021 Update of /cvsroot/othersrc/usr.bin/tnftp/src In directory ivanova.netbsd.org:/tmp/cvs-serv6414 Log Message: Import NetBSD ftp as at 2021-01-31 Changes since import tag NetBSD-20200608: * Fix signal handler restoration. Avoids intermittent crash. Bug class reported by Joyu Liao from Juniper Networks. * Improve ftp(1) manual page formatting, "debug" command description, and $https_proxy documentation. * Add -? to display synopsis and usage to stdout. * Don't use restartable signals (SA_RESTART). Should fix intermittent failures with -q QUITTIME. Status: Vendor Tag: NetBSD Release Tags: NetBSD-2021-01-31 U othersrc/usr.bin/tnftp/src/ruserpass.c C othersrc/usr.bin/tnftp/src/ftp.1 C othersrc/usr.bin/tnftp/src/fetch.c U othersrc/usr.bin/tnftp/src/util.c C othersrc/usr.bin/tnftp/src/ftp.c U othersrc/usr.bin/tnftp/src/cmdtab.c U othersrc/usr.bin/tnftp/src/ssl.h C othersrc/usr.bin/tnftp/src/main.c C othersrc/usr.bin/tnftp/src/ssl.c U othersrc/usr.bin/tnftp/src/extern.h C othersrc/usr.bin/tnftp/src/progressbar.h U othersrc/usr.bin/tnftp/src/ftp_var.h C othersrc/usr.bin/tnftp/src/version.h C othersrc/usr.bin/tnftp/src/progressbar.c C othersrc/usr.bin/tnftp/src/Makefile U othersrc/usr.bin/tnftp/src/complete.c U othersrc/usr.bin/tnftp/src/domacro.c C othersrc/usr.bin/tnftp/src/cmds.c 10 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNetBSD:yesterday -jNetBSD othersrc/usr.bin/tnftp/src
