diff options
| -rw-r--r-- | llvm/include/llvm/CodeGen/CommandFlags.h | 6 | ||||
| -rw-r--r-- | llvm/include/llvm/Target/TargetOptions.h | 7 |
2 files changed, 1 insertions, 12 deletions
diff --git a/llvm/include/llvm/CodeGen/CommandFlags.h b/llvm/include/llvm/CodeGen/CommandFlags.h index cc0a487a0f2..7fed8261e68 100644 --- a/llvm/include/llvm/CodeGen/CommandFlags.h +++ b/llvm/include/llvm/CodeGen/CommandFlags.h @@ -226,11 +226,6 @@ JTableType("jump-table-type", "Create one table per unique function type."), clEnumValEnd)); -cl::opt<bool> -FCFI("fcfi", - cl::desc("Apply forward-edge control-flow integrity"), - cl::init(false)); - // Common utility function tightly tied to the options listed here. Initializes // a TargetOptions object with CodeGen flags and returns it. static inline TargetOptions InitTargetOptionsFromCodeGenFlags() { @@ -259,7 +254,6 @@ static inline TargetOptions InitTargetOptionsFromCodeGenFlags() { Options.MCOptions = InitMCTargetOptionsFromFlags(); Options.JTType = JTableType; - Options.FCFI = FCFI; Options.ThreadModel = TMModel; diff --git a/llvm/include/llvm/Target/TargetOptions.h b/llvm/include/llvm/Target/TargetOptions.h index ba7bd162dce..0fe530d664d 100644 --- a/llvm/include/llvm/Target/TargetOptions.h +++ b/llvm/include/llvm/Target/TargetOptions.h @@ -73,7 +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) {} + ThreadModel(ThreadModel::POSIX) {} /// PrintMachineCode - This flag is enabled when the -print-machineinstrs /// option is specified on the command line, and should enable debugging @@ -221,10 +221,6 @@ namespace llvm { /// create for functions that have the jumptable attribute. JumpTable::JumpTableType JTType; - /// FCFI - This flags controls whether or not forward-edge control-flow - /// integrity is applied. - bool FCFI; - /// ThreadModel - This flag specifies the type of threading model to assume /// for things like atomics ThreadModel::Model ThreadModel; @@ -257,7 +253,6 @@ inline bool operator==(const TargetOptions &LHS, ARE_EQUAL(FloatABIType) && ARE_EQUAL(AllowFPOpFusion) && ARE_EQUAL(JTType) && - ARE_EQUAL(FCFI) && ARE_EQUAL(ThreadModel) && ARE_EQUAL(MCOptions); #undef ARE_EQUAL |
