diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2022-06-14 15:38:04 +0000 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2022-06-14 15:38:04 +0000 |
| commit | e8462c8a96e3d47bff6e1e3b1b2b00b847f9328c (patch) | |
| tree | 8ebc4cca03f0cefac055a13d064de244183eb761 | |
| parent | c7e7fb9f949e417fea68f5e2d6baf8a8465fee86 (diff) | |
| parent | 3f25cec02a9f8a02479ae60c81e97ec7daeb8bbf (diff) | |
| download | nettle-e8462c8a96e3d47bff6e1e3b1b2b00b847f9328c.tar.gz | |
Merge branch 'chacha_m4_fix' into 'master'
Add missing percent sign for chacha s390x-specific vector names
See merge request nettle/nettle!50
| -rw-r--r-- | s390x/vf/chacha-4core.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/s390x/vf/chacha-4core.asm b/s390x/vf/chacha-4core.asm index c10093a8..04747c2f 100644 --- a/s390x/vf/chacha-4core.asm +++ b/s390x/vf/chacha-4core.asm @@ -51,9 +51,9 @@ define(`T3', `%v28') C A workaround for expanding multiple digits of argument references to QR macro which is incompatible with POSIX C See https://www.gnu.org/software/m4/manual/html_node/Arguments.html define(`P1', -`ifelse($1, 0, v0, $1, 1, v1, $1, 2, v2, $1, 3, v3, $1, 4, v4, $1, 5, v5, $1, 6, v6, $1, 7, v7, $1, 8, v8, $1, 9, v9, $1, 10, v10, $1, 11, v11, $1, 12, v12, $1, 13, v13, $1, 14, v14, $1, 15, v15)') +`ifelse($1, 0, %v0, $1, 1, %v1, $1, 2, %v2, $1, 3, %v3, $1, 4, %v4, $1, 5, %v5, $1, 6, %v6, $1, 7, %v7, $1, 8, %v8, $1, 9, %v9, $1, 10, %v10, $1, 11, %v11, $1, 12, %v12, $1, 13, %v13, $1, 14, %v14, $1, 15, %v15)') define(`P2', -`ifelse($1, 0, v0, $1, 1, v5, $1, 2, v10, $1, 3, v15, $1, 4, v4, $1, 5, v9, $1, 6, v14, $1, 7, v3, $1, 8, v8, $1, 9, v13, $1, 10, v2, $1, 11, v7, $1, 12, v12, $1, 13, v1, $1, 14, v6, $1, 15, v11)') +`ifelse($1, 0, %v0, $1, 1, %v5, $1, 2, %v10, $1, 3, %v15, $1, 4, %v4, $1, 5, %v9, $1, 6, %v14, $1, 7, %v3, $1, 8, %v8, $1, 9, %v13, $1, 10, %v2, $1, 11, %v7, $1, 12, %v12, $1, 13, %v1, $1, 14, %v6, $1, 15, %v11)') C Main loop for round define(`QR',` |