Changeset 86 for trunk/src/binutils/gas/as.c

Timestamp:

May 3, 2003, 11:45:43 PM (22 years ago)

Author:

bird

Message:

Applied the original 2.11.2 diff.

File:

• trunk/src/binutils/gas/as.c (modified) (5 diffs, 1 prop)

trunk/src/binutils/gas/as.c

@@ -110 +110 @@
 
 static struct itbl_file_list *itbl_files;
+
+
+#ifdef EMX
+static char *omf_file_name;
+int emx_omf;                    /* -Zomf */
+int emx_strip;                  /* -Zstrip */
+#endif /* EMX */
 
 
@@ -780 +787 @@
   int keep_it;
 
+#ifdef __EMX__
+  _emxload_env ("GCCLOAD");
+  _envargs (&argc, &argv, "GASOPT");
+  _response (&argc, &argv);
+  _wildcard (&argc, &argv);
+#endif /* __EMX__ */
+
   start_time = get_run_time ();
 
@@ -801 +815 @@
 #endif
 
+#ifdef __EMX__
+  myname = _getname(argv[0]);
+#else
   myname = argv[0];
+#endif
   xmalloc_set_program_name (myname);
 
@@ -827 +845 @@
   subsegs_begin ();
   parse_args (&argc, &argv);
+
+#ifdef EMX
+  if (emx_omf)
+    {
+      char *tmp_dir;
+      size_t tmp_dir_len;
+
+      omf_file_name = out_file_name;
+      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);
+      out_file_name = xmalloc (tmp_dir_len + 10);
+      memcpy (out_file_name, tmp_dir, tmp_dir_len);
+      if (tmp_dir_len != 0 && strchr ("\\/:", tmp_dir[tmp_dir_len-1]) == NULL)
+        out_file_name[tmp_dir_len++] = '\\';
+      strcpy (out_file_name + tmp_dir_len, "asXXXXXX");
+      if (mktemp (out_file_name) == NULL)
+        as_fatal ("mktemp() failed");
+    }
+#endif /* EMX */
+
   read_begin ();
   input_scrub_begin ();
@@ -928 +969 @@
   if (!keep_it)
     unlink (out_file_name);
+
+#ifdef EMX
+  if (keep_it && emx_omf)
+    {
+      int rc, i;
+      char *args[6];
+
+      i = 0;
+      args[i++] = "emxomf";
+      if (emx_strip)
+      args[i++] = "-s";
+      args[i++] = "-o";
+      args[i++] = omf_file_name;
+      args[i++] = out_file_name;
+      args[i] = NULL;
+      rc = spawnvp (P_WAIT, "emxomf.exe", args);
+      remove (out_file_name);
+      if (rc < 0)
+        as_fatal ("cannot run emxomf");
+      else if (rc > 0)
+        as_fatal ("emxomf failed");
+    }
+#endif /* EMX */
 
   input_scrub_end ();