Changeset 2673

Timestamp:

Mar 19, 2006, 6:21:22 AM (19 years ago)

Author:

bird

Message:

• *:

o Synced over changed from 0.6.1 bugfixing.

• emxbind:

o #38: Fixed truncation bug writing to the LX nametable. (Yuri)
o #38: Imports and exports are limited to 255 not 127 chars. (Yuri)
o #28: Use DLL name from the .def file when present.

• emxomf:

o #70: Demangle symbol names in debug info. (thanks to Yuri)

• emxomfld:

o #55: delete the response file when reinit the args.
o #46: specify .map file extension to the linker.
o #34: Removed all the silliness trying to deal with truncated symbols.
o Don't display usage() on failure, just the error message.
o #20: use mkstemp + close instead of mktemp for the response file.

• ld:

o #20: use make_temp_file instead of mktemp. This involved including

libiberty.h which required some adjustments of duplicate code to work.

o #27: Applied fix from Yuri.

• libmoddef:

o Allow '.' and '@' in LIBRARY/NAME names.

Location:

trunk/emx

Files:

• ChangeLog.emx (modified) (1 diff)
• src/emxbind/emxbind.c (modified) (1 diff)
• src/emxbind/emxbind.h (modified) (1 diff)
• src/emxbind/export.c (modified) (1 diff)
• src/emxbind/fixup.c (modified) (1 diff)
• src/emxbind/utils.c (modified) (1 diff)
• src/emxomf/emxomf.smak (modified) (1 diff)
• src/emxomf/emxomfld.c (modified) (10 diffs)
• src/emxomf/stabshll.c (modified) (10 diffs)
• src/emxomf/weakld.c (modified) (12 diffs)
• src/ld/ld.c (modified) (21 diffs)
• src/libmoddef/moddef1.c (modified) (3 diffs)
• src/misc/MakeOmfLibs.cmd (modified) (1 diff)

trunk/emx/ChangeLog.emx

@@ -1 +1 @@
 /* $Id$ */
 
-TODO: open replace on RAMFS fails with error 32!
+2006-03-19: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - *:
+        o Synced over changed from 0.6.1 bugfixing.
+    - emxbind:
+        o #38: Fixed truncation bug writing to the LX nametable. (Yuri)
+        o #38: Imports and exports are limited to 255 not 127 chars. (Yuri)
+        o #28: Use DLL name from the .def file when present.
+    - emxomf:
+        o #70: Demangle symbol names in debug info. (thanks to Yuri)
+    - emxomfld:
+        o #55: delete the response file when reinit the args.
+        o #46: specify .map file extension to the linker.
+        o #34: Removed all the silliness trying to deal with truncated symbols.
+        o Don't display usage() on failure, just the error message.
+        o #20: use mkstemp + close instead of mktemp for the response file.
+    - ld:
+        o #20: use make_temp_file instead of mktemp. This involved including
+          libiberty.h which required some adjustments of duplicate code to work.
+        o #27: Applied fix from Yuri.
+    - libmoddef:
+        o Allow '.' and '@' in LIBRARY/NAME names.
 
 2004-11-14: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/emx/src/emxbind/emxbind.c

@@ -160 +160 @@
     case _MD_LIBRARY:
 
-      /* Create a DLL.  Save the initialization and termination
-         policies after choosing default values for unspecified
-         values. */
+      /* Create a DLL. Override the module name if specified. Save the
+         initialization and termination policies after choosing default
+         values for unspecified values. */
 
       dll_flag = TRUE;
+
+      if (stmt->library.name[0] != 0)
+        module_name = xstrdup (stmt->library.name);
+
       switch (stmt->library.init)
         {

trunk/emx/src/emxbind/emxbind.h

@@ -519 +519 @@
 
 void error (const char *fmt, ...) NORETURN2;
+void warning (const char *fmt, ...);
 void my_read (void *dst, size_t size, struct file *f);
 void my_read_str (byte *dst, size_t size, struct file *f);

trunk/emx/src/emxbind/export.c

@@ -76 +76 @@
 
   name_len = strlen (name);
-  if (name_len >= 128)
-    name_len = 127;
+  if (name_len > 255)
+    {
+      warning("truncating export '%s' to 255 chars (ord %d)!", name, ord);
+      blen = 255;
+    }
   else
     blen = (byte)name_len;

trunk/emx/src/emxbind/fixup.c

@@ -285 +285 @@
 
   name_len = strlen (name);
-  if (name_len >= 128)
-    name_len = 127;
   i = 0;
   while (i < procs.len)

trunk/emx/src/emxbind/utils.c

@@ -49 +49 @@
   exit (2);
 }
