diff options
| author | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-11-06 13:27:15 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-11-06 13:27:15 +0000 |
| commit | b6cecb4c2644527777b23833b0fa6e6fdb6b1e0b (patch) | |
| tree | f3b37f0673ac87d4e6ab862f08d4f6fb7ad09b8f /main/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch | |
| parent | 51e522b3ffa25ebd6d003679ca34d780818a30e8 (diff) | |
main/libmad: armv7 build fix
Diffstat (limited to 'main/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch')
| -rw-r--r-- | main/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/main/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch b/main/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch new file mode 100644 index 00000000000..46415107d24 --- /dev/null +++ b/main/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch @@ -0,0 +1,34 @@ +From: Dave Martin +Subject: "rsc" doesnt exist anymore in thumb2 + +diff --git a/fixed.h b/fixed.h +index 4b58abf..ba4bc26 100644 +--- a/fixed.h ++++ b/fixed.h +@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y) + : "+r" (lo), "+r" (hi) \ + : "%r" (x), "r" (y)) + ++#ifdef __thumb__ ++/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero ++ operand. If needed this code can also support Thumb-1 ++ (simply append "s" to the end of the second two instructions). */ ++# define MAD_F_MLN(hi, lo) \ ++ asm ("rsbs %0, %0, #0\n\t" \ ++ "sbc %1, %1, %1\n\t" \ ++ "sub %1, %1, %2" \ ++ : "+&r" (lo), "=&r" (hi) \ ++ : "r" (hi) \ ++ : "cc") ++#else /* ! __thumb__ */ + # define MAD_F_MLN(hi, lo) \ + asm ("rsbs %0, %2, #0\n\t" \ + "rsc %1, %3, #0" \ +- : "=r" (lo), "=r" (hi) \ ++ : "=&r" (lo), "=r" (hi) \ + : "0" (lo), "1" (hi) \ + : "cc") ++#endif /* __thumb__ */ + + # define mad_f_scale64(hi, lo) \ + ({ mad_fixed_t __result; \ |