Changeset 2692 for trunk/emx/src/emxomf/weakld.c

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.

File:

• trunk/emx/src/emxomf/weakld.c (modified) (3 diffs)

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. */