2
0
Эх сурвалжийг харах

* Add --32 or --64 to to ensure functionality of i386 compiler on x64_64 OSes.

git-svn-id: trunk@2325 -
daniel 19 жил өмнө
parent
commit
6ba68594be

+ 8 - 1
compiler/assemble.pas

@@ -554,6 +554,13 @@ Implementation
           end;
           end;
       end;
       end;
 
 
+{$ifdef i386}
+    const format_option='--32';
+{$else}{$ifdef x86_64}
+    const format_option='--64';
+{$else}
+    const format_option='';
+{$endif}{$endif}
 
 
     procedure TExternalAssembler.AsmCreate(Aplace:tcutplace);
     procedure TExternalAssembler.AsmCreate(Aplace:tcutplace);
       begin
       begin
@@ -563,7 +570,7 @@ Implementation
         if DoPipe then
         if DoPipe then
          begin
          begin
            Message1(exec_i_assembling_pipe,asmfile);
            Message1(exec_i_assembling_pipe,asmfile);
-           POpen(outfile,'as -o '+objfile,'W');
+           POpen(outfile,'as '+format_option+' -o '+objfile,'W');
          end
          end
         else
         else
 {$endif}
 {$endif}