-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
xz: patch new issue with assembly inlining using older binutils
- Loading branch information
Showing
1 changed file
with
84 additions
and
0 deletions.
There are no files selected for viewing
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" \ | ||
\ |