4 files changed, 8 insertions, 0 deletions

diff --git a/src/lib/libcrypto/bn/asm/parisc-mont.pl b/src/lib/libcrypto/bn/asm/parisc-mont.pl
index baa19675ac..fcfdee1f1f 100644
--- a/src/lib/libcrypto/bn/asm/parisc-mont.pl
+++ b/src/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/src/lib/libcrypto/modes/asm/ghash-parisc.pl b/src/lib/libcrypto/modes/asm/ghash-parisc.pl
index 38c5e00a98..b17ee8858c 100644
--- a/src/lib/libcrypto/modes/asm/ghash-parisc.pl
+++ b/src/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/src/lib/libssl/src/crypto/bn/asm/parisc-mont.pl b/src/lib/libssl/src/crypto/bn/asm/parisc-mont.pl
index baa19675ac..fcfdee1f1f 100644
--- a/src/lib/libssl/src/crypto/bn/asm/parisc-mont.pl
+++ b/src/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/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl b/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
index 38c5e00a98..b17ee8858c 100644
--- a/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
+++ b/src/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