Changeset 2815 for branches

Timestamp:

Sep 11, 2006, 3:19:43 AM (19 years ago)

Author:

bird

Message:

Support wlink as an alternative to ilink and link386. backported from the trunk with buildsystem adjustments. see #89.

Location:

branches/libc-0.6/src/emx

Files:

• Makefile.gmk (modified) (1 diff)
• src/emxomf/emxomfld.c (modified) (12 diffs)
• src/emxomf/weakld.c (modified) (3 diffs)
• src/emxomf/weakld.h (modified) (1 diff)
• src/ld/ld.smak (modified) (1 diff)
• src/lib/fwdstub.asm (modified) (1 diff)
• src/lib/libc.smak (modified) (1 diff)

branches/libc-0.6/src/emx/Makefile.gmk

@@ -125 +125 @@
 LDFLAGS.dbg = -g
 LDFLAGS.aout = -Zaout
+
+
+
 LDFLAGS.omf = -Zomf -Zlinker /PM:VIO -Zlinker /LINENUMBERS
+
 LDFLAGS.prof = -pg
 # Linker flags for different kinds of target

branches/libc-0.6/src/emx/src/emxomf/emxomfld.c

@@ -156 +156 @@
 /* The type of linker to use. By default we assume it's VAC365 or later
    version of ilink. This can be overridden with the EMXOMFLD_TYPE env.
-   var. using any of the value VAC365, VAC308 and LINK386. */
+   var. using any of the value VAC365, VAC308 and LINK386. */
 static const char *linker_type = "VAC365";
 
@@ -253 +253 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /* Replace forward slashes `/' in NAME with backslashes `\'.  The linkers
@@ -348 +396 @@
 
           if (response_file == NULL)
-            {
-              int fd;
-
-              /* Complain if we are not allowed to use a response
-                 file. */
-
-              if (!response_flag)
-                {
-                  fprintf (stderr, "emxomfld: command line too long\n");
-                  exit (2);
-                }
-
-              /* Choose a unique file name and create the response
-                 file. */
-
-              strcpy (response_fname, "ldXXXXXX");
-              fd = mkstemp (response_fname);
-              if (fd < 0)
-                {
-                  perror ("emxomfld");
-                  exit (2);
-                }
-              close(fd);
-              response_file = fopen (response_fname, "wt");
-              if (response_file == NULL)
-                {
-                  perror ("emxomfld");
-                  exit (2);
-                }
-
-              /* Add the name of the response file to the command
-                 line. */
-
-              command_line[line_len++] = ' ';
-              command_line[line_len++] = '@';
-              strcpy (command_line+line_len, response_fname);
-
-              if (force_response_file)
-                force_response_file = FALSE;
-            }
+            open_response_file();
           else if (line_len != 0)
             {
@@ -1041 +1050 @@
   if (!stricmp(linker_type, "LINK386"))
       fFlags |= WLDC_LINKER_LINK386;
+
+
 
   for (pOpt = options; pOpt; pOpt = pOpt->next)
@@ -1245 +1256 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /* -t output. We dump the commandline and responsefile. */
 static void  show_spawn(const char *pszwhat)
@@ -1338 +1455 @@
       response_file = NULL;
     }
-  if (response_fname[0] != '\0')
-    {
-      remove (response_fname);
-      response_fname[0] = '\0';
-    }
-  if (weakobj_fname[0] != '\0')
-    {
-      remove (weakobj_fname);
-      weakobj_fname[0] = '\0';
-    }
-  if (weakdef_fname[0] != '\0')
-    {
-      remove (weakdef_fname);
-      weakdef_fname[0] = '\0';
-    }
-  for (; conv_list; conv_list = conv_list->next)
-      remove (conv_list->name);
+  if (opt_t <= 1)
+    {
+      if (response_fname[0] != '\0')
+        {
+          remove (response_fname);
+          response_fname[0] = '\0';
+        }
+      if (weakobj_fname[0] != '\0')
+        {
+          remove (weakobj_fname);
+          weakobj_fname[0] = '\0';
+        }
+      if (weakdef_fname[0] != '\0')
+        {
+          remove (weakdef_fname);
+          weakdef_fname[0] = '\0';
+        }
+      for (; conv_list; conv_list = conv_list->next)
+        remove (conv_list->name);
+    }
 }
 
