[FFmpeg-devel] Cherry-pick commit id c1cc13cd2a9b8d6d2810ec42454f328a1a0d5efa avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6

Submitted by shivraj.patil@imgtec.com on Oct. 6, 2016, 4:51 a.m.

Details

Message ID 1475729485-11466-1-git-send-email-shivraj.patil@imgtec.com
State New
Headers show

Commit Message

shivraj.patil@imgtec.com Oct. 6, 2016, 4:51 a.m.
From: Shivraj Patil <shivraj.patil@imgtec.com>

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavutil/mips/generic_macros_msa.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Michael Niedermayer Oct. 6, 2016, 7:28 p.m.
On Thu, Oct 06, 2016 at 10:21:25AM +0530, shivraj.patil@imgtec.com wrote:
> From: Shivraj Patil <shivraj.patil@imgtec.com>
> 
> Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavutil/mips/generic_macros_msa.h |   12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

commit locally backported

[...]

Patch hide | download patch | download mbox

diff --git a/libavutil/mips/generic_macros_msa.h b/libavutil/mips/generic_macros_msa.h
index b1d18dd..0a59619 100644
--- a/libavutil/mips/generic_macros_msa.h
+++ b/libavutil/mips/generic_macros_msa.h
@@ -85,12 +85,12 @@ 
     #else  // !(__mips == 64)
         #define LD(psrc)                                              \
         ( {                                                           \
-            uint8_t *psrc_m = (uint8_t *) (psrc);                     \
+            uint8_t *psrc_ld_m = (uint8_t *) (psrc);                  \
             uint32_t val0_m, val1_m;                                  \
             uint64_t val_m = 0;                                       \
                                                                       \
-            val0_m = LW(psrc_m);                                      \
-            val1_m = LW(psrc_m + 4);                                  \
+            val0_m = LW(psrc_ld_m);                                   \
+            val1_m = LW(psrc_ld_m + 4);                               \
                                                                       \
             val_m = (uint64_t) (val1_m);                              \
             val_m = (uint64_t) ((val_m << 32) & 0xFFFFFFFF00000000);  \
@@ -172,12 +172,12 @@ 
     #else  // !(__mips == 64)
         #define LD(psrc)                                              \
         ( {                                                           \
-            uint8_t *psrc_m1 = (uint8_t *) (psrc);                    \
+            uint8_t *psrc_ld_m = (uint8_t *) (psrc);                  \
             uint32_t val0_m, val1_m;                                  \
             uint64_t val_m = 0;                                       \
                                                                       \
-            val0_m = LW(psrc_m1);                                     \
-            val1_m = LW(psrc_m1 + 4);                                 \
+            val0_m = LW(psrc_ld_m);                                   \
+            val1_m = LW(psrc_ld_m + 4);                               \
                                                                       \
             val_m = (uint64_t) (val1_m);                              \
             val_m = (uint64_t) ((val_m << 32) & 0xFFFFFFFF00000000);  \