kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove local __arm__ ifdef on aes-armv4.pl.

Browse Source 
We patch arm-xlate.pl to add the ifdefs, so this isn't needed and
reduces our upstream diff.

(We do still have a diff from upstream here. Will go through them
shortly.)

Change-Id: I5b1e301b9111969815f58d69a98591c973465f42
Reviewed-on: https://boringssl-review.googlesource.com/17105
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2017-06-12 15:02:12 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 0514e3dfdd
commit c07635f869
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/fipsmodule/aes/asm/aes-armv4.pl
View File

@ -63,7 +63,6 @@ $key="r11";
$rounds="r12";
$code=<<___;
#if defined(__arm__)
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#else
@ -1225,8 +1224,6 @@ _armv4_AES_decrypt:
.size _armv4_AES_decrypt,.-_armv4_AES_decrypt
.asciz "AES for ARMv4, CRYPTOGAMS by <appro\@openssl.org>"
.align 2
#endif
___
$code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm; # make it possible to compile with -march=armv4