@@ -1364 +1484 @@
          "Copyright (c) 1992-1996 by Eberhard Mattes\n"
          "Copyright (c) 2003 by InnoTek Systemberatung GmbH\n"
-         "Copyright (c) 2003-2004 by Knut St. Osmundsen\n"
+         "Copyright (c) 2003-200 by Knut St. Osmundsen\n"
          "\n", stderr);
   fputs ("Usage: emxomfld -o <file> [-l <lib>] [-L <libdir>] [-T <base>] [-igtsS]\n"
@@ -1389 +1509 @@
   fputs ("Environment variables:\n"
          "  EMXOMFLD_TYPE:\n"
-         "    The type of linker we're using. Values: VAC365, VAC308, LINK386.\n"
+         "    The type of linker we're using. Values: WLINK, VAC365, VAC308, LINK386.\n"
+         "        WLINK    wlink.exe from Open Watcom v1.5 or later.\n"
          "        VAC365   ilink.exe from IBM C and C++ Compilers for OS/2 v3.6 or later.\n"
          "        VAC308   ilink.exe from Visual Age for C++ v3.08.\n"
@@ -1448 +1569 @@
 int main (int argc, char *argv[])
 {
+
   int c, rc, files;
   const char *ext;
@@ -1545 +1667 @@
         case 't':
         case 'i':                 /* Trace the linking process, sending /INFO to the IBM/M$ linker. */
-          opt_t = TRUE;
+          opt_t;
           break;
 
@@ -1687 +1809 @@
   t = getenv ("EMXOMFLD_TYPE");
   if (    t
+
       &&  stricmp(t, "VAC365")
       &&  stricmp(t, "VAC308")
@@ -1739 +1862 @@
   arg_init (TRUE);
 
-  /*
-     For VAC365 and VAC308 the default options is:
-
-     /NOFR[EEFORMAT]    Use /NOFREEFORMAT to allow a LINK386-compatible
-                        command line syntax, in which different types of file
-                        are grouped and separated by commas.
-
-     /DBGPACK           If !strip_symbols then we'll add this option, which
-                        will cause type tables to be merged into one global
-                        table and so eliminating a lot of duplicate info.
-
-     For VAC365 additional default option is:
-
-     /STUB:<emxomfld-path>\os2stub.bin
-                        Causes this MZ stub to be used when linking the
-                        executables instead of the default on for the linker.
-
-     For LINK386 the default options is:
-
-     /BATCH             Run in batch mode (disable prompting, don't
-                        echo response file)
-
-     The default options for all linkers are:
-
-     /NOLOGO            Don't display sign-on banner
-
-     /NOEXTDICTIONARY   Don't use extended dictionary (redefining
-                        library symbols is quite common)
-
-     /NOIGNORECASE      Make symbols case-sensitive
-
-     /PACKCODE          Group neighboring code segments (this is the
-                        default unless the SEGMENTS module definition
-                        statement is used for a segment of class
-                        'CODE').  Not grouping neighboring code
-                        segments would break sets
-
-     For non DLLs targets:
-
-     /BASE:0x10000      Base the executable an so removing extra fixups.
-
-  */
-
   /* issue commandline */
   put_arg (linker_name, TRUE, FALSE);
 
-  /* the next part depends on the linker type. */
-  if (!stricmp (linker_type, "LINK386"))
-      put_arg ("/bat", FALSE, FALSE);
-  else /* vac3xx: */
-    {
-      put_arg ("/nofree", FALSE, FALSE);
+  if (stricmp (linker_type, "WLINK"))
+    {
+      /*
+         For VAC365 and VAC308 the default options are:
+
+         /NOFR[EEFORMAT]    Use /NOFREEFORMAT to allow a LINK386-compatible
+                            command line syntax, in which different types of file
+                            are grouped and separated by commas.
+
+         /DBGPACK           If !strip_symbols then we'll add this option, which
+                            will cause type tables to be merged into one global
+                            table and so eliminating a lot of duplicate info.
+
+         For VAC365 additional default option is:
+
+         /STUB:<emxomfld-path>\os2stub.bin
+                            Causes this MZ stub to be used when linking the
+                            executables instead of the default on for the linker.
+
+         For LINK386 the default options are:
+
+         /BATCH             Run in batch mode (disable prompting, don't
+                            echo response file)
+
+         The default options for all linkers are:
+
+         /NOLOGO            Don't display sign-on banner
+
+         /NOEXTDICTIONARY   Don't use extended dictionary (redefining
+                            library symbols is quite common)
+
+         /NOIGNORECASE      Make symbols case-sensitive
+
+         /PACKCODE          Group neighboring code segments (this is the
+                            default unless the SEGMENTS module definition
+                            statement is used for a segment of class
+                            'CODE').  Not grouping neighboring code
+                            segments would break sets
+
+         For non DLLs targets:
+
+         /BASE:0x10000      Base the executable an so removing extra fixups.
+
+      */
+
+      /* the next part depends on the linker type. */
+      if (!stricmp (linker_type, "LINK386"))
+          put_arg ("/bat", FALSE, FALSE);
+      else /* vac3xx: */
+        {
+          put_arg ("/nofree", FALSE, FALSE);
+          if (!strip_symbols)
+            put_arg ("/db", FALSE, FALSE);
+          if (map_flag)
+            put_arg ("/map", FALSE, FALSE);
+        }
+      put_arg ("/nol", FALSE, FALSE);
+      put_arg ("/noe", FALSE, FALSE);
+      put_arg ("/noi", FALSE, FALSE);
+      put_arg ("/packc", FALSE, FALSE);
+
+
+      /* VAC365: check if we have os2stub.bin.
+         We must to this after the above stuff else /nol might end up in the
+         response file and we'll get the component output. */
+
+      if (!stricmp (linker_type, "VAC365"))
+        {
+          /* gklayout show that the linker isn't capable of determining a
+             decent value for this parameter. 32MB makes gklayout link. */
+          put_arg ("/ocache:0x02000000", FALSE, FALSE);
+
+          _execname (&execname[0], sizeof(execname));
+          strcpy (_getname (&execname[0]), "os2stub.bin");
+          if (!stat (execname, &s))
+            {
+              sprintf (tmp, "/STUB:%s", &execname[0]);
+              put_arg (tmp, FALSE, FALSE);
+            }
+        }
+
+      /* Add the /INFORMATION option if the -i or -t option was given.  This is
+         for debugging. */
+
+      if (opt_t)
+        put_arg ("/i", FALSE, FALSE);
+
+      /* Add the /DEBUG option if the -s option was not given.  Without
+         this, the linker throws away debugging information. */
+
       if (!strip_symbols)
-        put_arg ("/db", FALSE, FALSE);
-      if (map_flag)
-        put_arg ("/map", FALSE, FALSE);
-    }
-  put_arg ("/nol", FALSE, FALSE);
-  put_arg ("/noe", FALSE, FALSE);
-  put_arg ("/noi", FALSE, FALSE);
-  put_arg ("/packc", FALSE, FALSE);
-
-
-  /* VAC365: check if we have os2stub.bin.
-     We must to this after the above stuff else /nol might end up in the
-     response file and we'll get the component output. */
-
-  if (!stricmp (linker_type, "VAC365"))
-    {
-      struct stat s;
-      /* gklayout show that the linker isn't capable of determining a
-         decent value for this parameter. 32MB make gklayout link. */
-      put_arg ("/ocache:0x02000000", FALSE, FALSE);
-
-      _execname(&execname[0], sizeof(execname));
-      strcpy(_getname(&execname[0]), "os2stub.bin");
-      if (!stat (execname, &s))
-        {
-          sprintf (tmp, "/STUB:%s", &execname[0]);
+        put_arg ("/de", FALSE, FALSE);
+
+      /* Add the /BASE:n option to set the base address.  This specifies
+         the preferred load address of object 1.  The base address being
+         used is 0x10000 unless a DLL is generated or the -T option was
+         given.  -Tno can be used to suppress the /BASE:n option. */
+
+      if (base == NULL && !dll_flag)
+        {
+          struct _md *md;
+
+          if (def_fname != NULL)
+            {
+              int token;
+              md = _md_open (def_fname);
+              if (md == NULL)
+                {
+                  fprintf (stderr, "emxomfld: cannot open `%s'\n", def_fname);
+                  exit (2);
+                }
+              token = _md_next_token (md);
+              if (token == _MD_LIBRARY || token == _MD_PHYSICAL || token == _MD_VIRTUAL)
+                dll_flag = TRUE;
+              _md_close (md);
+            }
+        }
+      if (base == NULL && !dll_flag)
+        base = "0x10000";
+      if (base != NULL && stricmp (base, "no") != 0)
+        {
+          sprintf (tmp, "/bas:%s", base);
           put_arg (tmp, FALSE, FALSE);
         }
-    }
-
-  /* Add the /INFORMATION option if the -i or -t option was given.  This is
-     for debugging. */
-
-  if (opt_t)
-    put_arg ("/i", FALSE, FALSE);
-
-  /* Add the /DEBUG option if the -s option was not given.  Without
-     this, the linker throws away debugging information. */
-
-  if (!strip_symbols)
-    put_arg ("/de", FALSE, FALSE);
-
-  /* Add the /BASE:n option to set the base address.  This specifies
-     the preferred load address of object 1.  The base address being
-     used is 0x10000 unless a DLL is generated or the -T option was
-     given.  -Tno can be used to suppress the /BASE:n option. */
-
-  if (base == NULL && !dll_flag)
-    {
-      struct _md *md;
-
-      if (def_fname != NULL)
+
+      /* Add the /STACK:n option if the -Zstack option was given. */
+
+      if (!dll_flag)
+        {
+          sprintf (tmp, "/st:0x%lx", stack_size * 1024);
+          put_arg (tmp, FALSE, FALSE);
+        }
+
+      /* Add the linker options specified with -O. */
+
+      put_args (options, FALSE);
+
+      /* Put the object file names onto the command line. */
+
+      force_response_file = TRUE;           /* link386 workaround. */
+      put_args (obj_fnames, TRUE);
+      put_arg (",", FALSE, FALSE);
+
+      /* Put the output file name onto the command line. */
+
+      put_arg (output_fname, TRUE, TRUE);
+      put_arg (",", FALSE, FALSE);
+
+      /* Put the map file name onto the command line. */
+
+      put_arg (map_fname, TRUE, TRUE);
+      put_arg (",", FALSE, FALSE);
+
+      /* Put the library file names onto the command line. */
+
+      put_args (lib_fnames, TRUE);
+      put_arg (",", FALSE, FALSE);
+
+      /* Put the name of the module definition file onto the command line. */
+
+      put_arg (def_fname, TRUE, TRUE);
+      put_arg (";", FALSE, FALSE);
+
+      /* Call Linker and abort on failure. */
+    }
+  else /* wlink */
+    {
+      open_response_file ();
+
+      /* figure out what format options we're gonna use */
+
+      if (!def_fname && !dll_flag)
+        fprintf (response_file, "FORMAT OS2 LX PMCompatible\n");
+      else if (!def_fname && dll_flag)
+        fprintf (response_file, "FORMAT OS2 LX DLL INITINSTANCE TERMINSTANCE\n");
+      else
         {
           int token;
-          md = _md_open (def_fname);
-          if (md == NULL)
+          d = _md_open (def_fname);
+          if ()
             {
               fprintf (stderr, "emxomfld: cannot open `%s'\n", def_fname);
               exit (2);
             }
-          token = _md_next_token (md);
+          token = _md_next_token (d);
           if (token == _MD_LIBRARY || token == _MD_PHYSICAL || token == _MD_VIRTUAL)
             dll_flag = TRUE;
-          _md_close (md);
-        }
-    }
-  if (base == NULL && !dll_flag)
-    base = "0x10000";
-  if (base != NULL && stricmp (base, "no") != 0)
-    {
-      sprintf (tmp, "/bas:%s", base);
-      put_arg (tmp, FALSE, FALSE);
-    }
-
-  /* Add the /STACK:n option if the -Zstack option was given. */
-
-  if (!dll_flag)
-    {
-      sprintf (tmp, "/st:0x%lx", stack_size * 1024);
-      put_arg (tmp, FALSE, FALSE);
-    }
-
-  /* Add the linker options specified with -O. */
-
-  put_args (options, FALSE);
-
-  /* Put the object file names onto the command line. */
-
-  force_response_file = TRUE;           /* link386 workaround. */
-  put_args (obj_fnames, TRUE);
-  put_arg (",", FALSE, FALSE);
-
-  /* Put the output file name onto the command line. */
-
-  put_arg (output_fname, TRUE, TRUE);
-  put_arg (",", FALSE, FALSE);
-
-  /* Put the map file name onto the command line. */
-
-  put_arg (map_fname, TRUE, TRUE);
-  put_arg (",", FALSE, FALSE);
-
-  /* Put the library file names onto the command line. */
-
-  put_args (lib_fnames, TRUE);
-  put_arg (",", FALSE, FALSE);
-
-  /* Put the name of the module definition file onto the command line. */
-
-  put_arg (def_fname, TRUE, TRUE);
-  put_arg (";", FALSE, FALSE);
+          if (dll_flag)
+            {
+              int fInitInstance = 1;
+              int fTermInstance = 1;
+              for (;;)
+                {
+                  switch (_md_next_token (pMd))
+                    {
+                      case _MD_INITINSTANCE:  fInitInstance = 1; continue;
+                      case _MD_INITGLOBAL:    fInitInstance = 0; continue;
+                      case _MD_TERMINSTANCE:  fTermInstance = 1; continue;
+                      case _MD_TERMGLOBAL:    fTermInstance = 0; continue;
+                      default: break;
+                    }
+                  break;
+                }
+              fprintf (response_file, "FORMAT OS2 LX DLL %s %s\n",
+                       fInitInstance ? "INITINSTANCE" : "INITGLOBAL",
+                       fTermInstance ? "TERMINSTANCE" : "TERMGLOBAL");
+            }
+          else
+            switch (_md_next_token (pMd))
+              {
+                case _MD_WINDOWAPI:
+                  fprintf (response_file, "FORMAT OS2 LX PM\n");
+                  break;
+                default:
+                case _MD_WINDOWCOMPAT:
+                  fprintf (response_file, "FORMAT OS2 LX PMCompatible\n");
+                  break;
+                case _MD_NOTWINDOWCOMPAT:
+                  fprintf (response_file, "FORMAT OS2 LX FullScreen\n");
+                  break;
+              }
+          _md_close (pMd);
+        }
+
+      /* output files */
+
+      fprintf (response_file, "NAME '%s'\n", output_fname);
+
+      if (map_flag && map_fname)
+        fprintf (response_file, "OPTION MAP='%s'\n", map_fname);
+      else if (map_flag)
+        fprintf (response_file, "OPTION MAP\n");
+
+      /* standard stuff */
+
+      if (!strip_symbols)
+        fprintf (response_file, "DEBUG HLL\n");
+      fprintf (response_file, "OPTION QUIET\n");
+      fprintf (response_file, "OPTION OSNAME='OS/2 EMX'\n");
+      fprintf (response_file, "OPTION CASEEXACT\n");
+      if (!dll_flag)
+        fprintf (response_file, "OPTION STACK=%#lx\n", stack_size * 1024);
+      if (!dll_flag && !base)
+        base = "0x10000";
+      if (base)
+        fprintf (response_file, "OPTION OFFSET=%s\n", base);
+
+      /* the stub */
+
+      _execname(&execname[0], sizeof(execname));
+      strcpy (_getname (&execname[0]), "os2stub.bin");
+      if (!stat (execname, &s))
+        fprintf (response_file, "OPTION STUB='%s'\n", execname);
+
+      /* Add the /INFORMATION option if the -i or -t option was given.  This is
+         for debugging. */
+
+//      if (opt_t)
+//        put_arg ("/i", FALSE, FALSE);
+
+      /* Add the linker options specified with -O. */
+
+      for (pcur = options; pcur; pcur = pcur->next)
+        fprintf (response_file, "%s\n", pcur->name);
+
+      /* Put the object file names onto the command line. */
+
+      for (pcur = obj_fnames; pcur; pcur = pcur->next)
+        fprintf (response_file, "FILE '%s'\n", pcur->name);
+
+      /* Put the library file names onto the command line. */
+
+      for (pcur = lib_fnames; pcur; pcur = pcur->next)
+        fprintf (response_file, "LIBRARY '%s'\n", pcur->name);
+
+      /* Translate the essentials of the module definition file into wlink lingo. */
+      if (def_fname)
+        {
+          struct _md *pMd = _md_open (def_fname);
+          if (!pMd)
+            {
+              fprintf (stderr, "emxomfld: cannot open `%s'\n", def_fname);
+              exit (2);
+            }
+          _md_next_token (pMd);
+          _md_parse (pMd, def_2_watcom, NULL);
+          _md_close (pMd);
+        }
+    }
+
+  /* End the arguments and run the linker. */
+
   arg_end ();
-
-  /* Call Linker and abort on failure. */
 
   rc = emxomfld_spawn (command_line, "Linker");

branches/libc-0.6/src/emx/src/emxomf/weakld.c

@@ -1998 +1998 @@
             {
                 pSym->fFlags |= WLDSF_ALIAS;
+
                 pSym->pAliasFor = pSymAlias;
             }
@@ -3498 +3499 @@
             {
                 cch = sprintf(szTmp, "  \"%s\" = \"%s\"", pStmt->export.entryname, pSymExp->pszWeakName);
-                pSymExp->fFlags |= WLDSF_WEAKALIASDONE;
+                if (!(pParam->pWld->fFlags & WLDC_LINKER_WLINK))
+                    pSymExp->fFlags |= WLDSF_WEAKALIASDONE;
             }
             if (pStmt->export.flags & _MDEP_ORDINAL)
@@ -3688 +3690 @@
                         /* now see if there are any aliases in __declspec(dllexport) statements. */
                         if (!rc)
-                            rc = symEnum(pWld, &pWld->Global,
-                                         WLDSF_EXPORT | WLDSF_WEAK, WLDSF_EXPORT | WLDSF_WEAK | WLDSF_EXPORT_DEF | WLDSF_WEAKALIASDONE,
-                                         wldGenerateDefExportEnum, &param);
+                        {
+                            if (0)//pWld->fFlags & WLDC_LINKER_WLINK)
+                                rc = symEnum(pWld, &pWld->Global,
+                                             WLDSF_EXPORT | WLDSF_EXPORT_DEF | WLDSF_WEAK, WLDSF_EXPORT | WLDSF_EXPORT_DEF | WLDSF_WEAK | WLDSF_WEAKALIASDONE,
+                                             wldGenerateDefExportEnum, &param);
+                            else
+                                rc = symEnum(pWld, &pWld->Global,
+                                             WLDSF_EXPORT | WLDSF_WEAK, WLDSF_EXPORT | WLDSF_WEAK | WLDSF_EXPORT_DEF | WLDSF_WEAKALIASDONE,
+                                             wldGenerateDefExportEnum, &param);
+                        }
 
                         /* copy the rest of the file if any changes was made. */

branches/libc-0.6/src/emx/src/emxomf/weakld.h

@@ -44 +44 @@
     WLDC_CASE_INSENSITIVE = 4,
     /** The linker is link386. */
-    WLDC_LINKER_LINK386 = 0x1000
+    WLDC_LINKER_LINK386 = 0x1000,
+    /** The linker is wlink. */
+    WLDC_LINKER_WLINK = 0x2000
 };
 

branches/libc-0.6/src/emx/src/ld/ld.smak

@@ -27 +27 @@
 # link386 -> ilink
 #.TLDF  := -nostdlib -los2 -s -Zlinker /align:1 -Zlinker /nosectoraligncode
-.TLDF   := -nostdlib -los2 -s -Zlinker /align:1 -lend
+ifeq ($(EMXOMFLD_TYPE),wlink)
+.TLDF   := -nostdlib -los2 -lend -s -Zlinker "OPTION ALIGN=4096"
+else # ilink:
+.TLDF   := -nostdlib -los2 -lend -s -Zlinker /align:1
+endif
 .TKEEP  := 1
 include mkexe.smak

branches/libc-0.6/src/emx/src/lib/fwdstub.asm

@@ -3 +3 @@
 WEAK$ZERO = 0
 
+
+
+
+
 end

branches/libc-0.6/src/emx/src/lib/libc.smak

@@ -82 +82 @@
 .TKIND          := omf
 LIBC.STUB               := $(wildcard $.omf/os2stub.bin)
+
+
+
 LIBC.STUBARG    := $(if $(LIBC.STUB),-Zlinker -STUB:$(LIBC.STUB))
+
 LIBC.DLL        := $.omf/libc$(VH)$(VM)$(VL).dll
 LIBC.IMPLIB     := $.omf/libc_dll.lib $.aout/libc_dll.a