Changeset 914

Timestamp:

Dec 28, 2003, 5:44:43 AM (22 years ago)

Author:

bird

Message:

Added feature for automatic a.out to omf conversion.

File:

• trunk/src/emx/src/emxomf/emxomfld.c (modified) (12 diffs, 1 prop)

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

@@ -1 +1 @@
 /* emxomfld.c --  Provide an ld-like interface to the IBM and M$ linkers
    Copyright (c) 1992-1998 Eberhard Mattes
+   Copyright (c) 2003 InnoTek Systemberatung GmbH
+   Copyright (c) 2003-2004 Knut St. Osmundsen
 
 This file is part of emxomld.
@@ -122 +124 @@
 static char weakdef_fname[_MAX_PATH + 1];
 
+/* list of converted libraries and objects which must be removed upon exit. */
+static name_list *conv_list = NULL;
+
 /* Non-zero if debugging information is to be omitted.  Set by the -s
    and -S options. */
@@ -146 +151 @@
    var. using any of the value VAC365, VAC308 and LINK386. */
 static const char *linker_type = "VAC365";
+
+/* Non-zero if emxomfld should automatically convert a.out objects and
+   archives to the OMF equivalents during linking. */
+static int autoconvert_flag = 1;
+
 
 /* Prototypes. */
@@ -180 +190 @@
            "Usage: emxomfld -o <file> [-l <lib>] [-L <libdir>] [-T <base>] [-igtsS]\n"
            "                [-Zexe] [-Zdll] [-Zstack <size>] [-Zmap[=<map_file>]]\n"
-           "                [-O <option>] <file>...\n"
+           "                [-Z[no-]autoconv] [-O <option>] <file>...\n"
+           "\n"
+           "Options:\n"
+           " -Zno-autoconv / -Zautoconv:\n"
+           "    Turns off/on the automatic conversion of a.out libs and objs.\n"
+           "    default: -Zautoconv\n"
            "\n"
            "Environment variables:\n"
@@ -502 +517 @@
 
   if (fread (&libhdr, 1, sizeof(libhdr), f) == sizeof (libhdr)
+   && !fseek (f, 0, SEEK_SET)
    && libhdr.rec_type == LIBHDR
    && libhdr.flags <= 1 /* ASSUME only first bit is used... */
-   && !fseek (f, 0, SEEK_SET))
+      )
     {
       int page_size = libhdr.rec_len + 3;
@@ -516 +532 @@
 }
 
-/* Finds the full path of a library or object file.
+
+/* Checks if the file handle is to an omf object or library file. */
+
+static int check_omf (FILE *f)
+{
+#pragma pack(1)
+  struct
+  {
+    byte rec_type;
+    word rec_len;
+  } omfhdr;
+#pragma pack()
+  if (fread (&omfhdr, 1, sizeof(omfhdr), f) == sizeof (omfhdr)
+   && omfhdr.rec_type == THEADR
+   && omfhdr.rec_len >= sizeof(omfhdr)
+   && !fseek (f, 0, SEEK_SET)
+      )
+    {
+      return 1;
+    }
+
+  return !fseek (f, 0, SEEK_SET) && check_omf_library (f);
+}
+
+
+/**
+ * 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.
+ */
+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;
+}
+
+
+/* Converts the file indicated by pf & pszFilename to omf closing f and
+   updating filename with the new (temporary filename). A successful
+   return from the function returns a pointe to the filestream for the
+   converted file. On failure NULL is returned, f is closed adn filename
+   is undefined. */
+
+static FILE *aout_to_omf (FILE *pf, char *pszFilename, int fLibrary)
+{
+    int         rc;
+    char *      pszNewFile;
+    name_list  *pName;
+
+    fclose(pf);                         /* don't need this! */
+
+    if (opt_t)
+      fprintf(stderr, "emxomfld: info: converting %s %s to OMF.\n",
+              fLibrary ? "lib" : "obj", pszFilename);
+
+    /*
+     * Make temporary file.
+     */
+    pName = xmalloc(sizeof(name_list));
+    pName->name = pszNewFile = xmalloc(_MAX_PATH);
+    if (make_tempfile(pszNewFile, "ldconv", fLibrary ? ".lib" : ".obj"))
+    {
+        free(pszNewFile);
+        return NULL;
+    }
+
+    /*
+     * Do the conversion.
+     */
+    rc = spawnlp(P_WAIT, "emxomf.exe", "emxomf.exe",
+                 "-o", pszNewFile, pszFilename, NULL);
+    if (!rc)
+    {
+        /* open the file */
+        pf = fopen(pszNewFile, "rb");
+        if (pf)
+        {
+            /* add to auto delete list for removal on exit(). */
+            pName->next = conv_list;
+            conv_list = pName;
+
+            strcpy(pszFilename, pszNewFile);
+
+            if (opt_t)
+              fprintf(stderr, "emxomfld: info: convert result '%s'.\n",
+                      pszFilename);
+            return pf;
+        }
+        remove(pszNewFile);
+    }
+    free(pszNewFile);
+    free(pName);
+
+    fprintf (stderr, "emxomfld: a.out to omf conversion failed for '%s'.\n",
+             pszFilename);
+    exit (2);
+    return NULL;
+}
+
+
+/* Finds the full path of a OMF library or object file.
+
+   This function may perform conversion from a.out to omf if that feature
+   is enabled.
 
    Object files and libraries will be searched for using the LIB env.var
@@ -537 +677 @@
 static FILE *find_objlib (char *fullname, const char *name, int is_library)
 {
-  const char *exts [2][2] = { { ".obj", ".o" }, { ".lib", ".a" } };
+  static const char *exts [2][2] = { { ".obj", ".o" }, { ".lib", ".a" } };
   FILE *f;
   size_t pathlen, namelen = strlen (name);
@@ -605 +745 @@
           if (f)
             {
-              if (is_library && !check_omf_library (f))
+              if (autoconvert_flag && !check_omf (f))
+                f = aout_to_omf (f, fullname, is_library);
+
+              if (is_library && !check_omf_library (f) /* not sure if this makes sense */)
                 fclose (f);
               else
@@ -903 +1046 @@
       weakdef_fname[0] = '\0';
     }
+  for (; conv_list; conv_list = conv_list->next)
+      remove (conv_list->name);
 }
 
@@ -1004 +1149 @@
             ++optind;
           }
+        else if (strcmp (optarg, "autoconv") == 0)
+          autoconvert_flag = 1;
+        else if (strcmp (optarg, "no-autoconv") == 0)
+          autoconvert_flag = 0;
         else
           {
@@ -1137 +1286 @@
                     "*** Linker type: %s\n", linker_name, linker_type);
 
-  /* apply library hacks */
+  /* apply object & library hacks */
+  for (pcur = obj_fnames, rc = 0; !rc && pcur; pcur = pcur->next)
+    {
+      char szname[_MAX_PATH + 1];
+      FILE *phfile = find_objlib (szname, pcur->name, FALSE);
+      if (!phfile)
+        continue;
+      free (pcur->name);
+      pcur->name = xstrdup(szname);
+      fclose(phfile);
+    }
+
   for (pcur = lib_fnames, rc = 0; !rc && pcur; pcur = pcur->next)
     {
@@ -1148 +1308 @@
       fclose(phfile);
     }
+
 
   /* Do the weak prelinking unless GCC_WEAKSYMS are set.