From 17e66c88d85058a76de19602d08855ab66fa8d51 Mon Sep 17 00:00:00 2001 From: Sun Yimin Date: Thu, 7 Sep 2023 16:27:58 +0800 Subject: [PATCH] zuc: arm64 eliminate the usage of R15 --- zuc/asm_amd64.s | 4 ++-- zuc/core_asm.go | 4 ++-- zuc/core_generic.go | 4 ++-- zuc/eea_asm.go | 4 ++-- zuc/eea_generic.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/zuc/asm_amd64.s b/zuc/asm_amd64.s index aa15ba9..83dfa2c 100644 --- a/zuc/asm_amd64.s +++ b/zuc/asm_amd64.s @@ -1,8 +1,8 @@ // Referenced Intel(R) Multi-Buffer Crypto for IPsec // https://github.com/intel/intel-ipsec-mb/ // https://gist.github.com/emmansun/15d2fce6659ab97ffaf7ab66e278caee -//go:build amd64 && !purego && !plugin -// +build amd64,!purego,!plugin +//go:build amd64 && !purego +// +build amd64,!purego #include "textflag.h" diff --git a/zuc/core_asm.go b/zuc/core_asm.go index a35d9bb..a396ba7 100644 --- a/zuc/core_asm.go +++ b/zuc/core_asm.go @@ -1,5 +1,5 @@ -//go:build (amd64 && !purego && !plugin) || (arm64 && !purego) -// +build amd64,!purego,!plugin arm64,!purego +//go:build (amd64 && !purego) || (arm64 && !purego) +// +build amd64,!purego arm64,!purego package zuc diff --git a/zuc/core_generic.go b/zuc/core_generic.go index 9944098..4c75066 100644 --- a/zuc/core_generic.go +++ b/zuc/core_generic.go @@ -1,5 +1,5 @@ -//go:build (!amd64 && !arm64) || purego || plugin -// +build !amd64,!arm64 purego plugin +//go:build (!amd64 && !arm64) || purego +// +build !amd64,!arm64 purego package zuc diff --git a/zuc/eea_asm.go b/zuc/eea_asm.go index d2d6af8..1f06425 100644 --- a/zuc/eea_asm.go +++ b/zuc/eea_asm.go @@ -1,5 +1,5 @@ -//go:build (amd64 && !purego && !plugin) || (arm64 && !purego) -// +build amd64,!purego,!plugin arm64,!purego +//go:build (amd64 && !purego) || (arm64 && !purego) +// +build amd64,!purego arm64,!purego package zuc diff --git a/zuc/eea_generic.go b/zuc/eea_generic.go index 7ae727e..641ee1b 100644 --- a/zuc/eea_generic.go +++ b/zuc/eea_generic.go @@ -1,5 +1,5 @@ -//go:build !amd64 && !arm64 || purego || plugin -// +build !amd64,!arm64 purego plugin +//go:build !amd64 && !arm64 || purego +// +build !amd64,!arm64 purego package zuc