From d69d10da5510517830f98435b4984052c2d21825 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 4 Nov 2016 13:56:05 +0000
Subject: Remove I386_ONLY define. It was only used to prefer a
 faster-on-genuine-80386-but-slower-on-80486-onwards innstruction sequence in
 the SHA512 code, and had not been enabled in years, if at all.

ok tom@ bcook@
---
 src/lib/libcrypto/sha/sha512.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'src/lib/libcrypto/sha/sha512.c')

diff --git a/src/lib/libcrypto/sha/sha512.c b/src/lib/libcrypto/sha/sha512.c
index 7a55c0acc9..6b95cfa72e 100644
--- a/src/lib/libcrypto/sha/sha512.c
+++ b/src/lib/libcrypto/sha/sha512.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha512.c,v 1.14 2015/09/10 15:56:26 jsing Exp $ */
+/* $OpenBSD: sha512.c,v 1.15 2016/11/04 13:56:05 miod Exp $ */
 /* ====================================================================
  * Copyright (c) 2004 The OpenSSL Project.  All rights reserved
  * according to the OpenSSL license [found in ../../LICENSE].
@@ -320,23 +320,12 @@ static const SHA_LONG64 K512[80] = {
 				: "=r"(ret)			\
 				: "0"(ret)); ret;		})
 # elif (defined(__i386) || defined(__i386__))
-#  if defined(I386_ONLY)
-#   define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
-			 unsigned int hi=p[0],lo=p[1];		\
-				asm("xchgb %%ah,%%al;xchgb %%dh,%%dl;"\
-				    "roll $16,%%eax; roll $16,%%edx; "\
-				    "xchgb %%ah,%%al;xchgb %%dh,%%dl;" \
-				: "=a"(lo),"=d"(hi)		\
-				: "0"(lo),"1"(hi) : "cc");	\
-				((SHA_LONG64)hi)<<32|lo;	})
-#  else
 #   define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
 			 unsigned int hi=p[0],lo=p[1];		\
 				asm ("bswapl %0; bswapl %1;"	\
 				: "=r"(lo),"=r"(hi)		\
 				: "0"(lo),"1"(hi));		\
 				((SHA_LONG64)hi)<<32|lo;	})
-#  endif
 # elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64)
 #  define ROTR(a,n)	({ SHA_LONG64 ret;		\
 				asm ("rotrdi %0,%1,%2"	\
-- 
cgit v1.2.3-55-g6feb