+
+
+/* Print an warning message. This function is called like  printf().
+   The message will be prefixed with  "emxbind: warning: " and a
+   newline will be added at the end. */
+
+void warning (const char *fmt, ...)
+{
+  va_list arg_ptr;
+
+  va_start (arg_ptr, fmt);
+  fprintf (stderr, "emxbind: warning: ");
+  vfprintf (stderr, fmt, arg_ptr);
+  fputc ('\n', stderr);
+}
+
 
 /* Print an out of memory message and abort. */

trunk/emx/src/emxomf/emxomf.smak

@@ -9 +9 @@
 .TCF    := $(CFLAGS.DEF.VERSION)
 .TDEP   := @O@libomflib$A
+.TLDF   := -liberty
 include mkexe.smak
 

trunk/emx/src/emxomf/emxomfld.c

@@ -349 +349 @@
           if (response_file == NULL)
             {
+              int fd;
 
               /* Complain if we are not allowed to use a response
@@ -363 +364 @@
 
               strcpy (response_fname, "ldXXXXXX");
-              if (mktemp (response_fname) == NULL)
+              fd = mkstemp (response_fname);
+              if (fd < 0)
                 {
                   perror ("emxomfld");
                   exit (2);
                 }
+              close(fd);
               response_file = fopen (response_fname, "wt");
               if (response_file == NULL)
@@ -1161 +1164 @@
 static void arg_init (int rsp)
 {
-  response_fname[0] = '\0';
+  if (response_fname[0] != '\0')
+    {
+      remove (response_fname);
+      response_fname[0] = '\0';
+    }
   command_line[0] = '\0';
   line_len = 0;
@@ -1496 +1503 @@
                   fprintf (stderr,
                            "emxomfld: multiple module definition files\n");
-                  usage ();
+                  return 1;
                 }
               def_fname = _realrealpath(optarg, NULL, 0);
@@ -1512 +1519 @@
                   fprintf (stderr,
                            "emxomfld: multiple binary resource files\n");
-                  usage ();
+                  return 1;
                 }
               res_fname = _realrealpath(optarg, NULL, 0);
@@ -1585 +1592 @@
                 {
                   fprintf (stderr, "emxomfld: multiple map files files\n");
-                  usage ();
+                  return 1;
                 }
             map_fname = optarg;
@@ -1593 +1600 @@
         case OPT_ZSTACK:
           if (!optarg)
-            usage ();
+            return 1;
           errno = 0;
           stack_size = strtol (optarg, &t, 0);
           if (errno != 0 || *t != 0 || t == optarg)
-            usage ();
+            return 1;
           break;
 
@@ -1622 +1629 @@
           if (optind > 1)
             fprintf (stderr, "emxomfld: invalid option (%s)\n", argv[optind - 1]);
-          usage ();
+          else
+            usage ();
+          return 1;
         }
     }
@@ -1639 +1648 @@
     {
       fprintf (stderr, "emxomfld: no input files\n");
-      usage ();
+      return 1;
     }
 
@@ -1656 +1665 @@
   else if (map_fname == NULL)
     {
-      t = xstrdup (output_fname);
+      int cch = strlen (output_fname) + 1;
+      t = xmalloc (cch + 4);
+      memcpy (t, output_fname, cch);
       _remext (t);
+      strcat (t, ".map");
       map_fname = t;
     }

trunk/emx/src/emxomf/stabshll.c

@@ -20 +20 @@
 Boston, MA 02111-1307, USA.  */
 //#define HLL_DEBUG 1
+
+#define DEMANGLE_PROC_NAMES 1
 
 /*******************************************************************************
@@ -31 +33 @@
 #include <alloca.h>
 #include <ctype.h>
+#ifdef DEMANGLE_PROC_NAMES
+# include <demangle.h>
+#endif
 #include "defs.h"
 #include "emxomf.h"
@@ -2225 +2230 @@
                   if (!parse_mangled_args ())
                     goto syntax;
-                  tf->mnglname = strpool_addn(str_pool, pszMangled, parse_ptr - pszMangled - 1); /* ASSUMES not extra spaces! */
+                  tf->mnglname = strpool_addn(str_pool, pszMangled, parse_ptr - pszMangled - 1); /* ASSUMES no extra spaces! */
                   tf->flags = parse_visibility () | MEMBER_FUNCTION;
                   switch (*parse_ptr)
@@ -3315 +3320 @@
   struct relocation_info r;
   const char *str, *p, *p2;
-  const char *name;
-  int n,                                /* size of name. */
-      ti,
-      ticlass;
+  const char *name, *mnglname;
+#ifdef DEMANGLE_PROC_NAMES
+  char *pszFree;
+#endif
+  size_t cchName, cchMnglName;
+  int ti, ticlass;
 
   str = str_ptr + symbol->n_un.n_strx;
@@ -3324 +3331 @@
   if (p == NULL)
     abort ();
-  n = p - str;
-
-  /** @todo name demangling */
-  name = strpool_addn (str_pool, str, n);
+  cchName = cchMnglName = p - str;
+  name = mnglname = strpool_addn (str_pool, str, cchMnglName);
   proc_start_addr = symbol->n_value;
+
+#ifdef DEMANGLE_PROC_NAMES
+  /* demangle the name */
+  pszFree = cplus_demangle (mnglname, DMGL_ANSI | DMGL_PARAMS);
+  if (!pszFree && (*mnglname == '_' || *mnglname == '*'))
+    pszFree = cplus_demangle (mnglname + 1, DMGL_ANSI | DMGL_PARAMS);
+  if (pszFree)
+    {
+      cchName = strlen (pszFree);
+      name = pszFree;
+    }
+  else if (*mnglname == '*')
+    {
+      cchName--;
+      name++;
+    }
+#endif
 
   /* now let's see if there is a memfunc for this name. */
   for (t1 = type_head; t1; t1 = t1->next)
     if (    t1->tag == ty_memfunc
-        &&  t1->d.memfunc.mnglname == name)
+        &&  t1->d.memfunc.mnglname == mnglname)
       break;
 
