diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2013-07-13 01:00:17 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2013-07-13 01:00:17 +0000 |
| commit | 12c74dc2c2ee306f60fb39a9b2a43000e23addcc (patch) | |
| tree | 1a4a03195d8312595fa1479be4618bafdffe86ab /include | |
| parent | 1dedabdfad8f3412256e706905b9b3b69aa2e17a (diff) | |
| download | external_llvm-12c74dc2c2ee306f60fb39a9b2a43000e23addcc.zip external_llvm-12c74dc2c2ee306f60fb39a9b2a43000e23addcc.tar.gz external_llvm-12c74dc2c2ee306f60fb39a9b2a43000e23addcc.tar.bz2 | |
Revert commit r186217 -- this is breaking bots:
http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/4328
Original commit log:
Use the function attributes to pass along the stack protector buffer
size.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186234 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/CodeGen/CommandFlags.h | 4 | ||||
| -rw-r--r-- | include/llvm/Target/TargetOptions.h | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/llvm/CodeGen/CommandFlags.h b/include/llvm/CodeGen/CommandFlags.h index fd1d67b..9a27661 100644 --- a/include/llvm/CodeGen/CommandFlags.h +++ b/include/llvm/CodeGen/CommandFlags.h @@ -220,4 +220,8 @@ cl::opt<std::string> StartAfter("start-after", cl::value_desc("pass-name"), cl::init("")); +cl::opt<unsigned> +SSPBufferSize("stack-protector-buffer-size", cl::init(8), + cl::desc("Lower bound for a buffer to be considered for " + "stack protection")); #endif diff --git a/include/llvm/Target/TargetOptions.h b/include/llvm/Target/TargetOptions.h index 04b2080..e240a9a 100644 --- a/include/llvm/Target/TargetOptions.h +++ b/include/llvm/Target/TargetOptions.h @@ -48,7 +48,7 @@ namespace llvm { UseSoftFloat(false), NoZerosInBSS(false), JITEmitDebugInfo(false), JITEmitDebugInfoToDisk(false), GuaranteedTailCallOpt(false), DisableTailCalls(false), - StackAlignmentOverride(0), RealignStack(true), + StackAlignmentOverride(0), RealignStack(true), SSPBufferSize(0), EnableFastISel(false), PositionIndependentExecutable(false), EnableSegmentedStacks(false), UseInitArray(false), TrapFuncName(""), FloatABIType(FloatABI::Default), AllowFPOpFusion(FPOpFusion::Standard) @@ -151,6 +151,10 @@ namespace llvm { /// automatically realigned, if needed. unsigned RealignStack : 1; + /// SSPBufferSize - The minimum size of buffers that will receive stack + /// smashing protection when -fstack-protection is used. + unsigned SSPBufferSize; + /// EnableFastISel - This flag enables fast-path instruction selection /// which trades away generated code quality in favor of reducing /// compile time. @@ -220,6 +224,7 @@ inline bool operator==(const TargetOptions &LHS, ARE_EQUAL(DisableTailCalls) && ARE_EQUAL(StackAlignmentOverride) && ARE_EQUAL(RealignStack) && + ARE_EQUAL(SSPBufferSize) && ARE_EQUAL(EnableFastISel) && ARE_EQUAL(PositionIndependentExecutable) && ARE_EQUAL(EnableSegmentedStacks) && |