[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b5640316771fb776101cf6be8e6ae2ed5cf93d02 (commit)
      from  81e61d7cb51988a0cde11c3b924052213b50d979 (commit)


- Log -----------------------------------------------------------------
commit b5640316771fb776101cf6be8e6ae2ed5cf93d02
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 8 00:33:08 2016 +0100

    Adapt mk1mf.pl and companions to changed perlasm script semantics
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/mk1mf.pl   | 4 ++--
 util/pl/unix.pl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index a68cb73..b5cb507 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1230,7 +1230,7 @@ sub perlasm_compile_target
 	my($ret);
 	$bname =~ s/(.*)\.[^\.]$/$1/;
 	$ret ="\$(TMP_D)$o$bname$asm_suffix: $source\n";
-	$ret.="\t\$(PERL) $source $asmtype \$(CFLAG) >\$\@\n";
+	$ret.="\t\$(PERL) $source $asmtype \$(CFLAG) \$\@\n";
 	if ($fipscanisteronly)
 		{
 		$ret .= "\t\$(PERL) util$o.pl . \$@ norunasm \$(CFLAG)\n";
@@ -1295,7 +1295,7 @@ sub do_asm_rule
 			my $plasm = $objfile;
 			$plasm =~ s/${obj}/.pl/;
 			$ret.="$srcfile: $plasm\n";
-			$ret.="\t\$(PERL) $plasm $asmtype \$(CFLAG) >$srcfile\n\n";
+			$ret.="\t\$(PERL) $plasm $asmtype \$(CFLAG) $srcfile\n\n";
 			}
 
 		$ret.="$objfile: $srcfile\n";
diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 09f7486..6add39a 100644
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -96,7 +96,7 @@ sub platform_perlasm_compile_target
 		        {
 			return << "EOF";
 \$(TMP_D)/$p.s: $perl1{$p}/asm/$p.pl
-	\$(PERL) $perl1{$p}/asm/$p.pl \$(PERLASM_SCHEME) > \$@
+	\$(PERL) $perl1{$p}/asm/$p.pl \$(PERLASM_SCHEME) \$@
 EOF
 		        }
 	        }
@@ -104,7 +104,7 @@ EOF
 		{
 		return << 'EOF';
 $(TMP_D)/x86_64cpuid.s: crypto/x86_64cpuid.pl
-	$(PERL) crypto/x86_64cpuid.pl $(PERLASM_SCHEME) > $@
+	$(PERL) crypto/x86_64cpuid.pl $(PERLASM_SCHEME) $@
 EOF
 		}
 	elsif ($target eq '$(OBJ_D)/sha256-x86_64.o')