RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 11:42:57 +01:00
Code Issues Projects Releases Wiki Activity

Remove the CFIType TargetOption as it is unused.

Browse Source 
llvm-svn: 235266
This commit is contained in:
Eric Christopher 2015-04-19 03:20:55 +00:00
parent 2b1be84066
commit 853f61980f
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/llvm/CodeGen/CommandFlags.h
View File

@ -231,19 +231,6 @@ FCFI("fcfi",
cl::desc("Apply forward-edge control-flow integrity"),
cl::init(false));
cl::opt<llvm::CFIntegrity>
CFIType("cfi-type",
cl::desc("Choose the type of Control-Flow Integrity check to add"),
cl::init(CFIntegrity::Sub),
cl::values(
clEnumValN(CFIntegrity::Sub, "sub",
"Subtract the pointer from the table base, then mask."),
clEnumValN(CFIntegrity::Ror, "ror",
"Use rotate to check the offset from a table base."),
clEnumValN(CFIntegrity::Add, "add",
"Mask out the high bits and add to an aligned base."),
clEnumValEnd));
cl::opt<bool>
CFIEnforcing("cfi-enforcing",
cl::desc("Enforce CFI or pass the violation to a function."),
@ -293,7 +280,6 @@ static inline TargetOptions InitTargetOptionsFromCodeGenFlags() {
Options.MCOptions = InitMCTargetOptionsFromFlags();
Options.JTType = JTableType;
Options.FCFI = FCFI;
Options.CFIType = CFIType;
Options.CFIEnforcing = CFIEnforcing;
Options.CFIFuncName = CFIFuncName;

15
include/llvm/Target/TargetOptions.h
View File

@ -57,14 +57,6 @@ namespace llvm {
};
}
enum class CFIntegrity {
Sub, // Use subtraction-based checks.
Ror, // Use rotation-based checks.
Add // Use addition-based checks. This depends on having
// sufficient alignment in the code and is usually not
// feasible.
};
class TargetOptions {
public:
TargetOptions()
@ -82,7 +74,7 @@ namespace llvm {
TrapFuncName(), FloatABIType(FloatABI::Default),
AllowFPOpFusion(FPOpFusion::Standard), JTType(JumpTable::Single),
FCFI(false), ThreadModel(ThreadModel::POSIX),
CFIType(CFIntegrity::Sub), CFIEnforcing(false), CFIFuncName() {}
CFIEnforcing(false), CFIFuncName() {}
/// PrintMachineCode - This flag is enabled when the -print-machineinstrs
/// option is specified on the command line, and should enable debugging
@ -238,10 +230,6 @@ namespace llvm {
/// for things like atomics
ThreadModel::Model ThreadModel;
/// CFIType - This flag specifies the type of control-flow integrity check
/// to add as a preamble to indirect calls.
CFIntegrity CFIType;
/// CFIEnforcing - This flags controls whether or not CFI violations cause
/// the program to halt.
bool CFIEnforcing;
@ -282,7 +270,6 @@ inline bool operator==(const TargetOptions &LHS,
ARE_EQUAL(JTType) &&
ARE_EQUAL(FCFI) &&
ARE_EQUAL(ThreadModel) &&
ARE_EQUAL(CFIType) &&
ARE_EQUAL(CFIEnforcing) &&
ARE_EQUAL(CFIFuncName) &&
ARE_EQUAL(MCOptions);