Changeset 516

Timestamp:

Aug 4, 2003, 1:05:40 AM (22 years ago)

Author:

bird

Message:

Bugfixing.

Location:

trunk/src/emx/src/emxomf

Files:

• emxomfld.c (modified) (1 diff, 1 prop)
• weakld.c (modified) (11 diffs, 1 prop)
• weakld.h (modified) (1 diff, 1 prop)

trunk/src/emx/src/emxomf/emxomfld.c

@@ -599 +599 @@
 static void weak_prelink ()
 {
-  int     rc = 0;
-  PWLD    pwld;
-
-  pwld = wldCreate (WLDC_VERBOSE);
+  int           rc = 0;
+  name_list *   pOpt;
+  PWLD          pwld;
+  unsigned      fFlags = 0;
+
+  /* look for ilinker options. */
+  for (pOpt = options; pOpt; pOpt = pOpt->next)
+    if (    !strnicmp(pOpt->name, "/NOE", 4)
+        ||  !strnicmp(pOpt->name, "-NOE", 4))
+        fFlags |= WLDC_NO_EXTENDED_DICTIONARY_SEARCH;
+    else
+    if (    !strnicmp(pOpt->name, "/INC", 4)
+        ||  !strnicmp(pOpt->name, "-INC", 4))
+        fFlags = fFlags;                /* Ignore for now. */
+    else
+    if (    !strnicmp(pOpt->name, "/IG", 3)
+        ||  !strnicmp(pOpt->name, "-IG", 3))
+        fFlags |= WLDC_CASE_INSENSITIVE;
+    else
+    if (    !strnicmp(pOpt->name, "/I", 2)
+        ||  !strnicmp(pOpt->name, "-I", 2))
+        fFlags |= WLDC_VERBOSE;
+    else
+    if (    !strnicmp(pOpt->name, "/NOIN", 5)
+        ||  !strnicmp(pOpt->name, "-NOIN", 5))
+        fFlags &= ~WLDC_VERBOSE;
+    else
+    if (    !strnicmp(pOpt->name, "/NOI", 4)
+        ||  !strnicmp(pOpt->name, "/NOI", 4))
+        fFlags &= ~WLDC_CASE_INSENSITIVE;
+
+  /* create the linker and to the linking. */
+  pwld = wldCreate (fFlags);
   if (pwld)
     {

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

@@ -54 +54 @@
 #define WLDINTERR(pWld, pMod)   wldIntErr(pWld, pMod, __FILE__, __LINE__, __FUNCTION__);
 
-#ifdef DEBUG
+#if 0 /*def DEBUG*/
 #define SYMDBG(pSym, pszMsg)    symDbg(pSym, pszMsg);
 #define WLDDBG(a)               wldDbg a
@@ -732 +732 @@
             {
                 case COMENT: case COMENT | REC32:
-                    switch (*++u.pch)
+                    uch = OMF_BYTE(); /* comment type */
+                    uch = OMF_BYTE(); /* comment class */
+                    switch (uch)
                     {
                         case CLASS_PASS:
@@ -1309 +1311 @@
  *
  * We'll return upgraded existing symbol when:
- *      1. adding a PUBLIC or COMM where a UNDEF or WKEXT exists.
+ *      1. adding a PUBLIC, COMM or IMPORT where a UNDEF or WKEXT exists.
  *      2. adding a !WEAK PUBLIC or !WEAK COMM where a WEAK PUBLIC or WEAK COMM exists.
  *      3. adding a !WEAK UNDEF where a WEAK UNDEF exists.
@@ -1372 +1374 @@
     /* search for existing symbol  */
     pSym = pWld->Global.ap[uHash];
-    while (pSym && pSym->pszName == pszName)
+    while (pSym && pSym->pszName != pszName)
         pSym = pSym->pHashNext;
 
@@ -1444 +1446 @@
         /*
          * We'll return upgraded existing symbol when:
-         *      1. adding a PUBLIC or COMM where a UNDEF or WKEXT exists.
+         *      1. adding a PUBLIC, COMM or IMPORT where a UNDEF or WKEXT exists.
          *      2. adding a !WEAK PUBLIC or !WEAK COMM where a WEAK PUBLIC or WEAK COMM exists.
          *      3. adding a !WEAK UNDEF where a WEAK UNDEF exists.
@@ -1451 +1453 @@
         else
         if ( (     /* 1 */
-                ((fFlags & WLDSF_TYPEMASK) == WLDSF_PUBLIC || (fFlags & WLDSF_TYPEMASK) == WLDSF_COMM)
+                ((fFlags & WLDSF_TYPEMASK) == WLDSF_PUBLIC || (fFlags & WLDSF_TYPEMASK) == WLDSF_COMM || (fFlags & WLDSF_TYPEMASK) == WLDSF_IMPORT)
             &&  ((pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_WKEXT || (pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_UNDEF)
             ) || ( /* 2 */
@@ -1545 +1547 @@
     {
         case WLDSA_NEW:
+        case WLDSA_UP:
             pSym->u.import.pszImpMod = pszImpMod;
             pSym->u.import.uImpOrd   = uOrdinal;
@@ -1582 +1585 @@
         }
 
-        case WLDSA_UP:
         default:
             WLDINTERR(pWld, pMod);
@@ -1718 +1720 @@
     PWLDSYM         pSym;
 
-    pSym = symAdd(pWld, pMod, WLDSF_UNDEF | (fLibSearch ? WLDSF_LIBSEARCH : 0),
+    pSym = symAdd(pWld, pMod, WLDSF_UNDEF | WLDSF_UNCERTAIN | (fLibSearch ? WLDSF_LIBSEARCH : 0),
                   pachName, cchName, NULL);
     if (!pSym)
@@ -1978 +1980 @@
 
             case COMENT: case COMENT | REC32:
-                switch (*++u.pch)
+                uch = OMF_BYTE(); /* comment type */
+                uch = OMF_BYTE(); /* comment class */
+                switch (uch)
                 {
                     case CLASS_PASS:
@@ -2213 +2217 @@
  * @param   fFlags  Linker flags as defined by enum wld_create_flags.
  */
-PWLD    wldCreate(int fFlags)
+PWLD    wldCreate(unsigned fFlags)
 {
     PWLD    pWld = xmalloc(sizeof(*pWld));

trunk/src/emx/src/emxomf/weakld.h

@@ -51 +51 @@
 /** @group Weak LD - Public methods.
  * @{ */
-PWLD    wldCreate(int fFlags);
+PWLD    wldCreate(unsigned fFlags);
 int     wldAddObject(PWLD pWld, FILE *phFile, const char *pszName);
 int     wldAddDefFile(PWLD pWld, FILE *phFile, const char *pszName);
 int     wldAddLibrary(PWLD pWld, FILE *phFile, const char *pszName);
 int     wldPass1(PWLD pWld);
-int     wldGenerate_weakobj(PWLD pwld, char *pszName);
+int     wldGenerateWeakobj(PWLD pwld, char *pszName);
 int     wldDestroy(PWLD pWld);
 /** @} */