Переглянути джерело

* target netwlibc added (libc is preferred for newer netware versions)

armin 21 роки тому
батько
коміт
354004d803

+ 7 - 1
compiler/compiler.pas

@@ -176,6 +176,9 @@ uses
 {$ifdef nwm}
   ,i_nwm
 {$endif nwm}
+{$ifdef nwl}
+  ,i_nwl
+{$endif nwm}
 {$ifdef os2}
  {$ifdef emx}
   ,i_emx
@@ -426,7 +429,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.45  2004-06-20 08:55:29  florian
+  Revision 1.46  2004-09-04 21:18:47  armin
+  * target netwlibc added (libc is preferred for newer netware versions)
+
+  Revision 1.45  2004/06/20 08:55:29  florian
     * logs truncated
 
   Revision 1.44  2004/01/14 23:39:05  florian

+ 7 - 1
compiler/i386/cputarg.pas

@@ -57,6 +57,9 @@ implementation
     {$ifndef NOTARGETNETWARE}
       ,t_nwm
     {$endif}
+    {$ifndef NOTARGETNETWLIBC}
+      ,t_nwl
+    {$endif}
     {$ifndef NOTARGETGO32V2}
       ,t_go32v2
     {$endif}
@@ -91,7 +94,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.14  2004-06-20 08:55:31  florian
+  Revision 1.15  2004-09-04 21:18:47  armin
+  * target netwlibc added (libc is preferred for newer netware versions)
+
+  Revision 1.14  2004/06/20 08:55:31  florian
     * logs truncated
 
 }

+ 1 - 0
compiler/msg/errord.msg

