diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-12-26 12:09:50 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-27 22:52:58 +0000 |
| commit | 1ef07c387ff1a5497151e453f2ca47c75d5135b2 (patch) | |
| tree | 5f4e7b9b4863c5314e4c4b26423be63348fb21e5 /meta/recipes-core/libxcrypt/files | |
| parent | d80ada6025de5cc017a8997d9705bcc94411ca42 (diff) | |
| download | poky-1ef07c387ff1a5497151e453f2ca47c75d5135b2.tar.gz | |
libxcrypt: Upgrade to 4.4.2
Licence-Update: Copyright Alexander Peslyak; 0-clause BSD added
see https://github.com/besser82/libxcrypt/commit/e07290ec7c3de301ce2b813ee2b42131bef2b119
Rename recipe to ve versionless and add PV in recipe itself, makes it
easy to traverse git history
Drop upstreamed patch
(From OE-Core rev: 2eae2d53df739acc2f89599a9296ccacbafebb60)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxcrypt/files')
| -rw-r--r-- | meta/recipes-core/libxcrypt/files/0001-Add-x32-specific-inline-asm.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-core/libxcrypt/files/0001-Add-x32-specific-inline-asm.patch b/meta/recipes-core/libxcrypt/files/0001-Add-x32-specific-inline-asm.patch deleted file mode 100644 index 9e31b03561..0000000000 --- a/meta/recipes-core/libxcrypt/files/0001-Add-x32-specific-inline-asm.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | From 7d01f2acf6fde6341a68a91f9b343841cc424af7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 17 Dec 2018 11:33:35 -0800 | ||
| 4 | Subject: [PATCH] Add x32 specific inline asm | ||
| 5 | |||
| 6 | Upstream-Status: Pending [https://github.com/besser82/libxcrypt/issues/74#issuecomment-447966455] | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | alg-yescrypt-opt.c | 9 +++++++-- | ||
| 11 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/alg-yescrypt-opt.c b/alg-yescrypt-opt.c | ||
| 14 | index 5dbd822..060caf4 100644 | ||
| 15 | --- a/alg-yescrypt-opt.c | ||
| 16 | +++ b/alg-yescrypt-opt.c | ||
| 17 | @@ -528,6 +528,11 @@ static volatile uint64_t Smask2var = Smask2; | ||
| 18 | #undef MAYBE_MEMORY_BARRIER | ||
| 19 | #define MAYBE_MEMORY_BARRIER \ | ||
| 20 | __asm__("" : : : "memory"); | ||
| 21 | +#ifdef __ILP32__ /* x32 */ | ||
| 22 | +#define REGISTER_PREFIX "e" | ||
| 23 | +#else | ||
| 24 | +#define REGISTER_PREFIX "r" | ||
| 25 | +#endif | ||
| 26 | #define PWXFORM_SIMD(X) { \ | ||
| 27 | __m128i H; \ | ||
| 28 | __asm__( \ | ||
| 29 | @@ -537,8 +542,8 @@ static volatile uint64_t Smask2var = Smask2; | ||
| 30 | "pmuludq %1, %0\n\t" \ | ||
| 31 | "movl %%eax, %%ecx\n\t" \ | ||
| 32 | "shrq $0x20, %%rax\n\t" \ | ||
| 33 | - "paddq (%3,%%rcx), %0\n\t" \ | ||
| 34 | - "pxor (%4,%%rax), %0\n\t" \ | ||
| 35 | + "paddq (%3,%%" REGISTER_PREFIX "cx), %0\n\t" \ | ||
| 36 | + "pxor (%4,%%" REGISTER_PREFIX "ax), %0\n\t" \ | ||
| 37 | : "+x" (X), "=x" (H) \ | ||
| 38 | : "d" (Smask2), "S" (S0), "D" (S1) \ | ||
| 39 | : "cc", "ax", "cx"); \ | ||
| 40 | -- | ||
| 41 | 2.20.1 | ||
| 42 | |||
