X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Foutput-file.c;h=2400786e7005d46a9d83158adbe66508e700eb29;hb=45d735237b7edf282131d570a7a9f6aa9ee1bd9c;hp=f401581bed945d6956f96aea6b0e70aae7a02188;hpb=2da5c03714e1f97bb83d05114e97dcf92eb17b64;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/output-file.c b/gas/output-file.c
index f401581bed..2400786e70 100644
--- a/gas/output-file.c
+++ b/gas/output-file.c
@@ -1,12 +1,11 @@
 /* output-file.c -  Deal with the output file
-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1996, 1998, 1999, 2001,
-   2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1987-2019 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,
@@ -16,142 +15,59 @@
 
    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, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-#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
-#define USE_BFD
-#endif
-
-#ifdef BFD_ASSEMBLER
-#define USE_BFD
 #ifndef TARGET_MACH
 #define TARGET_MACH 0
 #endif
-#endif
 
-#ifdef USE_BFD
-#include "bfd.h"
 bfd *stdoutput;
 
 void
-output_file_create (char *name)
+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)))
     {
-      if (bfd_get_error () == bfd_error_invalid_target)
-	as_perror (_("Selected target format '%s' unknown"), 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_perror (_("FATAL: can't create %s"), name);
-      exit (EXIT_FAILURE);
+	as_fatal (_("can't create %s: %s"), name, bfd_errmsg (err));
     }
 
   bfd_set_format (stdoutput, bfd_object);
-#ifdef BFD_ASSEMBLER
   bfd_set_arch_mach (stdoutput, TARGET_ARCH, TARGET_MACH);
-#endif
   if (flag_traditional_format)
     stdoutput->flags |= BFD_TRADITIONAL_FORMAT;
 }
 
 void
-output_file_close (char *filename)
-{
-#ifdef BFD_ASSEMBLER
-  /* Close the bfd.  */
-  if (bfd_close (stdoutput) == 0)
-    {
-      bfd_perror (filename);
-      as_perror (_("FATAL: can't close %s\n"), filename);
-      exit (EXIT_FAILURE);
-    }
-#else
-  /* 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 (EXIT_FAILURE);
-    }
-#endif
-  stdoutput = NULL;		/* Trust nobody!  */
-}
-
-#ifndef BFD_ASSEMBLER
-void
-output_file_append (char *where ATTRIBUTE_UNUSED,
-		    long length ATTRIBUTE_UNUSED,
-		    char *filename ATTRIBUTE_UNUSED)
+output_file_close (const char *filename)
 {
-  abort ();
-}
-#endif
-
-#else
-
-static FILE *stdoutput;
+  bfd_boolean res;
 
-void
-output_file_create (char *name)
-{
-  if (name[0] == '-' && name[1] == '\0')
-    {
-      stdoutput = stdout;
-      return;
-    }
-
-  stdoutput = fopen (name, FOPEN_WB);
   if (stdoutput == NULL)
-    {
-#ifdef BFD_ASSEMBLER
-      bfd_set_error (bfd_error_system_call);
-#endif
-      as_perror (_("FATAL: can't create %s"), name);
-      exit (EXIT_FAILURE);
-    }
-}
+    return;
 
-void
-output_file_close (char *filename)
-{
-  if (EOF == fclose (stdoutput))
-    {
-#ifdef BFD_ASSEMBLER
-      bfd_set_error (bfd_error_system_call);
-#endif
-      as_perror (_("FATAL: can't close %s"), filename);
-      exit (EXIT_FAILURE);
-    }
+  /* Close the bfd.  */
+  if (had_errors ())
+    res = bfd_cache_close_all ();
+  else
+    res = bfd_close (stdoutput);
 
-  /* Trust nobody!  */
+  /* 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;
-}
-
-void
-output_file_append (char * where, long length, char * filename)
-{
-  for (; length; length--, where++)
-    {
-      (void) putc (*where, stdoutput);
 
-      if (ferror (stdoutput))
-	{
-#ifdef BFD_ASSEMBLER
-	  bfd_set_error (bfd_error_system_call);
-#endif
-	  as_perror (_("Failed to emit an object byte"), filename);
-	  as_fatal (_("can't continue"));
-	}
-    }
+  if (! res)
+    as_fatal (_("can't close %s: %s"), filename,
+	      bfd_errmsg (bfd_get_error ()));
 }
-
-#endif
-