Make it build even on ppc64le

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=423
This commit is contained in:
Dr. Werner Fink 2022-10-28 09:56:21 +00:00 committed by Git OBS Bridge
parent 2b4a68bc6f
commit e4d1536097
3 changed files with 38 additions and 32 deletions

View File

@ -1,7 +1,8 @@
---
libs/luajit/configure | 9 +++++++++
libs/luajit/m4/lj-system.m4 | 8 +++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
libs/luajit/configure | 9 +++++++++
libs/luajit/m4/lj-system.m4 | 8 +++++++-
texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h | 6 +++---
3 files changed, 19 insertions(+), 4 deletions(-)
--- libs/luajit/configure
+++ libs/luajit/configure 2020-04-30 15:42:15.998038368 +0000
@ -38,3 +39,32 @@
AS_IF([test "x$build" != "x$host"],
[AS_CASE([$LJHOST],
--- texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h
+++ texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h 2022-10-28 08:55:05.465324386 +0000
@@ -4128,7 +4128,7 @@ XXH3_accumulate_512_vsx( void* XXH_REST
const void* XXH_RESTRICT secret)
{
/* presumed aligned */
- unsigned long long* const xacc = (unsigned long long*) acc;
+ unsigned int* const xacc = (unsigned int*) acc;
xxh_u64x2 const* const xinput = (xxh_u64x2 const*) input; /* no alignment restriction */
xxh_u64x2 const* const xsecret = (xxh_u64x2 const*) secret; /* no alignment restriction */
xxh_u64x2 const v32 = { 32, 32 };
@@ -4144,7 +4144,7 @@ XXH3_accumulate_512_vsx( void* XXH_REST
/* product = ((xxh_u64x2)data_key & 0xFFFFFFFF) * ((xxh_u64x2)shuffled & 0xFFFFFFFF); */
xxh_u64x2 const product = XXH_vec_mulo((xxh_u32x4)data_key, shuffled);
/* acc_vec = xacc[i]; */
- xxh_u64x2 acc_vec = vec_xl(0, xacc + 2 * i);
+ xxh_u64x2 acc_vec = (xxh_u64x2)vec_xl(0, xacc + 2 * i);
acc_vec += product;
/* swap high and low halves */
@@ -4154,7 +4154,7 @@ XXH3_accumulate_512_vsx( void* XXH_REST
acc_vec += vec_xxpermdi(data_vec, data_vec, 2);
#endif
/* xacc[i] = acc_vec; */
- vec_xst(acc_vec, 0, xacc + 2 * i);
+ vec_xst((xxh_u32x4)acc_vec, 0, xacc + 2 * i);
}
}

View File

@ -45,35 +45,6 @@
# for icu data location
ifeq ($(PKGDATA_MODE),common)
--- texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h
+++ texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h 2022-10-28 08:55:05.465324386 +0000
@@ -4128,7 +4128,7 @@ XXH3_accumulate_512_vsx( void* XXH_REST
const void* XXH_RESTRICT secret)
{
/* presumed aligned */
- unsigned long long* const xacc = (unsigned long long*) acc;
+ unsigned int* const xacc = (unsigned int*) acc;
xxh_u64x2 const* const xinput = (xxh_u64x2 const*) input; /* no alignment restriction */
xxh_u64x2 const* const xsecret = (xxh_u64x2 const*) secret; /* no alignment restriction */
xxh_u64x2 const v32 = { 32, 32 };
@@ -4144,7 +4144,7 @@ XXH3_accumulate_512_vsx( void* XXH_REST
/* product = ((xxh_u64x2)data_key & 0xFFFFFFFF) * ((xxh_u64x2)shuffled & 0xFFFFFFFF); */
xxh_u64x2 const product = XXH_vec_mulo((xxh_u32x4)data_key, shuffled);
/* acc_vec = xacc[i]; */
- xxh_u64x2 acc_vec = vec_xl(0, xacc + 2 * i);
+ xxh_u64x2 acc_vec = (xxh_u64x2)vec_xl(0, xacc + 2 * i);
acc_vec += product;
/* swap high and low halves */
@@ -4154,7 +4154,7 @@ XXH3_accumulate_512_vsx( void* XXH_REST
acc_vec += vec_xxpermdi(data_vec, data_vec, 2);
#endif
/* xacc[i] = acc_vec; */
- vec_xst(acc_vec, 0, xacc + 2 * i);
+ vec_xst((xxh_u32x4)acc_vec, 0, xacc + 2 * i);
}
}
--- texk/dviljk/dvi2xx.c
+++ texk/dviljk/dvi2xx.c 2021-04-07 10:14:44.206880772 +0000
@@ -168,7 +168,18 @@ main(int argc, char *argv[])

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 28 09:55:07 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Make it build even ol ppc64le
-------------------------------------------------------------------
Mon Jul 25 10:43:31 UTC 2022 - Dirk Müller <dmueller@suse.com>