RISC-V: Fix RV32Q conflict

[binutils-gdb.git] / gas / output-file.c

diff --git a/gas/output-file.c b/gas/output-file.c
index f2db85f0cd26e2624e30dc895936781e397e4465..9852a2ed45661efec3cd84dbf175e98fb8bc200a 100644 (file)
--- a/gas/output-file.c
+++ b/gas/output-file.c
@@ -1,5 +1,5 @@
 /* output-file.c -  Deal with the output file
-   Copyright (C) 1987-2016 Free Software Foundation, Inc.
+   Copyright (C) 1987-2022 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -52,13 +52,13 @@ output_file_create (const char *name)
 void
 output_file_close (const char *filename)
 {
-  bfd_boolean res;
+  bool res;
 
   if (stdoutput == NULL)
     return;
 
   /* Close the bfd.  */
-  if (had_errors ())
+  if (!flag_always_generate_output && had_errors ())
     res = bfd_cache_close_all ();
   else
     res = bfd_close (stdoutput);
@@ -68,6 +68,5 @@ output_file_close (const char *filename)
   stdoutput = NULL;
 
   if (! res)
-    as_fatal (_("can't close %s: %s"), filename,
-             bfd_errmsg (bfd_get_error ()));
+    as_fatal ("%s: %s", filename, bfd_errmsg (bfd_get_error ()));
 }