Changeset 2097 for trunk

Timestamp:

Jun 28, 2005, 2:03:05 AM (20 years ago)

Author:

bird

Message:

Generate .def-file for dlls without one - forgot cleanup.

Location:

trunk/src/emx/src

Files:

• emxomf/emxomf.c (modified) (13 diffs, 1 prop)
• emxomf/emxomfld.c (modified) (3 diffs, 1 prop)
• ld/ld.c (modified) (3 diffs, 1 prop)

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

@@ -123 +123 @@
   char *symbol;                 /* Symbol attached to the string */
   char *str;                    /* The value of the string */
-};
-
-/* This structure keeps track which weak symbol and where it is defined,
-   to simulate weak symbols in OMF (which aren't supported in OMF) */
-
-struct weaksym
-{
-  struct weaksym *next;         /* Next weak symbol in chain */
-  char *name;                   /* Symbol name */
-  char *module;                 /* Object file where it should be defined */
-  int used;                     /* 1 if the symbol has been encountered */
 };
 
@@ -249 +238 @@
 static int opt_x = FALSE;
 
-/* Suppress reading and/or writing of the weaksyms.omf file */
-static int opt_w = FALSE;
-
 /* Remove underscores from all symbol names */
 static int opt_rmunder = FALSE;
@@ -279 +265 @@
 /* The index of the "WEAK$ZERO" symbol or 0. */
 static int weak_zero_index;
-
-/* The list of currently known OMF symbols */
-static struct weaksym *weak_symbol_list;
-static struct weaksym **weak_symbol_top = &weak_symbol_list;
-
-/* 1 whenever the weak symbol list has been altered */
-static int weak_list_altered;
-
-/* The file name of the weak symbol list file.
-   If NULL the new method is used, if not NULL the old method is used. */
-static char *weak_list_filename;
 
 /* OMF name indices: segments, classes, groups, etc. */
@@ -615 +590 @@
     error ("Internal error! Invalid index (%d) passed to set_hll_type().", index);
   sym_more[index].hll_type = hll_type;
-}
-
-
-/* Add a symbol to 0 symbol list */
-
-static struct weaksym *add_weak (const char *symname, const char *modname)
-{
-  struct weaksym *newsym = xmalloc (sizeof (struct weaksym));
-  newsym->name = xstrdup (symname);
-  newsym->module = xstrdup (modname);
-  newsym->used = 0;
-  newsym->next = NULL;
-  *weak_symbol_top = newsym;
-  weak_symbol_top = &newsym->next;
-  weak_list_altered = 1;
-  return newsym;
-}
-
-
-/* Load the weak symbols table from the weaksyms.omf file.
- * We emulate the weak symbol functionality in the following way:
- * first time we encounter a weak symbol, we mark it as "strong"
- * and remember the first object file where it was encountered.
- * Then when another instance of this weak symbol is encountered
- * the output file name is checked; if it is a different object file,
- * the symbol is marked as local. Otherwise it is marked as strong.
- * Finally, when we find any external references to this symbol, they
- * are marked as "OMF weak reference", e.g. the N_WEAKU type
- * (which is quite different from a.out weaks, thats why we have
- * to dig all that mess!). Alas, this mechanism can require multi-pass
- * builds for complex cases...
- */
-
-static void weak_load (void)
-{
-  FILE *wf;
-  char line [1024];
-
-
-  /* Find and open the weak symbol list file
-     #483: If not present we'll use the new method. */
-  weak_list_filename = getenv ("GCC_WEAKSYMS");
-  if (!weak_list_filename)
-    return ;
-  if (opt_w)
-    return;
-  wf = fopen (weak_list_filename, "r");
-  if (!wf)
-    return;
-
-  /* Every line of the file contains something like:
-       __symbol:object_file
-     or just
-       __symbol
-  */
-
-  while (fgets (line, sizeof (line), wf))
-    {
-      char *eol = strchr (line, 0);
-      while ((eol > line) && (isspace (eol [-1])))
-        eol--;
-      *eol = 0;
-      char *sep = strchr (line, ':');
-      if (!sep)
-        {
-          fprintf (stderr, "WARNING: bad line `%s' in weak symbol list file `%s'\n",
-            line, weak_list_filename);
-          continue;
-        }
-
-      *sep = 0;
-      add_weak (line, sep + 1);
-    }
-
-  fclose (wf);
-
-  /* Mark the list as unmodified */
-  weak_list_altered = 0;
-}
-
-
-/* Save the weak symbol list */
-
-static void weak_save (void)
-{
-  FILE *wf;
-  struct weaksym *wsym;
-
-  if (opt_w)
-    return;
-
-  /* Find and open the weak symbol list file */
-  wf = fopen (weak_list_filename, "w");
-  if (!wf)
-    return;
-
-  for (wsym = weak_symbol_list; wsym; wsym = wsym->next)
-    fprintf (wf, "%s:%s\n", wsym->name, wsym->module);
-
-  fclose (wf);
-}
-
-
-/* Free the weak symbol list */
-
-static void weak_free (void)
-{
-  struct weaksym *cur = weak_symbol_list;
-  while (cur)
-    {
-      struct weaksym *next = cur->next;
-      free (cur->name);
-      free (cur);
-      free (cur->module);
-      cur = next;
-    }
-  weak_symbol_list = NULL;
-}
-
-
-/* Find if a symbol is weak */
-
-static struct weaksym *is_weak (const char *symname)
-{
-  struct weaksym *wsym;
-  for (wsym = weak_symbol_list; wsym; wsym = wsym->next)
-    if (!strcmp (symname, wsym->name))
-      return wsym;
-  return NULL;
 }
 