@@ -3358 +3380 @@
                        */
                       /** @todo: the string parsing still is a bit spooky. */
-                      for (p2 = p; (p2 = strstr (p2, name)) != NULL; p2 += n)
-                        if (p2[-1] == ':' && p2[n] == ';')
+                      for (p2 = p; (p2 = strstr (p2, mnglname)) != NULL; p2 += cchMnglName)
+                        if (p2[-1] == ':' && p2[cchMnglName] == ';')
                         {
                             int stab = atoi (&p[3]);
@@ -3373 +3395 @@
           if (ticlass < 0)
             {
-              warning (" Can't figure out which class method '%s' is a member of!", name);
+              warning (" Can't figure out which class method '%s' is a member of!", mnglname);
               ticlass = 0;
             }
@@ -3411 +3433 @@
       make_type (t2, &ti);
 
-      sst_start (cplusplus_flag || n > 255 ? SST_CPPproc : SST_proc);
+      sst_start (cplusplus_flag || cchName > 255 ? SST_CPPproc : SST_proc);
       r.r_address = sst.size;
       buffer_dword (&sst, symbol->n_value); /* Segment offset */
@@ -3421 +3443 @@
       buffer_word (&sst, 0);        /* Class type (for member functions) */
       buffer_byte (&sst, 8);        /* 32-bit near */
-      if (cplusplus_flag || n > 255)
+      if (cplusplus_flag || cchName > 255)
         buffer_enc (&sst, name);    /* Proc name */
       else
@@ -3434 +3456 @@
   buffer_mem (&sst_reloc, &r, sizeof (r));
   set_hll_type (symbol - sym_ptr, ti);
+
+#ifdef DEMANGLE_PROC_NAMES
+  /* free the demangled name. */
+  free (pszFree);
+#endif
 }
 

trunk/emx/src/emxomf/weakld.c

@@ -73 +73 @@
 
 /** Compares a existing symbol with a new symbol. */
