Explorar o código

Use clang instead of as for AsBinStr for aarch64-win64 target

Pierre Muller %!s(int64=2) %!d(string=hai) anos
pai
achega
c6d936dc25
Modificáronse 1 ficheiros con 10 adicións e 2 borrados
  1. 10 2
      compiler/systems/t_win.pas

+ 10 - 2
compiler/systems/t_win.pas

@@ -1405,7 +1405,7 @@ implementation
         cmdstr  : TCmdStr;
         cmdstr  : TCmdStr;
         success : boolean;
         success : boolean;
         cmds,i       : longint;
         cmds,i       : longint;
-        AsBinStr     : string[80];
+        AsBinStr     : string;
         GCSectionsStr,
         GCSectionsStr,
         StripStr,
         StripStr,
         RelocStr,
         RelocStr,
@@ -1424,7 +1424,11 @@ implementation
         StripStr:='';
         StripStr:='';
         MapStr:='';
         MapStr:='';
         GCSectionsStr:='';
         GCSectionsStr:='';
+{$ifdef AARCH64}
+        AsBinStr:=FindUtil(utilsprefix+'clang');
+{$else not AARCH64}
         AsBinStr:=FindUtil(utilsprefix+'as');
         AsBinStr:=FindUtil(utilsprefix+'as');
+{$endif AARCH64}
         if RelocSection then
         if RelocSection then
           RelocStr:='--base-file base.$$$';
           RelocStr:='--base-file base.$$$';
         if create_smartlink_sections then
         if create_smartlink_sections then
@@ -1510,7 +1514,7 @@ implementation
         success : boolean;
         success : boolean;
         cmds,
         cmds,
         i       : longint;
         i       : longint;
-        AsBinStr     : string[80];
+        AsBinStr     : string;
         StripStr,
         StripStr,
         GCSectionsStr,
         GCSectionsStr,
         RelocStr,
         RelocStr,
@@ -1530,7 +1534,11 @@ implementation
         StripStr:='';
         StripStr:='';
         MapStr:='';
         MapStr:='';
         GCSectionsStr:='';
         GCSectionsStr:='';
+{$ifdef AARCH64}
+        AsBinStr:=FindUtil(utilsprefix+'clang');
+{$else not AARCH64}
         AsBinStr:=FindUtil(utilsprefix+'as');
         AsBinStr:=FindUtil(utilsprefix+'as');
+{$endif AARCH64}
         if RelocSection then
         if RelocSection then
          RelocStr:='--base-file base.$$$';
          RelocStr:='--base-file base.$$$';
         if create_smartlink_sections then
         if create_smartlink_sections then