From faef9fcb41cff7c2cbafb86d3af47c422ddf3010 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Mon, 15 Aug 2011 19:13:06 +0000 Subject: [PATCH] Make -findirect-virtual-calls and -fterminated-vtables aliases of -fapple-kext. Outside the driver, they were already treated that way, but the driver was not giving them the same special treatment as -fapple-kext, e.g., falling back to llvm-gcc for i386/Darwin kexts. Radar 9868422. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@137639 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/Options.td | 4 ++-- lib/Driver/ToolChains.cpp | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index 3ea43c7f6d..5294fe0464 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -319,7 +319,7 @@ def fno_gnu89_inline : Flag<"-fno-gnu89-inline">, Group; def fgnu_runtime : Flag<"-fgnu-runtime">, Group; def fheinous_gnu_extensions : Flag<"-fheinous-gnu-extensions">; def filelist : Separate<"-filelist">, Flags<[LinkerInput]>; -def findirect_virtual_calls : Flag<"-findirect-virtual-calls">, Group; +def findirect_virtual_calls : Flag<"-findirect-virtual-calls">, Alias; def finline_functions : Flag<"-finline-functions">, Group; def finline : Flag<"-finline">, Group; def finstrument_functions : Flag<"-finstrument-functions">, Group; @@ -470,7 +470,7 @@ def Wlarger_than_ : Joined<"-Wlarger-than-">, Alias; def Wframe_larger_than : Separate<"-Wframe-larger-than">, Group; def Wframe_larger_than_EQ : Joined<"-Wframe-larger-than=">, Alias; -def fterminated_vtables : Flag<"-fterminated-vtables">, Group; +def fterminated_vtables : Flag<"-fterminated-vtables">, Alias; def fthreadsafe_statics : Flag<"-fthreadsafe-statics">, Group; def ftime_report : Flag<"-ftime-report">, Group; def ftrapv : Flag<"-ftrapv">, Group; diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 77aea08dbb..1bdbf24443 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -800,12 +800,6 @@ DerivedArgList *Darwin::TranslateArgs(const DerivedArgList &Args, Opts.getOption(options::OPT_feliminate_unused_debug_symbols)); break; - case options::OPT_fterminated_vtables: - case options::OPT_findirect_virtual_calls: - DAL->AddFlagArg(A, Opts.getOption(options::OPT_fapple_kext)); - DAL->AddFlagArg(A, Opts.getOption(options::OPT_static)); - break; - case options::OPT_shared: DAL->AddFlagArg(A, Opts.getOption(options::OPT_dynamiclib)); break; -- 2.40.0