Merge BoringSSL 35be688: Enable upstream's ChaCha20 assembly for x86 …

…and ARM (32- and 64-bit).
zhaixiaojuan · Feb 29, 2016 · 68abf98 · 68abf98
2 parents 095835b + 35be688
commit 68abf98
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 2,824 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -24,17 +24,3 @@ you are cross-compiling an x86 build on a 64-bit version of Linux, then you
 need to have the proper gcc-multilibs and g++-multilibs packages or equivalent
 installed.
 
-
-
-Prerequisites for Regenerating `crypto/chacha/chacha_vec_arm.S`
-===============================================================
-
-If you change `crypto/chacha/chacha_vec.c`, you will need the
-arm-linux-gnueabihf-gcc compiler:
-
-```
-wget https://releases.linaro.org/14.11/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf.tar.xz && \
-echo bc4ca2ced084d2dc12424815a4442e19cb1422db87068830305d90075feb1a3b  gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf.tar.xz | sha256sum -c && \
-tar xf gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf.tar.xz && \
-sudo mv gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf /opt/
-```
diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl
@@ -162,7 +162,7 @@ sub ROUND {
 }
 
 $code.=<<___;
-#include "arm_arch.h"
+#include <openssl/arm_arch.h>
 
 .text
 #if defined(__thumb2__)

diff --git a/crypto/chacha/asm/chacha-armv8.pl b/crypto/chacha/asm/chacha-armv8.pl
@@ -111,7 +111,7 @@ sub ROUND {
 }
 
 $code.=<<___;
-#include "arm_arch.h"
+#include <openssl/arm_arch.h>
 
 .text
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,7 +111,7 @@ sub ROUND { @@
     }
     $code.=<<___;
-    #include "arm_arch.h"
+    #include <openssl/arm_arch.h>
     .text
@@ Expand Down @@