mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-08 15:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR driver/47678 (missing error message for -I)

Browse Source 
PR driver/47678
	* gcc.c (main): Do not compile inputs if there were errors in
	option handling.
	* opts-common.c (read_cmdline_option): Check for wrong language
	after other error checks.

testsuite:
	* gcc.dg/opts-6.c: New test.

From-SVN: r170056
This commit is contained in:
Joseph Myers 2011-02-11 18:13:11 +00:00 committed by Joseph Myers
parent 1c31ca71a7
commit 4df47bca15
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2011-02-11 Joseph Myers <joseph@codesourcery.com>
PR driver/47678
* gcc.c (main): Do not compile inputs if there were errors in
option handling.
* opts-common.c (read_cmdline_option): Check for wrong language
after other error checks.
2011-02-11 Nathan Froyd <froydnj@codesourcery.com>
* cgraph.c: Fix comment typos.

4
gcc/gcc.c
View File

@ -6597,6 +6597,9 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
if (n_infiles == added_libraries)
fatal_error ("no input files");
if (seen_error ())
goto out;
/* Make a place to record the compiler output file names
that correspond to the input files. */
@ -6864,6 +6867,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
printf ("%s\n", bug_report_url);
}
out:
return (signal_count != 0 ? 2
: seen_error () ? (pass_exit_codes ? greatest_status : 1)
: 0);

12
gcc/opts-common.c
View File

@ -960,12 +960,6 @@ read_cmdline_option (struct gcc_options *opts,
return;
}
if (decoded->errors & CL_ERR_WRONG_LANG)
{
handlers->wrong_lang_callback (decoded, lang_mask);
return;
}
if (decoded->errors & CL_ERR_MISSING_ARG)
{
if (option->missing_argument_error)
@ -1012,6 +1006,12 @@ read_cmdline_option (struct gcc_options *opts,
return;
}
if (decoded->errors & CL_ERR_WRONG_LANG)
{
handlers->wrong_lang_callback (decoded, lang_mask);
return;
}
gcc_assert (!decoded->errors);
if (!handle_option (opts, opts_set, decoded, lang_mask, DK_UNSPECIFIED,

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-02-11 Joseph Myers <joseph@codesourcery.com>
PR driver/47678
* gcc.dg/opts-6.c: New test.
2011-02-11 Jakub Jelinek <jakub@redhat.com>
PR debug/47684

6
gcc/testsuite/gcc.dg/opts-6.c Normal file
View File

@ -0,0 +1,6 @@
/* Missing option arguments take precedence over wrong-language
warnings. */
/* { dg-do compile } */
/* { dg-options "-ftemplate-depth=" } */
/* { dg-error "missing argument" "" { target *-*-* } 0 } */