diff options
Diffstat (limited to 'contrib/binutils/gas/output-file.c')
-rw-r--r-- | contrib/binutils/gas/output-file.c | 123 |
1 files changed, 20 insertions, 103 deletions
diff --git a/contrib/binutils/gas/output-file.c b/contrib/binutils/gas/output-file.c index 4c376b4..9603dc4 100644 --- a/contrib/binutils/gas/output-file.c +++ b/contrib/binutils/gas/output-file.c @@ -1,6 +1,6 @@ /* output-file.c - Deal with the output file - Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1996, 1998, 1999, 2001, 2003 - Free Software Foundation, Inc. + Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1996, 1998, 1999, 2001, + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -16,28 +16,16 @@ 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 @@ -48,14 +36,16 @@ output_file_create (char *name) else if (!(stdoutput = bfd_openw (name, TARGET_FORMAT))) { - as_perror (_("FATAL: can't create %s"), name); - exit (EXIT_FAILURE); + 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); -#ifdef BFD_ASSEMBLER bfd_set_arch_mach (stdoutput, TARGET_ARCH, TARGET_MACH); -#endif if (flag_traditional_format) stdoutput->flags |= BFD_TRADITIONAL_FORMAT; } @@ -63,92 +53,19 @@ output_file_create (char *name) 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) -{ - abort (); -} -#endif - -#else - -static FILE *stdoutput; - -void -output_file_create (char *name) -{ - if (name[0] == '-' && name[1] == '\0') - { - stdoutput = stdout; - return; - } + bfd_boolean res; - 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); - } -} - -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); - } + return; + + /* Close the bfd. */ + 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 - |