X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Foutput-file.c;h=f2db85f0cd26e2624e30dc895936781e397e4465;hb=6610dc6daa661b7cd042bc6313a29859b87263d9;hp=423bab277144e5378c4ca68faa2d00d463f07781;hpb=fecd2382e77b89f12c9d630ed4e42e9a54ba6953;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/output-file.c b/gas/output-file.c
index 423bab2771..f2db85f0cd 100644
--- a/gas/output-file.c
+++ b/gas/output-file.c
@@ -1,83 +1,73 @@
 /* output-file.c -  Deal with the output file
-   Copyright (C) 1987, 1990, 1991 Free Software Foundation, Inc.
+   Copyright (C) 1987-2016 Free Software Foundation, Inc.
 
-This file is part of GAS, the GNU Assembler.
+   This file is part of GAS, the GNU Assembler.
 
-GAS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
+   GAS is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
 
-GAS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GAS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GAS; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* static const char rcsid[] = "$Id$"; */
-
-/*
- * Confines all details of emitting object bytes to this module.
- * All O/S specific crocks should live here.
- * What we lose in "efficiency" we gain in modularity.
- * Note we don't need to #include the "as.h" file. No common coupling!
- */
-
- /* note that we do need config info.  xoxorich. */
-
-/* #include "style.h" */
-#include <stdio.h>
+   You should have received a copy of the GNU General Public License
+   along with GAS; see the file COPYING.  If not, write to
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #include "as.h"
-
 #include "output-file.h"
 
-static FILE *stdoutput;
+#ifndef TARGET_MACH
+#define TARGET_MACH 0
+#endif
+
+bfd *stdoutput;
 
-void output_file_create(name)
-char *name;
+void
+output_file_create (const char *name)
 {
-  if(name[0]=='-' && name[1]=='\0')
-    stdoutput=stdout;
-  else if ( ! (stdoutput = fopen( name, "w" )) )
+  if (name[0] == '-' && name[1] == '\0')
+    as_fatal (_("can't open a bfd on stdout %s"), name);
+
+  else if (!(stdoutput = bfd_openw (name, TARGET_FORMAT)))
     {
-      as_perror ("FATAL: Can't create %s", name);
-      exit(42);
-    }
-} /* output_file_create() */
+      bfd_error_type err = bfd_get_error ();
 
+      if (err == bfd_error_invalid_target)
+	as_fatal (_("selected target format '%s' unknown"), TARGET_FORMAT);
+      else
+	as_fatal (_("can't create %s: %s"), name, bfd_errmsg (err));
+    }
 
+  bfd_set_format (stdoutput, bfd_object);
+  bfd_set_arch_mach (stdoutput, TARGET_ARCH, TARGET_MACH);
+  if (flag_traditional_format)
+    stdoutput->flags |= BFD_TRADITIONAL_FORMAT;
+}
 
-void output_file_close(filename)
-char *filename;
+void
+output_file_close (const char *filename)
 {
-  if ( EOF == fclose( stdoutput ) )
-    {
-      as_perror ("FATAL: Can't close %s", filename);
-      exit(42);
-    }
-  stdoutput = NULL;		/* Trust nobody! */
-} /* output_file_close() */
+  bfd_boolean res;
 
-void output_file_append(where, length, filename)
-char *where;
-long length;
-char *filename;
-{
+  if (stdoutput == NULL)
+    return;
 
-  for (; length; length--,where++)
-    {
-    	(void)putc(*where,stdoutput);
-	if(ferror(stdoutput))
-      /* if ( EOF == (putc( *where, stdoutput )) ) */
-	{
-	  as_perror("Failed to emit an object byte", filename);
-	  as_fatal("Can't continue");
-	}
-    }
-} /* output_file_append() */
+  /* Close the bfd.  */
+  if (had_errors ())
+    res = bfd_cache_close_all ();
+  else
+    res = bfd_close (stdoutput);
+
+  /* Prevent an infinite loop - if the close failed we will call as_fatal
+     which will call xexit() which may call this function again...  */
+  stdoutput = NULL;
 
-/* end: output-file.c */
+  if (! res)
+    as_fatal (_("can't close %s: %s"), filename,
+	      bfd_errmsg (bfd_get_error ()));
+}