From 3a148f26250b13adb094f771a18913a85cc690b3 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 7 Apr 2009 21:51:40 +0000 Subject: [PATCH] Driver: Forward remaining -f options to clang manually. - Groups are really just intended to hold inherent structure of the options, not be abused for individual tool argument translation. llvm-svn: 68554 --- clang/include/clang/Driver/Options.def | 35 +++++++++++++------------- clang/lib/Driver/Tools.cpp | 20 ++++++++++++++- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/clang/include/clang/Driver/Options.def b/clang/include/clang/Driver/Options.def index 9e86a24e386a..1421b6e1f0c7 100644 --- a/clang/include/clang/Driver/Options.def +++ b/clang/include/clang/Driver/Options.def @@ -105,7 +105,6 @@ OPTION("", X_Group, Group, INVALID, INVALID, "", 0, 0, 0) OPTION("", a_Group, Group, INVALID, INVALID, "", 0, 0, 0) OPTION("", d_Group, Group, INVALID, INVALID, "", 0, 0, 0) OPTION("", f_Group, Group, INVALID, INVALID, "", 0, 0, 0) -OPTION("", clang_f_Group, Group, f_Group, INVALID, "", 0, 0, 0) OPTION("", g_Group, Group, INVALID, INVALID, "", 0, 0, 0) OPTION("", i_Group, Group, INVALID, INVALID, "", 0, 0, 0) OPTION("", clang_i_Group, Group, i_Group, INVALID, "", 0, 0, 0) @@ -437,12 +436,12 @@ OPTION("-fdebug-pass-arguments", fdebug_pass_arguments, Flag, f_Group, INVALID, OPTION("-fdebug-pass-structure", fdebug_pass_structure, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fdollars-in-identifiers", fdollars_in_identifiers, Flag, clang_ignored_f_Group, INVALID, "", 0, 0, 0) OPTION("-feliminate-unused-debug-symbols", feliminate_unused_debug_symbols, Flag, f_Group, INVALID, "", 0, 0, 0) -OPTION("-femit-all-decls", femit_all_decls, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-femit-all-decls", femit_all_decls, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fencoding=", fencoding_EQ, Joined, f_Group, INVALID, "", 0, 0, 0) -OPTION("-fexceptions", fexceptions, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-fexceptions", fexceptions, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fextdirs=", fextdirs_EQ, Joined, f_Group, INVALID, "", 0, 0, 0) -OPTION("-ffreestanding", ffreestanding, Flag, clang_f_Group, INVALID, "", 0, 0, 0) -OPTION("-fgnu-runtime", fgnu_runtime, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-ffreestanding", ffreestanding, Flag, f_Group, INVALID, "", 0, 0, 0) +OPTION("-fgnu-runtime", fgnu_runtime, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fheinous-gnu-extensions", fheinous_gnu_extensions, Flag, INVALID, INVALID, "", 0, 0, 0) OPTION("-filelist", filelist, Separate, INVALID, INVALID, "l", 0, 0, 0) OPTION("-findirect-virtual-calls", findirect_virtual_calls, Flag, f_Group, INVALID, "", 0, 0, 0) @@ -450,19 +449,19 @@ OPTION("-finline-functions", finline_functions, Flag, clang_ignored_f_Group, INV OPTION("-finline", finline, Flag, clang_ignored_f_Group, INVALID, "", 0, 0, 0) OPTION("-fkeep-inline-functions", fkeep_inline_functions, Flag, clang_ignored_f_Group, INVALID, "", 0, 0, 0) OPTION("-flat_namespace", flat__namespace, Flag, INVALID, INVALID, "", 0, 0, 0) -OPTION("-flax-vector-conversions", flax_vector_conversions, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-flax-vector-conversions", flax_vector_conversions, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-flimited-precision=", flimited_precision_EQ, Joined, f_Group, INVALID, "", 0, 0, 0) OPTION("-flto", flto, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fmath-errno", fmath_errno, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fmessage-length=", fmessage_length_EQ, Joined, clang_ignored_f_Group, INVALID, "", 0, 0, 0) -OPTION("-fms-extensions", fms_extensions, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-fms-extensions", fms_extensions, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fmudflapth", fmudflapth, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fmudflap", fmudflap, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fnested-functions", fnested_functions, Flag, f_Group, INVALID, "", 0, 0, 0) -OPTION("-fnext-runtime", fnext_runtime, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-fnext-runtime", fnext_runtime, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-blocks", fno_blocks, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-builtin", fno_builtin, Flag, f_Group, INVALID, "", 0, 0, 0) -OPTION("-fno-caret-diagnostics", fno_caret_diagnostics, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-fno-caret-diagnostics", fno_caret_diagnostics, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-common", fno_common, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-constant-cfstrings", fno_constant_cfstrings, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-eliminate-unused-debug-symbols", fno_eliminate_unused_debug_symbols, Flag, f_Group, INVALID, "", 0, 0, 0) @@ -471,7 +470,7 @@ OPTION("-fno-inline", fno_inline, Flag, clang_ignored_f_Group, INVALID, "", 0, 0 OPTION("-fno-keep-inline-functions", fno_keep_inline_functions, Flag, clang_ignored_f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-math-errno", fno_math_errno, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-pascal-strings", fno_pascal_strings, Flag, f_Group, INVALID, "", 0, 0, 0) -OPTION("-fno-show-column", fno_show_column, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-fno-show-column", fno_show_column, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-stack-protector", fno_stack_protector, Flag, clang_ignored_f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-strict-aliasing", fno_strict_aliasing, Flag, clang_ignored_f_Group, INVALID, "", 0, 0, 0) OPTION("-fno-unwind-tables", fno_unwind_tables, Flag, f_Group, INVALID, "", 0, 0, 0) @@ -479,10 +478,10 @@ OPTION("-fno-working-directory", fno_working_directory, Flag, f_Group, INVALID, OPTION("-fno-zero-initialized-in-bss", fno_zero_initialized_in_bss, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fobjc-atdefs", fobjc_atdefs, Flag, clang_ignored_f_Group, INVALID, "", 0, 0, 0) OPTION("-fobjc-call-cxx-cdtors", fobjc_call_cxx_cdtors, Flag, clang_ignored_f_Group, INVALID, "", 0, 0, 0) -OPTION("-fobjc-gc-only", fobjc_gc_only, Flag, clang_f_Group, INVALID, "", 0, 0, 0) -OPTION("-fobjc-gc", fobjc_gc, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-fobjc-gc-only", fobjc_gc_only, Flag, f_Group, INVALID, "", 0, 0, 0) +OPTION("-fobjc-gc", fobjc_gc, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fobjc-new-property", fobjc_new_property, Flag, clang_ignored_f_Group, INVALID, "", 0, 0, 0) -OPTION("-fobjc-nonfragile-abi", fobjc_nonfragile_abi, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-fobjc-nonfragile-abi", fobjc_nonfragile_abi, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fobjc", fobjc, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fomit-frame-pointer", fomit_frame_pointer, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fopenmp", fopenmp, Flag, f_Group, INVALID, "", 0, 0, 0) @@ -493,7 +492,7 @@ OPTION("-fpascal-strings", fpascal_strings, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fpch-preprocess", fpch_preprocess, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fpic", fpic, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fpie", fpie, Flag, f_Group, INVALID, "", 0, 0, 0) -OPTION("-fprint-source-range-info", fprint_source_range_info, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-fprint-source-range-info", fprint_source_range_info, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fprofile-arcs", fprofile_arcs, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fprofile-generate", fprofile_generate, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-framework", framework, Separate, INVALID, INVALID, "l", 0, 0, 0) @@ -502,13 +501,13 @@ OPTION("-fstrict-aliasing", fstrict_aliasing, Flag, clang_ignored_f_Group, INVAL OPTION("-fsyntax-only", fsyntax_only, Flag, INVALID, INVALID, "d", 0, 0, 0) OPTION("-ftemplate-depth-", ftemplate_depth_, Joined, f_Group, INVALID, "", 0, 0, 0) OPTION("-fterminated-vtables", fterminated_vtables, Flag, f_Group, INVALID, "", 0, 0, 0) -OPTION("-ftime-report", ftime_report, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-ftime-report", ftime_report, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-ftraditional", ftraditional, Flag, f_Group, INVALID, "", 0, 0, 0) -OPTION("-ftrapv", ftrapv, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-ftrapv", ftrapv, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-funwind-tables", funwind_tables, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fverbose-asm", fverbose_asm, Flag, f_Group, INVALID, "", 0, 0, 0) -OPTION("-fvisibility=", f_visibility_EQ, Joined, clang_f_Group, INVALID, "", 0, 0, 0) -OPTION("-fwritable-strings", fwritable_strings, Flag, clang_f_Group, INVALID, "", 0, 0, 0) +OPTION("-fvisibility=", fvisibility_EQ, Joined, f_Group, INVALID, "", 0, 0, 0) +OPTION("-fwritable-strings", fwritable_strings, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-fzero-initialized-in-bss", fzero_initialized_in_bss, Flag, f_Group, INVALID, "", 0, 0, 0) OPTION("-f", f, Joined, f_Group, INVALID, "", 0, 0, 0) OPTION("-g0", g0, Joined, g_Group, INVALID, "", 0, 0, 0) diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 9e128984bfd7..4e2a7b993977 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -359,7 +359,25 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } // Forward -f options which we can pass directly. - Args.AddAllArgs(CmdArgs, options::OPT_clang_f_Group); + Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls); + Args.AddLastArg(CmdArgs, options::OPT_fexceptions); + Args.AddLastArg(CmdArgs, options::OPT_ffreestanding); + Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions); + Args.AddLastArg(CmdArgs, options::OPT_fgnu_runtime); + Args.AddLastArg(CmdArgs, options::OPT_flax_vector_conversions); + Args.AddLastArg(CmdArgs, options::OPT_fms_extensions); + Args.AddLastArg(CmdArgs, options::OPT_fnext_runtime); + Args.AddLastArg(CmdArgs, options::OPT_fno_caret_diagnostics); + Args.AddLastArg(CmdArgs, options::OPT_fno_show_column); + Args.AddLastArg(CmdArgs, options::OPT_fobjc_gc_only); + Args.AddLastArg(CmdArgs, options::OPT_fobjc_gc); + // FIXME: Should we remove this? + Args.AddLastArg(CmdArgs, options::OPT_fobjc_nonfragile_abi); + Args.AddLastArg(CmdArgs, options::OPT_fprint_source_range_info); + Args.AddLastArg(CmdArgs, options::OPT_ftime_report); + Args.AddLastArg(CmdArgs, options::OPT_ftrapv); + Args.AddLastArg(CmdArgs, options::OPT_fvisibility_EQ); + Args.AddLastArg(CmdArgs, options::OPT_fwritable_strings); // Forward -f options with positive and negative forms; we translate // these by hand.