Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Feb 2021 04:21:49 GMT
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: ba4d5b4d5951 - releng/13.0 - OpenSSL: Regen assembly files for OpenSSL 1.1.1j
Message-ID:  <202102180421.11I4LnB6070669@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/13.0 has been updated by jkim:

URL: https://cgit.FreeBSD.org/src/commit/?id=ba4d5b4d5951b1b2e3e7eb280b62a34cc95988d6

commit ba4d5b4d5951b1b2e3e7eb280b62a34cc95988d6
Author:     Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2021-02-17 05:35:11 +0000
Commit:     Jung-uk Kim <jkim@FreeBSD.org>
CommitDate: 2021-02-18 00:16:20 +0000

    OpenSSL: Regen assembly files for OpenSSL 1.1.1j
    
    (cherry picked from commit 3396647c8dc40e859609995d8f5415df43504416)
    (cherry picked from commit 7973db046cb057192199dcc72c64789afc160ced)
    
    Approved by:    re (gjb)
---
 sys/crypto/openssl/arm/poly1305-armv4.S | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys/crypto/openssl/arm/poly1305-armv4.S b/sys/crypto/openssl/arm/poly1305-armv4.S
index c3041f6e2905..02d745f510b7 100644
--- a/sys/crypto/openssl/arm/poly1305-armv4.S
+++ b/sys/crypto/openssl/arm/poly1305-armv4.S
@@ -87,10 +87,10 @@ poly1305_init:
 #  ifdef __thumb2__
 	itete	eq
 #  endif
-	addeq	r12,r11,#(poly1305_emit-.Lpoly1305_init)
-	addne	r12,r11,#(poly1305_emit_neon-.Lpoly1305_init)
-	addeq	r11,r11,#(poly1305_blocks-.Lpoly1305_init)
-	addne	r11,r11,#(poly1305_blocks_neon-.Lpoly1305_init)
+	addeq	r12,r11,#(.Lpoly1305_emit-.Lpoly1305_init)
+	addne	r12,r11,#(.Lpoly1305_emit_neon-.Lpoly1305_init)
+	addeq	r11,r11,#(.Lpoly1305_blocks-.Lpoly1305_init)
+	addne	r11,r11,#(.Lpoly1305_blocks_neon-.Lpoly1305_init)
 # endif
 # ifdef	__thumb2__
 	orr	r12,r12,#1	@ thumb-ify address
@@ -292,6 +292,7 @@ poly1305_blocks:
 .type	poly1305_emit,%function
 .align	5
 poly1305_emit:
+.Lpoly1305_emit:
 	stmdb	sp!,{r4,r5,r6,r7,r8,r9,r10,r11}
 .Lpoly1305_emit_enter:
 
@@ -602,6 +603,7 @@ poly1305_init_neon:
 .type	poly1305_blocks_neon,%function
 .align	5
 poly1305_blocks_neon:
+.Lpoly1305_blocks_neon:
 	ldr	ip,[r0,#36]		@ is_base2_26
 	ands	r2,r2,#-16
 	beq	.Lno_data_neon
@@ -1088,6 +1090,7 @@ poly1305_blocks_neon:
 .type	poly1305_emit_neon,%function
 .align	5
 poly1305_emit_neon:
+.Lpoly1305_emit_neon:
 	ldr	ip,[r0,#36]		@ is_base2_26
 
 	stmdb	sp!,{r4,r5,r6,r7,r8,r9,r10,r11}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102180421.11I4LnB6070669>