-#define SYM_EQUAL(pWld, pSym, _pszName, _fFlags, _uHash, _cchName) \
+#define SYM_EQUAL(pWld, pSym, _pszName, _fFlags, _uHash, _cchName)                  \
     (   (pSym)->uHash == (_uHash)                                                   \
-     && ( !((_fFlags) & WLDSF_TRUNCATED) && !((pSym)->fFlags & WLDSF_TRUNCATED)     \
-         ? (pSym)->pszName == (_pszName)                                            \
-         : symCompareTrucated(pWld, pSym, _pszName, _cchName) )                     \
-      )
+     && (pSym)->pszName == (_pszName)                                               \
+    )
 
 /** Compares a existing symbol with a potential symbol. */
-#define SYM_EQUAL2(pWld, pSym, _pszName, _fFlags, _uHash, _cchName, _pfn) \
+#define SYM_EQUAL2(pWld, pSym, _pszName, _fFlags, _uHash, _cchName, _pfn)           \
     (   (pSym)->uHash == (_uHash)                                                   \
-     && ( !((_fFlags) & WLDSF_TRUNCATED) && !((pSym)->fFlags & WLDSF_TRUNCATED)     \
-         ? !_pfn((pSym)->pszName, (_pszName), (_cchName)) && !(pSym)->pszName[(_cchName)] \
-         : symCompareTrucated(pWld, pSym, _pszName, _cchName) )                     \
-      )
+     && !_pfn((pSym)->pszName, (_pszName), (_cchName))                              \
+     && !(pSym)->pszName[(_cchName)]                                                \
+    )
 
 
@@ -187 +184 @@
 
 /**
- * Truncated EXTDEF name.
- */
-typedef struct wldsymtrunc
-{
-    /** Full name. */
-    const char *        pszName;
-    /** Pointer to the next symbol. */
-    struct wldsymtrunc *pNext;
-} WLDSYMTRUNC, *PWLDSYMTRUNC;
-
-/**
  * Symbol structure.
  */
@@ -208 +194 @@
     /** The full hash value. */
     unsigned            uHash;
-    /** LIFO of truncated name variations. */
-    PWLDSYMTRUNC        pTrunc;
 
     /** Symbol flags. */
@@ -278 +262 @@
          * in the definition file.
          */
-        WLDSF_WEAKALIASDONE = 0x8000,
-
-        /** Internal flag which indicates that the symbol have been
-         * truncated by emxomf. */
-        WLDSF_TRUNCATED = 0x10000,
+        WLDSF_WEAKALIASDONE = 0x8000
     }                   fFlags;
 
@@ -486 +466 @@
 static int          symSearchLibEnum(PWLD pWld, PWLDSYM pSym, void *pvUser);
 static inline unsigned symHash(const char* pszSym, unsigned cch, unsigned fWldCaseFlag);
-static int          symCompareTrucated(PWLD pWld, PWLDSYM pSym1, const char *pszName2, unsigned cchName2);
 static const char * symGetDescr(PWLDSYM pSym);
 static void         symDumpReferers(PWLDSYM pSym);
@@ -1265 +1244 @@
 
 
-/**
- * Internal worker for SYM_EQUAL()
- *
- * Compares truncated symbols. The hash for these symbols matches and at least
- * one of them is truncated.
- *
- * @returns 1 if matches
- * @returns 0 if not matching.
- * @param   pWld        Linker Instance.
- * @param   pSym1       Symbol 1.
- * @param   pszName2    Symbol 2 name.
- * @param   cchName2    Symbol 2 name length.
- */
-static int symCompareTrucated(PWLD pWld, PWLDSYM pSym1, const char *pszName2, unsigned cchName2)
-{
-    /* Truncated string comparision means comparing MIN(cchName2, strlen(pSym1->pszName)) chars. */
-    const char *pszName1 = pSym1->pszName;
-    if (pWld->fFlags & WLDC_CASE_INSENSITIVE)
-    {
-        while (cchName2-- > 0 && *pszName1)
-        {
-            if (toupper(*pszName1) != toupper(*pszName2))
-                return 0;
-            pszName1++;
-            pszName2++;
-        }
-    }
-    else
-    {
-        while (cchName2-- > 0 && *pszName1)
-        {
-            if (*pszName1 != *pszName2)
-                return 0;
-            pszName1++;
-            pszName2++;
-        }
-    }
-    return 1;
-}
-
-
 
 /**
@@ -1341 +1279 @@
                 break;
         }
-        else if (    psz[0] == '!'
-                 &&  psz[1] == '_'
-                 &&  psz - psz > 200)
-        {
-            uHash = strtol(&psz[2], NULL, 16);
-            fFlags |= WLDSF_TRUNCATED;
-            cchName = psz - pszName;
-            break;
-        }
 
     pszName = (pWld->fFlags & WLDC_CASE_INSENSITIVE ? strpool_addnu : strpool_addn)(pWld->pStrMisc, pszName, cchName);
@@ -1516 +1445 @@
             if (cchName > 200)
                 break;
-        }
-        else if (    psz[0] == '!'
-                 &&  psz[1] == '_'
-                 &&  psz - pszName > 200)
-        {
-            uHash = strtol(&psz[2], NULL, 16);
-            fFlags |= WLDSF_TRUNCATED;
-            cchName = psz - pszName;
-            break;
         }
 
@@ -1681 +1601 @@
     const char *pszName;                /* The symbol name in the string pool */
     int         cchNameWeak = 0;        /* Indicator and length of the weak name. (0 if not weak) */
