Remove CFIFuncName from TargetOptions as it is currently unused.

llvm-svn: 235268
This commit is contained in:
Eric Christopher 2015-04-19 03:21:04 +00:00
parent 78804ab2df
commit d2e3ddad14
3 changed files with 1 additions and 30 deletions

View File

@ -231,21 +231,6 @@ FCFI("fcfi",
cl::desc("Apply forward-edge control-flow integrity"),
cl::init(false));
// Note that this option is linked to the cfi-enforcing option above: if
// cfi-enforcing is set, then the cfi-func-name option is entirely ignored. If
// cfi-enforcing is false and no cfi-func-name is set, then a default function
// will be generated that ignores all CFI violations. The expected signature for
// functions called with CFI violations is
//
// void (i8*, i8*)
//
// The first pointer is a C string containing the name of the function in which
// the violation occurs, and the second pointer is the pointer that violated
// CFI.
cl::opt<std::string>
CFIFuncName("cfi-func-name", cl::desc("The name of the CFI function to call"),
cl::init(""));
// Common utility function tightly tied to the options listed here. Initializes
// a TargetOptions object with CodeGen flags and returns it.
static inline TargetOptions InitTargetOptionsFromCodeGenFlags() {

View File

@ -73,8 +73,7 @@ namespace llvm {
DataSections(false), UniqueSectionNames(true), TrapUnreachable(false),
TrapFuncName(), FloatABIType(FloatABI::Default),
AllowFPOpFusion(FPOpFusion::Standard), JTType(JumpTable::Single),
FCFI(false), ThreadModel(ThreadModel::POSIX),
CFIFuncName() {}
FCFI(false), ThreadModel(ThreadModel::POSIX) {}
/// PrintMachineCode - This flag is enabled when the -print-machineinstrs
/// option is specified on the command line, and should enable debugging
@ -230,12 +229,6 @@ namespace llvm {
/// for things like atomics
ThreadModel::Model ThreadModel;
/// getCFIFuncName - If this returns a non-empty string, then this is the
/// name of the function that will be called for each CFI violation in
/// non-enforcing mode.
std::string CFIFuncName;
StringRef getCFIFuncName() const;
/// Machine level options.
MCTargetOptions MCOptions;
};
@ -266,7 +259,6 @@ inline bool operator==(const TargetOptions &LHS,
ARE_EQUAL(JTType) &&
ARE_EQUAL(FCFI) &&
ARE_EQUAL(ThreadModel) &&
ARE_EQUAL(CFIFuncName) &&
ARE_EQUAL(MCOptions);
#undef ARE_EQUAL
}

View File

@ -51,9 +51,3 @@ bool TargetOptions::HonorSignDependentRoundingFPMath() const {
StringRef TargetOptions::getTrapFunctionName() const {
return TrapFuncName;
}
/// getCFIFuncName - If this returns a non-empty string, then it is the name of
/// the function that gets called on CFI violations in CFI non-enforcing mode.
StringRef TargetOptions::getCFIFuncName() const {
return CFIFuncName;
}