Changeset 918

Timestamp:

Jan 2, 2004, 3:47:31 AM (22 years ago)

Author:

bird

Message:

Added support for .dll's as libs.

File:

• trunk/src/emx/src/ld/ld.c (modified) (6 diffs, 1 prop)

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

@@ -1 +1 @@
 /* ld.c -- changed for emx by Eberhard Mattes -- Sep 1998
+           chagned for Innotek GCC by Andrew Zabolotny -- 2003
+           chagned for Innotek GCC by knut st. osmundsen -- 2004
            changed for RSX by Rainer Schnitker -- Feb 1996 */
 
@@ -36 +38 @@
 #include <sys/time.h>
 #include <sys/resource.h>
+#endif
+#ifdef __EMX__
+#include <string.h>
 #endif
 
@@ -892 +897 @@
 void do_warnings ();
 void check_exe (void);
+char *lx_to_aout (const char *pszFilename);
+void cleanup (void);
 
 
@@ -962 +969 @@
                                   * sizeof(struct glosym *));
   *cmdline_references = 0;
+
+  /* Cleanup converted file on exit. */
+
+  atexit (cleanup);
 
   /* Completely decode ARGV.  */
@@ -1299 +1310 @@
                 --number_of_files;
                 break;
+              }
+            else if (ext != NULL && stricmp (ext, ".dll") == 0
+                     && res_filename == NULL)
+              { /* convert .dll to temporary import library. */
+                p->filename = lx_to_aout (optarg);
+                p->local_sym_name = optarg;
+                p++;
+                break;
               }
           }
@@ -5309 +5328 @@
   return cplus_demangle (mangled, demangle_options);
 }
+
+
+
+/**
+ * Generates an unique temporary file.
+ *
+ * @returns 0 on success.
+ * @returns -1 on failure.
+ * @param   pszFile     Where to put the filename.
+ * @param   pszPrefix   Prefix.
+ * @param   pszSuffix   Suffix.
+ * @remark  The code is nicked from the weak linker.
+ * @remark sorry about the convention here, this is borrowed from elsewhere.
+ */
+static int      make_tempfile(char *pszFile, const char *pszPrefix, const char *pszSuffix)
+{
+    struct stat     s;
+    unsigned        c = 0;
+    pid_t           pid = getpid();
+    const char *    pszTmp = getenv("TMP");
+    if (!pszTmp)    pszTmp = getenv("TMPDIR");
+    if (!pszTmp)    pszTmp = getenv("TEMP");
+    if (!pszTmp)    pszTmp = ".";
+
+    do
+    {
+        struct timeval  tv = {0,0};
+        if (c++ >= 200)
+            return -1;
+        gettimeofday(&tv, NULL);
+        sprintf(pszFile, "%s\\%s%x%lx%d%lx%s", pszTmp, pszPrefix, pid, tv.tv_sec, c, tv.tv_usec, pszSuffix);
+    } while (!stat(pszFile, &s));
+
+    return 0;
+}
+
+/* list of converted libraries and objects which must be removed upon exit. */
+struct lx_tmp
+{
+    struct lx_tmp *next;
+    char *name;
+}   *conv_list = NULL;
+
+/** Converts a .DLL to an temporary import library.
+ * @remark sorry about the convention here, this is borrowed from elsewhere.
+ */
+char *lx_to_aout (const char *pszFilename)
+{
+    int             rc;
+    char *          pszNewFile;
+    struct lx_tmp  *pName;
+
+    /*
+     * Make temporary file.
+     */
+    pName = (struct lx_tmp *)xmalloc(sizeof(*pName));
+    pName->name = pszNewFile = xmalloc(_MAX_PATH);
+    if (make_tempfile(pszNewFile, "ldconv", ".a"))
+    {
+        free(pszNewFile);
+        return NULL;
+    }
+
+    /*
+     * Do the conversion.
+     */
+    rc = spawnlp(P_WAIT, "emximp.exe", "emximp.exe",
+                 "-o", pszNewFile, pszFilename, NULL);
+    if (!rc)
+    {
+        /* add to auto delete list for removal on exit(). */
+        pName->next = conv_list;
+        conv_list = pName;
+        return pName->name;
+
+    }
+    free(pszNewFile);
+    free(pName);
+
+    fprintf (stderr, "emxomfld: a.out to omf conversion failed for '%s'.\n",
+             pszFilename);
+    exit (2);
+    return NULL;
+}
+
+/* atexit worker */
+void cleanup (void)
+{
+  for (; conv_list; conv_list = conv_list->next)
+    unlink (conv_list->name);
+}