From f2425489ef4cc6bb036c8db9d487e11590636104 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Sat, 19 Feb 2022 15:30:37 +0100 Subject: [PATCH] unix/linux: update to Go 1.18rc1 The change in ztypes_linux_s390x.go is likely due to CL 350159. Change-Id: Ib7080255f357d484ee708e128ac9a7ab408a6dc5 Reviewed-on: https://go-review.googlesource.com/c/sys/+/386955 Trust: Tobias Klauser Run-TryBot: Tobias Klauser TryBot-Result: Gopher Robot Reviewed-by: Matt Layher Reviewed-by: Ian Lance Taylor --- unix/linux/Dockerfile | 4 ++-- unix/ztypes_linux_s390x.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unix/linux/Dockerfile b/unix/linux/Dockerfile index 47763508..e36d00dc 100644 --- a/unix/linux/Dockerfile +++ b/unix/linux/Dockerfile @@ -21,9 +21,9 @@ RUN git clone --branch v5.16 --depth 1 https://kernel.googlesource.com/pub/scm/l RUN git clone --branch release/2.35/master --depth 1 https://sourceware.org/git/glibc.git # Get Go -ENV GOLANG_VERSION 1.17.6 +ENV GOLANG_VERSION 1.18rc1 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -ENV GOLANG_DOWNLOAD_SHA256 231654bbf2dab3d86c1619ce799e77b03d96f9b50770297c8f4dff8836fc8ca2 +ENV GOLANG_DOWNLOAD_SHA256 9ea4e6adee711e06fa95546e1a9629b63de3aaae85fac9dc752fb533f3e5be23 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \ diff --git a/unix/ztypes_linux_s390x.go b/unix/ztypes_linux_s390x.go index 63588061..c426c357 100644 --- a/unix/ztypes_linux_s390x.go +++ b/unix/ztypes_linux_s390x.go @@ -210,8 +210,8 @@ type PtraceFpregs struct { } type PtracePer struct { - _ [0]uint64 - _ [32]byte + Control_regs [3]uint64 + _ [8]byte Starting_addr uint64 Ending_addr uint64 Perc_atmid uint16