From: miod <miod@openbsd.org>
Date: Fri, 2 May 2014 22:22:27 +0000 (+0000)
Subject: More use of 64-bit registers which needs to be disabled under OpenBSD.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=20d5b0876421a450225fa8509fb6d76f88e3362a;p=openbsd

More use of 64-bit registers which needs to be disabled under OpenBSD.
---

diff --git a/lib/libcrypto/bn/asm/parisc-mont.pl b/lib/libcrypto/bn/asm/parisc-mont.pl
index baa19675ac3..fcfdee1f1f8 100644
--- a/lib/libcrypto/bn/asm/parisc-mont.pl
+++ b/lib/libcrypto/bn/asm/parisc-mont.pl
@@ -214,6 +214,7 @@ $code.=<<___;
 	 flddx		$idx($np),${fni}	; np[2,3]
 ___
 $code.=<<___ if ($BN_SZ==4);
+#ifndef __OpenBSD__
 	mtctl		$hi0,%cr11		; $hi0 still holds 31
 	extrd,u,*=	$hi0,%sar,1,$hi0	; executes on PA-RISC 1.0
 	b		L\$parisc11
@@ -550,6 +551,7 @@ $code.=<<___;
 
 	.ALIGN		8
 L\$parisc11
+#endif
 	xmpyu		${fai}L,${fbi},${fab0}	; ap[j]*bp[0]
 	xmpyu		${fni}L,${fm0}R,${fnm0}	; np[j]*m
 	ldw		-12($xfer),$ablo
diff --git a/lib/libcrypto/modes/asm/ghash-parisc.pl b/lib/libcrypto/modes/asm/ghash-parisc.pl
index 38c5e00a98d..b17ee8858c9 100644
--- a/lib/libcrypto/modes/asm/ghash-parisc.pl
+++ b/lib/libcrypto/modes/asm/ghash-parisc.pl
@@ -117,6 +117,7 @@ L\$pic_gmult
 	ldi	0xf0,$mask0xf0
 ___
 $code.=<<___ if ($SIZE_T==4);
+#ifndef __OpenBSD__
 	ldi	31,$rem
 	mtctl	$rem,%cr11
 	extrd,u,*= $rem,%sar,1,$rem	; executes on PA-RISC 1.0
@@ -215,6 +216,7 @@ $code.=<<___ if ($SIZE_T==4);
 	nop
 
 L\$parisc1_gmult
+#endif
 	ldb	15($Xi),$nlo
 	ldo	12($Htbl),$Hll
 	ldo	8($Htbl),$Hlh
diff --git a/lib/libssl/src/crypto/bn/asm/parisc-mont.pl b/lib/libssl/src/crypto/bn/asm/parisc-mont.pl
index baa19675ac3..fcfdee1f1f8 100644
--- a/lib/libssl/src/crypto/bn/asm/parisc-mont.pl
+++ b/lib/libssl/src/crypto/bn/asm/parisc-mont.pl
@@ -214,6 +214,7 @@ $code.=<<___;
 	 flddx		$idx($np),${fni}	; np[2,3]
 ___
 $code.=<<___ if ($BN_SZ==4);
+#ifndef __OpenBSD__
 	mtctl		$hi0,%cr11		; $hi0 still holds 31
 	extrd,u,*=	$hi0,%sar,1,$hi0	; executes on PA-RISC 1.0
 	b		L\$parisc11
@@ -550,6 +551,7 @@ $code.=<<___;
 
 	.ALIGN		8
 L\$parisc11
+#endif
 	xmpyu		${fai}L,${fbi},${fab0}	; ap[j]*bp[0]
 	xmpyu		${fni}L,${fm0}R,${fnm0}	; np[j]*m
 	ldw		-12($xfer),$ablo
diff --git a/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl b/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
index 38c5e00a98d..b17ee8858c9 100644
--- a/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
+++ b/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
@@ -117,6 +117,7 @@ L\$pic_gmult
 	ldi	0xf0,$mask0xf0
 ___
 $code.=<<___ if ($SIZE_T==4);
+#ifndef __OpenBSD__
 	ldi	31,$rem
 	mtctl	$rem,%cr11
 	extrd,u,*= $rem,%sar,1,$rem	; executes on PA-RISC 1.0
@@ -215,6 +216,7 @@ $code.=<<___ if ($SIZE_T==4);
 	nop
 
 L\$parisc1_gmult
+#endif
 	ldb	15($Xi),$nlo
 	ldo	12($Htbl),$Hll
 	ldo	8($Htbl),$Hlh