diff options
| author | Theo Buehler <tb@openbsd.org> | 2024-12-14 13:57:45 -0700 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2024-12-14 13:59:27 -0700 |
| commit | af9fe76e41149af313f82d94a54a36bc79c667c3 (patch) | |
| tree | 80d3e0deec71bcb502fd6571ec49daf6224ae204 /patches | |
| parent | b96ad7e8ab1339aed3d329532b4040d75418f0ca (diff) | |
| download | portable-af9fe76e41149af313f82d94a54a36bc79c667c3.tar.gz portable-af9fe76e41149af313f82d94a54a36bc79c667c3.tar.bz2 portable-af9fe76e41149af313f82d94a54a36bc79c667c3.zip | |
Regen crypto-cpu-caps.c patches
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/patch-aarch64-crypto-cpu-caps.c.patch | 8 | ||||
| -rw-r--r-- | patches/patch-amd64-crypto-cpu-caps.c.patch | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/patches/patch-aarch64-crypto-cpu-caps.c.patch b/patches/patch-aarch64-crypto-cpu-caps.c.patch index 2a1006e..dcfbdc0 100644 --- a/patches/patch-aarch64-crypto-cpu-caps.c.patch +++ b/patches/patch-aarch64-crypto-cpu-caps.c.patch | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | Disable feature detection until we find a more portable way. | 1 | Disable feature detection until we find a more portable way. |
| 2 | 2 | ||
| 3 | --- crypto/arch/aarch64/crypto_cpu_caps.c Fri Nov 8 09:23:31 2024 | 3 | --- crypto/arch/aarch64/crypto_cpu_caps.c.orig Sat Dec 14 13:45:16 2024 |
| 4 | --- crypto/arch/aarch64/crypto_cpu_caps.c Fri Nov 8 09:02:47 2024 | 4 | +++ crypto/arch/aarch64/crypto_cpu_caps.c Sat Dec 14 13:54:06 2024 |
| 5 | @@ -16,9 +16,12 @@ | 5 | @@ -16,9 +16,12 @@ |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| @@ -15,7 +15,7 @@ Disable feature detection until we find a more portable way. | |||
| 15 | 15 | ||
| 16 | #include <stddef.h> | 16 | #include <stddef.h> |
| 17 | #include <stdio.h> | 17 | #include <stdio.h> |
| 18 | @@ -66,6 +69,7 @@ | 18 | @@ -67,6 +70,7 @@ parse_isar0(uint64_t isar0) |
| 19 | return caps; | 19 | return caps; |
| 20 | } | 20 | } |
| 21 | 21 | ||
| @@ -23,7 +23,7 @@ Disable feature detection until we find a more portable way. | |||
| 23 | static int | 23 | static int |
| 24 | read_isar0(uint64_t *isar0) | 24 | read_isar0(uint64_t *isar0) |
| 25 | { | 25 | { |
| 26 | @@ -83,6 +87,13 @@ | 26 | @@ -84,6 +88,13 @@ read_isar0(uint64_t *isar0) |
| 27 | 27 | ||
| 28 | return 1; | 28 | return 1; |
| 29 | } | 29 | } |
diff --git a/patches/patch-amd64-crypto-cpu-caps.c.patch b/patches/patch-amd64-crypto-cpu-caps.c.patch index f7cb4c9..5fd7524 100644 --- a/patches/patch-amd64-crypto-cpu-caps.c.patch +++ b/patches/patch-amd64-crypto-cpu-caps.c.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | --- crypto/arch/amd64/crypto_cpu_caps.c.orig Fri Oct 18 17:35:20 2024 | 1 | --- crypto/arch/amd64/crypto_cpu_caps.c.orig Sat Dec 14 13:45:16 2024 |
| 2 | +++ crypto/arch/amd64/crypto_cpu_caps.c Fri Oct 18 17:39:13 2024 | 2 | +++ crypto/arch/amd64/crypto_cpu_caps.c Sat Dec 14 13:54:06 2024 |
| 3 | @@ -33,7 +33,7 @@ cpuid(uint32_t eax, uint32_t *out_eax, uint32_t *out_e | 3 | @@ -37,7 +37,7 @@ cpuid(uint32_t eax, uint32_t *out_eax, uint32_t *out_e |
| 4 | { | 4 | { |
| 5 | uint32_t ebx = 0, ecx = 0, edx = 0; | 5 | uint32_t ebx = 0, ecx = 0, edx = 0; |
| 6 | 6 | ||
| @@ -9,7 +9,7 @@ | |||
| 9 | __asm__ ("cpuid": "+a"(eax), "+b"(ebx), "+c"(ecx), "+d"(edx)); | 9 | __asm__ ("cpuid": "+a"(eax), "+b"(ebx), "+c"(ecx), "+d"(edx)); |
| 10 | #else | 10 | #else |
| 11 | eax = 0; | 11 | eax = 0; |
| 12 | @@ -54,7 +54,7 @@ xgetbv(uint32_t ecx, uint32_t *out_eax, uint32_t *out_ | 12 | @@ -58,7 +58,7 @@ xgetbv(uint32_t ecx, uint32_t *out_eax, uint32_t *out_ |
| 13 | { | 13 | { |
| 14 | uint32_t eax = 0, edx = 0; | 14 | uint32_t eax = 0, edx = 0; |
| 15 | 15 | ||