-    int         cchNameTrunc = 0;       /* Full length of truncated symbol name.  */
     /* general stuff */
     const char *    pach;
@@ -1708 +1627 @@
                 break;
         }
-        else if (    pach[0] == '!'
-                 &&  pach[1] == '_'
-                 &&  pach - pachName > 200)
-        {
-            uHash = strtol(&pach[2], NULL, 16);
-            fFlags |= WLDSF_TRUNCATED;
-            cchNameTrunc = cchNameWeak ? cchNameWeak : cchName;
-            cchName = pach - pachName;
-            break;
-        }
     }
     pszName = (pWld->fFlags & WLDC_CASE_INSENSITIVE ? strpool_addnu : strpool_addn)(pWld->pStrMisc, pachName, cchName);
-    if (!(fFlags & WLDSF_TRUNCATED))
-        uHash = symHash(pszName, cchName, pWld->fFlags & WLDC_CASE_INSENSITIVE);
+    uHash = symHash(pszName, cchName, pWld->fFlags & WLDC_CASE_INSENSITIVE);
 
     /* search for existing symbol  */
@@ -1895 +1803 @@
             }
         }
-
-        /*
-         * Maintain list of truncated aliases.
-         */
-        if (    !SYM_IS_DEFINED(fFlags)
-            && ((fFlags & WLDSF_TRUNCATED) || (pSym->fFlags & WLDSF_TRUNCATED)))
-        {
-            PWLDSYMTRUNC    pTrunc = pSym->pTrunc;
-            const char     *pszSubName = pSym->pszWeakName;
-            if (!pszSubName)
-                pszSubName = strpool_addn(pWld->pStrMisc, pachName, cchNameTrunc);
-
-            while (pTrunc && pTrunc->pszName != pszSubName)
-                pTrunc = pTrunc->pNext;
-            if (!pTrunc)
-            {
-                pTrunc = xmalloc(sizeof(*pTrunc));
-                pTrunc->pszName = pszSubName;
-                pTrunc->pNext = pSym->pTrunc;
-                pSym->pTrunc = pTrunc;
-            }
-        }
     }
 
