diff options
| author | miod <> | 2014-04-23 19:20:36 +0000 |
|---|---|---|
| committer | miod <> | 2014-04-23 19:20:36 +0000 |
| commit | 0d15f5b8849bca4941e94d990f6b6c7331687f16 (patch) | |
| tree | 026b3787b029f9c6cd5298211c94ed6701f6da8f | |
| parent | 2b6194972603c42800a3b08dec4925ab370d6bd1 (diff) | |
| download | openbsd-0d15f5b8849bca4941e94d990f6b6c7331687f16.tar.gz openbsd-0d15f5b8849bca4941e94d990f6b6c7331687f16.tar.bz2 openbsd-0d15f5b8849bca4941e94d990f6b6c7331687f16.zip | |
One last Dec C tentacle on alpha.
| -rw-r--r-- | src/lib/libcrypto/bn/bn_lcl.h | 5 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/bn/bn_lcl.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libcrypto/bn/bn_lcl.h b/src/lib/libcrypto/bn/bn_lcl.h index 22b4d17eb6..e46cbc2ef8 100644 --- a/src/lib/libcrypto/bn/bn_lcl.h +++ b/src/lib/libcrypto/bn/bn_lcl.h | |||
| @@ -235,10 +235,7 @@ extern "C" { | |||
| 235 | * <appro@fy.chalmers.se> | 235 | * <appro@fy.chalmers.se> |
| 236 | */ | 236 | */ |
| 237 | # if defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT)) | 237 | # if defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT)) |
| 238 | # if defined(__DECC) | 238 | # if defined(__GNUC__) && __GNUC__>=2 |
| 239 | # include <c_asm.h> | ||
| 240 | # define BN_UMULT_HIGH(a,b) (BN_ULONG)asm("umulh %a0,%a1,%v0",(a),(b)) | ||
| 241 | # elif defined(__GNUC__) && __GNUC__>=2 | ||
| 242 | # define BN_UMULT_HIGH(a,b) ({ \ | 239 | # define BN_UMULT_HIGH(a,b) ({ \ |
| 243 | register BN_ULONG ret; \ | 240 | register BN_ULONG ret; \ |
| 244 | asm ("umulh %1,%2,%0" \ | 241 | asm ("umulh %1,%2,%0" \ |
diff --git a/src/lib/libssl/src/crypto/bn/bn_lcl.h b/src/lib/libssl/src/crypto/bn/bn_lcl.h index 22b4d17eb6..e46cbc2ef8 100644 --- a/src/lib/libssl/src/crypto/bn/bn_lcl.h +++ b/src/lib/libssl/src/crypto/bn/bn_lcl.h | |||
| @@ -235,10 +235,7 @@ extern "C" { | |||
| 235 | * <appro@fy.chalmers.se> | 235 | * <appro@fy.chalmers.se> |
| 236 | */ | 236 | */ |
| 237 | # if defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT)) | 237 | # if defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT)) |
| 238 | # if defined(__DECC) | 238 | # if defined(__GNUC__) && __GNUC__>=2 |
| 239 | # include <c_asm.h> | ||
| 240 | # define BN_UMULT_HIGH(a,b) (BN_ULONG)asm("umulh %a0,%a1,%v0",(a),(b)) | ||
| 241 | # elif defined(__GNUC__) && __GNUC__>=2 | ||
| 242 | # define BN_UMULT_HIGH(a,b) ({ \ | 239 | # define BN_UMULT_HIGH(a,b) ({ \ |
| 243 | register BN_ULONG ret; \ | 240 | register BN_ULONG ret; \ |
| 244 | asm ("umulh %1,%2,%0" \ | 241 | asm ("umulh %1,%2,%0" \ |