diff options
Diffstat (limited to 'gcc/gcc.c')
| -rw-r--r-- | gcc/gcc.c | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/gcc/gcc.c b/gcc/gcc.c index e02bc0c1e9a..d4dbf5ea9d6 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -1,5 +1,6 @@ /* Compiler driver program that can handle many languages. - Copyright (C) 1987, 89, 92-98, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000 Free Software Foundation, Inc. This file is part of GNU CC. @@ -594,7 +595,7 @@ static struct compiler default_compilers[] = {"@c", { #if USE_CPPLIB - "%{E|M|MM:cpp -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\ + "%{E|M|MM:cpp0 -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\ %{C} %{v} %{A*} %{I*} %{P} %{$} %I\ %{C:%{!E:%eGNU C does not support -C without using -E}}\ %{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\ @@ -630,7 +631,7 @@ static struct compiler default_compilers[] = %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\ %{!pipe:%g.s} %A\n }}}}" #else /* ! USE_CPPLIB */ - "cpp -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\ + "cpp0 -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\ %{C} %{v} %{A*} %{I*} %{P} %{$} %I\ %{C:%{!E:%eGNU C does not support -C without using -E}}\ %{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\ @@ -658,7 +659,7 @@ static struct compiler default_compilers[] = #endif /* ! USE_CPPLIB */ }}, {"-", - {"%{E:cpp -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\ + {"%{E:cpp0 -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\ %{C} %{v} %{A*} %{I*} %{P} %{$} %I\ %{C:%{!E:%eGNU C does not support -C without using -E}}\ %{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\ @@ -676,7 +677,7 @@ static struct compiler default_compilers[] = {".h", {"@c-header"}}, {"@c-header", {"%{!E:%eCompilation of header file requested} \ - cpp %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %{$} %I\ + cpp0 %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %{$} %I\ %{C:%{!E:%eGNU C does not support -C without using -E}}\ %{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\ %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\ @@ -707,7 +708,7 @@ static struct compiler default_compilers[] = %i %A\n }}}}"}}, {".S", {"@assembler-with-cpp"}}, {"@assembler-with-cpp", - {"cpp -lang-asm %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %{$} %I\ + {"cpp0 -lang-asm %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %{$} %I\ %{C:%{!E:%eGNU C does not support -C without using -E}}\ %{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG} %{trigraphs}\ -$ %{!undef:%p %P} -D__ASSEMBLER__ \ @@ -4818,18 +4819,7 @@ main (argc, argv) if (access (specs_file, R_OK) == 0) read_specs (specs_file, TRUE); - /* Process any user specified specs in the order given on the command - line. */ - for (uptr = user_specs_head; uptr; uptr = uptr->next) - { - char *filename = find_a_file (&startfile_prefixes, uptr->filename, R_OK); - read_specs (filename ? filename : uptr->filename, FALSE); - } - /* If not cross-compiling, look for startfiles in the standard places. */ - /* The fact that these are done here, after reading the specs file, - means that it cannot be found in these directories. - But that's okay. It should never be there anyway. */ if (*cross_compile == '0') { #ifdef MD_EXEC_PREFIX @@ -4892,6 +4882,14 @@ main (argc, argv) "BINUTILS", 0, 0, NULL_PTR); } + /* Process any user specified specs in the order given on the command + line. */ + for (uptr = user_specs_head; uptr; uptr = uptr->next) + { + char *filename = find_a_file (&startfile_prefixes, uptr->filename, R_OK); + read_specs (filename ? filename : uptr->filename, FALSE); + } + /* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake. */ if (gcc_exec_prefix) { @@ -4965,8 +4963,8 @@ main (argc, argv) if (! verbose_flag) { - printf ("\nReport bugs to egcs-bugs@egcs.cygnus.com.\n"); - printf ("Please see the file BUGS (included with the sources) first.\n"); + printf ("\nFor bug reporting instructions, please see:\n"); + printf ("%s.\n", GCCBUGURL); exit (0); } @@ -5158,8 +5156,8 @@ main (argc, argv) if (print_help_list) { - printf ("\nReport bugs to egcs-bugs@egcs.cygnus.com.\n"); - printf ("Please see the file BUGS (included with the sources) first.\n"); + printf ("\nFor bug reporting instructions, please see:\n"); + printf ("%s\n", GCCBUGURL); } exit (error_count > 0 ? (signal_count ? 2 : 1) : 0); |