PR sim/12737

[pf3gnuchains/pf3gnuchains4x.git] / gas / output-file.c

diff --git a/gas/output-file.c b/gas/output-file.c
index dfbef1f..e993033 100644 (file)
--- a/gas/output-file.c
+++ b/gas/output-file.c
@@ -1,12 +1,12 @@
 /* output-file.c -  Deal with the output file
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1996, 1998, 1999, 2001,
-   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2006, 2007 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,
@@ -53,9 +53,19 @@ output_file_create (char *name)
 void
 output_file_close (char *filename)
 {
+  bfd_boolean res;
+
+  if (stdoutput == NULL)
+    return;
+    
   /* Close the bfd.  */
-  if (!bfd_close (stdoutput))
+  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;
+
+  if (! res)
     as_fatal (_("can't close %s: %s"), filename,
              bfd_errmsg (bfd_get_error ()));
-  stdoutput = NULL;            /* Trust nobody!  */
 }