@@ -1215 +1061 @@
 
 
-/* Check all external symbol references for weakness; if a symbol is weak,
-   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
-
-   Weak Hack Method 1.
-   */
-
-static void weak_process (void)
-{
-  int i;
-
-  if (!weak_list_filename)
-      return;
-
-#define SETTYPE(t) ((struct nlist *)sym_ptr)[i].n_type = t
-
-  for (i = 0; i < sym_count; ++i)
-    if ((sym_ptr[i].n_type >= N_WEAKA) && (sym_ptr[i].n_type <= N_WEAKB))
-      {
-        const char *name = (const char *)(str_ptr + sym_ptr[i].n_un.n_strx);
-
-        int public = N_EXT;
-
-        /* Add the symbol to weak list if not already */
-        struct weaksym *wsym = is_weak (name);
-        if (!wsym)
-          wsym = add_weak (name, out_fname);
-        else if (strcmp (out_fname, wsym->module) || wsym->used)
-          public = 0;
-        /* If the symbol is exported more than once (e.g. from an archive),
-           export just the first instance... */
-        wsym->used = 1;
-
-        /* Now convert it to a normal public symbol */
-        switch (sym_ptr[i].n_type)
-          {
-            case N_WEAKA: SETTYPE (N_ABS  | public); break;
-            case N_WEAKT: SETTYPE (N_TEXT | public); break;
-            case N_WEAKD: SETTYPE (N_DATA | public); break;
-            case N_WEAKB: SETTYPE (N_BSS  | public); break;
-          }
-      }
-    #if 0
-    else if ((sym_ptr[i].n_type & N_EXT) && is_weak (str_ptr + sym_ptr[i].n_un.n_strx))
-      {
-         /* Convert a external reference to N_WEAKU */
-         /* P.S. As experiments show, WKEXT works somewhat strangely
-            with LINK386 (sometimes such external references are left
-            unresolved, even that they could be resolved), thus the
-            following line is commented out */
-         /*SETTYPE (N_WEAKU);*/
-      }
-    #endif
-#undef SETTYPE
-}
-
-
 /**
  * Generates new names for weak symbols.
@@ -1287 +1075 @@
  *                      This must be at least 256, the code make this assumption!
  * @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)
@@ -1468 +1255 @@
               {
                 /* for weaksymbols we may have to decorate the name */
-                if (   !weak_list_filename
-                    && sym_ptr[i].n_type >= N_WEAKU && sym_ptr[i].n_type <= N_WEAKB )
+                if ( sym_ptr[i].n_type >= N_WEAKU && sym_ptr[i].n_type <= N_WEAKB )
                     name = weak_process_name(&sym_ptr[i], name, szName, sizeof(szName));
 
