Asm build portability.
authorDr. Stephen Henson <steve@openssl.org>
Mon, 8 Apr 2013 13:53:54 +0000 (14:53 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 8 Apr 2013 13:53:54 +0000 (14:53 +0100)
Don't use Win32 specific options in mk1mf.pl to build assembly language
files.

util/mk1mf.pl
util/pl/unix.pl

index ab806d1..2b383e2 100755 (executable)
@@ -1269,15 +1269,15 @@ sub perlasm_compile_target
 
        my($ret);
        $bname =~ s/(.*)\.[^\.]$/$1/;
-       $ret ="\$(TMP_D)$o$bname.asm: $source\n";
+       $ret ="\$(TMP_D)$o$bname$asm_suffix: $source\n";
        $ret.="\t\$(PERL) $source $asmtype \$(CFLAG) >\$\@\n";
        if ($fipscanisteronly)
                {
-               $ret .= "\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n";
+               $ret .= "\t\$(PERL) util$o.pl . \$@ norunasm \$(CFLAG)\n";
                }
        $ret .= "\n";
-       $ret.="$target: \$(TMP_D)$o$bname.asm\n";
-       $ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm\n\n";
+       $ret.="$target: \$(TMP_D)$o$bname$asm_suffix\n";
+       $ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname$asm_suffix\n\n";
        return($ret);
        }
 
index 1e0902a..72d3b44 100644 (file)
@@ -26,6 +26,7 @@ else
                { $cflags="-O"; }
        }
 $obj='.o';
+$asm_suffix='.s';
 $ofile='-o ';
 
 # EXE linking stuff