Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-musl-libc: Commit

external/musl/libc


Commit MetaInfo

Revision980f80f79216c268c18fa36b7680c076c684dfa2 (tree)
Time2019-07-16 04:33:12
AuthorRich Felker <dalias@aeri...>
CommiterRich Felker

Log Message

fix build failure on arm building C code in thumb1 mode

a fully thumb1 build is not supported because some asm files are
incompatible with thumb1, but apparently it works to compile the C
code as thumb1

commit 06fbefd10046a0fae7e588b7c6d25fb51811b931 caused this regression
but introducing use of the clz instruction, which is not supported in
arm mode prior to v5, and not supported in thumb prior to thumb2
(v6t2). commit 1b9406b03c0a94ebe2076a8fc1746a8c45e78a83 fixed the
issue only for arm mode pre-v5 but left thumb1 broken.

Change Summary

Incremental Difference

--- a/arch/arm/atomic_arch.h
+++ b/arch/arm/atomic_arch.h
@@ -83,7 +83,7 @@ static inline void a_crash()
8383 : : : "memory");
8484 }
8585
86-#if __ARM_ARCH >= 5
86+#if __ARM_ARCH >= 5 && (!__thumb__ || __thumb2__)
8787
8888 #define a_clz_32 a_clz_32
8989 static inline int a_clz_32(uint32_t x)
Show on old repository browser