Ad-hockery for Platform SDK ml64.
authorAndy Polyakov <appro@openssl.org>
Mon, 11 Feb 2008 13:04:39 +0000 (13:04 +0000)
committerAndy Polyakov <appro@openssl.org>
Mon, 11 Feb 2008 13:04:39 +0000 (13:04 +0000)
crypto/perlasm/x86_64-xlate.pl

index 14b6e35..fd02951 100755 (executable)
@@ -65,7 +65,10 @@ my $output = shift;
        if ($stddev!=$outdev || $stdino!=$outino);
 }
 
-my $masm=1 if ($output =~ /\.asm/);
+my $masmref=8 + 50727*2**-32;  # 8.00.50727 shipped with VS2005
+my $masm=$masmref if ($output =~ /\.asm/);
+if ($masm && `ml64 2>&1` =~ m/Version ([0-9]+)\.([0-9]+)(\.([0-9]+))?/)
+{   $masm=$1 + $2*2**-16 + $4*2**-32;   }
 
 my $current_segment;
 my $current_function;
@@ -356,7 +359,9 @@ my $current_function;
                                    $v="$current_segment\tENDS\n" if ($current_segment);
                                    $current_segment = "_$1\$";
                                    $current_segment =~ tr/[a-z]/[A-Z]/;
-                                   $v.="$current_segment\tSEGMENT ALIGN(64) 'CODE'";
+                                   $v.="$current_segment\tSEGMENT ";
+                                   $v.=$masm>=$masmref ? "ALIGN(64)" : "PAGE";
+                                   $v.=" 'CODE'";
                                    $self->{value} = $v;
                                    last;
                                  };