From 4f73ff471125689807623a3a799b0c05107a2217 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 12 Jul 2013 22:25:20 +0000 Subject: Use the function attributes to pass along the stack protector buffer size. Now that we have robust function attributes, don't use a command line option to specify the stack protecto buffer size. llvm-svn: 186217 --- llvm/tools/llc/llc.cpp | 1 - llvm/tools/lto/LTOModule.cpp | 6 ------ llvm/tools/opt/opt.cpp | 1 - 3 files changed, 8 deletions(-) (limited to 'llvm/tools') diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp index bcabafc4675..9f6be81fc92 100644 --- a/llvm/tools/llc/llc.cpp +++ b/llvm/tools/llc/llc.cpp @@ -280,7 +280,6 @@ static int compileModule(char **argv, LLVMContext &Context) { Options.PositionIndependentExecutable = EnablePIE; Options.EnableSegmentedStacks = SegmentedStacks; Options.UseInitArray = UseInitArray; - Options.SSPBufferSize = SSPBufferSize; OwningPtr target(TheTarget->createTargetMachine(TheTriple.getTriple(), diff --git a/llvm/tools/lto/LTOModule.cpp b/llvm/tools/lto/LTOModule.cpp index 6220dd1c566..5ee43ba0229 100644 --- a/llvm/tools/lto/LTOModule.cpp +++ b/llvm/tools/lto/LTOModule.cpp @@ -151,11 +151,6 @@ UseInitArray("use-init-array", cl::desc("Use .init_array instead of .ctors."), cl::init(false)); -static cl::opt -SSPBufferSize("stack-protector-buffer-size", cl::init(8), - cl::desc("Lower bound for a buffer to be considered for " - "stack protection")); - LTOModule::LTOModule(llvm::Module *m, llvm::TargetMachine *t) : _module(m), _target(t), _context(_target->getMCAsmInfo(), _target->getRegisterInfo(), NULL), @@ -261,7 +256,6 @@ void LTOModule::getTargetOptions(TargetOptions &Options) { Options.PositionIndependentExecutable = EnablePIE; Options.EnableSegmentedStacks = SegmentedStacks; Options.UseInitArray = UseInitArray; - Options.SSPBufferSize = SSPBufferSize; } LTOModule *LTOModule::makeLTOModule(MemoryBuffer *buffer, diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp index 6fc8d6759b9..fa1cd436176 100644 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -510,7 +510,6 @@ static TargetOptions GetTargetOptions() { Options.PositionIndependentExecutable = EnablePIE; Options.EnableSegmentedStacks = SegmentedStacks; Options.UseInitArray = UseInitArray; - Options.SSPBufferSize = SSPBufferSize; return Options; } -- cgit v1.2.3