From 01354123b9df5d3cbb9d43298eea94ddda30acdf Mon Sep 17 00:00:00 2001 From: Bernhard Schommer Date: Fri, 24 Jun 2016 12:25:30 +0200 Subject: Deactivate options target dependend. Options only available for gnu systems or arm target arch are no longer displayed in the help and cannot be selected any longer. Bug 19197 --- driver/Driver.ml | 144 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 82 insertions(+), 62 deletions(-) (limited to 'driver/Driver.ml') diff --git a/driver/Driver.ml b/driver/Driver.ml index b8c92d6c..5a7bd929 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -293,6 +293,51 @@ let version_string = else "The CompCert C verified compiler, version "^ Version.version ^ "\n" +let gnu_system = Configuration.system <> "diab" + +let gnu_debugging_help = +" -gdwarf- Generate debug information in DWARF v2 or DWARF v3\n" + +let debugging_help = +"Debugging options:\n\ +\ -g Generate debugging information\n\ +\ -gdepth Control generation of debugging information\n\ +\ (=0: none, =1: only-globals, =2: globals + locals\n\ +\ without locations, =3: full;)\n" +^ (if gnu_system then gnu_debugging_help else "")^ +" -frename-static Rename static functions and declarations\n" + +let target_help = if Configuration.arch = "arm" then +"Target processor options:\n\ +\ -mthumb Use Thumb2 instruction encoding\n\ +\ -marm Use classic ARM instruction encoding\n" +else + "" + +let gnu_linker_help = +" -nostartfiles Do not use the standard system startup files when\n\ +\ linking\n\ +\ -nodefaultlibs Do not use the standard system libraries when\n\ +\ linking\n\ +\ -nostdlib Do not use the standard system startup files or\n\ +\ libraries when linking\n" + +let linker_help = +"Linking options:\n\ +\ -l Link library \n\ +\ -L Add to search path for libraries\n" ^ + (if gnu_system then gnu_linker_help else "") ^ +" -s Remove all symbol table and relocation information from the\n\ +\ executable\n\ +\ -static Prevent linking with the shared libraries\n\ +\ -T Use as linker command file\n\ +\ -Wl, Pass option to the linker\n\ +\ -WUl, Pass option to the gcc or dcc used for linking\n\ +\ -Xlinker Pass as an option to the linker\n\ +\ -u Pretend the symbol is undefined to force linking of\n\ +\ library modules to define it.\n" + + let usage_string = version_string ^ "Usage: ccomp [options] \n\ @@ -321,15 +366,9 @@ Processing options:\n\ \ -fpacked-structs Emulate packed structs [off]\n\ \ -finline-asm Support inline 'asm' statements [off]\n\ \ -fall Activate all language support options above\n\ -\ -fnone Turn off all language support options above\n\ -Debugging options:\n\ -\ -g Generate debugging information\n\ -\ -gdwarf- (GCC only) Generate debug information in DWARF v2 or DWARF v3\n\ -\ -gdepth Control generation of debugging information\n\ -\ (=0: none, =1: only-globals, =2: globals + locals\n\ -\ without locations, =3: full;)\n\ -\ -frename-static Rename static functions and declarations\n\ -Optimization options: (use -fno- to turn off -f)\n\ +\ -fnone Turn off all language support options above\n" ^ + debugging_help ^ +"Optimization options: (use -fno- to turn off -f)\n\ \ -O Optimize the compiled code [on by default]\n\ \ -O0 Do not optimize the compiled code\n\ \ -O1 -O2 -O3 Synonymous for -O\n\ @@ -346,32 +385,13 @@ Code generation options: (use -fno- to turn off -f)\n\ \ -fsmall-const Set maximal size for allocation in small constant area\n\ \ -falign-functions Set alignment (in bytes) of function entry points\n\ \ -falign-branch-targets Set alignment (in bytes) of branch targets\n\ -\ -falign-cond-branches Set alignment (in bytes) of conditional branches\n\ -Target processor options:\n\ -\ -mthumb (ARM only) Use Thumb2 instruction encoding\n\ -\ -marm (ARM only) Use classic ARM instruction encoding\n\ -Assembling options:\n\ +\ -falign-cond-branches Set alignment (in bytes) of conditional branches\n" ^ + target_help ^ +"Assembling options:\n\ \ -Wa, Pass option to the assembler\n\ -\ -Xassembler Pass as an option to the assembler\n\ -Linking options:\n\ -\ -l Link library \n\ -\ -L Add to search path for libraries\n\ -\ -nostartfiles (GCC only) Do not use the standard system startup files when\n\ -\ linking\n\ -\ -nodefaultlibs (GCC only) Do not use the standard system libraries when\n\ -\ linking\n\ -\ -nostdlib (GCC only) Do not use the standard system startup files or\n\ -\ libraries when linking\n\ -\ -s Remove all symbol table and relocation information from the\n\ -\ executable\n\ -\ -static Prevent linking with the shared libraries\n\ -\ -T Use as linker command file\n\ -\ -Wl, Pass option to the linker\n\ -\ -WUl, (GCC only) Pass option to the gcc used for linking\n\ -\ -Xlinker Pass as an option to the linker\n\ -\ -u Pretend the symbol is undefined to force linking of\n\ -\ library modules to define it.\n\ -Tracing options:\n\ +\ -Xassembler Pass as an option to the assembler\n" ^ + linker_help ^ +"Tracing options:\n\ \ -dprepro Save C file after preprocessing in .i\n\ \ -dparse Save C file after parsing and elaboration in .parsed.c\n\ \ -dc Save generated Compcert C in .compcert.c\n\ @@ -414,10 +434,6 @@ let optimization_options = [ let set_all opts = List.iter (fun r -> r := true) opts let unset_all opts = List.iter (fun r -> r := false) opts -let gnu_linker_opt s = - if gnu_option s then - push_linker_arg s - let num_source_files = ref 0 let num_input_files = ref 0 @@ -446,12 +462,13 @@ let cmdline_actions = Exact "-fnone", Self (fun _ -> unset_all language_support_options); (* Debugging options *) Exact "-g", Self (fun s -> option_g := true; - option_gdwarf := 3); - Exact "-gdwarf-2", Self (fun s -> option_g:=true; + option_gdwarf := 3);] @ + if gnu_system then + [ Exact "-gdwarf-2", Self (fun s -> option_g:=true; option_gdwarf := 2); Exact "-gdwarf-3", Self (fun s -> option_g := true; - option_gdwarf := 3); - Exact "-frename-static", Self (fun s -> option_rename_static:= true); + option_gdwarf := 3);] else [] @ + [ Exact "-frename-static", Self (fun s -> option_rename_static:= true); Exact "-gdepth", Integer (fun n -> if n = 0 || n <0 then begin option_g := false end else begin @@ -471,32 +488,35 @@ let cmdline_actions = Exact "-falign-cond-branches", Integer(fun n -> option_faligncondbranchs := n); (* Target processor options *) Exact "-conf", String (fun _ -> ()); (* Ignore option since it is already handled *) - Exact "-target", String (fun _ -> ()); (* Ignore option since it is already handled *) - Exact "-mthumb", Set option_mthumb; - Exact "-marm", Unset option_mthumb; + Exact "-target", String (fun _ -> ());] @ (* Ignore option since it is already handled *) + if Configuration.arch = "arm" then + [ Exact "-mthumb", Set option_mthumb; + Exact "-marm", Unset option_mthumb; ] + else [] @ (* Assembling options *) - Prefix "-Wa,", Self (fun s -> if Configuration.system = "diab" then - assembler_options := List.rev_append (explode_comma_option s) !assembler_options + [ Prefix "-Wa,", Self (fun s -> if gnu_system then + assembler_options := s :: !assembler_options else - assembler_options := s :: !assembler_options); - Exact "-Xassembler", String (fun s -> if Configuration.system = "diab" then - assembler_options := s::!assembler_options + assembler_options := List.rev_append (explode_comma_option s) !assembler_options); + Exact "-Xassembler", String (fun s -> if gnu_system then + assembler_options := s::"-Xassembler":: !assembler_options else - assembler_options := s::"-Xassembler":: !assembler_options); + assembler_options := s::!assembler_options ); (* Linking options *) Prefix "-l", Self push_linker_arg; - Prefix "-L", Self push_linker_arg; - Exact "-nostartfiles", Self gnu_linker_opt; - Exact "-nodefaultlibs", Self gnu_linker_opt; - Exact "-nostdlib", Self gnu_linker_opt; - Exact "-s", Self push_linker_arg; + Prefix "-L", Self push_linker_arg; ] @ + if gnu_system then + [ Exact "-nostartfiles", Self push_linker_arg; + Exact "-nodefaultlibs", Self push_linker_arg; + Exact "-nostdlib", Self push_linker_arg;] + else [] @ + [ Exact "-s", Self push_linker_arg; Exact "-static", Self push_linker_arg; - Exact "-T", String (fun s -> if Configuration.system = "diab" then - push_linker_arg ("-Wm"^s) - else begin - push_linker_arg ("-T"); - push_linker_arg(s) - end); + Exact "-T", String (fun s -> if gnu_system then begin + push_linker_arg ("-T"); + push_linker_arg(s) + end else + push_linker_arg ("-Wm"^s)); Exact "-Xlinker", String (fun s -> if Configuration.system = "diab" then push_linker_arg ("-Wl,"^s) else -- cgit