From 60cf5b23f24d857aab2bfcb351c293fee384bdc7 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Wed, 26 Jul 2000 12:27:29 +0000 Subject: make_temp_file proto is in libiberty now --- gnu/egcs/gcc/collect2.c | 2 -- gnu/egcs/gcc/gcc.c | 39 +++++++++++++++++---------------------- 2 files changed, 17 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/egcs/gcc/collect2.c b/gnu/egcs/gcc/collect2.c index 303c13af535..56ab9cd5e57 100644 --- a/gnu/egcs/gcc/collect2.c +++ b/gnu/egcs/gcc/collect2.c @@ -52,8 +52,6 @@ Boston, MA 02111-1307, USA. */ /* Obstack allocation and deallocation routines. */ #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free - -extern char *make_temp_file PROTO ((char *)); /* On certain systems, we have code that works by scanning the object file directly. But this code uses system-specific header files and library diff --git a/gnu/egcs/gcc/gcc.c b/gnu/egcs/gcc/gcc.c index 9e2573d6d76..b54be5b1a99 100644 --- a/gnu/egcs/gcc/gcc.c +++ b/gnu/egcs/gcc/gcc.c @@ -598,7 +598,7 @@ static struct compiler default_compilers[] = %{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}\ - -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\ + %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\ %{ansi|std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\ %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\ %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\ @@ -612,7 +612,7 @@ static struct compiler default_compilers[] = %{std*} %{nostdinc*} %{A*} %{I*} %I\ %{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a*}\ %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\ - -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\ + %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\ %{ansi|std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\ %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\ %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\ @@ -634,7 +634,7 @@ static struct compiler default_compilers[] = %{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}\ - -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\ + %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\ %{ansi|std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\ %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\ %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\ @@ -662,7 +662,7 @@ static struct compiler default_compilers[] = %{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}\ - -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\ + %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\ %{ansi|std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\ %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\ %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\ @@ -679,7 +679,7 @@ static struct compiler default_compilers[] = cpp %{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}\ - -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\ + %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\ %{std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\ %{!undef:%{!std=*:%p}%{std=gnu*:%p} %P} %{trigraphs}\ %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\ @@ -1288,8 +1288,6 @@ static int argbuf_index; #ifdef MKTEMP_EACH_FILE -extern char *make_temp_file PROTO((const char *)); - /* This is the list of suffixes and codes (%g/%u/%U) and the associated temp file. */ @@ -4818,18 +4816,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 +4879,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 +4960,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 +5153,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); -- cgit v1.2.3