[libav-commits] arm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6

Mans Rullgard git at libav.org
Thu May 3 22:40:26 CEST 2012


Module: libav
Branch: master
Commit: c02efacc8fd7b3758bf362712019decc907bb8e9

Author:    Mans Rullgard <mans at mansr.com>
Committer: Mans Rullgard <mans at mansr.com>
Date:      Thu May  3 19:14:16 2012 +0100

arm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6

Commit adebad0 "arm: intreadwrite: fix inline asm constraints for gcc
4.6 and later" caused some older gcc versions to miscompile code.
This reverts to the old version of the code for these compilers.

Signed-off-by: Mans Rullgard <mans at mansr.com>

---

 libavutil/arm/intreadwrite.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libavutil/arm/intreadwrite.h b/libavutil/arm/intreadwrite.h
index 86b93c9..ed53330 100644
--- a/libavutil/arm/intreadwrite.h
+++ b/libavutil/arm/intreadwrite.h
@@ -30,7 +30,9 @@ static av_always_inline unsigned AV_RN16(const void *p)
 {
     const uint8_t *q = p;
     unsigned v;
-#ifdef __thumb__
+#if !AV_GCC_VERSION_AT_LEAST(4,6)
+    __asm__ ("ldrh %0, %1" : "=r"(v) : "m"(*(const uint16_t *)q));
+#elif defined __thumb__
     __asm__ ("ldrh %0, %1" : "=r"(v) : "m"(q[0]), "m"(q[1]));
 #else
     __asm__ ("ldrh %0, %1" : "=r"(v) : "Uq"(q[0]), "m"(q[1]));



More information about the libav-commits mailing list