Changeset 2692

Timestamp:

Apr 11, 2006, 12:50:06 AM (19 years ago)

Author:

bird

Message:

#89: more wlink stuff. ; Fixed the exp=int .def errors in weakld.

Location:

trunk/emx

Files:

• ChangeLog.emx (modified) (1 diff)
• src/emxomf/emxomfld.c (modified) (6 diffs)
• src/emxomf/weakld.c (modified) (3 diffs)
• src/emxomf/weakld.h (modified) (1 diff)

trunk/emx/ChangeLog.emx

@@ -1 +1 @@
 /* $Id$ */
+
+2006-04-10: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - emxomfld, weakld:
+        o #89: more wlink stuff.
+        o Fixed the exp=int .def errors in weakld.
 
 2006-04-01: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/emx/src/emxomf/emxomfld.c

@@ -1050 +1050 @@
   if (!stricmp(linker_type, "LINK386"))
       fFlags |= WLDC_LINKER_LINK386;
+  else if (!stricmp(linker_type, "WLINK"))
+      fFlags |= WLDC_LINKER_WLINK;
 
   for (pOpt = options; pOpt; pOpt = pOpt->next)
@@ -1443 +1445 @@
       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);
+    }
 }
 
@@ -1469 +1474 @@
          "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-2006 by Knut St. Osmundsen\n"
          "\n", stderr);
   fputs ("Usage: emxomfld -o <file> [-l <lib>] [-L <libdir>] [-T <base>] [-igtsS]\n"
@@ -1652 +1657 @@
         case 't':
         case 'i':                 /* Trace the linking process, sending /INFO to the IBM/M$ linker. */
-          opt_t = TRUE;
+          opt_t++;
           break;
 
@@ -2085 +2090 @@
       /* standard stuff */
 
-      //if (!strip_symbols)
-      //  put_arg ("debug hll", FALSE, FALSE);
+      if (!strip_symbols)
+        fprintf (response_file, "DEBUG HLL\n");
       fprintf (response_file, "OPTION QUIET\n");
       fprintf (response_file, "OPTION OSNAME='OS/2 EMX'\n");
@@ -2112 +2117 @@
       /* Add the linker options specified with -O. */
 
-      put_args (options, FALSE);
+      for (pcur = options; pcur; pcur = pcur->next)
+        fprintf (response_file, "%s\n", pcur->name);
 
       /* Put the object file names onto the command line. */

trunk/emx/src/emxomf/weakld.c

@@ -1998 +1998 @@
             {
                 pSym->fFlags |= WLDSF_ALIAS;
+                pSym->fFlags &= ~WLDSF_UNDEF;
                 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. */

trunk/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
 };