Changeset 556

Timestamp:

Aug 8, 2003, 5:15:43 PM (22 years ago)

Author:

bird

Message:

PUBLIC symbols overrides COMM symbols.

File:

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

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

@@ -1494 +1494 @@
  *      4. adding a UNDEF where a WKEXT exists.
  *      5. adding a IMPORT where a WEAK exists.
+ *      6. adding a PUBLIC where a COMM exists.
  *
  * We'll warn and upgraded existing symbol when:
@@ -1621 +1622 @@
          *      4. adding a UNDEF where a WKEXT exists.
          *      5. adding a IMPORT where a WEAK exists.
+         *      6. adding a PUBLIC where a COMM exists.
          */
         else
@@ -1638 +1640 @@
                 (fFlags & WLDSF_TYPEMASK) == WLDSF_IMPORT
             &&  (pSym->fFlags & WLDSF_WEAK) == WLDSF_WEAK
+            ) || ( /* 6 */
+                (fFlags & WLDSF_TYPEMASK) == WLDSF_PUBLIC
+            &&  (pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_COMM
             ))
         {
@@ -1644 +1649 @@
                 pSym->pszWeakName = strpool_addn(pWld->pStrMisc, pachName, cchNameWeak);
             }
+            if ((fFlags & WLDSF_TYPEMASK) == WLDSF_PUBLIC && (pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_COMM)
+                memset(&pSym->u, 0, sizeof(pSym->u));
             pSym->fFlags = (pSym->fFlags & ~(WLDSF_TYPEMASK | WLDSF_WEAK | WLDSF_UNCERTAIN | WLDSF_LIBSEARCH)) | fFlags;
             if (peAction) *peAction = WLDSA_UP;
@@ -3567 +3574 @@
                          * pass2 an EXTDEF array may become too short.
                          */
-                        if (pWld->cMaxObjExts < pWld->cMaxLibExts && !(pWld->fFlags & WLDC_LINKER_LINK386))
+                        WLDINFO(pWld, ("cWeakAliases=%d cMaxObjExts=%d cMaxLibExts=%d", 
+                                       param.cAliases + (param.iLibFile - 1) * 32, pWld->cMaxObjExts, pWld->cMaxLibExts));
+                        if (pWld->cMaxObjExts < pWld->cMaxLibExts + 32 && !(pWld->fFlags & WLDC_LINKER_LINK386))
                         {
                             int i;
@@ -3587 +3596 @@
                             }
                             omf.ach[omf.hdr.cb++] = 0;                              /* crc */
-                            for (i = pWld->cMaxLibExts + 3; i > 0; i -= 10)
+                            for (i = pWld->cMaxLibExts + 32; i > 0; i -= 10)
                                 if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, phFile) != 1)
                                 {