diff options
| author | Adam Langley <agl@google.com> | 2015-02-14 01:57:49 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-02-19 22:58:17 +0300 |
| commit | 16e38b2b8f50a3d048f61d2979d5ceddacd70fc3 (patch) | |
| tree | 209a45ddc604fe05086c7b824ed234f72ab474be /crypto | |
| parent | d3459fb2f9c98a8fd60626c22ce40876d674dbaa (diff) | |
Mark OPENSSL_armcap_P as hidden in ARM asm.
This is an import from ARM. Without this, one of the Android builds of
BoringSSL was failing with:
(sha512-armv4.o): requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC
This is (I believe) a very misleading error message. The R_ARM_REL32
relocation type is the correct type for position independent code. But
unless the target symbol is hidden then the linker doesn't know that
it's not going to be overridden by a different ELF module.
Chromium probably gets away with this because of different default
compiler flags than Android.
Change-Id: I967eabc4d6b33d1e6635caaf6e7a306e4e77c101
Reviewed-on: https://boringssl-review.googlesource.com/3471
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto')
| -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 |
4 files changed, 4 insertions, 0 deletions
diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl index 5cc13288..23d6a956 100644 --- a/crypto/bn/asm/armv4-mont.pl +++ b/crypto/bn/asm/armv4-mont.pl @@ -661,6 +661,7 @@ $code.=<<___; .align 2 #if __ARM_ARCH__>=7 .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif ___ diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl index b2c30322..1ffa041e 100644 --- a/crypto/sha/asm/sha1-armv4-large.pl +++ b/crypto/sha/asm/sha1-armv4-large.pl @@ -642,6 +642,7 @@ ___ $code.=<<___; #if __ARM_MAX_ARCH__>=7 .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif ___ diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl index f14c9c3c..398376e5 100644 --- a/crypto/sha/asm/sha256-armv4.pl +++ b/crypto/sha/asm/sha256-armv4.pl @@ -621,6 +621,7 @@ $code.=<<___; .align 2 #if __ARM_MAX_ARCH__>=7 .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif ___ diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl index fb7dc506..bfe28c45 100644 --- a/crypto/sha/asm/sha512-armv4.pl +++ b/crypto/sha/asm/sha512-armv4.pl @@ -599,6 +599,7 @@ $code.=<<___; .align 2 #if __ARM_MAX_ARCH__>=7 .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif ___ |