Module Name: src
Committed By: matt
Date: Mon Mar 30 05:26:47 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S
Log Message:
Add workaround/hack for clang integrated arm assembler bug.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.1 Tue Mar 10 13:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S Mon Mar 30 05:26:47 2015
@@ -170,7 +170,13 @@ AES_encrypt:
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...
