Skip to content

Commit 587824f

Browse files
committed
goto-cc modes: interpret command-line options to set default verbosity to warning
We already did this for GCC, but we can also do this for other modes (ARMCC, CodeWarrior, LD, CL, LINK).
1 parent 9659d17 commit 587824f

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

src/goto-cc/armcc_mode.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ int armcc_modet::doit()
4545
has_prefix(base_name, "goto-link");
4646
#endif
4747

48+
const auto default_verbosity =
49+
cmdline.isset("diag_warning=") ? messaget::M_WARNING : messaget::M_ERROR;
4850
const auto verbosity = messaget::eval_verbosity(
49-
cmdline.get_value("verbosity"), messaget::M_ERROR, message_handler);
51+
cmdline.get_value("verbosity"), default_verbosity, message_handler);
5052

5153
messaget log{message_handler};
5254
log.debug() << "ARM mode" << messaget::eom;

src/goto-cc/cw_mode.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ int cw_modet::doit()
4545
has_prefix(base_name, "goto-link");
4646
#endif
4747

48+
const auto default_verbosity =
49+
cmdline.isset("Wall") ? messaget::M_WARNING : messaget::M_ERROR;
4850
const auto verbosity = messaget::eval_verbosity(
49-
cmdline.get_value("verbosity"), messaget::M_ERROR, message_handler);
51+
cmdline.get_value("verbosity"), default_verbosity, message_handler);
5052

5153
messaget log{message_handler};
5254
log.debug() << "CodeWarrior mode" << messaget::eom;

src/goto-cc/ld_mode.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ int ld_modet::doit()
7878
messaget::eval_verbosity(
7979
cmdline.get_value("verbosity"), messaget::M_ERROR, gcc_message_handler);
8080

81-
compilet compiler(cmdline, gcc_message_handler, false);
81+
compilet compiler(
82+
cmdline,
83+
gcc_message_handler,
84+
cmdline.isset("fatal-warnings") && !cmdline.isset("no-fatal-warnings"));
8285

8386
// determine actions to be undertaken
8487
compiler.mode = compilet::LINK_LIBRARY;

src/goto-cc/ms_cl_mode.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ int ms_cl_modet::doit()
5656
has_prefix(base_name, "goto-link");
5757
#endif
5858

59+
const auto default_verbosity = (cmdline.isset("Wall") || cmdline.isset("W4"))
60+
? messaget::M_WARNING
61+
: messaget::M_ERROR;
5962
const auto verbosity = messaget::eval_verbosity(
60-
cmdline.get_value("verbosity"), messaget::M_ERROR, message_handler);
63+
cmdline.get_value("verbosity"), default_verbosity, message_handler);
6164

6265
ms_cl_versiont ms_cl_version;
6366
ms_cl_version.get("cl.exe");

src/goto-cc/ms_link_mode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ int ms_link_modet::doit()
3636
messaget::eval_verbosity(
3737
cmdline.get_value("verbosity"), messaget::M_ERROR, message_handler);
3838

39-
compilet compiler(cmdline, message_handler, false);
39+
compilet compiler(cmdline, message_handler, cmdline.isset("WX"));
4040

4141
// determine actions to be undertaken
4242
compiler.mode = compilet::LINK_LIBRARY;

0 commit comments

Comments
 (0)