[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  19ded1a717b6c72c3db241f06787a353f1190755 (commit)
      from  e1182bdb8a735b96dd99d8eefd01e4edf6241a82 (commit)


- Log -----------------------------------------------------------------
commit 19ded1a717b6c72c3db241f06787a353f1190755
Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Feb 18 10:08:27 2020 -0800

    config: Drop linux-alpha-gcc+bwx
    
    Its entry in Configuration/10-main.conf was dropped in commit
    7ead0c89185c ("Configure: fold related configurations more aggressively
    and clean-up.") probably because all but one of its bn_ops were removed
    (RC4_CHAR remained). Benchmarks on an Alpha EV7 indicate that RC4_INT is
    better than RC4_CHAR so rather than restoring the configuation, remove
    it from config.
    
    CLA: trivial
    Bug: https://bugs.gentoo.org/697840
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11130)

-----------------------------------------------------------------------

Summary of changes:
 config | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/config b/config
index 2213969f90..e39481ca2a 100755
--- a/config
+++ b/config
@@ -498,10 +498,7 @@ case "$GUESSOS" in
 	OUT="ios64-cross" ;;
   alpha-*-linux2)
         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
-	case ${ISA:-generic} in
-	*[678])	OUT="linux-alpha+bwx-$CC" ;;
-	*)	OUT="linux-alpha-$CC" ;;
-	esac
+	OUT="linux-alpha-$CC"
 	if [ "$CC" = "gcc" ]; then
 	    case ${ISA:-generic} in
 	    EV5|EV45)		__CNF_CFLAGS="$__CNF_CFLAGS -mcpu=ev5"