@@ -1560 +1346 @@
 static void write_pubdef (void)
 {
-  write_pubdef1 (N_ABS,  0,          FALSE, 0);
-  write_pubdef1 (N_ABS,  0,          TRUE, 0);
-  write_pubdef1 (N_TEXT, text_index, FALSE, 0);
-  write_pubdef1 (N_TEXT, text_index, TRUE,  0);
-  write_pubdef1 (N_DATA, udat_index, FALSE, text_size);
-  write_pubdef1 (N_DATA, udat_index, TRUE,  text_size);
-  write_pubdef1 (N_BSS,  bss_index,  FALSE, text_size + data_size);
-  write_pubdef1 (N_BSS,  bss_index,  TRUE,  text_size + data_size);
-  if (!weak_list_filename)
-  {
-      write_pubdef1 (N_WEAKA, 0,          FALSE, 0);
-      write_pubdef1 (N_WEAKA, 0,          TRUE, 0);
-      write_pubdef1 (N_WEAKT, text_index, FALSE, 0);
-      write_pubdef1 (N_WEAKT, text_index, TRUE,  0);
-      write_pubdef1 (N_WEAKD, udat_index, FALSE, text_size);
-      write_pubdef1 (N_WEAKD, udat_index, TRUE,  text_size);
-      write_pubdef1 (N_WEAKB, bss_index,  FALSE, text_size + data_size);
-      write_pubdef1 (N_WEAKB, bss_index,  TRUE,  text_size + data_size);
-  }
+  write_pubdef1 (N_ABS,   0,          FALSE, 0);
+  write_pubdef1 (N_ABS,   0,          TRUE, 0);
+  write_pubdef1 (N_TEXT,  text_index, FALSE, 0);
+  write_pubdef1 (N_TEXT,  text_index, TRUE,  0);
+  write_pubdef1 (N_DATA,  udat_index, FALSE, text_size);
+  write_pubdef1 (N_DATA,  udat_index, TRUE,  text_size);
+  write_pubdef1 (N_BSS,   bss_index,  FALSE, text_size + data_size);
+  write_pubdef1 (N_BSS,   bss_index,  TRUE,  text_size + data_size);
+  write_pubdef1 (N_WEAKA, 0,          FALSE, 0);
+  write_pubdef1 (N_WEAKA, 0,          TRUE, 0);
+  write_pubdef1 (N_WEAKT, text_index, FALSE, 0);
+  write_pubdef1 (N_WEAKT, text_index, TRUE,  0);
+  write_pubdef1 (N_WEAKD, udat_index, FALSE, text_size);
+  write_pubdef1 (N_WEAKD, udat_index, TRUE,  text_size);
+  write_pubdef1 (N_WEAKB, bss_index,  FALSE, text_size + data_size);
+  write_pubdef1 (N_WEAKB, bss_index,  TRUE,  text_size + data_size);
   /* kso #456 2003-06-10: The debugger looks for 'main' not '_main'. */
   write_pubdef_main ();
@@ -3822 +3605 @@
   write_rec ();
 
-  /* Process weak symbols */
-  weak_process ();
-
   /* Convert imports and exports. These show up very early in VAC
      generated OMF files. */
@@ -3929 +3709 @@
   puts ("  -t                 Add timestamping to the weak symbol mangling (def)");
   puts ("  -j                 Do not add timestamping to the weak symbol mangling");
-  puts ("  -w                 Suppress reading/writing of the weaksyms.omf file");
-  puts ("                     (Only used if GCC_WEAKSYMS is set.)");
   puts ("  -z                 Remove underscores from all symbol names");
   puts ("  -P <dbgpackdll>    Name the dbgpack DLL (ilink)");
@@ -4439 +4217 @@
         opt_x = TRUE;
         break;
-      case 'w':
-        opt_w = TRUE;
-        break;
       case 'z':
         opt_rmunder = TRUE;
@@ -4457 +4232 @@
     usage ();
 
-  /* Initialize weak symbol list */
-
-  weak_symbol_list = NULL;
-  weak_load ();
-
   if (opt_o != NULL)
     {
@@ -4493 +4263 @@
     }
 
-  /* If the weak symbol list has been altered, save it */
-
-  if (weak_list_altered)
-    weak_save ();
-
-  /* Free the weak symbol list */
-
-  weak_free ();
-
   /* If a LIB response file has been created, finish and close it. */
 

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

@@ -1188 +1188 @@
 static void gen_deffile(void)
 {
-    char *psz = xmalloc(_MAX_PATH);
+    char *          psz;
+    name_list      *pName;
+
+    /*
+     * Make temporary file.
+     */
+    pName = (name_list *)xmalloc(sizeof(*pName));
+    pName->name = psz = xmalloc(_MAX_PATH);
     if (!make_tempfile(psz, "lddef", ".def", NULL))
     {
@@ -1216 +1223 @@
                         "---- End of generated def-file.\n",
                         psz, cchName, pszName);
+
+            /* add to auto delete list for removal on exit(). */
+            pName->next = conv_list;
+            conv_list = pName;
             return;
         }
     }
     free(psz);
