Patch review
PATCH 1/20 insane: consolidate skipping of temporary do_package files
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
During the course of do_package_rpm and friends the tools create a top-level CONTROL or DEBIAN directory in the package directory. do_package_qa needs to be aware of these files and ignore them, this was previously done in just one check but instead should be done once when building the file list so all the checks don't see the temporary files.
[ YOCTO #13804 ]
--- meta/classes/insane.bbclass | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
meta/classes/insane.bbclass +8 -5
@@ -458,10 +458,6 @@ def package_qa_check_buildpaths(path, name, d, elf, messages): if os.path.islink(path): return - # Ignore ipk and deb's CONTROL dir - if path.find(name + "/CONTROL/") != -1 or path.find(name + "/DEBIAN/") != -1: - return - tmpdir = bytes(d.getVar('TMPDIR'), encoding="utf-8") with open(path, 'rb') as f: file_content = f.read()
@@ -1023,7 +1019,14 @@ python do_package_qa () { pkgfiles = {} for pkg in packages: pkgfiles[pkg] = [] - for walkroot, dirs, files in os.walk(os.path.join(pkgdest, pkg)): + pkgdir = os.path.join(pkgdest, pkg) + for walkroot, dirs, files in os.walk(pkgdir): + # Don't walk into top-level CONTROL or DEBIAN directories as these + # are temporary directories created by do_package. + if walkroot == pkgdir: + for control in ("CONTROL", "DEBIAN"): + if control in dirs: + dirs.remove(control) for file in files: pkgfiles[pkg].append(os.path.join(walkroot, file))
Signature · 1 line
2.17.1
cover Patch review
Please review this next set of patches for dunfell and have comments back by end of day Tuesday.
Passed a-full build on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/1179
The following changes since commit c2ad3af9da9bb3a98c1d5d1b3d21eb8db643c189:
coreutils: don't split stdbuf to own package with single-binary (2020-07-13 17:14:28 -1000)
are available in the Git repository at:
git://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut
Alexander Kanavin (1):
babeltrace: correct the git SRC_URI
Charlie Davies (1):
u-boot: fix condition to allow use of *.cfg
Christian Eggers (1):
avahi: Fix typo in recipe
Douglas (2):
nativesdk: clear MACHINE_FEATURES
nativesdk: Set the CXXFLAGS to the BUILDSDK_CXXFLAGS
Jens Rehsack (2):
subversion: extend for nativesdk
serf: extend for nativesdk
Khem Raj (2):
go: Disbale CGO for riscv64
go-dep: Fix build on riscv64
Konrad Weihmann (1):
ptest: append to FILES
Lee Chee Yang (1):
bison: fix Argument list too long error
Richard Purdie (4):
oeqa/selftest/sstatetests: Avoid polluting DL_DIR
qemurunner: Ensure pid location is deterministic
qemurunner: Add extra debug info when qemu fails to start oeqa/utils/qemurunner: Fix missing pid file tracebacks
Ross Burton (1):
insane: consolidate skipping of temporary do_package files
Tim Orling (2):
lib/oe/recipeutils.py: add AUTHOR; BBCLASSEXTEND scripts/lib/recipetool/create.py: fix regex strings
Yongxin Liu (2):
linux-firmware: fix the wrong file path for ibt-misc
linux-firmware: move ibt-misc to the end of ibt packages
meta/classes/insane.bbclass | 13 +- meta/classes/nativesdk.bbclass | 3 +- meta/classes/ptest.bbclass | 2 +- meta/lib/oe/recipeutils.py | 2 +- meta/lib/oeqa/selftest/cases/sstatetests.py | 5 +- meta/lib/oeqa/utils/qemurunner.py | 15 +- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- meta/recipes-connectivity/avahi/avahi_0.7.bb | 2 +- meta/recipes-devtools/bison/bison_3.5.3.bb | 2 +- .../0001-Update-sys-module-to-latest.patch | 145574 +++++++++++++++ meta/recipes-devtools/go/go-dep_0.5.4.bb | 1 + meta/recipes-devtools/go/go-runtime_1.14.bb | 1 + meta/recipes-devtools/go/go_1.14.bb | 2 +- .../subversion/subversion_1.13.0.bb | 2 +- .../linux-firmware/linux-firmware_20200619.bb | 5 +- .../recipes-kernel/lttng/babeltrace2_2.0.2.bb | 2 +- meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 2 +- meta/recipes-support/serf/serf_1.3.9.bb | 2 +- scripts/lib/recipetool/create.py | 10 +- 19 files changed, 145621 insertions(+), 26 deletions(-) create mode 100644 meta/recipes-devtools/go/go-dep/0001-Update-sys-module-to-latest.patch
Signature · 1 line
2.17.1
PATCH 2/20 linux-firmware: fix the wrong file path for ibt-misc
From: Yongxin Liu <[email protected]>
--- meta/recipes-kernel/linux-firmware/linux-firmware_20200619.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20200619.bb +1 -1
@@ -813,7 +813,7 @@ FILES_${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bs FILES_${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" FILES_${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" FILES_${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" -FILES_${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/ibt-*" +FILES_${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*" RDEPENDS_${PN}-ibt-hw-37-7 = "${PN}-ibt-license" RDEPENDS_${PN}-ibt-hw-37.8 = "${PN}-ibt-license"
Signature · 1 line
2.17.1
PATCH 3/20 linux-firmware: move ibt-misc to the end of ibt packages
In reply to Steve SakomanFrom: Yongxin Liu <[email protected]>
After commit 3ca1d3fa1d ("linux-firmware: fix the wrong file path for ibt-misc"), if we don't change the location of ibt-misc in PACKAGES, ibt-misc will include all ibt files and make other individual ibt package empty.
--- meta/recipes-kernel/linux-firmware/linux-firmware_20200619.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20200619.bb +2 -1
@@ -278,9 +278,10 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \ ${PN}-iwlwifi-9000 \ ${PN}-iwlwifi-misc \ - ${PN}-ibt-license ${PN}-ibt ${PN}-ibt-misc \ + ${PN}-ibt-license ${PN}-ibt \ ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ ${PN}-ibt-17 \ + ${PN}-ibt-misc \ ${PN}-i915-license ${PN}-i915 \ ${PN}-ice-license ${PN}-ice \ ${PN}-adsp-sst-license ${PN}-adsp-sst \
Signature · 1 line
2.17.1
PATCH 4/20 bison: fix Argument list too long error
In reply to Steve SakomanFrom: Lee Chee Yang <[email protected]>
fix Argument list too long error when len(TMPDIR) = 410
--- meta/recipes-devtools/bison/bison_3.5.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/bison/bison_3.5.3.bb +1 -1
@@ -28,7 +28,7 @@ EXTRA_OEMAKE_append = " -l" inherit autotools gettext texinfo # The automatic m4 path detection gets confused, so force the right value -acpaths = "-I ${S}/m4" +acpaths = "-I ./m4" do_compile_prepend() { for i in mfcalc calc++ rpcalc; do mkdir -p ${B}/examples/$i; done
Signature · 1 line
2.17.1
PATCH 5/20 avahi: Fix typo in recipe
In reply to Steve SakomanFrom: Christian Eggers <[email protected]>
According to the PACKAGES variable, LICENSE_avahi-client is misspelled. Additionally, the libavahi-client package actually only includes LGPLv2.1+ software (as opposed to the global LICENSE variable).
--- meta/recipes-connectivity/avahi/avahi_0.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/avahi/avahi_0.7.bb +1 -1
@@ -14,7 +14,7 @@ LICENSE_libavahi-gobject = "LGPLv2.1+" LICENSE_avahi-daemon = "LGPLv2.1+" LICENSE_libavahi-common = "LGPLv2.1+" LICENSE_libavahi-core = "LGPLv2.1+" -LICENSE_avahi-client = "LGPLv2.1+" +LICENSE_libavahi-client = "LGPLv2.1+" LICENSE_avahi-dnsconfd = "LGPLv2.1+" LICENSE_libavahi-glib = "LGPLv2.1+" LICENSE_avahi-autoipd = "LGPLv2.1+"
Signature · 1 line
2.17.1
PATCH 6/20 oeqa/selftest/sstatetests: Avoid polluting DL_DIR
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
Every selftest run is currently polluting the autobuilder DL_DIR. Avoid this by using a temporary directory for the test which is cleaned up.
--- meta/lib/oeqa/selftest/cases/sstatetests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/sstatetests.py +4 -1
@@ -19,10 +19,13 @@ class SStateTests(SStateBase): # Test that a git repository which changes is correctly handled by SRCREV = ${AUTOREV} # when PV does not contain SRCPV - tempdir = tempfile.mkdtemp(prefix='oeqa') + tempdir = tempfile.mkdtemp(prefix='sstate_autorev') + tempdldir = tempfile.mkdtemp(prefix='sstate_autorev_dldir') self.track_for_cleanup(tempdir) + self.track_for_cleanup(tempdldir) create_temp_layer(tempdir, 'selftestrecipetool') self.add_command_to_tearDown('bitbake-layers remove-layer %s' % tempdir) + self.append_config("DL_DIR = \"%s\"" % tempdldir) runCmd('bitbake-layers add-layer %s' % tempdir) # Use dbus-wait as a local git repo we can add a commit between two builds in
Signature · 1 line
2.17.1
PATCH 7/20 subversion: extend for nativesdk
In reply to Steve SakomanFrom: Jens Rehsack <[email protected]>
For SDK environments where people still use subversion, let it easily being added to buildtools-tarball to invite more developers relying on Yocto based SDKs without much requirement to setup anything on the development workplace.
--- meta/recipes-devtools/subversion/subversion_1.13.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/subversion/subversion_1.13.0.bb +1 -1
@@ -60,4 +60,4 @@ PARALLEL_MAKEINST = "" RDEPENDS_${PN} = "serf" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
PATCH 8/20 serf: extend for nativesdk
In reply to Steve SakomanFrom: Jens Rehsack <[email protected]>
As an unconditionally dependency of subversion, extend serf recipe for building a nativesdk variant being usable by nativesdk-subversion.
--- meta/recipes-support/serf/serf_1.3.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/serf/serf_1.3.9.bb +1 -1
@@ -30,4 +30,4 @@ EXTRA_OESCONS = " \ OPENSSL="${STAGING_EXECPREFIXDIR}" \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
PATCH 9/20 u-boot: fix condition to allow use of *.cfg
In reply to Steve SakomanFrom: Charlie Davies <[email protected]>
U-boot recipe supports .cfg files in SRC_URI, but bug in conditional statement meant that the code was unreachable and the .cfg files were never applied.
--- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/u-boot/u-boot.inc +1 -1
@@ -89,7 +89,7 @@ do_configure () { j=$(expr $j + 1); if [ $j -eq $i ]; then oe_runmake -C ${S} O=${B}/${config} ${config} - if [ test -n "${@' '.join(find_cfgs(d))}" ]; then + if [ -n "${@' '.join(find_cfgs(d))}" ]; then merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} oe_runmake -C ${S} O=${B}/${config} oldconfig fi
Signature · 1 line
2.17.1
PATCH 10/20 go: Disbale CGO for riscv64
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
cgo is still not available in go for riscv64, we will re-evaluate it once we upgrade to 1.15
Fixes
| /usr/src/debug/go-runtime/1.14.4-r0/go/src/runtime/cgo/gcc_util.c:23: undefined reference to `_cgo_sys_thread_start'
[YOCTO #13966]
--- meta/recipes-devtools/go/go-runtime_1.14.bb | 1 + meta/recipes-devtools/go/go_1.14.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/go/go-runtime_1.14.bb +1 -0
@@ -1,2 +1,3 @@ +export CGO_ENABLED_riscv64 = "" require go-${PV}.inc require go-runtime.inc
meta/recipes-devtools/go/go_1.14.bb +1 -1
@@ -2,7 +2,7 @@ require go-${PV}.inc require go-target.inc export GOBUILDMODE="" - +export CGO_ENABLED_riscv64 = "" # Add pie to GOBUILDMODE to satisfy "textrel" QA checking, but mips/riscv # doesn't support -buildmode=pie, so skip the QA checking for mips/riscv and its # variants.
Signature · 1 line
2.17.1
PATCH 11/20 go-dep: Fix build on riscv64
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
Bring in only patch from meta-riscv here
--- .../0001-Update-sys-module-to-latest.patch | 145574 +++++++++++++++ meta/recipes-devtools/go/go-dep_0.5.4.bb | 1 + 2 files changed, 145575 insertions(+) create mode 100644 meta/recipes-devtools/go/go-dep/0001-Update-sys-module-to-latest.patch
meta/recipes-devtools/go/go-dep/0001-Update-sys-module-to-latest.patch new file +145574 -0
@@ -0,0 +1,145574 @@ +From f7904cb91a1b18e893ffbd25b450926d145d0e0a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 22 Apr 2020 18:44:48 -0700 +Subject: [PATCH] Update sys module to latest + +Gets us riscv support + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + Gopkg.lock | 4 +- + .../golang.org/x/sys/unix/affinity_linux.go | 86 + + vendor/golang.org/x/sys/unix/aliases.go | 14 + + vendor/golang.org/x/sys/unix/asm_aix_ppc64.s | 17 + + .../x/sys/unix/asm_dragonfly_amd64.s | 10 +- + ...sm_linux_mips64x.s => asm_freebsd_arm64.s} | 11 +- + vendor/golang.org/x/sys/unix/asm_linux_386.s | 36 +- + .../golang.org/x/sys/unix/asm_linux_amd64.s | 30 +- + vendor/golang.org/x/sys/unix/asm_linux_arm.s | 35 +- + .../golang.org/x/sys/unix/asm_linux_arm64.s | 30 +- + .../golang.org/x/sys/unix/asm_linux_mips64x.s | 36 +- + .../golang.org/x/sys/unix/asm_linux_mipsx.s | 33 +- + .../golang.org/x/sys/unix/asm_linux_ppc64x.s | 38 +- + .../golang.org/x/sys/unix/asm_linux_riscv64.s | 47 + + .../golang.org/x/sys/unix/asm_linux_s390x.s | 28 + + ...asm_linux_mips64x.s => asm_netbsd_arm64.s} | 17 +- + ...sm_linux_mips64x.s => asm_openbsd_arm64.s} | 9 +- + .../golang.org/x/sys/unix/bluetooth_linux.go | 1 + + vendor/golang.org/x/sys/unix/cap_freebsd.go | 30 +- + vendor/golang.org/x/sys/unix/constants.go | 2 +- + vendor/golang.org/x/sys/unix/dev_aix_ppc.go | 27 + + vendor/golang.org/x/sys/unix/dev_aix_ppc64.go | 29 + + vendor/golang.org/x/sys/unix/dev_darwin.go | 24 + + vendor/golang.org/x/sys/unix/dev_dragonfly.go | 30 + + vendor/golang.org/x/sys/unix/dev_freebsd.go | 30 + + vendor/golang.org/x/sys/unix/dev_linux.go | 8 +- + vendor/golang.org/x/sys/unix/dev_netbsd.go | 29 + + vendor/golang.org/x/sys/unix/dev_openbsd.go | 29 + + vendor/golang.org/x/sys/unix/dirent.go | 2 +- + vendor/golang.org/x/sys/unix/endian_little.go | 2 +- + vendor/golang.org/x/sys/unix/env_unix.go | 8 +- + vendor/golang.org/x/sys/unix/env_unset.go | 14 - + .../x/sys/unix/errors_freebsd_386.go | 6 + + .../x/sys/unix/errors_freebsd_amd64.go | 6 + + .../x/sys/unix/errors_freebsd_arm64.go | 17 + + .../x/sys/unix/{flock.go => fcntl.go} | 18 +- + vendor/golang.org/x/sys/unix/fcntl_darwin.go | 18 + + ...ck_linux_32bit.go => fcntl_linux_32bit.go} | 0 + vendor/golang.org/x/sys/unix/fdset.go | 29 + + vendor/golang.org/x/sys/unix/file_unix.go | 27 - + vendor/golang.org/x/sys/unix/gccgo.go | 20 +- + vendor/golang.org/x/sys/unix/gccgo_c.c | 12 +- + .../x/sys/unix/gccgo_linux_amd64.go | 2 +- + .../x/sys/unix/gccgo_linux_sparc64.go | 20 - + vendor/golang.org/x/sys/unix/ioctl.go | 65 + + vendor/golang.org/x/sys/unix/mkasm_darwin.go | 78 + + vendor/golang.org/x/sys/unix/mkmerge.go | 521 +++ + vendor/golang.org/x/sys/unix/mkpost.go | 63 +- + vendor/golang.org/x/sys/unix/mksyscall.go | 402 +++ + .../x/sys/unix/mksyscall_aix_ppc.go | 415 +++ + .../x/sys/unix/mksyscall_aix_ppc64.go | 614 ++++ + .../x/sys/unix/mksyscall_solaris.go | 341 ++ + .../golang.org/x/sys/unix/mksysctl_openbsd.go | 355 +++ + vendor/golang.org/x/sys/unix/mksysnum.go | 190 ++ + .../golang.org/x/sys/unix/openbsd_pledge.go | 38 - + vendor/golang.org/x/sys/unix/pagesize_unix.go | 15 + + .../golang.org/x/sys/unix/pledge_openbsd.go | 163 + + vendor/golang.org/x/sys/unix/race.go | 2 +- + vendor/golang.org/x/sys/unix/race0.go | 4 +- + .../x/sys/unix/readdirent_getdents.go | 12 + + .../x/sys/unix/readdirent_getdirentries.go | 19 + + .../x/sys/unix/sockcmsg_dragonfly.go | 16 + + .../golang.org/x/sys/unix/sockcmsg_linux.go | 4 +- + vendor/golang.org/x/sys/unix/sockcmsg_unix.go | 28 +- + .../x/sys/unix/sockcmsg_unix_other.go | 38 + + vendor/golang.org/x/sys/unix/str.go | 2 +- + vendor/golang.org/x/sys/unix/syscall.go | 38 +- + vendor/golang.org/x/sys/unix/syscall_aix.go | 536 ++++ + .../golang.org/x/sys/unix/syscall_aix_ppc.go | 54 + + .../x/sys/unix/syscall_aix_ppc64.go | 85 + + vendor/golang.org/x/sys/unix/syscall_bsd.go | 112 +- + .../x/sys/unix/syscall_darwin.1_12.go | 29 + + .../x/sys/unix/syscall_darwin.1_13.go | 101 + + .../golang.org/x/sys/unix/syscall_darwin.go | 263 +- + .../x/sys/unix/syscall_darwin_386.1_11.go | 9 + + .../x/sys/unix/syscall_darwin_386.go | 45 +- + .../x/sys/unix/syscall_darwin_amd64.1_11.go | 9 + + .../x/sys/unix/syscall_darwin_amd64.go | 45 +- + .../x/sys/unix/syscall_darwin_arm.1_11.go | 11 + + .../x/sys/unix/syscall_darwin_arm.go | 51 +- + .../x/sys/unix/syscall_darwin_arm64.1_11.go | 11 + + .../x/sys/unix/syscall_darwin_arm64.go | 47 +- + .../x/sys/unix/syscall_darwin_libSystem.go | 33 + + .../x/sys/unix/syscall_dragonfly.go | 136 +- + .../x/sys/unix/syscall_dragonfly_amd64.go | 21 +- + .../golang.org/x/sys/unix/syscall_freebsd.go | 592 ++-- + .../x/sys/unix/syscall_freebsd_386.go | 31 +- + .../x/sys/unix/syscall_freebsd_amd64.go | 31 +- + .../x/sys/unix/syscall_freebsd_arm.go | 27 +- + ...nfly_amd64.go => syscall_freebsd_arm64.go} | 31 +- + .../golang.org/x/sys/unix/syscall_illumos.go | 57 + + vendor/golang.org/x/sys/unix/syscall_linux.go | 1030 +++++- + .../x/sys/unix/syscall_linux_386.go | 47 +- + .../x/sys/unix/syscall_linux_amd64.go | 80 +- + .../x/sys/unix/syscall_linux_arm.go | 64 +- + .../x/sys/unix/syscall_linux_arm64.go | 111 +- + .../golang.org/x/sys/unix/syscall_linux_gc.go | 14 + + .../x/sys/unix/syscall_linux_gc_386.go | 16 + + .../x/sys/unix/syscall_linux_gccgo_386.go | 30 + + .../x/sys/unix/syscall_linux_gccgo_arm.go | 20 + + .../x/sys/unix/syscall_linux_mips64x.go | 53 +- + .../x/sys/unix/syscall_linux_mipsx.go | 47 +- + .../x/sys/unix/syscall_linux_ppc64x.go | 59 +- + ...inux_arm64.go => syscall_linux_riscv64.go} | 118 +- + .../x/sys/unix/syscall_linux_s390x.go | 44 +- + .../x/sys/unix/syscall_linux_sparc64.go | 48 +- + .../golang.org/x/sys/unix/syscall_netbsd.go | 156 +- + .../x/sys/unix/syscall_netbsd_386.go | 21 +- + .../x/sys/unix/syscall_netbsd_amd64.go | 21 +- + .../x/sys/unix/syscall_netbsd_arm.go | 21 +- + ...etbsd_amd64.go => syscall_netbsd_arm64.go} | 25 +- + .../golang.org/x/sys/unix/syscall_no_getwd.go | 11 - + .../golang.org/x/sys/unix/syscall_openbsd.go | 199 +- + .../x/sys/unix/syscall_openbsd_386.go | 25 +- + .../x/sys/unix/syscall_openbsd_amd64.go | 25 +- + .../x/sys/unix/syscall_openbsd_arm.go | 27 +- + .../x/sys/unix/syscall_openbsd_arm64.go | 41 + + .../golang.org/x/sys/unix/syscall_solaris.go | 128 +- + .../x/sys/unix/syscall_solaris_amd64.go | 24 +- + vendor/golang.org/x/sys/unix/syscall_unix.go | 176 +- + .../golang.org/x/sys/unix/syscall_unix_gc.go | 2 +- + ...l_unix_gc.go => syscall_unix_gc_ppc64x.go} | 21 +- + vendor/golang.org/x/sys/unix/timestruct.go | 82 + + .../unix/{types_netbsd.go => types_aix.go} | 196 +- + vendor/golang.org/x/sys/unix/types_darwin.go | 41 +- + .../golang.org/x/sys/unix/types_dragonfly.go | 66 +- + vendor/golang.org/x/sys/unix/types_freebsd.go | 178 +- + vendor/golang.org/x/sys/unix/types_netbsd.go | 73 +- + vendor/golang.org/x/sys/unix/types_openbsd.go | 78 +- + vendor/golang.org/x/sys/unix/types_solaris.go | 54 +- + .../golang.org/x/sys/unix/unveil_openbsd.go | 42 + + vendor/golang.org/x/sys/unix/xattr_bsd.go | 240 ++ + .../golang.org/x/sys/unix/zerrors_aix_ppc.go | 1384 ++++++++ + .../x/sys/unix/zerrors_aix_ppc64.go | 1385 ++++++++ + .../x/sys/unix/zerrors_darwin_386.go | 391 ++- + .../x/sys/unix/zerrors_darwin_amd64.go | 391 ++- + .../x/sys/unix/zerrors_darwin_arm.go | 391 ++- + .../x/sys/unix/zerrors_darwin_arm64.go | 391 ++- + .../x/sys/unix/zerrors_dragonfly_amd64.go | 355 ++- + .../x/sys/unix/zerrors_freebsd_386.go | 508 ++- + .../x/sys/unix/zerrors_freebsd_amd64.go | 506 ++- + .../x/sys/unix/zerrors_freebsd_arm.go | 368 ++- + ...ebsd_amd64.go => zerrors_freebsd_arm64.go} | 509 ++- + vendor/golang.org/x/sys/unix/zerrors_linux.go | 2469 +++++++++++++++ + .../x/sys/unix/zerrors_linux_386.go | 2690 ++++------------ + .../x/sys/unix/zerrors_linux_amd64.go | 2691 ++++------------ + .../x/sys/unix/zerrors_linux_arm.go | 2701 ++++------------ + .../x/sys/unix/zerrors_linux_arm64.go | 2673 ++++------------ + .../x/sys/unix/zerrors_linux_mips.go | 2702 ++++------------ + .../x/sys/unix/zerrors_linux_mips64.go | 2702 ++++------------ + .../x/sys/unix/zerrors_linux_mips64le.go | 2702 ++++------------ + .../x/sys/unix/zerrors_linux_mipsle.go | 2702 ++++------------ + .../x/sys/unix/zerrors_linux_ppc64.go | 2816 ++++------------- + .../x/sys/unix/zerrors_linux_ppc64le.go | 2816 ++++------------- + .../x/sys/unix/zerrors_linux_riscv64.go | 771 +++++ + .../x/sys/unix/zerrors_linux_s390x.go | 2812 ++++------------ + .../x/sys/unix/zerrors_linux_sparc64.go | 2013 +++--------- + .../x/sys/unix/zerrors_netbsd_386.go | 325 +- + .../x/sys/unix/zerrors_netbsd_amd64.go | 325 +- + .../x/sys/unix/zerrors_netbsd_arm.go | 325 +- + ...etbsd_amd64.go => zerrors_netbsd_arm64.go} | 327 +- + .../x/sys/unix/zerrors_openbsd_386.go | 339 +- + .../x/sys/unix/zerrors_openbsd_amd64.go | 576 ++-- + .../x/sys/unix/zerrors_openbsd_arm.go | 333 +- + ...nbsd_amd64.go => zerrors_openbsd_arm64.go} | 605 ++-- + .../x/sys/unix/zerrors_solaris_amd64.go | 380 ++- + .../x/sys/unix/zptrace_armnn_linux.go | 41 + + .../x/sys/unix/zptrace_linux_arm64.go | 17 + + .../x/sys/unix/zptrace_mipsnn_linux.go | 50 + + .../x/sys/unix/zptrace_mipsnnle_linux.go | 50 + + .../x/sys/unix/zptrace_x86_linux.go | 80 + + .../golang.org/x/sys/unix/zsyscall_aix_ppc.go | 1484 +++++++++ + ..._netbsd_amd64.go => zsyscall_aix_ppc64.go} | 936 +++--- + .../x/sys/unix/zsyscall_aix_ppc64_gc.go | 1192 +++++++ + .../x/sys/unix/zsyscall_aix_ppc64_gccgo.go | 1070 +++++++ + ...win_arm.go => zsyscall_darwin_386.1_11.go} | 416 ++- + .../x/sys/unix/zsyscall_darwin_386.1_13.go | 41 + + .../x/sys/unix/zsyscall_darwin_386.1_13.s | 12 + + .../x/sys/unix/zsyscall_darwin_386.go | 1314 ++++++-- + .../x/sys/unix/zsyscall_darwin_386.s | 284 ++ + ...arm64.go => zsyscall_darwin_amd64.1_11.go} | 416 ++- + .../x/sys/unix/zsyscall_darwin_amd64.1_13.go | 41 + + .../x/sys/unix/zsyscall_darwin_amd64.1_13.s | 12 + + .../x/sys/unix/zsyscall_darwin_amd64.go | 1314 ++++++-- + .../x/sys/unix/zsyscall_darwin_amd64.s | 284 ++ + ...win_arm.go => zsyscall_darwin_arm.1_11.go} | 389 ++- + .../x/sys/unix/zsyscall_darwin_arm.1_13.go | 41 + + .../x/sys/unix/zsyscall_darwin_arm.1_13.s | 12 + + .../x/sys/unix/zsyscall_darwin_arm.go | 1301 ++++++-- + .../x/sys/unix/zsyscall_darwin_arm.s | 282 ++ + ...arm64.go => zsyscall_darwin_arm64.1_11.go} | 389 ++- + .../x/sys/unix/zsyscall_darwin_arm64.1_13.go | 41 + + .../x/sys/unix/zsyscall_darwin_arm64.1_13.s | 12 + + .../x/sys/unix/zsyscall_darwin_arm64.go | 1301 ++++++-- + .../x/sys/unix/zsyscall_darwin_arm64.s | 282 ++ + .../x/sys/unix/zsyscall_dragonfly_amd64.go | 238 +- + .../x/sys/unix/zsyscall_freebsd_386.go | 204 +- + .../x/sys/unix/zsyscall_freebsd_amd64.go | 204 +- + .../x/sys/unix/zsyscall_freebsd_arm.go | 204 +- + ...bsd_amd64.go => zsyscall_freebsd_arm64.go} | 206 +- + .../x/sys/unix/zsyscall_illumos_amd64.go | 87 + + ...scall_linux_s390x.go => zsyscall_linux.go} | 774 ++--- + .../x/sys/unix/zsyscall_linux_386.go | 1573 +-------- + .../x/sys/unix/zsyscall_linux_amd64.go | 1607 +--------- + .../x/sys/unix/zsyscall_linux_arm.go | 1626 +--------- + .../x/sys/unix/zsyscall_linux_arm64.go | 1513 +-------- + .../x/sys/unix/zsyscall_linux_mips.go | 1567 +-------- + .../x/sys/unix/zsyscall_linux_mips64.go | 1552 +-------- + .../x/sys/unix/zsyscall_linux_mips64le.go | 1552 +-------- + .../x/sys/unix/zsyscall_linux_mipsle.go | 1567 +-------- + .../x/sys/unix/zsyscall_linux_ppc64.go | 1586 +--------- + .../x/sys/unix/zsyscall_linux_ppc64le.go | 1586 +--------- + .../x/sys/unix/zsyscall_linux_riscv64.go | 582 ++++ + .../x/sys/unix/zsyscall_linux_s390x.go | 1570 +-------- + .../x/sys/unix/zsyscall_linux_sparc64.go | 1247 +------- + .../x/sys/unix/zsyscall_netbsd_386.go | 551 +++- + .../x/sys/unix/zsyscall_netbsd_amd64.go | 551 +++- + .../x/sys/unix/zsyscall_netbsd_arm.go | 551 +++- + ...ebsd_amd64.go => zsyscall_netbsd_arm64.go} | 262 +- + .../x/sys/unix/zsyscall_openbsd_386.go | 338 +- + .../x/sys/unix/zsyscall_openbsd_amd64.go | 338 +- + .../x/sys/unix/zsyscall_openbsd_arm.go | 338 +- + ...arwin_386.go => zsyscall_openbsd_arm64.go} | 289 +- + .../x/sys/unix/zsyscall_solaris_amd64.go | 382 ++- + ...sctl_openbsd.go => zsysctl_openbsd_386.go} | 4 +- + ...tl_openbsd.go => zsysctl_openbsd_amd64.go} | 42 +- + ...sctl_openbsd.go => zsysctl_openbsd_arm.go} | 6 +- + ...tl_openbsd.go => zsysctl_openbsd_arm64.go} | 47 +- + .../x/sys/unix/zsysnum_darwin_386.go | 60 +- + .../x/sys/unix/zsysnum_darwin_amd64.go | 62 +- + .../x/sys/unix/zsysnum_darwin_arm.go | 14 +- + .../x/sys/unix/zsysnum_darwin_arm64.go | 14 +- + .../x/sys/unix/zsysnum_dragonfly_amd64.go | 176 +- + .../x/sys/unix/zsysnum_freebsd_386.go | 731 +++-- + .../x/sys/unix/zsysnum_freebsd_amd64.go | 731 +++-- + .../x/sys/unix/zsysnum_freebsd_arm.go | 731 +++-- + .../x/sys/unix/zsysnum_freebsd_arm64.go | 396 +++ + .../x/sys/unix/zsysnum_linux_386.go | 808 ++--- + .../x/sys/unix/zsysnum_linux_amd64.go | 19 +- + .../x/sys/unix/zsysnum_linux_arm.go | 745 ++--- + .../x/sys/unix/zsysnum_linux_arm64.go | 20 +- + .../x/sys/unix/zsysnum_linux_mips.go | 779 ++--- + .../x/sys/unix/zsysnum_linux_mips64.go | 19 +- + .../x/sys/unix/zsysnum_linux_mips64le.go | 19 +- + .../x/sys/unix/zsysnum_linux_mipsle.go | 779 ++--- + .../x/sys/unix/zsysnum_linux_ppc64.go | 33 +- + .../x/sys/unix/zsysnum_linux_ppc64le.go | 33 +- + ...inux_arm64.go => zsysnum_linux_riscv64.go} | 23 +- + .../x/sys/unix/zsysnum_linux_s390x.go | 80 +- + .../x/sys/unix/zsysnum_linux_sparc64.go | 35 +- + .../x/sys/unix/zsysnum_netbsd_386.go | 4 +- + .../x/sys/unix/zsysnum_netbsd_amd64.go | 4 +- + .../x/sys/unix/zsysnum_netbsd_arm.go | 4 +- + ..._netbsd_386.go => zsysnum_netbsd_arm64.go} | 6 +- + .../x/sys/unix/zsysnum_openbsd_386.go | 223 +- + .../x/sys/unix/zsysnum_openbsd_amd64.go | 223 +- + .../x/sys/unix/zsysnum_openbsd_arm.go | 217 +- + ...penbsd_arm.go => zsysnum_openbsd_arm64.go} | 218 +- + .../x/sys/unix/zsysnum_solaris_amd64.go | 13 - + .../golang.org/x/sys/unix/ztypes_aix_ppc.go | 352 +++ + .../golang.org/x/sys/unix/ztypes_aix_ppc64.go | 356 +++ + .../x/sys/unix/ztypes_darwin_386.go | 195 +- + .../x/sys/unix/ztypes_darwin_amd64.go | 241 +- + .../x/sys/unix/ztypes_darwin_arm.go | 195 +- + .../x/sys/unix/ztypes_darwin_arm64.go | 246 +- + .../x/sys/unix/ztypes_dragonfly_amd64.go | 213 +- + .../x/sys/unix/ztypes_freebsd_386.go | 426 ++- + .../x/sys/unix/ztypes_freebsd_amd64.go | 448 ++- + .../x/sys/unix/ztypes_freebsd_arm.go | 427 ++- + ...eebsd_amd64.go => ztypes_freebsd_arm64.go} | 430 ++- + vendor/golang.org/x/sys/unix/ztypes_linux.go | 2340 ++++++++++++++ + .../golang.org/x/sys/unix/ztypes_linux_386.go | 878 ++--- + .../x/sys/unix/ztypes_linux_amd64.go | 881 ++---- + .../golang.org/x/sys/unix/ztypes_linux_arm.go | 899 +++--- + .../x/sys/unix/ztypes_linux_arm64.go | 883 ++---- + .../x/sys/unix/ztypes_linux_mips.go | 864 ++--- + .../x/sys/unix/ztypes_linux_mips64.go | 880 ++---- + .../x/sys/unix/ztypes_linux_mips64le.go | 880 ++---- + .../x/sys/unix/ztypes_linux_mipsle.go | 864 ++--- + .../x/sys/unix/ztypes_linux_ppc64.go | 889 ++---- + .../x/sys/unix/ztypes_linux_ppc64le.go | 889 ++---- + .../x/sys/unix/ztypes_linux_riscv64.go | 621 ++++ + .../x/sys/unix/ztypes_linux_s390x.go | 842 ++--- + .../x/sys/unix/ztypes_linux_sparc64.go | 910 +++--- + .../x/sys/unix/ztypes_netbsd_386.go | 145 +- + .../x/sys/unix/ztypes_netbsd_amd64.go | 152 +- + .../x/sys/unix/ztypes_netbsd_arm.go | 151 +- + ...netbsd_amd64.go => ztypes_netbsd_arm64.go} | 154 +- + .../x/sys/unix/ztypes_openbsd_386.go | 173 +- + .../x/sys/unix/ztypes_openbsd_amd64.go | 264 +- + .../x/sys/unix/ztypes_openbsd_arm.go | 255 +- + ...enbsd_amd64.go => ztypes_openbsd_arm64.go} | 260 +- + .../x/sys/unix/ztypes_solaris_amd64.go | 239 +- + 293 files changed, 60017 insertions(+), 59731 deletions(-) + create mode 100644 vendor/golang.org/x/sys/unix/affinity_linux.go + create mode 100644 vendor/golang.org/x/sys/unix/aliases.go + create mode 100644 vendor/golang.org/x/sys/unix/asm_aix_ppc64.s + copy vendor/golang.org/x/sys/unix/{asm_linux_mips64x.s => asm_freebsd_arm64.s} (71%) + create mode 100644 vendor/golang.org/x/sys/unix/asm_linux_riscv64.s + copy vendor/golang.org/x/sys/unix/{asm_linux_mips64x.s => asm_netbsd_arm64.s} (60%) + copy vendor/golang.org/x/sys/unix/{asm_linux_mips64x.s => asm_openbsd_arm64.s} (76%) + create mode 100644 vendor/golang.org/x/sys/unix/dev_aix_ppc.go + create mode 100644 vendor/golang.org/x/sys/unix/dev_aix_ppc64.go + create mode 100644 vendor/golang.org/x/sys/unix/dev_darwin.go + create mode 100644 vendor/golang.org/x/sys/unix/dev_dragonfly.go + create mode 100644 vendor/golang.org/x/sys/unix/dev_freebsd.go + create mode 100644 vendor/golang.org/x/sys/unix/dev_netbsd.go + create mode 100644 vendor/golang.org/x/sys/unix/dev_openbsd.go + delete mode 100644 vendor/golang.org/x/sys/unix/env_unset.go + create mode 100644 vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go + rename vendor/golang.org/x/sys/unix/{flock.go => fcntl.go} (54%) + create mode 100644 vendor/golang.org/x/sys/unix/fcntl_darwin.go + rename vendor/golang.org/x/sys/unix/{flock_linux_32bit.go => fcntl_linux_32bit.go} (100%) + create mode 100644 vendor/golang.org/x/sys/unix/fdset.go + delete mode 100644 vendor/golang.org/x/sys/unix/file_unix.go + delete mode 100644 vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go + create mode 100644 vendor/golang.org/x/sys/unix/ioctl.go + create mode 100644 vendor/golang.org/x/sys/unix/mkasm_darwin.go + create mode 100644 vendor/golang.org/x/sys/unix/mkmerge.go + create mode 100644 vendor/golang.org/x/sys/unix/mksyscall.go + create mode 100644 vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go + create mode 100644 vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go + create mode 100644 vendor/golang.org/x/sys/unix/mksyscall_solaris.go + create mode 100644 vendor/golang.org/x/sys/unix/mksysctl_openbsd.go + create mode 100644 vendor/golang.org/x/sys/unix/mksysnum.go + delete mode 100644 vendor/golang.org/x/sys/unix/openbsd_pledge.go + create mode 100644 vendor/golang.org/x/sys/unix/pagesize_unix.go + create mode 100644 vendor/golang.org/x/sys/unix/pledge_openbsd.go + create mode 100644 vendor/golang.org/x/sys/unix/readdirent_getdents.go + create mode 100644 vendor/golang.org/x/sys/unix/readdirent_getdirentries.go + create mode 100644 vendor/golang.org/x/sys/unix/sockcmsg_dragonfly.go + create mode 100644 vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_aix.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_aix_ppc.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin.1_12.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_386.1_11.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_amd64.1_11.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_arm64.1_11.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go + copy vendor/golang.org/x/sys/unix/{syscall_dragonfly_amd64.go => syscall_freebsd_arm64.go} (59%) + create mode 100644 vendor/golang.org/x/sys/unix/syscall_illumos.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_gc.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go + copy vendor/golang.org/x/sys/unix/{syscall_linux_arm64.go => syscall_linux_riscv64.go} (68%) + copy vendor/golang.org/x/sys/unix/{syscall_netbsd_amd64.go => syscall_netbsd_arm64.go} (50%) + delete mode 100644 vendor/golang.org/x/sys/unix/syscall_no_getwd.go + create mode 100644 vendor/golang.org/x/sys/unix/syscall_openbsd_arm64.go + copy vendor/golang.org/x/sys/unix/{syscall_unix_gc.go => syscall_unix_gc_ppc64x.go} (51%) + create mode 100644 vendor/golang.org/x/sys/unix/timestruct.go + copy vendor/golang.org/x/sys/unix/{types_netbsd.go => types_aix.go} (53%) + create mode 100644 vendor/golang.org/x/sys/unix/unveil_openbsd.go + create mode 100644 vendor/golang.org/x/sys/unix/xattr_bsd.go + create mode 100644 vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go + create mode 100644 vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go + copy vendor/golang.org/x/sys/unix/{zerrors_freebsd_amd64.go => zerrors_freebsd_arm64.go} (80%) + create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux.go + create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go + copy vendor/golang.org/x/sys/unix/{zerrors_netbsd_amd64.go => zerrors_netbsd_arm64.go} (89%) + copy vendor/golang.org/x/sys/unix/{zerrors_openbsd_amd64.go => zerrors_openbsd_arm64.go} (76%) + create mode 100644 vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go + create mode 100644 vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go + create mode 100644 vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go + create mode 100644 vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go + create mode 100644 vendor/golang.org/x/sys/unix/zptrace_x86_linux.go + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go + copy vendor/golang.org/x/sys/unix/{zsyscall_netbsd_amd64.go => zsyscall_aix_ppc64.go} (57%) + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go + copy vendor/golang.org/x/sys/unix/{zsyscall_darwin_arm.go => zsyscall_darwin_386.1_11.go} (85%) + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_13.go + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_13.s + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s + copy vendor/golang.org/x/sys/unix/{zsyscall_darwin_arm64.go => zsyscall_darwin_amd64.1_11.go} (85%) + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.go + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.s + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s + copy vendor/golang.org/x/sys/unix/{zsyscall_darwin_arm.go => zsyscall_darwin_arm.1_11.go} (85%) + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_13.go + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_13.s + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s + copy vendor/golang.org/x/sys/unix/{zsyscall_darwin_arm64.go => zsyscall_darwin_arm64.1_11.go} (84%) + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.go + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.s + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s + copy vendor/golang.org/x/sys/unix/{zsyscall_freebsd_amd64.go => zsyscall_freebsd_arm64.go} (90%) + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go + copy vendor/golang.org/x/sys/unix/{zsyscall_linux_s390x.go => zsyscall_linux.go} (79%) + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go + copy vendor/golang.org/x/sys/unix/{zsyscall_freebsd_amd64.go => zsyscall_netbsd_arm64.go} (92%) + copy vendor/golang.org/x/sys/unix/{zsyscall_darwin_386.go => zsyscall_openbsd_arm64.go} (87%) + copy vendor/golang.org/x/sys/unix/{zsysctl_openbsd.go => zsysctl_openbsd_386.go} (99%) + copy vendor/golang.org/x/sys/unix/{zsysctl_openbsd.go => zsysctl_openbsd_amd64.go} (91%) + copy vendor/golang.org/x/sys/unix/{zsysctl_openbsd.go => zsysctl_openbsd_arm.go} (99%) + rename vendor/golang.org/x/sys/unix/{zsysctl_openbsd.go => zsysctl_openbsd_arm64.go} (91%) + create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go + copy vendor/golang.org/x/sys/unix/{zsysnum_linux_arm64.go => zsysnum_linux_riscv64.go} (92%) + copy vendor/golang.org/x/sys/unix/{zsysnum_netbsd_386.go => zsysnum_netbsd_arm64.go} (99%) + copy vendor/golang.org/x/sys/unix/{zsysnum_openbsd_arm.go => zsysnum_openbsd_arm64.go} (67%) + delete mode 100644 vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go + create mode 100644 vendor/golang.org/x/sys/unix/ztypes_aix_ppc.go + create mode 100644 vendor/golang.org/x/sys/unix/ztypes_aix_ppc64.go + copy vendor/golang.org/x/sys/unix/{ztypes_freebsd_amd64.go => ztypes_freebsd_arm64.go} (54%) + create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux.go + create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go + copy vendor/golang.org/x/sys/unix/{ztypes_netbsd_amd64.go => ztypes_netbsd_arm64.go} (73%) + copy vendor/golang.org/x/sys/unix/{ztypes_openbsd_amd64.go => ztypes_openbsd_arm64.go} (58%) + +diff --git a/Gopkg.lock b/Gopkg.lock +index b4333103..01a867d5 100644 +--- a/Gopkg.lock ++++ b/Gopkg.lock +@@ -112,11 +112,11 @@ + + [[projects]] + branch = "master" +- digest = "1:51912e607c5e28a89fdc7e41d3377b92086ab7f76ded236765dbf98d0a704c5d" ++ digest = "1:f8181d8aa1e268255316ec12ab5402d4f671b1da6d7ad40abdf2f92c0404b67d" + name = "golang.org/x/sys" + packages = ["unix"] + pruneopts = "NUT" +- revision = "bb24a47a89eac6c1227fbcb2ae37a8b9ed323366" ++ revision = "1957bb5e6d1f523308b49060df02171d06ddfc77" + + [[projects]] + branch = "v2" +diff --git a/vendor/golang.org/x/sys/unix/affinity_linux.go b/vendor/golang.org/x/sys/unix/affinity_linux.go +new file mode 100644 +index 00000000..6e5c81ac +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/affinity_linux.go +@@ -0,0 +1,86 @@ ++// Copyright 2018 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// CPU affinity functions ++ ++package unix ++ ++import ( ++ "math/bits" ++ "unsafe" ++) ++ ++const cpuSetSize = _CPU_SETSIZE / _NCPUBITS ++ ++// CPUSet represents a CPU affinity mask. ++type CPUSet [cpuSetSize]cpuMask ++ ++func schedAffinity(trap uintptr, pid int, set *CPUSet) error { ++ _, _, e := RawSyscall(trap, uintptr(pid), uintptr(unsafe.Sizeof(*set)), uintptr(unsafe.Pointer(set))) ++ if e != 0 { ++ return errnoErr(e) ++ } ++ return nil ++} ++ ++// SchedGetaffinity gets the CPU affinity mask of the thread specified by pid. ++// If pid is 0 the calling thread is used. ++func SchedGetaffinity(pid int, set *CPUSet) error { ++ return schedAffinity(SYS_SCHED_GETAFFINITY, pid, set) ++} ++ ++// SchedSetaffinity sets the CPU affinity mask of the thread specified by pid. ++// If pid is 0 the calling thread is used. ++func SchedSetaffinity(pid int, set *CPUSet) error { ++ return schedAffinity(SYS_SCHED_SETAFFINITY, pid, set) ++} ++ ++// Zero clears the set s, so that it contains no CPUs. ++func (s *CPUSet) Zero() { ++ for i := range s { ++ s[i] = 0 ++ } ++} ++ ++func cpuBitsIndex(cpu int) int { ++ return cpu / _NCPUBITS ++} ++ ++func cpuBitsMask(cpu int) cpuMask { ++ return cpuMask(1 << (uint(cpu) % _NCPUBITS)) ++} ++ ++// Set adds cpu to the set s. ++func (s *CPUSet) Set(cpu int) { ++ i := cpuBitsIndex(cpu) ++ if i < len(s) { ++ s[i] |= cpuBitsMask(cpu) ++ } ++} ++ ++// Clear removes cpu from the set s. ++func (s *CPUSet) Clear(cpu int) { ++ i := cpuBitsIndex(cpu) ++ if i < len(s) { ++ s[i] &^= cpuBitsMask(cpu) ++ } ++} ++ ++// IsSet reports whether cpu is in the set s. ++func (s *CPUSet) IsSet(cpu int) bool { ++ i := cpuBitsIndex(cpu) ++ if i < len(s) { ++ return s[i]&cpuBitsMask(cpu) != 0 ++ } ++ return false ++} ++ ++// Count returns the number of CPUs in the set s. ++func (s *CPUSet) Count() int { ++ c := 0 ++ for _, b := range s { ++ c += bits.OnesCount64(uint64(b)) ++ } ++ return c ++} +diff --git a/vendor/golang.org/x/sys/unix/aliases.go b/vendor/golang.org/x/sys/unix/aliases.go +new file mode 100644 +index 00000000..951fce4d +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/aliases.go +@@ -0,0 +1,14 @@ ++// Copyright 2018 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris ++// +build go1.9 ++ ++package unix ++ ++import "syscall" ++ ++type Signal = syscall.Signal ++type Errno = syscall.Errno ++type SysProcAttr = syscall.SysProcAttr +diff --git a/vendor/golang.org/x/sys/unix/asm_aix_ppc64.s b/vendor/golang.org/x/sys/unix/asm_aix_ppc64.s +new file mode 100644 +index 00000000..06f84b85 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/asm_aix_ppc64.s +@@ -0,0 +1,17 @@ ++// Copyright 2018 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build !gccgo ++ ++#include "textflag.h" ++ ++// ++// System calls for ppc64, AIX are implemented in runtime/syscall_aix.go ++// ++ ++TEXT ·syscall6(SB),NOSPLIT,$0-88 ++ JMP syscall·syscall6(SB) ++ ++TEXT ·rawSyscall6(SB),NOSPLIT,$0-88 ++ JMP syscall·rawSyscall6(SB) +diff --git a/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s +index d5ed6726..603dd572 100644 +--- a/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s ++++ b/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s +@@ -13,17 +13,17 @@ + // Just jump to package syscall's implementation for all these functions. + // The runtime may know about them. + +-TEXT ·Syscall(SB),NOSPLIT,$0-64 ++TEXT ·Syscall(SB),NOSPLIT,$0-56 + JMP syscall·Syscall(SB) + +-TEXT ·Syscall6(SB),NOSPLIT,$0-88 ++TEXT ·Syscall6(SB),NOSPLIT,$0-80 + JMP syscall·Syscall6(SB) + +-TEXT ·Syscall9(SB),NOSPLIT,$0-112 ++TEXT ·Syscall9(SB),NOSPLIT,$0-104 + JMP syscall·Syscall9(SB) + +-TEXT ·RawSyscall(SB),NOSPLIT,$0-64 ++TEXT ·RawSyscall(SB),NOSPLIT,$0-56 + JMP syscall·RawSyscall(SB) + +-TEXT ·RawSyscall6(SB),NOSPLIT,$0-88 ++TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 + JMP syscall·RawSyscall6(SB) +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/vendor/golang.org/x/sys/unix/asm_freebsd_arm64.s +similarity index 71% +copy from vendor/golang.org/x/sys/unix/asm_linux_mips64x.s +copy to vendor/golang.org/x/sys/unix/asm_freebsd_arm64.s +index 724e580c..d9318cbf 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s ++++ b/vendor/golang.org/x/sys/unix/asm_freebsd_arm64.s +@@ -1,15 +1,13 @@ +-// Copyright 2015 The Go Authors. All rights reserved. ++// Copyright 2018 The Go Authors. All rights reserved. + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +-// +build linux +-// +build mips64 mips64le + // +build !gccgo + + #include "textflag.h" + + // +-// System calls for mips64, Linux ++// System call support for ARM64, FreeBSD + // + + // Just jump to package syscall's implementation for all these functions. +@@ -21,7 +19,10 @@ TEXT ·Syscall(SB),NOSPLIT,$0-56 + TEXT ·Syscall6(SB),NOSPLIT,$0-80 + JMP syscall·Syscall6(SB) + +-TEXT ·RawSyscall(SB),NOSPLIT,$0-56 ++TEXT ·Syscall9(SB),NOSPLIT,$0-104 ++ JMP syscall·Syscall9(SB) ++ ++TEXT ·RawSyscall(SB),NOSPLIT,$0-56 + JMP syscall·RawSyscall(SB) + + TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_386.s b/vendor/golang.org/x/sys/unix/asm_linux_386.s +index 4db29093..448bebbb 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_386.s ++++ b/vendor/golang.org/x/sys/unix/asm_linux_386.s +@@ -10,21 +10,51 @@ + // System calls for 386, Linux + // + ++// See ../runtime/sys_linux_386.s for the reason why we always use int 0x80 ++// instead of the glibc-specific "CALL 0x10(GS)". ++#define INVOKE_SYSCALL INT $0x80 ++ + // Just jump to package syscall's implementation for all these functions. + // The runtime may know about them. + +-TEXT ·Syscall(SB),NOSPLIT,$0-28 ++TEXT ·Syscall(SB),NOSPLIT,$0-28 + JMP syscall·Syscall(SB) + +-TEXT ·Syscall6(SB),NOSPLIT,$0-40 ++TEXT ·Syscall6(SB),NOSPLIT,$0-40 + JMP syscall·Syscall6(SB) + ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-24 ++ CALL runtime·entersyscall(SB) ++ MOVL trap+0(FP), AX // syscall entry ++ MOVL a1+4(FP), BX ++ MOVL a2+8(FP), CX ++ MOVL a3+12(FP), DX ++ MOVL $0, SI ++ MOVL $0, DI ++ INVOKE_SYSCALL ++ MOVL AX, r1+16(FP) ++ MOVL DX, r2+20(FP) ++ CALL runtime·exitsyscall(SB) ++ RET ++ + TEXT ·RawSyscall(SB),NOSPLIT,$0-28 + JMP syscall·RawSyscall(SB) + +-TEXT ·RawSyscall6(SB),NOSPLIT,$0-40 ++TEXT ·RawSyscall6(SB),NOSPLIT,$0-40 + JMP syscall·RawSyscall6(SB) + ++TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24 ++ MOVL trap+0(FP), AX // syscall entry ++ MOVL a1+4(FP), BX ++ MOVL a2+8(FP), CX ++ MOVL a3+12(FP), DX ++ MOVL $0, SI ++ MOVL $0, DI ++ INVOKE_SYSCALL ++ MOVL AX, r1+16(FP) ++ MOVL DX, r2+20(FP) ++ RET ++ + TEXT ·socketcall(SB),NOSPLIT,$0-36 + JMP syscall·socketcall(SB) + +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s +index 44e25c62..c6468a95 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s ++++ b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s +@@ -13,17 +13,45 @@ + // Just jump to package syscall's implementation for all these functions. + // The runtime may know about them. + +-TEXT ·Syscall(SB),NOSPLIT,$0-56 ++TEXT ·Syscall(SB),NOSPLIT,$0-56 + JMP syscall·Syscall(SB) + + TEXT ·Syscall6(SB),NOSPLIT,$0-80 + JMP syscall·Syscall6(SB) + ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-48 ++ CALL runtime·entersyscall(SB) ++ MOVQ a1+8(FP), DI ++ MOVQ a2+16(FP), SI ++ MOVQ a3+24(FP), DX ++ MOVQ $0, R10 ++ MOVQ $0, R8 ++ MOVQ $0, R9 ++ MOVQ trap+0(FP), AX // syscall entry ++ SYSCALL ++ MOVQ AX, r1+32(FP) ++ MOVQ DX, r2+40(FP) ++ CALL runtime·exitsyscall(SB) ++ RET ++ + TEXT ·RawSyscall(SB),NOSPLIT,$0-56 + JMP syscall·RawSyscall(SB) + + TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 + JMP syscall·RawSyscall6(SB) + ++TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48 ++ MOVQ a1+8(FP), DI ++ MOVQ a2+16(FP), SI ++ MOVQ a3+24(FP), DX ++ MOVQ $0, R10 ++ MOVQ $0, R8 ++ MOVQ $0, R9 ++ MOVQ trap+0(FP), AX // syscall entry ++ SYSCALL ++ MOVQ AX, r1+32(FP) ++ MOVQ DX, r2+40(FP) ++ RET ++ + TEXT ·gettimeofday(SB),NOSPLIT,$0-16 + JMP syscall·gettimeofday(SB) +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm.s b/vendor/golang.org/x/sys/unix/asm_linux_arm.s +index cf0b5746..cf0f3575 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_arm.s ++++ b/vendor/golang.org/x/sys/unix/asm_linux_arm.s +@@ -13,17 +13,44 @@ + // Just jump to package syscall's implementation for all these functions. + // The runtime may know about them. + +-TEXT ·Syscall(SB),NOSPLIT,$0-28 ++TEXT ·Syscall(SB),NOSPLIT,$0-28 + B syscall·Syscall(SB) + +-TEXT ·Syscall6(SB),NOSPLIT,$0-40 ++TEXT ·Syscall6(SB),NOSPLIT,$0-40 + B syscall·Syscall6(SB) + ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-24 ++ BL runtime·entersyscall(SB) ++ MOVW trap+0(FP), R7 ++ MOVW a1+4(FP), R0 ++ MOVW a2+8(FP), R1 ++ MOVW a3+12(FP), R2 ++ MOVW $0, R3 ++ MOVW $0, R4 ++ MOVW $0, R5 ++ SWI $0 ++ MOVW R0, r1+16(FP) ++ MOVW $0, R0 ++ MOVW R0, r2+20(FP) ++ BL runtime·exitsyscall(SB) ++ RET ++ + TEXT ·RawSyscall(SB),NOSPLIT,$0-28 + B syscall·RawSyscall(SB) + +-TEXT ·RawSyscall6(SB),NOSPLIT,$0-40 ++TEXT ·RawSyscall6(SB),NOSPLIT,$0-40 + B syscall·RawSyscall6(SB) + +-TEXT ·seek(SB),NOSPLIT,$0-32 ++TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24 ++ MOVW trap+0(FP), R7 // syscall entry ++ MOVW a1+4(FP), R0 ++ MOVW a2+8(FP), R1 ++ MOVW a3+12(FP), R2 ++ SWI $0 ++ MOVW R0, r1+16(FP) ++ MOVW $0, R0 ++ MOVW R0, r2+20(FP) ++ RET ++ ++TEXT ·seek(SB),NOSPLIT,$0-28 + B syscall·seek(SB) +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s +index 4be9bfed..afe6fdf6 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s ++++ b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s +@@ -11,14 +11,42 @@ + // Just jump to package syscall's implementation for all these functions. + // The runtime may know about them. + +-TEXT ·Syscall(SB),NOSPLIT,$0-56 ++TEXT ·Syscall(SB),NOSPLIT,$0-56 + B syscall·Syscall(SB) + + TEXT ·Syscall6(SB),NOSPLIT,$0-80 + B syscall·Syscall6(SB) + ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-48 ++ BL runtime·entersyscall(SB) ++ MOVD a1+8(FP), R0 ++ MOVD a2+16(FP), R1 ++ MOVD a3+24(FP), R2 ++ MOVD $0, R3 ++ MOVD $0, R4 ++ MOVD $0, R5 ++ MOVD trap+0(FP), R8 // syscall entry ++ SVC ++ MOVD R0, r1+32(FP) // r1 ++ MOVD R1, r2+40(FP) // r2 ++ BL runtime·exitsyscall(SB) ++ RET ++ + TEXT ·RawSyscall(SB),NOSPLIT,$0-56 + B syscall·RawSyscall(SB) + + TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 + B syscall·RawSyscall6(SB) ++ ++TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48 ++ MOVD a1+8(FP), R0 ++ MOVD a2+16(FP), R1 ++ MOVD a3+24(FP), R2 ++ MOVD $0, R3 ++ MOVD $0, R4 ++ MOVD $0, R5 ++ MOVD trap+0(FP), R8 // syscall entry ++ SVC ++ MOVD R0, r1+32(FP) ++ MOVD R1, r2+40(FP) ++ RET +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s +index 724e580c..ab9d6383 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s ++++ b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s +@@ -15,14 +15,42 @@ + // Just jump to package syscall's implementation for all these functions. + // The runtime may know about them. + +-TEXT ·Syscall(SB),NOSPLIT,$0-56 ++TEXT ·Syscall(SB),NOSPLIT,$0-56 + JMP syscall·Syscall(SB) + +-TEXT ·Syscall6(SB),NOSPLIT,$0-80 ++TEXT ·Syscall6(SB),NOSPLIT,$0-80 + JMP syscall·Syscall6(SB) + +-TEXT ·RawSyscall(SB),NOSPLIT,$0-56 ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-48 ++ JAL runtime·entersyscall(SB) ++ MOVV a1+8(FP), R4 ++ MOVV a2+16(FP), R5 ++ MOVV a3+24(FP), R6 ++ MOVV R0, R7 ++ MOVV R0, R8 ++ MOVV R0, R9 ++ MOVV trap+0(FP), R2 // syscall entry ++ SYSCALL ++ MOVV R2, r1+32(FP) ++ MOVV R3, r2+40(FP) ++ JAL runtime·exitsyscall(SB) ++ RET ++ ++TEXT ·RawSyscall(SB),NOSPLIT,$0-56 + JMP syscall·RawSyscall(SB) + +-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 ++TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 + JMP syscall·RawSyscall6(SB) ++ ++TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48 ++ MOVV a1+8(FP), R4 ++ MOVV a2+16(FP), R5 ++ MOVV a3+24(FP), R6 ++ MOVV R0, R7 ++ MOVV R0, R8 ++ MOVV R0, R9 ++ MOVV trap+0(FP), R2 // syscall entry ++ SYSCALL ++ MOVV R2, r1+32(FP) ++ MOVV R3, r2+40(FP) ++ RET +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s b/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s +index 2ea42575..99e53990 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s ++++ b/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s +@@ -15,17 +15,40 @@ + // Just jump to package syscall's implementation for all these functions. + // The runtime may know about them. + +-TEXT ·Syscall(SB),NOSPLIT,$0-28 ++TEXT ·Syscall(SB),NOSPLIT,$0-28 + JMP syscall·Syscall(SB) + +-TEXT ·Syscall6(SB),NOSPLIT,$0-40 ++TEXT ·Syscall6(SB),NOSPLIT,$0-40 + JMP syscall·Syscall6(SB) + +-TEXT ·Syscall9(SB),NOSPLIT,$0-52 ++TEXT ·Syscall9(SB),NOSPLIT,$0-52 + JMP syscall·Syscall9(SB) + +-TEXT ·RawSyscall(SB),NOSPLIT,$0-28 ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-24 ++ JAL runtime·entersyscall(SB) ++ MOVW a1+4(FP), R4 ++ MOVW a2+8(FP), R5 ++ MOVW a3+12(FP), R6 ++ MOVW R0, R7 ++ MOVW trap+0(FP), R2 // syscall entry ++ SYSCALL ++ MOVW R2, r1+16(FP) // r1 ++ MOVW R3, r2+20(FP) // r2 ++ JAL runtime·exitsyscall(SB) ++ RET ++ ++TEXT ·RawSyscall(SB),NOSPLIT,$0-28 + JMP syscall·RawSyscall(SB) + +-TEXT ·RawSyscall6(SB),NOSPLIT,$0-40 ++TEXT ·RawSyscall6(SB),NOSPLIT,$0-40 + JMP syscall·RawSyscall6(SB) ++ ++TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24 ++ MOVW a1+4(FP), R4 ++ MOVW a2+8(FP), R5 ++ MOVW a3+12(FP), R6 ++ MOVW trap+0(FP), R2 // syscall entry ++ SYSCALL ++ MOVW R2, r1+16(FP) ++ MOVW R3, r2+20(FP) ++ RET +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s +index 8d231feb..88f71255 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s ++++ b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s +@@ -15,14 +15,30 @@ + // Just jump to package syscall's implementation for all these functions. + // The runtime may know about them. + +-TEXT ·Syscall(SB),NOSPLIT,$0-56 +- BR syscall·Syscall(SB) +- +-TEXT ·Syscall6(SB),NOSPLIT,$0-80 +- BR syscall·Syscall6(SB) +- +-TEXT ·RawSyscall(SB),NOSPLIT,$0-56 +- BR syscall·RawSyscall(SB) +- +-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 +- BR syscall·RawSyscall6(SB) ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-48 ++ BL runtime·entersyscall(SB) ++ MOVD a1+8(FP), R3 ++ MOVD a2+16(FP), R4 ++ MOVD a3+24(FP), R5 ++ MOVD R0, R6 ++ MOVD R0, R7 ++ MOVD R0, R8 ++ MOVD trap+0(FP), R9 // syscall entry ++ SYSCALL R9 ++ MOVD R3, r1+32(FP) ++ MOVD R4, r2+40(FP) ++ BL runtime·exitsyscall(SB) ++ RET ++ ++TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48 ++ MOVD a1+8(FP), R3 ++ MOVD a2+16(FP), R4 ++ MOVD a3+24(FP), R5 ++ MOVD R0, R6 ++ MOVD R0, R7 ++ MOVD R0, R8 ++ MOVD trap+0(FP), R9 // syscall entry ++ SYSCALL R9 ++ MOVD R3, r1+32(FP) ++ MOVD R4, r2+40(FP) ++ RET +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s b/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s +new file mode 100644 +index 00000000..3cfefed2 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s +@@ -0,0 +1,47 @@ ++// Copyright 2019 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build riscv64,!gccgo ++ ++#include "textflag.h" ++ ++// ++// System calls for linux/riscv64. ++// ++// Where available, just jump to package syscall's implementation of ++// these functions. ++ ++TEXT ·Syscall(SB),NOSPLIT,$0-56 ++ JMP syscall·Syscall(SB) ++ ++TEXT ·Syscall6(SB),NOSPLIT,$0-80 ++ JMP syscall·Syscall6(SB) ++ ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-48 ++ CALL runtime·entersyscall(SB) ++ MOV a1+8(FP), A0 ++ MOV a2+16(FP), A1 ++ MOV a3+24(FP), A2 ++ MOV trap+0(FP), A7 // syscall entry ++ ECALL ++ MOV A0, r1+32(FP) // r1 ++ MOV A1, r2+40(FP) // r2 ++ CALL runtime·exitsyscall(SB) ++ RET ++ ++TEXT ·RawSyscall(SB),NOSPLIT,$0-56 ++ JMP syscall·RawSyscall(SB) ++ ++TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 ++ JMP syscall·RawSyscall6(SB) ++ ++TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48 ++ MOV a1+8(FP), A0 ++ MOV a2+16(FP), A1 ++ MOV a3+24(FP), A2 ++ MOV trap+0(FP), A7 // syscall entry ++ ECALL ++ MOV A0, r1+32(FP) ++ MOV A1, r2+40(FP) ++ RET +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s +index 11889859..a5a863c6 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s ++++ b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s +@@ -21,8 +21,36 @@ TEXT ·Syscall(SB),NOSPLIT,$0-56 + TEXT ·Syscall6(SB),NOSPLIT,$0-80 + BR syscall·Syscall6(SB) + ++TEXT ·SyscallNoError(SB),NOSPLIT,$0-48 ++ BL runtime·entersyscall(SB) ++ MOVD a1+8(FP), R2 ++ MOVD a2+16(FP), R3 ++ MOVD a3+24(FP), R4 ++ MOVD $0, R5 ++ MOVD $0, R6 ++ MOVD $0, R7 ++ MOVD trap+0(FP), R1 // syscall entry ++ SYSCALL ++ MOVD R2, r1+32(FP) ++ MOVD R3, r2+40(FP) ++ BL runtime·exitsyscall(SB) ++ RET ++ + TEXT ·RawSyscall(SB),NOSPLIT,$0-56 + BR syscall·RawSyscall(SB) + + TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 + BR syscall·RawSyscall6(SB) ++ ++TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48 ++ MOVD a1+8(FP), R2 ++ MOVD a2+16(FP), R3 ++ MOVD a3+24(FP), R4 ++ MOVD $0, R5 ++ MOVD $0, R6 ++ MOVD $0, R7 ++ MOVD trap+0(FP), R1 // syscall entry ++ SYSCALL ++ MOVD R2, r1+32(FP) ++ MOVD R3, r2+40(FP) ++ RET +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/vendor/golang.org/x/sys/unix/asm_netbsd_arm64.s +similarity index 60% +copy from vendor/golang.org/x/sys/unix/asm_linux_mips64x.s +copy to vendor/golang.org/x/sys/unix/asm_netbsd_arm64.s +index 724e580c..6f98ba5a 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s ++++ b/vendor/golang.org/x/sys/unix/asm_netbsd_arm64.s +@@ -1,28 +1,29 @@ +-// Copyright 2015 The Go Authors. All rights reserved. ++// Copyright 2019 The Go Authors. All rights reserved. + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +-// +build linux +-// +build mips64 mips64le + // +build !gccgo + + #include "textflag.h" + + // +-// System calls for mips64, Linux ++// System call support for ARM64, NetBSD + // + + // Just jump to package syscall's implementation for all these functions. + // The runtime may know about them. + + TEXT ·Syscall(SB),NOSPLIT,$0-56 +- JMP syscall·Syscall(SB) ++ B syscall·Syscall(SB) + + TEXT ·Syscall6(SB),NOSPLIT,$0-80 +- JMP syscall·Syscall6(SB) ++ B syscall·Syscall6(SB) ++ ++TEXT ·Syscall9(SB),NOSPLIT,$0-104 ++ B syscall·Syscall9(SB) + + TEXT ·RawSyscall(SB),NOSPLIT,$0-56 +- JMP syscall·RawSyscall(SB) ++ B syscall·RawSyscall(SB) + + TEXT ·RawSyscall6(SB),NOSPLIT,$0-80 +- JMP syscall·RawSyscall6(SB) ++ B syscall·RawSyscall6(SB) +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/vendor/golang.org/x/sys/unix/asm_openbsd_arm64.s +similarity index 76% +copy from vendor/golang.org/x/sys/unix/asm_linux_mips64x.s +copy to vendor/golang.org/x/sys/unix/asm_openbsd_arm64.s +index 724e580c..0cedea3d 100644 +--- a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s ++++ b/vendor/golang.org/x/sys/unix/asm_openbsd_arm64.s +@@ -1,15 +1,13 @@ +-// Copyright 2015 The Go Authors. All rights reserved. ++// Copyright 2019 The Go Authors. All rights reserved. + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +-// +build linux +-// +build mips64 mips64le + // +build !gccgo + + #include "textflag.h" + + // +-// System calls for mips64, Linux ++// System call support for arm64, OpenBSD + // + + // Just jump to package syscall's implementation for all these functions. +@@ -21,6 +19,9 @@ TEXT ·Syscall(SB),NOSPLIT,$0-56 + TEXT ·Syscall6(SB),NOSPLIT,$0-80 + JMP syscall·Syscall6(SB) + ++TEXT ·Syscall9(SB),NOSPLIT,$0-104 ++ JMP syscall·Syscall9(SB) ++ + TEXT ·RawSyscall(SB),NOSPLIT,$0-56 + JMP syscall·RawSyscall(SB) + +diff --git a/vendor/golang.org/x/sys/unix/bluetooth_linux.go b/vendor/golang.org/x/sys/unix/bluetooth_linux.go +index 6e322969..a178a614 100644 +--- a/vendor/golang.org/x/sys/unix/bluetooth_linux.go ++++ b/vendor/golang.org/x/sys/unix/bluetooth_linux.go +@@ -23,6 +23,7 @@ const ( + HCI_CHANNEL_USER = 1 + HCI_CHANNEL_MONITOR = 2 + HCI_CHANNEL_CONTROL = 3 ++ HCI_CHANNEL_LOGGING = 4 + ) + + // Socketoption Level +diff --git a/vendor/golang.org/x/sys/unix/cap_freebsd.go b/vendor/golang.org/x/sys/unix/cap_freebsd.go +index 83b6bcea..df520487 100644 +--- a/vendor/golang.org/x/sys/unix/cap_freebsd.go ++++ b/vendor/golang.org/x/sys/unix/cap_freebsd.go +@@ -7,7 +7,7 @@ + package unix + + import ( +- errorspkg "errors" ++ "errors" + "fmt" + ) + +@@ -60,26 +60,26 @@ func CapRightsSet(rights *CapRights, setrights []uint64) error { + + n := caparsize(rights) + if n < capArSizeMin || n > capArSizeMax { +- return errorspkg.New("bad rights size") ++ return errors.New("bad rights size") + } + + for _, right := range setrights { + if caprver(right) != CAP_RIGHTS_VERSION_00 { +- return errorspkg.New("bad right version") ++ return errors.New("bad right version") + } + i, err := rightToIndex(right) + if err != nil { + return err + } + if i >= n { +- return errorspkg.New("index overflow") ++ return errors.New("index overflow") + } + if capidxbit(rights.Rights[i]) != capidxbit(right) { +- return errorspkg.New("index mismatch") ++ return errors.New("index mismatch") + } + rights.Rights[i] |= right + if capidxbit(rights.Rights[i]) != capidxbit(right) { +- return errorspkg.New("index mismatch (after assign)") ++ return errors.New("index mismatch (after assign)") + } + } + +@@ -95,26 +95,26 @@ func CapRightsClear(rights *CapRights, clearrights []uint64) error { + + n := caparsize(rights) + if n < capArSizeMin || n > capArSizeMax { +- return errorspkg.New("bad rights size") ++ return errors.New("bad rights size") + } + + for _, right := range clearrights { + if caprver(right) != CAP_RIGHTS_VERSION_00 { +- return errorspkg.New("bad right version") ++ return errors.New("bad right version") + } + i, err := rightToIndex(right) + if err != nil { + return err + } + if i >= n { +- return errorspkg.New("index overflow") ++ return errors.New("index overflow") + } + if capidxbit(rights.Rights[i]) != capidxbit(right) { +- return errorspkg.New("index mismatch") ++ return errors.New("index mismatch") + } + rights.Rights[i] &= ^(right & 0x01FFFFFFFFFFFFFF) + if capidxbit(rights.Rights[i]) != capidxbit(right) { +- return errorspkg.New("index mismatch (after assign)") ++ return errors.New("index mismatch (after assign)") + } + } + +@@ -130,22 +130,22 @@ func CapRightsIsSet(rights *CapRights, setrights []uint64) (bool, error) { + + n := caparsize(rights) + if n < capArSizeMin || n > capArSizeMax { +- return false, errorspkg.New("bad rights size") ++ return false, errors.New("bad rights size") + } + + for _, right := range setrights { + if caprver(right) != CAP_RIGHTS_VERSION_00 { +- return false, errorspkg.New("bad right version") ++ return false, errors.New("bad right version") + } + i, err := rightToIndex(right) + if err != nil { + return false, err + } + if i >= n { +- return false, errorspkg.New("index overflow") ++ return false, errors.New("index overflow") + } + if capidxbit(rights.Rights[i]) != capidxbit(right) { +- return false, errorspkg.New("index mismatch") ++ return false, errors.New("index mismatch") + } + if (rights.Rights[i] & right) != right { + return false, nil +diff --git a/vendor/golang.org/x/sys/unix/constants.go b/vendor/golang.org/x/sys/unix/constants.go +index a96f0ebc..3a6ac648 100644 +--- a/vendor/golang.org/x/sys/unix/constants.go ++++ b/vendor/golang.org/x/sys/unix/constants.go +@@ -2,7 +2,7 @@ + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +-// +build darwin dragonfly freebsd linux netbsd openbsd solaris ++// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris + + package unix + +diff --git a/vendor/golang.org/x/sys/unix/dev_aix_ppc.go b/vendor/golang.org/x/sys/unix/dev_aix_ppc.go +new file mode 100644 +index 00000000..5e5fb451 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/dev_aix_ppc.go +@@ -0,0 +1,27 @@ ++// Copyright 2018 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build aix ++// +build ppc ++ ++// Functions to access/create device major and minor numbers matching the ++// encoding used by AIX. ++ ++package unix ++ ++// Major returns the major component of a Linux device number. ++func Major(dev uint64) uint32 { ++ return uint32((dev >> 16) & 0xffff) ++} ++ ++// Minor returns the minor component of a Linux device number. ++func Minor(dev uint64) uint32 { ++ return uint32(dev & 0xffff) ++} ++ ++// Mkdev returns a Linux device number generated from the given major and minor ++// components. ++func Mkdev(major, minor uint32) uint64 { ++ return uint64(((major) << 16) | (minor)) ++} +diff --git a/vendor/golang.org/x/sys/unix/dev_aix_ppc64.go b/vendor/golang.org/x/sys/unix/dev_aix_ppc64.go +new file mode 100644 +index 00000000..8b401244 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/dev_aix_ppc64.go +@@ -0,0 +1,29 @@ ++// Copyright 2018 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build aix ++// +build ppc64 ++ ++// Functions to access/create device major and minor numbers matching the ++// encoding used AIX. ++ ++package unix ++ ++// Major returns the major component of a Linux device number. ++func Major(dev uint64) uint32 { ++ return uint32((dev & 0x3fffffff00000000) >> 32) ++} ++ ++// Minor returns the minor component of a Linux device number. ++func Minor(dev uint64) uint32 { ++ return uint32((dev & 0x00000000ffffffff) >> 0) ++} ++ ++// Mkdev returns a Linux device number generated from the given major and minor ++// components. ++func Mkdev(major, minor uint32) uint64 { ++ var DEVNO64 uint64 ++ DEVNO64 = 0x8000000000000000 ++ return ((uint64(major) << 32) | (uint64(minor) & 0x00000000FFFFFFFF) | DEVNO64) ++} +diff --git a/vendor/golang.org/x/sys/unix/dev_darwin.go b/vendor/golang.org/x/sys/unix/dev_darwin.go +new file mode 100644 +index 00000000..8d1dc0fa +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/dev_darwin.go +@@ -0,0 +1,24 @@ ++// Copyright 2017 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// Functions to access/create device major and minor numbers matching the ++// encoding used in Darwin's sys/types.h header. ++ ++package unix ++ ++// Major returns the major component of a Darwin device number. ++func Major(dev uint64) uint32 { ++ return uint32((dev >> 24) & 0xff) ++} ++ ++// Minor returns the minor component of a Darwin device number. ++func Minor(dev uint64) uint32 { ++ return uint32(dev & 0xffffff) ++} ++ ++// Mkdev returns a Darwin device number generated from the given major and minor ++// components. ++func Mkdev(major, minor uint32) uint64 { ++ return (uint64(major) << 24) | uint64(minor) ++} +diff --git a/vendor/golang.org/x/sys/unix/dev_dragonfly.go b/vendor/golang.org/x/sys/unix/dev_dragonfly.go +new file mode 100644 +index 00000000..8502f202 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/dev_dragonfly.go +@@ -0,0 +1,30 @@ ++// Copyright 2017 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// Functions to access/create device major and minor numbers matching the ++// encoding used in Dragonfly's sys/types.h header. ++// ++// The information below is extracted and adapted from sys/types.h: ++// ++// Minor gives a cookie instead of an index since in order to avoid changing the ++// meanings of bits 0-15 or wasting time and space shifting bits 16-31 for ++// devices that don't use them. ++ ++package unix ++ ++// Major returns the major component of a DragonFlyBSD device number. ++func Major(dev uint64) uint32 { ++ return uint32((dev >> 8) & 0xff) ++} ++ ++// Minor returns the minor component of a DragonFlyBSD device number. ++func Minor(dev uint64) uint32 { ++ return uint32(dev & 0xffff00ff) ++} ++ ++// Mkdev returns a DragonFlyBSD device number generated from the given major and ++// minor components. ++func Mkdev(major, minor uint32) uint64 { ++ return (uint64(major) << 8) | uint64(minor) ++} +diff --git a/vendor/golang.org/x/sys/unix/dev_freebsd.go b/vendor/golang.org/x/sys/unix/dev_freebsd.go +new file mode 100644 +index 00000000..eba3b4bd +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/dev_freebsd.go +@@ -0,0 +1,30 @@ ++// Copyright 2017 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// Functions to access/create device major and minor numbers matching the ++// encoding used in FreeBSD's sys/types.h header. ++// ++// The information below is extracted and adapted from sys/types.h: ++// ++// Minor gives a cookie instead of an index since in order to avoid changing the ++// meanings of bits 0-15 or wasting time and space shifting bits 16-31 for ++// devices that don't use them. ++ ++package unix ++ ++// Major returns the major component of a FreeBSD device number. ++func Major(dev uint64) uint32 { ++ return uint32((dev >> 8) & 0xff) ++} ++ ++// Minor returns the minor component of a FreeBSD device number. ++func Minor(dev uint64) uint32 { ++ return uint32(dev & 0xffff00ff) ++} ++ ++// Mkdev returns a FreeBSD device number generated from the given major and ++// minor components. ++func Mkdev(major, minor uint32) uint64 { ++ return (uint64(major) << 8) | uint64(minor) ++} +diff --git a/vendor/golang.org/x/sys/unix/dev_linux.go b/vendor/golang.org/x/sys/unix/dev_linux.go +index c902c39e..d165d6f3 100644 +--- a/vendor/golang.org/x/sys/unix/dev_linux.go ++++ b/vendor/golang.org/x/sys/unix/dev_linux.go +@@ -34,9 +34,9 @@ func Minor(dev uint64) uint32 { + // Mkdev returns a Linux device number generated from the given major and minor + // components. + func Mkdev(major, minor uint32) uint64 { +- dev := uint64((major & 0x00000fff) << 8) +- dev |= uint64((major & 0xfffff000) << 32) +- dev |= uint64((minor & 0x000000ff) << 0) +- dev |= uint64((minor & 0xffffff00) << 12) ++ dev := (uint64(major) & 0x00000fff) << 8 ++ dev |= (uint64(major) & 0xfffff000) << 32 ++ dev |= (uint64(minor) & 0x000000ff) << 0 ++ dev |= (uint64(minor) & 0xffffff00) << 12 + return dev + } +diff --git a/vendor/golang.org/x/sys/unix/dev_netbsd.go b/vendor/golang.org/x/sys/unix/dev_netbsd.go +new file mode 100644 +index 00000000..b4a203d0 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/dev_netbsd.go +@@ -0,0 +1,29 @@ ++// Copyright 2017 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// Functions to access/create device major and minor numbers matching the ++// encoding used in NetBSD's sys/types.h header. ++ ++package unix ++ ++// Major returns the major component of a NetBSD device number. ++func Major(dev uint64) uint32 { ++ return uint32((dev & 0x000fff00) >> 8) ++} ++ ++// Minor returns the minor component of a NetBSD device number. ++func Minor(dev uint64) uint32 { ++ minor := uint32((dev & 0x000000ff) >> 0) ++ minor |= uint32((dev & 0xfff00000) >> 12) ++ return minor ++} ++ ++// Mkdev returns a NetBSD device number generated from the given major and minor ++// components. ++func Mkdev(major, minor uint32) uint64 { ++ dev := (uint64(major) << 8) & 0x000fff00 ++ dev |= (uint64(minor) << 12) & 0xfff00000 ++ dev |= (uint64(minor) << 0) & 0x000000ff ++ return dev ++} +diff --git a/vendor/golang.org/x/sys/unix/dev_openbsd.go b/vendor/golang.org/x/sys/unix/dev_openbsd.go +new file mode 100644 +index 00000000..f3430c42 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/dev_openbsd.go +@@ -0,0 +1,29 @@ ++// Copyright 2017 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// Functions to access/create device major and minor numbers matching the ++// encoding used in OpenBSD's sys/types.h header. ++ ++package unix ++ ++// Major returns the major component of an OpenBSD device number. ++func Major(dev uint64) uint32 { ++ return uint32((dev & 0x0000ff00) >> 8) ++} ++ ++// Minor returns the minor component of an OpenBSD device number. ++func Minor(dev uint64) uint32 { ++ minor := uint32((dev & 0x000000ff) >> 0) ++ minor |= uint32((dev & 0xffff0000) >> 8) ++ return minor ++} ++ ++// Mkdev returns an OpenBSD device number generated from the given major and minor ++// components. ++func Mkdev(major, minor uint32) uint64 { ++ dev := (uint64(major) << 8) & 0x0000ff00 ++ dev |= (uint64(minor) << 8) & 0xffff0000 ++ dev |= (uint64(minor) << 0) & 0x000000ff ++ return dev ++} +diff --git a/vendor/golang.org/x/sys/unix/dirent.go b/vendor/golang.org/x/sys/unix/dirent.go +index bd475812..304016b6 100644 +--- a/vendor/golang.org/x/sys/unix/dirent.go ++++ b/vendor/golang.org/x/sys/unix/dirent.go +@@ -2,7 +2,7 @@ + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris ++// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris + + package unix + +diff --git a/vendor/golang.org/x/sys/unix/endian_little.go b/vendor/golang.org/x/sys/unix/endian_little.go +index 085df2d8..bcdb5d30 100644 +--- a/vendor/golang.org/x/sys/unix/endian_little.go ++++ b/vendor/golang.org/x/sys/unix/endian_little.go +@@ -2,7 +2,7 @@ + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + // +-// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le ++// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le riscv64 + + package unix + +diff --git a/vendor/golang.org/x/sys/unix/env_unix.go b/vendor/golang.org/x/sys/unix/env_unix.go +index 45e281a0..84178b0a 100644 +--- a/vendor/golang.org/x/sys/unix/env_unix.go ++++ b/vendor/golang.org/x/sys/unix/env_unix.go +@@ -1,8 +1,8 @@ +-// Copyright 2010 The Go Authors. All rights reserved. ++// Copyright 2010 The Go Authors. All rights reserved. + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +-// +build darwin dragonfly freebsd linux netbsd openbsd solaris ++// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris + + // Unix environment variables. + +@@ -25,3 +25,7 @@ func Clearenv() { + func Environ() []string { + return syscall.Environ() + } ++ ++func Unsetenv(key string) error { ++ return syscall.Unsetenv(key) ++} +diff --git a/vendor/golang.org/x/sys/unix/env_unset.go b/vendor/golang.org/x/sys/unix/env_unset.go +deleted file mode 100644 +index 92222625..00000000 +--- a/vendor/golang.org/x/sys/unix/env_unset.go ++++ /dev/null +@@ -1,14 +0,0 @@ +-// Copyright 2014 The Go Authors. All rights reserved. +-// Use of this source code is governed by a BSD-style +-// license that can be found in the LICENSE file. +- +-// +build go1.4 +- +-package unix +- +-import "syscall" +- +-func Unsetenv(key string) error { +- // This was added in Go 1.4. +- return syscall.Unsetenv(key) +-} +diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_386.go b/vendor/golang.org/x/sys/unix/errors_freebsd_386.go +index c56bc8b0..761db66e 100644 +--- a/vendor/golang.org/x/sys/unix/errors_freebsd_386.go ++++ b/vendor/golang.org/x/sys/unix/errors_freebsd_386.go +@@ -8,6 +8,7 @@ + package unix + + const ( ++ DLT_HHDLC = 0x79 + IFF_SMART = 0x20 + IFT_1822 = 0x2 + IFT_A12MPPSWITCH = 0x82 +@@ -210,13 +211,18 @@ const ( + IFT_XETHER = 0x1a + IPPROTO_MAXID = 0x34 + IPV6_FAITH = 0x1d ++ IPV6_MIN_MEMBERSHIPS = 0x1f + IP_FAITH = 0x16 ++ IP_MAX_SOURCE_FILTER = 0x400 ++ IP_MIN_MEMBERSHIPS = 0x1f + MAP_NORESERVE = 0x40 + MAP_RENAME = 0x20 + NET_RT_MAXID = 0x6 + RTF_PRCLONING = 0x10000 + RTM_OLDADD = 0x9 + RTM_OLDDEL = 0xa ++ RT_CACHING_CONTEXT = 0x1 ++ RT_NORTREF = 0x2 + SIOCADDRT = 0x8030720a + SIOCALIFADDR = 0x8118691b + SIOCDELRT = 0x8030720b +diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go +index 3e977117..070f44b6 100644 +--- a/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go ++++ b/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go +@@ -8,6 +8,7 @@ + package unix + + const ( ++ DLT_HHDLC = 0x79 + IFF_SMART = 0x20 + IFT_1822 = 0x2 + IFT_A12MPPSWITCH = 0x82 +@@ -210,13 +211,18 @@ const ( + IFT_XETHER = 0x1a + IPPROTO_MAXID = 0x34 + IPV6_FAITH = 0x1d ++ IPV6_MIN_MEMBERSHIPS = 0x1f + IP_FAITH = 0x16 ++ IP_MAX_SOURCE_FILTER = 0x400 ++ IP_MIN_MEMBERSHIPS = 0x1f + MAP_NORESERVE = 0x40 + MAP_RENAME = 0x20 + NET_RT_MAXID = 0x6 + RTF_PRCLONING = 0x10000 + RTM_OLDADD = 0x9 + RTM_OLDDEL = 0xa ++ RT_CACHING_CONTEXT = 0x1 ++ RT_NORTREF = 0x2 + SIOCADDRT = 0x8040720a + SIOCALIFADDR = 0x8118691b + SIOCDELRT = 0x8040720b +diff --git a/vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go +new file mode 100644 +index 00000000..946dcf3f +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go +@@ -0,0 +1,17 @@ ++// Copyright 2020 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// Constants that were deprecated or moved to enums in the FreeBSD headers. Keep ++// them here for backwards compatibility. ++ ++package unix ++ ++const ( ++ DLT_HHDLC = 0x79 ++ IPV6_MIN_MEMBERSHIPS = 0x1f ++ IP_MAX_SOURCE_FILTER = 0x400 ++ IP_MIN_MEMBERSHIPS = 0x1f ++ RT_CACHING_CONTEXT = 0x1 ++ RT_NORTREF = 0x2 ++) +diff --git a/vendor/golang.org/x/sys/unix/flock.go b/vendor/golang.org/x/sys/unix/fcntl.go +similarity index 54% +rename from vendor/golang.org/x/sys/unix/flock.go +rename to vendor/golang.org/x/sys/unix/fcntl.go +index 2994ce75..4dc53486 100644 +--- a/vendor/golang.org/x/sys/unix/flock.go ++++ b/vendor/golang.org/x/sys/unix/fcntl.go +@@ -2,16 +2,30 @@ + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +-// +build darwin dragonfly freebsd linux netbsd openbsd ++// +build dragonfly freebsd linux netbsd openbsd + + package unix + + import "unsafe" + + // fcntl64Syscall is usually SYS_FCNTL, but is overridden on 32-bit Linux +-// systems by flock_linux_32bit.go to be SYS_FCNTL64. ++// systems by fcntl_linux_32bit.go to be SYS_FCNTL64. + var fcntl64Syscall uintptr = SYS_FCNTL + ++func fcntl(fd int, cmd, arg int) (int, error) { ++ valptr, _, errno := Syscall(fcntl64Syscall, uintptr(fd), uintptr(cmd), uintptr(arg)) ++ var err error ++ if errno != 0 { ++ err = errno ++ } ++ return int(valptr), err ++} ++ ++// FcntlInt performs a fcntl syscall on fd with the provided command and argument. ++func FcntlInt(fd uintptr, cmd, arg int) (int, error) { ++ return fcntl(int(fd), cmd, arg) ++} ++ + // FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command. + func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error { + _, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(unsafe.Pointer(lk))) +diff --git a/vendor/golang.org/x/sys/unix/fcntl_darwin.go b/vendor/golang.org/x/sys/unix/fcntl_darwin.go +new file mode 100644 +index 00000000..5868a4a4 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/fcntl_darwin.go +@@ -0,0 +1,18 @@ ++// Copyright 2019 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++package unix ++ ++import "unsafe" ++ ++// FcntlInt performs a fcntl syscall on fd with the provided command and argument. ++func FcntlInt(fd uintptr, cmd, arg int) (int, error) { ++ return fcntl(int(fd), cmd, arg) ++} ++ ++// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command. ++func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error { ++ _, err := fcntl(int(fd), cmd, int(uintptr(unsafe.Pointer(lk)))) ++ return err ++} +diff --git a/vendor/golang.org/x/sys/unix/flock_linux_32bit.go b/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go +similarity index 100% +rename from vendor/golang.org/x/sys/unix/flock_linux_32bit.go +rename to vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go +diff --git a/vendor/golang.org/x/sys/unix/fdset.go b/vendor/golang.org/x/sys/unix/fdset.go +new file mode 100644 +index 00000000..b27be0a0 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/fdset.go +@@ -0,0 +1,29 @@ ++// Copyright 2019 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris ++ ++package unix ++ ++// Set adds fd to the set fds. ++func (fds *FdSet) Set(fd int) { ++ fds.Bits[fd/NFDBITS] |= (1 << (uintptr(fd) % NFDBITS)) ++} ++ ++// Clear removes fd from the set fds. ++func (fds *FdSet) Clear(fd int) { ++ fds.Bits[fd/NFDBITS] &^= (1 << (uintptr(fd) % NFDBITS)) ++} ++ ++// IsSet returns whether fd is in the set fds. ++func (fds *FdSet) IsSet(fd int) bool { ++ return fds.Bits[fd/NFDBITS]&(1<<(uintptr(fd)%NFDBITS)) != 0 ++} ++ ++// Zero clears the set fds. ++func (fds *FdSet) Zero() { ++ for i := range fds.Bits { ++ fds.Bits[i] = 0 ++ } ++} +diff --git a/vendor/golang.org/x/sys/unix/file_unix.go b/vendor/golang.org/x/sys/unix/file_unix.go +deleted file mode 100644 +index 47f6a83f..00000000 +--- a/vendor/golang.org/x/sys/unix/file_unix.go ++++ /dev/null +@@ -1,27 +0,0 @@ +-// Copyright 2017 The Go Authors. All rights reserved. +-// Use of this source code is governed by a BSD-style +-// license that can be found in the LICENSE file. +- +-package unix +- +-import ( +- "os" +- "syscall" +-) +- +-// FIXME: unexported function from os +-// syscallMode returns the syscall-specific mode bits from Go's portable mode bits. +-func syscallMode(i os.FileMode) (o uint32) { +- o |= uint32(i.Perm()) +- if i&os.ModeSetuid != 0 { +- o |= syscall.S_ISUID +- } +- if i&os.ModeSetgid != 0 { +- o |= syscall.S_ISGID +- } +- if i&os.ModeSticky != 0 { +- o |= syscall.S_ISVTX +- } +- // No mapping for Go's ModeTemporary (plan9 only). +- return +-} +diff --git a/vendor/golang.org/x/sys/unix/gccgo.go b/vendor/golang.org/x/sys/unix/gccgo.go +index 94c82321..cd6f5a61 100644 +--- a/vendor/golang.org/x/sys/unix/gccgo.go ++++ b/vendor/golang.org/x/sys/unix/gccgo.go +@@ -1,19 +1,30 @@ +-// Copyright 2015 The Go Authors. All rights reserved. ++// Copyright 2015 The Go Authors. All rights reserved. + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + + // +build gccgo ++// +build !aix + + package unix + + import "syscall" + +-// We can't use the gc-syntax .s files for gccgo. On the plus side ++// We can't use the gc-syntax .s files for gccgo. On the plus side + // much of the functionality can be written directly in Go. + ++//extern gccgoRealSyscallNoError ++func realSyscallNoError(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r uintptr) ++ + //extern gccgoRealSyscall + func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr) + ++func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) { ++ syscall.Entersyscall() ++ r := realSyscallNoError(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0) ++ syscall.Exitsyscall() ++ return r, 0 ++} ++ + func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) { + syscall.Entersyscall() + r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0) +@@ -35,6 +46,11 @@ func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, + return r, 0, syscall.Errno(errno) + } + ++func RawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) { ++ r := realSyscallNoError(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0) ++ return r, 0 ++} ++ + func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) { + r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0) + return r, 0, syscall.Errno(errno) +diff --git a/vendor/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c +index 07f6be03..c44730c5 100644 +--- a/vendor/golang.org/x/sys/unix/gccgo_c.c ++++ b/vendor/golang.org/x/sys/unix/gccgo_c.c +@@ -1,8 +1,9 @@ +-// Copyright 2015 The Go Authors. All rights reserved. ++// Copyright 2015 The Go Authors. All rights reserved. + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + + // +build gccgo ++// +build !aix + + #include <errno.h> + #include <stdint.h> +@@ -31,11 +32,8 @@ gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintp + return r; + } + +-// Define the use function in C so that it is not inlined. +- +-extern void use(void *) __asm__ (GOSYM_PREFIX GOPKGPATH ".use") __attribute__((noinline)); +- +-void +-use(void *p __attribute__ ((unused))) ++uintptr_t ++gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9) + { ++ return syscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9); + } +diff --git a/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go +index bffe1a77..251a977a 100644 +--- a/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go ++++ b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go +@@ -1,4 +1,4 @@ +-// Copyright 2015 The Go Authors. All rights reserved. ++// Copyright 2015 The Go Authors. All rights reserved. + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +diff --git a/vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go b/vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go +deleted file mode 100644 +index 56332692..00000000 +--- a/vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go ++++ /dev/null +@@ -1,20 +0,0 @@ +-// Copyright 2016 The Go Authors. All rights reserved. +-// Use of this source code is governed by a BSD-style +-// license that can be found in the LICENSE file. +- +-// +build gccgo,linux,sparc64 +- +-package unix +- +-import "syscall" +- +-//extern sysconf +-func realSysconf(name int) int64 +- +-func sysconf(name int) (n int64, err syscall.Errno) { +- r := realSysconf(name) +- if r < 0 { +- return 0, syscall.GetErrno() +- } +- return r, 0 +-} +diff --git a/vendor/golang.org/x/sys/unix/ioctl.go b/vendor/golang.org/x/sys/unix/ioctl.go +new file mode 100644 +index 00000000..3559e5dc +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/ioctl.go +@@ -0,0 +1,65 @@ ++// Copyright 2018 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris ++ ++package unix ++ ++import ( ++ "runtime" ++ "unsafe" ++) ++ ++// ioctl itself should not be exposed directly, but additional get/set ++// functions for specific types are permissible. ++ ++// IoctlSetInt performs an ioctl operation which sets an integer value ++// on fd, using the specified request number. ++func IoctlSetInt(fd int, req uint, value int) error { ++ return ioctl(fd, req, uintptr(value)) ++} ++ ++// IoctlSetWinsize performs an ioctl on fd with a *Winsize argument. ++// ++// To change fd's window size, the req argument should be TIOCSWINSZ. ++func IoctlSetWinsize(fd int, req uint, value *Winsize) error { ++ // TODO: if we get the chance, remove the req parameter and ++ // hardcode TIOCSWINSZ. ++ err := ioctl(fd, req, uintptr(unsafe.Pointer(value))) ++ runtime.KeepAlive(value) ++ return err ++} ++ ++// IoctlSetTermios performs an ioctl on fd with a *Termios. ++// ++// The req value will usually be TCSETA or TIOCSETA. ++func IoctlSetTermios(fd int, req uint, value *Termios) error { ++ // TODO: if we get the chance, remove the req parameter. ++ err := ioctl(fd, req, uintptr(unsafe.Pointer(value))) ++ runtime.KeepAlive(value) ++ return err ++} ++ ++// IoctlGetInt performs an ioctl operation which gets an integer value ++// from fd, using the specified request number. ++// ++// A few ioctl requests use the return value as an output parameter; ++// for those, IoctlRetInt should be used instead of this function. ++func IoctlGetInt(fd int, req uint) (int, error) { ++ var value int ++ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value))) ++ return value, err ++} ++ ++func IoctlGetWinsize(fd int, req uint) (*Winsize, error) { ++ var value Winsize ++ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value))) ++ return &value, err ++} ++ ++func IoctlGetTermios(fd int, req uint) (*Termios, error) { ++ var value Termios ++ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value))) ++ return &value, err ++} +diff --git a/vendor/golang.org/x/sys/unix/mkasm_darwin.go b/vendor/golang.org/x/sys/unix/mkasm_darwin.go +new file mode 100644 +index 00000000..6f7bb6ed +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/mkasm_darwin.go +@@ -0,0 +1,78 @@ ++// Copyright 2018 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build ignore ++ ++// mkasm_darwin.go generates assembly trampolines to call libSystem routines from Go. ++//This program must be run after mksyscall.go. ++package main ++ ++import ( ++ "bytes" ++ "fmt" ++ "io/ioutil" ++ "log" ++ "os" ++ "strings" ++) ++ ++func writeASMFile(in string, fileName string, buildTags string) { ++ trampolines := map[string]bool{} ++ ++ var out bytes.Buffer ++ ++ fmt.Fprintf(&out, "// go run mkasm_darwin.go %s\n", strings.Join(os.Args[1:], " ")) ++ fmt.Fprintf(&out, "// Code generated by the command above; DO NOT EDIT.\n") ++ fmt.Fprintf(&out, "\n") ++ fmt.Fprintf(&out, "// +build %s\n", buildTags) ++ fmt.Fprintf(&out, "\n") ++ fmt.Fprintf(&out, "#include \"textflag.h\"\n") ++ for _, line := range strings.Split(in, "\n") { ++ if !strings.HasPrefix(line, "func ") || !strings.HasSuffix(line, "_trampoline()") { ++ continue ++ } ++ fn := line[5 : len(line)-13] ++ if !trampolines[fn] { ++ trampolines[fn] = true ++ fmt.Fprintf(&out, "TEXT ·%s_trampoline(SB),NOSPLIT,$0-0\n", fn) ++ fmt.Fprintf(&out, "\tJMP\t%s(SB)\n", fn) ++ } ++ } ++ err := ioutil.WriteFile(fileName, out.Bytes(), 0644) ++ if err != nil { ++ log.Fatalf("can't write %s: %s", fileName, err) ++ } ++} ++ ++func main() { ++ in1, err := ioutil.ReadFile("syscall_darwin.go") ++ if err != nil { ++ log.Fatalf("can't open syscall_darwin.go: %s", err) ++ } ++ arch := os.Args[1] ++ in2, err := ioutil.ReadFile(fmt.Sprintf("syscall_darwin_%s.go", arch)) ++ if err != nil { ++ log.Fatalf("can't open syscall_darwin_%s.go: %s", arch, err) ++ } ++ in3, err := ioutil.ReadFile(fmt.Sprintf("zsyscall_darwin_%s.go", arch)) ++ if err != nil { ++ log.Fatalf("can't open zsyscall_darwin_%s.go: %s", arch, err) ++ } ++ in := string(in1) + string(in2) + string(in3) ++ ++ writeASMFile(in, fmt.Sprintf("zsyscall_darwin_%s.s", arch), "go1.12") ++ ++ in1, err = ioutil.ReadFile("syscall_darwin.1_13.go") ++ if err != nil { ++ log.Fatalf("can't open syscall_darwin.1_13.go: %s", err) ++ } ++ in2, err = ioutil.ReadFile(fmt.Sprintf("zsyscall_darwin_%s.1_13.go", arch)) ++ if err != nil { ++ log.Fatalf("can't open zsyscall_darwin_%s.1_13.go: %s", arch, err) ++ } ++ ++ in = string(in1) + string(in2) ++ ++ writeASMFile(in, fmt.Sprintf("zsyscall_darwin_%s.1_13.s", arch), "go1.13") ++} +diff --git a/vendor/golang.org/x/sys/unix/mkmerge.go b/vendor/golang.org/x/sys/unix/mkmerge.go +new file mode 100644 +index 00000000..8bde4501 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/mkmerge.go +@@ -0,0 +1,521 @@ ++// Copyright 2020 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build ignore ++ ++// mkmerge.go parses generated source files and merges common ++// consts, funcs, and types into a common source file, per GOOS. ++// ++// Usage: ++// $ go run mkmerge.go -out MERGED FILE [FILE ...] ++// ++// Example: ++// # Remove all common consts, funcs, and types from zerrors_linux_*.go ++// # and write the common code into zerrors_linux.go ++// $ go run mkmerge.go -out zerrors_linux.go zerrors_linux_*.go ++// ++// mkmerge.go performs the merge in the following steps: ++// 1. Construct the set of common code that is idential in all ++// architecture-specific files. ++// 2. Write this common code to the merged file. ++// 3. Remove the common code from all architecture-specific files. ++package main ++ ++import ( ++ "bufio" ++ "bytes" ++ "flag" ++ "fmt" ++ "go/ast" ++ "go/format" ++ "go/parser" ++ "go/token" ++ "io" ++ "io/ioutil" ++ "log" ++ "os" ++ "path" ++ "path/filepath" ++ "regexp" ++ "strconv" ++ "strings" ++) ++ ++const validGOOS = "aix|darwin|dragonfly|freebsd|linux|netbsd|openbsd|solaris" ++ ++// getValidGOOS returns GOOS, true if filename ends with a valid "_GOOS.go" ++func getValidGOOS(filename string) (string, bool) { ++ matches := regexp.MustCompile(`_(` + validGOOS + `)\.go$`).FindStringSubmatch(filename) ++ if len(matches) != 2 { ++ return "", false ++ } ++ return matches[1], true ++} ++ ++// codeElem represents an ast.Decl in a comparable way. ++type codeElem struct { ++ tok token.Token // e.g. token.CONST, token.TYPE, or token.FUNC ++ src string // the declaration formatted as source code ++} ++ ++// newCodeElem returns a codeElem based on tok and node, or an error is returned. ++func newCodeElem(tok token.Token, node ast.Node) (codeElem, error) { ++ var b strings.Builder ++ err := format.Node(&b, token.NewFileSet(), node) ++ if err != nil { ++ return codeElem{}, err ++ } ++ return codeElem{tok, b.String()}, nil ++} ++ ++// codeSet is a set of codeElems ++type codeSet struct { ++ set map[codeElem]bool // true for all codeElems in the set ++} ++ ++// newCodeSet returns a new codeSet ++func newCodeSet() *codeSet { return &codeSet{make(map[codeElem]bool)} } ++ ++// add adds elem to c ++func (c *codeSet) add(elem codeElem) { c.set[elem] = true } ++ ++// has returns true if elem is in c ++func (c *codeSet) has(elem codeElem) bool { return c.set[elem] } ++ ++// isEmpty returns true if the set is empty ++func (c *codeSet) isEmpty() bool { return len(c.set) == 0 } ++ ++// intersection returns a new set which is the intersection of c and a ++func (c *codeSet) intersection(a *codeSet) *codeSet { ++ res := newCodeSet() ++ ++ for elem := range c.set { ++ if a.has(elem) { ++ res.add(elem) ++ } ++ } ++ return res ++} ++ ++// keepCommon is a filterFn for filtering the merged file with common declarations. ++func (c *codeSet) keepCommon(elem codeElem) bool { ++ switch elem.tok { ++ case token.VAR: ++ // Remove all vars from the merged file ++ return false ++ case token.CONST, token.TYPE, token.FUNC, token.COMMENT: ++ // Remove arch-specific consts, types, functions, and file-level comments from the merged file ++ return c.has(elem) ++ case token.IMPORT: ++ // Keep imports, they are handled by filterImports ++ return true ++ } ++ ++ log.Fatalf("keepCommon: invalid elem %v", elem) ++ return true ++} ++ ++// keepArchSpecific is a filterFn for filtering the GOARC-specific files. ++func (c *codeSet) keepArchSpecific(elem codeElem) bool { ++ switch elem.tok { ++ case token.CONST, token.TYPE, token.FUNC: ++ // Remove common consts, types, or functions from the arch-specific file ++ return !c.has(elem) ++ } ++ return true ++} ++ ++// srcFile represents a source file ++type srcFile struct { ++ name string ++ src []byte ++} ++ ++// filterFn is a helper for filter ++type filterFn func(codeElem) bool ++ ++// filter parses and filters Go source code from src, removing top ++// level declarations using keep as predicate. ++// For src parameter, please see docs for parser.ParseFile. ++func filter(src interface{}, keep filterFn) ([]byte, error) { ++ // Parse the src into an ast ++ fset := token.NewFileSet() ++ f, err := parser.ParseFile(fset, "", src, parser.ParseComments) ++ if err != nil { ++ return nil, err ++ } ++ cmap := ast.NewCommentMap(fset, f, f.Comments) ++ ++ // Group const/type specs on adjacent lines ++ var groups specGroups = make(map[string]int) ++ var groupID int ++ ++ decls := f.Decls ++ f.Decls = f.Decls[:0] ++ for _, decl := range decls { ++ switch decl := decl.(type) { ++ case *ast.GenDecl: ++ // Filter imports, consts, types, vars ++ specs := decl.Specs ++ decl.Specs = decl.Specs[:0] ++ for i, spec := range specs { ++ elem, err := newCodeElem(decl.Tok, spec) ++ if err != nil { ++ return nil, err ++ } ++ ++ // Create new group if there are empty lines between this and the previous spec ++ if i > 0 && fset.Position(specs[i-1].End()).Line < fset.Position(spec.Pos()).Line-1 { ++ groupID++ ++ } ++ ++ // Check if we should keep this spec ++ if keep(elem) { ++ decl.Specs = append(decl.Specs, spec) ++ groups.add(elem.src, groupID) ++ } ++ } ++ // Check if we should keep this decl ++ if len(decl.Specs) > 0 { ++ f.Decls = append(f.Decls, decl) ++ } ++ case *ast.FuncDecl: ++ // Filter funcs ++ elem, err := newCodeElem(token.FUNC, decl) ++ if err != nil { ++ return nil, err ++ } ++ if keep(elem) { ++ f.Decls = append(f.Decls, decl) ++ } ++ } ++ } ++ ++ // Filter file level comments ++ if cmap[f] != nil { ++ commentGroups := cmap[f] ++ cmap[f] = cmap[f][:0] ++ for _, cGrp := range commentGroups { ++ if keep(codeElem{token.COMMENT, cGrp.Text()}) { ++ cmap[f] = append(cmap[f], cGrp) ++ } ++ } ++ } ++ f.Comments = cmap.Filter(f).Comments() ++ ++ // Generate code for the filtered ast ++ var buf bytes.Buffer ++ if err = format.Node(&buf, fset, f); err != nil { ++ return nil, err ++ } ++ ++ groupedSrc, err := groups.filterEmptyLines(&buf) ++ if err != nil { ++ return nil, err ++ } ++ ++ return filterImports(groupedSrc) ++} ++ ++// getCommonSet returns the set of consts, types, and funcs that are present in every file. ++func getCommonSet(files []srcFile) (*codeSet, error) { ++ if len(files) == 0 { ++ return nil, fmt.Errorf("no files provided") ++ } ++ // Use the first architecture file as the baseline ++ baseSet, err := getCodeSet(files[0].src) ++ if err != nil { ++ return nil, err ++ } ++ ++ // Compare baseline set with other architecture files: discard any element, ++ // that doesn't exist in other architecture files. ++ for _, f := range files[1:] { ++ set, err := getCodeSet(f.src) ++ if err != nil { ++ return nil, err ++ } ++ ++ baseSet = baseSet.intersection(set) ++ } ++ return baseSet, nil ++} ++ ++// getCodeSet returns the set of all top-level consts, types, and funcs from src. ++// src must be string, []byte, or io.Reader (see go/parser.ParseFile docs) ++func getCodeSet(src interface{}) (*codeSet, error) { ++ set := newCodeSet() ++ ++ fset := token.NewFileSet() ++ f, err := parser.ParseFile(fset, "", src, parser.ParseComments) ++ if err != nil { ++ return nil, err ++ } ++ ++ for _, decl := range f.Decls { ++ switch decl := decl.(type) { ++ case *ast.GenDecl: ++ // Add const, and type declarations ++ if !(decl.Tok == token.CONST || decl.Tok == token.TYPE) { ++ break ++ } ++ ++ for _, spec := range decl.Specs { ++ elem, err := newCodeElem(decl.Tok, spec) ++ if err != nil { ++ return nil, err ++ } ++ ++ set.add(elem) ++ } ++ case *ast.FuncDecl: ++ // Add func declarations ++ elem, err := newCodeElem(token.FUNC, decl) ++ if err != nil { ++ return nil, err ++ } ++ ++ set.add(elem) ++ } ++ } ++ ++ // Add file level comments ++ cmap := ast.NewCommentMap(fset, f, f.Comments) ++ for _, cGrp := range cmap[f] { ++ set.add(codeElem{token.COMMENT, cGrp.Text()}) ++ } ++ ++ return set, nil ++} ++ ++// importName returns the identifier (PackageName) for an imported package ++func importName(iSpec *ast.ImportSpec) (string, error) { ++ if iSpec.Name == nil { ++ name, err := strconv.Unquote(iSpec.Path.Value) ++ if err != nil { ++ return "", err ++ } ++ return path.Base(name), nil ++ } ++ return iSpec.Name.Name, nil ++} ++ ++// specGroups tracks grouped const/type specs with a map of line: groupID pairs ++type specGroups map[string]int ++ ++// add spec source to group ++func (s specGroups) add(src string, groupID int) error { ++ srcBytes, err := format.Source(bytes.TrimSpace([]byte(src))) ++ if err != nil { ++ return err ++ } ++ s[string(srcBytes)] = groupID ++ return nil ++} ++ ++// filterEmptyLines removes empty lines within groups of const/type specs. ++// Returns the filtered source. ++func (s specGroups) filterEmptyLines(src io.Reader) ([]byte, error) { ++ scanner := bufio.NewScanner(src) ++ var out bytes.Buffer ++ ++ var emptyLines bytes.Buffer ++ prevGroupID := -1 // Initialize to invalid group ++ for scanner.Scan() { ++ line := bytes.TrimSpace(scanner.Bytes()) ++ ++ if len(line) == 0 { ++ fmt.Fprintf(&emptyLines, "%s\n", scanner.Bytes()) ++ continue ++ } ++ ++ // Discard emptyLines if previous non-empty line belonged to the same ++ // group as this line ++ if src, err := format.Source(line); err == nil { ++ groupID, ok := s[string(src)] ++ if ok && groupID == prevGroupID { ++ emptyLines.Reset() ++ } ++ prevGroupID = groupID ++ } ++ ++ emptyLines.WriteTo(&out) ++ fmt.Fprintf(&out, "%s\n", scanner.Bytes()) ++ } ++ if err := scanner.Err(); err != nil { ++ return nil, err ++ } ++ return out.Bytes(), nil ++} ++ ++// filterImports removes unused imports from fileSrc, and returns a formatted src. ++func filterImports(fileSrc []byte) ([]byte, error) { ++ fset := token.NewFileSet() ++ file, err := parser.ParseFile(fset, "", fileSrc, parser.ParseComments) ++ if err != nil { ++ return nil, err ++ } ++ cmap := ast.NewCommentMap(fset, file, file.Comments) ++ ++ // create set of references to imported identifiers ++ keepImport := make(map[string]bool) ++ for _, u := range file.Unresolved { ++ keepImport[u.Name] = true ++ } ++ ++ // filter import declarations ++ decls := file.Decls ++ file.Decls = file.Decls[:0] ++ for _, decl := range decls { ++ importDecl, ok := decl.(*ast.GenDecl) ++ ++ // Keep non-import declarations ++ if !ok || importDecl.Tok != token.IMPORT { ++ file.Decls = append(file.Decls, decl) ++ continue ++ } ++ ++ // Filter the import specs ++ specs := importDecl.Specs ++ importDecl.Specs = importDecl.Specs[:0] ++ for _, spec := range specs { ++ iSpec := spec.(*ast.ImportSpec) ++ name, err := importName(iSpec) ++ if err != nil { ++ return nil, err ++ } ++ ++ if keepImport[name] { ++ importDecl.Specs = append(importDecl.Specs, iSpec) ++ } ++ } ++ if len(importDecl.Specs) > 0 { ++ file.Decls = append(file.Decls, importDecl) ++ } ++ } ++ ++ // filter file.Imports ++ imports := file.Imports ++ file.Imports = file.Imports[:0] ++ for _, spec := range imports { ++ name, err := importName(spec) ++ if err != nil { ++ return nil, err ++ } ++ ++ if keepImport[name] { ++ file.Imports = append(file.Imports, spec) ++ } ++ } ++ file.Comments = cmap.Filter(file).Comments() ++ ++ var buf bytes.Buffer ++ err = format.Node(&buf, fset, file) ++ if err != nil { ++ return nil, err ++ } ++ ++ return buf.Bytes(), nil ++} ++ ++// merge extracts duplicate code from archFiles and merges it to mergeFile. ++// 1. Construct commonSet: the set of code that is idential in all archFiles. ++// 2. Write the code in commonSet to mergedFile. ++// 3. Remove the commonSet code from all archFiles. ++func merge(mergedFile string, archFiles ...string) error { ++ // extract and validate the GOOS part of the merged filename ++ goos, ok := getValidGOOS(mergedFile) ++ if !ok { ++ return fmt.Errorf("invalid GOOS in merged file name %s", mergedFile) ++ } ++ ++ // Read architecture files ++ var inSrc []srcFile ++ for _, file := range archFiles { ++ src, err := ioutil.ReadFile(file) ++ if err != nil { ++ return fmt.Errorf("cannot read archfile %s: %w", file, err) ++ } ++ ++ inSrc = append(inSrc, srcFile{file, src}) ++ } ++ ++ // 1. Construct the set of top-level declarations common for all files ++ commonSet, err := getCommonSet(inSrc) ++ if err != nil { ++ return err ++ } ++ if commonSet.isEmpty() { ++ // No common code => do not modify any files ++ return nil ++ } ++ ++ // 2. Write the merged file ++ mergedSrc, err := filter(inSrc[0].src, commonSet.keepCommon) ++ if err != nil { ++ return err ++ } ++ ++ f, err := os.Create(mergedFile) ++ if err != nil { ++ return err ++ } ++ ++ buf := bufio.NewWriter(f) ++ fmt.Fprintln(buf, "// Code generated by mkmerge.go; DO NOT EDIT.") ++ fmt.Fprintln(buf) ++ fmt.Fprintf(buf, "// +build %s\n", goos) ++ fmt.Fprintln(buf) ++ buf.Write(mergedSrc) ++ ++ err = buf.Flush() ++ if err != nil { ++ return err ++ } ++ err = f.Close() ++ if err != nil { ++ return err ++ } ++ ++ // 3. Remove duplicate declarations from the architecture files ++ for _, inFile := range inSrc { ++ src, err := filter(inFile.src, commonSet.keepArchSpecific) ++ if err != nil { ++ return err ++ } ++ err = ioutil.WriteFile(inFile.name, src, 0644) ++ if err != nil { ++ return err ++ } ++ } ++ return nil ++} ++ ++func main() { ++ var mergedFile string ++ flag.StringVar(&mergedFile, "out", "", "Write merged code to `FILE`") ++ flag.Parse() ++ ++ // Expand wildcards ++ var filenames []string ++ for _, arg := range flag.Args() { ++ matches, err := filepath.Glob(arg) ++ if err != nil { ++ fmt.Fprintf(os.Stderr, "Invalid command line argument %q: %v\n", arg, err) ++ os.Exit(1) ++ } ++ filenames = append(filenames, matches...) ++ } ++ ++ if len(filenames) < 2 { ++ // No need to merge ++ return ++ } ++ ++ err := merge(mergedFile, filenames...) ++ if err != nil { ++ fmt.Fprintf(os.Stderr, "Merge failed with error: %v\n", err) ++ os.Exit(1) ++ } ++} +diff --git a/vendor/golang.org/x/sys/unix/mkpost.go b/vendor/golang.org/x/sys/unix/mkpost.go +index d3ff659b..5ee1a16b 100644 +--- a/vendor/golang.org/x/sys/unix/mkpost.go ++++ b/vendor/golang.org/x/sys/unix/mkpost.go +@@ -28,10 +28,10 @@ func main() { + if goarch == "" { + goarch = os.Getenv("GOARCH") + } +- // Check that we are using the new build system if we should be. +- if goos == "linux" && goarch != "sparc64" { ++ // Check that we are using the Docker-based build system if we should be. ++ if goos == "linux" { + if os.Getenv("GOLANG_SYS_BUILD") != "docker" { +- os.Stderr.WriteString("In the new build system, mkpost should not be called directly.\n") ++ os.Stderr.WriteString("In the Docker-based build system, mkpost should not be called directly.\n") + os.Stderr.WriteString("See README.md\n") + os.Exit(1) + } +@@ -42,6 +42,21 @@ func main() { + log.Fatal(err) + } + ++ if goos == "aix" { ++ // Replace type of Atim, Mtim and Ctim by Timespec in Stat_t ++ // to avoid having both StTimespec and Timespec. ++ sttimespec := regexp.MustCompile(`_Ctype_struct_st_timespec`) ++ b = sttimespec.ReplaceAll(b, []byte("Timespec")) ++ } ++ ++ // Intentionally export __val fields in Fsid and Sigset_t ++ valRegex := regexp.MustCompile(`type (Fsid|Sigset_t) struct {(\s+)X__(bits|val)(\s+\S+\s+)}`) ++ b = valRegex.ReplaceAll(b, []byte("type $1 struct {${2}Val$4}")) ++ ++ // Intentionally export __fds_bits field in FdSet ++ fdSetRegex := regexp.MustCompile(`type (FdSet) struct {(\s+)X__fds_bits(\s+\S+\s+)}`) ++ b = fdSetRegex.ReplaceAll(b, []byte("type $1 struct {${2}Bits$3}")) ++ + // If we have empty Ptrace structs, we should delete them. Only s390x emits + // nonempty Ptrace structs. + ptraceRexexp := regexp.MustCompile(`type Ptrace((Psw|Fpregs|Per) struct {\s*})`) +@@ -56,16 +71,31 @@ func main() { + removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`) + b = removeFieldsRegex.ReplaceAll(b, []byte("_")) + +- // We refuse to export private fields on s390x +- if goarch == "s390x" && goos == "linux" { +- // Remove cgo padding fields +- removeFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`) +- b = removeFieldsRegex.ReplaceAll(b, []byte("_")) ++ // Convert [65]int8 to [65]byte in Utsname members to simplify ++ // conversion to string; see golang.org/issue/20753 ++ convertUtsnameRegex := regexp.MustCompile(`((Sys|Node|Domain)name|Release|Version|Machine)(\s+)\[(\d+)\]u?int8`) ++ b = convertUtsnameRegex.ReplaceAll(b, []byte("$1$3[$4]byte")) + +- // Remove padding, hidden, or unused fields +- removeFieldsRegex = regexp.MustCompile(`X_\S+`) +- b = removeFieldsRegex.ReplaceAll(b, []byte("_")) +- } ++ // Convert [n]int8 to [n]byte in Statvfs_t members to simplify ++ // conversion to string. ++ convertStatvfsRegex := regexp.MustCompile(`((Fstype|Mnton|Mntfrom)name)(\s+)\[(\d+)\]int8`) ++ b = convertStatvfsRegex.ReplaceAll(b, []byte("$1$3[$4]byte")) ++ ++ // Convert [1024]int8 to [1024]byte in Ptmget members ++ convertPtmget := regexp.MustCompile(`([SC]n)(\s+)\[(\d+)\]u?int8`) ++ b = convertPtmget.ReplaceAll(b, []byte("$1[$3]byte")) ++ ++ // Remove spare fields (e.g. in Statx_t) ++ spareFieldsRegex := regexp.MustCompile(`X__spare\S*`) ++ b = spareFieldsRegex.ReplaceAll(b, []byte("_")) ++ ++ // Remove cgo padding fields ++ removePaddingFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`) ++ b = removePaddingFieldsRegex.ReplaceAll(b, []byte("_")) ++ ++ // Remove padding, hidden, or unused fields ++ removeFieldsRegex = regexp.MustCompile(`\b(X_\S+|Padding)`) ++ b = removeFieldsRegex.ReplaceAll(b, []byte("_")) + + // Remove the first line of warning from cgo + b = b[bytes.IndexByte(b, '\n')+1:] +@@ -78,6 +108,15 @@ func main() { + cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`) + b = cgoCommandRegex.ReplaceAll(b, []byte(replacement)) + ++ // Rename Stat_t time fields ++ if goos == "freebsd" && goarch == "386" { ++ // Hide Stat_t.[AMCB]tim_ext fields ++ renameStatTimeExtFieldsRegex := regexp.MustCompile(`[AMCB]tim_ext`) ++ b = renameStatTimeExtFieldsRegex.ReplaceAll(b, []byte("_")) ++ } ++ renameStatTimeFieldsRegex := regexp.MustCompile(`([AMCB])(?:irth)?time?(?:spec)?\s+(Timespec|StTimespec)`) ++ b = renameStatTimeFieldsRegex.ReplaceAll(b, []byte("${1}tim ${2}")) ++ + // gofmt + b, err = format.Source(b) + if err != nil { +diff --git a/vendor/golang.org/x/sys/unix/mksyscall.go b/vendor/golang.org/x/sys/unix/mksyscall.go +new file mode 100644 +index 00000000..9e540cc8 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/mksyscall.go +@@ -0,0 +1,402 @@ ++// Copyright 2018 The Go Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style ++// license that can be found in the LICENSE file. ++ ++// +build ignore ++ ++/* ++This program reads a file containing function prototypes ++(like syscall_darwin.go) and generates system call bodies. ++The prototypes are marked by lines beginning with "//sys" ++and read like func declarations if //sys is replaced by func, but: ++ * The parameter lists must give a name for each argument. ++ This includes return parameters. ++ * The parameter lists must give a type for each argument: ++ the (x, y, z int) shorthand is not allowed. ++ * If the return parameter is an error number, it must be named errno. ++ ++A line beginning with //sysnb is like //sys, except that the ++goroutine will not be suspended during the execution of the system ++call. This must only be used for system calls which can never ++block, as otherwise the system call could cause all goroutines to ++hang. ++*/ ++package main ++ ++import ( ++ "bufio" ++ "flag" ++ "fmt" ++ "os" ++ "regexp" ++ "strings" ++) ++ ++var ( ++ b32 = flag.Bool("b32", false, "32bit big-endian") ++ l32 = flag.Bool("l32", false, "32bit little-endian") ++ plan9 = flag.Bool("plan9", false, "plan9") ++ openbsd = flag.Bool("openbsd", false, "openbsd") ++ netbsd = flag.Bool("netbsd", false, "netbsd") ++ dragonfly = flag.Bool("dragonfly", false, "dragonfly") ++ arm = flag.Bool("arm", false, "arm") // 64-bit value should use (even, odd)-pair ++ tags = flag.String("tags", "", "build tags") ++ filename = flag.String("output", "", "output file name (standard output if omitted)") ++) ++ ++// cmdLine returns this programs's commandline arguments ++func cmdLine() string { ++ return "go run mksyscall.go " + strings.Join(os.Args[1:], " ") ++} ++ ++// buildTags returns build tags ++func buildTags() string { ++ return *tags ++} ++ ++// Param is function parameter ++type Param struct { ++ Name string ++ Type string ++} ++ ++// usage prints the program usage ++func usage() { ++ fmt.Fprintf(os.Stderr, "usage: go run mksyscall.go [-b32 | -l32] [-tags x,y] [file ...]\n") ++ os.Exit(1) ++} ++ ++// parseParamList parses parameter list and returns a slice of parameters ++func parseParamList(list string) []string { ++ list = strings.TrimSpace(list) ++ if list == "" { ++ return []string{} ++ } ++ return regexp.MustCompile(`\s*,\s*`).Split(list, -1) ++} ++ ++// parseParam splits a parameter into name and type ++func parseParam(p string) Param { ++ ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) ++ if ps == nil { ++ fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) ++ os.Exit(1) ++ } ++ return Param{ps[1], ps[2]} ++} ++ ++func main() { ++ // Get the OS and architecture (using GOARCH_TARGET if it exists) ++ goos := os.Getenv("GOOS") ++ if goos == "" { ++ fmt.Fprintln(os.Stderr, "GOOS not defined in environment") ++ os.Exit(1) ++ } ++ goarch := os.Getenv("GOARCH_TARGET") ++ if goarch == "" { ++ goarch = os.Getenv("GOARCH") ++ } ++ ++ // Check that we are using the Docker-based build system if we should ++ if goos == "linux" { ++ if os.Getenv("GOLANG_SYS_BUILD") != "docker" { ++ fmt.Fprintf(os.Stderr, "In the Docker-based build system, mksyscall should not be called directly.\n") ++ fmt.Fprintf(os.Stderr, "See README.md\n") ++ os.Exit(1) ++ } ++ } ++ ++ flag.Usage = usage ++ flag.Parse() ++ if len(flag.Args()) <= 0 { ++ fmt.Fprintf(os.Stderr, "no files to parse provided\n") ++ usage() ++ } ++ ++ endianness := "" ++ if *b32 { ++ endianness = "big-endian" ++ } else if *l32 { ++ endianness = "little-endian" ++ } ++ ++ libc := false ++ if goos == "darwin" && (strings.Contains(buildTags(), ",go1.12") || strings.Contains(buildTags(), ",go1.13")) { ++ libc = true ++ } ++ trampolines := map[string]bool{} ++ ++ text := "" ++ for _, path := range flag.Args() { ++ file, err := os.Open(path) ++ if err != nil { ++ fmt.Fprintf(os.Stderr, err.Error()) ++ os.Exit(1) ++ } ++ s := bufio.NewScanner(file) ++ for s.Scan() { ++ t := s.Text() ++ t = strings.TrimSpace(t) ++ t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) ++ nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) ++ if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { ++ continue ++ } ++ ++ // Line must be of the form ++ // func Open(path string, mode int, perm int) (fd int, errno error) ++ // Split into name, in params, out params. ++ f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*((?i)SYS_[A-Z0-9_]+))?$`).FindStringSubmatch(t) ++ if f == nil { ++ fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) ++ os.Exit(1) ++ } ++ funct, inps, outps, sysname := f[2], f[3], f[4], f[5] ++ ++ // ClockGettime doesn't have a syscall number on Darwin, only generate libc wrappers. ++ if goos == "darwin" && !libc && funct == "ClockGettime" { ++ continue ++ } ++ ++ // Split argument lists on comma. ++ in := parseParamList(inps) ++ out := parseParamList(outps) ++ ++ // Try in vain to keep people from editing this file. ++ // The theory is that they jump into the middle of the file ++ // without reading the header. ++ text += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" ++ ++ // Go function header. ++ outDecl := "" ++ if len(out) > 0 { ++ outDecl = fmt.Sprintf(" (%s)", strings.Join(out, ", ")) ++ } ++ text += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outDecl) ++ ++ // Check if err return available ++ errvar := "" ++ for _, param := range out { ++ p := parseParam(param) ++ if p.Type == "error" { ++ errvar = p.Name ++ break ++ } ++ } ++ ++ // Prepare arguments to Syscall. ++ var args []string ++ n := 0 ++ for _, param := range in { ++ p := parseParam(param) ++ if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { ++ args = append(args, "uintptr(unsafe.Pointer("+p.Name+"))") ++ } else if p.Type == "string" && errvar != "" { ++ text += fmt.Sprintf("\tvar _p%d *byte\n", n) ++ text += fmt.Sprintf("\t_p%d, %s = BytePtrFromString(%s)\n", n, errvar, p.Name) ++ text += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) ++ args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) ++ n++ ++ } else if p.Type == "string" { ++ fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") ++ text += fmt.Sprintf("\tvar _p%d *byte\n", n) ++ text += fmt.Sprintf("\t_p%d, _ = BytePtrFromString(%s)\n", n, p.Name) ++ args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) ++ n++ ++ } else if regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type) != nil { ++ // Convert slice into pointer, length. ++ // Have to be careful not to take address of &a[0] if len == 0: ++ // pass dummy pointer in that case. ++ // Used to pass nil, but some OSes or simulators reject write(fd, nil, 0). ++ text += fmt.Sprintf("\tvar _p%d unsafe.Pointer\n", n) ++ text += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = unsafe.Pointer(&%s[0])\n\t}", p.Name, n, p.Name) ++ text += fmt.Sprintf(" else {\n\t\t_p%d = unsafe.Pointer(&_zero)\n\t}\n", n) ++ args = append(args, fmt.Sprintf("uintptr(_p%d)", n), fmt.Sprintf("uintptr(len(%s))", p.Name)) ++ n++ ++ } else if p.Type == "int64" && (*openbsd || *netbsd) { ++ args = append(args, "0") ++ if endianness == "big-endian" { ++ args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) ++ } else if endianness == "little-endian" { ++ args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) ++ } else { ++ args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) ++ } ++ } else if p.Type == "int64" && *dragonfly { ++ if regexp.MustCompile(`^(?i)extp(read|write)`).FindStringSubmatch(funct) == nil { ++ args = append(args, "0") ++ } ++ if endianness == "big-endian" { ++ args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) ++ } else if endianness == "little-endian" { ++ args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) ++ } else { ++ args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) ++ } ++ } else if (p.Type == "int64" || p.Type == "uint64") && endianness != "" { ++ if len(args)%2 == 1 && *arm { ++ // arm abi specifies 64-bit argument uses ++ // (even, odd) pair ++ args = append(args, "0") ++ } ++ if endianness == "big-endian" { ++ args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) ++ } else { ++ args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) ++ } ++ } else { ++ args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) ++ } ++ } ++ ++ // Determine which form to use; pad args with zeros.
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/go/go-dep_0.5.4.bb +1 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.1
Part of the diff is not shown here. View the raw message.
PATCH 12/20 ptest: append to FILES
In reply to Steve SakomanFrom: Konrad Weihmann <[email protected]>
as ptest FILES could be determined before or after the classes was inherited, if is much safer to append to the setting of FILES_${PN}-ptest
--- meta/classes/ptest.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/ptest.bbclass +1 -1
@@ -6,7 +6,7 @@ PTEST_PATH ?= "${libdir}/${BPN}/ptest" PTEST_BUILD_HOST_FILES ?= "Makefile" PTEST_BUILD_HOST_PATTERN ?= "" -FILES_${PN}-ptest = "${PTEST_PATH}" +FILES_${PN}-ptest += "${PTEST_PATH}" SECTION_${PN}-ptest = "devel" ALLOW_EMPTY_${PN}-ptest = "1" PTEST_ENABLED = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '1', '0', d)}"
Signature · 1 line
2.17.1
PATCH 13/20 nativesdk: clear MACHINE_FEATURES
In reply to Steve SakomanFrom: Douglas <[email protected]>
Further to 96c20c9df7:
Try to avoid nativesdk recipes accidentally being dependent on MACHINE_FEATURES.
--- meta/classes/nativesdk.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes/nativesdk.bbclass +1 -0
@@ -9,6 +9,7 @@ NATIVESDKLIBC ?= "libc-glibc" LIBCOVERRIDE = ":${NATIVESDKLIBC}" CLASSOVERRIDE = "class-nativesdk" MACHINEOVERRIDES = "" +MACHINE_FEATURES = "" MULTILIBS = ""
Signature · 1 line
2.17.1
PATCH 14/20 nativesdk: Set the CXXFLAGS to the BUILDSDK_CXXFLAGS
In reply to Steve SakomanFrom: Douglas <[email protected]>
... which default to the BUILDSDK_CFLAGS in any case.
--- meta/classes/nativesdk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/nativesdk.bbclass +1 -1
@@ -58,7 +58,7 @@ EXTRA_OECONF_GCC_FLOAT = "" CPPFLAGS = "${BUILDSDK_CPPFLAGS}" CFLAGS = "${BUILDSDK_CFLAGS}" -CXXFLAGS = "${BUILDSDK_CFLAGS}" +CXXFLAGS = "${BUILDSDK_CXXFLAGS}" LDFLAGS = "${BUILDSDK_LDFLAGS}" # Change to place files in SDKPATH
Signature · 1 line
2.17.1
PATCH 15/20 lib/oe/recipeutils.py: add AUTHOR; BBCLASSEXTEND
In reply to Steve SakomanFrom: Tim Orling <[email protected]>
If you try to create a plugin for recipetool that adds the AUTHOR field, it is impossible to put it in the recommended position [1] without adding to the recipe_progression variable.
While we are at it, also add BBCLASSEXTEND at the
end, as also recommended by [1].
[1] http://www.openembedded.org/wiki/Styleguide
--- meta/lib/oe/recipeutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/recipeutils.py +1 -1
@@ -24,7 +24,7 @@ from collections import OrderedDict, defaultdict from bb.utils import vercmp_string # Help us to find places to insert values -recipe_progression = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LICENSE_FLAGS', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRCREV', 'SRCPV', 'SRC_URI', 'S', 'do_fetch()', 'do_unpack()', 'do_patch()', 'EXTRA_OECONF', 'EXTRA_OECMAKE', 'EXTRA_OESCONS', 'do_configure()', 'EXTRA_OEMAKE', 'do_compile()', 'do_install()', 'do_populate_sysroot()', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'populate_packages()', 'do_package()', 'do_deploy()'] +recipe_progression = ['SUMMARY', 'DESCRIPTION', 'AUTHOR', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LICENSE_FLAGS', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRCREV', 'SRCPV', 'SRC_URI', 'S', 'do_fetch()', 'do_unpack()', 'do_patch()', 'EXTRA_OECONF', 'EXTRA_OECMAKE', 'EXTRA_OESCONS', 'do_configure()', 'EXTRA_OEMAKE', 'do_compile()', 'do_install()', 'do_populate_sysroot()', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'populate_packages()', 'do_package()', 'do_deploy()', 'BBCLASSEXTEND'] # Variables that sometimes are a bit long but shouldn't be wrapped nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER', r'SRC_URI\[(.+\.)?md5sum\]', r'SRC_URI\[(.+\.)?sha256sum\]'] list_vars = ['SRC_URI', 'LIC_FILES_CHKSUM']
Signature · 1 line
2.17.1
PATCH 16/20 scripts/lib/recipetool/create.py: fix regex strings
In reply to Steve SakomanFrom: Tim Orling <[email protected]>
Python now expects regex strings to be prepended with r. Silence pylint/autopep8 and similar warnings by identifying these regex patterns as... regex patterns.
--- scripts/lib/recipetool/create.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
scripts/lib/recipetool/create.py +5 -5
@@ -66,7 +66,7 @@ class RecipeHandler(object): libdir = d.getVar('libdir') base_libdir = d.getVar('base_libdir') libpaths = list(set([base_libdir, libdir])) - libname_re = re.compile('^lib(.+)\.so.*$') + libname_re = re.compile(r'^lib(.+)\.so.*$') pkglibmap = {} for lib, item in shlib_providers.items(): for path, pkg in item.items():
@@ -428,7 +428,7 @@ def create_recipe(args): if scriptutils.is_src_url(source): # Warn about github archive URLs - if re.match('https?://github.com/[^/]+/[^/]+/archive/.+(\.tar\..*|\.zip)$', source): + if re.match(r'https?://github.com/[^/]+/[^/]+/archive/.+(\.tar\..*|\.zip)$', source): logger.warning('github archive files are not guaranteed to be stable and may be re-generated over time. If the latter occurs, the checksums will likely change and the recipe will fail at do_fetch. It is recommended that you point to an actual commit or tag in the repository instead (using the repository URL in conjunction with the -S/--srcrev option).') # Fetch a URL fetchuri = reformat_git_uri(urldefrag(source)[0])
@@ -830,7 +830,7 @@ def create_recipe(args): elif line.startswith('PV = '): if realpv: # Replace the first part of the PV value - line = re.sub('"[^+]*\+', '"%s+' % realpv, line) + line = re.sub(r'"[^+]*\+', '"%s+' % realpv, line) lines_before.append(line) if args.also_native:
@@ -1066,8 +1066,8 @@ def crunch_license(licfile): import oe.utils # Note: these are carefully constructed! - license_title_re = re.compile('^\(?(#+ *)?(The )?.{1,10} [Ll]icen[sc]e( \(.{1,10}\))?\)?:?$') - license_statement_re = re.compile('^(This (project|software) is( free software)? (released|licen[sc]ed)|(Released|Licen[cs]ed)) under the .{1,10} [Ll]icen[sc]e:?$') + license_title_re = re.compile(r'^\(?(#+ *)?(The )?.{1,10} [Ll]icen[sc]e( \(.{1,10}\))?\)?:?$') + license_statement_re = re.compile(r'^(This (project|software) is( free software)? (released|licen[sc]ed)|(Released|Licen[cs]ed)) under the .{1,10} [Ll]icen[sc]e:?$') copyright_re = re.compile('^(#+)? *Copyright .*$') crunched_md5sums = {}
Signature · 1 line
2.17.1
PATCH 17/20 babeltrace: correct the git SRC_URI
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
The previous one seems to be gone.
--- meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb | 2 +- meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0 \ file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ file://0001-Make-manpages-multilib-identical.patch \
meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \ +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.5 \ file://run-ptest \ " SRCREV = "054a54ae10b01a271afc4f19496c041b10fb414c"
Signature · 1 line
2.17.1
PATCH 18/20 qemurunner: Ensure pid location is deterministic
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
The pid location could vary due to changes in cwd as only a filename is specified, not a full path. This in theory could be resulting in some of our autobuilder failures. Whilst its difficult to know if this is causing a problem, Using a full path removes any question of such an issue.
--- meta/lib/oeqa/utils/qemurunner.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/lib/oeqa/utils/qemurunner.py +4 -2
@@ -32,7 +32,7 @@ re_control_char = re.compile('[%s]' % re.escape("".join(control_chars))) class QemuRunner: def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, - use_kvm, logger, use_slirp=False, serial_ports=2, boot_patterns = defaultdict(str), use_ovmf=False): + use_kvm, logger, use_slirp=False, serial_ports=2, boot_patterns = defaultdict(str), use_ovmf=False, workdir=None): # Popen object for runqemu self.runqemu = None
@@ -63,7 +63,9 @@ class QemuRunner: self.boot_patterns = boot_patterns self.runqemutime = 120 - self.qemu_pidfile = 'pidfile_'+str(os.getpid()) + if not workdir: + workdir = os.getcwd() + self.qemu_pidfile = workdir + '/pidfile_' + str(os.getpid()) self.host_dumper = HostDumper(dump_host_cmds, dump_dir) self.monitorpipe = None
Signature · 1 line
2.17.1
PATCH 19/20 qemurunner: Add extra debug info when qemu fails to start
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
When qemu fails to start we're struggling to work out why. Add more debug info which can at least confirm/rule out various things.
This code is only on the error handling path and more info shoudl help us debug issues.
--- meta/lib/oeqa/utils/qemurunner.py | 9 +++++++++ 1 file changed, 9 insertions(+)
meta/lib/oeqa/utils/qemurunner.py +9 -0
@@ -254,6 +254,15 @@ class QemuRunner: if not self.is_alive(): self.logger.error("Qemu pid didn't appear in %s seconds (%s)" % (self.runqemutime, time.strftime("%D %H:%M:%S"))) + + qemu_pid = None + if os.path.isfile(self.qemu_pidfile): + with open(self.qemu_pidfile, 'r') as f: + qemu_pid = f.read().strip() + + self.logger.error("Status information, poll status: %s, pidfile exists: %s, pidfile contents %s, proc pid exists %s" + % (self.runqemu.poll(), os.path.isfile(self.qemu_pidfile), str(qemu_pid), os.path.exists("/proc/" + qemu_pid))) + # Dump all processes to help us to figure out what is going on... ps = subprocess.Popen(['ps', 'axww', '-o', 'pid,ppid,command '], stdout=subprocess.PIPE).communicate()[0] processes = ps.decode("utf-8")
Signature · 1 line
2.17.1
PATCH 20/20 oeqa/utils/qemurunner: Fix missing pid file tracebacks
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
One element of the error message guarded against None as a value but I missed the other, fix this.
--- meta/lib/oeqa/utils/qemurunner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/utils/qemurunner.py +1 -1
@@ -261,7 +261,7 @@ class QemuRunner: qemu_pid = f.read().strip() self.logger.error("Status information, poll status: %s, pidfile exists: %s, pidfile contents %s, proc pid exists %s" - % (self.runqemu.poll(), os.path.isfile(self.qemu_pidfile), str(qemu_pid), os.path.exists("/proc/" + qemu_pid))) + % (self.runqemu.poll(), os.path.isfile(self.qemu_pidfile), str(qemu_pid), os.path.exists("/proc/" + str(qemu_pid)))) # Dump all processes to help us to figure out what is going on... ps = subprocess.Popen(['ps', 'axww', '-o', 'pid,ppid,command '], stdout=subprocess.PIPE).communicate()[0]
Signature · 1 line
2.17.1