From 2fc264917370321c5b359c9de2fcde9ce776087e Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Thu, 22 Jan 2015 12:13:57 +0100 Subject: [PATCH] Fix macosx-ppc build (and typos in unwind info). Reviewed-by: Tim Hudson (cherry picked from commit c462a6817bb05a4c8dded1aa9fa3aa8fd7e176bf) --- crypto/aes/asm/aesp8-ppc.pl | 6 ++++-- crypto/sha/asm/sha512p8-ppc.pl | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crypto/aes/asm/aesp8-ppc.pl b/crypto/aes/asm/aesp8-ppc.pl index 3ee8979e76..a1891cc03c 100755 --- a/crypto/aes/asm/aesp8-ppc.pl +++ b/crypto/aes/asm/aesp8-ppc.pl @@ -648,6 +648,7 @@ ___ {{ # Optimized CBC decrypt procedure # my $key_="r11"; my ($x00,$x10,$x20,$x30,$x40,$x50,$x60,$x70)=map("r$_",(0,8,26..31)); + $x00=0 if ($flavour =~ /osx/); my ($in0, $in1, $in2, $in3, $in4, $in5, $in6, $in7 )=map("v$_",(0..3,10..13)); my ($out0,$out1,$out2,$out3,$out4,$out5,$out6,$out7)=map("v$_",(14..21)); my $rndkey0="v23"; # v24-v25 rotating buffer for first found keys @@ -1227,7 +1228,7 @@ Lcbc_dec8x_done: addi $sp,$sp,`$FRAME+21*16+6*$SIZE_T` blr .long 0 - .byte 0,12,0x14,0,0x80,6,6,0 + .byte 0,12,0x04,0,0x80,6,6,0 .long 0 .size .${prefix}_cbc_encrypt,.-.${prefix}_cbc_encrypt ___ @@ -1353,6 +1354,7 @@ ___ {{ # Optimized CTR procedure # my $key_="r11"; my ($x00,$x10,$x20,$x30,$x40,$x50,$x60,$x70)=map("r$_",(0,8,26..31)); + $x00=0 if ($flavour =~ /osx/); my ($in0, $in1, $in2, $in3, $in4, $in5, $in6, $in7 )=map("v$_",(0..3,10,12..14)); my ($out0,$out1,$out2,$out3,$out4,$out5,$out6,$out7)=map("v$_",(15..22)); my $rndkey0="v23"; # v24-v25 rotating buffer for first found keys @@ -1879,7 +1881,7 @@ Lctr32_enc8x_done: addi $sp,$sp,`$FRAME+21*16+6*$SIZE_T` blr .long 0 - .byte 0,12,0x14,0,0x80,6,6,0 + .byte 0,12,0x04,0,0x80,6,6,0 .long 0 .size .${prefix}_ctr32_encrypt_blocks,.-.${prefix}_ctr32_encrypt_blocks ___ diff --git a/crypto/sha/asm/sha512p8-ppc.pl b/crypto/sha/asm/sha512p8-ppc.pl index a316b31a4f..47189502c6 100755 --- a/crypto/sha/asm/sha512p8-ppc.pl +++ b/crypto/sha/asm/sha512p8-ppc.pl @@ -76,6 +76,7 @@ $lrsave="r8"; $offload="r11"; $vrsave="r12"; ($x00,$x10,$x20,$x30,$x40,$x50,$x60,$x70)=map("r$_",(0,10,26..31)); + $x00=0 if ($flavour =~ /osx/); @V=($A,$B,$C,$D,$E,$F,$G,$H)=map("v$_",(0..7)); @X=map("v$_",(8..23)); -- 2.25.1