@@ -3440 +3326 @@
 static int      wldGenerateObjEnum(PWLD pWld, PWLDSYM pSym, void *pvUser)
 {
-    const char     *pszSubName = pSym->pszWeakName;
+    #pragma pack(1)
+    struct omfstuff
+    {
+        OMFREC  hdr;
+        union
+        {
+            char        ach[640];
+            OMFLIBHDRX  libhdr;
+        };
+    } omf;
+    #pragma pack()
     PWLDGOEPARAM    pParam = (PWLDGOEPARAM)pvUser;
+    int             cchAlias;
     int             cch;
-    WLDSYMTRUNC     Trunc;
-    PWLDSYMTRUNC    pTrunc;
 
     /*
-     * If weak, we'll make fake trunc record.
+     * Skip non-weak symbols (a bit of paranoia).
      */
-    if (pSym->pszWeakName)
-    {
-        Trunc.pNext   = pSym->pTrunc;
-        Trunc.pszName = pSym->pszName;
-        pTrunc = &Trunc;
-    }
-    else
-    {
-        pTrunc = pSym->pTrunc;
-        pszSubName = pSym->pszName;
-    }
-    cch = strlen(pszSubName);
+    if (    !pSym->pszWeakName
+        ||  pSym->pszName == pSym->pszWeakName)
+    {
+        WLDDBG(("not weak: '%s'\n", pSym->pszName));
+        return 0;
+    }
 
     /*
-     * Walk trunc record list.
+     * Create the alias record.
      */
-    while (pTrunc)
-    {
-        if (pTrunc->pszName != pszSubName)
-        {
-            #pragma pack(1)
-            struct omfstuff
-            {
-                OMFREC  hdr;
-                union
-                {
-                    char        ach[640];
-                    OMFLIBHDRX  libhdr;
-                };
-            } omf;
-            #pragma pack()
-            int             cchAlias = strlen(pTrunc->pszName);
-
-            WLDINFO(pWld, ("using weak/trunc %s for %s", pszSubName, pTrunc->pszName));
-
-            /* paranoia */
-            if (cchAlias > 255)
-            {
-                wldErr(pWld, "Symbol '%s' are too long (%d).", pTrunc->pszName, cchAlias);
-                return -1;
-            }
-            if (cch > 255)
-            {
-                wldErr(pWld, "Symbol '%s' are too long (%d).", pszSubName, cch);
-                return -1;
-            }
-
-            /* end the current object? */
-            if ((pWld->fFlags & WLDC_LINKER_LINK386) && pParam->cAliases >= 32)
-            {
-                int rc = wldObjEnd(pWld, pParam->phFile, 32);
-                if (rc)
-                    return rc;
-                pParam->cAliases = 0;
-            }
-
-            /* make new object ? */
-            if (!pParam->cAliases)
-            {
-                sprintf(omf.ach, "wk%d.obj", pParam->iLibFile++);
-                int rc = wldObjStart(pWld, pParam->phFile, omf.ach);
-                if (rc)
-                    return rc;
-            }
-
-            /* Alias record */
-            omf.hdr.chType = ALIAS;
-            omf.hdr.cb = cchAlias + cch + 3;
-            omf.ach[0] = cchAlias;
-            memcpy(&omf.ach[1], pTrunc->pszName, cchAlias);           /* alias */
-            omf.ach[cchAlias + 1] = cch;
-            memcpy(&omf.ach[cchAlias + 2], pszSubName, cch); /* subtitute */
-            omf.ach[cchAlias + cch + 2] = 0; /* crc */
-            if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, pParam->phFile) != 1)
-            {
-                wldErr(pWld, "Error occured while writing weak/trunc aliases. (2)");
-                return -1;
-            }
-            pParam->cAliases++;
-        }
-
-        /* next */
-        pTrunc = pTrunc->pNext;
-    }
+    cchAlias   = strlen(pSym->pszName);
+    cch        = strlen(pSym->pszWeakName);
+    WLDINFO(pWld, ("using weak %s for %s", pSym->pszWeakName, pSym->pszName));
+
+    /* paranoia */
+    if (cchAlias > 255)
+    {
+        wldErr(pWld, "Symbol '%s' are too long (%d).", pSym->pszName, cchAlias);
+        return -1;
+    }
+    if (cch > 255)
+    {
+        wldErr(pWld, "Symbol '%s' are too long (%d).", pSym->pszWeakName, cch);
+        return -1;
+    }
+
+    /* end the current object? */
+    if ((pWld->fFlags & WLDC_LINKER_LINK386) && pParam->cAliases >= 32)
+    {
+        int rc = wldObjEnd(pWld, pParam->phFile, 32);
+        if (rc)
+            return rc;
+        pParam->cAliases = 0;
+    }
+
+    /* make new object ? */
+    if (!pParam->cAliases)
+    {
+        sprintf(omf.ach, "wk%d.obj", pParam->iLibFile++);
+        int rc = wldObjStart(pWld, pParam->phFile, omf.ach);
+        if (rc)
+            return rc;
+    }
+
+    /* Alias record */
+    omf.hdr.chType = ALIAS;
+    omf.hdr.cb = cchAlias + cch + 3;
+    omf.ach[0] = cchAlias;
+    memcpy(&omf.ach[1], pSym->pszName, cchAlias);           /* alias */
+    omf.ach[cchAlias + 1] = cch;
+    memcpy(&omf.ach[cchAlias + 2], pSym->pszWeakName, cch); /* subtitute */
+    omf.ach[cchAlias + cch + 2] = 0; /* crc */
+    if (fwrite(&omf, omf.hdr.cb + sizeof(OMFREC), 1, pParam->phFile) != 1)
+    {
+        wldErr(pWld, "Error occured while writing weak/trunc aliases. (2)");
+        return -1;
+    }
+    pParam->cAliases++;
 
     return 0;

