diff options
| author | Andy Polyakov <appro@openssl.org> | 2010-03-29 09:59:58 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2010-03-29 09:59:58 +0000 |
| commit | 1244d5b713b380caa1b427b2549bc83508d482bc (patch) | |
| tree | 61248bb80112522eada79141f9a3950dced5394f | |
| parent | c0ed5cd47bebc489053e1121f0b58320704db452 (diff) | |
ARMv4 assembler: [unconfirmed] fix for compilation failure [from HEAD].
| -rw-r--r-- | crypto/aes/asm/aes-armv4.pl | 1 | ||||
| -rw-r--r-- | crypto/bn/asm/armv4-mont.pl | 1 | ||||
| -rw-r--r-- | crypto/sha/asm/sha1-armv4-large.pl | 1 | ||||
| -rw-r--r-- | crypto/sha/asm/sha256-armv4.pl | 1 | ||||
| -rw-r--r-- | crypto/sha/asm/sha512-armv4.pl | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl index 15742c1ec5..690244111a 100644 --- a/crypto/aes/asm/aes-armv4.pl +++ b/crypto/aes/asm/aes-armv4.pl @@ -1024,6 +1024,7 @@ _armv4_AES_decrypt: mov pc,lr @ return .size _armv4_AES_decrypt,.-_armv4_AES_decrypt .asciz "AES for ARMv4, CRYPTOGAMS by <appro\@openssl.org>" +.align 2 ___ $code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm; # make it possible to compile with -march=armv4 diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl index 05d5dc1a48..14e0d2d1dd 100644 --- a/crypto/bn/asm/armv4-mont.pl +++ b/crypto/bn/asm/armv4-mont.pl @@ -193,6 +193,7 @@ bn_mul_mont: bx lr @ interoperable with Thumb ISA:-) .size bn_mul_mont,.-bn_mul_mont .asciz "Montgomery multiplication for ARMv4, CRYPTOGAMS by <appro\@openssl.org>" +.align 2 ___ $code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm; # make it possible to compile with -march=armv4 diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl index c5c4480f94..88861af641 100644 --- a/crypto/sha/asm/sha1-armv4-large.pl +++ b/crypto/sha/asm/sha1-armv4-large.pl @@ -226,6 +226,7 @@ $code.=<<___; .LK_60_79: .word 0xca62c1d6 .size sha1_block_data_order,.-sha1_block_data_order .asciz "SHA1 block transform for ARMv4, CRYPTOGAMS by <appro\@openssl.org>" +.align 2 ___ $code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm; # make it possible to compile with -march=armv4 diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl index 853ca31e48..48d846deec 100644 --- a/crypto/sha/asm/sha256-armv4.pl +++ b/crypto/sha/asm/sha256-armv4.pl @@ -172,6 +172,7 @@ $code.=<<___; bx lr @ interoperable with Thumb ISA:-) .size sha256_block_data_order,.-sha256_block_data_order .asciz "SHA256 block transform for ARMv4, CRYPTOGAMS by <appro\@openssl.org>" +.align 2 ___ $code =~ s/\`([^\`]*)\`/eval $1/gem; diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl index f27e9cd319..4fbb94a914 100644 --- a/crypto/sha/asm/sha512-armv4.pl +++ b/crypto/sha/asm/sha512-armv4.pl @@ -390,6 +390,7 @@ $code.=<<___; bx lr @ interoperable with Thumb ISA:-) .size sha512_block_data_order,.-sha512_block_data_order .asciz "SHA512 block transform for ARMv4, CRYPTOGAMS by <appro\@openssl.org>" +.align 2 ___ $code =~ s/\`([^\`]*)\`/eval $1/gem; |