projects / openssl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d231a40)
ARMv4 assembly pack: allow Thumb2 even in iOS build,
authorAndy Polyakov <appro@openssl.org>
Sun, 6 Dec 2015 21:02:39 +0000 (22:02 +0100)
committerAndy Polyakov <appro@openssl.org>
Mon, 7 Dec 2015 11:06:06 +0000 (12:06 +0100)
and engage it in most modules.

Reviewed-by: Tim Hudson <tjh@openssl.org>
crypto/aes/asm/aes-armv4.pl patch | blob | history
crypto/aes/asm/bsaes-armv7.pl patch | blob | history
crypto/bn/asm/armv4-gf2m.pl patch | blob | history
crypto/bn/asm/armv4-mont.pl patch | blob | history
crypto/ec/asm/ecp_nistz256-armv4.pl patch | blob | history
crypto/modes/asm/ghash-armv4.pl patch | blob | history
crypto/perlasm/arm-xlate.pl patch | blob | history
crypto/sha/asm/sha1-armv4-large.pl patch | blob | history
crypto/sha/asm/sha256-armv4.pl patch | blob | history
crypto/sha/asm/sha512-armv4.pl patch | blob | history

diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl
index c3d166ff5f94d445a120545d3b4cb0dec525c2ce..fbe45975a5b9965f2e93ec209be6d68eb7a793f9 100644 (file)
--- a/crypto/aes/asm/aes-armv4.pl
+++ b/crypto/aes/asm/aes-armv4.pl
@@ -75,6 +75,7 @@ $code=<<___;
 .thumb
 #else
 .code  32
 .thumb
 #else
 .code  32
+#undef __thumb2__
 #endif
 
 .type  AES_Te,%object
 #endif
 
 .type  AES_Te,%object
diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
index f9293d599bc44393715ed3b718bdacdd10d48182..03b8d825cd5f5f6ed6e01457173692f0b3e2d1bc 100644 (file)
--- a/crypto/aes/asm/bsaes-armv7.pl
+++ b/crypto/aes/asm/bsaes-armv7.pl
@@ -731,6 +731,7 @@ $code.=<<___;
 .thumb
 #else
 .code   32
 .thumb
 #else
 .code   32
+# undef __thumb2__
 #endif
 
 .type  _bsaes_decrypt8,%function
 #endif
 
 .type  _bsaes_decrypt8,%function
diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl
index 227581e10c7fed7e1f9aac97f3fe31bd2350d384..22aa4830f8edcee997589b1528e52412ec6b3105 100644 (file)
--- a/crypto/bn/asm/armv4-gf2m.pl
+++ b/crypto/bn/asm/armv4-gf2m.pl
@@ -51,7 +51,7 @@ $code=<<___;
 #include "arm_arch.h"
 
 .text
 #include "arm_arch.h"
 
 .text
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
 .syntax        unified
 .thumb
 #else
 .syntax        unified
 .thumb
 #else
diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl
index 48e523013fe4523d9a9feac649dc6b491f5cdc4f..7017ad5f20eb94af5d963046dfe923fe48600125 100644 (file)
--- a/crypto/bn/asm/armv4-mont.pl
+++ b/crypto/bn/asm/armv4-mont.pl
@@ -91,7 +91,7 @@ $code=<<___;
 #include "arm_arch.h"
 
 .text
 #include "arm_arch.h"
 
 .text
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
 .syntax        unified
 .thumb
 #else
 .syntax        unified
 .thumb
 #else
diff --git a/crypto/ec/asm/ecp_nistz256-armv4.pl b/crypto/ec/asm/ecp_nistz256-armv4.pl
index aeeb190335f9ae2f8f57b56b57cd4fe88fa7ff80..3a636eae6cb61d8ab7830c6b7770db4d4e7d619f 100755 (executable)
--- a/crypto/ec/asm/ecp_nistz256-armv4.pl
+++ b/crypto/ec/asm/ecp_nistz256-armv4.pl
@@ -45,7 +45,7 @@ $code.=<<___;
 #include "arm_arch.h"
 
 .text
 #include "arm_arch.h"
 
 .text
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
 .syntax        unified
 .thumb
 #else
 .syntax        unified
 .thumb
 #else
diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
index 245ac921d298cbbbd219354b39f7c8fd3d84e6a6..0d5b8ef3a76e08e91caf5cd6569c8872ad09bc81 100644 (file)
--- a/crypto/modes/asm/ghash-armv4.pl
+++ b/crypto/modes/asm/ghash-armv4.pl
@@ -136,7 +136,7 @@ $code=<<___;
 #include "arm_arch.h"
 
 .text
 #include "arm_arch.h"
 
 .text
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
 .syntax        unified
 .thumb
 #else
 .syntax        unified
 .thumb
 #else