@@ -1819,6 +1819,7 @@ option_help_pages=11025_[
 3*2TGO32V2_Version 2 von DJ Delorie's DOS extender
 3*2TLINUX_Linux
 3*2TNETWARE_Novell Netware Module (clib)
+3*2TNETWLIBC_Novell Netware Module (libc)
 3*2TOS2_OS/2 / eComStation
 3*2TSUNOS_SunOS/Solaris
 3*2TWDOSX_WDOSX DOS extender

+ 1 - 0
compiler/msg/errore.msg

@@ -2246,6 +2246,7 @@ option_help_pages=11025_[
 3*2Tgo32v2_Version 2 of DJ Delorie DOS extender
 3*2Tlinux_Linux
 3*2Tnetware_Novell Netware Module (clib)
+3*2Tnetwlibc_Novell Netware Module (libc)
 3*2Tos2_OS/2 / eComStation
 3*2Tsunos_SunOS/Solaris
 3*2Twatcom_Watcom compatible DOS extender

+ 1 - 0
compiler/msg/errorf.msg

@@ -1858,6 +1858,7 @@ option_help_pages=11025_[
 3*2TGO32V2_version 2 de l'extension DOS de DJ Delorie
 3*2TLINUX_Linux
 3*2TNETWARE_Novell Netware Module (clib)
+3*2Tnetwlibc_Novell Netware Module (libc)
 3*2TOS2_OS/2 / eComStation
 3*2TSUNOS_SunOS/Solaris
 3*2TWDOSX_WDOSX DOS extension

+ 1 - 0
compiler/msg/errorpl.msg

@@ -2189,6 +2189,7 @@ option_help_pages=11025_[
 3*2Tgo32v2_DJ Delorie DOS extender - wersja 2
 3*2Tlinux_Linux
 3*2Tnetware_Novell Netware Module (clib)
+3*2Tnetwlibc_Novell Netware Module (libc)
 3*2Tos2_OS/2 / eComStation
 3*2Tsunos_SunOS/Solaris
 3*2Twatcom_DOS extendery zgodne z Watcomem

+ 1 - 1
compiler/msgidx.inc

@@ -643,7 +643,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 36849;
+  MsgTxtSize = 36891;
 
   MsgIdxMax : array[1..20] of longint=(
     17,66,208,59,57,46,99,20,35,60,

+ 12 - 11
compiler/msgtxt.inc

@@ -851,46 +851,47 @@ const msgtxt : array[0..000153,1..240] of char=(
   '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Tlinux_Li','nux'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
+  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
-  '3*1W<x>_Win32-like target options'#010+
-  '3*2WB<x>_Set I','mage base to Hexadecimal <x> value'#010+
+  '3*1W<x','>_Win32-like target options'#010+
+  '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
   '3*2WF_Specify full-screen type application (OS/2 only)'#010+
-  '3*2WG_Specify graphic type application'#010+
-  '3*2WN_Do not generat','e relocation code (necessary for debugging)'#010+
+  '3*2WG_Specify gra','phic type application'#010+
+  '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   '6*1A<x>_output format'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
-  '6*2Amot_Standard Motorola assembler'#010+
-  '6*1O_optimizati','ons:'#010+
+  '6*2Amot_S','tandard Motorola assembler'#010+
+  '6*1O_optimizations:'#010+
   '6*2Oa_turn on the optimizer'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O0_set target processor to a MC68000'#010+
-  '6*2O2_set target processor to a MC68020+ (default)'#010+
-  '6*1R<x>_ass','embler reading style:'#010+
+  '6*2O2_set target pro','cessor to a MC68020+ (default)'#010+
+  '6*1R<x>_assembler reading style:'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux-68k'#010+
-  '6*2Tmacos_Macintosh m68k (not supported)'#010+
+  '6*2Tmacos_Macintosh m68k (not sup','ported)'#010+
   '6*2Tpalmos_PalmOS'#010+
-  'P*1T<x>_Target o','perating system:'#010+
+  'P*1T<x>_Target operating system:'#010+
   'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
   'P*2Tlinux_Linux on PowerPC'#010+
   'P*2Tmacos_MacOS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'P*2WC_Specify console type application (MacOS only)'#010+
-  'P*2WG_Specify graphic type application (MacOS ','only)'#010+
+  'P*2W','G_Specify graphic type application (MacOS only)'#010+
   'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+

+ 11 - 5
compiler/pmodules.pas

@@ -1372,12 +1372,15 @@ implementation
           end
          else
           begin
-	    if target_info.system <> system_i386_netware then
+	    if (target_info.system = system_i386_netware) or
+	       (target_info.system = system_i386_netwlibc) then
 	    begin
-              pd:=create_main_proc('main',potype_proginit,st);
-              pd.aliasnames.insert('PASCALMAIN');
+              pd:=create_main_proc('PASCALMAIN',potype_proginit,st); { main is need by the netware rtl }
 	    end else
-	      pd:=create_main_proc('PASCALMAIN',potype_proginit,st); { main is need by the netware rtl }
+	    begin
+	      pd:=create_main_proc('main',potype_proginit,st);
+              pd.aliasnames.insert('PASCALMAIN');
+	    end;
           end;
          tcgprocinfo(current_procinfo).parse_body;
          tcgprocinfo(current_procinfo).generate_code;
@@ -1527,7 +1530,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.162  2004-09-03 16:12:32  armin
+  Revision 1.163  2004-09-04 21:18:47  armin
+  * target netwlibc added (libc is preferred for newer netware versions)
+
+  Revision 1.162  2004/09/03 16:12:32  armin
   * dont create main for netware (only PASCALMAIN)
 
   Revision 1.161  2004/08/16 22:52:35  olle

+ 5 - 2
compiler/psub.pas

@@ -1345,7 +1345,7 @@ implementation
                         consume_all_until(_SEMICOLON);
                      end
                    else if islibrary or
-                           (target_info.system in [system_i386_WIN32,system_i386_wdosx,system_i386_Netware]) then
+                           (target_info.system in [system_i386_WIN32,system_i386_wdosx,system_i386_Netware,system_i386_netwlibc]) then
                      read_exports
                    else
                      begin
@@ -1423,7 +1423,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.203  2004-08-14 14:50:42  florian
+  Revision 1.204  2004-09-04 21:18:47  armin
+  * target netwlibc added (libc is preferred for newer netware versions)
+
+  Revision 1.203  2004/08/14 14:50:42  florian
     * fixed several sparc alignment issues
     + Jonas' inline node patch; non functional yet
 

+ 11 - 7
compiler/scandir.pas

@@ -255,7 +255,7 @@ implementation
     procedure dir_description;
       begin
         if not (target_info.system in [system_i386_os2,system_i386_emx,
-                 system_i386_win32,system_i386_netware,system_i386_wdosx]) then
+                 system_i386_win32,system_i386_netware,system_i386_wdosx,system_i386_netwlibc]) then
           Message(scan_w_description_not_support);
         { change description global var in all cases }
         { it not used but in win32, os2 and netware }
@@ -266,7 +266,7 @@ implementation
 
     procedure dir_screenname; {ad}
       begin
-        if target_info.system <> system_i386_netware then
+        if not (target_info.system in [system_i386_netware,system_i386_netwlibc]) then
           {Message(scan_w_decription_not_support);}
           comment (V_Warning,'Screenname only supported for target netware');
         current_scanner.skipspace;
@@ -275,7 +275,7 @@ implementation
 
       procedure dir_threadname; {ad}
       begin
-        if target_info.system <> system_i386_netware then
+        if not (target_info.system in [system_i386_netware,system_i386_netwlibc]) then
           {Message(scan_w_decription_not_support);}
           comment (V_Warning,'Threadname only supported for target netware');
         current_scanner.skipspace;
@@ -284,7 +284,7 @@ implementation
 
       procedure dir_copyright; {ad}
       begin
-        if target_info.system <> system_i386_netware then
+        if not (target_info.system in [system_i386_netware,system_i386_netwlibc]) then
           {Message(scan_w_decription_not_support);}
           comment (V_Warning,'Copyright only supported for target netware');
         current_scanner.skipspace;
@@ -891,7 +891,8 @@ implementation
         error : integer;
       begin
         if not (target_info.system in [system_i386_os2,system_i386_emx,
-                 system_i386_win32,system_i386_netware,system_i386_wdosx]) then
+                 system_i386_win32,system_i386_netware,system_i386_wdosx,
+		 system_i386_netwlibc]) then
           begin
             Message(scan_n_version_not_support);
             exit;
@@ -925,7 +926,7 @@ implementation
                     exit;
                   end;
                 if (c='.') and
-                   (target_info.system = system_i386_netware) then
+                   (target_info.system in [system_i386_netware,system_i386_netwlibc]) then
                   begin
                      current_scanner.readchar;
                      current_scanner.readnumber;
@@ -1114,7 +1115,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.42  2004-08-31 22:07:04  olle
+  Revision 1.43  2004-09-04 21:18:47  armin
+  * target netwlibc added (libc is preferred for newer netware versions)
+
+  Revision 1.42  2004/08/31 22:07:04  olle
     + compiler directives which take filenames/paths, get these trimmed, and
       also support quotes.
 

+ 6 - 2
compiler/systems.pas

@@ -111,7 +111,8 @@ interface
              system_arm_linux,          { 31 }
              system_i386_watcom,        { 32 }
              system_powerpc_MorphOS,    { 33 }
-	     system_x86_64_freebsd	{ 34 }
+	     system_x86_64_freebsd,     { 34 }
+             system_i386_netwlibc       { 35 }
        );
 
        tasm = (as_none
@@ -702,7 +703,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.91  2004-06-29 21:00:08  peter
+  Revision 1.92  2004-09-04 21:18:47  armin
+  * target netwlibc added (libc is preferred for newer netware versions)
+
+  Revision 1.91  2004/06/29 21:00:08  peter
     * only enable dwarf for supported platforms
 
   Revision 1.90  2004/06/20 08:55:30  florian

+ 108 - 0
compiler/systems/i_nwl.pas

@@ -0,0 +1,108 @@
+{
+    $Id$
+    Copyright (c) 1998-2004 by Peter Vreman
+
+    This unit implements support information structures for Netware (libc) modules
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ ****************************************************************************}
+
+{ This unit implements support information structures for Netware libc modules. }
+unit i_nwl;
+
+  interface
+
+    uses
+       systems;
+
+    const
+       system_i386_netwlibc_info : tsysteminfo =
+          (
+            system       : system_i386_netwlibc;
+            name         : 'Netware for i386(libc)';
+            shortname    : 'Netwlibc';
+            flags        : [];
+            cpu          : cpu_i386;
+            unit_env     : 'NETWLIBCUNITS';
+            extradefines : '';
+            sourceext    : '.pp';
+            pasext       : '.pas';
+            exeext       : '.nlm';
+            defext       : '.def';
+            scriptext    : '.sh';
+            smartext     : '.sl';
+            unitext      : '.ppu';
+            unitlibext   : '.ppl';
+            asmext       : '.s';
+            objext       : '.o';
+            resext       : '.res';
+            resobjext    : '.or';
+            sharedlibext : '.nlm';
+            staticlibext : '.a';
+            staticlibprefix : '';
+            sharedlibprefix : '';
+            sharedClibext : '.nlm';
+            staticClibext : '.a';
+            staticClibprefix : '';
+            sharedClibprefix : '';
+            Cprefix      : '';
+            newline      : #13#10;
+            dirsep       : '/';
+            files_case_relevent : false;
+            assem        : as_i386_elf32;
+            assemextern  : as_gas;
+            link         : nil;
+            linkextern   : nil;
+            ar           : ar_gnu_ar;
+            res          : res_none;
+            script       : script_unix;
+            endian       : endian_little;
+            alignment    :
+              (
+                procalign       : 4;
+                loopalign       : 4;
+                jumpalign       : 0;
+                constalignmin   : 0;
+                constalignmax   : 4;
+                varalignmin     : 0;
+                varalignmax     : 4;
+                localalignmin   : 4;
+                localalignmax   : 4;
+                recordalignmin  : 0;
+                recordalignmax  : 4;
+                maxCrecordalign : 4
+              );
+            first_parm_offset : 8;
+            heapsize     : 256*1024;
+            stacksize    : 16384;
+            DllScanSupported:false;
+            use_function_relative_addresses : true
+          );
+
+  implementation
+
+initialization
+{$ifdef CPU86}
+  {$ifdef netwlibc}
+    set_source_info(system_i386_netwlibc_info);
+  {$endif netwlibc}
+{$endif CPU86}
+end.
+{
+  $Log$
+  Revision 1.1  2004-09-04 21:18:47  armin
+  * target netwlibc added (libc is preferred for newer netware versions)
+
+}

+ 610 - 0
compiler/systems/t_nwl.pas

@@ -0,0 +1,610 @@
+{
+    $Id$
+    Copyright (c) 1998-2004 by Peter Vreman
+
+    This unit implements support import,export,link routines
+    for the (i386) Netware libc target
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    Currently generating NetWare-NLM's only work under Linux and win32.
+    (see http://home.arcor.de/armin.diehl/fpcnw for binutils working
+    with win32) while not included in fpc-releases.
+
+    The following compiler-swiches are supported for NetWare:
+    $DESCRIPTION    : NLM-Description, will be displayed at load-time
+    $M              : For Stack-Size, Heap-Size will be ignored
+                      32K is the accepted minimum
+    $VERSION x.x.x  : Sets Major, Minor and Revision
+    $SCREENNAME     : Sets the ScreenName
+    $THREADNAME     : Sets current threadname
+
+    Additional parameters for the nlmvonv-inputfile can be passed with
+    -k, i.e. -kREENTRANT will add the option REENTRANT to the nlmconv
+    inputfile. A ; will be converted into a newline
+
+    Exports will be handled like in win32:
+    procedure bla;
+    begin
+    end;
+
+    exports foo name 'Bar';
+
+    The path to the import-Files must be specified by the library-path.
+    All external modules are defined as autoload. (Note: the import-files have
+    to be in unix-format for exe2nlm)
+    By default, the most import files are included in freepascal.
+
+    i.e. Procedure ConsolePrintf (p:pchar); cdecl; external 'clib.nlm';
+    sets IMPORT @clib.imp and MODULE clib.
+
+    Function simply defined as external work without generating autoload but
+    you will get a warnung from nlmconv.
+
+    If you dont have nlmconv, compile gnu-binutils with
+       ./configure --enable-targets=i386-linux,i386-netware
+       make all
+
+    Debugging is possible with gdb and a converter from gdb to ndi available
+    at http://home.arcor.de/armin.diehl/gdbnw
+
+    A sample program:
+
+    Program Hello;
+    (*$DESCRIPTION HelloWorldNlm*)
+    (*$VERSION 1.2.3*)
+    (*$ScreenName Hello*)
+    (*$M 60000,60000*)
+    begin
+      writeLn ('hello world');
+    end.
+
+    compile with:
+    ppc386 -Tnetware hello
+
+    ToDo:
+      - No duplicate imports and autoloads
+      - libc support (needs new target)
+
+****************************************************************************
+}
+unit t_nwl;
+
+{$i fpcdefs.inc}
+
+interface
+
+
+implementation
+
+{$ifdef netwlibc}
+{$define netware}
+{$endif}
+
+  uses
+    cutils,
+    verbose,systems,globtype,globals,
+    symconst,script,
+    fmodule,aasmbase,aasmtai,aasmcpu,cpubase,symsym,symdef,
+    import,export,link,i_nwl
+    {$ifdef netware} ,dos {$endif}
+    ;
+
+  type
+    timportlibnetwlibc=class(timportlib)
+      procedure preparelib(const s:string);override;
+      procedure importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string);override;
+      procedure importvariable(vs:tvarsym;const name,module:string);override;
+      procedure generatelib;override;
+    end;
+
+    texportlibnetwlibc=class(texportlib)
+      procedure preparelib(const s : string);override;
+      procedure exportprocedure(hp : texported_item);override;
+      procedure exportvar(hp : texported_item);override;
+      procedure generatelib;override;
+    end;
+
+    tlinkernetwlibc=class(texternallinker)
+    private
+      NLMConvLinkFile: TLinkRes;  {for second pass, fist pass is ld}
+      Function  WriteResponseFile(isdll:boolean) : Boolean;
+    public
+      constructor Create;override;
+      procedure SetDefaultInfo;override;
+      function  MakeExecutable:boolean;override;
+    end;
+
+Const tmpLinkFileName = 'link~tmp._o_';
+      minStackSize = 32768;
+
+{*****************************************************************************
+                               TIMPORTLIBNETWARE
+*****************************************************************************}
+
+procedure timportlibnetwlibc.preparelib(const s : string);
+begin
+end;
+
+
+procedure timportlibnetwlibc.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string);
+begin
+  { insert sharedlibrary }
+  current_module.linkothersharedlibs.add(SplitName(module),link_allways);
+  { do nothing with the procedure, only set the mangledname }
+  if name<>'' then
+   begin
+     aprocdef.setmangledname(name);
+   end
+  else
+    message(parser_e_empty_import_name);
+end;
+
+
+procedure timportlibnetwlibc.importvariable(vs:tvarsym;const name,module:string);
+begin
+  { insert sharedlibrary }
+  current_module.linkothersharedlibs.add(SplitName(module),link_allways);
+  { reset the mangledname and turn off the dll_var option }
+  vs.set_mangledname(name);
+  exclude(vs.varoptions,vo_is_dll_var);
+end;
+
+
+procedure timportlibnetwlibc.generatelib;
+begin
+end;
+
+
+{*****************************************************************************
+                               TEXPORTLIBNETWARE
+*****************************************************************************}
+
+procedure texportlibnetwlibc.preparelib(const s:string);
+begin
+end;
+
+
+procedure texportlibnetwlibc.exportprocedure(hp : texported_item);
+var
+  hp2 : texported_item;
+begin
+  { first test the index value }
+  if (hp.options and eo_index)<>0 then
+   begin
+     Comment(V_Error,'can''t export with index under netware');
+     exit;
+   end;
+  { use pascal name is none specified }
+  if (hp.options and eo_name)=0 then
+    begin
+       hp.name:=stringdup(hp.sym.name);
+       hp.options:=hp.options or eo_name;
+    end;
+  { now place in correct order }
+  hp2:=texported_item(current_module._exports.first);
+  while assigned(hp2) and
+     (hp.name^>hp2.name^) do
+    hp2:=texported_item(hp2.next);
+  { insert hp there !! }
+  if assigned(hp2) and (hp2.name^=hp.name^) then
+    begin
+      { this is not allowed !! }
+      Message1(parser_e_export_name_double,hp.name^);
+      exit;
+    end;
+  if hp2=texported_item(current_module._exports.first) then
+    current_module._exports.insert(hp)
+  else if assigned(hp2) then
+    begin
+       hp.next:=hp2;
+       hp.previous:=hp2.previous;
+       if assigned(hp2.previous) then
+         hp2.previous.next:=hp;
+       hp2.previous:=hp;
+    end
+  else
+    current_module._exports.concat(hp);
+end;
+
+
+procedure texportlibnetwlibc.exportvar(hp : texported_item);
+begin
+  hp.is_var:=true;
+  exportprocedure(hp);
+end;
+
+
+procedure texportlibnetwlibc.generatelib;
+var
+  hp2 : texported_item;
+begin
+  hp2:=texported_item(current_module._exports.first);
+  while assigned(hp2) do
+   begin
+     if (not hp2.is_var) and
+        (hp2.sym.typ=procsym) then
+      begin
+        { the manglednames can already be the same when the procedure
+          is declared with cdecl }
+        if tprocsym(hp2.sym).first_procdef.mangledname<>hp2.name^ then
+         begin
+{$ifdef i386}
+           { place jump in codesegment }
+           codesegment.concat(Tai_align.Create_op(4,$90));
+           codeSegment.concat(Tai_symbol.Createname_global(hp2.name^,AT_FUNCTION,0));
+           codeSegment.concat(Taicpu.Op_sym(A_JMP,S_NO,objectlibrary.newasmsymbol(tprocsym(hp2.sym).first_procdef.mangledname,AB_EXTERNAL,AT_FUNCTION)));
+           codeSegment.concat(Tai_symbol_end.Createname(hp2.name^));
+{$endif i386}
+         end;
+      end
+     else
+      //Comment(V_Error,'Exporting of variables is not supported under netware');
+      Message1(parser_e_no_export_of_variables_for_target,'netware');
+     hp2:=texported_item(hp2.next);
+   end;
+end;
+
+
+{*****************************************************************************
+                                  TLINKERNETWARE
+*****************************************************************************}
+
+Constructor TLinkerNetwlibc.Create;
+begin
+  Inherited Create;
+end;
+
+
+procedure TLinkerNetwlibc.SetDefaultInfo;
+begin
+  with Info do
+   begin
+     {$ifndef netware}
+     ExeCmd[1]:= 'ld -Ur -T $RES $STRIP -o $TMPOBJ';
+     ExeCmd[2]:='nlmconv -T$RES';
+     {$else}
+     {for running on netware we need absolute pathes since ld has another working directory}
+     ExeCmd[1]:= 'ld -Ur -T '+FExpand(outputexedir+Info.ResName)+' $STRIP -o '+Fexpand(outputexedir+tmpLinkFileName);
+     ExeCmd[2]:='nlmconv -T'+FExpand(outputexedir+'n'+Info.ResName);
+     {$endif}
+   end;
+end;
+
+
+Function TLinkerNetwlibc.WriteResponseFile(isdll:boolean) : Boolean;
+Var
+  linkres      : TLinkRes;
+  i            : longint;
+  s,s2,s3      : string;
+  ProgNam      : string [80];
+  NlmNam       : string [80];
+  hp2          : texported_item;  { for exports }
+  p            : byte;
+begin
+  WriteResponseFile:=False;
+
+  ProgNam := current_module.exefilename^;
+  i:=Pos(target_info.exeext,ProgNam);
+  if i>0 then
+    Delete(ProgNam,i,255);
+  NlmNam := ProgNam + target_info.exeext;
+
+  { Open link.res file }
+  LinkRes:=TLinkRes.Create(outputexedir+Info.ResName);             {for ld}
+  NLMConvLinkFile:=TLinkRes.Create(outputexedir+'n'+Info.ResName); {for nlmconv, written in CreateExeFile}
+
+  p := Pos ('"', Description);
+  while (p > 0) do
+  begin
+    delete (Description,p,1);
+    p := Pos ('"', Description);
+  end;
+  if Description <> '' then
+    NLMConvLinkFile.Add('DESCRIPTION "' + Description + '"');
+  NLMConvLinkFile.Add('VERSION '+tostr(dllmajor)+','+tostr(dllminor)+','+tostr(dllrevision));
+
+  p := Pos ('"', nwscreenname);
+  while (p > 0) do
+  begin
+    delete (nwscreenname,p,1);
+    p := Pos ('"', nwscreenname);
+  end;
+  p := Pos ('"', nwthreadname);
+  while (p > 0) do
+  begin
+    delete (nwthreadname,p,1);
+    p := Pos ('"', nwthreadname);
+  end;
+  p := Pos ('"', nwcopyright);
+  while (p > 0) do
+  begin
+    delete (nwcopyright,p,1);
+    p := Pos ('"', nwcopyright);
+  end;
+
+  if nwscreenname <> '' then
+    NLMConvLinkFile.Add('SCREENNAME "' + nwscreenname + '"');
+  if nwthreadname <> '' then
+    NLMConvLinkFile.Add('THREADNAME "' + nwthreadname + '"');
+  if nwcopyright <> '' then
+    NLMConvLinkFile.Add('COPYRIGHT "' + nwcopyright + '"');
+
+  if stacksize < minStackSize then stacksize := minStackSize;
+  str (stacksize, s);
+  NLMConvLinkFile.Add ('STACKSIZE '+s);
+  {$ifndef netware}
+  NLMConvLinkFile.Add ('INPUT '+outputexedir+tmpLinkFileName);
+  {$else}
+  NLMConvLinkFile.Add ('INPUT '+FExpand(outputexedir+tmpLinkFileName));
+  {$endif}
+
+  { add objectfiles, start with nwpre always }
+  LinkRes.Add ('INPUT (');
+  s2 := FindObjectFile('nwplibc','',false);
+  if s2 = '' then
+    s2 := FindObjectFile('libcpre.gcc','',false);
+  Comment (V_Debug,'adding Object File '+s2);
+  {$ifndef netware} LinkRes.Add (s2); {$else} LinkRes.Add (FExpand(s2)); {$endif}
+
+  { main objectfiles, add to linker input }
+  while not ObjectFiles.Empty do
+  begin
+    s:=ObjectFiles.GetFirst;
+    if s<>'' then
+    begin
+      s2 := FindObjectFile (s,'',false);
+      Comment (V_Debug,'adding Object File '+s2);
+      {$ifndef netware} LinkRes.Add (s2); {$else} LinkRes.Add (FExpand(s2)); {$endif}
+    end;
+  end;
+
+  { output file (nlm), add to nlmconv }
+  {$ifndef netware}
+  NLMConvLinkFile.Add ('OUTPUT ' + NlmNam);
+  {$else}
+  NLMConvLinkFile.Add ('OUTPUT ' + FExpand(NlmNam));
+  {$endif}
+
+  { start and stop-procedures }
+  NLMConvLinkFile.Add ('START _LibCPrelude');
+  NLMConvLinkFile.Add ('EXIT _LibCPostlude');
+  NLMConvLinkFile.Add ('CHECK _LibCCheckUnload');
+  NLMConvLinkFile.Add ('REENTRANT');            { needed by older libc versions }
+
+  if not (cs_link_strip in aktglobalswitches) then
+  begin
+    NLMConvLinkFile.Add ('DEBUG');
+    Comment(V_Debug,'DEBUG');
+  end;
+
+  { Write staticlibraries, is that correct ? }
+  if not StaticLibFiles.Empty then
+   begin
+     While not StaticLibFiles.Empty do
+      begin
+        S:=lower (StaticLibFiles.GetFirst);
+        if s<>'' then
+        begin
+          {ad: that's a hack !
+           whith -XX we get the .a files as static libs (in addition to the
+           imported libraries}
+         if (pos ('.a',s) <> 0) OR (pos ('.A', s) <> 0) then
+         begin
+           S2 := FindObjectFile(s,'',false);
+	   {$ifndef netware} LinkRes.Add (s2); {$else} LinkRes.Add (FExpand(s2)); {$endif}
+           Comment(V_Debug,'adding Object File (StaticLibFiles) '+S2);
+         end else
+         begin
+           i:=Pos(target_info.staticlibext,S);
+           if i>0 then
+             Delete(S,i,255);
+           S := S + '.imp'; S2 := '';
+           librarysearchpath.FindFile(S,S2);
+	   {$ifdef netware}
+	   Comment(V_Debug,'IMPORT @'+s2);
+	   s2 := FExpand (S2);
+	   {$endif}
+           NLMConvLinkFile.Add('IMPORT @'+S2);
+           Comment(V_Debug,'IMPORT @'+s2);
+         end;
+        end
+      end;
+   end;
+
+  if not SharedLibFiles.Empty then
+   begin
+     While not SharedLibFiles.Empty do
+      begin
+        {becuase of upper/lower case mix, we may get duplicate
+         names but nlmconv ignores that.
+         Here we are setting the import-files for nlmconv. I.e. for
+         the module libc or libc.nlm we add IMPORT @libc.imp and also
+         the module libc.nlm (autoload)
+	 If a lib name begins with !, only the IMPORT will be generated
+         ? may it be better to set autoload's via StaticLibFiles ? }
+        S:=lower (SharedLibFiles.GetFirst);
+        if s<>'' then
+         begin
+           s2:=s;
+           i:=Pos(target_info.sharedlibext,S);
+           if i>0 then
+             Delete(S,i,255);
+	   if s[1] = '!' then
+	   begin  // special, with ! only the imp will be included but no module is autoloaded, needed i.e. for netware.imp inlcuded in libc ndk
+	     delete (s,1,1);
+	     S := S + '.imp';
+             librarysearchpath.FindFile(S,S3);
+	     {$ifdef netware}
+	     Comment(V_Debug,'IMPORT @'+S3);
+	     S3 := FExpand (S3);
+	     {$endif}
+             NLMConvLinkFile.Add('IMPORT @'+S3);
+             Comment(V_Debug,'IMPORT @'+S3);
+	   end else
+	   begin
+             S := S + '.imp';
+             librarysearchpath.FindFile(S,S3);
+	     {$ifdef netware}
+	     Comment(V_Debug,'IMPORT @'+S3);
+	     S3 := FExpand (S3);
+	     {$endif}
+             NLMConvLinkFile.Add('IMPORT @'+S3);
+             NLMConvLinkFile.Add('MODULE '+s2);
+             Comment(V_Debug,'MODULE '+S2);
+             Comment(V_Debug,'IMPORT @'+S3);
+	   end;
+         end
+      end;
+   end;
+
+  { write exports }
+  hp2:=texported_item(current_module._exports.first);
+  while assigned(hp2) do
+   begin
+     if not hp2.is_var then
+      begin
+        { Export the Symbol }
+        Comment(V_Debug,'EXPORT '+hp2.name^);
+        NLMConvLinkFile.Add ('EXPORT '+hp2.name^);
+      end
+     else
+      { really, i think it is possible }
+      {Comment(V_Error,'Exporting of variables is not supported under netware');}
+      Message1(parser_e_no_export_of_variables_for_target,'netware');
+     hp2:=texported_item(hp2.next);
+   end;
+
+{ Write and Close response for ld, response for nlmconv is in NLMConvLinkFile(not written) }
+  linkres.Add (')');
+  linkres.writetodisk;
+  LinkRes.Free;
+
+{ pass options from -k to nlmconv, ; is interpreted as newline }
+  s := ParaLinkOptions;
+  while(Length(s) > 0) and (s[1] = ' ') do
+    delete (s,1,1);
+  p := pos ('"',s);
+  while p > 0 do
+  begin
+    delete (s,p,1);
+    p := pos ('"',s);
+  end;
+
+  p := pos (';',s);
+  while p > 0 do
+  begin
+    s2 := copy(s,1,p-1);
+    comment (V_Debug,'adding "'+s2+'" to nlmvonv input');
+    NLMConvLinkFile.Add(s2);
+    delete (s,1,p);
+    p := pos (';',s);
+  end;
+  if s <> '' then
+  begin
+    comment (V_Debug,'adding "'+s+'" to nlmvonv input');
+    NLMConvLinkFile.Add(s);
+  end;
+
+  WriteResponseFile:=True;
+end;
+
+
+function TLinkerNetwlibc.MakeExecutable:boolean;
+var
+  binstr,
+  cmdstr   : string;
+  success  : boolean;
+  StripStr : string[2];
+begin
+  if not(cs_link_extern in aktglobalswitches) then
+   Message1(exec_i_linking,current_module.exefilename^);
+
+{ Create some replacements }
+  StripStr:='';
+
+  if (cs_link_strip in aktglobalswitches) then
+   StripStr:='-s';
+
+{ Write used files and libraries and create Headerfile for
+  nlmconv in NLMConvLinkFile }
+  WriteResponseFile(false);
+
+{ Call linker, this will generate a new object file that will be passed
+  to nlmconv. Otherwise we could not create nlms without debug info }
+  SplitBinCmd(Info.ExeCmd[1],binstr,cmdstr);
+  Replace(cmdstr,'$EXE',current_module.exefilename^);
+  Replace(cmdstr,'$RES',outputexedir+Info.ResName);
+  Replace(cmdstr,'$STRIP',StripStr);
+  Replace(cmdstr,'$TMPOBJ',outputexedir+tmpLinkFileName);
+  Comment (v_debug,'Executing '+BinStr+' '+cmdstr);
+  success:=DoExec(FindUtil(BinStr),CmdStr,true,false);
+
+  { Remove ReponseFile }
+  if (success) and not(cs_link_extern in aktglobalswitches) then
+    RemoveFile(outputexedir+Info.ResName);
+
+{ Call nlmconv }
+  if success then
+  begin
+    NLMConvLinkFile.writetodisk;
+    NLMConvLinkFile.Free;
+    SplitBinCmd(Info.ExeCmd[2],binstr,cmdstr);
+    Replace(cmdstr,'$RES',outputexedir+'n'+Info.ResName);
+    Comment (v_debug,'Executing '+BinStr+' '+cmdstr);
+    success:=DoExec(FindUtil(BinStr),CmdStr,true,false);
+    if (success) and not(cs_link_extern in aktglobalswitches) then
+    begin
+      RemoveFile(outputexedir+'n'+Info.ResName);
+      RemoveFile(outputexedir+tmpLinkFileName);
+    end;
+  end;
+
+  MakeExecutable:=success;   { otherwise a recursive call to link method }
+end;
+
+
+{*****************************************************************************
+                                     Initialize
+*****************************************************************************}
+
+
+initialization
+  RegisterExternalLinker(system_i386_netwlibc_info,TLinkerNetwlibc);
+  RegisterImport(system_i386_netwlibc,TImportLibNetwlibc);
+  RegisterExport(system_i386_netwlibc,TExportLibNetwlibc);
+  RegisterTarget(system_i386_netwlibc_info);
+end.
+{
+  $Log$
+  Revision 1.1  2004-09-04 21:18:47  armin
+  * target netwlibc added (libc is preferred for newer netware versions)
+
+  Revision 1.14  2004/08/30 11:17:34  armin
+  * added support for libc
+
+  Revision 1.13  2004/08/01 19:29:06  armin
+  * changes to compile fpc on netware
+
+  Revision 1.12  2004/07/30 16:00:19  armin
+  * removed -m for nlmconv, it is only valid for ld
+
+  Revision 1.11  2004/06/20 08:55:32  florian
+    * logs truncated
+
+  Revision 1.10  2004/03/02 00:36:33  olle
+    * big transformation of Tai_[const_]Symbol.Create[data]name*
+
+}