linux-next: Tree for Mar 11 (powerpc build failure due to vmx crypto code)

crypto: vmx - Fix assembler perl to use _GLOBAL

Rather than doing things by hand for global symbols to deal with
different calling conventions we already have a macro _GLOBAL in
Linux to handle this.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/crypto/vmx/aesp8-ppc.pl b/drivers/crypto/vmx/aesp8-ppc.pl
old mode 100755 (executable)
new mode 100644 (file)
index 3ee8979..6c5c20c
--- a/drivers/crypto/vmx/aesp8-ppc.pl
+++ b/drivers/crypto/vmx/aesp8-ppc.pl
@@ -85,8 +85,6 @@ Lconsts:
 .asciz "AES for PowerISA 2.07, CRYPTOGAMS by <appro\@openssl.org>"
 
 .globl .${prefix}_set_encrypt_key
-.align 5
-.${prefix}_set_encrypt_key:
 Lset_encrypt_key:
        mflr            r11
        $PUSH           r11,$LRSAVE($sp)
@@ -348,8 +346,6 @@ Lenc_key_abort:
 .size  .${prefix}_set_encrypt_key,.-.${prefix}_set_encrypt_key
 
 .globl .${prefix}_set_decrypt_key
-.align 5
-.${prefix}_set_decrypt_key:
        $STU            $sp,-$FRAME($sp)
        mflr            r10
        $PUSH           r10,$FRAME+$LRSAVE($sp)
@@ -405,8 +401,6 @@ my ($inp,$out,$key,$rounds,$idx)=map("r$_",(3..7));
 
 $code.=<<___;
 .globl .${prefix}_${dir}crypt
-.align 5
-.${prefix}_${dir}crypt:
        lwz             $rounds,240($key)
        lis             r0,0xfc00
        mfspr           $vrsave,256
@@ -484,8 +478,6 @@ my ($ivec,$inptail,$inpperm,$outhead,$outperm,$outmask,$keyperm)=
                                                map("v$_",(4..10));
 $code.=<<___;
 .globl .${prefix}_cbc_encrypt
-.align 5
-.${prefix}_cbc_encrypt:
        ${UCMP}i        $len,16
        bltlr-
 
@@ -1243,8 +1235,6 @@ my $dat=$tmp;
 
 $code.=<<___;
 .globl .${prefix}_ctr32_encrypt_blocks
-.align 5
-.${prefix}_ctr32_encrypt_blocks:
        ${UCMP}i        $len,1
        bltlr-
 

diff --git a/drivers/crypto/vmx/ghashp8-ppc.pl b/drivers/crypto/vmx/ghashp8-ppc.pl
old mode 100755 (executable)
new mode 100644 (file)
index e76a58c..0a6f899
--- a/drivers/crypto/vmx/ghashp8-ppc.pl
+++ b/drivers/crypto/vmx/ghashp8-ppc.pl
@@ -54,8 +54,6 @@ $code=<<___;
 .text
 
 .globl .gcm_init_p8
-.align 5
-.gcm_init_p8:
        lis             r0,0xfff0
        li              r8,0x10
        mfspr           $vrsave,256
@@ -98,8 +96,6 @@ $code=<<___;
 .size  .gcm_init_p8,.-.gcm_init_p8
 
 .globl .gcm_gmult_p8
-.align 5
-.gcm_gmult_p8:
        lis             r0,0xfff8
        li              r8,0x10
        mfspr           $vrsave,256
@@ -148,8 +144,6 @@ $code=<<___;
 .size  .gcm_gmult_p8,.-.gcm_gmult_p8
 
 .globl .gcm_ghash_p8
-.align 5
-.gcm_ghash_p8:
        lis             r0,0xfff8
        li              r8,0x10
        mfspr           $vrsave,256

diff --git a/drivers/crypto/vmx/ppc-xlate.pl b/drivers/crypto/vmx/ppc-xlate.pl
old mode 100755 (executable)
new mode 100644 (file)
index f89e814..a591884
--- a/drivers/crypto/vmx/ppc-xlate.pl
+++ b/drivers/crypto/vmx/ppc-xlate.pl
@@ -27,25 +27,13 @@ my $globl = sub {
        /osx/           && do { $name = "_$name";
                                last;
                              };
-       /linux.*(32|64le)/
-                       && do { $ret .= ".globl $name\n";
-                               $ret .= ".type  $name,\@function";
-                               last;
-                             };
-       /linux.*64/     && do { $ret .= ".globl $name\n";
-                               $ret .= ".type  $name,\@function\n";
-                               $ret .= ".section       \".opd\",\"aw\"\n";
-                               $ret .= ".align 3\n";
-                               $ret .= "$name:\n";
-                               $ret .= ".quad  .$name,.TOC.\@tocbase,0\n";
-                               $ret .= ".previous\n";
-
-                               $name = ".$name";
+       /linux/
+                       && do { $ret = "_GLOBAL($name)";
                                last;
                              };
     }
 
-    $ret = ".globl     $name" if (!$ret);
+    $ret = ".globl     $name\nalign 5\n$name:" if (!$ret);
     $$global = $name;
     $ret;
 };
@@ -187,6 +175,8 @@ my $mtsle   = sub {
     "  .long   ".sprintf "0x%X",(31<<26)|($arg<<21)|(147*2);
 };
 
+print "#include <asm/ppc_asm.h>\n" if $flavour =~ /linux/;
+
 while($line=<>) {
 
     $line =~ s|[#!;].*$||;     # get rid of asm-style comments...
@@ -199,15 +189,6 @@ while($line=<>) {
        $line =~ s|\bL(\w+)|\.L$1|g     if ($dotinlocallabels);
     }
 
-    {
-       $line =~ s|(^[\.\w]+)\:\s*||;
-       my $label = $1;
-       if ($label) {
-           printf "%s:",($GLOBALS{$label} or $label);
-           printf "\n.localentry\t$GLOBALS{$label},0"  if ($GLOBALS{$label} && $flavour =~ /linux.*64le/);
-       }
-    }
-
     {
        $line =~ s|^\s*(\.?)(\w+)([\.\+\-]?)\s*||;
        my $c = $1; $c = "\t" if ($c eq "");