Index: third_party/boringssl/mac-x86/crypto/aes/aes-586.S |
diff --git a/third_party/boringssl/mac-x86/crypto/aes/aes-586.S b/third_party/boringssl/mac-x86/crypto/aes/aes-586.S |
index f5ecf56f5ca395ada8a37792efd7130f4e614e5f..d3dc6beb6ac1e073c8f21feddd874e1133bbadcb 100644 |
--- a/third_party/boringssl/mac-x86/crypto/aes/aes-586.S |
+++ b/third_party/boringssl/mac-x86/crypto/aes/aes-586.S |
@@ -1,6 +1,7 @@ |
#if defined(__i386__) |
.file "aes-586.S" |
.text |
+.private_extern __x86_AES_encrypt_compact |
.align 4 |
__x86_AES_encrypt_compact: |
movl %edi,20(%esp) |
@@ -258,6 +259,7 @@ L000loop: |
xorl 24(%edi),%ecx |
xorl 28(%edi),%edx |
ret |
+.private_extern __sse_AES_encrypt_compact |
.align 4 |
__sse_AES_encrypt_compact: |
pxor (%edi),%mm0 |
@@ -413,6 +415,7 @@ L002out: |
pxor (%edi),%mm0 |
pxor 8(%edi),%mm4 |
ret |
+.private_extern __x86_AES_encrypt |
.align 4 |
__x86_AES_encrypt: |
movl %edi,20(%esp) |
@@ -959,10 +962,11 @@ LAES_Te: |
.long 16,32,64,128 |
.long 27,54,0,0 |
.long 0,0,0,0 |
-.globl _AES_encrypt |
+.globl _asm_AES_encrypt |
+.private_extern _asm_AES_encrypt |
.align 4 |
-_AES_encrypt: |
-L_AES_encrypt_begin: |
+_asm_AES_encrypt: |
+L_asm_AES_encrypt_begin: |
pushl %ebp |
pushl %ebx |
pushl %esi |
@@ -1022,6 +1026,7 @@ L005x86: |
popl %ebx |
popl %ebp |
ret |
+.private_extern __x86_AES_decrypt_compact |
.align 4 |
__x86_AES_decrypt_compact: |
movl %edi,20(%esp) |
@@ -1375,6 +1380,7 @@ L006loop: |
xorl 24(%edi),%ecx |
xorl 28(%edi),%edx |
ret |
+.private_extern __sse_AES_decrypt_compact |
.align 4 |
__sse_AES_decrypt_compact: |
pxor (%edi),%mm0 |
@@ -1589,6 +1595,7 @@ L008out: |
pxor (%edi),%mm0 |
pxor 8(%edi),%mm4 |
ret |
+.private_extern __x86_AES_decrypt |
.align 4 |
__x86_AES_decrypt: |
movl %edi,20(%esp) |
@@ -2139,10 +2146,11 @@ LAES_Td: |
.byte 200,235,187,60,131,83,153,97 |
.byte 23,43,4,126,186,119,214,38 |
.byte 225,105,20,99,85,33,12,125 |
-.globl _AES_decrypt |
+.globl _asm_AES_decrypt |
+.private_extern _asm_AES_decrypt |
.align 4 |
-_AES_decrypt: |
-L_AES_decrypt_begin: |
+_asm_AES_decrypt: |
+L_asm_AES_decrypt_begin: |
pushl %ebp |
pushl %ebx |
pushl %esi |
@@ -2202,10 +2210,11 @@ L011x86: |
popl %ebx |
popl %ebp |
ret |
-.globl _AES_cbc_encrypt |
+.globl _asm_AES_cbc_encrypt |
+.private_extern _asm_AES_cbc_encrypt |
.align 4 |
-_AES_cbc_encrypt: |
-L_AES_cbc_encrypt_begin: |
+_asm_AES_cbc_encrypt: |
+L_asm_AES_cbc_encrypt_begin: |
pushl %ebp |
pushl %ebx |
pushl %esi |
@@ -2733,6 +2742,7 @@ L039slow_dec_partial_x86: |
popl %ebx |
popl %ebp |
ret |
+.private_extern __x86_AES_set_encrypt_key |
.align 4 |
__x86_AES_set_encrypt_key: |
pushl %ebp |
@@ -2961,16 +2971,18 @@ L045exit: |
popl %ebx |
popl %ebp |
ret |
-.globl _AES_set_encrypt_key |
+.globl _asm_AES_set_encrypt_key |
+.private_extern _asm_AES_set_encrypt_key |
.align 4 |
-_AES_set_encrypt_key: |
-L_AES_set_encrypt_key_begin: |
+_asm_AES_set_encrypt_key: |
+L_asm_AES_set_encrypt_key_begin: |
call __x86_AES_set_encrypt_key |
ret |
-.globl _AES_set_decrypt_key |
+.globl _asm_AES_set_decrypt_key |
+.private_extern _asm_AES_set_decrypt_key |
.align 4 |
-_AES_set_decrypt_key: |
-L_AES_set_decrypt_key_begin: |
+_asm_AES_set_decrypt_key: |
+L_asm_AES_set_decrypt_key_begin: |
call __x86_AES_set_encrypt_key |
cmpl $0,%eax |
je L054proceed |