forked from SynoCommunity/spksrc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
xz: Update from version 5.6.1+really5.4.5 to 5.6.2 (SynoCommunity#6210)
* xz: Update from version 5.6.1+really5.4.5 to 5.6.2 * xz: patch new issue with assembly inlining using older binutils * py311: Update crossenv and hopefully fix build issues * py310: Likewise, tentative to fix remaining build issues * hi3535 (ARMv7L): Fixing rustc version to 1.77.2 for fd-8.7.0 build
- Loading branch information
Showing
9 changed files
with
155 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
xz-5.6.1+really5.4.5.tar.xz SHA1 37ee68951814c3565f10ab92629d1d5173215fe0 | ||
xz-5.6.1+really5.4.5.tar.xz SHA256 da9dec6c12cf2ecf269c31ab65b5de18e8e52b96f35d5bcd08c12b43e6878803 | ||
xz-5.6.1+really5.4.5.tar.xz MD5 1d33e0be05c53e7a5641acf5c8b35fdd | ||
xz-5.6.2.tar.xz SHA1 340fb0e4e814edbed726e32f0d1e8e3a0dc85092 | ||
xz-5.6.2.tar.xz SHA256 a9db3bb3d64e248a0fae963f8fb6ba851a26ba1822e504dc0efd18a80c626caf | ||
xz-5.6.2.tar.xz MD5 bbf73fb28425cebb854328599f85c4cf |
84 changes: 84 additions & 0 deletions
84
cross/xz/patches/001-liblzma_fix_movzw_compatibility.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
github issue: https://github.com/tukaani-project/xz/issues/121 | ||
github PR: https://github.com/tukaani-project/xz/pull/136 | ||
|
||
--- src/liblzma/rangecoder/range_decoder.h-orig 2024-05-29 15:16:04.000000000 +0000 | ||
+++ src/liblzma/rangecoder/range_decoder.h 2024-08-26 11:54:33.092252300 +0000 | ||
@@ -592,13 +592,13 @@ do { \ | ||
// *_only = rc_asm_y or _n to include or exclude code marked with them | ||
#define rc_asm_bittree(a, b, first_only, middle_only, last_only) \ | ||
first_only( \ | ||
- "movzw 2(%[probs_base]), %[prob" #a "]\n\t" \ | ||
+ "movzwl 2(%[probs_base]), %[prob" #a "]\n\t" \ | ||
"mov $2, %[symbol]\n\t" \ | ||
- "movzw 4(%[probs_base]), %[prob" #b "]\n\t" \ | ||
+ "movzwl 4(%[probs_base]), %[prob" #b "]\n\t" \ | ||
) \ | ||
middle_only( \ | ||
/* Note the scaling of 4 instead of 2: */ \ | ||
- "movzw (%[probs_base], %q[symbol], 4), %[prob" #b "]\n\t" \ | ||
+ "movzwl (%[probs_base], %q[symbol], 4), %[prob" #b "]\n\t" \ | ||
) \ | ||
last_only( \ | ||
"add %[symbol], %[symbol]\n\t" \ | ||
@@ -610,11 +610,11 @@ do { \ | ||
"cmovae %[t0], %[range]\n\t" \ | ||
\ | ||
first_only( \ | ||
- "movzw 6(%[probs_base]), %[t0]\n\t" \ | ||
+ "movzwl 6(%[probs_base]), %[t0]\n\t" \ | ||
"cmovae %[t0], %[prob" #b "]\n\t" \ | ||
) \ | ||
middle_only( \ | ||
- "movzw 2(%[probs_base], %q[symbol], 4), %[t0]\n\t" \ | ||
+ "movzwl 2(%[probs_base], %q[symbol], 4), %[t0]\n\t" \ | ||
"lea (%q[symbol], %q[symbol]), %[symbol]\n\t" \ | ||
"cmovae %[t0], %[prob" #b "]\n\t" \ | ||
) \ | ||
@@ -716,12 +716,12 @@ do { \ | ||
#define rc_asm_bittree_rev(a, b, add, dcur, dnext0, dnext1, \ | ||
first_only, middle_only, last_only) \ | ||
first_only( \ | ||
- "movzw 2(%[probs_base]), %[prob" #a "]\n\t" \ | ||
+ "movzwl 2(%[probs_base]), %[prob" #a "]\n\t" \ | ||
"xor %[symbol], %[symbol]\n\t" \ | ||
- "movzw 4(%[probs_base]), %[prob" #b "]\n\t" \ | ||
+ "movzwl 4(%[probs_base]), %[prob" #b "]\n\t" \ | ||
) \ | ||
middle_only( \ | ||
- "movzw " #dnext0 "(%[probs_base], %q[symbol], 2), " \ | ||
+ "movzwl " #dnext0 "(%[probs_base], %q[symbol], 2), " \ | ||
"%[prob" #b "]\n\t" \ | ||
) \ | ||
\ | ||
@@ -731,11 +731,11 @@ do { \ | ||
"cmovae %[t0], %[range]\n\t" \ | ||
\ | ||
first_only( \ | ||
- "movzw 6(%[probs_base]), %[t0]\n\t" \ | ||
+ "movzwl 6(%[probs_base]), %[t0]\n\t" \ | ||
"cmovae %[t0], %[prob" #b "]\n\t" \ | ||
) \ | ||
middle_only( \ | ||
- "movzw " #dnext1 "(%[probs_base], %q[symbol], 2), %[t0]\n\t" \ | ||
+ "movzwl " #dnext1 "(%[probs_base], %q[symbol], 2), %[t0]\n\t" \ | ||
"cmovae %[t0], %[prob" #b "]\n\t" \ | ||
) \ | ||
\ | ||
@@ -788,7 +788,7 @@ do { \ | ||
uint32_t t_index; \ | ||
\ | ||
__asm__( \ | ||
- "movzw (%[probs_base], %q[symbol], 2), %[prob]\n\t" \ | ||
+ "movzwl (%[probs_base], %q[symbol], 2), %[prob]\n\t" \ | ||
"mov %[symbol], %[index]\n\t" \ | ||
\ | ||
"add %[dest], %[t2]\n\t" \ | ||
@@ -844,7 +844,7 @@ do { \ | ||
"and %[offset], %[match_bit]\n\t" \ | ||
"add %[match_bit], %[symbol]\n\t" \ | ||
\ | ||
- "movzw (%[probs_base], %q[symbol], 2), %[prob]\n\t" \ | ||
+ "movzwl (%[probs_base], %q[symbol], 2), %[prob]\n\t" \ | ||
\ | ||
"add %[symbol], %[symbol]\n\t" \ | ||
\ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters