diff --git a/crypto/aes/asm/aes-sparcv9.pl b/crypto/aes/asm/aes-sparcv9.pl
index 76828ee7673571a0d4fe3491bb6fa00e4be907d8..c57b3a2d6d341d7971712d2e38aa40d2abd537ea 100755
--- a/crypto/aes/asm/aes-sparcv9.pl
+++ b/crypto/aes/asm/aes-sparcv9.pl
@@ -523,7 +523,7 @@ AES_encrypt:
 	ld	[%i0+12],%o3
 
 1:	call	.+8
-	sub	%o7,1b-AES_Te,%o4
+	add	%o7,AES_Te-1b,%o4
 	call	_sparcv9_AES_encrypt
 	mov	%i2,%o5
 
@@ -583,7 +583,7 @@ AES_encrypt:
 	or	%l4,%l6,%o3
 
 1:	call	.+8
-	sub	%o7,1b-AES_Te,%o4
+	add	%o7,AES_Te-1b,%o4
 	call	_sparcv9_AES_encrypt
 	mov	%i2,%o5
 
@@ -1069,7 +1069,7 @@ AES_decrypt:
 	ld	[%i0+12],%o3
 
 1:	call	.+8
-	sub	%o7,1b-AES_Td,%o4
+	add	%o7,AES_Td-1b,%o4
 	call	_sparcv9_AES_decrypt
 	mov	%i2,%o5
 
@@ -1129,7 +1129,7 @@ AES_decrypt:
 	or	%l4,%l6,%o3
 
 1:	call	.+8
-	sub	%o7,1b-AES_Td,%o4
+	add	%o7,AES_Td-1b,%o4
 	call	_sparcv9_AES_decrypt
 	mov	%i2,%o5
 
diff --git a/crypto/sha/asm/sha1-sparcv9a.pl b/crypto/sha/asm/sha1-sparcv9a.pl
index 9e8d0ca3828568ee290d658e63ef8214b9477d8f..15eb854badc824946271f2e981b22e72f15cfde8 100644
--- a/crypto/sha/asm/sha1-sparcv9a.pl
+++ b/crypto/sha/asm/sha1-sparcv9a.pl
@@ -415,7 +415,7 @@ sha1_block_data_order:
 	add	%fp,$bias-256,$base
 
 1:	call	.+8
-	sub	%o7,1b-vis_const,$tmp0
+	add	%o7,vis_const-1b,$tmp0
 
 	ldd	[$tmp0+0],$VK_00_19
 	ldd	[$tmp0+8],$VK_20_39
@@ -433,7 +433,7 @@ sha1_block_data_order:
 	and	$inp,-8,$inp
 	ld	[$ctx+16],$Ectx
 
-	# X[16] is maintained in FP register bank
+	! X[16] is maintained in FP register bank
 	alignaddr	%g0,$align,%g0
 	ldd		[$inp+0],@X[0]
 	sub		$inp,-64,$Xfer
diff --git a/crypto/sha/asm/sha512-sparcv9.pl b/crypto/sha/asm/sha512-sparcv9.pl
index fa276d258b34a39d1327c1e2de687531acfc39d2..54241aab5041f0cc51fc42436ba7128232fe3e79 100644
--- a/crypto/sha/asm/sha512-sparcv9.pl
+++ b/crypto/sha/asm/sha512-sparcv9.pl
@@ -472,7 +472,7 @@ $code.=<<___ if ($SZ==8); # SHA512
 ___
 $code.=<<___;
 .Lpic:	call	.+8
-	sub	%o7,.Lpic-K${label},$Ktbl
+	add	%o7,K${label}-.Lpic,$Ktbl
 
 	$LD	[$ctx+`0*$SZ`],$A
 	$LD	[$ctx+`1*$SZ`],$B