michael@13: Index: Configure
michael@428: --- Configure.orig	2012-03-14 23:20:40.000000000 +0100
michael@428: +++ Configure	2012-06-27 10:10:05.000000000 +0200
michael@13: @@ -6,7 +6,6 @@
michael@13:  ##
michael@13:  
michael@13:  require 5.000;
michael@13: -use strict;
michael@13:  
michael@13:  # see INSTALL for instructions.
michael@13:  
michael@13: @@ -34,6 +33,7 @@
michael@13:  #		(Default: KRB5_DIR/include)
michael@13:  # --with-krb5-flavor  Declare what flavor of Kerberos 5 is used.  Currently
michael@13:  #		supported values are "MIT" and "Heimdal".  A value is required.
michael@13: +# --with-cc     compiler to use for $CC (useful if cc is a disguised gcc)
michael@13:  #
michael@13:  # --test-sanity Make a number of sanity checks on the data in this file.
michael@13:  #               This is a debugging tool for OpenSSL developers.
michael@428: @@ -123,6 +123,7 @@
michael@13:  #$bits2="THIRTY_TWO_BIT ";
michael@13:  my $bits1="THIRTY_TWO_BIT ";
michael@13:  my $bits2="SIXTY_FOUR_BIT ";
michael@13: +my $ccarg;
michael@13:  
michael@428:  my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:des-586.o crypt586.o:aes-586.o vpaes-x86.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o:";
michael@428:  
michael@428: @@ -460,12 +461,12 @@
michael@13:  
michael@13:  #### IBM's AIX.
michael@13:  "aix3-cc",  "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
michael@428: -"aix-gcc",  "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X32",
michael@428: -"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
michael@428: +"aix-gcc",  "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
michael@428: +"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
michael@13:  # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
michael@13:  # at build time. $OBJECT_MODE is respected at ./config stage!
michael@428: -"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
michael@428: -"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
michael@428: +"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
michael@428: +"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
michael@428:  
michael@428:  #
michael@428:  # Cray T90 and similar (SDSC)
michael@428: @@ -828,6 +829,10 @@
michael@13:  			{
michael@428:  			$strict_warnings = 1;
michael@13:  			}
michael@13: +		elsif (/^--with-cc=(.*)$/)
michael@13: +			{
michael@13: +                $ccarg=$1
michael@13: +			}
michael@13:  		elsif (/^reconfigure/ || /^reconf/)
michael@13:  			{
michael@13:  			if (open(IN,"<$Makefile"))
michael@428: @@ -1143,7 +1148,7 @@
michael@13:  print "IsMK1MF=$IsMK1MF\n";
michael@13:  
michael@13:  my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
michael@13: -my $cc = $fields[$idx_cc];
michael@13: +my $cc = $ccarg ? $ccarg : $fields[$idx_cc];
michael@428:  # Allow environment CC to override compiler...
michael@428:  if($ENV{CC}) {
michael@428:      $cc = $ENV{CC};
michael@13: Index: config
michael@428: --- config.orig	2011-11-14 22:12:53.000000000 +0100
michael@428: +++ config	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -277,6 +277,9 @@
michael@428:  	    Power*)
michael@428:  		echo "ppc-apple-darwin${VERSION}"
michael@428:  		;;
michael@428: +	    x86_64 )
michael@428: +		echo "x86_64-apple-darwin${VERSION}"
michael@428: +		;;
michael@428:  	    *)
michael@428:  		echo "i686-apple-darwin${VERSION}"
michael@428:  		;;
michael@472: @@ -411,9 +414,14 @@
michael@472:  # this is where the translation occurs into SSLeay terms
michael@472:  # ---------------------------------------------------------------------------
michael@13:  
michael@472: +# Assume CC is GNU GCC if 'dumpversion' argument produces valid output
michael@472: +GCCVER=`sh -c "${CC-gcc} -dumpversion" 2>/dev/null`
michael@472: +GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
michael@472: +GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
michael@472: +
michael@428:  # Only set CC if not supplied already
michael@428:  if [ -z "$CROSS_COMPILE$CC" ]; then
michael@428: -  GCCVER=`sh -c "gcc -dumpversion" 2>/dev/null`
michael@428: +  GCCVER=`sh -c "${CC-gcc} -dumpversion" 2>/dev/null`
michael@428:    if [ "$GCCVER" != "" ]; then
michael@428:      # then strip off whatever prefix egcs prepends the number with...
michael@428:      # Hopefully, this will work for any future prefixes as well.
michael@472: @@ -424,8 +432,17 @@
michael@428:      # peak single digit before and after first dot, e.g. 2.95.1 gives 29
michael@428:      GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
michael@428:      CC=gcc
michael@428: +    SUFFIX=gcc
michael@472:    else
michael@472:      CC=cc
michael@428: +    SUFFIX=cc
michael@428: +  fi
michael@428: +else
michael@428: +  if [ "$GCCVER" != "" ]; then
michael@428: +    SUFFIX=gcc
michael@472: +  else
michael@472: +    CC=cc
michael@432: +    SUFFIX=cc
michael@428:    fi
michael@13:  fi
michael@13:  GCCVER=${GCCVER:-0}
michael@472: @@ -435,7 +452,7 @@
michael@13:    if [ $GCCVER -ge 30 ]; then
michael@13:      # PA64 support only came in with gcc 3.0.x.
michael@13:      # We check if the preprocessor symbol __LP64__ is defined...
michael@13: -    if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
michael@13: +    if echo "__LP64__" | $CC -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
michael@13:        : # __LP64__ has slipped through, it therefore is not defined
michael@13:      else
michael@13:        GCC_BITS="64"
michael@472: @@ -446,13 +463,14 @@
michael@13:    if [ $GCCVER -ge 30 ]; then
michael@13:      # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
michael@13:      # to be working, at the very least 'make test' passes...
michael@13: -    if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
michael@13: +    if $CC -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
michael@13:        GCC_ARCH="-m64"
michael@13:      else
michael@13:        GCC_ARCH="-m32"
michael@13:      fi
michael@13:    fi
michael@13:    # check for WorkShop C, expected output is "cc: blah-blah C x.x"
michael@13: +  if [ $GCCVER -eq 0 ]; then
michael@13:    CCVER=`(cc -V 2>&1) 2>/dev/null | \
michael@13:    	egrep -e '^cc: .* C [0-9]\.[0-9]' | \
michael@13:  	sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
michael@472: @@ -465,6 +483,7 @@
michael@13:        sleep 5
michael@13:      fi
michael@13:    fi
michael@13: +  fi
michael@13:  fi
michael@13:  
michael@13:  if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
michael@472: @@ -482,6 +501,7 @@
michael@13:  
michael@13:  if [ "${SYSTEM}" = "AIX" ]; then	# favor vendor cc over gcc
michael@13:      (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
michael@13: +    (gcc) 2>&1 | grep -iv "not found" > /dev/null && CC=gcc
michael@13:  fi
michael@13:  
michael@13:  CCVER=${CCVER:-0}
michael@472: @@ -507,7 +527,7 @@
michael@13:  	if [ $CPU -ge 4000 ]; then
michael@13:  		options="$options -mips2"
michael@13:  	fi
michael@13: -	OUT="irix-$CC"
michael@13: +	OUT="irix-$SUFFIX"
michael@13:  	;;
michael@13:    mips3-sgi-irix)
michael@13:  	#CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
michael@472: @@ -517,11 +537,11 @@
michael@13:  	#else
michael@13:  	#	options="$options -mips3"
michael@13:  	#fi
michael@13: -	OUT="irix-mips3-$CC"
michael@13: +	OUT="irix-mips3-$SUFFIX"
michael@13:  	;;
michael@13:    mips4-sgi-irix64)
michael@13:  	echo "WARNING! If you wish to build 64-bit library, then you have to"
michael@13: -	echo "         invoke './Configure irix64-mips4-$CC' *manually*."
michael@13: +	echo "         invoke './Configure irix64-mips4-$SUFFIX' *manually*."
michael@13:  	if [ "$TEST" = "false" -a -t 1 ]; then
michael@13:  	  echo "         You have about 5 seconds to press Ctrl-C to abort."
michael@13:  	  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
michael@472: @@ -533,7 +553,7 @@
michael@13:          #else
michael@13:          #        options="$options -mips3"
michael@13:          #fi
michael@13: -	OUT="irix-mips3-$CC"
michael@13: +	OUT="irix-mips3-$SUFFIX"
michael@13:  	;;
michael@13:    ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
michael@428:    ppc-apple-darwin*)
michael@472: @@ -566,6 +586,9 @@
michael@428:  	else
michael@428:  	    OUT="darwin-i386-cc"
michael@428:  	fi ;;
michael@428: +  x86_64-apple-darwin*)
michael@428: +    OUT="darwin64-x86_64-cc"
michael@428: +    ;;
michael@428:    armv6+7-*-iphoneos)
michael@428:  	options="$options -arch%20armv6 -arch%20armv7"
michael@428:  	OUT="iphoneos-cross" ;;
michael@472: @@ -575,10 +598,10 @@
michael@13:    alpha-*-linux2)
michael@13:          ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
michael@13:  	case ${ISA:-generic} in
michael@13: -	*[678])	OUT="linux-alpha+bwx-$CC" ;;
michael@13: -	*)	OUT="linux-alpha-$CC" ;;
michael@13: +	*[678])	OUT="linux-alpha+bwx-$SUFFIX" ;;
michael@13: +	*)	OUT="linux-alpha-$SUFFIX" ;;
michael@13:  	esac
michael@13: -	if [ "$CC" = "gcc" ]; then
michael@13: +	if [ $GCCVER -gt 0 ]; then
michael@13:  	    case ${ISA:-generic} in
michael@13:  	    EV5|EV45)		options="$options -mcpu=ev5";;
michael@13:  	    EV56|PCA56)		options="$options -mcpu=ev56";;
michael@472: @@ -662,7 +685,7 @@
michael@428:  	;;
michael@13:    x86_64-*-linux?) OUT="linux-x86_64" ;;
michael@13:    *86-*-linux2) OUT="linux-elf"
michael@13: -	if [ "$GCCVER" -gt 28 ]; then
michael@13: +	if [ $GCCVER -gt 28 ]; then
michael@13:            if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
michael@13:  	    options="$options -march=pentium"
michael@13:            fi
michael@472: @@ -676,17 +699,17 @@
michael@13:    *-*-linux1) OUT="linux-aout" ;;
michael@13:    *-*-linux2) OUT="linux-generic32" ;;
michael@13:    sun4[uv]*-*-solaris2)
michael@13: -	OUT="solaris-sparcv9-$CC"
michael@13: +	OUT="solaris-sparcv9-$SUFFIX"
michael@13:  	ISA64=`(isalist) 2>/dev/null | grep sparcv9`
michael@428:  	if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then
michael@13: -	    if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
michael@13: +	    if [ $GCCVER -eq 0 -a $CCVER -ge 50 ]; then
michael@13:  		echo "WARNING! If you wish to build 64-bit library, then you have to"
michael@13:  		echo "         invoke './Configure solaris64-sparcv9-cc' *manually*."
michael@13:  		if [ "$TEST" = "false" -a -t 1 ]; then
michael@13:  		  echo "         You have about 5 seconds to press Ctrl-C to abort."
michael@13:  		  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
michael@13:  		fi
michael@13: -	    elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
michael@13: +	    elif [ $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
michael@13:  		# $GCC_ARCH denotes default ABI chosen by compiler driver
michael@13:  		# (first one found on the $PATH). I assume that user
michael@13:  		# expects certain consistency with the rest of his builds
michael@472: @@ -712,21 +735,21 @@
michael@428:  	    OUT="solaris64-sparcv9-$CC"
michael@13:  	fi
michael@13:  	;;
michael@13: -  sun4m-*-solaris2)	OUT="solaris-sparcv8-$CC" ;;
michael@13: -  sun4d-*-solaris2)	OUT="solaris-sparcv8-$CC" ;;
michael@13: -  sun4*-*-solaris2)	OUT="solaris-sparcv7-$CC" ;;
michael@13: +  sun4m-*-solaris2)	OUT="solaris-sparcv8-$SUFFIX" ;;
michael@13: +  sun4d-*-solaris2)	OUT="solaris-sparcv8-$SUFFIX" ;;
michael@13: +  sun4*-*-solaris2)	OUT="solaris-sparcv7-$SUFFIX" ;;
michael@13:    *86*-*-solaris2)
michael@13:  	ISA64=`(isalist) 2>/dev/null | grep amd64`
michael@432:  	if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
michael@13: -	    OUT="solaris64-x86_64-$CC"
michael@13: +	    OUT="solaris64-x86_64-$SUFFIX"
michael@13:  	else
michael@13: -	    OUT="solaris-x86-$CC"
michael@13: +	    OUT="solaris-x86-$SUFFIX"
michael@13:  	    if [ `uname -r | sed -e 's/5\.//'` -lt 10 ]; then
michael@13:  		options="$options no-sse2"
michael@13:  	    fi
michael@13:  	fi
michael@13:  	;;
michael@13: -  *-*-sunos4)		OUT="sunos-$CC" ;;
michael@13: +  *-*-sunos4)		OUT="sunos-$SUFFIX" ;;
michael@13:  
michael@13:    *86*-*-bsdi4)		OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
michael@13:    alpha*-*-*bsd*)	OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
michael@472: @@ -750,7 +773,7 @@
michael@13:    *-*-osf)		OUT="osf1-alpha-cc" ;;
michael@13:    *-*-tru64)		OUT="tru64-alpha-cc" ;;
michael@13:    *-*-[Uu]nix[Ww]are7)
michael@13: -	if [ "$CC" = "gcc" ]; then
michael@13: +	if [ $GCCVER -gt 0 ]; then
michael@13:  	  OUT="unixware-7-gcc" ; options="$options no-sse2"
michael@13:  	else    
michael@13:  	  OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
michael@472: @@ -761,12 +784,12 @@
michael@13:    *-*-vos)
michael@13:  	options="$options no-threads no-shared no-asm no-dso"
michael@13:  	EXE=".pm"
michael@13: -	OUT="vos-$CC" ;;
michael@13: +	OUT="vos-$SUFFIX" ;;
michael@13:    BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
michael@13:    RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
michael@13:    *-siemens-sysv4) OUT="SINIX" ;;
michael@13:    *-hpux1*)
michael@13: -	if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
michael@13: +	if [ $GCCVER -gt 0 -a $GCC_BITS = "64" ]; then
michael@13:  	    OUT="hpux64-parisc2-gcc"
michael@13:  	fi
michael@428:  	[ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
michael@472: @@ -781,8 +804,8 @@
michael@428:  	        OUT="hpux-ia64-cc"
michael@428:               fi
michael@13:  	elif [ $CPU_VERSION -ge 532 ]; then	# PA-RISC 2.x CPU
michael@13: -	     OUT=${OUT:-"hpux-parisc2-${CC}"}
michael@13: -	     if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
michael@13: +	     OUT=${OUT:-"hpux-parisc2-${SUFFIX}"}
michael@13: +	     if [ $KERNEL_BITS -eq 64 -a $GCCVER -eq 0 ]; then
michael@13:  		echo "WARNING! If you wish to build 64-bit library then you have to"
michael@13:  		echo "         invoke './Configure hpux64-parisc2-cc' *manually*."
michael@13:  		if [ "$TEST" = "false" -a -t 1 ]; then
michael@472: @@ -791,9 +814,9 @@
michael@13:  		fi
michael@13:  	     fi
michael@13:  	elif [ $CPU_VERSION -ge 528 ]; then	# PA-RISC 1.1+ CPU
michael@13: -	     OUT="hpux-parisc-${CC}"
michael@13: +	     OUT="hpux-parisc-${SUFFIX}"
michael@13:  	elif [ $CPU_VERSION -ge 523 ]; then	# PA-RISC 1.0 CPU
michael@13: -	     OUT="hpux-parisc-${CC}"
michael@13: +	     OUT="hpux-parisc-${SUFFIX}"
michael@13:  	else					# Motorola(?) CPU
michael@428:  	     OUT="hpux-$CC"
michael@13:  	fi
michael@472: @@ -803,7 +826,7 @@
michael@428:  	[ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
michael@13:  	KERNEL_BITS=${KERNEL_BITS:-32}
michael@13:  	OBJECT_MODE=${OBJECT_MODE:-32}
michael@13: -	if [ "$CC" = "gcc" ]; then
michael@13: +	if [ $GCCVER -gt 0 ]; then
michael@13:  	    OUT="aix-gcc"
michael@428:            if [ $OBJECT_MODE -eq 64 ]; then
michael@428:              echo 'Your $OBJECT_MODE was found to be set to 64'
michael@472: @@ -913,7 +936,7 @@
michael@13:  #fi
michael@13:  
michael@13:  if [ -z "$OUT" ]; then
michael@13: -  OUT="$CC"
michael@13: +  OUT="$SUFFIX"
michael@13:  fi
michael@13:  
michael@13:  if [ ".$PERL" = . ] ; then
michael@472: @@ -945,9 +968,9 @@
michael@13:  # compiler for the platform ... in which case we add it on
michael@13:  # the end ... otherwise we leave it off
michael@13:  
michael@13: -$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null
michael@13: +$PERL ./Configure LIST | grep "$OUT-$SUFFIX" > /dev/null
michael@13:  if [ $? = "0" ]; then
michael@13: -  OUT="$OUT-$CC"
michael@13: +  OUT="$OUT-$SUFFIX"
michael@13:  fi
michael@13:  
michael@13:  OUT="$PREFIX$OUT"
michael@472: @@ -957,9 +980,9 @@
michael@13:    echo Configuring for $OUT
michael@13:  
michael@13:    if [ "$TEST" = "true" ]; then
michael@13: -    echo $PERL ./Configure $OUT $options
michael@13: +    echo $PERL ./Configure $OUT --with-cc=$CC $options
michael@13:    else
michael@13: -    $PERL ./Configure $OUT $options
michael@13: +    $PERL ./Configure $OUT --with-cc=$CC $options
michael@13:    fi
michael@13:  else
michael@13:    echo "This system ($OUT) is not supported. See file INSTALL for details."
michael@428: Index: crypto/aes/asm/aesni-sha1-x86_64.pl
michael@428: --- crypto/aes/asm/aesni-sha1-x86_64.pl.orig	2011-08-23 22:53:31.000000000 +0200
michael@428: +++ crypto/aes/asm/aesni-sha1-x86_64.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -206,7 +206,7 @@
michael@428:  ___
michael@428:  
michael@428:  my $aesenc=sub {
michael@428: -  use integer;
michael@428: +  
michael@428:    my ($n,$k)=($r/10,$r%10);
michael@428:      if ($k==0) {
michael@428:        $code.=<<___;
michael@428: @@ -249,7 +249,7 @@
michael@428:  };
michael@428:  
michael@428:  sub Xupdate_ssse3_16_31()		# recall that $Xi starts wtih 4
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 40 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -330,7 +330,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xupdate_ssse3_32_79()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 to 48 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -397,7 +397,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xuplast_ssse3_80()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -431,7 +431,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xloop_ssse3()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -456,7 +456,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xtail_ssse3()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -465,7 +465,7 @@
michael@428:  }
michael@428:  
michael@428:  sub body_00_19 () {
michael@428: -  use integer;
michael@428: +  
michael@428:    my ($k,$n);
michael@428:    my @r=(
michael@428:  	'($a,$b,$c,$d,$e)=@V;'.
michael@428: @@ -488,7 +488,7 @@
michael@428:  }
michael@428:  
michael@428:  sub body_20_39 () {
michael@428: -  use integer;
michael@428: +  
michael@428:    my ($k,$n);
michael@428:    my @r=(
michael@428:  	'($a,$b,$c,$d,$e)=@V;'.
michael@428: @@ -509,7 +509,7 @@
michael@428:  }
michael@428:  
michael@428:  sub body_40_59 () {
michael@428: -  use integer;
michael@428: +  
michael@428:    my ($k,$n);
michael@428:    my @r=(
michael@428:  	'($a,$b,$c,$d,$e)=@V;'.
michael@428: @@ -723,7 +723,7 @@
michael@428:  ___
michael@428:  
michael@428:  my $aesenc=sub {
michael@428: -  use integer;
michael@428: +  
michael@428:    my ($n,$k)=($r/10,$r%10);
michael@428:      if ($k==0) {
michael@428:        $code.=<<___;
michael@428: @@ -766,7 +766,7 @@
michael@428:  };
michael@428:  
michael@428:  sub Xupdate_avx_16_31()		# recall that $Xi starts wtih 4
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 40 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -842,7 +842,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xupdate_avx_32_79()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 to 48 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -907,7 +907,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xuplast_avx_80()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -941,7 +941,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xloop_avx()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -965,7 +965,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xtail_avx()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: Index: crypto/asn1/charmap.pl
michael@428: --- crypto/asn1/charmap.pl.orig	2000-07-28 03:58:11.000000000 +0200
michael@428: +++ crypto/asn1/charmap.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -1,7 +1,5 @@
michael@428:  #!/usr/local/bin/perl -w
michael@428:  
michael@428: -use strict;
michael@428: -
michael@428:  my ($i, @arr);
michael@428:  
michael@428:  # Set up an array with the type of ASCII characters
michael@428: Index: crypto/bn/asm/modexp512-x86_64.pl
michael@428: --- crypto/bn/asm/modexp512-x86_64.pl.orig	2011-12-12 16:12:09.000000000 +0100
michael@428: +++ crypto/bn/asm/modexp512-x86_64.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -70,7 +70,6 @@
michael@428:  
michael@428:  open STDOUT,"| $^X $xlate $flavour $output";
michael@428:  
michael@428: -use strict;
michael@428:  my $code=".text\n\n";
michael@428:  my $m=0;
michael@428:  
michael@428: Index: crypto/md5/asm/md5-x86_64.pl
michael@428: --- crypto/md5/asm/md5-x86_64.pl.orig	2008-12-19 12:17:27.000000000 +0100
michael@428: +++ crypto/md5/asm/md5-x86_64.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -7,8 +7,6 @@
michael@428:  # in the public domain.
michael@428:  #
michael@428:  
michael@428: -use strict;
michael@428: -
michael@428:  my $code;
michael@428:  
michael@428:  # round1_step() does:
michael@13: Index: crypto/objects/obj_dat.pl
michael@428: --- crypto/objects/obj_dat.pl.orig	2007-09-18 23:05:21.000000000 +0200
michael@428: +++ crypto/objects/obj_dat.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -2,7 +2,6 @@
michael@428:  
michael@428:  # fixes bug in floating point emulation on sparc64 when
michael@428:  # this script produces off-by-one output on sparc64
michael@428: -use integer;
michael@428:  
michael@428:  sub obj_cmp
michael@428:  	{
michael@428: Index: crypto/objects/objxref.pl
michael@428: --- crypto/objects/objxref.pl.orig	2009-04-06 18:16:23.000000000 +0200
michael@428: +++ crypto/objects/objxref.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -1,7 +1,5 @@
michael@13:  #!/usr/local/bin/perl
michael@13:  
michael@428: -use strict;
michael@13: -
michael@428:  my %xref_tbl;
michael@428:  my %oid_tbl;
michael@428:  
michael@428: Index: crypto/perlasm/x86_64-xlate.pl
michael@428: --- crypto/perlasm/x86_64-xlate.pl.orig	2012-03-13 20:19:31.000000000 +0100
michael@428: +++ crypto/perlasm/x86_64-xlate.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -248,7 +248,6 @@
michael@428:  
michael@428:  	# Solaris /usr/ccs/bin/as can't handle multiplications
michael@428:  	# in $self->{label}, new gas requires sign extension...
michael@428: -	use integer;
michael@428:  	$self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
michael@428:  	$self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
michael@428:  	$self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
michael@428: Index: crypto/sha/asm/sha1-586.pl
michael@428: --- crypto/sha/asm/sha1-586.pl.orig	2011-06-28 15:53:49.000000000 +0200
michael@428: +++ crypto/sha/asm/sha1-586.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -523,7 +523,7 @@
michael@428:  # round]...
michael@428:  #
michael@428:  sub Xupdate_ssse3_16_31()		# recall that $Xi starts wtih 4
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 40 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -607,7 +607,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xupdate_ssse3_32_79()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 to 48 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -675,7 +675,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xuplast_ssse3_80()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -710,7 +710,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xloop_ssse3()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -735,7 +735,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xtail_ssse3()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -945,7 +945,7 @@
michael@428:  	&jmp	(&label("loop"));
michael@428:  
michael@428:  sub Xupdate_avx_16_31()		# recall that $Xi starts wtih 4
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 40 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -1023,7 +1023,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xupdate_avx_32_79()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 to 48 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -1088,7 +1088,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xuplast_avx_80()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -1123,7 +1123,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xloop_avx()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -1147,7 +1147,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xtail_avx()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: Index: crypto/sha/asm/sha1-x86_64.pl
michael@428: --- crypto/sha/asm/sha1-x86_64.pl.orig	2011-07-04 15:01:42.000000000 +0200
michael@428: +++ crypto/sha/asm/sha1-x86_64.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -367,7 +367,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xupdate_ssse3_16_31()		# recall that $Xi starts wtih 4
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 40 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -448,7 +448,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xupdate_ssse3_32_79()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 to 48 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -515,7 +515,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xuplast_ssse3_80()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -549,7 +549,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xloop_ssse3()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -574,7 +574,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xtail_ssse3()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -778,7 +778,7 @@
michael@428:  ___
michael@428:  
michael@428:  sub Xupdate_avx_16_31()		# recall that $Xi starts wtih 4
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 40 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -854,7 +854,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xupdate_avx_32_79()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 to 48 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -919,7 +919,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xuplast_avx_80()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -953,7 +953,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xloop_avx()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: @@ -977,7 +977,7 @@
michael@428:  }
michael@428:  
michael@428:  sub Xtail_avx()
michael@428: -{ use integer;
michael@428: +{ 
michael@428:    my $body = shift;
michael@428:    my @insns = (&$body,&$body,&$body,&$body);	# 32 instructions
michael@428:    my ($a,$b,$c,$d,$e);
michael@428: Index: util/clean-depend.pl
michael@428: --- util/clean-depend.pl.orig	2007-09-19 16:53:18.000000000 +0200
michael@428: +++ util/clean-depend.pl	2012-06-27 10:10:05.000000000 +0200
michael@428: @@ -2,8 +2,6 @@
michael@428:  # Clean the dependency list in a makefile of standard includes...
michael@428:  # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
michael@428:  
michael@428: -use strict;
michael@428: -
michael@428:  while(<STDIN>) {
michael@428:      print;
michael@428:      last if /^# DO NOT DELETE THIS LINE/;
michael@13: Index: util/mklink.pl
michael@428: --- util/mklink.pl.orig	2008-12-19 14:35:09.000000000 +0100
michael@428: +++ util/mklink.pl	2012-06-27 10:10:05.000000000 +0200
michael@13: @@ -15,13 +15,12 @@
michael@13:  # Apart from this, this script should be able to handle even the most
michael@13:  # pathological cases.
michael@13:  
michael@13: -use Cwd;
michael@13: -
michael@13:  my $from = shift;
michael@13:  my @files = @ARGV;
michael@13:  
michael@13:  my @from_path = split(/[\\\/]/, $from);
michael@13: -my $pwd = getcwd();
michael@13: +my $pwd = `pwd`;
michael@428: +$pwd =~ s/\r?\n$//s;
michael@13:  chomp($pwd);
michael@13:  my @pwd_path = split(/[\\\/]/, $pwd);
michael@13: