aboutsummaryrefslogtreecommitdiffstats
path: root/cparser/Diagnostics.ml
diff options
context:
space:
mode:
authorCyril SIX <cyril.six@kalray.eu>2019-09-03 10:52:23 +0200
committerCyril SIX <cyril.six@kalray.eu>2019-09-03 10:52:23 +0200
commit0cb5a0b65b4fbeb5bc1c14f75951798f20500177 (patch)
tree767381d2490c86dcee95da2631ac5c94e14de8f5 /cparser/Diagnostics.ml
parent1fbd5d18a9f4398d7ecb9b9ab148a96f575fd1e0 (diff)
parent2f7f68f69b6408e4de6210c827b108eff011af51 (diff)
downloadcompcert-kvx-0cb5a0b65b4fbeb5bc1c14f75951798f20500177.tar.gz
compcert-kvx-0cb5a0b65b4fbeb5bc1c14f75951798f20500177.zip
Merge remote-tracking branch 'origin/mppa-work-upstream-merge' into mppa-work
Conflicts: configure mppa_k1c/Archi.v mppa_k1c/Asmexpand.ml
Diffstat (limited to 'cparser/Diagnostics.ml')
-rw-r--r--cparser/Diagnostics.ml8
1 files changed, 8 insertions, 0 deletions
diff --git a/cparser/Diagnostics.ml b/cparser/Diagnostics.ml
index 51dcab47..012e4b66 100644
--- a/cparser/Diagnostics.ml
+++ b/cparser/Diagnostics.ml
@@ -102,6 +102,7 @@ type warning_type =
| Flexible_array_extensions
| Tentative_incomplete_static
| Reduced_alignment
+ | Non_linear_cond_expr
(* List of active warnings *)
let active_warnings: warning_type list ref = ref [
@@ -163,6 +164,7 @@ let string_of_warning = function
| Flexible_array_extensions -> "flexible-array-extensions"
| Tentative_incomplete_static -> "tentative-incomplete-static"
| Reduced_alignment -> "reduced-alignment"
+ | Non_linear_cond_expr -> "non-linear-cond-expr"
(* Activate the given warning *)
let activate_warning w () =
@@ -216,6 +218,7 @@ let wall () =
Flexible_array_extensions;
Tentative_incomplete_static;
Reduced_alignment;
+ Non_linear_cond_expr;
]
let wnothing () =
@@ -253,6 +256,7 @@ let werror () =
Flexible_array_extensions;
Tentative_incomplete_static;
Reduced_alignment;
+ Non_linear_cond_expr;
]
(* Generate the warning key for the message *)
@@ -437,6 +441,7 @@ let warning_options =
error_option Flexible_array_extensions @
error_option Tentative_incomplete_static @
error_option Reduced_alignment @
+ error_option Non_linear_cond_expr @
[Exact ("-Wfatal-errors"), Set error_fatal;
Exact ("-fdiagnostics-color"), Ignore; (* Either output supports it or no color *)
Exact ("-fno-diagnostics-color"), Unset color_diagnostics;
@@ -492,3 +497,6 @@ let crash exn =
let no_loc = ("", -1)
let file_loc file = (file,-10)
+
+let active_warning ty =
+ fst (classify_warning ty) <> SuppressedMsg