diff options
| author |   miod <miod@openbsd.org> | 2014-09-27 20:17:52 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-09-27 20:17:52 +0000 |
| commit | da30afcc77ccc9e55871b41ff231d91467653535 (patch) | |
| tree | 02213f04c821e5f09ffa0aa948ec9f6c22b37556 | |
| parent | Move clock_reg[] definition. (diff) | |
| download | wireguard-openbsd-da30afcc77ccc9e55871b41ff231d91467653535.tar.xz wireguard-openbsd-da30afcc77ccc9e55871b41ff231d91467653535.zip | |
Doh, rev 1.4 had left out one routine with both 32-bit and 64-bit code, where
the 64-bit code has to be disabled under OpenBSD/hppa.
| -rw-r--r-- | lib/libcrypto/modes/asm/ghash-parisc.pl | 2 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/modes/asm/ghash-parisc.pl | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/libcrypto/modes/asm/ghash-parisc.pl b/lib/libcrypto/modes/asm/ghash-parisc.pl index b17ee8858c9..965802d3fae 100644 --- a/lib/libcrypto/modes/asm/ghash-parisc.pl +++ b/lib/libcrypto/modes/asm/ghash-parisc.pl @@ -372,6 +372,7 @@ L\$pic_ghash 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 @@ -481,6 +482,7 @@ $code.=<<___ if ($SIZE_T==4); nop L\$parisc1_ghash +#endif ldb 15($Xi),$nlo ldo 12($Htbl),$Hll ldo 8($Htbl),$Hlh diff --git a/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl b/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl index b17ee8858c9..965802d3fae 100644 --- a/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl +++ b/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl @@ -372,6 +372,7 @@ L\$pic_ghash 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 @@ -481,6 +482,7 @@ $code.=<<___ if ($SIZE_T==4); nop L\$parisc1_ghash +#endif ldb 15($Xi),$nlo ldo 12($Htbl),$Hll ldo 8($Htbl),$Hlh |