瀏覽代碼

* link.res is a real linkerscript when we target binutils, not when we
target the AIX linker
* never quote file names added to link.res when it's not a linkerscript
(only newline is a separator in the case)

git-svn-id: trunk@21342 -

Jonas Maebe 13 年之前
父節點
當前提交
ccf895af5a
共有 1 個文件被更改,包括 13 次插入4 次删除
  1. 13 4
      compiler/systems/t_aix.pas

+ 13 - 4
compiler/systems/t_aix.pas

@@ -155,7 +155,7 @@ begin
     not(cs_link_on_target in current_settings.globalswitches) and
     not(source_info.system in systems_aix) ;
   { Open link.res file }
-  LinkRes:=TLinkRes.Create(outputexedir+Info.ResName,not assumebinutils);
+  LinkRes:=TLinkRes.Create(outputexedir+Info.ResName,assumebinutils);
   with linkres do
     begin
       { Write path to search libraries }
@@ -181,13 +181,19 @@ begin
        if assumebinutils then
         StartSection('INPUT(');
       { add objectfiles, start with prt0 always }
-      AddFileName(maybequoted(FindObjectFile(prtobj,'',false)));
+       if assumebinutils then
+         AddFileName(maybequoted(FindObjectFile(prtobj,'',false)))
+       else
+         AddFileName(FindObjectFile(prtobj,'',false));
       { main objectfiles }
       while not ObjectFiles.Empty do
        begin
          s:=ObjectFiles.GetFirst;
          if s<>'' then
-          AddFileName(maybequoted(s));
+          if assumebinutils then
+            AddFileName(maybequoted(s))
+          else
+            AddFileName(s)
        end;
 
       { Write staticlibraries }
@@ -196,7 +202,10 @@ begin
          While not StaticLibFiles.Empty do
           begin
             S:=StaticLibFiles.GetFirst;
-            AddFileName(maybequoted(s))
+            if assumebinutils then
+              AddFileName(maybequoted(s))
+            else
+              AddFileName(s);
           end;
        end;