diff options
| -rw-r--r-- | include/clang/Driver/CC1Options.h | 32 | ||||
| -rw-r--r-- | include/clang/Driver/CC1Options.td | 335 | ||||
| -rw-r--r-- | include/clang/Driver/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | include/clang/Driver/Makefile | 6 | ||||
| -rw-r--r-- | include/clang/Driver/OptParser.td | 5 | ||||
| -rw-r--r-- | include/clang/Driver/OptTable.h | 3 | ||||
| -rw-r--r-- | include/clang/Driver/Option.h | 6 | ||||
| -rw-r--r-- | include/clang/Driver/Options.td | 483 | ||||
| -rw-r--r-- | lib/Driver/CC1Options.cpp | 38 | ||||
| -rw-r--r-- | lib/Driver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 2 | ||||
| -rw-r--r-- | lib/Driver/OptTable.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 113 | ||||
| -rw-r--r-- | lib/FrontendTool/ExecuteCompilerInvocation.cpp | 4 | ||||
| -rw-r--r-- | test/Sema/fpack-struct.c | 4 | ||||
| -rw-r--r-- | tools/driver/cc1_main.cpp | 4 | ||||
| -rw-r--r-- | tools/driver/driver.cpp | 4 |
17 files changed, 424 insertions, 622 deletions
diff --git a/include/clang/Driver/CC1Options.h b/include/clang/Driver/CC1Options.h index 4a8bbe5feb..e69de29bb2 100644 --- a/include/clang/Driver/CC1Options.h +++ b/include/clang/Driver/CC1Options.h @@ -1,32 +0,0 @@ -//===--- CC1Options.h - Clang CC1 Options Table -----------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef CLANG_DRIVER_CC1OPTIONS_H -#define CLANG_DRIVER_CC1OPTIONS_H - -namespace clang { -namespace driver { - class OptTable; - -namespace cc1options { - enum ID { - OPT_INVALID = 0, // This is not an option ID. -#define OPTION(NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ - HELPTEXT, METAVAR) OPT_##ID, -#include "clang/Driver/CC1Options.inc" - LastOption -#undef OPTION - }; -} - - OptTable *createCC1OptTable(); -} -} - -#endif diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td index 83c988abd1..90933f7ce1 100644 --- a/include/clang/Driver/CC1Options.td +++ b/include/clang/Driver/CC1Options.td @@ -11,8 +11,7 @@ // //===----------------------------------------------------------------------===// -// Include the common option parsing interfaces. -include "OptParser.td" +let Flags = [CC1Option] in { //===----------------------------------------------------------------------===// // Target Options @@ -145,46 +144,12 @@ def fdebug_compilation_dir : Separate<"-fdebug-compilation-dir">, HelpText<"The compilation directory to embed in the debug info.">; def dwarf_debug_flags : Separate<"-dwarf-debug-flags">, HelpText<"The string to embed in the Dwarf debug flags record.">; -def faddress_sanitizer: Flag<"-faddress-sanitizer">, - HelpText<"Enable AddressSanitizer instrumentation (memory error detection)">; -def fthread_sanitizer: Flag<"-fthread-sanitizer">, - HelpText<"Enable ThreadSanitizer instrumentation (race detection)">; def fforbid_guard_variables : Flag<"-fforbid-guard-variables">, HelpText<"Emit an error if a C++ static local initializer would need a guard variable">; -def g : Flag<"-g">, HelpText<"Generate source level debug information">; -def fno_dwarf2_cfi_asm : Flag<"-fno-dwarf2-cfi-asm">, - HelpText<"Don't use the cfi directives">; -def fno_dwarf_directory_asm : Flag<"-fno-dwarf-directory-asm">, - HelpText<"Don't separate directory and filename in .file directives">; -def fcatch_undefined_behavior : Flag<"-fcatch-undefined-behavior">, - HelpText<"Generate runtime checks for undefined behavior.">; -def flimit_debug_info : Flag<"-flimit-debug-info">, - HelpText<"Limit debug information produced to reduce size of debug binary">; -def fno_common : Flag<"-fno-common">, - HelpText<"Compile common globals like normal definitions">; def no_implicit_float : Flag<"-no-implicit-float">, HelpText<"Don't generate implicit floating point instructions (x86-only)">; -def finstrument_functions : Flag<"-finstrument-functions">, - HelpText<"Generate calls to instrument function entry and exit">; -def fno_limit_debug_info : Flag<"-fno-limit-debug-info">, - HelpText<"Do not limit debug information produced to reduce size of debug binary">; -def fno_merge_all_constants : Flag<"-fno-merge-all-constants">, - HelpText<"Disallow merging of constants.">; -def fno_threadsafe_statics : Flag<"-fno-threadsafe-statics">, - HelpText<"Do not emit code to make initialization of local statics thread safe">; def fdump_vtable_layouts : Flag<"-fdump-vtable-layouts">, HelpText<"Dump the layouts of all vtables that will be emitted in a translation unit">; -def ffunction_sections : Flag<"-ffunction-sections">, - HelpText<"Place each function in its own section (ELF Only)">; -def fdata_sections : Flag<"-fdata-sections">, - HelpText<"Place each data in its own section (ELF Only)">; -def fstrict_enums : Flag<"-fstrict-enums">, - HelpText<"Enable optimizations based on the strict definition of an enum's " - "value range.">; -def ftrap_function_EQ : Joined<"-ftrap-function=">, - HelpText<"Issue call to specified function rather than a trap instruction">; -def funroll_loops : Flag<"-funroll-loops">, - HelpText<"Turn on loop unroller">; def femit_coverage_notes : Flag<"-femit-coverage-notes">, HelpText<"Emit a gcov coverage notes file when compiling.">; def femit_coverage_data: Flag<"-femit-coverage-data">, @@ -215,66 +180,35 @@ def menable_unsafe_fp_math : Flag<"-menable-unsafe-fp-math">, "precision">; def mfloat_abi : Separate<"-mfloat-abi">, HelpText<"The float ABI to use">; -def mno_global_merge : Flag<"-mno-global-merge">, - HelpText<"Disable merging of globals">; def mlimit_float_precision : Separate<"-mlimit-float-precision">, HelpText<"Limit float precision to the given value">; def mno_exec_stack : Flag<"-mnoexecstack">, HelpText<"Mark the file as not needing an executable stack">; def mno_zero_initialized_in_bss : Flag<"-mno-zero-initialized-in-bss">, HelpText<"Do not put zero initialized data in the BSS">; -def momit_leaf_frame_pointer : Flag<"-momit-leaf-frame-pointer">, - HelpText<"Omit frame pointer setup for leaf functions.">; -def msoft_float : Flag<"-msoft-float">, - HelpText<"Use software floating point">; def backend_option : Separate<"-backend-option">, HelpText<"Additional arguments to forward to LLVM backend (during code gen)">; def mregparm : Separate<"-mregparm">, HelpText<"Limit the number of registers available for integer arguments">; -def mrelax_all : Flag<"-mrelax-all">, - HelpText<"(integrated-as) Relax all machine instructions">; def msave_temp_labels : Flag<"-msave-temp-labels">, HelpText<"(integrated-as) Save temporary labels">; -def mrtd: Flag<"-mrtd">, - HelpText<"Make StdCall calling convention the default">; def mrelocation_model : Separate<"-mrelocation-model">, HelpText<"The relocation model to use">; def munwind_tables : Flag<"-munwind-tables">, HelpText<"Generate unwinding tables for all functions">; def mconstructor_aliases : Flag<"-mconstructor-aliases">, HelpText<"Emit complete constructors and destructors as aliases when possible">; -def mms_bitfields : Flag<"-mms-bitfields">, - HelpText<"Set the default structure layout to be compatible with the Microsoft compiler standard.">; -def mstackrealign : Flag<"-mstackrealign">, - HelpText<"Force realign the stack at entry to every function.">; -def mstack_alignment : Joined<"-mstack-alignment=">, - HelpText<"Set the stack alignment">; def mlink_bitcode_file : Separate<"-mlink-bitcode-file">, HelpText<"Link the given bitcode file before performing optimizations.">; -def O : Joined<"-O">, HelpText<"Optimization level">; -def Os : Flag<"-Os">, HelpText<"Optimize for size">; -def Oz : Flag<"-Oz">, HelpText<"Optimize for size, regardless of performance">; -def pg : Flag<"-pg">, HelpText<"Enable mcount instrumentation">; //===----------------------------------------------------------------------===// // Dependency Output Options //===----------------------------------------------------------------------===// -def dependency_file : Separate<"-dependency-file">, - HelpText<"Filename (or -) to write dependency output to">; -def dependency_dot : Separate<"-dependency-dot">, - HelpText<"Filename to write DOT-formatted header dependencies to">; def sys_header_deps : Flag<"-sys-header-deps">, HelpText<"Include system headers in dependency output">; def header_include_file : Separate<"-header-include-file">, HelpText<"Filename (or -) to write header include output to">; -def H : Flag<"-H">, - HelpText<"Show header includes and nesting depth">; -def MQ : Separate<"-MQ">, HelpText<"Specify target to quote for dependency">; -def MT : Separate<"-MT">, HelpText<"Specify target for dependency">; -def MP : Flag<"-MP">, - HelpText<"Create phony target for each dependency (other than main file)">; -def MG : Flag<"-MG">, HelpText<"Add missing headers to dependency list">; //===----------------------------------------------------------------------===// // Diagnostic Options @@ -288,44 +222,11 @@ def diagnostic_log_file : Separate<"-diagnostic-log-file">, def diagnostic_serialized_file : Separate<"-serialize-diagnostic-file">, MetaVarName<"<filename>">, HelpText<"File for serializing diagnostics in a binary format">; -def fno_show_column : Flag<"-fno-show-column">, - HelpText<"Do not include column number on diagnostics">; -def fshow_column : Flag<"-fshow-column">, - HelpText<"Include column number on diagnostics">; -def fno_show_source_location : Flag<"-fno-show-source-location">, - HelpText<"Do not include source location information with diagnostics">; -def fshow_overloads_EQ : Joined<"-fshow-overloads=">, - HelpText<"Which overload candidates to show when overload resolution fails: " - "best|all; defaults to all">; -def fno_caret_diagnostics : Flag<"-fno-caret-diagnostics">, - HelpText<"Do not include source line and caret with diagnostics">; -def fno_diagnostics_fixit_info : Flag<"-fno-diagnostics-fixit-info">, - HelpText<"Do not include fixit information in diagnostics">; -def fno_diagnostics_show_note_include_stack : - Flag<"-fno-diagnostics-show-note-include-stack">, - HelpText<"Display include stacks for diagnostic notes">; -def w : Flag<"-w">, HelpText<"Suppress all warnings">; -def pedantic : Flag<"-pedantic">; -def pedantic_errors : Flag<"-pedantic-errors">; - -// This gets all -W options, including -Werror, -W[no-]system-headers, etc. The -// driver has stripped off -Wa,foo etc. The driver has also translated -W to -// -Wextra, so we don't need to worry about it. -def W : Joined<"-W">; - -def fdiagnostics_print_source_range_info : Flag<"-fdiagnostics-print-source-range-info">, - HelpText<"Print source range spans in numeric form">; -def fdiagnostics_parseable_fixits : Flag<"-fdiagnostics-parseable-fixits">, - HelpText<"Print fix-its in machine parseable form">; -def fdiagnostics_show_option : Flag<"-fdiagnostics-show-option">, - HelpText<"Print option name with mappable diagnostics">; + def fdiagnostics_format : Separate<"-fdiagnostics-format">, HelpText<"Change diagnostic formatting to match IDE and command line tools">; def fdiagnostics_show_category : Separate<"-fdiagnostics-show-category">, HelpText<"Print diagnostic category">; -def fdiagnostics_show_note_include_stack : - Flag<"-fdiagnostics-show-note-include-stack">, - HelpText<"Display include stacks for diagnostic notes">; def ftabstop : Separate<"-ftabstop">, MetaVarName<"<N>">, HelpText<"Set the tab stop distance.">; def ferror_limit : Separate<"-ferror-limit">, MetaVarName<"<N>">, @@ -338,12 +239,8 @@ def fconstexpr_backtrace_limit : Separate<"-fconstexpr-backtrace-limit">, MetaVa HelpText<"Set the maximum number of entries to print in a constexpr evaluation backtrace (0 = no limit).">; def fmessage_length : Separate<"-fmessage-length">, MetaVarName<"<N>">, HelpText<"Format message diagnostics so that they fit within N columns or fewer, when possible.">; -def fcolor_diagnostics : Flag<"-fcolor-diagnostics">, - HelpText<"Use colors in diagnostics">; def Wno_rewrite_macros : Flag<"-Wno-rewrite-macros">, HelpText<"Silence ObjC rewriting warnings">; -def verify : Flag<"-verify">, - HelpText<"Verify emitted diagnostics and warnings">; //===----------------------------------------------------------------------===// // Frontend Options @@ -372,11 +269,6 @@ def no_code_completion_globals : Flag<"-no-code-completion-globals">, HelpText<"Do not include global declarations in code-completion results.">; def disable_free : Flag<"-disable-free">, HelpText<"Disable freeing of memory on exit">; -def help : Flag<"-help">, - HelpText<"Print this help text">; -def _help : Flag<"--help">, Alias<help>; -def x : Separate<"-x">, HelpText<"Input language type">; -def o : Separate<"-o">, MetaVarName<"<path>">, HelpText<"Specify output file">; def load : Separate<"-load">, MetaVarName<"<dsopath>">, HelpText<"Load the named plugin (dynamic shared object)">; def plugin : Separate<"-plugin">, MetaVarName<"<name>">, @@ -390,15 +282,11 @@ def resource_dir : Separate<"-resource-dir">, HelpText<"The directory which holds the compiler resource files">; def version : Flag<"-version">, HelpText<"Print the compiler version">; -def _version : Flag<"--version">, Alias<version>; -def Action_Group : OptionGroup<"<action group>">; let Group = Action_Group in { def Eonly : Flag<"-Eonly">, HelpText<"Just run preprocessor, no output (for timings)">; -def E : Flag<"-E">, - HelpText<"Run preprocessor, emit preprocessed file">; def dump_raw_tokens : Flag<"-dump-raw-tokens">, HelpText<"Lex file in raw mode and dump raw tokens">; def analyze : Flag<"-analyze">, @@ -407,8 +295,6 @@ def dump_tokens : Flag<"-dump-tokens">, HelpText<"Run preprocessor, dump internal rep of tokens">; def init_only : Flag<"-init-only">, HelpText<"Only execute frontend initialization">; -def fsyntax_only : Flag<"-fsyntax-only">, - HelpText<"Run parser and perform semantic analysis">; def fixit : Flag<"-fixit">, HelpText<"Apply fix-it advice to the input source">; def fixit_EQ : Joined<"-fixit=">, @@ -434,10 +320,6 @@ def emit_pth : Flag<"-emit-pth">, HelpText<"Generate pre-tokenized header file">; def emit_pch : Flag<"-emit-pch">, HelpText<"Generate pre-compiled header file">; -def S : Flag<"-S">, - HelpText<"Emit native assembly code">; -def emit_llvm : Flag<"-emit-llvm">, - HelpText<"Build ASTs then convert to LLVM, emit .ll file">; def emit_llvm_bc : Flag<"-emit-llvm-bc">, HelpText<"Build ASTs then convert to LLVM, emit .bc file">; def emit_llvm_only : Flag<"-emit-llvm-only">, @@ -448,8 +330,6 @@ def emit_obj : Flag<"-emit-obj">, HelpText<"Emit native object files">; def rewrite_test : Flag<"-rewrite-test">, HelpText<"Rewriter playground">; -def rewrite_objc : Flag<"-rewrite-objc">, - HelpText<"Rewrite ObjC into C (code rewriter example)">; def rewrite_macros : Flag<"-rewrite-macros">, HelpText<"Expand macros without full preprocessing">; def migrate : Flag<"-migrate">, @@ -464,27 +344,11 @@ def arcmt_modify : Flag<"-arcmt-modify">, HelpText<"Apply modifications to files to conform to ARC">; def arcmt_migrate : Flag<"-arcmt-migrate">, HelpText<"Apply modifications and produces temporary files that conform to ARC">; -def arcmt_migrate_report_output : Separate<"-arcmt-migrate-report-output">, - HelpText<"Output path for the plist report">; -def arcmt_migrate_emit_arc_errors : Flag<"-arcmt-migrate-emit-errors">, - HelpText<"Emit ARC errors even if the migrator can fix them">; - -def objcmt_migrate_literals : Flag<"-objcmt-migrate-literals">, - HelpText<"Enable migration to modern ObjC literals">; -def objcmt_migrate_subscripting : Flag<"-objcmt-migrate-subscripting">, - HelpText<"Enable migration to modern ObjC subscripting">; - -def working_directory : JoinedOrSeparate<"-working-directory">, - HelpText<"Resolve file paths relative to the specified directory">; -def working_directory_EQ : Joined<"-working-directory=">, - Alias<working_directory>; def relocatable_pch : Flag<"-relocatable-pch">, HelpText<"Whether to build a relocatable precompiled header">; def print_stats : Flag<"-print-stats">, HelpText<"Print performance metrics and statistics">; -def ftime_report : Flag<"-ftime-report">, - HelpText<"Print the amount of time each phase of compilation takes">; def fdump_record_layouts : Flag<"-fdump-record-layouts">, HelpText<"Dump record layout information">; def fdump_record_layouts_simple : Flag<"-fdump-record-layouts-simple">, @@ -498,11 +362,6 @@ def fixit_recompile : Flag<"-fixit-recompile">, def fixit_to_temp : Flag<"-fixit-to-temporary">, HelpText<"Apply fix-it changes to temporary files">; -// Generic forwarding to LLVM options. This should only be used for debugging -// and experimental features. -def mllvm : Separate<"-mllvm">, - HelpText<"Additional arguments to forward to LLVM's option processing">; - def foverride_record_layout_EQ : Joined<"-foverride-record-layout=">, HelpText<"Override record layouts with those in the given file">; @@ -510,135 +369,37 @@ def foverride_record_layout_EQ : Joined<"-foverride-record-layout=">, // Language Options //===----------------------------------------------------------------------===// -def fno_builtin : Flag<"-fno-builtin">, - HelpText<"Disable implicit builtin knowledge of functions">; -def faltivec : Flag<"-faltivec">, - HelpText<"Enable AltiVec vector initializer syntax">; -def fno_access_control : Flag<"-fno-access-control">, - HelpText<"Disable C++ access control">; -def fno_assume_sane_operator_new : Flag<"-fno-assume-sane-operator-new">, - HelpText<"Don't assume that C++'s global operator new can't alias any pointer">; -def fgnu_keywords : Flag<"-fgnu-keywords">, - HelpText<"Allow GNU-extension keywords regardless of language standard">; -def fgnu89_inline : Flag<"-fgnu89-inline">, - HelpText<"Use the gnu89 inline semantics">; -def fno_inline : Flag<"-fno-inline">, - HelpText<"Disable use of the inline keyword">; -def fno_inline_functions : Flag<"-fno-inline-functions">, - HelpText<"Disable automatic function inlining">; -def fno_gnu_keywords : Flag<"-fno-gnu-keywords">, - HelpText<"Disallow GNU-extension keywords regardless of language standard">; -def fdollars_in_identifiers : Flag<"-fdollars-in-identifiers">, - HelpText<"Allow '$' in identifiers">; -def fno_dollars_in_identifiers : Flag<"-fno-dollars-in-identifiers">, - HelpText<"Disallow '$' in identifiers">; -def femit_all_decls : Flag<"-femit-all-decls">, - HelpText<"Emit all declarations, even if unused">; -def fblocks : Flag<"-fblocks">, - HelpText<"Enable the 'blocks' language feature">; def fblocks_runtime_optional : Flag<"-fblocks-runtime-optional">, HelpText<"Weakly link in the blocks runtime">; -def fheinous_gnu_extensions : Flag<"-fheinous-gnu-extensions">; -def fexceptions : Flag<"-fexceptions">, - HelpText<"Enable support for exception handling">; -def fobjc_exceptions : Flag<"-fobjc-exceptions">, - HelpText<"Enable Objective-C exceptions">; -def fcxx_exceptions : Flag<"-fcxx-exceptions">, - HelpText<"Enable C++ exceptions">; def fsjlj_exceptions : Flag<"-fsjlj-exceptions">, HelpText<"Use SjLj style exceptions">; -def ffast_math : Flag<"-ffast-math">, - HelpText<"Enable the *frontend*'s 'fast-math' mode. This has no effect on " - "optimizations, but provides a preprocessor macro __FAST_MATH__ the " - "same as GCC's -ffast-math flag.">; -def ffreestanding : Flag<"-ffreestanding">, - HelpText<"Assert that the compilation takes place in a freestanding environment">; -def fgnu_runtime : Flag<"-fgnu-runtime">, - HelpText<"Generate output compatible with the standard GNU Objective-C runtime">; def fhidden_weak_vtables : Flag<"-fhidden-weak-vtables">, HelpText<"Generate weak vtables and RTTI with hidden visibility">; -def std_EQ : Joined<"-std=">, - HelpText<"Language standard to compile for">; -def stdlib_EQ : Joined<"-stdlib=">, - HelpText<"C++ standard library to use">; -def fmath_errno : Flag<"-fmath-errno">, - HelpText<"Require math functions to indicate errors by setting errno">; -def fms_extensions : Flag<"-fms-extensions">, - HelpText<"Accept some non-standard constructs supported by the Microsoft compiler">; -def fms_compatibility : Flag<"-fms-compatibility">, - HelpText<"Enable Microsoft compatibility mode">; -def fmsc_version : Joined<"-fmsc-version=">, - HelpText<"Version of the Microsoft C/C++ compiler to report in _MSC_VER (0 = don't define it (default))">; -def fborland_extensions : Flag<"-fborland-extensions">, - HelpText<"Accept non-standard constructs supported by the Borland compiler">; def main_file_name : Separate<"-main-file-name">, HelpText<"Main file name to use for debug info">; -def fno_elide_constructors : Flag<"-fno-elide-constructors">, - HelpText<"Disable C++ copy constructor elision">; -def fno_lax_vector_conversions : Flag<"-fno-lax-vector-conversions">, - HelpText<"Disallow implicit conversions between vectors with a different number of elements or different element types">; -def fno_operator_names : Flag<"-fno-operator-names">, - HelpText<"Do not treat C++ operator name keywords as synonyms for operators">; def fno_signed_char : Flag<"-fno-signed-char">, HelpText<"Char is unsigned">; -def fno_spell_checking : Flag<"-fno-spell-checking">, - HelpText<"Disable spell-checking">; -def fno_use_cxa_atexit : Flag<"-fno-use-cxa-atexit">, - HelpText<"Don't use __cxa_atexit for calling destructors">; def fconstant_string_class : Separate<"-fconstant-string-class">, MetaVarName<"<class name>">, HelpText<"Specify the class to use for constant Objective-C string objects.">; -def fno_constant_cfstrings : Flag<"-fno-constant-cfstrings">, - HelpText<"Enable creation of CodeFoundation-type constant strings">; -def fobjc_arc : Flag<"-fobjc-arc">, - HelpText<"Synthesize retain and release calls for Objective-C pointers">; def fobjc_arc_cxxlib_EQ : Joined<"-fobjc-arc-cxxlib=">, HelpText<"Objective-C++ Automatic Reference Counting standard library kind">; -def fobjc_arc_exceptions : Flag<"-fobjc-arc-exceptions">, - HelpText<"Use EH-safe code when synthesizing retains and releases in -fobjc-arc">; def fobjc_runtime_has_arc : Flag<"-fobjc-runtime-has-arc">, HelpText<"The target Objective-C runtime provides ARC entrypoints">; def fobjc_runtime_has_weak : Flag<"-fobjc-runtime-has-weak">, HelpText<"The target Objective-C runtime supports ARC weak operations">; def fobjc_runtime_has_terminate : Flag<"-fobjc-runtime-has-terminate">, HelpText<"The target Objective-C runtime provides an objc_terminate entrypoint">; -def fobjc_gc : Flag<"-fobjc-gc">, - HelpText<"Enable Objective-C garbage collection">; -def fobjc_gc_only : Flag<"-fobjc-gc-only">, - HelpText<"Use GC exclusively for Objective-C related memory management">; -def fapple_kext : Flag<"-fapple-kext">, - HelpText<"Use Apple's kernel extensions ABI">; def fobjc_dispatch_method_EQ : Joined<"-fobjc-dispatch-method=">, HelpText<"Objective-C dispatch method to use">; def fobjc_default_synthesize_properties : Flag<"-fobjc-default-synthesize-properties">, HelpText<"enable the default synthesis of Objective-C properties">; -def print_ivar_layout : Flag<"-print-ivar-layout">, - HelpText<"Enable Objective-C Ivar layout bitmap print trace">; def fobjc_fragile_abi : Flag<"-fobjc-fragile-abi">, HelpText<"Use Objective-C's fragile ABI">; -def fno_objc_infer_related_result_type : Flag< - "-fno-objc-infer-related-result-type">, - HelpText< - "do not infer Objective-C related result type based on method family">; -def ftrapv : Flag<"-ftrapv">, - HelpText<"Trap on integer overflow">; -def ftrapv_handler : Separate<"-ftrapv-handler">, - MetaVarName<"<function name>">, - HelpText<"Specify the function to be called on overflow.">; -def fwrapv : Flag<"-fwrapv">, - HelpText<"Treat signed integer overflow as two's complement">; def pic_level : Separate<"-pic-level">, HelpText<"Value for __PIC__">; def pie_level : Separate<"-pie-level">, HelpText<"Value for __PIE__">; -def pthread : Flag<"-pthread">, - HelpText<"Support POSIX threads in generated code">; -def fpack_struct : Separate<"-fpack-struct">, - HelpText<"Specify the default maximum struct packing alignment">; -def fpascal_strings : Flag<"-fpascal-strings">, - HelpText<"Recognize and construct Pascal-style string literals">; -def fno_rtti : Flag<"-fno-rtti">, - HelpText<"Disable generation of rtti information">; def fno_validate_pch : Flag<"-fno-validate-pch">, HelpText<"Disable validation of precompiled headers">; def dump_deserialized_pch_decls : Flag<"-dump-deserialized-decls">, @@ -647,44 +408,24 @@ def error_on_deserialized_pch_decl : Separate<"-error-on-deserialized-decl">, HelpText<"Emit error if a specific declaration is deserialized from PCH, for testing">; def error_on_deserialized_pch_decl_EQ : Joined<"-error-on-deserialized-decl=">, Alias<error_on_deserialized_pch_decl>; -def fshort_wchar : Flag<"-fshort-wchar">, - HelpText<"Force wchar_t to be a short unsigned int">; -def fshort_enums : Flag<"-fshort-enums">, - HelpText<"Allocate to an enum type only as many bytes as it needs for the declared range of possible values">; def static_define : Flag<"-static-define">, HelpText<"Should __STATIC__ be defined">; def stack_protector : Separate<"-stack-protector">, HelpText<"Enable stack protectors">; def fvisibility : Separate<"-fvisibility">, HelpText<"Default symbol visibility">; -def fvisibility_inlines_hidden : Flag<"-fvisibility-inlines-hidden">, - HelpText<"Give inline C++ member functions default visibility by default">; def ftemplate_depth : Separate<"-ftemplate-depth">, HelpText<"Maximum depth of recursive template instantiation">; def fconstexpr_depth : Separate<"-fconstexpr-depth">, HelpText<"Maximum depth of recursive constexpr function calls">; -def Wlarge_by_value_copy : Separate<"-Wlarge-by-value-copy">, - HelpText<"Warn if a function definition returns or accepts an object larger " - "in bytes that a given value">; -def Wlarge_by_value_copy_EQ : Joined<"-Wlarge-by-value-copy=">, - Alias<Wlarge_by_value_copy>; -def trigraphs : Flag<"-trigraphs">, - HelpText<"Process trigraph sequences">; -def fwritable_strings : Flag<"-fwritable-strings">, - HelpText<"Store string literals as writable data">; def fconst_strings : Flag<"-fconst-strings">, HelpText<"Use a const qualified type for string literals in C and ObjC">; def fno_const_strings : Flag<"-fno-const-strings">, HelpText<"Don't use a const qualified type for string literals in C and ObjC">; def fno_bitfield_type_align : Flag<"-fno-bitfield-type-align">, HelpText<"Ignore bit-field types when aligning structures">; -def traditional_cpp : Flag<"-traditional-cpp">, - HelpText<"Enable some traditional CPP emulation">; def ffake_address_space_map : Flag<"-ffake-address-space-map">, HelpText<"Use a fake address space map; OpenCL testing purposes only">; -def fdelayed_template_parsing : Flag<"-fdelayed-template-parsing">, - HelpText<"Parse templated function definitions at the end of the " - "translation unit ">; def funknown_anytype : Flag<"-funknown-anytype">, HelpText<"Enable parser support for the __unknown_anytype type; for testing purposes only">; def fdebugger_support : Flag<"-fdebugger-support">, @@ -697,8 +438,6 @@ def fdeprecated_macro : Flag<"-fdeprecated-macro">, HelpText<"Defines the __DEPRECATED macro">; def fno_deprecated_macro : Flag<"-fno-deprecated-macro">, HelpText<"Undefines the __DEPRECATED macro">; -def fapple_pragma_pack : Flag<"-fapple-pragma-pack">, - HelpText<"Enable Apple gcc-compatible #pragma pack handling">; //===----------------------------------------------------------------------===// // Header Search Options @@ -706,48 +445,19 @@ def fapple_pragma_pack : Flag<"-fapple-pragma-pack">, def nostdsysteminc : Flag<"-nostdsysteminc">, HelpText<"Disable standard system #include directories">; -def nostdincxx : Flag<"-nostdinc++">, - HelpText<"Disable standard #include directories for the C++ standard library">; -def nobuiltininc : Flag<"-nobuiltininc">, - HelpText<"Disable builtin #include directories">; -def fmodule_cache_path : Separate<"-fmodule-cache-path">, - MetaVarName<"<directory>">, - HelpText<"Specify the module cache path">; def fmodule_name : Joined<"-fmodule-name=">, MetaVarName<"<name>">, HelpText<"Specify the name of the module to build">; def fdisable_module_hash : Flag<"-fdisable-module-hash">, HelpText<"Disable the module hash">; -def fmodules : Flag<"-fmodules">, - HelpText<"Enable the 'modules' language feature">; - -def F : JoinedOrSeparate<"-F">, MetaVarName<"<directory>">, - HelpText<"Add directory to framework include search path">; -def I : JoinedOrSeparate<"-I">, MetaVarName<"<directory>">, - HelpText<"Add directory to include search path">; -def idirafter : JoinedOrSeparate<"-idirafter">, MetaVarName<"<directory>">, - HelpText<"Add directory to AFTER include search path">; -def index_header_map : Flag<"-index-header-map">, - HelpText<"Make the next included directory (-I or -F) an indexer header map">; -def iquote : JoinedOrSeparate<"-iquote">, MetaVarName<"<directory>">, - HelpText<"Add directory to QUOTE include search path">; def c_isystem : JoinedOrSeparate<"-c-isystem">, MetaVarName<"<directory>">, HelpText<"Add directory to the C SYSTEM include search path">; -def cxx_isystem : JoinedOrSeparate<"-cxx-isystem">, MetaVarName<"<directory>">, - HelpText<"Add directory to the C++ SYSTEM include search path">; def objc_isystem : JoinedOrSeparate<"-objc-isystem">, MetaVarName<"<directory>">, HelpText<"Add directory to the ObjC SYSTEM include search path">; def objcxx_isystem : JoinedOrSeparate<"-objcxx-isystem">, MetaVarName<"<directory>">, HelpText<"Add directory to the ObjC++ SYSTEM include search path">; -def iframework : JoinedOrSeparate<"-iframework">, MetaVarName<"<directory>">, - HelpText<"Add directory to SYSTEM framework search path">; -def isystem : JoinedOrSeparate<"-isystem">, MetaVarName<"<directory>">, - HelpText<"Add directory to SYSTEM include search path">; -def iwithsysroot : JoinedOrSeparate<"-iwithsysroot">,MetaVarName<"<directory>">, - HelpText<"Add directory to SYSTEM include search path, " - "absolute paths are relative to -isysroot">; def internal_isystem : JoinedOrSeparate<"-internal-isystem">, MetaVarName<"<directory>">, HelpText<"Add directory to the internal system include search path; these " @@ -759,29 +469,11 @@ def internal_externc_isystem : JoinedOrSeparate<"-internal-externc-isystem">, "implicit extern \"C\" semantics; these are assumed to not be " "user-provided and are used to model system and standard headers' " "paths.">; -def iprefix : JoinedOrSeparate<"-iprefix">, MetaVarName<"<prefix>">, - HelpText<"Set the -iwithprefix/-iwithprefixbefore prefix">; -def iwithprefix : JoinedOrSeparate<"-iwithprefix">, MetaVarName<"<dir>">, - HelpText<"Set directory to SYSTEM include search path with prefix">; -def iwithprefixbefore : JoinedOrSeparate<"-iwithprefixbefore">, - MetaVarName<"<dir>">, - HelpText<"Set directory to include search path with prefix">; -def isysroot : JoinedOrSeparate<"-isysroot">, MetaVarName<"<dir>">, - HelpText<"Set the system root directory (usually /)">; -def v : Flag<"-v">, HelpText<"Enable verbose output">; //===----------------------------------------------------------------------===// // Preprocessor Options //===----------------------------------------------------------------------===// -def D : JoinedOrSeparate<"-D">, MetaVarName<"<macro>">, - HelpText<"Predefine the specified macro">; -def include_ : JoinedOrSeparate<"-include">, MetaVarName<"<file>">, EnumName<"include">, - HelpText<"Include file before parsing">; -def imacros : JoinedOrSeparate<"-imacros">, MetaVarName<"<file>">, - HelpText<"Include macros from file before parsing">; -def include_pch : Separate<"-include-pch">, MetaVarName<"<file>">, - HelpText<"Include precompiled header file">; def include_pth : Separate<"-include-pth">, MetaVarName<"<file>">, HelpText<"Include file before parsing">; def chain_include : Separate<"-chain-include">, MetaVarName<"<file>">, @@ -791,29 +483,8 @@ def preamble_bytes_EQ : Joined<"-preamble-bytes=">, "covering the first N bytes of the main file">; def token_cache : Separate<"-token-cache">, MetaVarName<"<path>">, HelpText<"Use specified token cache file">; -def U : JoinedOrSeparate<"-U">, MetaVarName<"<macro>">, - HelpText<"Undefine the specified macro">; -def undef : Flag<"-undef">, MetaVarName<"<macro>">, - HelpText<"undef all system defines">; def detailed_preprocessing_record : Flag<"-detailed-preprocessing-record">, HelpText<"include a detailed record of preprocessing actions">; -def mqdsp6_compat : Flag<"-mqdsp6-compat">, - HelpText<"Enable hexagon-qdsp6 backward compatibility">; - -//===----------------------------------------------------------------------===// -// Preprocessed Output Options -//===----------------------------------------------------------------------===// - -def P : Flag<"-P">, - HelpText<"Disable linemarker output in -E mode">; -def C : Flag<"-C">, - HelpText<"Enable comment output in -E mode">; -def CC : Flag<"-CC">, - HelpText<"Enable comment output in -E mode, even from macro expansions">; -def dM : Flag<"-dM">, - HelpText<"Print macro definitions in -E mode instead of normal output">; -def dD : Flag<"-dD">, - HelpText<"Print macro definitions in -E mode in addition to normal output">; //===----------------------------------------------------------------------===// // OpenCL Options @@ -840,3 +511,5 @@ def cl_std_EQ : Joined<"-cl-std=">, def fcuda_is_device : Flag<"-fcuda-is-device">, HelpText<"Generate code for CUDA device">; + +} // let Flags = [CC1Option] diff --git a/include/clang/Driver/CMakeLists.txt b/include/clang/Driver/CMakeLists.txt index abd4cfe501..1277d51edb 100644 --- a/include/clang/Driver/CMakeLists.txt +++ b/include/clang/Driver/CMakeLists.txt @@ -2,10 +2,6 @@ clang_tablegen(Options.inc -gen-opt-parser-defs SOURCE Options.td TARGET ClangDriverOptions) -clang_tablegen(CC1Options.inc -gen-opt-parser-defs - SOURCE CC1Options.td - TARGET ClangCC1Options) - clang_tablegen(CC1AsOptions.inc -gen-opt-parser-defs SOURCE CC1AsOptions.td TARGET ClangCC1AsOptions) diff --git a/include/clang/Driver/Makefile b/include/clang/Driver/Makefile index 45bc40f3b7..007bff5709 100644 --- a/include/clang/Driver/Makefile +++ b/include/clang/Driver/Makefile @@ -1,5 +1,5 @@ CLANG_LEVEL := ../../.. -BUILT_SOURCES = Options.inc CC1Options.inc CC1AsOptions.inc +BUILT_SOURCES = Options.inc CC1AsOptions.inc TABLEGEN_INC_FILES_COMMON = 1 @@ -9,10 +9,6 @@ $(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(CLANG_TBLGEN) $(ObjDir)/.d $(Echo) "Building Clang Driver Option tables with tblgen" $(Verb) $(ClangTableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< -$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(CLANG_TBLGEN) $(ObjDir)/.dir - $(Echo) "Building Clang CC1 Option tables with tblgen" - $(Verb) $(ClangTableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< - $(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(CLANG_TBLGEN) $(ObjDir)/.dir $(Echo) "Building Clang CC1 Assembler Option tables with tblgen" $(Verb) $(ClangTableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< diff --git a/include/clang/Driver/OptParser.td b/include/clang/Driver/OptParser.td index 25ecbc35f9..9e6d5b9118 100644 --- a/include/clang/Driver/OptParser.td +++ b/include/clang/Driver/OptParser.td @@ -85,6 +85,9 @@ def HelpHidden : OptionFlag; // NoForward - The option should not be implicitly forwarded to other tools. def NoForward : OptionFlag; +// CC1Option - This option should be accepted by clang -cc1. +def CC1Option : OptionFlag; + // Define the option group class. class OptionGroup<string name> { @@ -134,5 +137,5 @@ class MetaVarName<string name> { string MetaVarName = name; } // FIXME: Have generator validate that these appear in correct position (and // aren't duplicated). -def INPUT : Option<"<input>", KIND_INPUT>, Flags<[DriverOption]>; +def INPUT : Option<"<input>", KIND_INPUT>, Flags<[DriverOption,CC1Option]>; def UNKNOWN : Option<"<unknown>", KIND_UNKNOWN>; diff --git a/include/clang/Driver/OptTable.h b/include/clang/Driver/OptTable.h index 3af6f8fa3e..7b88080b43 100644 --- a/include/clang/Driver/OptTable.h +++ b/include/clang/Driver/OptTable.h @@ -25,7 +25,8 @@ namespace options { RenderAsInput = (1 << 5), RenderJoined = (1 << 6), RenderSeparate = (1 << 7), - Unsupported = (1 << 8) + Unsupported = (1 << 8), + CC1Option = (1 << 9) }; } diff --git a/include/clang/Driver/Option.h b/include/clang/Driver/Option.h index 8243f6d693..e6c4e12e0d 100644 --- a/include/clang/Driver/Option.h +++ b/include/clang/Driver/Option.h @@ -91,6 +91,9 @@ namespace driver { /// This option should not be implicitly forwarded. bool NoForward : 1; + /// CC1Option - This option should be accepted by clang -cc1. + bool CC1Option : 1; + protected: Option(OptionClass Kind, OptSpecifier ID, const char *Name, const OptionGroup *Group, const Option *Alias); @@ -126,6 +129,9 @@ namespace driver { bool hasNoForward() const { return NoForward; } void setNoForward(bool Value) { NoForward = Value; } + bool isCC1Option() const { return CC1Option; } + void setIsCC1Option(bool Value) { CC1Option = Value; } + bool hasForwardToGCC() const { return !NoForward && !DriverOption && !LinkerInput; } diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index f6bb256a12..4ca5e95945 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -19,6 +19,7 @@ include "OptParser.td" // Meta-group which defines def CompileOnly_Group : OptionGroup<"<CompileOnly group>">; +def Action_Group : OptionGroup<"<action group>">; def I_Group : OptionGroup<"<I group>">, Group<CompileOnly_Group>; def L_Group : OptionGroup<"<L group>">, Group<CompileOnly_Group>; @@ -120,18 +121,19 @@ def ccc_arrmt_modify : Flag<"-ccc-arrmt-modify">, Alias<ccc_arcmt_modify>; def ccc_arcmt_migrate : Separate<"-ccc-arcmt-migrate">, CCCDriverOpt, HelpText<"Apply modifications and produces temporary files that conform to ARC">; def arcmt_migrate_report_output : Separate<"-arcmt-migrate-report-output">, - HelpText<"Output path for the plist report">; + HelpText<"Output path for the plist report">, Flags<[CC1Option]>; def arcmt_migrate_emit_arc_errors : Flag<"-arcmt-migrate-emit-errors">, - HelpText<"Emit ARC errors even if the migrator can fix them">; + HelpText<"Emit ARC errors even if the migrator can fix them">, + Flags<[CC1Option]>; def _migrate : Flag<"--migrate">, Flags<[DriverOption]>, HelpText<"Run the migrator">; def ccc_objcmt_migrate : Separate<"-ccc-objcmt-migrate">, CCCDriverOpt, HelpText<"Apply modifications and produces temporary files to migrate to " "modern ObjC syntax">; -def objcmt_migrate_literals : Flag<"-objcmt-migrate-literals">, +def objcmt_migrate_literals : Flag<"-objcmt-migrate-literals">, Flags<[CC1Option]>, HelpText<"Enable migration to modern ObjC literals">; -def objcmt_migrate_subscripting : Flag<"-objcmt-migrate-subscripting">, +def objcmt_migrate_subscripting : Flag<"-objcmt-migrate-subscripting">, Flags<[CC1Option]>, HelpText<"Enable migration to modern ObjC subscripting">; // Make sure all other -ccc- options are rejected. @@ -146,66 +148,76 @@ def _HASH_HASH_HASH : Flag<"-###">, Flags<[DriverOption]>, def _DASH_DASH : Flag<"--">, Flags<[DriverOption]>; def A : JoinedOrSeparate<"-A">; def B : JoinedOrSeparate<"-B">; -def CC : Flag<"-CC">; -def C : Flag<"-C">; -def D : JoinedOrSeparate<"-D">, Group<CompileOnly_Group>; -def E : Flag<"-E">, Flags<[DriverOption]>, +def CC : Flag<"-CC">, Flags<[CC1Option]>; +def C : Flag<"-C">, Flags<[CC1Option]>; +def D : JoinedOrSeparate<"-D">, Group<CompileOnly_Group>, Flags<[CC1Option]>; +def E : Flag<"-E">, Flags<[DriverOption,CC1Option]>, Group<Action_Group>, HelpText<"Only run the preprocessor">; -def F : JoinedOrSeparate<"-F">, Flags<[RenderJoined]>; +def F : JoinedOrSeparate<"-F">, Flags<[RenderJoined,CC1Option]>, + HelpText<"Add directory to framework include search path">; def G : Separate<"-G">, Flags<[DriverOption]>; -def H : Flag<"-H">; +def H : Flag<"-H">, Flags<[CC1Option]>, + HelpText<"Show header includes and nesting depth">; def I_ : Flag<"-I-">, Group<I_Group>; -def I : JoinedOrSeparate<"-I">, Group<I_Group>; +def I : JoinedOrSeparate<"-I">, Group<I_Group>, Flags<[CC1Option]>, + HelpText<"Add directory to include search path">; def L : JoinedOrSeparate<"-L">, Flags<[RenderJoined]>; def MD : Flag<"-MD">, Group<M_Group>; def MF : JoinedOrSeparate<"-MF">, Group<M_Group>; -def MG : Flag<"-MG">, Group<M_Group>; +def MG : Flag<"-MG">, Group<M_Group>, Flags<[CC1Option]>, + HelpText<"Add missing headers to dependency list">; def MMD : Flag<"-MMD">, Group<M_Group>; def MM : Flag<"-MM">, Group<M_Group>; -def MP : Flag<"-MP">, Group<M_Group>; -def MQ : JoinedOrSeparate<"-MQ">, Group<M_Group>; -def MT : JoinedOrSeparate<"-MT">, Group<M_Group>; +def MP : Flag<"-MP">, Group<M_Group>, Flags<[CC1Option]>, + HelpText<"Create phony target for each dependency (other than main file)">; +def MQ : JoinedOrSeparate<"-MQ">, Group<M_Group>, Flags<[CC1Option]>, + HelpText<"Specify target to quote for dependency">; +def MT : JoinedOrSeparate<"-MT">, Group<M_Group>, Flags<[CC1Option]>, + HelpText<"Specify target for dependency">; def Mach : Flag<"-Mach">; def M : Flag<"-M">, Group<M_Group>; -def O0 : Joined<"-O0">, Group<O_Group>; -def O4 : Joined<"-O4">, Group<O_Group>; +def O0 : Joined<"-O0">, Group<O_Group>, Flags<[CC1Option]>; +def O4 : Joined<"-O4">, Group<O_Group>, Flags<[CC1Option]>; def ObjCXX : Flag<"-ObjC++">, Flags<[DriverOption]>, HelpText<"Treat source input files as Objective-C++ inputs">; def ObjC : Flag<"-ObjC">, Flags<[DriverOption]>, HelpText<"Treat source input files as Objective-C inputs">; -def O : Joined<"-O">, Group<O_Group>; -def P : Flag<"-P">; +def O : Joined<"-O">, Group<O_Group>, Flags<[CC1Option]>; +def P : Flag<"-P">, Flags<[CC1Option]>, + HelpText<"Disable linemarker output in -E mode">; def Qn : Flag<"-Qn">; def Qunused_arguments : Flag<"-Qunused-arguments">, Flags<[DriverOption]>, HelpText<"Don't emit warning for unused driver arguments">; def Q : Flag<"-Q">; def R : Flag<"-R">; -def S : Flag<"-S">, Flags<[DriverOption]>, +def S : Flag<"-S">, Flags<[DriverOption,CC1Option]>, Group<Action_Group>, HelpText<"Only run preprocess and compilation steps">; def Tbss : JoinedOrSeparate<"-Tbss">, Group<T_Group>; def Tdata : JoinedOrSeparate<"-Tdata">, Group<T_Group>; def Ttext : JoinedOrSeparate<"-Ttext">, Group<T_Group>; def T : JoinedOrSeparate<"-T">, Group<T_Group>; -def U : JoinedOrSeparate<"-U">, Group<CompileOnly_Group>; +def U : JoinedOrSeparate<"-U">, Group<CompileOnly_Group>, Flags<[CC1Option]>; def V : JoinedOrSeparate<"-V">, Flags<[DriverOption, Unsupported]>; def Wa_COMMA : CommaJoined<"-Wa,">, HelpText<"Pass the comma separated arguments in <arg> to the assembler">, MetaVarName<"<arg>">; -def Wall : Flag<"-Wall">, Group<W_Group>; -def Wdeprecated : Flag<"-Wdeprecated">, Group<W_Group>; -def Wno_deprecated : Flag<"-Wno-deprecated">, Group<W_Group>; -def Wextra : Flag<"-Wextra">, Group<W_Group>; +def Wall : Flag<"-Wall">, Group<W_Group>, Flags<[CC1Option]>; +def Wdeprecated : Flag<"-Wdeprecated">, Group<W_Group>, Flags<[CC1Option]>; +def Wno_deprecated : Flag<"-Wno-deprecated">, Group<W_Group>, Flags<[CC1Option]>; +def Wextra : Flag<"-Wextra">, Group<W_Group>, Flags<[CC1Option]>; def Wl_COMMA : CommaJoined<"-Wl,">, Flags<[LinkerInput, RenderAsInput]>, HelpText<"Pass the comma separated arguments in <arg> to the linker">, MetaVarName<"<arg>">; -def Wno_nonportable_cfstrings : Joined<"-Wno-nonportable-cfstrings">, Group<W_Group>; -def Wnonportable_cfstrings : Joined<"-Wnonportable-cfstrings">, Group<W_Group>; +def Wno_nonportable_cfstrings : Joined<"-Wno-nonportable-cfstrings">, Group<W_Group>, + Flags<[CC1Option]>; +def Wnonportable_cfstrings : Joined<"-Wnonportable-cfstrings">, Group<W_Group>, + Flags<[CC1Option]>; def Wp_COMMA : CommaJoined<"-Wp,">, HelpText<"Pass the comma separated arguments in <arg> to the preprocessor">, MetaVarName<"<arg>">; -def Wwrite_strings : Flag<"-Wwrite-strings">, Group<W_Group>; -def Wno_write_strings : Flag<"-Wno-write-strings">, Group<W_Group>; -def W_Joined : Joined<"-W">, Group<W_Group>; +def Wwrite_strings : Flag<"-Wwrite-strings">, Group<W_Group>, Flags<[CC1Option]>; +def Wno_write_strings : Flag<"-Wno-write-strings">, Group<W_Group>, Flags<[CC1Option]>; +def W_Joined : Joined<"-W">, Group<W_Group>, Flags<[CC1Option]>; def Xanalyzer : Separate<"-Xanalyzer">, HelpText<"Pass <arg> to the static analyzer">, MetaVarName<"<arg>">; def Xarch__ : JoinedAndSeparate<"-Xarch_">, Flags<[DriverOption]>; @@ -239,14 +251,21 @@ def compatibility__version : JoinedOrSeparate<"-compatibility_version">; def coverage : Flag<"-coverage">; def cpp_precomp : Flag<"-cpp-precomp">, Group<clang_ignored_f_Group>; def current__version : JoinedOrSeparate<"-current_version">; -def cxx_isystem : JoinedOrSeparate<"-cxx-isystem">, Group<clang_i_Group>; +def cxx_isystem : JoinedOrSeparate<"-cxx-isystem">, Group<clang_i_Group>, + HelpText<"Add directory to the C++ SYSTEM include search path">, Flags<[CC1Option]>, + MetaVarName<"<directory>">; def c : Flag<"-c">, Flags<[DriverOption]>, HelpText<"Only run preprocess, compile, and assemble steps">; def dA : Flag<"-dA">, Group<d_Group>; -def dD : Flag<"-dD">, Group<d_Group>; -def dM : Flag<"-dM">, Group<d_Group>; +def dD : Flag<"-dD">, Group<d_Group>, Flags<[CC1Option]>, + HelpText<"Print macro definitions in -E mode in addition to normal output">; +def dM : Flag<"-dM">, Group<d_Group>, Flags<[CC1Option]>, + HelpText<"Print macro definitions in -E mode instead of normal output">; def dead__strip : Flag<"-dead_strip">; -def dependency_file : Separate<"-dependency-file">; +def dependency_file : Separate<"-dependency-file">, Flags<[CC1Option]>, + HelpText<"Filename (or -) to write dependency output to">; +def dependency_dot : Separate<"-dependency-dot">, Flags<[CC1Option]>, + HelpText<"Filename to write DOT-formatted header dependencies to">; def dumpmachine : Flag<"-dumpmachine">; def dumpspecs : Flag<"-dumpspecs">, Flags<[Unsupported]>; def dumpversion : Flag<"-dumpversion">; @@ -259,7 +278,7 @@ def d_Flag : Flag<"-d">, Group<d_Group>; def d_Joined : Joined<"-d">, Group<d_Group>; def emit_ast : Flag<"-emit-ast">, HelpText<"Emit Clang AST files for source inputs">; -def emit_llvm : Flag<"-emit-llvm">, +def emit_llvm : Flag<"-emit-llvm">, Flags<[CC1Option]>, Group<Action_Group>, HelpText<"Use the LLVM representation for assembler and object files">; def exported__symbols__list : Separate<"-exported_symbols_list">; def e : JoinedOrSeparate<"-e">; @@ -269,13 +288,18 @@ def fPIE : Flag<"-fPIE">, Group<f_Group>; def fno_PIE : Flag<"-fno-PIE">, Group<f_Group>; def faccess_control : Flag<"-faccess-control">, Group<f_Group>; def fallow_unsupported : Flag<"-fallow-unsupported">, Group<f_Group>; -def faltivec : Flag<"-faltivec">, Group<f_Group>; -def fapple_kext : Flag<"-fapple-kext">, Group<f_Group>; -def fapple_pragma_pack : Flag<"-fapple-pragma-pack">, Group<f_Group>; -def faddress_sanitizer : Flag<"-faddress-sanitizer">, Group<f_Group>; -def fno_address_sanitizer : Flag<"-fno-address-sanitizer">, Group<f_Group>; -def fthread_sanitizer : Flag<"-fthread-sanitizer">, Group<f_Group>; -def fno_thread_sanitizer : Flag<"-fno-thread-sanitizer">, Group<f_Group>; +def faltivec : Flag<"-faltivec">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable AltiVec vector initializer syntax">; +def fapple_kext : Flag<"-fapple-kext">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Use Apple's kernel extensions ABI">; +def fapple_pragma_pack : Flag<"-fapple-pragma-pack">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable Apple gcc-compatible #pragma pack handling">; +def faddress_sanitizer : Flag<"-faddress-sanitizer">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable AddressSanitizer instrumentation (memory error detection)">; +def fno_address_sanitizer : Flag<"-fno-address-sanitizer">, Group<f_Group>, Flags<[CC1Option]>; +def fthread_sanitizer : Flag<"-fthread-sanitizer">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable ThreadSanitizer instrumentation (race detection)">; +def fno_thread_sanitizer : Flag<"-fno-thread-sanitizer">, Group<f_Group>, Flags<[CC1Option]>; def fasm : Flag<"-fasm">, Group<f_Group>; def fasm_blocks : Flag<"-fasm-blocks">, Group<f_Group>; @@ -286,17 +310,20 @@ def fastcp : Flag<"-fastcp">, Group<f_Group>; def fastf : Flag<"-fastf">, Group<f_Group>; def fast : Flag<"-fast">, Group<f_Group>; def fasynchronous_unwind_tables : Flag<"-fasynchronous-unwind-tables">, Group<f_Group>; -def fblocks : Flag<"-fblocks">, Group<f_Group>; +def fblocks : Flag<"-fblocks">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable the 'blocks' language feature">; def fbootclasspath_EQ : Joined<"-fbootclasspath=">, Group<f_Group>; -def fborland_extensions : Flag<"-fborland-extensions">, Group<f_Group>; +def fborland_extensions : Flag<"-fborland-extensions">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Accept non-standard constructs supported by the Borland compiler">; def fbuiltin_strcat : Flag<"-fbuiltin-strcat">, Group<f_Group>; def fbuiltin_strcpy : Flag<"-fbuiltin-strcpy">, Group<f_Group>; def fbuiltin : Flag<"-fbuiltin">, Group<f_Group>; def fcaret_diagnostics : Flag<"-fcaret-diagnostics">, Group<f_Group>; -def fcatch_undefined_behavior : Flag<"-fcatch-undefined-behavior">, - Group<f_Group>, HelpText<"Generate runtime checks for undefined behavior.">; +def fcatch_undefined_behavior : Flag<"-fcatch-undefined-behavior">, Flags<[CC1Option]>, + Group<f_Group>, HelpText<"Generate runtime checks for undefined behavior.">; def fclasspath_EQ : Joined<"-fclasspath=">, Group<f_Group>; -def fcolor_diagnostics : Flag<"-fcolor-diagnostics">, Group<f_Group>; +def fcolor_diagnostics : Flag<"-fcolor-diagnostics">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Use colors in diagnostics">; def fcommon : Flag<"-fcommon">, Group<f_Group>; def fcompile_resource_EQ : Joined<"-fcompile-resource=">, Group<f_Group>; def fconstant_cfstrings : Flag<"-fconstant-cfstrings">, Group<f_Group>; @@ -306,32 +333,47 @@ def fconstexpr_backtrace_limit_EQ : Joined<"-fconstexpr-backtrace-limit=">, Group<f_Group>; def fno_crash_diagnostics : Flag<"-fno-crash-diagnostics">, Group<f_clang_Group>, Flags<[NoArgumentUnused]>; def fcreate_profile : Flag<"-fcreate-profile">, Group<f_Group>; -def fcxx_exceptions: Flag<"-fcxx-exceptions">, Group<f_Group>; +def fcxx_exceptions: Flag<"-fcxx-exceptions">, Group<f_Group>, + HelpText<"Enable C++ exceptions">, Flags<[CC1Option]>; def fcxx_modules : Flag <"-fcxx-modules">, Group<f_Group>, Flags<[NoForward]>; def fdebug_pass_arguments : Flag<"-fdebug-pass-arguments">, Group<f_Group>; def fdebug_pass_structure : Flag<"-fdebug-pass-structure">, Group<f_Group>; def fdiagnostics_fixit_info : Flag<"-fdiagnostics-fixit-info">, Group<f_clang_Group>; -def fdiagnostics_print_source_range_info : Flag<"-fdiagnostics-print-source-range-info">, Group<f_clang_Group>; -def fdiagnostics_parseable_fixits : Flag<"-fdiagnostics-parseable-fixits">, Group<f_clang_Group>; -def fdiagnostics_show_option : Flag<"-fdiagnostics-show-option">, Group<f_Group>; -def fdiagnostics_show_note_include_stack : Flag<"-fdiagnostics-show-note-include-stack">, Group<f_Group>; +def fdiagnostics_parseable_fixits : Flag<"-fdiagnostics-parseable-fixits">, Group<f_clang_Group>, + Flags<[CC1Option]>, HelpText<"Print fix-its in machine parseable form">; +def fdiagnostics_print_source_range_info : Flag<"-fdiagnostics-print-source-range-info">, + Group<f_clang_Group>, Flags<[CC1Option]>, + HelpText<"Print source range spans in numeric form">; +def fdiagnostics_show_option : Flag<"-fdiagnostics-show-option">, Group<f_Group>, + Flags<[CC1Option]>, HelpText<"Print option name with mappable diagnostics">; +def fdiagnostics_show_name : Flag<"-fdiagnostics-show-name">, Group<f_Group>, + Flags<[CC1Option]>, HelpText<"Print diagnostic name">; +def fdiagnostics_show_note_include_stack : Flag<"-fdiagnostics-show-note-include-stack">, + Group<f_Group>, Flags<[CC1Option]>, HelpText<"Display include stacks for diagnostic notes">; def fdiagnostics_format_EQ : Joined<"-fdiagnostics-format=">, Group<f_clang_Group>; def fdiagnostics_show_category_EQ : Joined<"-fdiagnostics-show-category=">, Group<f_clang_Group>; -def fdollars_in_identifiers : Flag<"-fdollars-in-identifiers">, Group<f_Group>; +def fdollars_in_identifiers : Flag<"-fdollars-in-identifiers">, Group<f_Group>, + HelpText<"Allow '$' in identifiers">, Flags<[CC1Option]>; def fdwarf2_cfi_asm : Flag<"-fdwarf2-cfi-asm">, Group<f_Group>; -def fno_dwarf2_cfi_asm : Flag<"-fno-dwarf2-cfi-asm">, Group<f_Group>; +def fno_dwarf2_cfi_asm : Flag<"-fno-dwarf2-cfi-asm">, Group<f_Group>, Flags<[CC1Option]>; def fdwarf_directory_asm : Flag<"-fdwarf-directory-asm">, Group<f_Group>; -def fno_dwarf_directory_asm : Flag<"-fno-dwarf-directory-asm">, Group<f_Group>; +def fno_dwarf_directory_asm : Flag<"-fno-dwarf-directory-asm">, Group<f_Group>, Flags<[CC1Option]>; def felide_constructors : Flag<"-felide-constructors">, Group<f_Group>; def feliminate_unused_debug_symbols : Flag<"-feliminate-unused-debug-symbols">, Group<f_Group>; -def femit_all_decls : Flag<"-femit-all-decls">, Group<f_Group>; +def femit_all_decls : Flag<"-femit-all-decls">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Emit all declarations, even if unused">; def fencoding_EQ : Joined<"-fencoding=">, Group<f_Group>; def ferror_limit_EQ : Joined<"-ferror-limit=">, Group<f_Group>; -def fexceptions : Flag<"-fexceptions">, Group<f_Group>; +def fexceptions : Flag<"-fexceptions">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable support for exception handling">; def fextdirs_EQ : Joined<"-fextdirs=">, Group<f_Group>; def fhosted : Flag<"-fhosted">, Group<f_Group>; -def ffast_math : Flag<"-ffast-math">, Group<f_Group>; -def fmath_errno : Flag<"-fmath-errno">, Group<f_Group>; +def ffast_math : Flag<"-ffast-math">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable the *frontend*'s 'fast-math' mode. This has no effect on " + "optimizations, but provides a preprocessor macro __FAST_MATH__ the " + "same as GCC's -ffast-math flag.">; +def fmath_errno : Flag<"-fmath-errno">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Require math functions to indicate errors by setting errno">; def fno_math_errno : Flag<"-fno-math-errno">, Group<f_Group>; def fsignaling_math : Flag<"-fsignaling-math">, Group<f_Group>; def fno_signaling_math : Flag<"-fno-signaling-math">, Group<f_Group>; @@ -360,21 +402,26 @@ def fno_trapping_math : Flag<"-fno-trapping-math">, Group<f_Group>; def ffor_scope : Flag<"-ffor-scope">, Group<f_Group>; def fno_for_scope : Flag<"-fno-for-scope">, Group<f_Group>; -def ffreestanding : Flag<"-ffreestanding">, Group<f_Group>; -def fgnu_keywords : Flag<"-fgnu-keywords">, Group<f_Group>; -def fgnu89_inline : Flag<"-fgnu89-inline">, Group<f_Group>; +def ffreestanding : Flag<"-ffreestanding">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Assert that the compilation takes place in a freestanding environment">; +def fgnu_keywords : Flag<"-fgnu-keywords">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Allow GNU-extension keywords regardless of language standard">; +def fgnu89_inline : Flag<"-fgnu89-inline">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Use the gnu89 inline semantics">; def fno_gnu89_inline : Flag<"-fno-gnu89-inline">, Group<f_Group>; -def fgnu_runtime : Flag<"-fgnu-runtime">, Group<f_Group>; -def fheinous_gnu_extensions : Flag<"-fheinous-gnu-extensions">; +def fgnu_runtime : Flag<"-fgnu-runtime">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Generate output compatible with the standard GNU Objective-C runtime">; +def fheinous_gnu_extensions : Flag<"-fheinous-gnu-extensions">, Flags<[CC1Option]>; def filelist : Separate<"-filelist">, Flags<[LinkerInput]>; def findirect_virtual_calls : Flag<"-findirect-virtual-calls">, Alias<fapple_kext>; def finline_functions : Flag<"-finline-functions">, Group<clang_ignored_f_Group>; def finline : Flag<"-finline">, Group<clang_ignored_f_Group>; -def finstrument_functions : Flag<"-finstrument-functions">, Group<f_Group>; +def finstrument_functions : Flag<"-finstrument-functions">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Generate calls to instrument function entry and exit">; def fkeep_inline_functions : Flag<"-fkeep-inline-functions">, Group<clang_ignored_f_Group>; def flat__namespace : Flag<"-flat_namespace">; def flax_vector_conversions : Flag<"-flax-vector-conversions">, Group<f_Group>; -def flimit_debug_info : Flag<"-flimit-debug-info">, Group<f_Group>, +def flimit_debug_info : Flag<"-flimit-debug-info">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Limit debug information produced to reduce size of debug binary">; def flimited_precision_EQ : Joined<"-flimited-precision=">, Group<f_Group>; def flto : Flag<"-flto">, Group<f_Group>; @@ -383,49 +430,71 @@ def fmacro_backtrace_limit_EQ : Joined<"-fmacro-backtrace-limit=">, Group<f_Group>; def fmerge_all_constants : Flag<"-fmerge-all-constants">, Group<f_Group>; def fmessage_length_EQ : Joined<"-fmessage-length=">, Group<f_Group>; -def fms_extensions : Flag<"-fms-extensions">, Group<f_Group>; -def fms_compatibility : Flag<"-fms-compatibility">, Group<f_Group>; -def fmsc_version : Joined<"-fmsc-version=">, Group<f_Group>; -def fdelayed_template_parsing : Flag<"-fdelayed-template-parsing">, Group<f_Group>; +def fms_extensions : Flag<"-fms-extensions">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Accept some non-standard constructs supported by the Microsoft compiler">; +def fms_compatibility : Flag<"-fms-compatibility">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable Microsoft compatibility mode">; +def fmsc_version : Joined<"-fmsc-version=">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Version of the Microsoft C/C++ compiler to report in _MSC_VER (0 = don't define it (default))">; +def fdelayed_template_parsing : Flag<"-fdelayed-template-parsing">, Group<f_Group>, + HelpText<"Parse templated function definitions at the end of the " + "translation unit ">, Flags<[CC1Option]>; def fmodule_cache_path : Separate<"-fmodule-cache-path">, Group<i_Group>, - Flags<[NoForward]>; -def fmodules : Flag <"-fmodules">, Group<f_Group>, Flags<[NoForward]>; + Flags<[NoForward,CC1Option]>, MetaVarName<"<directory>">, + HelpText<"Specify the module cache path">; +def fmodules : Flag <"-fmodules">, Group<f_Group>, Flags<[NoForward,CC1Option]>, + HelpText<"Enable the 'modules' language feature">; def fmudflapth : Flag<"-fmudflapth">, Group<f_Group>; def fmudflap : Flag<"-fmudflap">, Group<f_Group>; def fnested_functions : Flag<"-fnested-functions">, Group<f_Group>; def fnext_runtime : Flag<"-fnext-runtime">, Group<f_Group>; -def fno_access_control : Flag<"-fno-access-control">, Group<f_Group>; +def fno_access_control : Flag<"-fno-access-control">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Disable C++ access control">; def fno_apple_pragma_pack : Flag<"-fno-apple-pragma-pack">, Group<f_Group>; def fno_asm : Flag<"-fno-asm">, Group<f_Group>; def fno_asynchronous_unwind_tables : Flag<"-fno-asynchronous-unwind-tables">, Group<f_Group>; -def fno_assume_sane_operator_new : Flag<"-fno-assume-sane-operator-new">, Group<f_Group>; +def fno_assume_sane_operator_new : Flag<"-fno-assume-sane-operator-new">, Group<f_Group>, + HelpText<"Don't assume that C++'s global operator new can't alias any pointer">, + Flags<[CC1Option]>; def fno_blocks : Flag<"-fno-blocks">, Group<f_Group>; def fno_borland_extensions : Flag<"-fno-borland-extensions">, Group<f_Group>; def fno_builtin_strcat : Flag<"-fno-builtin-strcat">, Group<f_Group>; def fno_builtin_strcpy : Flag<"-fno-builtin-strcpy">, Group<f_Group>; -def fno_builtin : Flag<"-fno-builtin">, Group<f_Group>; -def fno_caret_diagnostics : Flag<"-fno-caret-diagnostics">, Group<f_Group>; +def fno_builtin : Flag<"-fno-builtin">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Disable implicit builtin knowledge of functions">; +def fno_caret_diagnostics : Flag<"-fno-caret-diagnostics">, Group<f_Group>, + Flags<[CC1Option]>; def fno_color_diagnostics : Flag<"-fno-color-diagnostics">, Group<f_Group>; -def fno_common : Flag<"-fno-common">, Group<f_Group>; -def fno_constant_cfstrings : Flag<"-fno-constant-cfstrings">, Group<f_Group>; +def fno_common : Flag<"-fno-common">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Compile common globals like normal definitions">; +def fno_constant_cfstrings : Flag<"-fno-constant-cfstrings">, Group<f_Group>, + Flags<[CC1Option]>, + HelpText<"Disable creation of CodeFoundation-type constant strings">; def fno_cxx_exceptions: Flag<"-fno-cxx-exceptions">, Group<f_Group>; def fno_cxx_modules : Flag <"-fno-cxx-modules">, Group<f_Group>, Flags<[NoForward]>; -def fno_diagnostics_fixit_info : Flag<"-fno-diagnostics-fixit-info">, Group<f_Group>; +def fno_diagnostics_fixit_info : Flag<"-fno-diagnostics-fixit-info">, Group<f_Group>, + Flags<[CC1Option]>, HelpText<"Do not include fixit information in diagnostics">; +def fno_diagnostics_show_name : Flag<"-fno-diagnostics-show-name">, Group<f_Group>; def fno_diagnostics_show_option : Flag<"-fno-diagnostics-show-option">, Group<f_Group>; -def fno_diagnostics_show_note_include_stack : Flag<"-fno-diagnostics-show-note-include-stack">, Group<f_Group>; -def fno_dollars_in_identifiers : Flag<"-fno-dollars-in-identifiers">, Group<f_Group>; -def fno_elide_constructors : Flag<"-fno-elide-constructors">, Group<f_Group>; +def fno_diagnostics_show_note_include_stack : Flag<"-fno-diagnostics-show-note-include-stack">, + Flags<[CC1Option]>, Group<f_Group>, HelpText<"Display include stacks for diagnostic notes">; +def fno_dollars_in_identifiers : Flag<"-fno-dollars-in-identifiers">, Group<f_Group>, + HelpText<"Disallow '$' in identifiers">, Flags<[CC1Option]>; +def fno_elide_constructors : Flag<"-fno-elide-constructors">, Group<f_Group>, + HelpText<"Disable C++ copy constructor elision">, Flags<[CC1Option]>; def fno_eliminate_unused_debug_symbols : Flag<"-fno-eliminate-unused-debug-symbols">, Group<f_Group>; def fno_exceptions : Flag<"-fno-exceptions">, Group<f_Group>; -def fno_gnu_keywords : Flag<"-fno-gnu-keywords">, Group<f_Group>; -def fno_inline_functions : Flag<"-fno-inline-functions">, Group<f_Group>; -def fno_inline : Flag<"-fno-inline">, Group<f_Group>; +def fno_gnu_keywords : Flag<"-fno-gnu-keywords">, Group<f_Group>, Flags<[CC1Option]>; +def fno_inline_functions : Flag<"-fno-inline-functions">, Group<f_clang_Group>, Flags<[CC1Option]>; +def fno_inline : Flag<"-fno-inline">, Group<f_clang_Group>, Flags<[CC1Option]>; def fno_keep_inline_functions : Flag<"-fno-keep-inline-functions">, Group<clang_ignored_f_Group>; -def fno_lax_vector_conversions : Flag<"-fno-lax-vector-conversions">, Group<f_Group>; -def fno_limit_debug_info : Flag<"-fno-limit-debug-info">, Group<f_Group>, +def fno_lax_vector_conversions : Flag<"-fno-lax-vector-conversions">, Group<f_Group>, + HelpText<"Disallow implicit conversions between vectors with a different number of elements or different element types">, Flags<[CC1Option]>; +def fno_limit_debug_info : Flag<"-fno-limit-debug-info">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Do not limit debug information produced to reduce size of debug binary">; -def fno_merge_all_constants : Flag<"-fno-merge-all-constants">, Group<f_Group>; +def fno_merge_all_constants : Flag<"-fno-merge-all-constants">, Group<f_Group>, + Flags<[CC1Option]>, HelpText<"Disallow merging of constants.">; def fno_modules : Flag <"-fno-modules">, Group<f_Group>, Flags<[NoForward]>; def fno_ms_extensions : Flag<"-fno-ms-extensions">, Group<f_Group>; def fno_ms_compatibility : Flag<"-fno-ms-compatibility">, Group<f_Group>; @@ -433,41 +502,57 @@ def fno_delayed_template_parsing : Flag<"-fno-delayed-template-parsing">, Group< def fno_objc_exceptions: Flag<"-fno-objc-exceptions">, Group<f_Group>; def fno_objc_legacy_dispatch : Flag<"-fno-objc-legacy-dispatch">, Group<f_Group>; def fno_omit_frame_pointer : Flag<"-fno-omit-frame-pointer">, Group<f_Group>; -def fno_operator_names : Flag<"-fno-operator-names">, Group<f_Group>; +def fno_operator_names : Flag<"-fno-operator-names">, Group<f_Group>, + HelpText<"Do not treat C++ operator name keywords as synonyms for operators">, + Flags<[CC1Option]>; def fno_pascal_strings : Flag<"-fno-pascal-strings">, Group<f_Group>; -def fno_rtti : Flag<"-fno-rtti">, Group<f_Group>; +def fno_rtti : Flag<"-fno-rtti">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Disable generation of rtti information">; def fno_short_enums : Flag<"-fno-short-enums">, Group<f_Group>; -def fno_show_column : Flag<"-fno-show-column">, Group<f_Group>; -def fno_show_source_location : Flag<"-fno-show-source-location">, Group<f_Group>; -def fno_spell_checking : Flag<"-fno-spell-checking">, Group<f_Group>; +def fno_show_column : Flag<"-fno-show-column">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Do not include column number on diagnostics">; +def fno_show_source_location : Flag<"-fno-show-source-location">, Group<f_Group>, + Flags<[CC1Option]>, HelpText<"Do not include source location information with diagnostics">; +def fno_spell_checking : Flag<"-fno-spell-checking">, Group<f_Group>, + Flags<[CC1Option]>, HelpText<"Disable spell-checking">; def fno_stack_protector : Flag<"-fno-stack-protector">, Group<f_Group>; def fno_strict_aliasing : Flag<"-fno-strict-aliasing">, Group<f_Group>; def fno_strict_enums : Flag<"-fno-strict-enums">, Group<f_Group>; def fno_strict_overflow : Flag<"-fno-strict-overflow">, Group<f_Group>; -def fno_threadsafe_statics : Flag<"-fno-threadsafe-statics">, Group<f_Group>; -def fno_use_cxa_atexit : Flag<"-fno-use-cxa-atexit">, Group<f_Group>; +def fno_threadsafe_statics : Flag<"-fno-threadsafe-statics">, Group<f_Group>, + Flags<[CC1Option]>, HelpText<"Do not emit code to make initialization of local statics thread safe">; +def fno_use_cxa_atexit : Flag<"-fno-use-cxa-atexit">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Don't use __cxa_atexit for calling destructors">; def fno_unit_at_a_time : Flag<"-fno-unit-at-a-time">, Group<f_Group>; def fno_unwind_tables : Flag<"-fno-unwind-tables">, Group<f_Group>; def fno_verbose_asm : Flag<"-fno-verbose-asm">, Group<f_Group>; def fno_working_directory : Flag<"-fno-working-directory">, Group<f_Group>; def fno_wrapv : Flag<"-fno-wrapv">, Group<f_Group>; def fno_zero_initialized_in_bss : Flag<"-fno-zero-initialized-in-bss">, Group<f_Group>; -def fobjc_arc : Flag<"-fobjc-arc">, Group<f_Group>; +def fobjc_arc : Flag<"-fobjc-arc">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Synthesize retain and release calls for Objective-C pointers">; def fno_objc_arc : Flag<"-fno-objc-arc">, Group<f_Group>; -def fobjc_arc_exceptions : Flag<"-fobjc-arc-exceptions">, Group<f_Group>; +def fobjc_arc_exceptions : Flag<"-fobjc-arc-exceptions">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Use EH-safe code when synthesizing retains and releases in -fobjc-arc">; def fno_objc_arc_exceptions : Flag<"-fno-objc-arc-exceptions">, Group<f_Group>; def fobjc_atdefs : Flag<"-fobjc-atdefs">, Group<clang_ignored_f_Group>; def fobjc_call_cxx_cdtors : Flag<"-fobjc-call-cxx-cdtors">, Group<clang_ignored_f_Group>; -def fobjc_exceptions: Flag<"-fobjc-exceptions">, Group<f_Group>; +def fobjc_exceptions: Flag<"-fobjc-exceptions">, Group<f_Group>, + HelpText<"Enable Objective-C exceptions">, Flags<[CC1Option]>; -def fobjc_gc_only : Flag<"-fobjc-gc-only">, Group<f_Group>; -def fobjc_gc : Flag<"-fobjc-gc">, Group<f_Group>; +def fobjc_gc_only : Flag<"-fobjc-gc-only">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Use GC exclusively for Objective-C related memory management">; +def fobjc_gc : Flag<"-fobjc-gc">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable Objective-C garbage collection">; def fobjc_legacy_dispatch : Flag<"-fobjc-legacy-dispatch">, Group<f_Group>; def fobjc_new_property : Flag<"-fobjc-new-property">, Group<clang_ignored_f_Group>; def fobjc_infer_related_result_type : Flag<"-fobjc-infer-related-result-type">, Group<f_Group>; def fno_objc_infer_related_result_type : Flag< - "-fno-objc-infer-related-result-type">, Group<f_Group>; + "-fno-objc-infer-related-result-type">, Group<f_Group>, + HelpText< + "do not infer Objective-C related result type based on method family">, + Flags<[CC1Option]>; def fobjc_link_runtime: Flag<"-fobjc-link-runtime">, Group<f_Group>; // Objective-C ABI options. @@ -488,8 +573,10 @@ def force__load : Separate<"-force_load">; def foutput_class_dir_EQ : Joined<"-foutput-class-dir=">, Group<f_Group>; def fpack_struct : Flag<"-fpack-struct">, Group<f_Group>; def fno_pack_struct : Flag<"-fno-pack-struct">, Group<f_Group>; -def fpack_struct_EQ : Joined<"-fpack-struct=">, Group<f_Group>; -def fpascal_strings : Flag<"-fpascal-strings">, Group<f_Group>; +def fpack_struct_EQ : Joined<"-fpack-struct=">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Specify the default maximum struct packing alignment">; +def fpascal_strings : Flag<"-fpascal-strings">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Recognize and construct Pascal-style string literals">; def fpch_preprocess : Flag<"-fpch-preprocess">, Group<f_Group>; def fpic : Flag<"-fpic">, Group<f_Group>; def fno_pic : Flag<"-fno-pic">, Group<f_Group>; @@ -501,11 +588,15 @@ def framework : Separate<"-framework">, Flags<[LinkerInput]>; def frandom_seed_EQ : Joined<"-frandom-seed=">, Group<clang_ignored_f_Group>; def frtti : Flag<"-frtti">, Group<f_Group>; def fsched_interblock : Flag<"-fsched-interblock">, Group<clang_ignored_f_Group>; -def fshort_enums : Flag<"-fshort-enums">, Group<f_Group>; +def fshort_enums : Flag<"-fshort-enums">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Allocate to an enum type only as many bytes as it needs for the declared range of possible values">; def freorder_blocks : Flag<"-freorder-blocks">, Group<clang_ignored_f_Group>; -def fshort_wchar : Flag<"-fshort-wchar">, Group<f_Group>; -def fshow_overloads_EQ : Joined<"-fshow-overloads=">, Group<f_Group>; -def fshow_column : Flag<"-fshow-column">, Group<f_Group>; +def fshort_wchar : Flag<"-fshort-wchar">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Force wchar_t to be a short unsigned int">; +def fshow_overloads_EQ : Joined<"-fshow-overloads=">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Which overload candidates to show when overload resolution fails: " + "best|all; defaults to all">; +def fshow_column : Flag<"-fshow-column">, Group<f_Group>, Flags<[CC1Option]>; def fshow_source_location : Flag<"-fshow-source-location">, Group<f_Group>; def fspell_checking : Flag<"-fspell-checking">, Group<f_Group>; def fsigned_bitfields : Flag<"-fsigned-bitfields">, Group<f_Group>; @@ -513,17 +604,21 @@ def fsigned_char : Flag<"-fsigned-char">, Group<f_Group>; def fstack_protector_all : Flag<"-fstack-protector-all">, Group<f_Group>; def fstack_protector : Flag<"-fstack-protector">, Group<f_Group>; def fstrict_aliasing : Flag<"-fstrict-aliasing">, Group<f_Group>; -def fstrict_enums : Flag<"-fstrict-enums">, Group<f_Group>; +def fstrict_enums : Flag<"-fstrict-enums">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable optimizations based on the strict definition of an enum's " + "value range.">; def fstrict_overflow : Flag<"-fstrict-overflow">, Group<f_Group>; -def fsyntax_only : Flag<"-fsyntax-only">, Flags<[DriverOption]>; +def fsyntax_only : Flag<"-fsyntax-only">, Flags<[DriverOption,CC1Option]>, Group<Action_Group>; def ftabstop_EQ : Joined<"-ftabstop=">, Group<f_Group>; def ftemplate_depth_EQ : Joined<"-ftemplate-depth=">, Group<f_Group>; def ftemplate_depth_ : Joined<"-ftemplate-depth-">, Group<f_Group>; def ftemplate_backtrace_limit_EQ : Joined<"-ftemplate-backtrace-limit=">, Group<f_Group>; def ftest_coverage : Flag<"-ftest-coverage">, Group<f_Group>; -def Wlarge_by_value_copy_def : Flag<"-Wlarge-by-value-copy">; -def Wlarge_by_value_copy_EQ : Joined<"-Wlarge-by-value-copy=">; +def Wlarge_by_value_copy_def : Flag<"-Wlarge-by-value-copy">, + HelpText<"Warn if a function definition returns or accepts an object larger " + "in bytes that a given value">; +def Wlarge_by_value_copy_EQ : Joined<"-Wlarge-by-value-copy=">, Flags<[CC1Option]>; // Just silence warnings about -Wlarger-than, -Wframe-larger-than for now. def Wlarger_than : Separate<"-Wlarger-than">, Group<clang_ignored_f_Group>; @@ -534,25 +629,36 @@ def Wframe_larger_than_EQ : Joined<"-Wframe-larger-than=">, Alias<Wframe_larger_ def fterminated_vtables : Flag<"-fterminated-vtables">, Alias<fapple_kext>; def fthreadsafe_statics : Flag<"-fthreadsafe-statics">, Group<f_Group>; -def ftime_report : Flag<"-ftime-report">, Group<f_Group>; -def ftrapv : Flag<"-ftrapv">, Group<f_Group>; -def ftrapv_handler_EQ : Joined<"-ftrapv-handler=">, Group<f_Group>; -def ftrap_function_EQ : Joined<"-ftrap-function=">, Group<f_Group>, +def ftime_report : Flag<"-ftime-report">, Group<f_Group>, Flags<[CC1Option]>; +def ftrapv : Flag<"-ftrapv">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Trap on integer overflow">; +def ftrapv_handler_EQ : Joined<"-ftrapv-handler=">, Group<f_Group>, + MetaVarName<"<function name>">, + HelpText<"Specify the function to be called on overflow.">; +def ftrapv_handler : Separate<"-ftrapv-handler">, Group<f_Group>, Flags<[CC1Option]>; +def ftrap_function_EQ : Joined<"-ftrap-function=">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Issue call to specified function rather than a trap instruction">; def funit_at_a_time : Flag<"-funit-at-a-time">, Group<f_Group>; -def funroll_loops : Flag<"-funroll-loops">, Group<f_Group>; +def funroll_loops : Flag<"-funroll-loops">, Group<f_Group>, + HelpText<"Turn on loop unroller">, Flags<[CC1Option]>; def funsigned_bitfields : Flag<"-funsigned-bitfields">, Group<f_Group>; def funsigned_char : Flag<"-funsigned-char">, Group<f_Group>; def funwind_tables : Flag<"-funwind-tables">, Group<f_Group>; def fuse_cxa_atexit : Flag<"-fuse-cxa-atexit">, Group<f_Group>; def fverbose_asm : Flag<"-fverbose-asm">, Group<f_Group>; def fvisibility_EQ : Joined<"-fvisibility=">, Group<f_Group>; -def fvisibility_inlines_hidden : Flag<"-fvisibility-inlines-hidden">, Group<f_Group>; -def fwrapv : Flag<"-fwrapv">, Group<f_Group>; -def fwritable_strings : Flag<"-fwritable-strings">, Group<f_Group>; +def fvisibility_inlines_hidden : Flag<"-fvisibility-inlines-hidden">, Group<f_Group>, + HelpText<"Give inline C++ member functions default visibility by default">, + Flags<[CC1Option]>; +def fwrapv : Flag<"-fwrapv">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Treat signed integer overflow as two's complement">; +def fwritable_strings : Flag<"-fwritable-strings">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Store string literals as writable data">; def fzero_initialized_in_bss : Flag<"-fzero-initialized-in-bss">, Group<f_Group>; -def ffunction_sections: Flag <"-ffunction-sections">, Group<f_Group>; -def fdata_sections : Flag <"-fdata-sections">, Group<f_Group>; +def ffunction_sections: Flag <"-ffunction-sections">, Group<f_Group>, + Flags<[CC1Option]>, HelpText<"Place each function in its own section (ELF Only)">; +def fdata_sections : Flag <"-fdata-sections">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Place each data in its own section (ELF Only)">; def f : Joined<"-f">, Group<f_Group>; def g0 : Flag<"-g0">, Group<g_Group>; def g2 : Flag<"-g2">, Group<g_Group>; @@ -565,32 +671,52 @@ def gstabsplus : Flag<"-gstabs+">, Group<g_Group>; def gstabs1 : Flag<"-gstabs1">, Group<g_Group>; def gstabs2 : Flag<"-gstabs2">, Group<g_Group>; def gused : Flag<"-gused">, Group<g_Group>; -def g_Flag : Flag<"-g">, Group<g_Group>; +def g_Flag : Flag<"-g">, Group<g_Group>, HelpText<"Generate source level debug information">, + Flags<[CC1Option]>; def headerpad__max__install__names : Joined<"-headerpad_max_install_names">; -def index_header_map : Flag<"-index-header-map">; -def idirafter : JoinedOrSeparate<"-idirafter">, Group<clang_i_Group>; -def iframework : Joined<"-iframework">, Group<clang_i_Group>; -def imacros : JoinedOrSeparate<"-imacros">, Group<clang_i_Group>; +def help : Flag<"-help">, Flags<[CC1Option]>, + HelpText<"Display available options">; +def index_header_map : Flag<"-index-header-map">, Flags<[CC1Option]>, + HelpText<"Make the next included directory (-I or -F) an indexer header map">; +def idirafter : JoinedOrSeparate<"-idirafter">, Group<clang_i_Group>, Flags<[CC1Option]>, + HelpText<"Add directory to AFTER include search path">; +def iframework : Joined<"-iframework">, Group<clang_i_Group>, Flags<[CC1Option]>, + HelpText<"Add directory to SYSTEM framework search path">; +def imacros : JoinedOrSeparate<"-imacros">, Group<clang_i_Group>, Flags<[CC1Option]>, + HelpText<"Include macros from file before parsing">, MetaVarName<"<file>">; def image__base : Separate<"-image_base">; -def include_ : JoinedOrSeparate<"-include">, Group<clang_i_Group>, EnumName<"include">; -def include_pch : Separate<"-include-pch">, Group<clang_i_Group>; +def include_ : JoinedOrSeparate<"-include">, Group<clang_i_Group>, EnumName<"include">, + MetaVarName<"<file>">, HelpText<"Include file before parsing">, Flags<[CC1Option]>; +def include_pch : Separate<"-include-pch">, Group<clang_i_Group>, Flags<[CC1Option]>, + HelpText<"Include precompiled header file">, MetaVarName<"<file>">; def init : Separate<"-init">; def install__name : Separate<"-install_name">; def integrated_as : Flag<"-integrated-as">, Flags<[DriverOption]>; -def iprefix : JoinedOrSeparate<"-iprefix">, Group<clang_i_Group>; -def iquote : JoinedOrSeparate<"-iquote">, Group<clang_i_Group>; -def isysroot : JoinedOrSeparate<"-isysroot">, Group<clang_i_Group>; -def isystem : JoinedOrSeparate<"-isystem">, Group<clang_i_Group>; -def iwithprefixbefore : JoinedOrSeparate<"-iwithprefixbefore">, Group<clang_i_Group>; -def iwithprefix : JoinedOrSeparate<"-iwithprefix">, Group<clang_i_Group>; -def iwithsysroot : JoinedOrSeparate<"-iwithsysroot">, Group<clang_i_Group>; +def iprefix : JoinedOrSeparate<"-iprefix">, Group<clang_i_Group>, Flags<[CC1Option]>, + HelpText<"Set the -iwithprefix/-iwithprefixbefore prefix">, MetaVarName<"<dir>">; +def iquote : JoinedOrSeparate<"-iquote">, Group<clang_i_Group>, Flags<[CC1Option]>, + HelpText<"Add directory to QUOTE include search path">, MetaVarName<"<directory>">; +def isysroot : JoinedOrSeparate<"-isysroot">, Group<clang_i_Group>, Flags<[CC1Option]>, + HelpText<"Set the system root directory (usually /)">, MetaVarName<"<dir>">; +def isystem : JoinedOrSeparate<"-isystem">, Group<clang_i_Group>, Flags<[CC1Option]>, + HelpText<"Add directory to SYSTEM include search path">, MetaVarName<"<directory>">; +def iwithprefixbefore : JoinedOrSeparate<"-iwithprefixbefore">, Group<clang_i_Group>, + HelpText<"Set directory to include search path with prefix">, MetaVarName<"<dir>">, + Flags<[CC1Option]>; +def iwithprefix : JoinedOrSeparate<"-iwithprefix">, Group<clang_i_Group>, Flags<[CC1Option]>, + HelpText<"Set directory to SYSTEM include search path with prefix">, MetaVarName<"<dir>">; +def iwithsysroot : JoinedOrSeparate<"-iwithsysroot">, Group<clang_i_Group>, + HelpText<"Add directory to SYSTEM include search path, " + "absolute paths are relative to -isysroot">, MetaVarName<"<directory>">, + Flags<[CC1Option]>; def i : Joined<"-i">, Group<i_Group>; def keep__private__externs : Flag<"-keep_private_externs">; def l : JoinedOrSeparate<"-l">, Flags<[LinkerInput, RenderJoined]>; def lazy__framework : Separate<"-lazy_framework">, Flags<[LinkerInput]>; def lazy__library : Separate<"-lazy_library">, Flags<[LinkerInput]>; def m32 : Flag<"-m32">, Group<m_Group>, Flags<[DriverOption]>; -def mqdsp6_compat : Flag<"-mqdsp6-compat">, Group<m_Group>, Flags<[DriverOption]>; +def mqdsp6_compat : Flag<"-mqdsp6-compat">, Group<m_Group>, Flags<[DriverOption,CC1Option]>, + HelpText<"Enable hexagon-qdsp6 backward compatibility">; def m3dnowa : Flag<"-m3dnowa">, Group<m_x86_Features_Group>; def m3dnow : Flag<"-m3dnow">, Group<m_x86_Features_Group>; def m64 : Flag<"-m64">, Group<m_Group>, Flags<[DriverOption]>; @@ -611,16 +737,21 @@ def mios_version_min_EQ : Joined<"-mios-version-min=">, Alias<miphoneos_version_ def mios_simulator_version_min_EQ : Joined<"-mios-simulator-version-min=">, Group<m_Group>; def mkernel : Flag<"-mkernel">, Group<m_Group>; def mlinker_version_EQ : Joined<"-mlinker-version=">, Flags<[NoForward]>; -def mllvm : Separate<"-mllvm">; +def mllvm : Separate<"-mllvm">, Flags<[CC1Option]>, + HelpText<"Additional arguments to forward to LLVM's option processing">; def mmacosx_version_min_EQ : Joined<"-mmacosx-version-min=">, Group<m_Group>; -def mms_bitfields : Flag<"-mms-bitfields">, Group<m_Group>; -def mstackrealign : Flag<"-mstackrealign">, Group<m_Group>; -def mstack_alignment : Joined<"-mstack-alignment=">, Group<m_Group>; +def mms_bitfields : Flag<"-mms-bitfields">, Group<m_Group>, Flags<[CC1Option]>, + HelpText<"Set the default structure layout to be compatible with the Microsoft compiler standard.">; +def mstackrealign : Flag<"-mstackrealign">, Group<m_Group>, Flags<[CC1Option]>, + HelpText<"Force realign the stack at entry to every function.">; +def mstack_alignment : Joined<"-mstack-alignment=">, Group<m_Group>, Flags<[CC1Option]>, + HelpText<"Set the stack alignment">; def mmmx : Flag<"-mmmx">, Group<m_x86_Features_Group>; def mno_3dnowa : Flag<"-mno-3dnowa">, Group<m_x86_Features_Group>; def mno_3dnow : Flag<"-mno-3dnow">, Group<m_x86_Features_Group>; def mno_constant_cfstrings : Flag<"-mno-constant-cfstrings">, Group<m_Group>; -def mno_global_merge : Flag<"-mno-global-merge">, Group<m_Group>; +def mno_global_merge : Flag<"-mno-global-merge">, Group<m_Group>, Flags<[CC1Option]>, + HelpText<"Disable merging of globals">; def mno_mmx : Flag<"-mno-mmx">, Group<m_x86_Features_Group>; def mno_pascal_strings : Flag<"-mno-pascal-strings">, Group<m_Group>; def mno_red_zone : Flag<"-mno-red-zone">, Group<m_Group>; @@ -650,14 +781,18 @@ def marm : Flag<"-marm">, Alias<mno_thumb>; def mno_warn_nonportable_cfstrings : Flag<"-mno-warn-nonportable-cfstrings">, Group<m_Group>; def mno_omit_leaf_frame_pointer : Flag<"-mno-omit-leaf-frame-pointer">, Group<f_Group>; -def momit_leaf_frame_pointer : Flag<"-momit-leaf-frame-pointer">, Group<f_Group>; +def momit_leaf_frame_pointer : Flag<"-momit-leaf-frame-pointer">, Group<f_Group>, + HelpText<"Omit frame pointer setup for leaf functions.">, Flags<[CC1Option]>; def mpascal_strings : Flag<"-mpascal-strings">, Group<m_Group>; def mred_zone : Flag<"-mred-zone">, Group<m_Group>; def mregparm_EQ : Joined<"-mregparm=">, Group<m_Group>; -def mrelax_all : Flag<"-mrelax-all">, Group<m_Group>; -def mrtd: Flag<"-mrtd">, Group<m_Group>; +def mrelax_all : Flag<"-mrelax-all">, Group<m_Group>, Flags<[CC1Option]>, + HelpText<"(integrated-as) Relax all machine instructions">; +def mrtd : Flag<"-mrtd">, Group<m_Group>, Flags<[CC1Option]>, + HelpText<"Make StdCall calling convention the default">; def msmall_data_threshold_EQ : Joined <"-msmall-data-threshold=">, Group<m_Group>; -def msoft_float : Flag<"-msoft-float">, Group<m_Group>; +def msoft_float : Flag<"-msoft-float">, Group<m_Group>, Flags<[CC1Option]>, + HelpText<"Use software floating point">; def msse2 : Flag<"-msse2">, Group<m_x86_Features_Group>; def msse3 : Flag<"-msse3">, Group<m_x86_Features_Group>; def msse4a : Flag<"-msse4a">, Group<m_x86_Features_Group>; @@ -688,7 +823,8 @@ def no_cpp_precomp : Flag<"-no-cpp-precomp">, Group<clang_ignored_f_Group>; def no_integrated_as : Flag<"-no-integrated-as">, Flags<[DriverOption]>; def no_integrated_cpp : Flag<"-no-integrated-cpp">, Flags<[DriverOption]>; def no__dead__strip__inits__and__terms : Flag<"-no_dead_strip_inits_and_terms">; -def nobuiltininc : Flag<"-nobuiltininc">; +def nobuiltininc : Flag<"-nobuiltininc">, Flags<[CC1Option]>, + HelpText<"Disable builtin #include directories">; def nodefaultlibs : Flag<"-nodefaultlibs">; def nofixprebinding : Flag<"-nofixprebinding">; def nolibc : Flag<"-nolibc">; @@ -698,16 +834,17 @@ def noseglinkedit : Flag<"-noseglinkedit">; def nostartfiles : Flag<"-nostartfiles">; def nostdinc : Flag<"-nostdinc">; def nostdlibinc : Flag<"-nostdlibinc">; -def nostdincxx : Flag<"-nostdinc++">; +def nostdincxx : Flag<"-nostdinc++">, Flags<[CC1Option]>, + HelpText<"Disable standard #include directories for the C++ standard library">; def nostdlib : Flag<"-nostdlib">; def object : Flag<"-object">; -def o : JoinedOrSeparate<"-o">, Flags<[DriverOption, RenderAsInput]>, +def o : JoinedOrSeparate<"-o">, Flags<[DriverOption, RenderAsInput, CC1Option]>, HelpText<"Write output to <file>">, MetaVarName<"<file>">; def pagezero__size : JoinedOrSeparate<"-pagezero_size">; def pass_exit_codes : Flag<"-pass-exit-codes">, Flags<[Unsupported]>; -def pedantic_errors : Flag<"-pedantic-errors">, Group<pedantic_Group>; -def pedantic : Flag<"-pedantic">, Group<pedantic_Group>; -def pg : Flag<"-pg">; +def pedantic_errors : Flag<"-pedantic-errors">, Group<pedantic_Group>, Flags<[CC1Option]>; +def pedantic : Flag<"-pedantic">, Group<pedantic_Group>, Flags<[CC1Option]>; +def pg : Flag<"-pg">, HelpText<"Enable mcount instrumentation">, Flags<[CC1Option]>; def pipe : Flag<"-pipe">, HelpText<"Use pipes between commands, when possible">; def prebind__all__twolevel__modules : Flag<"-prebind_all_twolevel_modules">; @@ -715,7 +852,8 @@ def prebind : Flag<"-prebind">; def preload : Flag<"-preload">; def print_file_name_EQ : Joined<"-print-file-name=">, HelpText<"Print the full library path of <file>">, MetaVarName<"<file>">; -def print_ivar_layout : Flag<"-print-ivar-layout">; +def print_ivar_layout : Flag<"-print-ivar-layout">, Flags<[CC1Option]>, + HelpText<"Enable Objective-C Ivar layout bitmap print trace">; def print_libgcc_file_name : Flag<"-print-libgcc-file-name">, HelpText<"Print the library path for \"libgcc.a\"">; def print_multi_directory : Flag<"-print-multi-directory">; @@ -727,13 +865,14 @@ def print_search_dirs : Flag<"-print-search-dirs">, HelpText<"Print the paths used for finding libraries and programs">; def private__bundle : Flag<"-private_bundle">; def pthreads : Flag<"-pthreads">; -def pthread : Flag<"-pthread">; +def pthread : Flag<"-pthread">, Flags<[CC1Option]>, + HelpText<"Support POSIX threads in generated code">; def p : Flag<"-p">; def pie : Flag<"-pie">; def read__only__relocs : Separate<"-read_only_relocs">; def remap : Flag<"-remap">; -def rewrite_objc : Flag<"-rewrite-objc">, Flags<[DriverOption]>, - HelpText<"Rewrite Objective-C source to C++">; +def rewrite_objc : Flag<"-rewrite-objc">, Flags<[DriverOption,CC1Option]>, + HelpText<"Rewrite Objective-C source to C++">, Group<Action_Group>; def rewrite_legacy_objc : Flag<"-rewrite-legacy-objc">, Flags<[DriverOption]>, HelpText<"Rewrite Legacy Objective-C source to C++">; def rdynamic : Flag<"-rdynamic">; @@ -765,8 +904,10 @@ def static_libgcc : Flag<"-static-libgcc">; def static_libstdcxx : Flag<"-static-libstdc++">; def static : Flag<"-static">, Flags<[NoArgumentUnused]>; def std_default_EQ : Joined<"-std-default=">; -def std_EQ : Joined<"-std=">, Group<L_Group>; -def stdlib_EQ : Joined<"-stdlib=">; +def std_EQ : Joined<"-std=">, Flags<[CC1Option]>, Group<L_Group>, + HelpText<"Language standard to compile for">; +def stdlib_EQ : Joined<"-stdlib=">, Flags<[CC1Option]>, + HelpText<"C++ standard library to use">; def sub__library : JoinedOrSeparate<"-sub_library">; def sub__umbrella : JoinedOrSeparate<"-sub_umbrella">; def s : Flag<"-s">; @@ -778,21 +919,24 @@ def gcc_toolchain : Separate<"-gcc-toolchain">, Flags<[DriverOption]>, def ccc_host_triple : Separate<"-ccc-host-triple">, Alias<target>; def time : Flag<"-time">, HelpText<"Time individual commands">; -def traditional_cpp : Flag<"-traditional-cpp">; +def traditional_cpp : Flag<"-traditional-cpp">, Flags<[CC1Option]>, + HelpText<"Enable some traditional CPP emulation">; def traditional : Flag<"-traditional">; -def trigraphs : Flag<"-trigraphs">; +def trigraphs : Flag<"-trigraphs">, Flags<[CC1Option]>, + HelpText<"Process trigraph sequences">; def twolevel__namespace__hints : Flag<"-twolevel_namespace_hints">; def twolevel__namespace : Flag<"-twolevel_namespace">; def t : Flag<"-t">; def umbrella : Separate<"-umbrella">; def undefined : JoinedOrSeparate<"-undefined">, Group<u_Group>; -def undef : Flag<"-undef">, Group<u_Group>; +def undef : Flag<"-undef">, Group<u_Group>, Flags<[CC1Option]>, + HelpText<"undef all system defines">; def unexported__symbols__list : Separate<"-unexported_symbols_list">; def u : JoinedOrSeparate<"-u">, Group<u_Group>; def use_gold_plugin : Flag<"-use-gold-plugin">; -def v : Flag<"-v">, +def v : Flag<"-v">, Flags<[CC1Option]>, HelpText<"Show commands to run and use verbose output">; -def verify : Flag<"-verify">, Flags<[DriverOption]>, +def verify : Flag<"-verify">, Flags<[DriverOption,CC1Option]>, HelpText<"Verify output using a verifier.">; def weak_l : Joined<"-weak-l">, Flags<[LinkerInput]>; def weak__framework : Separate<"-weak_framework">, Flags<[LinkerInput]>; @@ -800,15 +944,15 @@ def weak__library : Separate<"-weak_library">, Flags<[LinkerInput]>; def weak__reference__mismatches : Separate<"-weak_reference_mismatches">; def whatsloaded : Flag<"-whatsloaded">; def whyload : Flag<"-whyload">; -def w : Flag<"-w">; -def x : JoinedOrSeparate<"-x">, Flags<[DriverOption]>, +def w : Flag<"-w">, HelpText<"Suppress all warnings.">, Flags<[CC1Option]>; +def x : JoinedOrSeparate<"-x">, Flags<[DriverOption,CC1Option]>, HelpText<"Treat subsequent input files as having type <language>">, MetaVarName<"<language>">; def y : Joined<"-y">; -def working_directory : Separate<"-working-directory">, +def working_directory : JoinedOrSeparate<"-working-directory">, Flags<[CC1Option]>, HelpText<"Resolve file paths relative to the specified directory">; -def working_directory_EQ : Joined<"-working-directory=">, +def working_directory_EQ : Joined<"-working-directory=">, Flags<[CC1Option]>, Alias<working_directory>; // Double dash options, which are usually an alias for one of the previous @@ -852,8 +996,7 @@ def _for_linker : Separate<"--for-linker">, Alias<Xlinker>; def _force_link_EQ : Joined<"--force-link=">, Alias<u>; def _force_link : Separate<"--force-link">, Alias<u>; def _help_hidden : Flag<"--help-hidden">; -def _help : Flag<"--help">, - HelpText<"Display available options">; +def _help : Flag<"--help">, Alias<help>; def _imacros_EQ : Joined<"--imacros=">, Alias<imacros>; def _imacros : Separate<"--imacros">, Alias<imacros>; def _include_barrier : Flag<"--include-barrier">, Alias<I_>; @@ -943,7 +1086,7 @@ def _undefine_macro : Separate<"--undefine-macro">, Alias<U>; def _unsigned_char : Flag<"--unsigned-char">, Alias<funsigned_char>; def _user_dependencies : Flag<"--user-dependencies">, Alias<MM>; def _verbose : Flag<"--verbose">, Alias<v>; -def _version : Flag<"--version">; +def _version : Flag<"--version">, Flags<[CC1Option]>; def _warn__EQ : Joined<"--warn-=">, Alias<W_Joined>; def _warn_ : Joined<"--warn-">, Alias<W_Joined>; def _write_dependencies : Flag<"--write-dependencies">, Alias<MD>; @@ -963,3 +1106,5 @@ def Z_reserved_lib_stdcxx : Flag<"-Z-reserved-lib-stdc++">, Flags<[LinkerInput, NoArgumentUnused, Unsupported]>, Group<reserved_lib_Group>; def Z_reserved_lib_cckext : Flag<"-Z-reserved-lib-cckext">, Flags<[LinkerInput, NoArgumentUnused, Unsupported]>, Group<reserved_lib_Group>; + +include "CC1Options.td" diff --git a/lib/Driver/CC1Options.cpp b/lib/Driver/CC1Options.cpp deleted file mode 100644 index 884b363f63..0000000000 --- a/lib/Driver/CC1Options.cpp +++ /dev/null @@ -1,38 +0,0 @@ -//===--- CC1Options.cpp - Clang CC1 Options Table -------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#include "clang/Driver/CC1Options.h" -#include "clang/Driver/Option.h" -#include "clang/Driver/OptTable.h" -using namespace clang; -using namespace clang::driver; -using namespace clang::driver::options; -using namespace clang::driver::cc1options; - -static const OptTable::Info CC1InfoTable[] = { -#define OPTION(NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \ - HELPTEXT, METAVAR) \ - { NAME, HELPTEXT, METAVAR, Option::KIND##Class, PARAM, FLAGS, \ - OPT_##GROUP, OPT_##ALIAS }, -#include "clang/Driver/CC1Options.inc" -}; - -namespace { - -class CC1OptTable : public OptTable { -public: - CC1OptTable() - : OptTable(CC1InfoTable, sizeof(CC1InfoTable) / sizeof(CC1InfoTable[0])) {} -}; - -} - -OptTable *clang::driver::createCC1OptTable() { - return new CC1OptTable(); -} diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt index a798e20750..249d5ac24d 100644 --- a/lib/Driver/CMakeLists.txt +++ b/lib/Driver/CMakeLists.txt @@ -4,7 +4,6 @@ add_clang_library(clangDriver Action.cpp Arg.cpp ArgList.cpp - CC1Options.cpp CC1AsOptions.cpp Compilation.cpp Driver.cpp diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 44521a1a59..483575298d 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -645,7 +645,7 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { return false; } - if (C.getArgs().hasArg(options::OPT__help) || + if (C.getArgs().hasArg(options::OPT_help) || C.getArgs().hasArg(options::OPT__help_hidden)) { PrintHelp(C.getArgs().hasArg(options::OPT__help_hidden)); return false; diff --git a/lib/Driver/OptTable.cpp b/lib/Driver/OptTable.cpp index 4f5390b6e2..a3e38b26f2 100644 --- a/lib/Driver/OptTable.cpp +++ b/lib/Driver/OptTable.cpp @@ -181,6 +181,8 @@ Option *OptTable::CreateOption(unsigned id) const { } if (info.Flags & Unsupported) Opt->setUnsupported(true); + if (info.Flags & CC1Option) + Opt->setIsCC1Option(true); return Opt; } diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 6046494b88..e8345fdfd7 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -13,7 +13,7 @@ #include "clang/Basic/FileManager.h" #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" -#include "clang/Driver/CC1Options.h" +#include "clang/Driver/Options.h" #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/OptTable.h" #include "clang/Driver/Option.h" @@ -910,7 +910,7 @@ void CompilerInvocation::toArgs(std::vector<std::string> &Res) { //===----------------------------------------------------------------------===// using namespace clang::driver; -using namespace clang::driver::cc1options; +using namespace clang::driver::options; // @@ -919,14 +919,66 @@ static unsigned getOptimizationLevel(ArgList &Args, InputKind IK, unsigned DefaultOpt = 0; if (IK == IK_OpenCL && !Args.hasArg(OPT_cl_opt_disable)) DefaultOpt = 2; - // -Os/-Oz implies -O2 - return (Args.hasArg(OPT_Os) || Args.hasArg (OPT_Oz)) ? 2 : - Args.getLastArgIntValue(OPT_O, DefaultOpt, Diags); + + if (Arg *A = Args.getLastArg(options::OPT_O_Group)) { + if (A->getOption().matches(options::OPT_O0)) + return 0; + + assert (A->getOption().matches(options::OPT_O)); + + llvm::StringRef S(A->getValue(Args)); + if (S == "s" || S == "z" || S.empty()) + return 2; + + return Args.getLastArgIntValue(OPT_O, DefaultOpt, Diags); + } + + return DefaultOpt; +} + +static unsigned getOptimizationLevelSize(ArgList &Args, InputKind IK, + DiagnosticsEngine &Diags) { + if (Arg *A = Args.getLastArg(options::OPT_O_Group)) { + if (A->getOption().matches(options::OPT_O)) { + switch (A->getValue(Args)[0]) { + default: + return 0; + case 's': + return 1; + case 'z': + return 2; + } + } + } + return 0; +} + +static void addWarningArgs(ArgList &Args, std::vector<std::string> &Warnings) { + for (arg_iterator I = Args.filtered_begin(OPT_W_Group), + E = Args.filtered_end(); I != E; ++I) { + Arg *A = *I; + // If the argument is a pure flag, add its name (minus the "-W" at the beginning) + // to the warning list. Else, add its value (for the OPT_W case). + if (A->getOption().getKind() == Option::FlagClass) { + Warnings.push_back(A->getOption().getName().substr(2)); + } else { + for (unsigned Idx = 0, End = A->getNumValues(); + Idx < End; ++Idx) { + StringRef V = A->getValue(Args, Idx); + // "-Wl," and such are not warning options. + // FIXME: Should be handled by putting these in separate flags. + if (V.startswith("l,") || V.startswith("a,") || V.startswith("p,")) + continue; + + Warnings.push_back(V); + } + } + } } static bool ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args, DiagnosticsEngine &Diags) { - using namespace cc1options; + using namespace options; bool Success = true; if (Arg *A = Args.getLastArg(OPT_analyzer_store)) { StringRef Name = A->getValue(Args); @@ -1076,7 +1128,7 @@ static bool ParseMigratorArgs(MigratorOptions &Opts, ArgList &Args) { static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, DiagnosticsEngine &Diags) { - using namespace cc1options; + using namespace options; bool Success = true; unsigned OptLevel = getOptimizationLevel(Args, IK, Diags); @@ -1096,7 +1148,7 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, Opts.Inlining = Args.hasArg(OPT_fno_inline_functions) ? CodeGenOptions::OnlyAlwaysInlining : Opts.Inlining; - if (Args.hasArg(OPT_g)) { + if (Args.hasArg(OPT_g_Flag)) { if (Args.hasFlag(OPT_flimit_debug_info, OPT_fno_limit_debug_info, true)) Opts.DebugInfo = CodeGenOptions::LimitedDebugInfo; else @@ -1113,8 +1165,7 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, Opts.MergeAllConstants = !Args.hasArg(OPT_fno_merge_all_constants); Opts.NoCommon = Args.hasArg(OPT_fno_common); Opts.NoImplicitFloat = Args.hasArg(OPT_no_implicit_float); - Opts.OptimizeSize = Args.hasArg(OPT_Os); - Opts.OptimizeSize = Args.hasArg(OPT_Oz) ? 2 : Opts.OptimizeSize; + Opts.OptimizeSize = getOptimizationLevelSize(Args, IK, Diags); Opts.SimplifyLibCalls = !(Args.hasArg(OPT_fno_builtin) || Args.hasArg(OPT_ffreestanding)); Opts.UnrollLoops = Args.hasArg(OPT_funroll_loops) || @@ -1199,7 +1250,7 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, static void ParseDependencyOutputArgs(DependencyOutputOptions &Opts, ArgList &Args) { - using namespace cc1options; + using namespace options; Opts.OutputFile = Args.getLastArgValue(OPT_dependency_file); Opts.Targets = Args.getAllArgValues(OPT_MT); Opts.IncludeSystemHeaders = Args.hasArg(OPT_sys_header_deps); @@ -1212,7 +1263,7 @@ static void ParseDependencyOutputArgs(DependencyOutputOptions &Opts, bool clang::ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args, DiagnosticsEngine *Diags) { - using namespace cc1options; + using namespace options; bool Success = true; Opts.DiagnosticLogFile = Args.getLastArgValue(OPT_diagnostic_log_file); @@ -1309,16 +1360,7 @@ bool clang::ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args, } Opts.MessageLength = Args.getLastArgIntValue(OPT_fmessage_length, 0, Diags); Opts.DumpBuildInformation = Args.getLastArgValue(OPT_dump_build_information); - - for (arg_iterator it = Args.filtered_begin(OPT_W), - ie = Args.filtered_end(); it != ie; ++it) { - StringRef V = (*it)->getValue(Args); - // "-Wl," and such are not warnings options. - if (V.startswith("l,") || V.startswith("a,") || V.startswith("p,")) - continue; - - Opts.Warnings.push_back(V); - } + addWarningArgs(Args, Opts.Warnings); return Success; } @@ -1329,7 +1371,7 @@ static void ParseFileSystemArgs(FileSystemOptions &Opts, ArgList &Args) { static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args, DiagnosticsEngine &Diags) { - using namespace cc1options; + using namespace options; Opts.ProgramAction = frontend::ParseSyntaxOnly; if (const Arg *A = Args.getLastArg(OPT_Action_Group)) { switch (A->getOption().getID()) { @@ -1549,7 +1591,7 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0, } static void ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args) { - using namespace cc1options; + using namespace options; Opts.Sysroot = Args.getLastArgValue(OPT_isysroot, "/"); Opts.Verbose = Args.hasArg(OPT_v); Opts.UseBuiltinIncludes = !Args.hasArg(OPT_nobuiltininc); @@ -1895,7 +1937,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, Opts.ConstexprCallDepth = Args.getLastArgIntValue(OPT_fconstexpr_depth, 512, Diags); Opts.DelayedTemplateParsing = Args.hasArg(OPT_fdelayed_template_parsing); - Opts.NumLargeByValueCopy = Args.getLastArgIntValue(OPT_Wlarge_by_value_copy, + Opts.NumLargeByValueCopy = Args.getLastArgIntValue(OPT_Wlarge_by_value_copy_EQ, 0, Diags); Opts.MSBitfields = Args.hasArg(OPT_mms_bitfields); Opts.NeXTRuntime = !Args.hasArg(OPT_fgnu_runtime); @@ -1908,7 +1950,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, Args.hasArg(OPT_fobjc_default_synthesize_properties); Opts.CatchUndefined = Args.hasArg(OPT_fcatch_undefined_behavior); Opts.EmitAllDecls = Args.hasArg(OPT_femit_all_decls); - Opts.PackStruct = Args.getLastArgIntValue(OPT_fpack_struct, 0, Diags); + Opts.PackStruct = Args.getLastArgIntValue(OPT_fpack_struct_EQ, 0, Diags); Opts.PICLevel = Args.getLastArgIntValue(OPT_pic_level, 0, Diags); Opts.PIELevel = Args.getLastArgIntValue(OPT_pie_level, 0, Diags); Opts.Static = Args.hasArg(OPT_static_define); @@ -1940,7 +1982,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, // FIXME: Eliminate this dependency. unsigned Opt = getOptimizationLevel(Args, IK, Diags); Opts.Optimize = Opt != 0; - Opts.OptimizeSize = Args.hasArg(OPT_Os) || Args.hasArg(OPT_Oz); + Opts.OptimizeSize = getOptimizationLevelSize(Args, IK, Diags); // This is the __NO_INLINE__ define, which just depends on things like the // optimization level and -fno-inline, not actually whether the backend has @@ -1964,7 +2006,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args, FileManager &FileMgr, DiagnosticsEngine &Diags) { - using namespace cc1options; + using namespace options; Opts.ImplicitPCHInclude = Args.getLastArgValue(OPT_include_pch); Opts.ImplicitPTHInclude = Args.getLastArgValue(OPT_include_pth); if (const Arg *A = Args.getLastArg(OPT_token_cache)) @@ -2066,7 +2108,7 @@ static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args, static void ParsePreprocessorOutputArgs(PreprocessorOutputOptions &Opts, ArgList &Args) { - using namespace cc1options; + using namespace options; Opts.ShowCPP = !Args.hasArg(OPT_dM); Opts.ShowComments = Args.hasArg(OPT_C); Opts.ShowLineMarkers = !Args.hasArg(OPT_P); @@ -2075,7 +2117,7 @@ static void ParsePreprocessorOutputArgs(PreprocessorOutputOptions &Opts, } static void ParseTargetArgs(TargetOptions &Opts, ArgList &Args) { - using namespace cc1options; + using namespace options; Opts.ABI = Args.getLastArgValue(OPT_target_abi); Opts.CXXABI = Args.getLastArgValue(OPT_cxx_abi); Opts.CPU = Args.getLastArgValue(OPT_target_cpu); @@ -2097,7 +2139,7 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res, bool Success = true; // Parse the arguments. - OwningPtr<OptTable> Opts(createCC1OptTable()); + OwningPtr<OptTable> Opts(createDriverOptTable()); unsigned MissingArgIndex, MissingArgCount; OwningPtr<InputArgList> Args( Opts->ParseArgs(ArgBegin, ArgEnd,MissingArgIndex, MissingArgCount)); @@ -2116,6 +2158,15 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res, Success = false; } + // Issue errors on arguments that are not valid for CC1. + for (ArgList::iterator I = Args->begin(), E = Args->end(); + I != E; ++I) { + if (!(*I)->getOption().isCC1Option()) { + Diags.Report(diag::err_drv_unknown_argument) << (*I)->getAsString(*Args); + Success = false; + } + } + Success = ParseAnalyzerArgs(Res.getAnalyzerOpts(), *Args, Diags) && Success; Success = ParseMigratorArgs(Res.getMigratorOpts(), *Args) && Success; ParseDependencyOutputArgs(Res.getDependencyOutputOpts(), *Args); diff --git a/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/lib/FrontendTool/ExecuteCompilerInvocation.cpp index 07d2b8d19f..f72d294e7a 100644 --- a/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/lib/FrontendTool/ExecuteCompilerInvocation.cpp @@ -16,7 +16,7 @@ #include "clang/StaticAnalyzer/Frontend/FrontendActions.h" #include "clang/ARCMigrate/ARCMTActions.h" #include "clang/CodeGen/CodeGenAction.h" -#include "clang/Driver/CC1Options.h" +#include "clang/Driver/Options.h" #include "clang/Driver/OptTable.h" #include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/CompilerInstance.h" @@ -129,7 +129,7 @@ static FrontendAction *CreateFrontendAction(CompilerInstance &CI) { bool clang::ExecuteCompilerInvocation(CompilerInstance *Clang) { // Honor -help. if (Clang->getFrontendOpts().ShowHelp) { - OwningPtr<driver::OptTable> Opts(driver::createCC1OptTable()); + OwningPtr<driver::OptTable> Opts(driver::createDriverOptTable()); Opts->PrintHelp(llvm::outs(), "clang -cc1", "LLVM 'Clang' Compiler: http://clang.llvm.org"); return 0; diff --git a/test/Sema/fpack-struct.c b/test/Sema/fpack-struct.c index 37c8444ae9..63766e9c9d 100644 --- a/test/Sema/fpack-struct.c +++ b/test/Sema/fpack-struct.c @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -DEXPECTED_STRUCT_SIZE=5 -fpack-struct 1 %s -// RUN: %clang_cc1 -DEXPECTED_STRUCT_SIZE=6 -fpack-struct 2 %s +// RUN: %clang_cc1 -DEXPECTED_STRUCT_SIZE=5 -fpack-struct=1 %s +// RUN: %clang_cc1 -DEXPECTED_STRUCT_SIZE=6 -fpack-struct=2 %s struct s0 { int x; diff --git a/tools/driver/cc1_main.cpp b/tools/driver/cc1_main.cpp index a211090085..f8e8a6b4f6 100644 --- a/tools/driver/cc1_main.cpp +++ b/tools/driver/cc1_main.cpp @@ -15,7 +15,7 @@ #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" -#include "clang/Driver/CC1Options.h" +#include "clang/Driver/Options.h" #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/OptTable.h" #include "clang/Frontend/CompilerInstance.h" @@ -58,7 +58,7 @@ static int cc1_test(DiagnosticsEngine &Diags, llvm::errs() << "\n"; // Parse the arguments. - OptTable *Opts = createCC1OptTable(); + OptTable *Opts = createDriverOptTable(); unsigned MissingArgIndex, MissingArgCount; InputArgList *Args = Opts->ParseArgs(ArgBegin, ArgEnd, MissingArgIndex, MissingArgCount); diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index a07738458a..7813f355e4 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/ArgList.h" -#include "clang/Driver/CC1Options.h" +#include "clang/Driver/Options.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Option.h" @@ -378,7 +378,7 @@ int main(int argc_, const char **argv_) { DiagnosticOptions DiagOpts; { // Note that ParseDiagnosticArgs() uses the cc1 option table. - OwningPtr<OptTable> CC1Opts(createCC1OptTable()); + OwningPtr<OptTable> CC1Opts(createDriverOptTable()); unsigned MissingArgIndex, MissingArgCount; OwningPtr<InputArgList> Args(CC1Opts->ParseArgs(argv.begin()+1, argv.end(), MissingArgIndex, MissingArgCount)); |