+    free(pName);
 }
 
@@ -1702 +1714 @@
     gen_deffile();
 
-  /* Do the weak prelinking unless GCC_WEAKSYMS are set.
-     Important that this is done after make_env(). */
-
-  if (!getenv("GCC_WEAKSYMS"))
-      weak_prelink ();
+  /* Do the weak prelinking. Important that this is done after make_env(). */
+
+  weak_prelink ();
 
   /* Start building the linker command line.  We can use a response

trunk/src/emx/src/ld/ld.c

@@ -929 +929 @@
 int assign_string_table_index (char *name);
 unsigned long check_each_file (register unsigned long (*function)(), register int arg);
-static int      make_tempfile(char *pszFile, const char *pszPrefix, const char *pszSuffix);
+static void     gen_deffile (void);
 
 
@@ -3906 +3906 @@
     unlink (touch_filename);
 }
-
-/* Generates a definition file for a dll which doesn't have one. */
-
-static void gen_deffile(void)
-{
-    char *psz = xmalloc(_MAX_PATH);
-    if (!make_tempfile(psz, "lddef", ".def"))
-    {
-        FILE *pFile = fopen(psz, "w");
-        if (pFile)
-        {
-            const char *pszName = _getname(exe_filename);
-            size_t cchName = strlen(pszName);
-            if (cchName > 4 && !stricmp(pszName + cchName - 4, ".dll"))
-                cchName -= 4;
-            fprintf(pFile,
-                    ";; Autogenerated by ld\n"
-                    "LIBRARY %.*s INITINSTANCE TERMINSTANCE\n"
-                    "DATA MULTIPLE\n"
-                    "CODE SHARED\n"
-                    "\n",
-                    cchName, pszName);
-            if (trace_files)
-                fprintf(stderr,
-                        "--- Generated def-file %s:\n"
-                        ";; Autogenerated by ld\n"
-                        "LIBRARY %.*s INITINSTANCE TERMINSTANCE\n"
-                        "DATA MULTIPLE NONSHARED\n"
-                        "CODE SINGLE SHARED\n"
-                        "---- End of generated def-file.\n",
-                        psz, cchName, pszName);
-            fclose(pFile);
-            def_filename = psz;
-            return;
-        }
-    }
-    free(psz);
-}
-
 
 /* Write the output file */
@@ -5695 +5656 @@
 }
 
+/* Generates a definition file for a dll which doesn't have one. */
+
+static void gen_deffile(void)
+{
+    char *          psz;
+    struct lx_tmp  *pName;
+
+    /*
+     * Make temporary file.
+     */
+    pName = (struct lx_tmp *)xmalloc(sizeof(*pName));
+    pName->name = psz = xmalloc(_MAX_PATH);
+    if (!make_tempfile(psz, "lddef", ".def"))
+    {
+        FILE *pFile = fopen(psz, "w");
+        if (pFile)
+        {
+            const char *pszName = _getname(exe_filename);
+            size_t cchName = strlen(pszName);
+            if (cchName > 4 && !stricmp(pszName + cchName - 4, ".dll"))
+                cchName -= 4;
+            fprintf(pFile,
+                    ";; Autogenerated by ld\n"
+                    "LIBRARY %.*s INITINSTANCE TERMINSTANCE\n"
+                    "DATA MULTIPLE\n"
+                    "CODE SHARED\n"
+                    "\n",
+                    cchName, pszName);
+            if (trace_files)
+                fprintf(stderr,
+                        "--- Generated def-file %s:\n"
+                        ";; Autogenerated by ld\n"
+                        "LIBRARY %.*s INITINSTANCE TERMINSTANCE\n"
+                        "DATA MULTIPLE NONSHARED\n"
+                        "CODE SINGLE SHARED\n"
+                        "---- End of generated def-file.\n",
+                        psz, cchName, pszName);
+            fclose(pFile);
+            def_filename = psz;
+
+            /* add to auto delete list for removal on exit(). */
+            pName->next = conv_list;
+            conv_list = pName;
+            return;
+        }
+    }
+    free(psz);
+    free(pName);
+}
+
 
 /* atexit worker */