trunk/emx/src/ld/ld.c

@@ -43 +43 @@
 #include <string.h>
 #endif
+#include "libiberty.h"
 
 #if !defined(A_OUT)
@@ -872 +873 @@
 int cl_refs_allocated;
 
-char *xmalloc (int);
-void *xrealloc (void *, int);
+void *xmalloc (size_t);
+void *xrealloc (void *, size_t);
 void usage (char *, char *);
 void fatal (char *, ...);
@@ -899 +900 @@
 void symtab_init (void);
 void padfile (int, int);
-char *concat (const char *, const char *, const char *);
 char *get_file_name (struct file_entry *);
 symbol *getsym (char *), *getsym_soft (char *);
@@ -1213 +1213 @@
           discard_locals = DISCARD_ALL;
           break;
-        
+
         case 'y':
           {
@@ -1242 +1242 @@
           search_dirs[n_search_dirs - 1] = optarg;
           break;
-        
+
         case 'M':
           write_map = 1;
@@ -1309 +1309 @@
               = (struct string_list_element *)
                 xmalloc (sizeof (struct string_list_element));
-        
+
             new->str = optarg;
             new->next = set_element_prefixes;
@@ -1392 +1392 @@
 
         case 'l':
-          p->filename = concat ("", optarg, "");
-          p->local_sym_name = concat ("-l", optarg, "");
+          p->filename = concat ("", optarg, "", NULL);
+          p->local_sym_name = concat ("-l", optarg, "", NULL);
           p->search_dirs_flag = 1;
           p->dynamic = !opt_libs_static;
@@ -1612 +1612 @@
         {
           int lendir = strlen (search_dirs[i]);
-          register char *string = xmalloc (lendir + lenname + 4 + 6 + 1);
+          register char *string = (char *) xmalloc (lendir + lenname + 4 + 6 + 1);
           int j;
 
@@ -2483 +2483 @@
                          entry->filename);
                 read_entry_symbols (desc, subentry);
-                subentry->strings = xmalloc (subentry->strs_size);
+                subentry->strings = (char *) xmalloc (subentry->strs_size);
                 read_entry_strings (desc, subentry);
 
@@ -3419 +3419 @@
           if (!demangler || !(nm = (*demangler)(g->name)))
             nm = g->name;
-          errmsg = xmalloc (strlen (errfmt) + strlen (nm) + 1);
+          errmsg = (char *) xmalloc (strlen (errfmt) + strlen (nm) + 1);
           sprintf (errmsg, errfmt, nm, data_segment ? "data" : "text");
           if (nm != g->name)
@@ -3854 +3854 @@
 void check_exe (void)
 {
-  char *ext, *tmp_dir;
-  size_t tmp_dir_len;
+  char *ext;
 
   if (exe_flag)
@@ -3867 +3866 @@
       {
         touch_filename = output_filename;
-        exe_filename = concat (output_filename, ".exe", "");
+        exe_filename = concat (output_filename, ".exe", NULL);
       }
     }
@@ -3887 +3886 @@
   /* Create a temporary a.out executable file. */
 
-  tmp_dir = getenv ("TMPDIR");
-  if (tmp_dir == NULL) tmp_dir = getenv ("TMP");
-  if (tmp_dir == NULL) tmp_dir = getenv ("TEMP");
-  if (tmp_dir == NULL) tmp_dir = ".";
-  tmp_dir_len = strlen (tmp_dir);
-  output_filename = xmalloc (tmp_dir_len + 10);
-  memcpy (output_filename, tmp_dir, tmp_dir_len);
-  if (tmp_dir_len != 0 && strchr ("\\/:", tmp_dir[tmp_dir_len-1]) == NULL)
-    output_filename[tmp_dir_len++] = '\\';
-  strcpy (output_filename + tmp_dir_len, "ldXXXXXX");
-  if (mktemp (output_filename) == NULL)
-    fatal ("mktemp(\"%s\") failed", output_filename);
+  output_filename = make_temp_file ("ldXXXXXX");
 
   if (rsxnt_linked != EMX_DEFAULT && strip_symbols != STRIP_NONE) /* RSXNT */
@@ -4010 +3998 @@
           if (map_filename == NULL)
             {
-              freeav[j++] = map_filename = ALLOCA (strlen (output_filename) + 5);
+              freeav[j++] = map_filename = ALLOCA (strlen (exe_filename) + 5);
               strcpy (map_filename, exe_filename);
               _remext (map_filename);
@@ -5051 +5039 @@
         if (strncmp (tmp, "-l", 2) != 0
             && (len < 2 || strcmp (tmp+len-2, ".o") != 0))
-          tmp = concat (tmp, ".o", "");   /* Needed by GDB */
+          tmp = concat (tmp, ".o", NULL);   /* Needed by GDB */
         nl.n_un.n_strx = assign_string_table_index (tmp);
       }
@@ -5397 +5385 @@
 
   if (errno < sys_nerr)
-    s = concat ("", sys_errlist[errno], " for %s");
+    s = concat ("", sys_errlist[errno], " for %s", NULL);
   else
     s = "cannot open %s";
@@ -5413 +5401 @@
 
   if (errno < sys_nerr)
-    s = concat ("", sys_errlist[errno], " for ");
+    s = concat ("", sys_errlist[errno], " for ", NULL);
   else
     s = "cannot open ";
@@ -5474 +5462 @@
 }
 
-/* Return a newly-allocated string
-   whose contents concatenate the strings S1, S2, S3.  */
-
-char *
-concat (s1, s2, s3)
-     const char *s1, *s2, *s3;
-{
-  register int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
-  register char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
-
-  strcpy (result, s1);
-  strcpy (result + len1, s2);
-  strcpy (result + len1 + len2, s3);
-  result[len1 + len2 + len3] = 0;
-
-  return result;
-}
-
 /* Parse the string ARG using scanf format FORMAT, and return the result.
    If it does not parse, report fatal error
@@ -5508 +5478 @@
 /* Like malloc but get fatal error if memory is exhausted.  */
 
-char *
+void *
 xmalloc (size)
-     int size;
+     size_t size;
 {
   register char *result = malloc (size);
@@ -5523 +5493 @@
 xrealloc (ptr, size)
      void *ptr;
-     int size;
+     size_t size;
 {
   register char *result = realloc (ptr, size);
@@ -5684 +5654 @@
      */
     pName = (struct lx_tmp *)xmalloc(sizeof(*pName));
-    pName->name = psz = xmalloc(_MAX_PATH);
+    pName->name = psz = (char *)xmalloc(_MAX_PATH);
     if (!make_tempfile(psz, "lddef", ".def"))
     {

trunk/emx/src/libmoddef/moddef1.c

@@ -154 +154 @@
 {
   char *p;
-  
+
   if (fgets (md->buffer, sizeof (md->buffer), md->file) == NULL)
     {
@@ -170 +170 @@
 _md_token _md_next_token (struct _md *md)
 {
+  _md_token prev_token = md->token;
   const char *start, *end;
   char *p, quote_char;
@@ -223 +224 @@
       md->token = _MD_word;
       start = md->ptr++;
-      md->ptr += strcspn (md->ptr, " \t=@.");
+      if (prev_token == _MD_LIBRARY || prev_token == _MD_NAME)
+        md->ptr += strcspn (md->ptr, " \t=");
+      else
+        md->ptr += strcspn (md->ptr, " \t=@.");
       end = md->ptr;
     }

trunk/emx/src/misc/MakeOmfLibs.cmd

@@ -43 +43 @@
      */
     Address CMD '@setlocal';
-    sEMXOMF = sDir'\..\bin\emxomf.exe -t';
+    sEMXOMF = sDir'\..\bin\emxomf.exe';
     sOldBeginLibPath = hlpEnvGet('BEGINLIBPATH');
     call hlpEnvSet 'BEGINLIBPATH', sDir'..\lib;'sOldBeginLibPath