procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c-opts.c (finish_options): Change to returns boolean - false iff the call to cpp_find_main_file fails.

Browse source 
* c-opts.c (finish_options):  Change to returns boolean - false iff
	the call to cpp_find_main_file fails.
	(c_common_init):  Skip preprocess_file if finish_options failed.
	(c_common_parse_file):  Break if finish_options failed.

From-SVN: r73170
This commit is contained in:
Per Bothner 2003-11-01 03:19:59 +00:00 • committed by Per Bothner
parent e31f8eda09
commit 8e974c0eba
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/ChangeLog
View file

@ -1,3 +1,10 @@
2003-10-31 Per Bothner <pbothner@apple.com>
* c-opts.c (finish_options): Change to returns boolean - false iff
the call to cpp_find_main_file fails.
(c_common_init): Skip preprocess_file if finish_options failed.
(c_common_parse_file): Break if finish_options failed.
2003-10-31 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
* aclocal.m4: Blacklist ultrix* for mmap file.

17
gcc/c-opts.c
View file

@ -108,7 +108,7 @@ static void sanitize_cpp_opts (void);
static void add_prefixed_path (const char *, size_t);
static void push_command_line_include (void);
static void cb_file_change (cpp_reader *, const struct line_map *);
static void finish_options (const char *);
static bool finish_options (const char *);
#ifndef STDC_0_IN_SYSTEM_HEADERS
#define STDC_0_IN_SYSTEM_HEADERS 0
@ -1183,8 +1183,8 @@ c_common_init (void)
if (flag_preprocess_only)
{
finish_options (in_fnames[0]);
preprocess_file (parse_in);
if (finish_options (in_fnames[0]))
preprocess_file (parse_in);
return false;
}
@ -1220,7 +1220,8 @@ c_common_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
cpp_undef_all (parse_in);
}
finish_options(in_fnames[file_index]);
if (! finish_options(in_fnames[file_index]))
break;
if (file_index == 0)
pch_init();
c_parse_file ();
@ -1387,8 +1388,8 @@ add_prefixed_path (const char *suffix, size_t chain)
/* Handle -D, -U, -A, -imacros, and the first -include.
TIF is the input file to which we will return after processing all
the includes. */
static void
the includes. Returns true on success. */
static bool
finish_options (const char *tif)
{
if (!cpp_opts->preprocessed)
@ -1441,8 +1442,10 @@ finish_options (const char *tif)
include_cursor = 0;
this_input_filename = tif;
cpp_find_main_file (parse_in, this_input_filename);
if (! cpp_find_main_file (parse_in, this_input_filename))
return false;
push_command_line_include ();
return true;
}
/* Give CPP the next file given by -include, if any. */