diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2011-06-23 18:15:47 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2011-06-23 18:15:47 +0000 |
| commit | 8b2a2a1158610f4d857fb09f5a06f162f2d22ecf (patch) | |
| tree | ea3efb7385602a9c687474540846c9d323582977 /llvm/lib | |
| parent | 1b049f5851242d71ccd6ab384c84b46a941fac29 (diff) | |
| download | bcm5719-llvm-8b2a2a1158610f4d857fb09f5a06f162f2d22ecf.tar.gz bcm5719-llvm-8b2a2a1158610f4d857fb09f5a06f162f2d22ecf.zip | |
Rename TargetOptions::StackAlignment to StackAlignmentOverride.
llvm-svn: 133739
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/TargetMachine.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86TargetMachine.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp index 863b8114dc3..14044f25a0b 100644 --- a/llvm/lib/Target/TargetMachine.cpp +++ b/llvm/lib/Target/TargetMachine.cpp @@ -43,7 +43,7 @@ namespace llvm { Reloc::Model RelocationModel; CodeModel::Model CMModel; bool GuaranteedTailCallOpt; - unsigned StackAlignment; + unsigned StackAlignmentOverride; bool RealignStack; bool DisableJumpTables; bool StrongPHIElim; @@ -183,7 +183,7 @@ EnableGuaranteedTailCallOpt("tailcallopt", static cl::opt<unsigned, true> OverrideStackAlignment("stack-alignment", cl::desc("Override default stack alignment"), - cl::location(StackAlignment), + cl::location(StackAlignmentOverride), cl::init(0)); static cl::opt<bool, true> EnableRealignStack("realign-stack", diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp index 0b85469976c..c10bf1cc0ab 100644 --- a/llvm/lib/Target/X86/X86TargetMachine.cpp +++ b/llvm/lib/Target/X86/X86TargetMachine.cpp @@ -117,7 +117,7 @@ X86_64TargetMachine::X86_64TargetMachine(const Target &T, const std::string &TT, X86TargetMachine::X86TargetMachine(const Target &T, const std::string &TT, const std::string &FS, bool is64Bit) : LLVMTargetMachine(T, TT), - Subtarget(TT, FS, is64Bit, StackAlignment), + Subtarget(TT, FS, is64Bit, StackAlignmentOverride), FrameLowering(*this, Subtarget), ELFWriterInfo(is64Bit, true) { DefRelocModel = getRelocationModel(); |
