New Upstream Release - golang-github-templexxx-cpu
Ready changes
Summary
Merged new upstream version: 0.1.0 (was: 0.0.9).
Diff
diff --git a/cpu_no_init.go b/cpu_no_init.go
index 1be4f29..e7add29 100644
--- a/cpu_no_init.go
+++ b/cpu_no_init.go
@@ -8,6 +8,7 @@
// +build !arm64
// +build !ppc64
// +build !ppc64le
+// +build !riscv64
// +build !s390x
package cpu
diff --git a/cpu_s390x.s b/cpu_s390x.s
index 9678035..5e1d391 100644
--- a/cpu_s390x.s
+++ b/cpu_s390x.s
@@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-#include "textflag.h"
-
// func stfle() facilityList
-TEXT ·stfle(SB), NOSPLIT|NOFRAME, $0-32
+TEXT ·stfle(SB), 4|512, $0-32
MOVD $ret+0(FP), R1
MOVD $3, R0 // last doubleword index to store
XC $32, (R1), (R1) // clear 4 doublewords (32 bytes)
@@ -13,42 +11,42 @@ TEXT ·stfle(SB), NOSPLIT|NOFRAME, $0-32
RET
// func kmQuery() queryResult
-TEXT ·kmQuery(SB), NOSPLIT|NOFRAME, $0-16
+TEXT ·kmQuery(SB), 4|512, $0-16
MOVD $0, R0 // set function code to 0 (KM-Query)
MOVD $ret+0(FP), R1 // address of 16-byte return value
WORD $0xB92E0024 // cipher message (KM)
RET
// func kmcQuery() queryResult
-TEXT ·kmcQuery(SB), NOSPLIT|NOFRAME, $0-16
+TEXT ·kmcQuery(SB), 4|512, $0-16
MOVD $0, R0 // set function code to 0 (KMC-Query)
MOVD $ret+0(FP), R1 // address of 16-byte return value
WORD $0xB92F0024 // cipher message with chaining (KMC)
RET
// func kmctrQuery() queryResult
-TEXT ·kmctrQuery(SB), NOSPLIT|NOFRAME, $0-16
+TEXT ·kmctrQuery(SB), 4|512, $0-16
MOVD $0, R0 // set function code to 0 (KMCTR-Query)
MOVD $ret+0(FP), R1 // address of 16-byte return value
WORD $0xB92D4024 // cipher message with counter (KMCTR)
RET
// func kmaQuery() queryResult
-TEXT ·kmaQuery(SB), NOSPLIT|NOFRAME, $0-16
+TEXT ·kmaQuery(SB), 4|512, $0-16
MOVD $0, R0 // set function code to 0 (KMA-Query)
MOVD $ret+0(FP), R1 // address of 16-byte return value
WORD $0xb9296024 // cipher message with authentication (KMA)
RET
// func kimdQuery() queryResult
-TEXT ·kimdQuery(SB), NOSPLIT|NOFRAME, $0-16
+TEXT ·kimdQuery(SB), 4|512, $0-16
MOVD $0, R0 // set function code to 0 (KIMD-Query)
MOVD $ret+0(FP), R1 // address of 16-byte return value
WORD $0xB93E0024 // compute intermediate message digest (KIMD)
RET
// func klmdQuery() queryResult
-TEXT ·klmdQuery(SB), NOSPLIT|NOFRAME, $0-16
+TEXT ·klmdQuery(SB), 4|512, $0-16
MOVD $0, R0 // set function code to 0 (KLMD-Query)
MOVD $ret+0(FP), R1 // address of 16-byte return value
WORD $0xB93F0024 // compute last message digest (KLMD)
diff --git a/cpu_x86.s b/cpu_x86.s
index 228fbcf..35b577f 100644
--- a/cpu_x86.s
+++ b/cpu_x86.s
@@ -4,10 +4,8 @@
// +build 386 amd64 amd64p32
-#include "textflag.h"
-
// func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32)
-TEXT ·cpuid(SB), NOSPLIT, $0-24
+TEXT ·cpuid(SB), 4, $0-24
MOVL eaxArg+0(FP), AX
MOVL ecxArg+4(FP), CX
CPUID
@@ -18,7 +16,7 @@ TEXT ·cpuid(SB), NOSPLIT, $0-24
RET
// func xgetbv() (eax, edx uint32)
-TEXT ·xgetbv(SB),NOSPLIT,$0-8
+TEXT ·xgetbv(SB),4,$0-8
#ifdef GOOS_nacl
// nacl does not support XGETBV.
MOVL $0, eax+0(FP)
diff --git a/debian/changelog b/debian/changelog
index 0c12bf3..d9d458d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+golang-github-templexxx-cpu (0.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Drop patch riscv.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk> Mon, 21 Aug 2023 13:34:40 -0000
+
golang-github-templexxx-cpu (0.0.9-3) unstable; urgency=medium
* Add upstream patch to fix riscv FTBFS (Closes: #1017785)
diff --git a/debian/patches/riscv.patch b/debian/patches/riscv.patch
deleted file mode 100644
index 4a11ce2..0000000
--- a/debian/patches/riscv.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From da6390459468e097f8bfbc71c6b9d8e3aff3cb15 Mon Sep 17 00:00:00 2001
-From: Ast-x64 <Ast-x64@protonmail.com>
-Date: Thu, 11 Nov 2021 15:37:16 +0800
-Subject: [PATCH] fix riscv support
-
----
- cpu_no_init.go | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cpu_no_init.go b/cpu_no_init.go
-index 1be4f29..e7add29 100644
---- a/cpu_no_init.go
-+++ b/cpu_no_init.go
-@@ -8,6 +8,7 @@
- // +build !arm64
- // +build !ppc64
- // +build !ppc64le
-+// +build !riscv64
- // +build !s390x
-
- package cpu
diff --git a/debian/patches/series b/debian/patches/series
index b9f4deb..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-riscv.patch
More details
Historical runs
- failed: src/github.com/templexxx/cpu/cpu_x86.s:8: Error: no such instruction: `text ·cpuid(SB),4,$0-24'
- failed: src/github.com/templexxx/cpu/cpu_x86.s:8: Error: no such instruction: `text ·cpuid(SB),4,$0-24'
- bad-gateway: Failed to push result branch: Unexpected HTTP status 502 for https://janitor.debian.net/git/golang-github-templexxx-cpu/info/refs?service=git-upload-pack: Unable to handle http code: Bad Gateway
- push-failed: Failed to push result branch: Unexpected HTTP status 500 for https://janitor.debian.net/git/golang-github-templexxx-cpu/info/refs?service=git-upload-pack: Unable to handle http code: Internal Server Error