diff options
| author | Adam Langley <agl@google.com> | 2015-03-06 11:08:23 -0800 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-03-06 12:15:23 -0800 |
| commit | a4fb56a4374ac52a0b1c23e3654d4426c2e4adb3 (patch) | |
| tree | fc5be1795f1cb25893d1dda8f9f581ed8430dece /linux-x86_64/crypto/aes | |
| parent | 73e611480396013cb4e059bb9e5ebb0db8e1ffce (diff) | |
| download | external_boringssl-a4fb56a4374ac52a0b1c23e3654d4426c2e4adb3.zip external_boringssl-a4fb56a4374ac52a0b1c23e3654d4426c2e4adb3.tar.gz external_boringssl-a4fb56a4374ac52a0b1c23e3654d4426c2e4adb3.tar.bz2 | |
Include .extern and .hidden in x86-64 asm.
This is backport of BoringSSL's d216b71f909fe56255813dab0a8d052534bdcb91
and https://boringssl-review.googlesource.com/3810 and should allow asm
on x86-64 to build correctly.
Change-Id: Id321768930182951223dbf90c4c910e24d9b6798
Diffstat (limited to 'linux-x86_64/crypto/aes')
| -rw-r--r-- | linux-x86_64/crypto/aes/aes-x86_64.S | 3 | ||||
| -rw-r--r-- | linux-x86_64/crypto/aes/aesni-x86_64.S | 3 | ||||
| -rw-r--r-- | linux-x86_64/crypto/aes/bsaes-x86_64.S | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/linux-x86_64/crypto/aes/aes-x86_64.S b/linux-x86_64/crypto/aes/aes-x86_64.S index b01ad7f..5f4b057 100644 --- a/linux-x86_64/crypto/aes/aes-x86_64.S +++ b/linux-x86_64/crypto/aes/aes-x86_64.S @@ -1294,7 +1294,8 @@ asm_AES_set_decrypt_key: .globl asm_AES_cbc_encrypt .hidden asm_AES_cbc_encrypt .type asm_AES_cbc_encrypt,@function - +.extern OPENSSL_ia32cap_P +.hidden OPENSSL_ia32cap_P .hidden asm_AES_cbc_encrypt asm_AES_cbc_encrypt: cmpq $0,%rdx diff --git a/linux-x86_64/crypto/aes/aesni-x86_64.S b/linux-x86_64/crypto/aes/aesni-x86_64.S index 9ab973d..ecefbe5 100644 --- a/linux-x86_64/crypto/aes/aesni-x86_64.S +++ b/linux-x86_64/crypto/aes/aesni-x86_64.S @@ -1,6 +1,7 @@ #if defined(__x86_64__) .text - +.extern OPENSSL_ia32cap_P +.hidden OPENSSL_ia32cap_P .globl aesni_encrypt .hidden aesni_encrypt .type aesni_encrypt,@function diff --git a/linux-x86_64/crypto/aes/bsaes-x86_64.S b/linux-x86_64/crypto/aes/bsaes-x86_64.S index 2960e95..8cfa4df 100644 --- a/linux-x86_64/crypto/aes/bsaes-x86_64.S +++ b/linux-x86_64/crypto/aes/bsaes-x86_64.S @@ -1,8 +1,10 @@ #if defined(__x86_64__) .text - - +.extern asm_AES_encrypt +.hidden asm_AES_encrypt +.extern asm_AES_decrypt +.hidden asm_AES_decrypt .type _bsaes_encrypt8,@function .align 64 @@ -1063,7 +1065,8 @@ _bsaes_key_convert: .byte 0xf3,0xc3 .size _bsaes_key_convert,.-_bsaes_key_convert - +.extern asm_AES_cbc_encrypt +.hidden asm_AES_cbc_encrypt .globl bsaes_cbc_encrypt .hidden bsaes_cbc_encrypt .type bsaes_cbc_encrypt,@function |