* cleanups, finalized vlink support

compiler/systems/t_morph.pas

@@ -73,11 +73,14 @@ procedure TLinkerMorphOS.SetDefaultInfo;
 begin
   with Info do
    begin
-     if (cs_link_on_target in aktglobalswitches) then begin
-        ExeCmd[1]:='ld $OPT -o $EXE $RES';
-        ExeCmd[2]:='strip --strip-unneeded --remove-section .comment $EXE';
-     end else begin
-        ExeCmd[1]:='fpcvlink -b elf32amiga $OPT $STRIP -o $EXE -F $RES';
+    if (cs_link_on_target in aktglobalswitches) then 
+     begin
+      ExeCmd[1]:='ld $OPT -o $EXE $RES';
+      ExeCmd[2]:='strip --strip-unneeded --remove-section .comment $EXE';
+     end 
+    else 
+     begin
+      ExeCmd[1]:='fpcvlink -b elf32amiga $OPT $STRIP -o $EXE -T $RES';
      end;
    end;
 end;
@@ -96,103 +99,81 @@ begin
   { Open link.res file }
   LinkRes:=TLinkRes.Create(outputexedir+Info.ResName);
   
-  if (cs_link_on_target in aktglobalswitches) then begin
-
-    { Write path to search libraries }
-    HPath:=TStringListItem(current_module.locallibrarysearchpath.First);
-    while assigned(HPath) do
-     begin
-       s:=HPath.Str;
-       if (cs_link_on_target in aktglobalswitches) then
-       s:=ScriptFixFileName(s);
-     LinkRes.Add('-L'+s);
-     HPath:=TStringListItem(HPath.Next);
-    end;
-    HPath:=TStringListItem(LibrarySearchPath.First);
-    while assigned(HPath) do
-     begin
-       s:=HPath.Str;
-       if s<>'' then
-         LinkRes.Add('SEARCH_DIR('+maybequoted(s)+')');
-       HPath:=TStringListItem(HPath.Next);
-     end;
-
-    LinkRes.Add('INPUT (');
-    { add objectfiles, start with prt0 always }
-    s:=FindObjectFile('prt0','',false);
-    LinkRes.AddFileName(s);
-    while not ObjectFiles.Empty do
-     begin
-       s:=ObjectFiles.GetFirst;
-       if s<>'' then 
-        begin
-         LinkRes.AddFileName(maybequoted(s));
-        end;
-     end;
-    LinkRes.Add(')');
+  { Write path to search libraries }
+  HPath:=TStringListItem(current_module.locallibrarysearchpath.First);
+  while assigned(HPath) do
+   begin
+    s:=HPath.Str;
+    if (cs_link_on_target in aktglobalswitches) then
+     s:=ScriptFixFileName(s);
+    LinkRes.Add('-L'+s);
+    HPath:=TStringListItem(HPath.Next);
+   end;
+  HPath:=TStringListItem(LibrarySearchPath.First);
+  while assigned(HPath) do
+   begin
+    s:=HPath.Str;
+    if s<>'' then
+     LinkRes.Add('SEARCH_DIR('+maybequoted(s)+')');
+    HPath:=TStringListItem(HPath.Next);
+   end;
 
-    { Write staticlibraries }
-    if not StaticLibFiles.Empty then
+  LinkRes.Add('INPUT (');
+  { add objectfiles, start with prt0 always }
+  s:=FindObjectFile('prt0','',false);
+  LinkRes.AddFileName(s);
+  while not ObjectFiles.Empty do
+   begin
+    s:=ObjectFiles.GetFirst;
+    if s<>'' then 
      begin
