Minor PPC assembler updates.

diff --git a/crypto/bn/asm/ppc-mont.pl b/crypto/bn/asm/ppc-mont.pl
index 8a260212b76a06a6fa3ad64bd422d617cc0dd08b..e9149c98cf5347b7d13f00b0085a6ebf6337b82f 100644 (file)
--- a/crypto/bn/asm/ppc-mont.pl
+++ b/crypto/bn/asm/ppc-mont.pl
@@ -98,6 +98,7 @@ $nlo="r25";
 $nhi="r0";
 
 $code=<<___;
+.machine any
 .text
 
 .globl .bn_mul_mont

diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
index a51147a3a7aa2377fb4e497ef387ac173a2821b1..7e0f9e96c094e1e52ed7c2b14a0b7e3782da965e 100755 (executable)
--- a/crypto/perlasm/ppc-xlate.pl
+++ b/crypto/perlasm/ppc-xlate.pl
@@ -58,7 +58,8 @@ my $text = sub {
 my $machine = sub {
     my $junk = shift;
     my $arch = shift;
-    $arch = "ppc970" if ($arch eq "any" and $flavour =~ /osx/);
+    if ($arch eq "any" and $flavour =~ /osx/)
+    {   $arch = ($flavour =~ /64/) ? "ppc970-64" : "ppc970";   }
     ".machine  $arch";
 };
 

diff --git a/crypto/sha/asm/sha1-ppc.pl b/crypto/sha/asm/sha1-ppc.pl
index 9c955ef036208d28dd1ef948f6ef4d73cb7ae26f..c1bf1f4872b67c378b6b931f9ac7d796b2bd2ea8 100755 (executable)
--- a/crypto/sha/asm/sha1-ppc.pl
+++ b/crypto/sha/asm/sha1-ppc.pl
@@ -62,10 +62,10 @@ sub BODY_00_19 {
 my ($i,$a,$b,$c,$d,$e,$f)=@_;
 my $j=$i+1;
 $code.=<<___ if ($i==0);
-       lwz     @X[$i],$i*4($inp)
+       lwz     @X[$i],`$i*4`($inp)
 ___
 $code.=<<___ if ($i<15);
-       lwz     @X[$j],$j*4($inp)
+       lwz     @X[$j],`$j*4`($inp)
        add     $f,$K,$e
        rotlwi  $e,$a,5
        add     $f,$f,@X[$i]
@@ -149,6 +149,7 @@ ___
 }
 
 $code=<<___;
+.machine any
 .text
 
 .globl .sha1_block_asm_data_order