diff options
Diffstat (limited to 'update.sh')
-rwxr-xr-x | update.sh | 27 |
1 files changed, 8 insertions, 19 deletions
@@ -197,18 +197,6 @@ fixup_masm() { | |||
197 | # generate assembly crypto algorithms | 197 | # generate assembly crypto algorithms |
198 | asm_src=$CWD/asm | 198 | asm_src=$CWD/asm |
199 | 199 | ||
200 | setup_asm_generator() { | ||
201 | rm -fr $asm_src | ||
202 | cp -a $libcrypto_src $asm_src | ||
203 | } | ||
204 | |||
205 | setup_asm_generator_patched() { | ||
206 | setup_asm_generator | ||
207 | for i in `ls -1 patches/asm/*.patch | sort -n`; do | ||
208 | patch -d $asm_src -p 4 < $i 1> /dev/null 2>/dev/null ; | ||
209 | done | ||
210 | } | ||
211 | |||
212 | gen_asm_stdout() { | 200 | gen_asm_stdout() { |
213 | CC=true perl $asm_src/$2 $1 > crypto/$3.tmp | 201 | CC=true perl $asm_src/$2 $1 > crypto/$3.tmp |
214 | [ $1 = "elf" ] && cat <<-EOF >> crypto/$3.tmp | 202 | [ $1 = "elf" ] && cat <<-EOF >> crypto/$3.tmp |
@@ -249,6 +237,14 @@ gen_asm() { | |||
249 | fi | 237 | fi |
250 | } | 238 | } |
251 | 239 | ||
240 | setup_asm_generator() { | ||
241 | rm -fr $asm_src | ||
242 | cp -a $libcrypto_src $asm_src | ||
243 | for i in `ls -1 patches/asm/*.patch | sort -n`; do | ||
244 | patch -d $asm_src -p0 < $i 1> /dev/null 2>/dev/null ; | ||
245 | done | ||
246 | } | ||
247 | |||
252 | setup_asm_generator | 248 | setup_asm_generator |
253 | 249 | ||
254 | echo generating mips ASM source for elf | 250 | echo generating mips ASM source for elf |
@@ -281,13 +277,6 @@ $CP $libcrypto_src/arch/arm/arm_arch.h crypto | |||
281 | for abi in elf macosx masm mingw64; do | 277 | for abi in elf macosx masm mingw64; do |
282 | echo generating x86_64 ASM source for $abi | 278 | echo generating x86_64 ASM source for $abi |
283 | 279 | ||
284 | # use patched generators for non-elf targets | ||
285 | if [ $abi = "elf" ]; then | ||
286 | setup_asm_generator | ||
287 | else | ||
288 | setup_asm_generator_patched | ||
289 | fi | ||
290 | |||
291 | gen_asm_stdout $abi aes/asm/aes-x86_64.pl aes/aes-$abi-x86_64.S | 280 | gen_asm_stdout $abi aes/asm/aes-x86_64.pl aes/aes-$abi-x86_64.S |
292 | gen_asm_stdout $abi aes/asm/vpaes-x86_64.pl aes/vpaes-$abi-x86_64.S | 281 | gen_asm_stdout $abi aes/asm/vpaes-x86_64.pl aes/vpaes-$abi-x86_64.S |
293 | gen_asm_stdout $abi aes/asm/bsaes-x86_64.pl aes/bsaes-$abi-x86_64.S | 282 | gen_asm_stdout $abi aes/asm/bsaes-x86_64.pl aes/bsaes-$abi-x86_64.S |