Add -mstack-alignment=X and fix -mstackrealign handling now that the
backend options are gone.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145868 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp
index f194c23..3bc57e7 100644
--- a/lib/CodeGen/BackendUtil.cpp
+++ b/lib/CodeGen/BackendUtil.cpp
@@ -289,6 +289,11 @@
llvm::TargetOptions Options;
+ if (CodeGenOpts.RealignStack)
+ Options.RealignStack = true;
+ if (CodeGenOpts.StackAlignment)
+ Options.StackAlignmentOverride = CodeGenOpts.StackAlignment;
+
// Set frame pointer elimination mode.
if (!CodeGenOpts.DisableFPElim) {
Options.NoFramePointerElim = false;
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index eed1c82..074be43 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1796,10 +1796,11 @@
CmdArgs.push_back(Args.MakeArgString(Twine(StackProtectorLevel)));
}
- // Translate -mstackrealign
- if (Args.hasArg(options::OPT_mstackrealign)) {
- CmdArgs.push_back("-backend-option");
- CmdArgs.push_back("-force-align-stack");
+ if (Args.hasArg(options::OPT_mstackrealign))
+ CmdArgs.push_back("-mstackrealign");
+ if (Args.hasArg(options::OPT_mstack_alignment)) {
+ StringRef alignment = Args.getLastArgValue(options::OPT_mstack_alignment);
+ CmdArgs.push_back(Args.MakeArgString("-mstack-alignment=" + alignment));
}
// Forward -f options with positive and negative forms; we translate
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 6b5c8cf..b89bf08 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -1114,6 +1114,11 @@
Opts.CoverageFile = Args.getLastArgValue(OPT_coverage_file);
Opts.DebugCompilationDir = Args.getLastArgValue(OPT_fdebug_compilation_dir);
Opts.LinkBitcodeFile = Args.getLastArgValue(OPT_mlink_bitcode_file);
+ Opts.RealignStack = Args.hasArg(OPT_mstackrealign);
+ if (Arg *A = Args.getLastArg(OPT_mstack_alignment)) {
+ StringRef Val = A->getValue(Args);
+ Val.getAsInteger(10, Opts.StackAlignment);
+ }
if (Arg *A = Args.getLastArg(OPT_fobjc_dispatch_method_EQ)) {
StringRef Name = A->getValue(Args);