OpenPKG Specs / file comparison

comparison: openpkg/openssl.patch

openpkg/openssl.patch

changeset 428
f880f219c566
parent 13
cb59d6afeb61
child 432
aa0488214e35
equal deleted inserted replaced
0:f28754fc20ec 1:3c446c02311c
1 Index: Configure 1 Index: Configure
2 --- Configure.orig 2007-09-16 14:24:17 +0200 2 --- Configure.orig 2012-03-14 23:20:40.000000000 +0100
3 +++ Configure 2007-10-17 12:14:14 +0200 3 +++ Configure 2012-06-27 10:10:05.000000000 +0200
4 @@ -6,7 +6,6 @@ 4 @@ -6,7 +6,6 @@
5 ## 5 ##
6 6
7 require 5.000; 7 require 5.000;
8 -use strict; 8 -use strict;
15 # supported values are "MIT" and "Heimdal". A value is required. 15 # supported values are "MIT" and "Heimdal". A value is required.
16 +# --with-cc compiler to use for $CC (useful if cc is a disguised gcc) 16 +# --with-cc compiler to use for $CC (useful if cc is a disguised gcc)
17 # 17 #
18 # --test-sanity Make a number of sanity checks on the data in this file. 18 # --test-sanity Make a number of sanity checks on the data in this file.
19 # This is a debugging tool for OpenSSL developers. 19 # This is a debugging tool for OpenSSL developers.
20 @@ -113,6 +113,7 @@ 20 @@ -123,6 +123,7 @@
21 #$bits2="THIRTY_TWO_BIT "; 21 #$bits2="THIRTY_TWO_BIT ";
22 my $bits1="THIRTY_TWO_BIT "; 22 my $bits1="THIRTY_TWO_BIT ";
23 my $bits2="SIXTY_FOUR_BIT "; 23 my $bits2="SIXTY_FOUR_BIT ";
24 +my $ccarg; 24 +my $ccarg;
25 25
26 my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o"; 26 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:";
27 my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o"; 27
28 @@ -402,8 +403,8 @@ 28 @@ -460,12 +461,12 @@
29 29
30 #### IBM's AIX. 30 #### IBM's AIX.
31 "aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::", 31 "aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
32 -"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", 32 -"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",
33 -"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64", 33 -"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",
34 +"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::", 34 +"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)::",
35 +"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::", 35 +"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)::",
36 # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE 36 # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
37 # at build time. $OBJECT_MODE is respected at ./config stage! 37 # at build time. $OBJECT_MODE is respected at ./config stage!
38 "aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", 38 -"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",
39 @@ -697,6 +698,10 @@ 39 -"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",
40 +"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)::",
41 +"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)::",
42
43 #
44 # Cray T90 and similar (SDSC)
45 @@ -828,6 +829,10 @@
40 { 46 {
41 exit(&test_sanity()); 47 $strict_warnings = 1;
42 } 48 }
43 + elsif (/^--with-cc=(.*)$/) 49 + elsif (/^--with-cc=(.*)$/)
44 + { 50 + {
45 + $ccarg=$1 51 + $ccarg=$1
46 + } 52 + }
47 elsif (/^reconfigure/ || /^reconf/) 53 elsif (/^reconfigure/ || /^reconf/)
48 { 54 {
49 if (open(IN,"<$Makefile")) 55 if (open(IN,"<$Makefile"))
50 @@ -949,7 +954,7 @@ 56 @@ -1143,7 +1148,7 @@
51 print "IsMK1MF=$IsMK1MF\n"; 57 print "IsMK1MF=$IsMK1MF\n";
52 58
53 my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); 59 my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
54 -my $cc = $fields[$idx_cc]; 60 -my $cc = $fields[$idx_cc];
55 +my $cc = $ccarg ? $ccarg : $fields[$idx_cc]; 61 +my $cc = $ccarg ? $ccarg : $fields[$idx_cc];
56 my $cflags = $fields[$idx_cflags]; 62 # Allow environment CC to override compiler...
57 my $unistd = $fields[$idx_unistd]; 63 if($ENV{CC}) {
58 my $thread_cflag = $fields[$idx_thread_cflag]; 64 $cc = $ENV{CC};
59 Index: config 65 Index: config
60 --- config.orig 2007-08-01 13:21:35 +0200 66 --- config.orig 2011-11-14 22:12:53.000000000 +0100
61 +++ config 2007-10-17 12:13:48 +0200 67 +++ config 2012-06-27 10:10:05.000000000 +0200
62 @@ -401,9 +401,9 @@ 68 @@ -277,6 +277,9 @@
63 69 Power*)
64 # figure out if gcc is available and if so we use it otherwise 70 echo "ppc-apple-darwin${VERSION}"
65 # we fallback to whatever cc does on the system 71 ;;
66 -GCCVER=`(gcc -dumpversion) 2>/dev/null` 72 + x86_64 )
67 +GCCVER=`(gcc -dumpversion 2>/dev/null && exit; cc --version 2>/dev/null | grep GCC >/dev/null && cc -dumpversion )` 73 + echo "x86_64-apple-darwin${VERSION}"
68 if [ "$GCCVER" != "" ]; then 74 + ;;
69 - CC=gcc 75 *)
70 + CC=cc; gcc -dumpversion >/dev/null 2>&1 && CC=gcc 76 echo "i686-apple-darwin${VERSION}"
71 # then strip off whatever prefix egcs prepends the number with... 77 ;;
72 # Hopefully, this will work for any future prefixes as well. 78 @@ -413,7 +416,7 @@
73 GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'` 79
74 @@ -412,8 +412,10 @@ 80 # Only set CC if not supplied already
75 # major and minor version numbers. 81 if [ -z "$CROSS_COMPILE$CC" ]; then
76 # peak single digit before and after first dot, e.g. 2.95.1 gives 29 82 - GCCVER=`sh -c "gcc -dumpversion" 2>/dev/null`
77 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` 83 + GCCVER=`sh -c "${CC-gcc} -dumpversion" 2>/dev/null`
78 + SUFFIX=gcc 84 if [ "$GCCVER" != "" ]; then
79 else 85 # then strip off whatever prefix egcs prepends the number with...
80 CC=cc 86 # Hopefully, this will work for any future prefixes as well.
81 + SUFFIX=cc 87 @@ -424,8 +427,14 @@
88 # peak single digit before and after first dot, e.g. 2.95.1 gives 29
89 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
90 CC=gcc
91 + SUFFIX=gcc
92 else
93 CC=cc
94 + SUFFIX=cc
95 + fi
96 +else
97 + if [ "$GCCVER" != "" ]; then
98 + SUFFIX=gcc
99 fi
82 fi 100 fi
83 GCCVER=${GCCVER:-0} 101 GCCVER=${GCCVER:-0}
84 if [ "$SYSTEM" = "HP-UX" ];then 102 @@ -435,7 +444,7 @@
85 @@ -422,7 +424,7 @@
86 if [ $GCCVER -ge 30 ]; then 103 if [ $GCCVER -ge 30 ]; then
87 # PA64 support only came in with gcc 3.0.x. 104 # PA64 support only came in with gcc 3.0.x.
88 # We check if the preprocessor symbol __LP64__ is defined... 105 # We check if the preprocessor symbol __LP64__ is defined...
89 - if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then 106 - if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
90 + if echo "__LP64__" | $CC -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then 107 + if echo "__LP64__" | $CC -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
91 : # __LP64__ has slipped through, it therefore is not defined 108 : # __LP64__ has slipped through, it therefore is not defined
92 else 109 else
93 GCC_BITS="64" 110 GCC_BITS="64"
94 @@ -433,13 +435,14 @@ 111 @@ -446,13 +455,14 @@
95 if [ $GCCVER -ge 30 ]; then 112 if [ $GCCVER -ge 30 ]; then
96 # 64-bit ABI isn't officially supported in gcc 3.0, but it appears 113 # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
97 # to be working, at the very least 'make test' passes... 114 # to be working, at the very least 'make test' passes...
98 - if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then 115 - if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
99 + if $CC -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then 116 + if $CC -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
105 # check for WorkShop C, expected output is "cc: blah-blah C x.x" 122 # check for WorkShop C, expected output is "cc: blah-blah C x.x"
106 + if [ $GCCVER -eq 0 ]; then 123 + if [ $GCCVER -eq 0 ]; then
107 CCVER=`(cc -V 2>&1) 2>/dev/null | \ 124 CCVER=`(cc -V 2>&1) 2>/dev/null | \
108 egrep -e '^cc: .* C [0-9]\.[0-9]' | \ 125 egrep -e '^cc: .* C [0-9]\.[0-9]' | \
109 sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'` 126 sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
110 @@ -452,6 +455,7 @@ 127 @@ -465,6 +475,7 @@
111 sleep 5 128 sleep 5
112 fi 129 fi
113 fi 130 fi
114 + fi 131 + fi
115 fi 132 fi
116 133
117 if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then 134 if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
118 @@ -469,6 +473,7 @@ 135 @@ -482,6 +493,7 @@
119 136
120 if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc 137 if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc
121 (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc 138 (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
122 + (gcc) 2>&1 | grep -iv "not found" > /dev/null && CC=gcc 139 + (gcc) 2>&1 | grep -iv "not found" > /dev/null && CC=gcc
123 fi 140 fi
124 141
125 CCVER=${CCVER:-0} 142 CCVER=${CCVER:-0}
126 @@ -488,7 +493,7 @@ 143 @@ -507,7 +519,7 @@
127 if [ $CPU -ge 4000 ]; then 144 if [ $CPU -ge 4000 ]; then
128 options="$options -mips2" 145 options="$options -mips2"
129 fi 146 fi
130 - OUT="irix-$CC" 147 - OUT="irix-$CC"
131 + OUT="irix-$SUFFIX" 148 + OUT="irix-$SUFFIX"
132 ;; 149 ;;
133 mips3-sgi-irix) 150 mips3-sgi-irix)
134 #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` 151 #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
135 @@ -498,11 +503,11 @@ 152 @@ -517,11 +529,11 @@
136 #else 153 #else
137 # options="$options -mips3" 154 # options="$options -mips3"
138 #fi 155 #fi
139 - OUT="irix-mips3-$CC" 156 - OUT="irix-mips3-$CC"
140 + OUT="irix-mips3-$SUFFIX" 157 + OUT="irix-mips3-$SUFFIX"
144 - echo " invoke './Configure irix64-mips4-$CC' *manually*." 161 - echo " invoke './Configure irix64-mips4-$CC' *manually*."
145 + echo " invoke './Configure irix64-mips4-$SUFFIX' *manually*." 162 + echo " invoke './Configure irix64-mips4-$SUFFIX' *manually*."
146 if [ "$TEST" = "false" -a -t 1 ]; then 163 if [ "$TEST" = "false" -a -t 1 ]; then
147 echo " You have about 5 seconds to press Ctrl-C to abort." 164 echo " You have about 5 seconds to press Ctrl-C to abort."
148 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1 165 (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
149 @@ -514,7 +519,7 @@ 166 @@ -533,7 +545,7 @@
150 #else 167 #else
151 # options="$options -mips3" 168 # options="$options -mips3"
152 #fi 169 #fi
153 - OUT="irix-mips3-$CC" 170 - OUT="irix-mips3-$CC"
154 + OUT="irix-mips3-$SUFFIX" 171 + OUT="irix-mips3-$SUFFIX"
155 ;; 172 ;;
156 ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;; 173 ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
157 ppc-apple-darwin*) OUT="darwin-ppc-cc" ;; 174 ppc-apple-darwin*)
158 @@ -522,10 +527,10 @@ 175 @@ -566,6 +578,9 @@
176 else
177 OUT="darwin-i386-cc"
178 fi ;;
179 + x86_64-apple-darwin*)
180 + OUT="darwin64-x86_64-cc"
181 + ;;
182 armv6+7-*-iphoneos)
183 options="$options -arch%20armv6 -arch%20armv7"
184 OUT="iphoneos-cross" ;;
185 @@ -575,10 +590,10 @@
159 alpha-*-linux2) 186 alpha-*-linux2)
160 ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` 187 ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
161 case ${ISA:-generic} in 188 case ${ISA:-generic} in
162 - *[678]) OUT="linux-alpha+bwx-$CC" ;; 189 - *[678]) OUT="linux-alpha+bwx-$CC" ;;
163 - *) OUT="linux-alpha-$CC" ;; 190 - *) OUT="linux-alpha-$CC" ;;
167 - if [ "$CC" = "gcc" ]; then 194 - if [ "$CC" = "gcc" ]; then
168 + if [ $GCCVER -gt 0 ]; then 195 + if [ $GCCVER -gt 0 ]; then
169 case ${ISA:-generic} in 196 case ${ISA:-generic} in
170 EV5|EV45) options="$options -mcpu=ev5";; 197 EV5|EV45) options="$options -mcpu=ev5";;
171 EV56|PCA56) options="$options -mcpu=ev56";; 198 EV56|PCA56) options="$options -mcpu=ev56";;
172 @@ -592,7 +597,7 @@ 199 @@ -662,7 +677,7 @@
173 s390x-*-linux2) OUT="linux-generic64"; options="$options -DB_ENDIAN" ;; 200 ;;
174 x86_64-*-linux?) OUT="linux-x86_64" ;; 201 x86_64-*-linux?) OUT="linux-x86_64" ;;
175 *86-*-linux2) OUT="linux-elf" 202 *86-*-linux2) OUT="linux-elf"
176 - if [ "$GCCVER" -gt 28 ]; then 203 - if [ "$GCCVER" -gt 28 ]; then
177 + if [ $GCCVER -gt 28 ]; then 204 + if [ $GCCVER -gt 28 ]; then
178 if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then 205 if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
179 options="$options -march=pentium" 206 options="$options -march=pentium"
180 fi 207 fi
181 @@ -606,17 +611,17 @@ 208 @@ -676,17 +691,17 @@
182 *-*-linux1) OUT="linux-aout" ;; 209 *-*-linux1) OUT="linux-aout" ;;
183 *-*-linux2) OUT="linux-generic32" ;; 210 *-*-linux2) OUT="linux-generic32" ;;
184 sun4[uv]*-*-solaris2) 211 sun4[uv]*-*-solaris2)
185 - OUT="solaris-sparcv9-$CC" 212 - OUT="solaris-sparcv9-$CC"
186 + OUT="solaris-sparcv9-$SUFFIX" 213 + OUT="solaris-sparcv9-$SUFFIX"
187 ISA64=`(isalist) 2>/dev/null | grep sparcv9` 214 ISA64=`(isalist) 2>/dev/null | grep sparcv9`
188 if [ "$ISA64" != "" ]; then 215 if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then
189 - if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then 216 - if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
190 + if [ $GCCVER -eq 0 -a $CCVER -ge 50 ]; then 217 + if [ $GCCVER -eq 0 -a $CCVER -ge 50 ]; then
191 echo "WARNING! If you wish to build 64-bit library, then you have to" 218 echo "WARNING! If you wish to build 64-bit library, then you have to"
192 echo " invoke './Configure solaris64-sparcv9-cc' *manually*." 219 echo " invoke './Configure solaris64-sparcv9-cc' *manually*."
193 if [ "$TEST" = "false" -a -t 1 ]; then 220 if [ "$TEST" = "false" -a -t 1 ]; then
197 - elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then 224 - elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
198 + elif [ $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then 225 + elif [ $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
199 # $GCC_ARCH denotes default ABI chosen by compiler driver 226 # $GCC_ARCH denotes default ABI chosen by compiler driver
200 # (first one found on the $PATH). I assume that user 227 # (first one found on the $PATH). I assume that user
201 # expects certain consistency with the rest of his builds 228 # expects certain consistency with the rest of his builds
202 @@ -639,21 +644,21 @@ 229 @@ -712,21 +727,21 @@
203 fi 230 OUT="solaris64-sparcv9-$CC"
204 fi 231 fi
205 ;; 232 ;;
206 - sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;; 233 - sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
207 - sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;; 234 - sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
208 - sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;; 235 - sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;;
209 + sun4m-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;; 236 + sun4m-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;;
210 + sun4d-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;; 237 + sun4d-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;;
211 + sun4*-*-solaris2) OUT="solaris-sparcv7-$SUFFIX" ;; 238 + sun4*-*-solaris2) OUT="solaris-sparcv7-$SUFFIX" ;;
212 *86*-*-solaris2) 239 *86*-*-solaris2)
213 ISA64=`(isalist) 2>/dev/null | grep amd64` 240 ISA64=`(isalist) 2>/dev/null | grep amd64`
214 - if [ "$ISA64" != "" ]; then 241 - if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
215 - OUT="solaris64-x86_64-$CC" 242 - OUT="solaris64-x86_64-$CC"
216 + if [ "$ISA64" != "" -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then 243 + if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
217 + OUT="solaris64-x86_64-$SUFFIX" 244 + OUT="solaris64-x86_64-$SUFFIX"
218 else 245 else
219 - OUT="solaris-x86-$CC" 246 - OUT="solaris-x86-$CC"
220 + OUT="solaris-x86-$SUFFIX" 247 + OUT="solaris-x86-$SUFFIX"
221 if [ `uname -r | sed -e 's/5\.//'` -lt 10 ]; then 248 if [ `uname -r | sed -e 's/5\.//'` -lt 10 ]; then
226 - *-*-sunos4) OUT="sunos-$CC" ;; 253 - *-*-sunos4) OUT="sunos-$CC" ;;
227 + *-*-sunos4) OUT="sunos-$SUFFIX" ;; 254 + *-*-sunos4) OUT="sunos-$SUFFIX" ;;
228 255
229 *86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;; 256 *86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
230 alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;; 257 alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
231 @@ -677,7 +682,7 @@ 258 @@ -750,7 +765,7 @@
232 *-*-osf) OUT="osf1-alpha-cc" ;; 259 *-*-osf) OUT="osf1-alpha-cc" ;;
233 *-*-tru64) OUT="tru64-alpha-cc" ;; 260 *-*-tru64) OUT="tru64-alpha-cc" ;;
234 *-*-[Uu]nix[Ww]are7) 261 *-*-[Uu]nix[Ww]are7)
235 - if [ "$CC" = "gcc" ]; then 262 - if [ "$CC" = "gcc" ]; then
236 + if [ $GCCVER -gt 0 ]; then 263 + if [ $GCCVER -gt 0 ]; then
237 OUT="unixware-7-gcc" ; options="$options no-sse2" 264 OUT="unixware-7-gcc" ; options="$options no-sse2"
238 else 265 else
239 OUT="unixware-7" ; options="$options no-sse2 -D__i386__" 266 OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
240 @@ -688,12 +693,12 @@ 267 @@ -761,12 +776,12 @@
241 *-*-vos) 268 *-*-vos)
242 options="$options no-threads no-shared no-asm no-dso" 269 options="$options no-threads no-shared no-asm no-dso"
243 EXE=".pm" 270 EXE=".pm"
244 - OUT="vos-$CC" ;; 271 - OUT="vos-$CC" ;;
245 + OUT="vos-$SUFFIX" ;; 272 + OUT="vos-$SUFFIX" ;;
249 *-hpux1*) 276 *-hpux1*)
250 - if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then 277 - if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
251 + if [ $GCCVER -gt 0 -a $GCC_BITS = "64" ]; then 278 + if [ $GCCVER -gt 0 -a $GCC_BITS = "64" ]; then
252 OUT="hpux64-parisc2-gcc" 279 OUT="hpux64-parisc2-gcc"
253 fi 280 fi
254 KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null` 281 [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
255 @@ -711,8 +716,8 @@ 282 @@ -781,8 +796,8 @@
256 fi 283 OUT="hpux-ia64-cc"
257 OUT="hpux64-ia64-cc" 284 fi
258 elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU 285 elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU
259 - OUT=${OUT:-"hpux-parisc2-${CC}"} 286 - OUT=${OUT:-"hpux-parisc2-${CC}"}
260 - if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then 287 - if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
261 + OUT=${OUT:-"hpux-parisc2-${SUFFIX}"} 288 + OUT=${OUT:-"hpux-parisc2-${SUFFIX}"}
262 + if [ $KERNEL_BITS -eq 64 -a $GCCVER -eq 0 ]; then 289 + if [ $KERNEL_BITS -eq 64 -a $GCCVER -eq 0 ]; then
263 echo "WARNING! If you wish to build 64-bit library then you have to" 290 echo "WARNING! If you wish to build 64-bit library then you have to"
264 echo " invoke './Configure hpux64-parisc2-cc' *manually*." 291 echo " invoke './Configure hpux64-parisc2-cc' *manually*."
265 if [ "$TEST" = "false" -a -t 1 ]; then 292 if [ "$TEST" = "false" -a -t 1 ]; then
266 @@ -721,19 +726,19 @@ 293 @@ -791,9 +806,9 @@
267 fi 294 fi
268 fi 295 fi
269 elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU 296 elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
270 - OUT="hpux-parisc-${CC}" 297 - OUT="hpux-parisc-${CC}"
271 + OUT="hpux-parisc-${SUFFIX}" 298 + OUT="hpux-parisc-${SUFFIX}"
272 elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU 299 elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU
273 - OUT="hpux-parisc-${CC}" 300 - OUT="hpux-parisc-${CC}"
274 + OUT="hpux-parisc-${SUFFIX}" 301 + OUT="hpux-parisc-${SUFFIX}"
275 else # Motorola(?) CPU 302 else # Motorola(?) CPU
276 - OUT="hpux-$CC" 303 OUT="hpux-$CC"
277 + OUT="hpux-$SUFFIX"
278 fi 304 fi
279 options="$options -D_REENTRANT" ;; 305 @@ -803,7 +818,7 @@
280 - *-hpux) OUT="hpux-parisc-$CC" ;; 306 [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
281 + *-hpux) OUT="hpux-parisc-$SUFFIX" ;;
282 *-aix)
283 KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
284 KERNEL_BITS=${KERNEL_BITS:-32} 307 KERNEL_BITS=${KERNEL_BITS:-32}
285 OBJECT_MODE=${OBJECT_MODE:-32} 308 OBJECT_MODE=${OBJECT_MODE:-32}
286 - if [ "$CC" = "gcc" ]; then 309 - if [ "$CC" = "gcc" ]; then
287 + if [ $GCCVER -gt 0 ]; then 310 + if [ $GCCVER -gt 0 ]; then
288 OUT="aix-gcc" 311 OUT="aix-gcc"
289 elif [ $OBJECT_MODE -eq 64 ]; then 312 if [ $OBJECT_MODE -eq 64 ]; then
290 echo 'Your $OBJECT_MODE was found to be set to 64' 313 echo 'Your $OBJECT_MODE was found to be set to 64'
291 @@ -828,7 +833,7 @@ 314 @@ -913,7 +928,7 @@
292 #fi 315 #fi
293 316
294 if [ -z "$OUT" ]; then 317 if [ -z "$OUT" ]; then
295 - OUT="$CC" 318 - OUT="$CC"
296 + OUT="$SUFFIX" 319 + OUT="$SUFFIX"
297 fi 320 fi
298 321
299 if [ ".$PERL" = . ] ; then 322 if [ ".$PERL" = . ] ; then
300 @@ -860,9 +865,9 @@ 323 @@ -945,9 +960,9 @@
301 # compiler for the platform ... in which case we add it on 324 # compiler for the platform ... in which case we add it on
302 # the end ... otherwise we leave it off 325 # the end ... otherwise we leave it off
303 326
304 -$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null 327 -$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null
305 +$PERL ./Configure LIST | grep "$OUT-$SUFFIX" > /dev/null 328 +$PERL ./Configure LIST | grep "$OUT-$SUFFIX" > /dev/null
307 - OUT="$OUT-$CC" 330 - OUT="$OUT-$CC"
308 + OUT="$OUT-$SUFFIX" 331 + OUT="$OUT-$SUFFIX"
309 fi 332 fi
310 333
311 OUT="$PREFIX$OUT" 334 OUT="$PREFIX$OUT"
312 @@ -872,9 +877,9 @@ 335 @@ -957,9 +972,9 @@
313 echo Configuring for $OUT 336 echo Configuring for $OUT
314 337
315 if [ "$TEST" = "true" ]; then 338 if [ "$TEST" = "true" ]; then
316 - echo $PERL ./Configure $OUT $options 339 - echo $PERL ./Configure $OUT $options
317 + echo $PERL ./Configure $OUT --with-cc=$CC $options 340 + echo $PERL ./Configure $OUT --with-cc=$CC $options
319 - $PERL ./Configure $OUT $options 342 - $PERL ./Configure $OUT $options
320 + $PERL ./Configure $OUT --with-cc=$CC $options 343 + $PERL ./Configure $OUT --with-cc=$CC $options
321 fi 344 fi
322 else 345 else
323 echo "This system ($OUT) is not supported. See file INSTALL for details." 346 echo "This system ($OUT) is not supported. See file INSTALL for details."
347 Index: crypto/aes/asm/aesni-sha1-x86_64.pl
348 --- crypto/aes/asm/aesni-sha1-x86_64.pl.orig 2011-08-23 22:53:31.000000000 +0200
349 +++ crypto/aes/asm/aesni-sha1-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
350 @@ -206,7 +206,7 @@
351 ___
352
353 my $aesenc=sub {
354 - use integer;
355 +
356 my ($n,$k)=($r/10,$r%10);
357 if ($k==0) {
358 $code.=<<___;
359 @@ -249,7 +249,7 @@
360 };
361
362 sub Xupdate_ssse3_16_31() # recall that $Xi starts wtih 4
363 -{ use integer;
364 +{
365 my $body = shift;
366 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
367 my ($a,$b,$c,$d,$e);
368 @@ -330,7 +330,7 @@
369 }
370
371 sub Xupdate_ssse3_32_79()
372 -{ use integer;
373 +{
374 my $body = shift;
375 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
376 my ($a,$b,$c,$d,$e);
377 @@ -397,7 +397,7 @@
378 }
379
380 sub Xuplast_ssse3_80()
381 -{ use integer;
382 +{
383 my $body = shift;
384 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
385 my ($a,$b,$c,$d,$e);
386 @@ -431,7 +431,7 @@
387 }
388
389 sub Xloop_ssse3()
390 -{ use integer;
391 +{
392 my $body = shift;
393 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
394 my ($a,$b,$c,$d,$e);
395 @@ -456,7 +456,7 @@
396 }
397
398 sub Xtail_ssse3()
399 -{ use integer;
400 +{
401 my $body = shift;
402 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
403 my ($a,$b,$c,$d,$e);
404 @@ -465,7 +465,7 @@
405 }
406
407 sub body_00_19 () {
408 - use integer;
409 +
410 my ($k,$n);
411 my @r=(
412 '($a,$b,$c,$d,$e)=@V;'.
413 @@ -488,7 +488,7 @@
414 }
415
416 sub body_20_39 () {
417 - use integer;
418 +
419 my ($k,$n);
420 my @r=(
421 '($a,$b,$c,$d,$e)=@V;'.
422 @@ -509,7 +509,7 @@
423 }
424
425 sub body_40_59 () {
426 - use integer;
427 +
428 my ($k,$n);
429 my @r=(
430 '($a,$b,$c,$d,$e)=@V;'.
431 @@ -723,7 +723,7 @@
432 ___
433
434 my $aesenc=sub {
435 - use integer;
436 +
437 my ($n,$k)=($r/10,$r%10);
438 if ($k==0) {
439 $code.=<<___;
440 @@ -766,7 +766,7 @@
441 };
442
443 sub Xupdate_avx_16_31() # recall that $Xi starts wtih 4
444 -{ use integer;
445 +{
446 my $body = shift;
447 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
448 my ($a,$b,$c,$d,$e);
449 @@ -842,7 +842,7 @@
450 }
451
452 sub Xupdate_avx_32_79()
453 -{ use integer;
454 +{
455 my $body = shift;
456 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
457 my ($a,$b,$c,$d,$e);
458 @@ -907,7 +907,7 @@
459 }
460
461 sub Xuplast_avx_80()
462 -{ use integer;
463 +{
464 my $body = shift;
465 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
466 my ($a,$b,$c,$d,$e);
467 @@ -941,7 +941,7 @@
468 }
469
470 sub Xloop_avx()
471 -{ use integer;
472 +{
473 my $body = shift;
474 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
475 my ($a,$b,$c,$d,$e);
476 @@ -965,7 +965,7 @@
477 }
478
479 sub Xtail_avx()
480 -{ use integer;
481 +{
482 my $body = shift;
483 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
484 my ($a,$b,$c,$d,$e);
485 Index: crypto/asn1/charmap.pl
486 --- crypto/asn1/charmap.pl.orig 2000-07-28 03:58:11.000000000 +0200
487 +++ crypto/asn1/charmap.pl 2012-06-27 10:10:05.000000000 +0200
488 @@ -1,7 +1,5 @@
489 #!/usr/local/bin/perl -w
490
491 -use strict;
492 -
493 my ($i, @arr);
494
495 # Set up an array with the type of ASCII characters
496 Index: crypto/bn/asm/modexp512-x86_64.pl
497 --- crypto/bn/asm/modexp512-x86_64.pl.orig 2011-12-12 16:12:09.000000000 +0100
498 +++ crypto/bn/asm/modexp512-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
499 @@ -70,7 +70,6 @@
500
501 open STDOUT,"| $^X $xlate $flavour $output";
502
503 -use strict;
504 my $code=".text\n\n";
505 my $m=0;
506
507 Index: crypto/md5/asm/md5-x86_64.pl
508 --- crypto/md5/asm/md5-x86_64.pl.orig 2008-12-19 12:17:27.000000000 +0100
509 +++ crypto/md5/asm/md5-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
510 @@ -7,8 +7,6 @@
511 # in the public domain.
512 #
513
514 -use strict;
515 -
516 my $code;
517
518 # round1_step() does:
324 Index: crypto/objects/obj_dat.pl 519 Index: crypto/objects/obj_dat.pl
325 --- crypto/objects/obj_dat.pl.orig 2005-08-29 01:20:47 +0200 520 --- crypto/objects/obj_dat.pl.orig 2007-09-18 23:05:21.000000000 +0200
326 +++ crypto/objects/obj_dat.pl 2007-10-17 12:13:48 +0200 521 +++ crypto/objects/obj_dat.pl 2012-06-27 10:10:05.000000000 +0200
327 @@ -1,9 +1,5 @@ 522 @@ -2,7 +2,6 @@
328 #!/usr/local/bin/perl 523
329 524 # fixes bug in floating point emulation on sparc64 when
330 -# fixes bug in floating point emulation on sparc64 when 525 # this script produces off-by-one output on sparc64
331 -# this script produces off-by-one output on sparc64
332 -use integer; 526 -use integer;
333 - 527
334 sub obj_cmp 528 sub obj_cmp
335 { 529 {
336 local(@a,@b,$_,$r); 530 Index: crypto/objects/objxref.pl
531 --- crypto/objects/objxref.pl.orig 2009-04-06 18:16:23.000000000 +0200
532 +++ crypto/objects/objxref.pl 2012-06-27 10:10:05.000000000 +0200
533 @@ -1,7 +1,5 @@
534 #!/usr/local/bin/perl
535
536 -use strict;
537 -
538 my %xref_tbl;
539 my %oid_tbl;
540
541 Index: crypto/perlasm/x86_64-xlate.pl
542 --- crypto/perlasm/x86_64-xlate.pl.orig 2012-03-13 20:19:31.000000000 +0100
543 +++ crypto/perlasm/x86_64-xlate.pl 2012-06-27 10:10:05.000000000 +0200
544 @@ -248,7 +248,6 @@
545
546 # Solaris /usr/ccs/bin/as can't handle multiplications
547 # in $self->{label}, new gas requires sign extension...
548 - use integer;
549 $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
550 $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
551 $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
552 Index: crypto/sha/asm/sha1-586.pl
553 --- crypto/sha/asm/sha1-586.pl.orig 2011-06-28 15:53:49.000000000 +0200
554 +++ crypto/sha/asm/sha1-586.pl 2012-06-27 10:10:05.000000000 +0200
555 @@ -523,7 +523,7 @@
556 # round]...
557 #
558 sub Xupdate_ssse3_16_31() # recall that $Xi starts wtih 4
559 -{ use integer;
560 +{
561 my $body = shift;
562 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
563 my ($a,$b,$c,$d,$e);
564 @@ -607,7 +607,7 @@
565 }
566
567 sub Xupdate_ssse3_32_79()
568 -{ use integer;
569 +{
570 my $body = shift;
571 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
572 my ($a,$b,$c,$d,$e);
573 @@ -675,7 +675,7 @@
574 }
575
576 sub Xuplast_ssse3_80()
577 -{ use integer;
578 +{
579 my $body = shift;
580 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
581 my ($a,$b,$c,$d,$e);
582 @@ -710,7 +710,7 @@
583 }
584
585 sub Xloop_ssse3()
586 -{ use integer;
587 +{
588 my $body = shift;
589 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
590 my ($a,$b,$c,$d,$e);
591 @@ -735,7 +735,7 @@
592 }
593
594 sub Xtail_ssse3()
595 -{ use integer;
596 +{
597 my $body = shift;
598 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
599 my ($a,$b,$c,$d,$e);
600 @@ -945,7 +945,7 @@
601 &jmp (&label("loop"));
602
603 sub Xupdate_avx_16_31() # recall that $Xi starts wtih 4
604 -{ use integer;
605 +{
606 my $body = shift;
607 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
608 my ($a,$b,$c,$d,$e);
609 @@ -1023,7 +1023,7 @@
610 }
611
612 sub Xupdate_avx_32_79()
613 -{ use integer;
614 +{
615 my $body = shift;
616 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
617 my ($a,$b,$c,$d,$e);
618 @@ -1088,7 +1088,7 @@
619 }
620
621 sub Xuplast_avx_80()
622 -{ use integer;
623 +{
624 my $body = shift;
625 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
626 my ($a,$b,$c,$d,$e);
627 @@ -1123,7 +1123,7 @@
628 }
629
630 sub Xloop_avx()
631 -{ use integer;
632 +{
633 my $body = shift;
634 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
635 my ($a,$b,$c,$d,$e);
636 @@ -1147,7 +1147,7 @@
637 }
638
639 sub Xtail_avx()
640 -{ use integer;
641 +{
642 my $body = shift;
643 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
644 my ($a,$b,$c,$d,$e);
645 Index: crypto/sha/asm/sha1-x86_64.pl
646 --- crypto/sha/asm/sha1-x86_64.pl.orig 2011-07-04 15:01:42.000000000 +0200
647 +++ crypto/sha/asm/sha1-x86_64.pl 2012-06-27 10:10:05.000000000 +0200
648 @@ -367,7 +367,7 @@
649 }
650
651 sub Xupdate_ssse3_16_31() # recall that $Xi starts wtih 4
652 -{ use integer;
653 +{
654 my $body = shift;
655 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
656 my ($a,$b,$c,$d,$e);
657 @@ -448,7 +448,7 @@
658 }
659
660 sub Xupdate_ssse3_32_79()
661 -{ use integer;
662 +{
663 my $body = shift;
664 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
665 my ($a,$b,$c,$d,$e);
666 @@ -515,7 +515,7 @@
667 }
668
669 sub Xuplast_ssse3_80()
670 -{ use integer;
671 +{
672 my $body = shift;
673 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
674 my ($a,$b,$c,$d,$e);
675 @@ -549,7 +549,7 @@
676 }
677
678 sub Xloop_ssse3()
679 -{ use integer;
680 +{
681 my $body = shift;
682 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
683 my ($a,$b,$c,$d,$e);
684 @@ -574,7 +574,7 @@
685 }
686
687 sub Xtail_ssse3()
688 -{ use integer;
689 +{
690 my $body = shift;
691 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
692 my ($a,$b,$c,$d,$e);
693 @@ -778,7 +778,7 @@
694 ___
695
696 sub Xupdate_avx_16_31() # recall that $Xi starts wtih 4
697 -{ use integer;
698 +{
699 my $body = shift;
700 my @insns = (&$body,&$body,&$body,&$body); # 40 instructions
701 my ($a,$b,$c,$d,$e);
702 @@ -854,7 +854,7 @@
703 }
704
705 sub Xupdate_avx_32_79()
706 -{ use integer;
707 +{
708 my $body = shift;
709 my @insns = (&$body,&$body,&$body,&$body); # 32 to 48 instructions
710 my ($a,$b,$c,$d,$e);
711 @@ -919,7 +919,7 @@
712 }
713
714 sub Xuplast_avx_80()
715 -{ use integer;
716 +{
717 my $body = shift;
718 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
719 my ($a,$b,$c,$d,$e);
720 @@ -953,7 +953,7 @@
721 }
722
723 sub Xloop_avx()
724 -{ use integer;
725 +{
726 my $body = shift;
727 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
728 my ($a,$b,$c,$d,$e);
729 @@ -977,7 +977,7 @@
730 }
731
732 sub Xtail_avx()
733 -{ use integer;
734 +{
735 my $body = shift;
736 my @insns = (&$body,&$body,&$body,&$body); # 32 instructions
737 my ($a,$b,$c,$d,$e);
738 Index: util/clean-depend.pl
739 --- util/clean-depend.pl.orig 2007-09-19 16:53:18.000000000 +0200
740 +++ util/clean-depend.pl 2012-06-27 10:10:05.000000000 +0200
741 @@ -2,8 +2,6 @@
742 # Clean the dependency list in a makefile of standard includes...
743 # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
744
745 -use strict;
746 -
747 while(<STDIN>) {
748 print;
749 last if /^# DO NOT DELETE THIS LINE/;
337 Index: util/mklink.pl 750 Index: util/mklink.pl
338 --- util/mklink.pl.orig 2006-02-09 13:28:30 +0100 751 --- util/mklink.pl.orig 2008-12-19 14:35:09.000000000 +0100
339 +++ util/mklink.pl 2007-10-17 12:13:48 +0200 752 +++ util/mklink.pl 2012-06-27 10:10:05.000000000 +0200
340 @@ -15,13 +15,12 @@ 753 @@ -15,13 +15,12 @@
341 # Apart from this, this script should be able to handle even the most 754 # Apart from this, this script should be able to handle even the most
342 # pathological cases. 755 # pathological cases.
343 756
344 -use Cwd; 757 -use Cwd;
347 my @files = @ARGV; 760 my @files = @ARGV;
348 761
349 my @from_path = split(/[\\\/]/, $from); 762 my @from_path = split(/[\\\/]/, $from);
350 -my $pwd = getcwd(); 763 -my $pwd = getcwd();
351 +my $pwd = `pwd`; 764 +my $pwd = `pwd`;
352 +$pwd =~ s/\n$//s; 765 +$pwd =~ s/\r?\n$//s;
353 chomp($pwd); 766 chomp($pwd);
354 my @pwd_path = split(/[\\\/]/, $pwd); 767 my @pwd_path = split(/[\\\/]/, $pwd);
355 768

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial