Changeset 485

Timestamp:

Jul 30, 2003, 8:10:01 PM (22 years ago)

Author:

bird

Message:

'

Location:

trunk/src/emx/src/emxomf

Files:

• emxomf.c (modified) (6 diffs, 1 prop)
• emxomf.smak (modified) (1 diff, 1 prop)
• emxomfld.c (modified) (13 diffs, 1 prop)
• grow.c (modified) (1 diff, 1 prop)
• weakld.c (added)
• weakld.h (added)

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

@@ -1110 +1110 @@
         add_extdef (&started, str_ptr + sym_ptr[i].n_un.n_strx);
       }
+    else if (sym_ptr[i].n_type >= N_WEAKA && sym_ptr[i].n_type <= N_WEAKB)
+      { /* Not convinced about this yet, I mean there should really be 
+           external records for this, perhaps...
+           At least I can't see why this will be wrong. */
+        name = str_ptr + sym_ptr[i].n_un.n_strx;
+        sym_more[i].index = sym_index++;
+        add_extdef (&started, name);
+      }
   if (started)
     write_rec ();
@@ -1147 +1155 @@
    mark it as N_WEAKU so that it is later writen within a WKEXT record.
    Also we convert a.out-style weak symbols here as normal public symbols,
-   as the sense of weak is reverse in OMF */
+   as the sense of weak is reverse in OMF 
+   
+   Weak Hack Method 1.
+   */
 
 static void weak_process (void)
@@ -1184 +1195 @@
           }
       }
+    #if 0
     else if ((sym_ptr[i].n_type & N_EXT) && is_weak (str_ptr + sym_ptr[i].n_un.n_strx))
       {
@@ -1193 +1205 @@
          /*SETTYPE (N_WEAKU);*/
       }
-
+    #endif 
 #undef SETTYPE
 }
@@ -1211 +1223 @@
  * @param   cchName     Size of the buffer pointed to by pachName.
  * @remark I'm sorry this function is written in my coding style - not!
+ * @remark Weak Hack Method 2.
  */
 static const char *weak_process_name(const struct nlist *pSym, const char *pszOrgName, char *pachName, int cchName)
@@ -1217 +1230 @@
     {
         /*
-         * Hmmm... Check that we handle this correctly else where
+         * Weak external.
          */
         case N_WEAKU:               /* 0x0d  Weak undefined symbol. */

trunk/src/emx/src/emxomf/emxomf.smak

@@ -20 +20 @@
 .TARGET := emxomfld.exe
 .TKIND  := $(TOOLFMT)
-.TSRC   := src/emxomf/emxomfld.c
+.TSRC   := $(addprefix src/emxomf/,emxomfld.c grow.c weakld.c)
 .TCF    := $(CFLAGS.DEF.VERSION)
 .TDEP   := @O@moddef$A

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

@@ -36 +36 @@
 #include <sys/omflib.h>
 #include "defs.h"
+#include "weakld.h"
 
 #define FALSE 0
@@ -109 +110 @@
 static FILE *response_file = NULL;
 
+/* Weak alias object file. */
+static char weakobj_fname[_MAX_PATH];
+
 /* Non-zero if debugging information is to be omitted.  Set by the -s
    and -S options. */
@@ -132 +136 @@
 
 static void usage (void) NORETURN2;
-static void *xmalloc (size_t n);
-static char *xstrdup (const char *s);
+extern void *xmalloc (size_t n);
+extern void *xrealloc (void *ptr, size_t n);
+extern char *xstrdup (const char *s);
 static void add_name_list (name_list ***add, const char *src);
 static void conv_path (char *name);
@@ -156 +161 @@
 static void usage (void)
 {
-  fprintf (stderr, "emxomfld " VERSION INNOTEK_VERSION " -- "
-           "Copyright (c) 1992-1996 by Eberhard Mattes\n\n");
+  fprintf (stderr, "emxomfld " VERSION INNOTEK_VERSION "\n"
+           "Copyright (c) 1992-1996 by Eberhard Mattes\n"
+           "Copyright (c) 2003 by InnoTek Systemberatung GmbH\n\n");
+
   fprintf (stderr,
            "Usage: emxomfld -o <file> [-l <lib>] [-L <libdir>] [-T <base>] [-sS]\n"
@@ -169 +176 @@
    used like malloc(), but we don't have to check the return value. */
 
-static void *xmalloc (size_t n)
+void *xmalloc (size_t n)
 {
   void *p;
@@ -181 +188 @@
   return p;
 }
+
+
+/* Change the allocation of PTR to N bytes.  Quit on failure.  This
+   function is used like realloc(), but we don't have to check the
+   return value. */
+
+void *xrealloc (void *ptr, size_t n)
+{
+  void *p;
+
+  p = realloc (ptr, n);
+  if (p == NULL)
+    {
+      fprintf (stderr, "emxomfld: out of memory\n");
+      exit (2);
+    }
+  return p;
+}
+
 
 
@@ -187 +213 @@
    return value. */
 
-static char *xstrdup (const char *s)
+char *xstrdup (const char *s)
 {
   char *p;
@@ -387 +413 @@
 
 
-/* Put a list of library arguments on to the command line or into the
-   response file. Filenames without path and extension will be 'resolved'
-   using libdirs and the LIB environment variable and a '.lib' extension.
-   If not found a search for a 'lib' prefixed filename is attempted, if
-   still not found we'll let link386 do the complaining and pass filename
-   unresolved to link386.
-
-   The motivation for doing this is to have the same behaviour of ld and
-   emxomfld which allows us to lax the libsomething.lib to something.lib
-   renaming and addapt to the gcc/unix library naming standards.
-   (see Innotek Defect #416)
-
-   Note. make_env () *must* be called before this function is called. */
-
-static void put_lib_args(const name_list *list)
-{
-  const char *pszLib = getenv ("LIB");
-  for (;list != NULL; list = list->next)
-    {
-      char  szFilename[260];
-      int   fFound = 0;
-
-      if (!strpbrk (list->name, ":\\/."))
-        { /* search for it */
-          const char *psz, *pszEnd;
-          for (psz = pszLib; !fFound && psz; psz = pszEnd + (pszEnd != NULL))
-            {
-              pszEnd = strchr(psz, ';');
-              if (pszEnd > psz)
-                {
-                  int  cchPath = pszEnd - psz;
-                  struct stat s;
-
-                  strncpy(szFilename, psz, pszEnd - psz);
-                  if (   szFilename[cchPath-1] != '\\'
-                      && szFilename[cchPath-1] != '/'
-                      && szFilename[cchPath-1] != ':')
-                    szFilename[cchPath++] = '\\';
-
-                  /* Files we're looking for:
-                   *    1. file with .lib extention.
-                   *    2. file with .lib extention and lib prefix.
-                   *    3. file with .a extention which is an OMF library.
-                   *    4. file with .a extention and lib prefix which is an OMF library.
-                   */
-                  strcat(strcpy(szFilename + cchPath, list->name), ".lib");
-                  fFound = !stat(szFilename, &s);
-                  if (!fFound)
-                    {
-                      strcat(strcpy(strcpy(szFilename + cchPath, "lib") + 3, list->name), ".lib");
-                      fFound = !stat(szFilename, &s);
-                      if (!fFound)
-                        {
-                          strcat(strcpy(szFilename + cchPath, list->name), ".a");
-                          fFound = !stat(szFilename, &s);
-                          if (!fFound)
-                            {
-                              strcat(strcpy(strcpy(szFilename + cchPath, "lib") + 3, list->name), ".a");
-                              fFound = !stat(szFilename, &s);
-                            }
-                          /*
-                           * Is this an OMF library?
-                           * We will open it hand do some verification of the LIBHDR.
-                           */
-                          if (fFound)
-                            {
-                              FILE *pFile = fopen(szFilename, "rb");
-                              fFound = 0;
-                              if (pFile)
-                                {
-                                  #pragma pack(1)
-                                  struct
-                                  {
-                                      byte rec_type;
-                                      word rec_len;
-                                      dword dict_offset;
-                                      word dict_blocks;
-                                      byte flags;
-                                  } libhdr;
-                                  #pragma pack()
-                                  if (  fread(&libhdr, 1, sizeof(libhdr), pFile) == sizeof(libhdr)
-                                      && libhdr.rec_type == LIBHDR
-                                      && libhdr.flags <= 1 /* ASSUME only first bit is used... */
-                                      )
-                                    {
-                                      int page_size = libhdr.rec_len + 3;
-                                      if (   page_size >= 16
-                                          && page_size <= 32768
-                                          && !(page_size & (page_size - 1)) != 0)
-                                          fFound = 1;
-                                    }
-                                  fclose(pFile);
-                                }
-                            }
-                        }
-                    }
-                }
-            } /* foreach path in $LIB */
-        }
-
-      put_arg (fFound ? szFilename : list->name, TRUE, TRUE);
-//fprintf(stderr, "%s -> %s\n", list->name, fFound ? szFilename : strpbrk(list->name,     ":\\/.") ? "not searched for" : "not found");
-    } /* foreach list entry */
-}
-
-
 /* Build the environment for LINK386: define the LIB environment
    variable. */
@@ -536 +456 @@
 
 
+/* finds the full path of a library or object file, after check 
+   default extentions an such. 
+      
+   Object files will be searched for using the LIB env.var if not found.
+   
+   Library hacks:
+     1. file with .lib extention.
+     2. file with .lib extention and lib prefix.
+     3. file with .a extention which is an OMF library.
+     4. file with .a extention and lib prefix which is an OMF library.
+   */
+
+static FILE * find_objlib(char *pszfullname, const char *pszname, 
+                          const char * const *papszexts, int flibhacks)
+{
+  const char *  psz;
+  char *        psz2;
+  int           cch;
+  int           i;
+  int           fextension;
+  FILE *        phFile;
+  char          cchname = strlen (pszname);
+  
+  /* Plain name first - the easist option */
+  memcpy (pszfullname, pszname, cchname + 1);
+  phFile = fopen (pszfullname, "rb");
+  if (phFile)
+    return phFile;
+
+  /* Plain name with all extentions. */
+  psz = strrchr (pszname, '.');
+  fextension = (psz && !strpbrk (psz, ":\\/"));
+  if (!fextension)
+    {
+      psz2 = pszfullname + cchname;
+      for (i = 0; papszexts[i]; i++)
+        {
+          strcpy (psz2, papszexts[i]);
+          phFile = fopen (pszfullname, "rb");
+          if (phFile)
+            return phFile;
+        }
+    }
+
+  /* Search LIBS. */
+  if (!strpbrk (pszname, ":\\/"))
+    { 
+      int           ffound;
+      const char *  pszend;
+      for (psz = getenv("LIB"), ffound = 0; !ffound && psz; psz = pszend + (pszend != NULL))
+        {
+          pszend = strchr(psz, ';');
+          if (pszend <= psz)
+              continue;
+
+          /* normalize the name */
+          cch = pszend - psz;
+          strncpy(pszfullname, psz, pszend - psz);
+          if (   pszfullname[cch-1] != '\\'
+              && pszfullname[cch-1] != '/'
+              && pszfullname[cch-1] != ':')
+            pszfullname[cch++] = '\\';
+          memcpy(pszfullname + cch, pszname, cchname + 1);
+
+          if (!fextension)
+            {
+              /* search thru extensions. */
+              for (i = 0; papszexts[i]; i++)
+                {
+                  strcpy(pszfullname + cch + cchname, papszexts[i]);
+                  phFile = fopen (pszfullname, "rb");
+                  if (phFile)
+                      break;
+                  if (flibhacks)
+                    {
+                      memcpy(pszfullname + cch, "lib", 3);
+                      memcpy(pszfullname + cch, pszname, cchname);
+                      strcpy(pszfullname + cch + cchname, papszexts[i]);
+                      phFile = fopen (pszfullname, "rb");
+                      if (phFile)
+                          break;
+                      memcpy(pszfullname + cch, pszname, cchname + 1);
+                    }
+                }
+            }
+          else
+            phFile = fopen (pszfullname, "rb");
+
+          if (phFile)
+            {
+              #pragma pack(1)
+              struct
+              {
+                  byte rec_type;
+                  word rec_len;
+                  dword dict_offset;
+                  word dict_blocks;
+                  byte flags;
+              } libhdr;
+              #pragma pack()
+              if (!flibhacks)
+                return phFile;
+              /* For .a libraries we will chech for a valid OMF library header. */
+              if (memicmp(pszfullname + strlen(pszfullname) - 2, ".a", 3))
+                  return phFile;
+              if (  fread(&libhdr, 1, sizeof(libhdr), phFile) == sizeof(libhdr)
+                  && libhdr.rec_type == LIBHDR
+                  && libhdr.flags <= 1 /* ASSUME only first bit is used... */
+                  )
+                {
+                  int page_size = libhdr.rec_len + 3;
+                  if (   page_size >= 16
+                      && page_size <= 32768
+                      && !(page_size & (page_size - 1)) != 0)
+                      return phFile;
+                }
+              fclose(phFile);
+              phFile = NULL;
+            }
+        } /* foreach path in $LIB */
+    }
+  return NULL;
+}
+
+
+/* Weak prelinking for Method 2 Weak support. */
+
+static void weak_prelink ()
+{
+  int     rc = 0;
+  PWLD    pwld;
+
+  pwld = wld_create (0);
+  if (pwld)
+    {
+      name_list *   pcur;
+      FILE         *phfile;
+      char          szname[_MAX_PATH];
+
+      /* objects */
+      for (pcur = obj_fnames; !rc && pcur; pcur = pcur->next)
+        {
+          static const char * objexts[] = { ".obj", ".o", NULL };
+          phfile = find_objlib (szname, pcur->name, objexts, TRUE);
+          rc = wld_add_object (pwld, phfile, szname);
+        }
+
+      /* definition file if any */
+      if (def_fname && def_fname[0])
+        {
+          phfile = fopen (def_fname, "r");
+          rc = wld_add_deffile (pwld, phfile, def_fname);
+        }
+
+      /* libraries */
+      for (pcur = lib_fnames; !rc && pcur; pcur = pcur->next)
+        {
+          static const char * libexts[] = { ".lib", ".a", NULL };
+          phfile = find_objlib (szname, pcur->name, libexts, TRUE);
+          rc = wld_add_library (pwld, phfile, szname);
+          free(pcur->name);
+          pcur->name = xstrdup(szname);
+        }
+
+      /* generate weak aliases. */
+      if (!rc)
+        rc = wld_generate_weakobj (pwld, weakobj_fname);
+      if (!rc && weakobj_fname[0])
+        add_name_list (&add_obj_fnames, weakobj_fname);
+
+      /* cleanup the linker */
+      wld_destroy (pwld);  
+    }
+  else
+    {
+      rc = 8;
+      fprintf (stderr, "emxomfld: failed to create weak linker.\n");
+    }
+
+  if (rc)
+    exit(rc);
+}
+
+
 /* Start a new set of command line arguments.  If RSP is non-zero, we
    are allowed to use a response file. */
@@ -575 +679 @@
       response_file = NULL;
     }
-  if (response_fname[0] != 0)
+  if (response_fname[0] != '\0')
     {
       remove (response_fname);
-      response_fname[0] = 0;
+      response_fname[0] = '\0';
+    }
+  if (weakobj_fname[0] != '\0')
+    {
+      remove (weakobj_fname);
+      weakobj_fname[0] = '\0';
     }
 }
@@ -790 +899 @@
     }
 
-  t = getenv ("EMXOMFLD_LINKER");
-  if (t != NULL)
-    linker_name = t;
-
-  /* Build the environment for LINK386.
-     This must be done before calling put_lib_args (). */
+  /* Build the environment for LINK386. */
 
   make_env ();
+
+  /* Do the weak prelinking unless GCC_WEAKSYMS are set. 
+     Important that this is done after make_env(). */
+
+  if (!getenv("GCC_WEAKSYMS"))
+      weak_prelink ();
+  else
+    {
+      /* apply library hack */
+      name_list *pcur;
+      for (pcur = lib_fnames; !rc && pcur; pcur = pcur->next)
+        {
+          static const char * libexts[] = { ".lib", ".a", NULL };
+          char szname[_MAX_PATH];
+          FILE *phfile = find_objlib (szname, pcur->name, libexts, TRUE);
+          if (!phfile)
+            continue;
+          free(pcur->name);
+          pcur->name = xstrdup(szname);
+        }
+
+    }
+
 
   /* Start building the LINK386 command line.  We can use a response
@@ -829 +956 @@
   */
 
+  t = getenv ("EMXOMFLD_LINKER");
+  if (t != NULL)
+    linker_name = t;
   put_arg (linker_name, TRUE, FALSE);
 
@@ -914 +1044 @@
   /* Put the library file names onto the command line. */
 
-  put_lib_args (lib_fnames);
+  put_args (lib_fnames, TRUE);
   put_arg (",", FALSE, FALSE);
 

trunk/src/emx/src/emxomf/grow.c

@@ -332 +332 @@
   return strpool_addn (p, s, strlen (s));
 }
+
+
+/* Add the string S of LEN characters to the string pool P.  The
+   string must not contain null characters. A pointer to a string of
+   the string pool is returned.  If a string identical to S already
+   exists in the string pool, a pointer to that string is returned.
+   Otherwise, a new string entry is added to the string pool. */
+
+const char *strpool_look (struct strpool *p, const char *s, int len)
+{
+  unsigned hash;
+  int i;
+  struct string *v;
+
+  hash = 0;
+  for (i = 0; i < len; ++i)
+    hash = hash * 65599 + s[i];
+  hash %= STRPOOL_HASH_SIZE;
+  for (v = p->table[hash]; v != NULL; v = v->next)
+    if (strlen (v->string) == len && memcmp (v->string, s, len) == 0)
+      return v->string;
+  v = xmalloc (sizeof (*v) + len);
+  memcpy (v->string, s, len);
+  v->string[len] = 0;
+  v->next = p->table[hash];
+  p->table[hash] = v;
+  return v->string;
+}
+