Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm Add worka...



details:   https://anonhg.NetBSD.org/src/rev/cf356920fdfe
branches:  trunk
changeset: 337014:cf356920fdfe
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Mar 30 05:26:47 2015 +0000

description:
Add workaround/hack for clang integrated arm assembler bug.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (17 lines):

diff -r f1cf678fa9fb -r cf356920fdfe crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S    Mon Mar 30 04:25:26 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S    Mon Mar 30 05:26:47 2015 +0000
@@ -170,7 +170,13 @@
        stmdb   sp!,{r1,r4-r12,lr}
        mov     r12,r0          @ inp
        mov     r11,r2
+#ifdef __clang__
+       @ workaround for clang integrated assembler bug
+       ldr     r0,=(AES_encrypt-AES_Te)
+       sub     r10,r3,r0
+#else
        sub     r10,r3,#AES_encrypt-AES_Te      @ Te
+#endif
 #if __ARM_ARCH__<7
        ldrb    r0,[r12,#3]     @ load input data in endian-neutral
        ldrb    r4,[r12,#2]     @ manner...



Home | Main Index | Thread Index | Old Index