Changeset 544

Timestamp:

Aug 7, 2003, 9:46:41 PM (22 years ago)

Author:

bird

Message:

Temporary commit.

File:

• trunk/src/emx/src/emxomf/weakld.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/emxomf/weakld.c

@@ -353 +353 @@
     /** string pool for miscellaneous string. */
     struct strpool *    pStrMisc;
+
+    /** @group ILINK Crash Workaround
+     * @{ */
+    /** Maximum number of externals in a object module. */
+    unsigned            cMaxObjExts;
+
+    /** Maximum number of externals in a library module. */
+    unsigned            cMaxLibExts;
+    /** @} */
 };
 typedef struct wld WLD;
@@ -2411 +2420 @@
             papExts[i]->fFlags &= ~WLDSF_UNCERTAIN;
 
+    /* Max extdefs values. */
+    if (fLibSearch)
+    {
+        if (pWld->cMaxLibExts < cExts)
+            pWld->cMaxLibExts = cExts;
+    }
+    else
+    {
+        if (pWld->cMaxObjExts < cExts)
+            pWld->cMaxObjExts = cExts;
+    }
+
     return 0;
 
@@ -3540 +3561 @@
                     if (!rc)
                     {
+                        /* Check if we need to fake a lot's of externals for working around an ILINK bug. */
+                        if (pWld->cMaxObjExts < pWld->cMaxLibExts && !(pWld->fFlags & WLDC_LINKER_LINK386))
+                        {
+                            int i;
+                            if (!param.cAliases)
+                            {
+                                rc = wldObjStart(pWld, phFile, "extdefshack.obj");
+                                param.cAliases++;
+                            }
+
+                            /* issue a shitload of extdefs. */
+                            omf.hdr.chType = EXTDEF;
+                            omf.ach[0] = strlen("WEAK$ZERO");
+                            memcmp(&omf.ach[1], "WEAK$ZERO", omf.ach[0]);
+                            omf.ach[omf.ach[0] + 2] = 0;
+                            omf.hdr.cb = omf.ach[0] + 3;
+                            for (i = 0; i < pWld->cMaxLibExts; i++)
+                            {
+                            }
+                        }
+
                         if (ftell(phFile) != offAlias)
                         {
                             /* end the last object? */
-                            if ((pWld->fFlags & WLDC_LINKER_LINK386) && param.cAliases > 1)
+                            if (pWld->fFlags & WLDC_LINKER_LINK386)
                             {
-                                rc = wldObjEnd(pWld, phFile, 32);
+                                if (param.cAliases)
+                                    rc = wldObjEnd(pWld, phFile, 32);
                                 if (!rc)
                                 {
@@ -3559 +3602 @@
                                 }
                             }
-                            else
+                            else if (param.cAliases)
                                 rc = wldObjEnd(pWld, phFile, 1);
                         }