X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Foutput-file.c;h=29497e110e4eedd7bbeec2fbf9d4dbd371b38162;hb=219d1afa89d0d53ca93a684cac341f16470f3ca0;hp=940a0c108e4a26fcc1aaef3056daabfb2d62520e;hpb=a39116f1c91d3642c068d9df871338cca9006be2;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/output-file.c b/gas/output-file.c
index 940a0c108e..29497e110e 100644
--- a/gas/output-file.c
+++ b/gas/output-file.c
@@ -1,122 +1,73 @@
 /* output-file.c -  Deal with the output file
-   Copyright (C) 1987, 1990, 1991 Free Software Foundation, Inc.
-   
+   Copyright (C) 1987-2018 Free Software Foundation, Inc.
+
    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 2, or (at your option)
+   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.
-   
+
    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.  */
-
-/*
- * 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>
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #include "as.h"
-
 #include "output-file.h"
-#ifdef BFD_HEADERS
-#include "bfd.h"
-bfd *stdoutput;
-void output_file_create(name)
-char *name;
-{
-	if(name[0]=='-' && name[1]=='\0')  {
-		as_perror("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);
-	    }
-	bfd_set_format(stdoutput, bfd_object);
-}	
-/* output_file_create() */
-
-
-void output_file_close(filename)
-char *filename;
-{
-	/* Close the bfd without getting bfd to write out anything by itself */
-	if ( bfd_close_all_done( stdoutput ) == 0 )
-	    {
-		    as_perror ("FATAL: Can't close %s\n", filename);
-		    exit(42);
-	    }
-	stdoutput = NULL;		/* Trust nobody! */
-}				/* output_file_close() */
-
-void output_file_append(where, length, filename)
-char *where;
-long length;
-char *filename;
-{
-	abort(); /* Never do this */
-} 
 
-#else
+#ifndef TARGET_MACH
+#define TARGET_MACH 0
+#endif
 
-static FILE *stdoutput;
+bfd *stdoutput;
 
-void output_file_create(name)
-char *name;
+void
+output_file_create (const char *name)
+{
+  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)))
+    {
+      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 (const char *filename)
 {
-	if(name[0]=='-' && name[1]=='\0')
-	    stdoutput=stdout;
-	else if ( ! (stdoutput = fopen( name, "w" )) )
-	    {
-		    as_perror ("FATAL: Can't create %s", name);
-		    exit(42);
-	    }
-} /* output_file_create() */
+  bfd_boolean res;
 
+  if (stdoutput == NULL)
+    return;
 
+  /* Close the bfd.  */
+  if (had_errors ())
+    res = bfd_cache_close_all ();
+  else
+    res = bfd_close (stdoutput);
 
-void output_file_close(filename)
-char *filename;
-{
-	if ( EOF == fclose( stdoutput ) )
-	    {
-		    as_perror ("FATAL: Can't close %s", filename);
-		    exit(42);
-	    }
-	stdoutput = NULL;		/* Trust nobody! */
-} /* output_file_close() */
-
-void output_file_append(where, length, filename)
-char *where;
-long length;
-char *filename;
-{
-	
-	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() */
-
-/* end: output-file.c */
-#endif
+  /* 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;
+
+  if (! res)
+    as_fatal (_("can't close %s: %s"), filename,
+	      bfd_errmsg (bfd_get_error ()));
+}