diff --git a/crypto/perlasm/arm-xlate.pl b/crypto/perlasm/arm-xlate.pl
index 81ceb3142ce377eb7ea77376a170ca899de6415d..ecd3198c44db7ca340c5d31b7240243e7bccabd9 100755 (executable)
--- a/crypto/perlasm/arm-xlate.pl
+++ b/crypto/perlasm/arm-xlate.pl
@@ -66,6 +66,12 @@ my $extern = sub {
 };
 my $type = sub {
     if ($flavour =~ /linux/)   { ".type\t".join(',',@_); }
 };
 my $type = sub {
     if ($flavour =~ /linux/)   { ".type\t".join(',',@_); }
+    elsif ($flavour =~ /ios32/)        { if (join(',',@_) =~ /(\w+),%function/) {
+                                       "#ifdef __thumb2__\n".
+                                       ".thumb_func    $1\n".
+                                       "#endif";
+                                 }
+                               }
     else                       { ""; }
 };
 my $size = sub {
     else                       { ""; }
 };
 my $size = sub {
diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl
index 9d34e04f7b632d25b146ce16f49be87fa3bb6829..e1bb92bad764dd26c9ca9a60819d2804f152a034 100644 (file)
--- a/crypto/sha/asm/sha1-armv4-large.pl
+++ b/crypto/sha/asm/sha1-armv4-large.pl
@@ -181,7 +181,7 @@ $code=<<___;
 #include "arm_arch.h"
 
 .text
 #include "arm_arch.h"
 
 .text
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
 .syntax        unified
 .thumb
 #else
 .syntax        unified
 .thumb
 #else
@@ -222,7 +222,7 @@ for($i=0;$i<5;$i++) {
        &BODY_00_15(@V);        unshift(@V,pop(@V));
 }
 $code.=<<___;
        &BODY_00_15(@V);        unshift(@V,pop(@V));
 }
 $code.=<<___;
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
        mov     $t3,sp
        teq     $Xi,$t3
 #else
        mov     $t3,sp
        teq     $Xi,$t3
 #else
@@ -246,7 +246,7 @@ for($i=0;$i<5;$i++) {
        &BODY_20_39(@V);        unshift(@V,pop(@V));
 }
 $code.=<<___;
        &BODY_20_39(@V);        unshift(@V,pop(@V));
 }
 $code.=<<___;
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
        mov     $t3,sp
        teq     $Xi,$t3
 #else
        mov     $t3,sp
        teq     $Xi,$t3
 #else
@@ -263,7 +263,7 @@ for($i=0;$i<5;$i++) {
        &BODY_40_59(@V);        unshift(@V,pop(@V));
 }
 $code.=<<___;
        &BODY_40_59(@V);        unshift(@V,pop(@V));
 }
 $code.=<<___;
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
        mov     $t3,sp
        teq     $Xi,$t3
 #else
        mov     $t3,sp
        teq     $Xi,$t3
 #else
@@ -610,7 +610,7 @@ my ($W0,$W1,$ABCD_SAVE)=map("q$_",(12..14));
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7
 
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7
 
-# if defined(__thumb2__) && !defined(__APPLE__)
+# if defined(__thumb2__)
 #  define INST(a,b,c,d)        .byte   c,d|0xf,a,b
 # else
 #  define INST(a,b,c,d)        .byte   a,b,c,d|0x10
 #  define INST(a,b,c,d)        .byte   c,d|0xf,a,b
 # else
 #  define INST(a,b,c,d)        .byte   a,b,c,d|0x10
diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index c65073b7f95c1f6f6cd1badcaf75192122e9e29a..b6b39dcbbb3f73bc9b9da3030e3693c872da114c 100644 (file)
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -175,7 +175,7 @@ $code=<<___;
 #endif
 
 .text
 #endif
 
 .text
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
 .syntax unified
 .thumb
 # define adrl adr
 .syntax unified
 .thumb
 # define adrl adr
@@ -595,7 +595,7 @@ my $Ktbl="r3";
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 
-# if defined(__thumb2__) && !defined(__APPLE__)
+# if defined(__thumb2__)
 #  define INST(a,b,c,d)        .byte   c,d|0xc,a,b
 # else
 #  define INST(a,b,c,d)        .byte   a,b,c,d
 #  define INST(a,b,c,d)        .byte   c,d|0xc,a,b
 # else
 #  define INST(a,b,c,d)        .byte   a,b,c,d
diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl
index a83d6772c8d357c71523196ffc8c559363c0fc20..56bb9fddffc7965e5335d0d3c0fa651fa7f99cf6 100644 (file)
--- a/crypto/sha/asm/sha512-armv4.pl
+++ b/crypto/sha/asm/sha512-armv4.pl
@@ -212,7 +212,7 @@ $code=<<___;
 #endif
 
 .text
 #endif
 
 .text
-#if defined(__thumb2__) && !defined(__APPLE__)
+#if defined(__thumb2__)
 .syntax unified
 .thumb
 # define adrl adr
 .syntax unified
 .thumb
 # define adrl adr
Unnamed repository; edit this file 'description' to name the repository.