diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2011-05-19 17:25:12 +0100 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2011-05-19 17:25:12 +0100 |
| commit | 9e350e99cb9f93ea99216c9c2a40517111636116 (patch) | |
| tree | d058c00dc1d7bc91f5480576092941a860ad9b64 /gcc/Makefile.in | |
| parent | 86ff4081df5f17cefaff375ab48fa0685ea3c3f8 (diff) | |
| download | gcc-9e350e99cb9f93ea99216c9c2a40517111636116.zip gcc-9e350e99cb9f93ea99216c9c2a40517111636116.tar.gz gcc-9e350e99cb9f93ea99216c9c2a40517111636116.tar.bz2 | |
collect2.c: Include diagnostic.h.
* 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.
From-SVN: r173915
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 3be33a2..27ffbbc 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2089,7 +2089,8 @@ sbitmap.o: sbitmap.c sbitmap.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(BASIC_BLOCK ebitmap.o: ebitmap.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(EBITMAP_H) sparseset.o: sparseset.c $(SYSTEM_H) sparseset.h $(CONFIG_H) -COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o intl.o version.o +COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o intl.o version.o \ + diagnostic.o pretty-print.o input.o COLLECT2_LIBS = @COLLECT2_LIBS@ collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS) # Don't try modifying collect2 (aka ld) in place--it might be linking this. @@ -2098,7 +2099,8 @@ collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS) mv -f T$@ $@ collect2.o : collect2.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) intl.h \ - $(OBSTACK_H) $(DEMANGLE_H) collect2.h collect2-aix.h version.h + $(OBSTACK_H) $(DEMANGLE_H) collect2.h collect2-aix.h version.h \ + $(DIAGNOSTIC_H) $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ -DTARGET_MACHINE=\"$(target_noncanonical)\" \ -c $(srcdir)/collect2.c $(OUTPUT_OPTION) @TARGET_SYSTEM_ROOT_DEFINE@ @@ -2107,7 +2109,7 @@ collect2-aix.o : collect2-aix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ collect2-aix.h tlink.o: tlink.c $(DEMANGLE_H) $(HASHTAB_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ - $(OBSTACK_H) collect2.h intl.h + $(OBSTACK_H) collect2.h intl.h $(DIAGNOSTIC_CORE_H) lto-wrapper$(exeext): lto-wrapper.o intl.o $(LIBDEPS) +$(COMPILER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o T$@ lto-wrapper.o intl.o $(LIBS) |