Changeset 86 for trunk/src/binutils/gas

Timestamp:

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

Author:

bird

Message:

Applied the original 2.11.2 diff.

Location:

trunk/src/binutils/gas

Files:

• as.c (modified) (5 diffs, 1 prop)
• config/tc-i386.c (modified) (2 diffs, 1 prop)
• config/tc-i386.h (modified) (1 diff, 1 prop)
• config/te-emx.h (added)
• configure.in (modified) (1 diff, 1 prop)
• write.c (modified) (2 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 ();

trunk/src/binutils/gas/config/tc-i386.c

@@ -4509 +4509 @@
   {"64", no_argument, NULL, OPTION_64},
 #endif
+#ifdef EMX
+#define OPTION_ZOMF (OPTION_MD_BASE + 1)
+  {"Zomf", no_argument, NULL, OPTION_ZOMF},
+#define OPTION_ZSTRIP (OPTION_MD_BASE + 2)
+  {"Zstrip", no_argument, NULL, OPTION_ZSTRIP},
+#endif /* EMX */
   {NULL, no_argument, NULL, 0}
 };
 size_t md_longopts_size = sizeof (md_longopts);
+
+#ifdef EMX
+extern int emx_omf;
+extern int emx_strip;
+#endif /* EMX */
 
 int
@@ -4565 +4576 @@
       default_arch = "i386";
       break;
+
+#ifdef EMX
+    case OPTION_ZOMF:
+      emx_omf = 1;
+      break;
+
+    case OPTION_ZSTRIP:
+      emx_strip = 1;
+      break;
+#endif /* EMX */
 
     default:

trunk/src/binutils/gas/config/tc-i386.h

@@ -94 +94 @@
 #ifdef TE_DYNIX
 #define AOUT_TARGET_FORMAT      "a.out-i386-dynix"
+#endif
+#ifdef TE_EMX
+#define AOUT_TARGET_FORMAT      "a.out-emx"
 #endif
 #ifndef AOUT_TARGET_FORMAT

trunk/src/binutils/gas/configure.in

@@ -280 +280 @@
       i386-*-mingw32*)      fmt=coff em=pe bfd_gas=yes ;;
       i386-*-*nt*)          fmt=coff em=pe bfd_gas=yes ;;
+      i386-*-os2*)          fmt=aout em=emx bfd_gas=yes ;;
       i386-*-vxworks*)      fmt=aout ;;
       i386-*-chaos)         fmt=elf ;;

trunk/src/binutils/gas/write.c

@@ -857 +857 @@
 
 #ifdef BFD_ASSEMBLER
+#ifndef __EMX__
+/* UGLY HACK: FOR SOME REASON IT DOESN'T WORK WITH EMX,
+   BUT IT LOOKS LIKE IT IS LIBBFD FAULT! LET'S WAIT TILL IT GETS FIXED. */
         /* We can never adjust a reloc against a weak symbol.  If we
            did, and the weak symbol was overridden by a real symbol
@@ -866 +869 @@
             goto done;
           }
+#endif
 #endif