diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-11-29 00:42:06 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-11-29 00:42:06 +0000 |
| commit | 9ae53f8e3a46de8fc32d102569ab0a191d435077 (patch) | |
| tree | 03e2f9490c37a60ea6bae4501a0eb2d19646f93b /clang/lib/Driver/Tools.cpp | |
| parent | 8c3f2764fb638e19133eded70a244d968bbf7126 (diff) | |
| download | bcm5719-llvm-9ae53f8e3a46de8fc32d102569ab0a191d435077.tar.gz bcm5719-llvm-9ae53f8e3a46de8fc32d102569ab0a191d435077.zip | |
[driver] -mkernel implies -mstrict-align; don't add the redundant option.
rdar://12771737
llvm-svn: 168841
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 34fbfcf14ee..4d562d3f8bd 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -2508,7 +2508,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, StringRef alignment = Args.getLastArgValue(options::OPT_mstack_alignment); CmdArgs.push_back(Args.MakeArgString("-mstack-alignment=" + alignment)); } - if (Args.hasArg(options::OPT_mstrict_align)) { + // -mkernel implies -mstrict-align; don't add the redundant option. + if (Args.hasArg(options::OPT_mstrict_align) && !KernelOrKext) { CmdArgs.push_back("-backend-option"); CmdArgs.push_back("-arm-strict-align"); } |
