From e96cf95b755a5d5f952f8e26fa661a9ff807ea7a Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 20 Oct 2022 15:44:09 -0400 Subject: [PATCH 1/3] Allow long-form "--debug" option --- src/jloptions.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/jloptions.c b/src/jloptions.c index ef5d192322c64..801bd8b88a82b 100644 --- a/src/jloptions.c +++ b/src/jloptions.c @@ -130,7 +130,7 @@ static const char opts[] = " --machine-file Run processes on hosts listed in \n\n" // interactive options - " -i Interactive mode; REPL runs and `isinteractive()` is true\n" + " -i, --interactive Interactive mode; REPL runs and `isinteractive()` is true\n" " -q, --quiet Quiet startup: no banner, suppress REPL warnings\n" " --banner={yes|no|auto*} Enable or disable startup banner\n" " --color={yes|no|auto*} Enable or disable color text\n" @@ -146,9 +146,9 @@ static const char opts[] = " -O, --optimize={0,1,2*,3} Set the optimization level (level 3 if `-O` is used without a level)\n" " --min-optlevel={0*,1,2,3} Set a lower bound on the optimization level\n" #ifdef JL_DEBUG_BUILD - " -g [{0,1,2*}] Set the level of debug info generation in the julia-debug build\n" + " -g, --debug=[{0,1,2*}] Set the level of debug info generation in the julia-debug build\n" #else - " -g [{0,1*,2}] Set the level of debug info generation (level 2 if `-g` is used without a level)\n" + " -g, --debug=[{0,1*,2}] Set the level of debug info generation (level 2 if `-g` is used without a level)\n" #endif " --inline={yes*|no} Control whether inlining is permitted, including overriding @inline declarations\n" " --check-bounds={yes|no|auto*}\n" @@ -256,6 +256,7 @@ JL_DLLEXPORT void jl_parse_opts(int *argcp, char ***argvp) { "version", no_argument, 0, 'v' }, { "help", no_argument, 0, 'h' }, { "help-hidden", no_argument, 0, opt_help_hidden }, + { "interactive", no_argument, 0, 'i' }, { "quiet", no_argument, 0, 'q' }, { "banner", required_argument, 0, opt_banner }, { "home", required_argument, 0, 'H' }, @@ -279,6 +280,7 @@ JL_DLLEXPORT void jl_parse_opts(int *argcp, char ***argvp) { "track-allocation",optional_argument, 0, opt_track_allocation }, { "optimize", optional_argument, 0, 'O' }, { "min-optlevel", optional_argument, 0, opt_optlevel_min }, + { "debug", optional_argument, 0, 'g' }, { "check-bounds", required_argument, 0, opt_check_bounds }, { "output-bc", required_argument, 0, opt_output_bc }, { "output-unopt-bc", required_argument, 0, opt_output_unopt_bc }, From 2203dd93cc5338978447968a3b05b2183c9e47c3 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Fri, 21 Oct 2022 09:18:57 -0400 Subject: [PATCH 2/3] Rename option to `--debuginfo` --- src/jloptions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jloptions.c b/src/jloptions.c index 801bd8b88a82b..4efad1d648535 100644 --- a/src/jloptions.c +++ b/src/jloptions.c @@ -146,9 +146,9 @@ static const char opts[] = " -O, --optimize={0,1,2*,3} Set the optimization level (level 3 if `-O` is used without a level)\n" " --min-optlevel={0*,1,2,3} Set a lower bound on the optimization level\n" #ifdef JL_DEBUG_BUILD - " -g, --debug=[{0,1,2*}] Set the level of debug info generation in the julia-debug build\n" + " -g, --debuginfo=[{0,1,2*}] Set the level of debug info generation in the julia-debug build\n" #else - " -g, --debug=[{0,1*,2}] Set the level of debug info generation (level 2 if `-g` is used without a level)\n" + " -g, --debuginfo=[{0,1*,2}] Set the level of debug info generation (level 2 if `-g` is used without a level)\n" #endif " --inline={yes*|no} Control whether inlining is permitted, including overriding @inline declarations\n" " --check-bounds={yes|no|auto*}\n" @@ -280,7 +280,7 @@ JL_DLLEXPORT void jl_parse_opts(int *argcp, char ***argvp) { "track-allocation",optional_argument, 0, opt_track_allocation }, { "optimize", optional_argument, 0, 'O' }, { "min-optlevel", optional_argument, 0, opt_optlevel_min }, - { "debug", optional_argument, 0, 'g' }, + { "debuginfo", optional_argument, 0, 'g' }, { "check-bounds", required_argument, 0, opt_check_bounds }, { "output-bc", required_argument, 0, opt_output_bc }, { "output-unopt-bc", required_argument, 0, opt_output_unopt_bc }, From ed4796fb7f9446f378caeb27868e19cb6910881d Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 3 Nov 2022 16:08:53 -0400 Subject: [PATCH 3/3] Rename option to --debug-info --- src/jloptions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jloptions.c b/src/jloptions.c index 4efad1d648535..8fb709513d7e8 100644 --- a/src/jloptions.c +++ b/src/jloptions.c @@ -146,9 +146,9 @@ static const char opts[] = " -O, --optimize={0,1,2*,3} Set the optimization level (level 3 if `-O` is used without a level)\n" " --min-optlevel={0*,1,2,3} Set a lower bound on the optimization level\n" #ifdef JL_DEBUG_BUILD - " -g, --debuginfo=[{0,1,2*}] Set the level of debug info generation in the julia-debug build\n" + " -g, --debug-info=[{0,1,2*}] Set the level of debug info generation in the julia-debug build\n" #else - " -g, --debuginfo=[{0,1*,2}] Set the level of debug info generation (level 2 if `-g` is used without a level)\n" + " -g, --debug-info=[{0,1*,2}] Set the level of debug info generation (level 2 if `-g` is used without a level)\n" #endif " --inline={yes*|no} Control whether inlining is permitted, including overriding @inline declarations\n" " --check-bounds={yes|no|auto*}\n" @@ -280,7 +280,7 @@ JL_DLLEXPORT void jl_parse_opts(int *argcp, char ***argvp) { "track-allocation",optional_argument, 0, opt_track_allocation }, { "optimize", optional_argument, 0, 'O' }, { "min-optlevel", optional_argument, 0, opt_optlevel_min }, - { "debuginfo", optional_argument, 0, 'g' }, + { "debug-info", optional_argument, 0, 'g' }, { "check-bounds", required_argument, 0, opt_check_bounds }, { "output-bc", required_argument, 0, opt_output_bc }, { "output-unopt-bc", required_argument, 0, opt_output_unopt_bc },