diff options
author | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-19 16:25:12 +0000 |
---|---|---|
committer | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-19 16:25:12 +0000 |
commit | 11091b4d06907a117524c3ac2b2a221d18cbb8dc (patch) | |
tree | d058c00dc1d7bc91f5480576092941a860ad9b64 /gcc/collect2.h | |
parent | c2b8897192542e99d6a98a46926f143fc2dd7bae (diff) | |
download | gcc-11091b4d06907a117524c3ac2b2a221d18cbb8dc.tar.gz |
* collect2.c: Include diagnostic.h.
(fatal_perror, fatal, error, fancy_abort): Remove.
(main): Set progname. Call xmalloc_set_program_name and
diagnostic_initialize.
(maybe_run_lto_and_relink, main, collect_execute, scan_prog_file,
scan_libraries, resolve_lib_name): Call fatal_error instead of
fatal and fatal_perror.
* collect2.h (error, fatal, fatal_perror): Don't declare.
* tlink.c: Include diagnostic-core.h.
(recompile_files): Call fatal_error instead of fatal_perror.
* Makefile.in (COLLECT2_OBJS): Include diagnostic.o,
pretty-print.o and input.o.
(collect2.o, tlink.o): Update dependencies.
testsuite:
* lib/prune.exe (prune_gcc_output): Expect "error:" in collect2
output.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@173915 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/collect2.h')
-rw-r--r-- | gcc/collect2.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gcc/collect2.h b/gcc/collect2.h index e20cc43017a..e18892d3a55 100644 --- a/gcc/collect2.h +++ b/gcc/collect2.h @@ -1,5 +1,5 @@ /* Header file for collect/tlink routines. - Copyright (C) 1998, 2003, 2004, 2005, 2007, 2010 + Copyright (C) 1998, 2003, 2004, 2005, 2007, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -41,11 +41,7 @@ extern struct obstack temporary_obstack; extern char *temporary_firstobj; extern bool vflag, debug; -extern void error (const char *, ...) ATTRIBUTE_PRINTF_1; extern void notice_translated (const char *, ...) ATTRIBUTE_PRINTF_1; extern void notice (const char *, ...) ATTRIBUTE_PRINTF_1; -extern void fatal (const char *, ...) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; -extern void fatal_perror (const char *, ...) - ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; #endif /* ! GCC_COLLECT2_H */ |