CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Tue Nov 19 06:21:24 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #443. To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Tue Nov 19 06:21:24 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #443. To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-9.0 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.0 diff -u src/doc/CHANGES-9.0:1.1.2.107 src/doc/CHANGES-9.0:1.1.2.108 --- src/doc/CHANGES-9.0:1.1.2.107 Mon Nov 18 19:48:41 2019 +++ src/doc/CHANGES-9.0 Tue Nov 19 06:21:24 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.107 2019/11/18 19:48:41 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.108 2019/11/19 06:21:24 msaitoh Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -5924,3 +5924,7 @@ sys/dev/pci/if_mcx.c1.6 Fixed incorrect m_defrag return value check. [nonaka, ticket #441] +usr.sbin/sysinst/arch/i386/md.c 1.25-1.26 + + Fix KASLR support for amd64. + [martin, ticket #443]
CVS commit: [netbsd-9] src/usr.sbin/sysinst/arch/i386
Module Name:src
Committed By: msaitoh
Date: Tue Nov 19 06:19:04 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/i386 [netbsd-9]: md.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #443):
usr.sbin/sysinst/arch/i386/md.c: revision 1.25
usr.sbin/sysinst/arch/i386/md.c: revision 1.26
Fix previous: the install medium may not have /usr/mdec/prekern; it was
meant to copy the one from the just installed system.
Fix previous: not a good idea to try to copy files from the not yet
extracted sets.
To generate a diff of this commit:
cvs rdiff -u -r1.20.2.2 -r1.20.2.3 src/usr.sbin/sysinst/arch/i386/md.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.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.20.2.2 src/usr.sbin/sysinst/arch/i386/md.c:1.20.2.3
--- src/usr.sbin/sysinst/arch/i386/md.c:1.20.2.2 Sun Nov 17 13:45:26 2019
+++ src/usr.sbin/sysinst/arch/i386/md.c Tue Nov 19 06:19:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.20.2.2 2019/11/17 13:45:26 msaitoh Exp $ */
+/* $NetBSD: md.c,v 1.20.2.3 2019/11/19 06:19:04 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -376,13 +376,6 @@ md_post_newfs_uefi(struct install_partit
int
md_post_newfs(struct install_partition_desc *install)
{
-#if defined(__amd64__)
- int ret;
-
- ret = cp_to_target("/usr/mdec/prekern", "/prekern");
- if (ret)
- return ret;
-#endif
return uefi_boot ? md_post_newfs_uefi(install)
: md_post_newfs_bios(install);
@@ -391,6 +384,15 @@ md_post_newfs(struct install_partition_d
int
md_post_extract(struct install_partition_desc *install)
{
+#if defined(__amd64__)
+ if (get_kernel_set() == SET_KERNEL_2) {
+ int ret;
+
+ ret = cp_within_target("/usr/mdec/prekern", "/prekern", 0);
+ if (ret)
+ return ret;
+ }
+#endif
return 0;
}
CVS commit: [netbsd-9] src/usr.sbin/sysinst/arch/i386
Module Name:src Committed By: msaitoh Date: Tue Nov 19 06:19:04 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/i386 [netbsd-9]: md.c Log Message: Pull up following revision(s) (requested by martin in ticket #443): usr.sbin/sysinst/arch/i386/md.c: revision 1.25 usr.sbin/sysinst/arch/i386/md.c: revision 1.26 Fix previous: the install medium may not have /usr/mdec/prekern; it was meant to copy the one from the just installed system. Fix previous: not a good idea to try to copy files from the not yet extracted sets. To generate a diff of this commit: cvs rdiff -u -r1.20.2.2 -r1.20.2.3 src/usr.sbin/sysinst/arch/i386/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src
Committed By: christos
Date: Tue Nov 19 05:11:33 UTC 2019
Modified Files:
src/share/man/man7: ascii.7
Log Message:
Sync with FreeBSD which capitalizes the control character names, and adds
a binary set.
Add a table with the full names for the control character set.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/share/man/man7/ascii.7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man7/ascii.7
diff -u src/share/man/man7/ascii.7:1.14 src/share/man/man7/ascii.7:1.15
--- src/share/man/man7/ascii.7:1.14 Mon Sep 30 09:44:52 2019
+++ src/share/man/man7/ascii.7 Tue Nov 19 00:11:33 2019
@@ -1,5 +1,4 @@
-.\" $NetBSD: ascii.7,v 1.14 2019/09/30 13:44:52 sevan Exp $
-.\"
+.\" $NetBSD: ascii.7,v 1.15 2019/11/19 05:11:33 christos Exp $
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -28,23 +27,26 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ascii.7 8.1 (Berkeley) 6/5/93
+.\" $FreeBSD: head/share/man/man7/ascii.7 325217 2017-10-31 06:43:37Z eadler $
.\"
-.Dd September 30, 2019
+.Dd November 19, 2019
.Dt ASCII 7
.Os
.Sh NAME
.Nm ascii
-.Nd octal, hexadecimal and decimal ASCII character sets
+.Nd octal, hexadecimal, decimal and binary
+.Tn ASCII
+character sets
.Sh DESCRIPTION
The
.Nm octal
set:
.Bd -literal -offset left
-000 nul 001 soh 002 stx 003 etx 004 eot 005 enq 006 ack 007 bel
-010 bs 011 ht 012 nl 013 vt 014 np 015 cr 016 so 017 si
-020 dle 021 dc1 022 dc2 023 dc3 024 dc4 025 nak 026 syn 027 etb
-030 can 031 em 032 sub 033 esc 034 fs 035 gs 036 rs 037 us
-040 sp 041 ! 042 " 043 # 044 $ 045 % 046 & 047 '
+000 NUL 001 SOH 002 STX 003 ETX 004 EOT 005 ENQ 006 ACK 007 BEL
+010 BS 011 HT 012 LF 013 VT 014 FF 015 CR 016 SO 017 SI
+020 DLE 021 DC1 022 DC2 023 DC3 024 DC4 025 NAK 026 SYN 027 ETB
+030 CAN 031 EM 032 SUB 033 ESC 034 FS 035 GS 036 RS 037 US
+040 SP 041 ! 042 " 043 # 044 $ 045 % 046 & 047 '
050 ( 051 ) 052 * 053 + 054 , 055 - 056 . 057 /
060 0 061 1 062 2 063 3 064 4 065 5 066 6 067 7
070 8 071 9 072 : 073 ; 074 < 075 = 076 > 077 ?
@@ -55,18 +57,18 @@ set:
140 ` 141 a 142 b 143 c 144 d 145 e 146 f 147 g
150 h 151 i 152 j 153 k 154 l 155 m 156 n 157 o
160 p 161 q 162 r 163 s 164 t 165 u 166 v 167 w
-170 x 171 y 172 z 173 { 174 | 175 } 176 ~ 177 del
+170 x 171 y 172 z 173 { 174 | 175 } 176 ~ 177 DEL
.Ed
.Pp
The
.Nm hexadecimal
set:
.Bd -literal -offset left
-00 nul 01 soh 02 stx 03 etx 04 eot 05 enq 06 ack 07 bel
-08 bs09 ht0a nl0b vt0c np0d cr0e so0f si
-10 dle 11 dc1 12 dc2 13 dc3 14 dc4 15 nak 16 syn 17 etb
-18 can 19 em1a sub 1b esc 1c fs1d gs1e rs1f us
-20 sp21 !22 "23 #24 $25 %26 &27 '
+00 NUL 01 SOH 02 STX 03 ETX 04 EOT 05 ENQ 06 ACK 07 BEL
+08 BS09 HT0a LF0b VT0c FF0d CR0e SO0f SI
+10 DLE 11 DC1 12 DC2 13 DC3 14 DC4 15 NAK 16 SYN 17 ETB
+18 CAN 19 EM1a SUB 1b ESC 1c FS1d GS1e RS1f US
+20 SP21 !22 "23 #24 $25 %26 &27 '
28 (29 )2a *2b +2c ,2d -2e .2f /
30 031 132 233 334 435 536 637 7
38 839 93a :3b ;3c <3d =3e >3f ?
@@ -77,18 +79,18 @@ set:
60 \`61 a62 b63 c64 d65 e66 f67 g
68 h69 i6a j6b k6c l6d m6e n6f o
70 p71 q72 r73 s74 t75 u76 v77 w
-78 x79 y7a z7b {7c |7d }7e ~7f del
+78 x79 y7a z7b {7c |7d }7e ~7f DEL
.Ed
.Pp
The
.Nm decimal
set:
.Bd -literal -offset left
- 0 nul1 soh2 stx3 etx4 eot5 enq6 ack7 bel
- 8 bs 9 ht10 nl11 vt12 np13 cr14 so15 si
- 16 dle 17 dc1 18 dc2 19 dc3 20 dc4 21 nak 22 syn 23 etb
- 24 can 25 em26 sub 27 esc 28 fs29 gs30 rs31 us
- 32 sp33 !34 "35 #36 $37 %38 &39 '
+ 0 NUL1 SOH2 STX3 ETX4 EOT5 ENQ6 ACK7 BEL
+ 8 BS 9 HT10 LF11 VT12 FF13 CR14 SO15 SI
+ 16 DLE 17 DC1 18 DC2 19 DC3 20 DC4 21 NAK 22 SYN 23 ETB
+ 24 CAN 25 EM26 SUB 27 ESC 28 FS29 GS30 RS31 US
+ 32 SP33 !34 "35 #36 $37 %38 &39 '
40 (41 )42 *43 +44 ,45 -46 .47 /
48 049 150 2
CVS commit: src/share/man/man7
Module Name:src Committed By: christos Date: Tue Nov 19 05:11:33 UTC 2019 Modified Files: src/share/man/man7: ascii.7 Log Message: Sync with FreeBSD which capitalizes the control character names, and adds a binary set. Add a table with the full names for the control character set. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man7/ascii.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external
Module Name:src Committed By: joerg Date: Mon Nov 18 22:26:15 UTC 2019 Modified Files: src/external/apache2/llvm/librt: Makefile src/external/mit/xorg/lib/gallium: Makefile Added Files: src/external/apache2/llvm/librt/libLLVMBitstreamReader: Makefile src/external/apache2/llvm/librt/libLLVMDebugInfoDWARF: Makefile src/external/apache2/llvm/librt/libLLVMDemangle: Makefile src/external/apache2/llvm/librt/libLLVMMIRParser: Makefile src/external/apache2/llvm/librt/libLLVMRemarks: Makefile src/external/apache2/llvm/librt/libLLVMTextAPI: Makefile src/external/apache2/llvm/librt/libLLVMTransformsCFGuard: Makefile Log Message: Build some more LLVM components for Gallium. Switch it to -Wl,-z,defs To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/apache2/llvm/librt/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/apache2/llvm/librt/libLLVMBitstreamReader/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/apache2/llvm/librt/libLLVMDebugInfoDWARF/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/apache2/llvm/librt/libLLVMDemangle/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/apache2/llvm/librt/libLLVMMIRParser/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/apache2/llvm/librt/libLLVMRemarks/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/apache2/llvm/librt/libLLVMTextAPI/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/apache2/llvm/librt/libLLVMTransformsCFGuard/Makefile cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external
Module Name:src
Committed By: joerg
Date: Mon Nov 18 22:26:15 UTC 2019
Modified Files:
src/external/apache2/llvm/librt: Makefile
src/external/mit/xorg/lib/gallium: Makefile
Added Files:
src/external/apache2/llvm/librt/libLLVMBitstreamReader: Makefile
src/external/apache2/llvm/librt/libLLVMDebugInfoDWARF: Makefile
src/external/apache2/llvm/librt/libLLVMDemangle: Makefile
src/external/apache2/llvm/librt/libLLVMMIRParser: Makefile
src/external/apache2/llvm/librt/libLLVMRemarks: Makefile
src/external/apache2/llvm/librt/libLLVMTextAPI: Makefile
src/external/apache2/llvm/librt/libLLVMTransformsCFGuard: Makefile
Log Message:
Build some more LLVM components for Gallium. Switch it to -Wl,-z,defs
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/apache2/llvm/librt/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/llvm/librt/libLLVMBitstreamReader/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/llvm/librt/libLLVMDebugInfoDWARF/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/llvm/librt/libLLVMDemangle/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/llvm/librt/libLLVMMIRParser/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/llvm/librt/libLLVMRemarks/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/llvm/librt/libLLVMTextAPI/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/llvm/librt/libLLVMTransformsCFGuard/Makefile
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/gallium/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/librt/Makefile
diff -u src/external/apache2/llvm/librt/Makefile:1.1 src/external/apache2/llvm/librt/Makefile:1.2
--- src/external/apache2/llvm/librt/Makefile:1.1 Mon Nov 11 22:45:18 2019
+++ src/external/apache2/llvm/librt/Makefile Mon Nov 18 22:26:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/11/11 22:45:18 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/18 22:26:14 joerg Exp $
.include
@@ -12,8 +12,11 @@ SUBDIR= libLLVMAnalysis \
libLLVMAsmPrinter \
libLLVMBinaryFormat \
libLLVMBitReader \
+ libLLVMBitstreamReader \
libLLVMCodeGen \
+ libLLVMDemangle \
libLLVMDebugInfoCodeView \
+ libLLVMDebugInfoDWARF \
libLLVMExecutionEngine \
libLLVMGlobalISel \
libLLVMInstCombine \
@@ -26,15 +29,19 @@ SUBDIR= libLLVMAnalysis \
libLLVMMCDisassembler \
libLLVMMCJIT \
libLLVMMCParser \
+ libLLVMMIRParser \
libLLVMObject \
libLLVMPasses \
libLLVMProfileData \
+ libLLVMRemarks \
libLLVMRuntimeDyld \
libLLVMScalarOpts \
libLLVMSelectionDAG \
libLLVMSupport \
libLLVMTarget \
+ libLLVMTextAPI \
libLLVMTransformsAggressiveInstCombine \
+ libLLVMTransformsCFGuard \
libLLVMTransformsCoroutines \
libLLVMTransformsUtils \
libLLVMVectorize
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.37 src/external/mit/xorg/lib/gallium/Makefile:1.38
--- src/external/mit/xorg/lib/gallium/Makefile:1.37 Mon Nov 11 22:45:26 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Mon Nov 18 22:26:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/11/11 22:45:26 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2019/11/18 22:26:15 joerg Exp $
# Link the gallium mega driver.
@@ -1049,12 +1049,16 @@ LLVMRT_LIBS+= \
SelectionDAG \
AsmPrinter \
CodeGen \
+ TransformsCFGuard \
Target \
InstCombine \
ScalarOpts \
DebugInfoCodeView \
+ DebugInfoDWARF \
Object \
BitReader \
+ TextAPI \
+ MIRParser \
MCParser \
MC \
ipo \
@@ -1066,16 +1070,19 @@ LLVMRT_LIBS+= \
ProfileData \
Analysis \
IR \
+ Remarks \
+ BitstreamReader \
Linker \
BinaryFormat \
TransformsUtils \
- Support
+ Support \
+ Demangle
.include "${NETBSDSRCDIR}/external/apache2/llvm/link.mk"
.endif # ${BUILD_LLVM_PIPE} == 1 || ${BUILD_RADEON} == 1
-LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym
+LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym -Wl,-z,defs
## build mesagallium parts
MESA_SRC_MODULES= main math vbo state_tracker program asm_s
Added files:
Index: src/external/apache2/llvm/librt/libLLVMBitstreamReader/Makefile
diff -u /dev/null src/external/apache2/llvm/librt/libLLVMBitstreamReader/Makefile:1.1
--- /dev/null Mon Nov 18 22:26:15 2019
+++ src/external/apache2/llvm/librt/libLLVMBitstreamReader/Makefile Mon Nov 18 22:26:14 2019
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1 2019/11/18 22:26:14 joerg Exp $
+
+.include
Index: src/external/apache2/llvm/librt/libLLVMDebugInfoDWARF/Makefile
diff -u /dev/null src/external/apache2/llvm/librt/libLLVMDebugInfoDWARF/Makefile:1.1
--- /dev/null Mon Nov 18 22:26:15 2019
+++ src/external/apache2/llvm/librt/libLLVMDebugInfoDWARF/Makefile Mon Nov 18 22:26:14 2019
@@ -0,0 +1,3 @@
+# $NetBSD:
CVS commit: src/share/examples/npf
Module Name:src
Committed By: sevan
Date: Mon Nov 18 22:27:27 UTC 2019
Modified Files:
src/share/examples/npf: soho_gw-npf.conf
Log Message:
Rename the block table to something else to make it easier to differentiate
between action and name. Use this table as the example for populating by npfctl.
Drop the int-block table, it's quite cumbersome to have a firewall which
needs the internal network lists added if reboot. Use the localnet variable to
indicated which network we should pass in traffic from instead.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/share/examples/npf/soho_gw-npf.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/npf/soho_gw-npf.conf
diff -u src/share/examples/npf/soho_gw-npf.conf:1.19 src/share/examples/npf/soho_gw-npf.conf:1.20
--- src/share/examples/npf/soho_gw-npf.conf:1.19 Sun Sep 22 19:51:18 2019
+++ src/share/examples/npf/soho_gw-npf.conf Mon Nov 18 22:27:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: soho_gw-npf.conf,v 1.19 2019/09/22 19:51:18 sevan Exp $
+# $NetBSD: soho_gw-npf.conf,v 1.20 2019/11/18 22:27:27 sevan Exp $
#
# SOHO border
#
@@ -12,10 +12,9 @@ $ext_addrs = ifaddrs(wm0)
$int_if = "wm1"
-# a table to house e.g. block candidates in
-table type ipset file "/usr/share/examples/npf/hashtablefile"
-# feed this using e.g.: npfctl table "int-block" add 198.51.100.16/29
-table type lpm
+# a "naughty" step^W table to house blocked candidates in
+# feed this using e.g.: npfctl table "naughty" add 203.0.113.99
+table type ipset
$services_tcp = { http, https, smtp, domain, 6000, 9022 }
$services_udp = { domain, ntp, 6000 }
@@ -39,8 +38,8 @@ group "external" on $ext_if {
# Allow all outbound traffic
pass stateful out all
- # Block inbound traffic from those on the block table
- block in from
+ # Block inbound traffic from those on the naughty table
+ block in from
# Placeholder for blacklistd (configuration separate) to add blocked hosts
ruleset "blacklistd"
@@ -61,7 +60,7 @@ group "external" on $ext_if {
group "internal" on $int_if {
# Allow inbound traffic from LAN
- pass in from
+ pass in from $localnet
# All outbound traffic to LAN
pass out all
CVS commit: src/share/examples/npf
Module Name:src Committed By: sevan Date: Mon Nov 18 22:27:27 UTC 2019 Modified Files: src/share/examples/npf: soho_gw-npf.conf Log Message: Rename the block table to something else to make it easier to differentiate between action and name. Use this table as the example for populating by npfctl. Drop the int-block table, it's quite cumbersome to have a firewall which needs the internal network lists added if reboot. Use the localnet variable to indicated which network we should pass in traffic from instead. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/examples/npf/soho_gw-npf.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: christos Date: Mon Nov 18 20:02:10 UTC 2019 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: don't build stub if legacy drm is present too. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/external/bsd/drm2/drm/files.drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/drm/files.drmkms diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.31 src/sys/external/bsd/drm2/drm/files.drmkms:1.32 --- src/sys/external/bsd/drm2/drm/files.drmkms:1.31 Fri Nov 15 23:10:33 2019 +++ src/sys/external/bsd/drm2/drm/files.drmkms Mon Nov 18 15:02:09 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.31 2019/11/16 04:10:33 christos Exp $ +# $NetBSD: files.drmkms,v 1.32 2019/11/18 20:02:09 christos Exp $ include "external/bsd/drm2/linux/files.drmkms_linux" @@ -100,4 +100,4 @@ file external/bsd/drm2/drm/drm_sysfs.c d file external/bsd/drm2/dist/drm/drm_trace_points.c drmkms file external/bsd/drm2/drm/drm_vm.c drmkms file external/bsd/drm2/drm/drm_vma_manager.c drmkms -file external/bsd/drm2/drm/drm_stub.c !drmkms +file external/bsd/drm2/drm/drm_stub.c !drmkms & !drmbase
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: christos Date: Mon Nov 18 20:02:10 UTC 2019 Modified Files: src/sys/external/bsd/drm2/drm: files.drmkms Log Message: don't build stub if legacy drm is present too. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/external/bsd/drm2/drm/files.drmkms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/llvm
Module Name:src
Committed By: joerg
Date: Mon Nov 18 19:54:24 UTC 2019
Modified Files:
src/external/apache2/llvm: Makefile.inc
src/external/apache2/llvm/lib/libclangAST: Makefile
Log Message:
Use a big hammer and disabling strict aliasing for the tools build or
when using GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/apache2/llvm/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/apache2/llvm/lib/libclangAST/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/Makefile.inc
diff -u src/external/apache2/llvm/Makefile.inc:1.2 src/external/apache2/llvm/Makefile.inc:1.3
--- src/external/apache2/llvm/Makefile.inc:1.2 Thu Nov 14 13:16:35 2019
+++ src/external/apache2/llvm/Makefile.inc Mon Nov 18 19:54:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2019/11/14 13:16:35 martin Exp $
+# $NetBSD: Makefile.inc,v 1.3 2019/11/18 19:54:23 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@@ -28,7 +28,7 @@ CLANG_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OB
LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR}
LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR}
HOST_CPPFLAGS+= ${CPPFLAGS}
-HOST_CXXFLAGS+= -O2 -fno-rtti -fno-exceptions
+HOST_CXXFLAGS+= -O2 -fno-rtti -fno-exceptions
HOST_CPPFLAGS+= -std=c++14
LLVM_TARGETS= x86,powerpc,sparc,aarch64,arm,mips
.else
@@ -38,7 +38,7 @@ LLVM_INCLUDE_OBJDIR!= cd ${LLVM_TOPLEVEL
LLVM_TARGETS= x86,powerpc,sparc,aarch64,arm,mips,amdgpu
CXXFLAGS+= -std=c++14
-CXXFLAGS+= -fno-rtti -fno-exceptions
+CXXFLAGS+= -fno-rtti -fno-exceptions ${${ACTIVE_CC} == "gcc" :? -fno-strict-aliasing :}
CXXFLAGS+= -ffunction-sections -fdata-sections
LDFLAGS+= -Wl,--gc-sections
DPADD+= ${LIBEXECINFO}
Index: src/external/apache2/llvm/lib/libclangAST/Makefile
diff -u src/external/apache2/llvm/lib/libclangAST/Makefile:1.2 src/external/apache2/llvm/lib/libclangAST/Makefile:1.3
--- src/external/apache2/llvm/lib/libclangAST/Makefile:1.2 Sat Nov 16 15:51:26 2019
+++ src/external/apache2/llvm/lib/libclangAST/Makefile Mon Nov 18 19:54:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/16 15:51:26 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/18 19:54:23 joerg Exp $
LIB= clangAST
@@ -112,10 +112,6 @@ CLANG_TABLEGEN_OUTPUT= \
.if defined(HOSTLIB)
.include
-BAD_GCC_VERSION!= case `${HOST_CXX} --version 2> /dev/null` in [cg]++*7.4*) echo yes ;; *) echo no ;; esac
-. if ${BAD_GCC_VERSION} == "yes"
-HOST_CXXFLAGS+= -O0
-. endif
.else
.include
.endif
CVS commit: src/external/apache2/llvm
Module Name:src Committed By: joerg Date: Mon Nov 18 19:54:24 UTC 2019 Modified Files: src/external/apache2/llvm: Makefile.inc src/external/apache2/llvm/lib/libclangAST: Makefile Log Message: Use a big hammer and disabling strict aliasing for the tools build or when using GCC. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/apache2/llvm/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/apache2/llvm/lib/libclangAST/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Nov 18 19:48:41 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #437 - #441 To generate a diff of this commit: cvs rdiff -u -r1.1.2.106 -r1.1.2.107 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Nov 18 19:48:41 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #437 - #441 To generate a diff of this commit: cvs rdiff -u -r1.1.2.106 -r1.1.2.107 src/doc/CHANGES-9.0 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.0 diff -u src/doc/CHANGES-9.0:1.1.2.106 src/doc/CHANGES-9.0:1.1.2.107 --- src/doc/CHANGES-9.0:1.1.2.106 Sun Nov 17 13:50:13 2019 +++ src/doc/CHANGES-9.0 Mon Nov 18 19:48:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.106 2019/11/17 13:50:13 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.107 2019/11/18 19:48:41 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -5884,3 +5884,43 @@ usr.sbin/sysinst/util.c1.35-1.40 - x86: improve boot block selection menu - amd64: allow installation of KASLR kernel via "Custom Install" [martin, ticket #436] + +sys/arch/arm/dts/sun50i-a64-pine64-plus.dts 1.3 +sys/arch/arm/dts/sun50i-a64-pine64.dts 1.2 +sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts 1.2 +sys/arch/arm/dts/sun50i-a64.dtsi 1.13 +sys/arch/arm/sunxi/sun50i_a64_ccu.c 1.14 +sys/arch/arm/sunxi/sunxi_ccu_div.c 1.6 +sys/arch/arm/sunxi/sunxi_dwhdmi.c 1.4 +sys/arch/arm/sunxi/sunxi_i2s.c 1.7 + + Add support for A64 I2S clocks. + Add A64 HDMI audio support. + Enable HDMI audio support on Pine64, Pine64+, and Pine64 LTS boards. + [jmcneill, ticket #437] + +sys/arch/evbarm/conf/GENERIC64 1.114 +sys/dev/fdt/files.fdt1.48 +sys/dev/fdt/spdif_tx.c1.1 + + Add driver for dummy spdif transmitter bindings. + [jmcneill, ticket #438] + +sys/arch/arm/sunxi/sun50i_a64_ccu.c 1.15 +sys/arch/evbarm/conf/GENERIC64 1.115 + + Add SPI clocks. + Add sun6ispi. + [jmcneill, ticket #439] + +share/man/man7/sysctl.71.142 + + Document usage of KERN_ARND. + [nia, ticket #440] + +sys/dev/hyperv/if_hvn.c1.7 +sys/dev/pci/if_mcx.c1.6 + + Fixed incorrect m_defrag return value check. + [nonaka, ticket #441] +
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Mon Nov 18 19:46:33 UTC 2019 Modified Files: src/sys/dev/hyperv [netbsd-9]: if_hvn.c src/sys/dev/pci [netbsd-9]: if_mcx.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #441): sys/dev/hyperv/if_hvn.c: revision 1.7 sys/dev/pci/if_mcx.c: revision 1.6 Fixed incorrect m_defrag return value check. To generate a diff of this commit: cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/dev/hyperv/if_hvn.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/dev/pci/if_mcx.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/hyperv/if_hvn.c diff -u src/sys/dev/hyperv/if_hvn.c:1.4.2.1 src/sys/dev/hyperv/if_hvn.c:1.4.2.2 --- src/sys/dev/hyperv/if_hvn.c:1.4.2.1 Sat Nov 16 16:51:45 2019 +++ src/sys/dev/hyperv/if_hvn.c Mon Nov 18 19:46:33 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_hvn.c,v 1.4.2.1 2019/11/16 16:51:45 martin Exp $ */ +/* $NetBSD: if_hvn.c,v 1.4.2.2 2019/11/18 19:46:33 martin Exp $ */ /* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */ /*- @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.1 2019/11/16 16:51:45 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.2 2019/11/18 19:46:33 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -565,7 +565,7 @@ hvn_encap(struct hvn_softc *sc, struct m case 0: break; case EFBIG: - if (m_defrag(m, M_NOWAIT) == 0 && + if (m_defrag(m, M_NOWAIT) != NULL && bus_dmamap_load_mbuf(sc->sc_dmat, txd->txd_dmap, m, BUS_DMA_READ | BUS_DMA_NOWAIT) == 0) break; Index: src/sys/dev/pci/if_mcx.c diff -u src/sys/dev/pci/if_mcx.c:1.1.2.4 src/sys/dev/pci/if_mcx.c:1.1.2.5 --- src/sys/dev/pci/if_mcx.c:1.1.2.4 Sun Sep 29 07:26:23 2019 +++ src/sys/dev/pci/if_mcx.c Mon Nov 18 19:46:33 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mcx.c,v 1.1.2.4 2019/09/29 07:26:23 martin Exp $ */ +/* $NetBSD: if_mcx.c,v 1.1.2.5 2019/11/18 19:46:33 martin Exp $ */ /* $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */ /* @@ -6347,7 +6347,7 @@ mcx_load_mbuf(struct mcx_softc *sc, stru break; case EFBIG: - if (m_defrag(m, M_DONTWAIT) == 0 && + if (m_defrag(m, M_DONTWAIT) != NULL && bus_dmamap_load_mbuf(sc->sc_dmat, ms->ms_map, m, BUS_DMA_STREAMING | BUS_DMA_NOWAIT) == 0) break;
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Mon Nov 18 19:46:33 UTC 2019 Modified Files: src/sys/dev/hyperv [netbsd-9]: if_hvn.c src/sys/dev/pci [netbsd-9]: if_mcx.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #441): sys/dev/hyperv/if_hvn.c: revision 1.7 sys/dev/pci/if_mcx.c: revision 1.6 Fixed incorrect m_defrag return value check. To generate a diff of this commit: cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/dev/hyperv/if_hvn.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/dev/pci/if_mcx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/man/man7
Module Name:src Committed By: martin Date: Mon Nov 18 19:45:00 UTC 2019 Modified Files: src/share/man/man7 [netbsd-9]: sysctl.7 Log Message: Pull up following revision(s) (requested by nia in ticket #440): share/man/man7/sysctl.7: revision 1.142 Document usage of KERN_ARND To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.139.2.1 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/man/man7
Module Name:src Committed By: martin Date: Mon Nov 18 19:45:00 UTC 2019 Modified Files: src/share/man/man7 [netbsd-9]: sysctl.7 Log Message: Pull up following revision(s) (requested by nia in ticket #440): share/man/man7/sysctl.7: revision 1.142 Document usage of KERN_ARND To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.139.2.1 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.139 src/share/man/man7/sysctl.7:1.139.2.1 --- src/share/man/man7/sysctl.7:1.139 Sat Jun 1 19:54:34 2019 +++ src/share/man/man7/sysctl.7 Mon Nov 18 19:45:00 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.139 2019/06/01 19:54:34 kamil Exp $ +.\" $NetBSD: sysctl.7,v 1.139.2.1 2019/11/18 19:45:00 martin Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -382,8 +382,10 @@ the variable may be created and removed upon loading or unloading the corresponding kernel module. .It Li kern.aio_max The maximum number of asynchronous I/O operations. -.It Li kern.arandom -This variable picks a random number each time it is queried. +.It Li kern.arandom ( Dv KERN_ARND ) +This variable returns up to 256 bytes of random data. +Multiple queries can be used to obtain an infinite amount of +non-blocking cryptographically secure random data. The used random number generator .Pf ( RNG ) is based on
CVS commit: [netbsd-9] src/sys/arch
Module Name:src
Committed By: martin
Date: Mon Nov 18 19:36:03 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi [netbsd-9]: sun50i_a64_ccu.c
src/sys/arch/evbarm/conf [netbsd-9]: GENERIC64
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #439):
sys/arch/evbarm/conf/GENERIC64: revision 1.115
sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.15
Add SPI clocks
Add sun6ispi
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c
cvs rdiff -u -r1.103.2.4 -r1.103.2.5 src/sys/arch/evbarm/conf/GENERIC64
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/sunxi/sun50i_a64_ccu.c
diff -u src/sys/arch/arm/sunxi/sun50i_a64_ccu.c:1.13.2.1 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c:1.13.2.2
--- src/sys/arch/arm/sunxi/sun50i_a64_ccu.c:1.13.2.1 Mon Nov 18 19:31:00 2019
+++ src/sys/arch/arm/sunxi/sun50i_a64_ccu.c Mon Nov 18 19:36:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i_a64_ccu.c,v 1.13.2.1 2019/11/18 19:31:00 martin Exp $ */
+/* $NetBSD: sun50i_a64_ccu.c,v 1.13.2.2 2019/11/18 19:36:03 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: sun50i_a64_ccu.c,v 1.13.2.1 2019/11/18 19:31:00 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun50i_a64_ccu.c,v 1.13.2.2 2019/11/18 19:36:03 martin Exp $");
#include
#include
@@ -60,6 +60,8 @@ __KERNEL_RCSID(1, "$NetBSD: sun50i_a64_c
#define SDMMC0_CLK_REG 0x088
#define SDMMC1_CLK_REG 0x08c
#define SDMMC2_CLK_REG 0x090
+#define SPI0_CLK_REG 0x0a0
+#define SPI1_CLK_REG 0x0a4
#define I2SPCM0_CLK_REG 0x0b0
#define I2SPCM1_CLK_REG 0x0b4
#define I2SPCM2_CLK_REG 0x0b8
@@ -158,6 +160,7 @@ static const char *ths_parents[] = { "ho
static const char *de_parents[] = { "pll_periph0_2x", "pll_de" };
static const char *hdmi_parents[] = { "pll_video0", "pll_video1" };
static const char *i2s_parents[] = { "pll_audio_8x", "pll_audio_4x", "pll_audio_2x", "pll_audio" };
+static const char *spi_parents[] = { "hosc", "pll_periph0", "pll_periph1", NULL };
static const char *tcon1_parents[] = { "pll_video0", NULL, "pll_video1", NULL };
static const char *gpu_parents[] = { "pll_gpu" };
@@ -260,6 +263,16 @@ static struct sunxi_ccu_clk sun50i_a64_c
SUNXI_CCU_NKMP_DIVIDE_BY_TWO),
SUNXI_CCU_FIXED_FACTOR(A64_CLK_PLL_PERIPH0_2X, "pll_periph0_2x", "pll_periph0", 1, 2),
+ SUNXI_CCU_NKMP(A64_CLK_PLL_PERIPH1, "pll_periph1", "hosc",
+ PLL_PERIPH1_CTRL_REG, /* reg */
+ __BITS(12,8), /* n */
+ __BITS(5,4), /* k */
+ 0,/* m */
+ __BITS(17,16), /* p */
+ __BIT(31), /* enable */
+ SUNXI_CCU_NKMP_DIVIDE_BY_TWO),
+ SUNXI_CCU_FIXED_FACTOR(A64_CLK_PLL_PERIPH1_2X, "pll_periph1_2x", "pll_periph1", 1, 2),
+
SUNXI_CCU_NKMP_TABLE(A64_CLK_PLL_AUDIO_BASE, "pll_audio_base", "hosc",
PLL_AUDIO_CTRL_REG, /* reg */
__BITS(14,8), /* n */
@@ -430,6 +443,21 @@ static struct sunxi_ccu_clk sun50i_a64_c
__BIT(31), /* enable */
0),
+ SUNXI_CCU_NM(A64_CLK_SPI0, "spi0", spi_parents,
+ SPI0_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_NM(A64_CLK_SPI1, "spi1", spi_parents,
+ SPI1_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(A64_CLK_TCON1, "tcon1", tcon1_parents,
TCON1_CLK_REG, /* reg */
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.103.2.4 src/sys/arch/evbarm/conf/GENERIC64:1.103.2.5
--- src/sys/arch/evbarm/conf/GENERIC64:1.103.2.4 Mon Nov 18 19:33:10 2019
+++ src/sys/arch/evbarm/conf/GENERIC64 Mon Nov 18 19:36:03 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.103.2.4 2019/11/18 19:33:10 martin Exp $
+# $NetBSD: GENERIC64,v 1.103.2.5 2019/11/18 19:36:03 martin Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -402,6 +402,7 @@ ld* at nvme? nsid ?
# SPI controllers
bcmspi* at fdt? # Broadcom BCM283x SPI
+sun6ispi* at fdt? # Allwinner SPI
spi* at spibus?
# Audio support
CVS commit: [netbsd-9] src/sys/arch
Module Name:src Committed By: martin Date: Mon Nov 18 19:36:03 UTC 2019 Modified Files: src/sys/arch/arm/sunxi [netbsd-9]: sun50i_a64_ccu.c src/sys/arch/evbarm/conf [netbsd-9]: GENERIC64 Log Message: Pull up following revision(s) (requested by jmcneill in ticket #439): sys/arch/evbarm/conf/GENERIC64: revision 1.115 sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.15 Add SPI clocks Add sun6ispi To generate a diff of this commit: cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c cvs rdiff -u -r1.103.2.4 -r1.103.2.5 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys
Module Name:src Committed By: martin Date: Mon Nov 18 19:33:10 UTC 2019 Modified Files: src/sys/arch/evbarm/conf [netbsd-9]: GENERIC64 src/sys/dev/fdt [netbsd-9]: files.fdt Added Files: src/sys/dev/fdt [netbsd-9]: spdif_tx.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #438): sys/dev/fdt/spdif_tx.c: revision 1.1 sys/arch/evbarm/conf/GENERIC64: revision 1.114 sys/dev/fdt/files.fdt: revision 1.48 Add driver for dummy spdif transmitter bindings. Add spdiftx To generate a diff of this commit: cvs rdiff -u -r1.103.2.3 -r1.103.2.4 src/sys/arch/evbarm/conf/GENERIC64 cvs rdiff -u -r1.44 -r1.44.4.1 src/sys/dev/fdt/files.fdt cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/fdt/spdif_tx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys
Module Name:src
Committed By: martin
Date: Mon Nov 18 19:33:10 UTC 2019
Modified Files:
src/sys/arch/evbarm/conf [netbsd-9]: GENERIC64
src/sys/dev/fdt [netbsd-9]: files.fdt
Added Files:
src/sys/dev/fdt [netbsd-9]: spdif_tx.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #438):
sys/dev/fdt/spdif_tx.c: revision 1.1
sys/arch/evbarm/conf/GENERIC64: revision 1.114
sys/dev/fdt/files.fdt: revision 1.48
Add driver for dummy spdif transmitter bindings.
Add spdiftx
To generate a diff of this commit:
cvs rdiff -u -r1.103.2.3 -r1.103.2.4 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.44 -r1.44.4.1 src/sys/dev/fdt/files.fdt
cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/fdt/spdif_tx.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/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.103.2.3 src/sys/arch/evbarm/conf/GENERIC64:1.103.2.4
--- src/sys/arch/evbarm/conf/GENERIC64:1.103.2.3 Sat Nov 16 16:48:25 2019
+++ src/sys/arch/evbarm/conf/GENERIC64 Mon Nov 18 19:33:10 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.103.2.3 2019/11/16 16:48:25 martin Exp $
+# $NetBSD: GENERIC64,v 1.103.2.4 2019/11/18 19:33:10 martin Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -412,6 +412,7 @@ options HDAUDIOVERBOSE
options HDAUDIO_ENABLE_HDMI
options HDAUDIO_ENABLE_DISPLAYPORT
ausoc* at fdt? # Simple SoC audio card
+spdiftx* at fdt? # SPDIF transmitter
rki2s* at fdt? # Rockchip I2S/PCM
sunxicodec* at fdt? # Allwinner audio codec
sun8icodec* at fdt? # Allwinner audio codec (sun8i/sun50i)
Index: src/sys/dev/fdt/files.fdt
diff -u src/sys/dev/fdt/files.fdt:1.44 src/sys/dev/fdt/files.fdt:1.44.4.1
--- src/sys/dev/fdt/files.fdt:1.44 Wed Mar 13 12:17:45 2019
+++ src/sys/dev/fdt/files.fdt Mon Nov 18 19:33:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.44 2019/03/13 12:17:45 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.44.4.1 2019/11/18 19:33:10 martin Exp $
include "external/bsd/libfdt/conf/files.libfdt"
@@ -93,6 +93,10 @@ device ausoc: audiobus
attach ausoc at fdt
file dev/fdt/ausoc.causoc
+device spdiftx
+attach spdiftx at fdt
+file dev/fdt/spdif_tx.c spdiftx
+
define fdt_display_timing
file dev/fdt/display_timing.c fdt_display_timing
Added files:
Index: src/sys/dev/fdt/spdif_tx.c
diff -u /dev/null src/sys/dev/fdt/spdif_tx.c:1.1.2.2
--- /dev/null Mon Nov 18 19:33:10 2019
+++ src/sys/dev/fdt/spdif_tx.c Mon Nov 18 19:33:10 2019
@@ -0,0 +1,114 @@
+/* $NetBSD: spdif_tx.c,v 1.1.2.2 2019/11/18 19:33:10 martin Exp $ */
+
+/*-
+ * Copyright (c) 2019 Jared McNeill
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: spdif_tx.c,v 1.1.2.2 2019/11/18 19:33:10 martin Exp $");
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+
+struct spdif_tx_softc {
+ device_t sc_dev;
+ struct audio_dai_device sc_dai;
+};
+
+static int spdif_tx_match(device_t, cfdata_t, void *);
+static void spdif_tx_attach(device_t, device_t, void *);
+
+static const char *compatible[] = {
+ "linux,spdif-dit",
+ NULL
+};
+
+CFATTACH_DECL_NEW(spdiftx, sizeof(struct spdif_tx_softc),
+ spdif_tx_match, spdif_tx_attach, NULL, NULL);
+
+static int
+spdif_tx_set_format(audio_dai_tag_t dai, u_int format)
+{
+ return 0;
+}
+
+static int
+spdif_tx_add_device(audio_dai_tag_t dai, audio_dai_tag_t aux)
+{
+ return 0;
+}
+
+static const struct audio_hw_if spdif_tx_hw_if = { };
+
+static audio_dai_tag_t
+spdif_tx_dai_get_tag(device_t dev, const void *data, size_t len)
+{
+ struct spdif_tx_softc * const sc = device_private(dev);
+
+
CVS commit: [netbsd-9] src/sys/arch/arm
Module Name:src
Committed By: martin
Date: Mon Nov 18 19:31:00 UTC 2019
Modified Files:
src/sys/arch/arm/dts [netbsd-9]: sun50i-a64-pine64-plus.dts
sun50i-a64-pine64.dts sun50i-a64-sopine-baseboard.dts
sun50i-a64.dtsi
src/sys/arch/arm/sunxi [netbsd-9]: sun50i_a64_ccu.c sunxi_ccu_div.c
sunxi_dwhdmi.c sunxi_i2s.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #437):
sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts: revision 1.2
sys/arch/arm/sunxi/sunxi_ccu_div.c: revision 1.6
sys/arch/arm/dts/sun50i-a64.dtsi: revision 1.13
sys/arch/arm/dts/sun50i-a64-pine64.dts: revision 1.2
sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.4
sys/arch/arm/dts/sun50i-a64-pine64-plus.dts: revision 1.3
sys/arch/arm/sunxi/sunxi_i2s.c: revision 1.7
sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.14
Add support for A64 I2S clocks.
Add A64 HDMI audio support.
Enable HDMI audio support on Pine64, Pine64+, and Pine64 LTS boards.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts
cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/arm/dts/sun50i-a64-pine64.dts \
src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 src/sys/arch/arm/dts/sun50i-a64.dtsi
cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c
cvs rdiff -u -r1.5 -r1.5.6.1 src/sys/arch/arm/sunxi/sunxi_ccu_div.c
cvs rdiff -u -r1.3 -r1.3.6.1 src/sys/arch/arm/sunxi/sunxi_dwhdmi.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/arm/sunxi/sunxi_i2s.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-a64-pine64-plus.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts:1.2 src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts:1.2.10.1
--- src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts:1.2 Sat Sep 9 12:05:28 2017
+++ src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts Mon Nov 18 19:31:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pine64-plus.dts,v 1.2 2017/09/09 12:05:28 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pine64-plus.dts,v 1.2.10.1 2019/11/18 19:31:00 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -49,3 +49,11 @@
{
status = "okay";
};
+
+ {
+ status = "okay";
+};
+
+_hdmi {
+ status = "okay";
+};
Index: src/sys/arch/arm/dts/sun50i-a64-pine64.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pine64.dts:1.1 src/sys/arch/arm/dts/sun50i-a64-pine64.dts:1.1.8.1
--- src/sys/arch/arm/dts/sun50i-a64-pine64.dts:1.1 Sun Feb 18 12:20:25 2018
+++ src/sys/arch/arm/dts/sun50i-a64-pine64.dts Mon Nov 18 19:31:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pine64.dts,v 1.1 2018/02/18 12:20:25 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pine64.dts,v 1.1.8.1 2019/11/18 19:31:00 martin Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -28,3 +28,11 @@
#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts"
#include "sun50i-a64.dtsi"
+
+ {
+ status = "okay";
+};
+
+_hdmi {
+ status = "okay";
+};
Index: src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts:1.1 src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts:1.1.8.1
--- src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts:1.1 Thu Jun 7 00:51:41 2018
+++ src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts Mon Nov 18 19:31:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-sopine-baseboard.dts,v 1.1 2018/06/07 00:51:41 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-sopine-baseboard.dts,v 1.1.8.1 2019/11/18 19:31:00 martin Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -28,3 +28,11 @@
#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts"
#include "sun50i-a64.dtsi"
+
+ {
+ status = "okay";
+};
+
+_hdmi {
+ status = "okay";
+};
Index: src/sys/arch/arm/dts/sun50i-a64.dtsi
diff -u src/sys/arch/arm/dts/sun50i-a64.dtsi:1.11.2.1 src/sys/arch/arm/dts/sun50i-a64.dtsi:1.11.2.2
--- src/sys/arch/arm/dts/sun50i-a64.dtsi:1.11.2.1 Sun Nov 10 13:14:41 2019
+++ src/sys/arch/arm/dts/sun50i-a64.dtsi Mon Nov 18 19:31:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64.dtsi,v 1.11.2.1 2019/11/10 13:14:41 martin Exp $ */
+/* $NetBSD: sun50i-a64.dtsi,v 1.11.2.2 2019/11/18 19:31:00 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -59,6 +59,36 @@
,
;
};
+
+ i2s2: i2s@1c22800 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun50i-a64-i2s",
+ "allwinner,sun8i-h3-i2s";
+ reg = <0x01c22800 0x400>;
+ interrupts = ;
+ clocks = < CLK_BUS_I2S2>, < CLK_I2S2>;
+ clock-names = "apb", "mod";
+ resets = < RST_BUS_I2S2>;
+ dma-names = "tx";
+ dmas = < 27>;
+ status = "disabled";
+ };
+
+ sound_hdmi: sound-hdmi {
+ compatible = "simple-audio-card";
+ simple-audio-card,name =
CVS commit: [netbsd-9] src/sys/arch/arm
Module Name:src Committed By: martin Date: Mon Nov 18 19:31:00 UTC 2019 Modified Files: src/sys/arch/arm/dts [netbsd-9]: sun50i-a64-pine64-plus.dts sun50i-a64-pine64.dts sun50i-a64-sopine-baseboard.dts sun50i-a64.dtsi src/sys/arch/arm/sunxi [netbsd-9]: sun50i_a64_ccu.c sunxi_ccu_div.c sunxi_dwhdmi.c sunxi_i2s.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #437): sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts: revision 1.2 sys/arch/arm/sunxi/sunxi_ccu_div.c: revision 1.6 sys/arch/arm/dts/sun50i-a64.dtsi: revision 1.13 sys/arch/arm/dts/sun50i-a64-pine64.dts: revision 1.2 sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.4 sys/arch/arm/dts/sun50i-a64-pine64-plus.dts: revision 1.3 sys/arch/arm/sunxi/sunxi_i2s.c: revision 1.7 sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.14 Add support for A64 I2S clocks. Add A64 HDMI audio support. Enable HDMI audio support on Pine64, Pine64+, and Pine64 LTS boards. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/arm/dts/sun50i-a64-pine64.dts \ src/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts cvs rdiff -u -r1.11.2.1 -r1.11.2.2 src/sys/arch/arm/dts/sun50i-a64.dtsi cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c cvs rdiff -u -r1.5 -r1.5.6.1 src/sys/arch/arm/sunxi/sunxi_ccu_div.c cvs rdiff -u -r1.3 -r1.3.6.1 src/sys/arch/arm/sunxi/sunxi_dwhdmi.c cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/arm/sunxi/sunxi_i2s.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Nov 18 19:29:27 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1447 To generate a diff of this commit: cvs rdiff -u -r1.1.2.66 -r1.1.2.67 src/doc/CHANGES-8.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-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.66 src/doc/CHANGES-8.2:1.1.2.67 --- src/doc/CHANGES-8.2:1.1.2.66 Sat Nov 16 16:40:29 2019 +++ src/doc/CHANGES-8.2 Mon Nov 18 19:29:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.66 2019/11/16 16:40:29 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.67 2019/11/18 19:29:27 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1607,3 +1607,8 @@ sys/arch/zaurus/zaurus/machdep.c 1.40,1 Make zaurus kernels use symbols loaded by bootloader. [tsutsui, ticket #1446] +sys/dev/hyperv/if_hvn.c1.7 + + Fixed incorrect m_defrag return value check. + [nonaka, ticket #1447] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Nov 18 19:29:27 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1447 To generate a diff of this commit: cvs rdiff -u -r1.1.2.66 -r1.1.2.67 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/hyperv
Module Name:src Committed By: martin Date: Mon Nov 18 19:27:56 UTC 2019 Modified Files: src/sys/dev/hyperv [netbsd-8]: if_hvn.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #1447): sys/dev/hyperv/if_hvn.c: revision 1.7 Fixed incorrect m_defrag return value check. To generate a diff of this commit: cvs rdiff -u -r1.2.2.3 -r1.2.2.4 src/sys/dev/hyperv/if_hvn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Mon Nov 18 16:23:28 UTC 2019 Modified Files: src/share/mk: compare-lib-lists Log Message: Compare libraries that the bsd.prog.mk "knows about" vs the ones we actually install... Yes, pretty bad right now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/mk/compare-lib-lists Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Nov 18 16:23:28 UTC 2019
Modified Files:
src/share/mk: compare-lib-lists
Log Message:
Compare libraries that the bsd.prog.mk "knows about" vs the ones we actually
install... Yes, pretty bad right now.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/mk/compare-lib-lists
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/compare-lib-lists
diff -u src/share/mk/compare-lib-lists:1.2 src/share/mk/compare-lib-lists:1.3
--- src/share/mk/compare-lib-lists:1.2 Mon Nov 18 11:09:21 2019
+++ src/share/mk/compare-lib-lists Mon Nov 18 11:23:28 2019
@@ -1,16 +1,20 @@
#!/bin/sh
-# $NetBSD: compare-lib-lists,v 1.2 2019/11/18 16:09:21 christos Exp $
+# $NetBSD: compare-lib-lists,v 1.3 2019/11/18 16:23:28 christos Exp $
#
# Q+D script to print the library lists for comparison between whats in the
-# bsd.prog.mk file and bsd.README
+# bsd.prog.mk file and bsd.README (this matches)
+#
+# Also compare the list of LIB variables we create against the actually
+# installed archives (this does *not* match -- yet)
prog=$(basename "$0")
RD=/tmp/${prog}.rd.$$
MK=/tmp/${prog}.mk.$$
IN=/tmp/${prog}.in.$$
+LB=/tmp/${prog}.lb.$$
-trap "rm -f ${MK} ${RD} ${IN}" 0 1 2 3 15
+trap "rm -f ${MK} ${RD} ${IN} ${LB}" 0 1 2 3 15
make -f - all << \EOF > ${MK}
.include
@@ -34,9 +38,8 @@ grep ' LIB' bsd.README | \
paste ${MK} ${RD}
echo "--"
-echo "Not installed"
-cat << \EOF | make -f - xall > ${IN}
+cat << \EOF | make -f - xall | sort > ${IN}
.include
xall:
@@ -47,8 +50,8 @@ xall:
@echo ${DESTDIR}${X11USRLIBDIR}/lib${_lib}.a
.endfor
EOF
-for i in ${IN}; do
- if [ ! -f $i ]; then
- echo $i
- fi
-done
+
+ls -1 /usr/lib/*.a /usr/X11R7/lib/*.a | \
+egrep -v '(_p|_pic|_g)\.a' | sort > ${LB}
+
+paste ${IN} ${LB}
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Mon Nov 18 16:09:21 UTC 2019 Modified Files: src/share/mk: bsd.README bsd.prog.mk compare-lib-lists Log Message: Improve the script to check for installed libraries, and fix the wrong names and obsolete libraries it found. To generate a diff of this commit: cvs rdiff -u -r1.395 -r1.396 src/share/mk/bsd.README cvs rdiff -u -r1.323 -r1.324 src/share/mk/bsd.prog.mk cvs rdiff -u -r1.1 -r1.2 src/share/mk/compare-lib-lists Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Nov 18 16:09:21 UTC 2019
Modified Files:
src/share/mk: bsd.README bsd.prog.mk compare-lib-lists
Log Message:
Improve the script to check for installed libraries, and fix the wrong
names and obsolete libraries it found.
To generate a diff of this commit:
cvs rdiff -u -r1.395 -r1.396 src/share/mk/bsd.README
cvs rdiff -u -r1.323 -r1.324 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.1 -r1.2 src/share/mk/compare-lib-lists
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.README
diff -u src/share/mk/bsd.README:1.395 src/share/mk/bsd.README:1.396
--- src/share/mk/bsd.README:1.395 Thu Oct 31 02:43:19 2019
+++ src/share/mk/bsd.README Mon Nov 18 11:09:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.395 2019/10/31 06:43:19 martin Exp $
+# $NetBSD: bsd.README,v 1.396 2019/11/18 16:09:21 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1645,15 +1645,14 @@ DPADD Additional dependencies for the p
LIBBLUETOOTH?= ${DESTDIR}/usr/lib/libbluetooth.a
LIBBSDMALLOC?= ${DESTDIR}/usr/lib/libbsdmalloc.a
LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a
- LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a
LIBC?= ${DESTDIR}/usr/lib/libc.a
+ LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a
LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a
LIBCOM_ERR?= ${DESTDIR}/usr/lib/libcom_err.a
LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a
LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a
LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a
- LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a
- LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a
+ LIBCXX?= ${DESTDIR}/usr/lib/libc++.a
LIBDES?= ${DESTDIR}/usr/lib/libdes.a
LIBDNS?= ${DESTDIR}/usr/lib/libdns.a
LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a
@@ -1665,7 +1664,6 @@ DPADD Additional dependencies for the p
LIBFETCH?= ${DESTDIR}/usr/lib/libfetch.a
LIBFL?= ${DESTDIR}/usr/lib/libfl.a
LIBFORM?= ${DESTDIR}/usr/lib/libform.a
- LIBG2C?= ${DESTDIR}/usr/lib/libg2c.a
LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a
LIBGNUMALLOC?= ${DESTDIR}/usr/lib/libgnumalloc.a
LIBGSSAPI?= ${DESTDIR}/usr/lib/libgssapi.a
@@ -1688,7 +1686,6 @@ DPADD Additional dependencies for the p
LIBLDAP?= ${DESTDIR}/usr/lib/libldap.a
LIBLDAP_R?= ${DESTDIR}/usr/lib/libldap_r.a
LIBLUA?= ${DESTDIR}/usr/lib/liblua.a
- LIBLUTOK?= ${DESTDIR}/usr/lib/liblutok.a
LIBM?= ${DESTDIR}/usr/lib/libm.a
LIBMAGIC?= ${DESTDIR}/usr/lib/libmagic.a
LIBMENU?= ${DESTDIR}/usr/lib/libmenu.a
@@ -1712,28 +1709,25 @@ DPADD Additional dependencies for the p
LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a
LIBRT?= ${DESTDIR}/usr/lib/librt.a
LIBRUMP?= ${DESTDIR}/usr/lib/librump.a
- LIBRUMPFS_CD966 0FS?= ${DESTDIR}/usr/lib/librumpfs_cd9660fs.a
+ LIBRUMPFS_CD9660?= ${DESTDIR}/usr/lib/librumpfs_cd9660.a
LIBRUMPFS_EFS?= ${DESTDIR}/usr/lib/librumpfs_efs.a
LIBRUMPFS_EXT2FS?= ${DESTDIR}/usr/lib/librumpfs_ext2fs.a
LIBRUMPFS_FFS?= ${DESTDIR}/usr/lib/librumpfs_ffs.a
LIBRUMPFS_HFS?= ${DESTDIR}/usr/lib/librumpfs_hfs.a
LIBRUMPFS_LFS?= ${DESTDIR}/usr/lib/librumpfs_lfs.a
- LIBRUMPFS_MSDOSFS?= ${DESTDIR}/usr/lib/librumpfs_msdosfs.a
+ LIBRUMPFS_MSDOS?= ${DESTDIR}/usr/lib/librumpfs_msdos.a
LIBRUMPFS_NFS?= ${DESTDIR}/usr/lib/librumpfs_nfs.a
LIBRUMPFS_NTFS?= ${DESTDIR}/usr/lib/librumpfs_ntfs.a
LIBRUMPFS_SYSPUFFS?= ${DESTDIR}/usr/lib/librumpfs_syspuffs.a
LIBRUMPFS_TMPFS?= ${DESTDIR}/usr/lib/librumpfs_tmpfs.a
LIBRUMPFS_UDF?= ${DESTDIR}/usr/lib/librumpfs_udf.a
- LIBRUMPFS_UFS?= ${DESTDIR}/usr/lib/librumpfs_ufs.a
LIBRUMPUSER?= ${DESTDIR}/usr/lib/librumpuser.a
LIBSASLC?= ${DESTDIR}/usr/lib/libsaslc.a
LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a
LIBSL?= ${DESTDIR}/usr/lib/libsl.a
LIBSQLITE3?= ${DESTDIR}/usr/lib/libsqlite3.a
- LIBSS?= ${DESTDIR}/usr/lib/libss.a
LIBSSH?= ${DESTDIR}/usr/lib/libssh.a
LIBSSL?= ${DESTDIR}/usr/lib/libssl.a
- LIBSSP?= ${DESTDIR}/usr/lib/libssp.a
LIBSTDCXX?= ${DESTDIR}/usr/lib/libstdc++.a
LIBSUPCXX?= ${DESTDIR}/usr/lib/libsupc++.a
LIBTERMINFO?= ${DESTDIR}/usr/lib/libterminfo.a
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.323 src/share/mk/bsd.prog.mk:1.324
--- src/share/mk/bsd.prog.mk:1.323 Tue Aug 27 18:48:54 2019
+++ src/share/mk/bsd.prog.mk Mon Nov 18 11:09:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.323 2019/08/27 22:48:54 kamil Exp $
+# $NetBSD: bsd.prog.mk,v 1.324 2019/11/18 16:09:21 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -123,7 +123,6 @@ _LIBLIST=\
crypto \
curses \
cxx \
- dbm \
des \
dns \
edit \
@@ -135,7 +134,6 @@ _LIBLIST=\
fetch \
fl \
form \
- g2c \
gcc \
gnumalloc \
gssapi \
@@ -158,7 +156,6 @@ _LIBLIST=\
ldap \
ldap_r \
lua \
- lutok \
m \
magic \
menu \
@@ -182,28 +179,25 @@
CVS commit: src/usr.sbin/sysinst/arch/i386
Module Name:src Committed By: martin Date: Mon Nov 18 16:05:55 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/i386: md.c Log Message: Fix previous: not a good idea to try to copy files from the not yet extracted sets. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/sysinst/arch/i386/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/i386
Module Name:src
Committed By: martin
Date: Mon Nov 18 16:05:55 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/i386: md.c
Log Message:
Fix previous: not a good idea to try to copy files from the not yet
extracted sets.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/sysinst/arch/i386/md.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.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.25 src/usr.sbin/sysinst/arch/i386/md.c:1.26
--- src/usr.sbin/sysinst/arch/i386/md.c:1.25 Mon Nov 18 08:16:32 2019
+++ src/usr.sbin/sysinst/arch/i386/md.c Mon Nov 18 16:05:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.25 2019/11/18 08:16:32 martin Exp $ */
+/* $NetBSD: md.c,v 1.26 2019/11/18 16:05:55 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -376,13 +376,6 @@ md_post_newfs_uefi(struct install_partit
int
md_post_newfs(struct install_partition_desc *install)
{
-#if defined(__amd64__)
- int ret;
-
- ret = cp_within_target("/usr/mdec/prekern", "/prekern", 0);
- if (ret)
- return ret;
-#endif
return uefi_boot ? md_post_newfs_uefi(install)
: md_post_newfs_bios(install);
@@ -391,6 +384,15 @@ md_post_newfs(struct install_partition_d
int
md_post_extract(struct install_partition_desc *install)
{
+#if defined(__amd64__)
+ if (get_kernel_set() == SET_KERNEL_2) {
+ int ret;
+
+ ret = cp_within_target("/usr/mdec/prekern", "/prekern", 0);
+ if (ret)
+ return ret;
+ }
+#endif
return 0;
}
CVS commit: src
Module Name:src
Committed By: christos
Date: Mon Nov 18 15:42:26 UTC 2019
Modified Files:
src: UPDATING
Log Message:
catch-up with more ports switched to gcc-8
fix typos, consistent whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.305 -r1.306 src/UPDATING
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/UPDATING
diff -u src/UPDATING:1.305 src/UPDATING:1.306
--- src/UPDATING:1.305 Wed Nov 13 04:59:02 2019
+++ src/UPDATING Mon Nov 18 10:42:26 2019
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.305 2019/11/13 09:59:02 martin Exp $
+$NetBSD: UPDATING,v 1.306 2019/11/18 15:42:26 christos Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,11 @@ See also: BUILDING, build.sh, Makefile.
Recent changes:
^^^
+20191118:
+ More architectures were switched to gcc8:
+ i386, ia64 powerpc64, sparc, sparc64, arm
+ The same comments as in 20191022 apply.
+
20191112:
The LLVM update requires a clean rebuild for all architectures using
LLVM during the tools build phase (i386, amd64, aarch64).
@@ -28,18 +33,16 @@ Recent changes:
In-place ("expert mode", build.sh -E) builds are not supported
when going from a GCC 7 userland to GCC 8. Do a regular
build to a different DESTDIR (or preferably: build.sh -U) at least
- once and install sets, or download compt.{tar.xz,tgz} from the
+ once and install sets, or download comp.{tar.xz,tgz} from the
daily builds and install that before doing the next in-place build.
20191001:
-
GCC 8.3 was imported. Builds of src/tools/gcc may fail if
old builds with GCC 7 output now uses GCC 8. Clean this
directory, and also clean src/external/gpl3/gcc.
20190903:
-
- File with names that coincide with existing files' names on
+ Files with names that coincide with existing files' names on
case-insensitive file systems were inadvertently committed, for
radeon GPU firmware. We cannot mark these as obsolete for
postinstall to fix, so if you updated src since 2019-08-26, and
CVS commit: src
Module Name:src Committed By: christos Date: Mon Nov 18 15:42:26 UTC 2019 Modified Files: src: UPDATING Log Message: catch-up with more ports switched to gcc-8 fix typos, consistent whitespace To generate a diff of this commit: cvs rdiff -u -r1.305 -r1.306 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Nov 18 15:38:07 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch arm to gcc-8
To generate a diff of this commit:
cvs rdiff -u -r1.1164 -r1.1165 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.1164 src/share/mk/bsd.own.mk:1.1165
--- src/share/mk/bsd.own.mk:1.1164 Sat Nov 16 21:59:25 2019
+++ src/share/mk/bsd.own.mk Mon Nov 18 10:38:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1164 2019/11/17 02:59:25 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1165 2019/11/18 15:38:07 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -69,7 +69,8 @@ TOOLCHAIN_MISSING?= no
${MACHINE} == "powerpc64" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
-${MACHINE_CPU} == "aarch64"
+${MACHINE_CPU} == "aarch64" || \
+${MACHINE_CPU} == "arm"
HAVE_GCC?= 8
.else
HAVE_GCC?= 7
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Mon Nov 18 15:38:07 UTC 2019 Modified Files: src/share/mk: bsd.own.mk Log Message: switch arm to gcc-8 To generate a diff of this commit: cvs rdiff -u -r1.1164 -r1.1165 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.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Nov 18 15:09:59 UTC 2019 Modified Files: src/sys/dev/mii: ihphy.c Log Message: Remove extra 10ms delay in ihphy_reset(). The delay are in if_wm.c side. It's required for hardware full reset and it't not requred on soft reset. When ihphy.c was added in 9 years ago, some workaround code were not in if_wm.c yet and the initialization code was not good. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/mii/ihphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/fstyp
Module Name:src
Committed By: tkusumi
Date: Mon Nov 18 14:53:34 UTC 2019
Modified Files:
src/usr.sbin/fstyp: Makefile fstyp.8 fstyp.c fstyp.h
Added Files:
src/usr.sbin/fstyp: exfat.c
Log Message:
fstyp: Add exFAT support
Taken-from: FreeBSD and DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/fstyp/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.sbin/fstyp/exfat.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/fstyp/fstyp.8 \
src/usr.sbin/fstyp/fstyp.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/fstyp/fstyp.h
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/fstyp/Makefile
diff -u src/usr.sbin/fstyp/Makefile:1.5 src/usr.sbin/fstyp/Makefile:1.6
--- src/usr.sbin/fstyp/Makefile:1.5 Mon Jun 24 08:27:21 2019
+++ src/usr.sbin/fstyp/Makefile Mon Nov 18 14:53:34 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/06/24 08:27:21 hannken Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/18 14:53:34 tkusumi Exp $
.include
PROG= fstyp
-SRCS= cd9660.c ext2fs.c fstyp.c msdosfs.c ntfs.c ufs.c
+SRCS= cd9660.c exfat.c ext2fs.c fstyp.c msdosfs.c ntfs.c ufs.c
.if (${MKZFS} != "no")
SRCS+= zfs.c
Index: src/usr.sbin/fstyp/fstyp.8
diff -u src/usr.sbin/fstyp/fstyp.8:1.2 src/usr.sbin/fstyp/fstyp.8:1.3
--- src/usr.sbin/fstyp/fstyp.8:1.2 Tue Jan 9 09:41:29 2018
+++ src/usr.sbin/fstyp/fstyp.8 Mon Nov 18 14:53:34 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: fstyp.8,v 1.2 2018/01/09 09:41:29 wiz Exp $
+.\" $NetBSD: fstyp.8,v 1.3 2019/11/18 14:53:34 tkusumi Exp $
.\"
.\" Copyright (c) 2017 The NetBSD Foundation, Inc.
.\" Copyright (c) 2016 The DragonFly Project
@@ -34,7 +34,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 25, 2017
+.Dd November 19, 2019
.Dt FSTYP 8
.Os
.Sh NAME
@@ -48,7 +48,7 @@
The
.Nm
utility is used to determine the file system type on a given device.
-It can recognize ISO-9660, Ext2, FAT, NTFS, and UFS file systems.
+It can recognize ISO-9660, exFAT, Ext2, FAT, NTFS, and UFS file systems.
When the
.Fl u
flag is specified,
@@ -64,6 +64,8 @@ as, respectively:
.It
cd9660
.It
+exfat
+.It
ext2fs
.It
msdosfs
Index: src/usr.sbin/fstyp/fstyp.c
diff -u src/usr.sbin/fstyp/fstyp.c:1.2 src/usr.sbin/fstyp/fstyp.c:1.3
--- src/usr.sbin/fstyp/fstyp.c:1.2 Tue Jan 9 10:47:57 2018
+++ src/usr.sbin/fstyp/fstyp.c Mon Nov 18 14:53:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fstyp.c,v 1.2 2018/01/09 10:47:57 martin Exp $ */
+/* $NetBSD: fstyp.c,v 1.3 2019/11/18 14:53:34 tkusumi Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*
*/
#include
-__RCSID("$NetBSD: fstyp.c,v 1.2 2018/01/09 10:47:57 martin Exp $");
+__RCSID("$NetBSD: fstyp.c,v 1.3 2019/11/18 14:53:34 tkusumi Exp $");
#include
#include
@@ -64,6 +64,7 @@ static struct {
bool unmountable;
} fstypes[] = {
{ "cd9660", _cd9660, false },
+ { "exfat", _exfat, false },
{ "ext2fs", _ext2fs, false },
{ "msdosfs", _msdosfs, false },
{ "ntfs", _ntfs, false },
Index: src/usr.sbin/fstyp/fstyp.h
diff -u src/usr.sbin/fstyp/fstyp.h:1.1 src/usr.sbin/fstyp/fstyp.h:1.2
--- src/usr.sbin/fstyp/fstyp.h:1.1 Tue Jan 9 03:31:15 2018
+++ src/usr.sbin/fstyp/fstyp.h Mon Nov 18 14:53:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fstyp.h,v 1.1 2018/01/09 03:31:15 christos Exp $ */
+/* $NetBSD: fstyp.h,v 1.2 2019/11/18 14:53:34 tkusumi Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -44,6 +44,7 @@ char *checked_strdup(const char *);
void rtrim(char *, size_t);
int fstyp_cd9660(FILE *, char *, size_t);
+int fstyp_exfat(FILE *fp, char *label, size_t size);
int fstyp_ext2fs(FILE *, char *, size_t);
int fstyp_msdosfs(FILE *, char *, size_t);
int fstyp_ntfs(FILE *, char *, size_t);
Added files:
Index: src/usr.sbin/fstyp/exfat.c
diff -u /dev/null src/usr.sbin/fstyp/exfat.c:1.1
--- /dev/null Mon Nov 18 14:53:34 2019
+++ src/usr.sbin/fstyp/exfat.c Mon Nov 18 14:53:34 2019
@@ -0,0 +1,78 @@
+/* $NetBSD: exfat.c,v 1.1 2019/11/18 14:53:34 tkusumi Exp $ */
+
+/*
+ * Copyright (c) 2017 Conrad Meyer
+ * 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 AUTHOR 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 AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
CVS commit: src/usr.sbin/fstyp
Module Name:src Committed By: tkusumi Date: Mon Nov 18 14:53:34 UTC 2019 Modified Files: src/usr.sbin/fstyp: Makefile fstyp.8 fstyp.c fstyp.h Added Files: src/usr.sbin/fstyp: exfat.c Log Message: fstyp: Add exFAT support Taken-from: FreeBSD and DragonFlyBSD To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/fstyp/Makefile cvs rdiff -u -r0 -r1.1 src/usr.sbin/fstyp/exfat.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/fstyp/fstyp.8 \ src/usr.sbin/fstyp/fstyp.c cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/fstyp/fstyp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src
Committed By: rin
Date: Mon Nov 18 12:06:26 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32.h
src/sys/compat/sys: siginfo.h
Log Message:
8-byte objects on i386 or arm-oabi are aligned in 4-byte boundary.
Therefore, we must use __attribute__((__aligned__(4))) for them.
netbsd32_{,u}int64 are provided for this purpose. However, we
cannot use it in due to circular dependency
b/w .
In order to distangle it, we choose here to have a duplicate type,
netbsd32_siginfo_uint64, in . The equivalence
with netbsd32_uint64 is asserted in .
Now, gdb for i386 works again on amd64 kernel.
Based on patch provided by kamil. Thanks!
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/sys/siginfo.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src
Committed By: rin
Date: Mon Nov 18 12:06:26 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32.h
src/sys/compat/sys: siginfo.h
Log Message:
8-byte objects on i386 or arm-oabi are aligned in 4-byte boundary.
Therefore, we must use __attribute__((__aligned__(4))) for them.
netbsd32_{,u}int64 are provided for this purpose. However, we
cannot use it in due to circular dependency
b/w .
In order to distangle it, we choose here to have a duplicate type,
netbsd32_siginfo_uint64, in . The equivalence
with netbsd32_uint64 is asserted in .
Now, gdb for i386 works again on amd64 kernel.
Based on patch provided by kamil. Thanks!
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/sys/siginfo.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/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.130 src/sys/compat/netbsd32/netbsd32.h:1.131
--- src/sys/compat/netbsd32/netbsd32.h:1.130 Mon Nov 18 04:17:08 2019
+++ src/sys/compat/netbsd32/netbsd32.h Mon Nov 18 12:06:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.130 2019/11/18 04:17:08 rin Exp $ */
+/* $NetBSD: netbsd32.h,v 1.131 2019/11/18 12:06:26 rin Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -162,6 +162,10 @@ typedef int64_t netbsd32_int64 NETBSD32_
typedef uint64_t netbsd32_uint64 NETBSD32_INT64_ALIGN;
#undef NETBSD32_INT64_ALIGN
+/* Type used in siginfo, avoids circular dependencies between headers. */
+CTASSERT(sizeof(netbsd32_uint64) == sizeof(netbsd32_siginfo_uint64));
+CTASSERT(__alignof__(netbsd32_uint64) == __alignof__(netbsd32_siginfo_uint64));
+
/*
* all pointers are netbsd32_pointer_t (defined in )
*/
Index: src/sys/compat/sys/siginfo.h
diff -u src/sys/compat/sys/siginfo.h:1.8 src/sys/compat/sys/siginfo.h:1.9
--- src/sys/compat/sys/siginfo.h:1.8 Mon Sep 30 21:13:33 2019
+++ src/sys/compat/sys/siginfo.h Mon Nov 18 12:06:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: siginfo.h,v 1.8 2019/09/30 21:13:33 kamil Exp $ */
+/* $NetBSD: siginfo.h,v 1.9 2019/11/18 12:06:26 rin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,6 +34,15 @@
#ifdef _KERNEL
+/* Avoids circular dependency with machine/netbsd32_machdep.h */
+#if defined(__x86_64__) || (defined(__arm__) && defined(__ARM_EABI__))
+#define NETBSD32_SIGINFO_UINT64_ALIGN __attribute__((__aligned__(4)))
+#else
+#define NETBSD32_SIGINFO_UINT64_ALIGN __attribute__((__aligned__(8)))
+#endif
+typedef uint64_t netbsd32_siginfo_uint64 NETBSD32_SIGINFO_UINT64_ALIGN;
+#undef NETBSD32_SIGINFO_UINT64_ALIGN
+
typedef union sigval32 {
int sival_int;
uint32_t sival_ptr;
@@ -73,7 +82,7 @@ struct __ksiginfo32 {
int _sysnum;
int _retval[2];
int _error;
- uint64_t _args[8]; /* SYS_MAXSYSARGS */
+ netbsd32_siginfo_uint64 _args[8]; /* SYS_MAXSYSARGS */
} _syscall;
struct {
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Mon Nov 18 11:01:41 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_signal.c Log Message: TRAP_EXEC does not have extra fields to be filled in at the moment. Explicitly ignore fields for now. Pointed out by kamil. Thanks! XXX pullup to netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/compat/netbsd32/netbsd32_signal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Mon Nov 18 11:01:41 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_signal.c
Log Message:
TRAP_EXEC does not have extra fields to be filled in at the moment.
Explicitly ignore fields for now.
Pointed out by kamil. Thanks!
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/compat/netbsd32/netbsd32_signal.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/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.49 src/sys/compat/netbsd32/netbsd32_signal.c:1.50
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.49 Mon Nov 18 10:25:48 2019
+++ src/sys/compat/netbsd32/netbsd32_signal.c Mon Nov 18 11:01:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_signal.c,v 1.49 2019/11/18 10:25:48 rin Exp $ */
+/* $NetBSD: netbsd32_signal.c,v 1.50 2019/11/18 11:01:41 rin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.49 2019/11/18 10:25:48 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.50 2019/11/18 11:01:41 rin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -213,6 +213,7 @@ fill_fault:
case SIGTRAP:
switch (si32->_code) {
case TRAP_EXEC:
+ break;
case TRAP_CHLD:
case TRAP_LWP:
si->_reason._ptrace_state._pe_report_event =
@@ -302,6 +303,7 @@ fill_fault:
case SIGTRAP:
switch (si->_code) {
case TRAP_EXEC:
+ break;
case TRAP_CHLD:
case TRAP_LWP:
si32->_reason._ptrace_state._pe_report_event =
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Mon Nov 18 10:25:48 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_signal.c
Log Message:
When converting siginfo, examine si_code at the beginning,
as explained in siginfo(2).
- If it is SI_NOINFO, there's no additional information.
- If it is non-positive, i.e., codes described in siginfo(2),
we need to fill in _rt.
XXX
Description for SA_ASYNCIO in siginfo(2) seems outdated;
neither si_fd nor si_band are filled in with that code.
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/compat/netbsd32/netbsd32_signal.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/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.48 src/sys/compat/netbsd32/netbsd32_signal.c:1.49
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.48 Mon Nov 18 10:14:52 2019
+++ src/sys/compat/netbsd32/netbsd32_signal.c Mon Nov 18 10:25:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_signal.c,v 1.48 2019/11/18 10:14:52 rin Exp $ */
+/* $NetBSD: netbsd32_signal.c,v 1.49 2019/11/18 10:25:48 rin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.48 2019/11/18 10:14:52 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.49 2019/11/18 10:25:48 rin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -195,6 +195,11 @@ netbsd32_ksi32_to_ksi(struct _ksiginfo *
si->_code = si32->_code;
si->_errno = si32->_errno;
+ if (si32->_code == SI_NOINFO)
+ return;
+ else if (si32->_code <= 0) /* codes described in siginfo(2) */
+ goto fill_rt;
+
switch (si32->_signo) {
case SIGILL:
case SIGFPE:
@@ -240,6 +245,7 @@ CTASSERT(sizeof(si->_reason._ptrace_stat
case SIGVTALRM:
case SIGPROF:
default: /* see sigqueue() and kill1() */
+fill_rt:
si->_reason._rt._pid = si32->_reason._rt._pid;
si->_reason._rt._uid = si32->_reason._rt._uid;
si->_reason._rt._value.sival_int =
@@ -278,6 +284,11 @@ netbsd32_ksi_to_ksi32(struct __ksiginfo3
si32->_code = si->_code;
si32->_errno = si->_errno;
+ if (si->_code == SI_NOINFO)
+ return;
+ else if (si->_code <= 0) /* codes described in siginfo(2) */
+ goto fill_rt;
+
switch (si->_signo) {
case SIGILL:
case SIGFPE:
@@ -323,6 +334,7 @@ CTASSERT(sizeof(si32->_reason._ptrace_st
case SIGVTALRM:
case SIGPROF:
default: /* see sigqueue() and kill1() */
+fill_rt:
si32->_reason._rt._pid = si->_reason._rt._pid;
si32->_reason._rt._uid = si->_reason._rt._uid;
si32->_reason._rt._value.sival_int =
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Mon Nov 18 10:25:48 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_signal.c Log Message: When converting siginfo, examine si_code at the beginning, as explained in siginfo(2). - If it is SI_NOINFO, there's no additional information. - If it is non-positive, i.e., codes described in siginfo(2), we need to fill in _rt. XXX Description for SA_ASYNCIO in siginfo(2) seems outdated; neither si_fd nor si_band are filled in with that code. XXX pullup to netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/compat/netbsd32/netbsd32_signal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Mon Nov 18 10:14:52 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_signal.c Log Message: Provide _ptrace_state for SIGTRAP with TRAP_EXEC, TRAP_CHLD, or TRAP_LWP. Pointed out by kamil. Thanks! XXX pullup to netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/compat/netbsd32/netbsd32_signal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Mon Nov 18 10:14:52 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_signal.c
Log Message:
Provide _ptrace_state for SIGTRAP with TRAP_EXEC, TRAP_CHLD, or TRAP_LWP.
Pointed out by kamil. Thanks!
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/compat/netbsd32/netbsd32_signal.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/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.47 src/sys/compat/netbsd32/netbsd32_signal.c:1.48
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.47 Mon Nov 18 04:58:42 2019
+++ src/sys/compat/netbsd32/netbsd32_signal.c Mon Nov 18 10:14:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_signal.c,v 1.47 2019/11/18 04:58:42 rin Exp $ */
+/* $NetBSD: netbsd32_signal.c,v 1.48 2019/11/18 10:14:52 rin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.47 2019/11/18 04:58:42 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.48 2019/11/18 10:14:52 rin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -206,17 +206,35 @@ fill_fault:
si->_reason._fault._trap = si32->_reason._fault._trap;
break;
case SIGTRAP:
- if (si32->_code != TRAP_SCE && si32->_code != TRAP_SCX)
+ switch (si32->_code) {
+ case TRAP_EXEC:
+ case TRAP_CHLD:
+ case TRAP_LWP:
+ si->_reason._ptrace_state._pe_report_event =
+ si32->_reason._ptrace_state._pe_report_event;
+CTASSERT(sizeof(si->_reason._ptrace_state._option._pe_other_pid) ==
+sizeof(si->_reason._ptrace_state._option._pe_lwp));
+ si->_reason._ptrace_state._option._pe_other_pid =
+ si32->_reason._ptrace_state._option._pe_other_pid;
+ break;
+ case TRAP_SCE:
+ case TRAP_SCX:
+ si->_reason._syscall._sysnum =
+ si32->_reason._syscall._sysnum;
+ si->_reason._syscall._retval[0] =
+ si32->_reason._syscall._retval[0];
+ si->_reason._syscall._retval[1] =
+ si32->_reason._syscall._retval[1];
+ si->_reason._syscall._error =
+ si32->_reason._syscall._error;
+ for (i = 0;
+ i < __arraycount(si->_reason._syscall._args); i++)
+si->_reason._syscall._args[i] =
+si32->_reason._syscall._args[i];
+ break;
+ default:
goto fill_fault;
- si->_reason._syscall._sysnum = si32->_reason._syscall._sysnum;
- si->_reason._syscall._retval[0] =
- si32->_reason._syscall._retval[0];
- si->_reason._syscall._retval[1] =
- si32->_reason._syscall._retval[1];
- si->_reason._syscall._error = si32->_reason._syscall._error;
- for (i = 0; i < __arraycount(si->_reason._syscall._args); i++)
- si->_reason._syscall._args[i] =
- si32->_reason._syscall._args[i];
+ }
break;
case SIGALRM:
case SIGVTALRM:
@@ -271,17 +289,35 @@ fill_fault:
si32->_reason._fault._trap = si->_reason._fault._trap;
break;
case SIGTRAP:
- if (si->_code != TRAP_SCE && si->_code != TRAP_SCX)
+ switch (si->_code) {
+ case TRAP_EXEC:
+ case TRAP_CHLD:
+ case TRAP_LWP:
+ si32->_reason._ptrace_state._pe_report_event =
+ si->_reason._ptrace_state._pe_report_event;
+CTASSERT(sizeof(si32->_reason._ptrace_state._option._pe_other_pid) ==
+sizeof(si32->_reason._ptrace_state._option._pe_lwp));
+ si32->_reason._ptrace_state._option._pe_other_pid =
+ si->_reason._ptrace_state._option._pe_other_pid;
+ break;
+ case TRAP_SCE:
+ case TRAP_SCX:
+ si32->_reason._syscall._sysnum =
+ si->_reason._syscall._sysnum;
+ si32->_reason._syscall._retval[0] =
+ si->_reason._syscall._retval[0];
+ si32->_reason._syscall._retval[1] =
+ si->_reason._syscall._retval[1];
+ si32->_reason._syscall._error =
+ si->_reason._syscall._error;
+ for (i = 0;
+ i < __arraycount(si->_reason._syscall._args); i++)
+si32->_reason._syscall._args[i] =
+si->_reason._syscall._args[i];
+ break;
+ default:
goto fill_fault;
- si32->_reason._syscall._sysnum = si->_reason._syscall._sysnum;
- si32->_reason._syscall._retval[0] =
- si->_reason._syscall._retval[0];
- si32->_reason._syscall._retval[1] =
- si->_reason._syscall._retval[1];
- si32->_reason._syscall._error = si->_reason._syscall._error;
- for (i = 0; i < __arraycount(si32->_reason._syscall._args); i++)
- si32->_reason._syscall._args[i] =
- si->_reason._syscall._args[i];
+ }
break;
case SIGALRM:
case SIGVTALRM:
CVS commit: src/usr.sbin/sysinst/arch/i386
Module Name:src Committed By: martin Date: Mon Nov 18 08:16:32 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/i386: md.c Log Message: Fix previous: the install medium may not have /usr/mdec/prekern; it was meant to copy the one from the just installed system. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/sysinst/arch/i386/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/i386
Module Name:src
Committed By: martin
Date: Mon Nov 18 08:16:32 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/i386: md.c
Log Message:
Fix previous: the install medium may not have /usr/mdec/prekern; it was
meant to copy the one from the just installed system.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/sysinst/arch/i386/md.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.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.24 src/usr.sbin/sysinst/arch/i386/md.c:1.25
--- src/usr.sbin/sysinst/arch/i386/md.c:1.24 Sat Nov 16 21:25:14 2019
+++ src/usr.sbin/sysinst/arch/i386/md.c Mon Nov 18 08:16:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.24 2019/11/16 21:25:14 martin Exp $ */
+/* $NetBSD: md.c,v 1.25 2019/11/18 08:16:32 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -379,7 +379,7 @@ md_post_newfs(struct install_partition_d
#if defined(__amd64__)
int ret;
- ret = cp_to_target("/usr/mdec/prekern", "/prekern");
+ ret = cp_within_target("/usr/mdec/prekern", "/prekern", 0);
if (ret)
return ret;
#endif
