diff options
author | Adam Langley <agl@google.com> | 2015-08-25 04:03:17 +0300 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-08-26 04:57:59 +0300 |
commit | 73415b6aa0ebe5a6b8acc0bcd66483eca1481676 (patch) | |
tree | 2308a0e0d99069a42b64f96dcba374f17affd1df /crypto/bn | |
parent | 61821bf149f774e7110ab3a76cc5e1e32fa5c2c7 (diff) |
Move arm_arch.h and fix up lots of include paths.
arm_arch.h is included from ARM asm files, but lives in crypto/, not
openssl/include/. Since the asm files are often built from a different
location than their position in the source tree, relative include paths
are unlikely to work so, rather than having crypto/ be a de-facto,
second global include path, this change moves arm_arch.h to
include/openssl/.
It also removes entries from many include paths because they should be
needed as relative includes are always based on the locations of the
source file.
Change-Id: I638ff43d641ca043a4fc06c0d901b11c6ff73542
Reviewed-on: https://boringssl-review.googlesource.com/5746
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/bn')
-rw-r--r-- | crypto/bn/CMakeLists.txt | 2 | ||||
-rw-r--r-- | crypto/bn/asm/armv4-mont.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/bn/CMakeLists.txt b/crypto/bn/CMakeLists.txt index 63029cf7..232e40ae 100644 --- a/crypto/bn/CMakeLists.txt +++ b/crypto/bn/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "x86_64") set( diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl index 0f1b6a90..4206fd85 100644 --- a/crypto/bn/asm/armv4-mont.pl +++ b/crypto/bn/asm/armv4-mont.pl @@ -79,7 +79,7 @@ $_n0="$num,#14*4"; $_num="$num,#15*4"; $_bpend=$_num; $code=<<___; -#include "arm_arch.h" +#include <openssl/arm_arch.h> .text .code 32 |