-       LinkRes.Add('GROUP(');
-       While not StaticLibFiles.Empty do
-       begin
-         S:=StaticLibFiles.GetFirst;
-         LinkRes.AddFileName(maybequoted(s));
-       end;
-       LinkRes.Add(')');
+      { vlink doesn't use SEARCH_DIR for object files }
+      if not(cs_link_on_target in aktglobalswitches) then 
+       s:=FindObjectFile(s,'',false);
+      LinkRes.AddFileName(maybequoted(s));
      end;
+   end;
 
-  end else begin
-
-    { add objectfiles, start with prt0 always }
-    s:=FindObjectFile('prt0','',false);
-    LinkRes.AddFileName(s);
-    while not ObjectFiles.Empty do
-     begin
-       s:=ObjectFiles.GetFirst;
-       if s<>'' then 
-        begin
-         s:=FindObjectFile(s,'',false);
-         LinkRes.AddFileName(maybequoted(s));
-        end;
+  { Write staticlibraries }
+  if not StaticLibFiles.Empty then
+   begin
+     { vlink doesn't need, and doesn't support GROUP }
+     if (cs_link_on_target in aktglobalswitches) then begin        
+      LinkRes.Add(')');
+      LinkRes.Add('GROUP(');
      end;
-
-    if not StaticLibFiles.Empty then
+     while not StaticLibFiles.Empty do
      begin
-       While not StaticLibFiles.Empty do
-       begin
-         S:=StaticLibFiles.GetFirst;
-         LinkRes.AddFileName(maybequoted(s));
-       end;
+       S:=StaticLibFiles.GetFirst;
+       LinkRes.AddFileName(maybequoted(s));
      end;
-
-  end;
+   end;
+  LinkRes.Add(')');
 
   { Write sharedlibraries like -l<lib>, also add the needed dynamic linker
     here to be sure that it gets linked this is needed for glibc2 systems (PFV) }
   linklibc:=false;
-  While not SharedLibFiles.Empty do
+  while not SharedLibFiles.Empty do
    begin
-     S:=SharedLibFiles.GetFirst;
-     if s<>'c' then
-      begin
-        i:=Pos(target_info.sharedlibext,S);
-        if i>0 then
-         Delete(S,i,255);
-        LinkRes.Add('-l'+s);
-      end
-     else
-      begin
-        LinkRes.Add('-l'+s);
-        linklibc:=true;
-      end;
+    S:=SharedLibFiles.GetFirst;
+    if s<>'c' then
+     begin
+      i:=Pos(target_info.sharedlibext,S);
+      if i>0 then
+       Delete(S,i,255);
+      LinkRes.Add('-l'+s);
+     end
+    else
+     begin
+      LinkRes.Add('-l'+s);
+      linklibc:=true;
+     end;
    end;
   { be sure that libc&libgcc is the last lib }
   if linklibc then
    begin
-     LinkRes.Add('-lc');
-     LinkRes.Add('-lgcc');
+    LinkRes.Add('-lc');
+    LinkRes.Add('-lgcc');
    end;
 
 { Write and Close response }
@@ -215,11 +196,12 @@ begin
   if not(cs_link_extern in aktglobalswitches) then
    Message1(exec_i_linking,current_module.exefilename^);
 
-  if not (cs_link_on_target in aktglobalswitches) then begin
+  if not (cs_link_on_target in aktglobalswitches) then 
+   begin
     StripStr:='';
     if (cs_link_strip in aktglobalswitches) then
      StripStr:='-s -P __abox__';
-  end;
+   end;
 
 { Write used files and libraries }
   WriteResponseFile(false);
@@ -227,28 +209,32 @@ begin
 { Call linker }
   SplitBinCmd(Info.ExeCmd[1],binstr,cmdstr);
   Replace(cmdstr,'$OPT',Info.ExtraOptions);
-  if not(cs_link_on_target in aktglobalswitches) then begin
+  if not(cs_link_on_target in aktglobalswitches) then 
+   begin
     Replace(cmdstr,'$EXE',PathConv(maybequoted(ScriptFixFileName(current_module.exefilename^))));
     Replace(cmdstr,'$RES',PathConv(maybequoted(ScriptFixFileName(outputexedir+Info.ResName))));
     Replace(cmdstr,'$STRIP',StripStr);
-  end else begin
+   end 
+  else 
+   begin
     Replace(cmdstr,'$EXE',maybequoted(ScriptFixFileName(current_module.exefilename^)));
     Replace(cmdstr,'$RES',maybequoted(ScriptFixFileName(outputexedir+Info.ResName)));
-  end;
+   end;
   success:=DoExec(FindUtil(BinStr),cmdstr,true,false);
 
 { Stripping Enabled? }
   { For MorphOS a separate strip command is needed, to avoid stripping }
   { __abox__ symbol, which is required to be present in current MorphOS }
   { executables. }
-  if (cs_link_on_target in aktglobalswitches) then begin
+  if (cs_link_on_target in aktglobalswitches) then 
+   begin
     if success and (cs_link_strip in aktglobalswitches) then
-      begin
-        SplitBinCmd(Info.ExeCmd[2],binstr,cmdstr);
-        Replace(cmdstr,'$EXE',maybequoted(current_module.exefilename^));
-        success:=DoExec(FindUtil(utilsprefix+binstr),cmdstr,true,false);
-      end;
-  end;
+     begin
+      SplitBinCmd(Info.ExeCmd[2],binstr,cmdstr);
+      Replace(cmdstr,'$EXE',maybequoted(current_module.exefilename^));
+      success:=DoExec(FindUtil(utilsprefix+binstr),cmdstr,true,false);
+     end;
+   end;
 
 { Remove ReponseFile }
   if (success) and not(cs_link_extern in aktglobalswitches) then
@@ -269,7 +255,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.11  2005-02-03 03:54:07  karoly
+  Revision 1.12  2005-02-11 07:23:22  karoly
+    * cleanups, finalized vlink support
+
+  Revision 1.11  2005/02/03 03:54:07  karoly
   t_morph.pas
 
   Revision 1.10  2004/12/23 18:45:23  jonas