diff options
| author | manu <manu@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-04-11 09:26:48 +0000 |
|---|---|---|
| committer | manu <manu@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-04-11 09:26:48 +0000 |
| commit | 5a9830842f69ebb059061e26f8b0699cbd85121e (patch) | |
| tree | 9e780906c85f6be0ad543abba26314c0c15e5512 /libmudflap | |
| parent | 980af7e02e2f824385a01dea0b053074a70c1645 (diff) | |
| download | gcc-5a9830842f69ebb059061e26f8b0699cbd85121e.tar.gz | |
2012-04-11 Manuel López-Ibáñez <manu@gcc.gnu.org>
PR 24985
gcc/
* diagnostic.h (show_caret): Declare.
(caret_max_width): Declare.
(diagnostic_show_locus): Declare.
* diagnostic.c (diagnostic_initialize): Initialize to false.
(diagnostic_show_locus): New.
(diagnostic_report_diagnostic): Call it.
(getenv_columns): New.
(adjust_line): New.
(diagnostic_set_caret_max_width): New.
* input.c (read_line): New.
(location_get_source_line): New.
* input.h (location_get_source_line): Declare.
* toplev.c (general_init): Initialize show_caret from options.
* dwarf2out.c (gen_producer_string): Handle fdiagnostics-show-caret.
* opts.c (common_handle_option): Likewise.
* pretty-print.h (pp_get_prefix): New.
(pp_base_get_prefix): New.
* common.opt (fdiagnostics-show-caret): New option.
* doc/invoke.texi (fdiagnostics-show-caret): Document it.
testsuite/
* lib/prune.exp: Add -fno-diagnostics-show-caret.
libstdc++-v3/
* testsuite/lib/prune.exp: Handle caret.
libmudflap/
* testsuite/lib/libmudflap.exp: Handle caret.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186305 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libmudflap')
| -rw-r--r-- | libmudflap/ChangeLog | 5 | ||||
| -rw-r--r-- | libmudflap/testsuite/lib/libmudflap.exp | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index 3d3e5af21a9..9fb1cac7758 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,8 @@ +2012-04-11 Manuel López-Ibáñez <manu@gcc.gnu.org> + + PR 24985 + * testsuite/lib/libmudflap.exp: Handle caret. + 2012-01-19 Jakub Jelinek <jakub@redhat.com> PR libmudflap/40778 diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp index f9603553199..00699e87b75 100644 --- a/libmudflap/testsuite/lib/libmudflap.exp +++ b/libmudflap/testsuite/lib/libmudflap.exp @@ -298,6 +298,9 @@ proc libmudflap-dg-prune { system text } { proc prune_gcc_output { text } { + # Ignore caret diagnostics. Unfortunately dejaGNU trims leading + # spaces, so one cannot rely on them being present. + regsub -all "(^|\n)\[^\n\]+\n *\\^\n" $text "\n" text regsub -all {(^|\n)[^\n]*ld: warning: libgcc_s[^\n]*not found[^\n]*try using[^\n]*} $text "" text regsub -all {(^|\n)[^\n]*In function.*pthread_create[^\n]*} $text "" text regsub -all {(^|\n)[^\n]*the use of .pthread.*is deprecated[^\n]*} $text "" text |