Accidental commit of partial 'stack canaries' code

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55937 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h
index 60b70399c7fe46e8086b126e0b0c45fc4cbb5856..93c46ae28ead8d6158dabed697157d8fbeb6d639 100644 (file)
--- a/include/llvm/Target/TargetMachine.h
+++ b/include/llvm/Target/TargetMachine.h
@@ -68,15 +68,6 @@ namespace FileModel {
   };
 }
 
-// Stack canary model types.
-namespace StackCanaries {
-  enum Model {
-    Default,
-    On,
-    Always
-  };
-}
-
 //===----------------------------------------------------------------------===//
 ///
 /// TargetMachine - Primary interface to the complete machine description for

diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp
index 0bf0e374d1e737546e6d9a5453698e1bd3092c40..600a120e867c559d70e7eb1ac597ad9de4ade752 100644 (file)
--- a/lib/Target/TargetMachine.cpp
+++ b/lib/Target/TargetMachine.cpp
@@ -40,7 +40,6 @@ namespace llvm {
   bool RealignStack;
   bool VerboseAsm;
   bool DisableJumpTables;
-  StackCanaries::Model StackProtectors;
 }
 
 static cl::opt<bool, true> PrintCode("print-machineinstrs",
@@ -164,21 +163,6 @@ DisableSwitchTables(cl::Hidden, "disable-jump-tables",
            cl::location(DisableJumpTables),
            cl::init(false));
 
-static cl::opt<llvm::StackCanaries::Model, true>
-GenerateStackProtectors("stack-protector",
-                        cl::desc("Generate stack protectors"),
-                        cl::location(StackProtectors),
-                        cl::init(StackCanaries::Default),
-                        cl::values(
-                         clEnumValN(StackCanaries::Default, "default",
-                           "  No stack protectors"),
-                         clEnumValN(StackCanaries::On, "on",
-                           "  Generate stack protectors for functions that"
-                           "need them"),
-                         clEnumValN(StackCanaries::Always, "all",
-                           "  Generate stack protectors for all functions"),
-                         clEnumValEnd));
-
 //---------------------------------------------------------------------------
 // TargetMachine Class
 //