Changeset 2670 for trunk/binutils

Timestamp:

Mar 19, 2006, 5:32:41 AM (19 years ago)

Author:

bird

Message:

synced with current libc-0.6(.1) changes.

Location:

trunk/binutils

Files:

• gas/as.c (modified) (4 diffs)
• ltcf-c.sh (modified) (1 diff)

trunk/binutils/gas/as.c

@@ -120 +120 @@
 
 
+#ifdef __EMX__
+# include <sys/emxload.h>
+#endif
 #ifdef EMX
 static char *omf_file_name;
@@ -224 +227 @@
 
 #ifdef BFD_ASSEMBLER
-  fprintf (stderr, _("GNU assembler version %s (%s) using BFD version %s (Innotek Build 2005-11-15 03:52)"),
+  fprintf (stderr, _("GNU assembler version %s (%s) using BFD version %s"),
            VERSION, TARGET_ALIAS, BFD_VERSION_STRING);
 #else
@@ -546 +549 @@
           /* This output is intended to follow the GNU standards document.  */
 #ifdef BFD_ASSEMBLER
-          printf (_("GNU assembler %s (Innotek Build 2005-11-15 03:52)\n"), BFD_VERSION_STRING);
+          printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
 #else
-          printf (_("GNU assembler %s (Innotek Build 2005-11-15 03:52)\n"), VERSION);
+          printf (_("GNU assembler %s\n"), VERSION);
 #endif
           printf (_("Copyright 2002 Free Software Foundation, Inc.\n"));
@@ -861 +864 @@
   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");
+      out_file_name = make_temp_file ("asXXXXXX");
     }
 #endif /* EMX */

trunk/binutils/ltcf-c.sh

@@ -490 +490 @@
     allow_undefined_flag=no
     archive_cmds='$echo "LIBRARY $soname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags ${LT_OS2_LDFLAGS} $output_objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+    old_archive_from_new_cmds='rm -f $output_objdir/$libname.a~emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
     ;;