diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-09-20 23:27:24 +0200 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-09-20 23:30:22 +0200 |
| commit | e36ff585168b616b9ef81d3cdb1349e87a65ef92 (patch) | |
| tree | 2023431bf1dee1e2457a6100cd3e4a921afcc136 | |
| parent | 446452f84e9cc4c75d8e80f6f05e24793397a19d (diff) | |
| download | webrtc-linaro_android_4.3_topic_clang.tar.gz | |
webrtc: Backport asm fixes from webrtc trunklinaro_android_4.4.4linaro_android_4.4.3linaro_android_4.4.2linaro_android_4.4linaro_android_4.3_topic_clanglinaro_android_4.3.1linaro_android_4.3
This allows webrtc to build with clang 3.4.
Change-Id: Idc043072db83834875a958b401ce747aa7e21403
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | src/common_audio/signal_processing/include/spl_inl_armv7.h | 2 | ||||
| -rw-r--r-- | src/common_audio/signal_processing/resample_by_2.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/common_audio/signal_processing/include/spl_inl_armv7.h b/src/common_audio/signal_processing/include/spl_inl_armv7.h index 689c2baeea..67fc4f97fb 100644 --- a/src/common_audio/signal_processing/include/spl_inl_armv7.h +++ b/src/common_audio/signal_processing/include/spl_inl_armv7.h @@ -130,7 +130,7 @@ static __inline int WebRtcSpl_NormW16(WebRtc_Word16 a) { static __inline WebRtc_Word16 WebRtcSpl_SatW32ToW16(WebRtc_Word32 value32) { WebRtc_Word16 out16; - __asm__("ssat %r0, #16, %r1" : "=r"(out16) : "r"(value32)); + __asm__("ssat %0, #16, %1" : "=r"(out16) : "r"(value32)); return out16; } diff --git a/src/common_audio/signal_processing/resample_by_2.c b/src/common_audio/signal_processing/resample_by_2.c index e239db75c0..a0da428fc5 100644 --- a/src/common_audio/signal_processing/resample_by_2.c +++ b/src/common_audio/signal_processing/resample_by_2.c @@ -31,8 +31,8 @@ static __inline WebRtc_Word32 MUL_ACCUM_1(WebRtc_Word32 tbl_value, WebRtc_Word32 diff, WebRtc_Word32 state) { WebRtc_Word32 result; - __asm__("smlawb %r0, %r1, %r2, %r3": "=r"(result): "r"(diff), - "r"(tbl_value), "r"(state)); + __asm__("smlawb %0, %1, %2, %3": "=r"(result): "r"(diff), + "r"(tbl_value), "r"(state)); return result; } @@ -47,8 +47,8 @@ static __inline WebRtc_Word32 MUL_ACCUM_2(WebRtc_Word32 tbl_value, WebRtc_Word32 diff, WebRtc_Word32 state) { WebRtc_Word32 result; - __asm__("smmla %r0, %r1, %r2, %r3": "=r"(result): "r"(diff << 1), - "r"(tbl_value), "r"(state)); + __asm__("smmla %0, %1, %2, %3": "=r"(result): "r"(diff << 1), + "r"(tbl_value), "r"(state)); return result; } |