Index: llvm/trunk/include/llvm/CodeGen/CommandFlags.h
===================================================================
--- llvm/trunk/include/llvm/CodeGen/CommandFlags.h
+++ llvm/trunk/include/llvm/CodeGen/CommandFlags.h
@@ -155,8 +155,8 @@
                                 "attribute not to use exceptions"),
                        cl::init(false));
 
-cl::opt<llvm::FPDenormal::DenormalType>
-DenormalType("denormal-fp-math",
+cl::opt<llvm::FPDenormal::DenormalMode>
+DenormalMode("denormal-fp-math",
           cl::desc("Select which denormal numbers the code is permitted to require"),
           cl::init(FPDenormal::IEEE),
           cl::values(
@@ -310,7 +310,7 @@
   Options.NoInfsFPMath = EnableNoInfsFPMath;
   Options.NoNaNsFPMath = EnableNoNaNsFPMath;
   Options.NoTrappingFPMath = EnableNoTrappingFPMath;
-  Options.FPDenormalType = DenormalType;
+  Options.FPDenormalMode = DenormalMode;
   Options.HonorSignDependentRoundingFPMathOption =
       EnableHonorSignDependentRoundingFPMath;
   if (FloatABIForCalls != FloatABI::Default)
Index: llvm/trunk/include/llvm/Target/TargetOptions.h
===================================================================
--- llvm/trunk/include/llvm/Target/TargetOptions.h
+++ llvm/trunk/include/llvm/Target/TargetOptions.h
@@ -57,7 +57,7 @@
   }
 
   namespace FPDenormal {
-    enum DenormalType {
+    enum DenormalMode {
       IEEE,           // IEEE 754 denormal numbers
       PreserveSign,   // the sign of a flushed-to-zero number is preserved in
                       // the sign of 0
@@ -114,7 +114,7 @@
           AllowFPOpFusion(FPOpFusion::Standard), Reciprocals(TargetRecip()),
           JTType(JumpTable::Single), ThreadModel(ThreadModel::POSIX),
           EABIVersion(EABI::Default), DebuggerTuning(DebuggerKind::Default),
-          FPDenormalType(FPDenormal::IEEE),
+          FPDenormalMode(FPDenormal::IEEE),
           ExceptionModel(ExceptionHandling::None) {}
 
     /// PrintMachineCode - This flag is enabled when the -print-machineinstrs
@@ -269,9 +269,9 @@
     /// Which debugger to tune for.
     DebuggerKind DebuggerTuning;
 
-    /// FPDenormalType - This flags specificies which denormal numbers the code
+    /// FPDenormalMode - This flags specificies which denormal numbers the code
     /// is permitted to require.
-    FPDenormal::DenormalType FPDenormalType;
+    FPDenormal::DenormalMode FPDenormalMode;
 
     /// What exception model to use
     ExceptionHandling ExceptionModel;
@@ -306,7 +306,7 @@
     ARE_EQUAL(ThreadModel) &&
     ARE_EQUAL(EABIVersion) &&
     ARE_EQUAL(DebuggerTuning) &&
-    ARE_EQUAL(FPDenormalType) &&
+    ARE_EQUAL(FPDenormalMode) &&
     ARE_EQUAL(ExceptionModel) &&
     ARE_EQUAL(MCOptions) &&
     ARE_EQUAL(EnableIPRA);
Index: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
===================================================================
--- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
+++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
@@ -781,12 +781,12 @@
   // Set FP Denormals.
   if (haveAllFunctionsAttribute(*MMI->getModule(), "denormal-fp-math",
                                 "preserve-sign") ||
-      TM.Options.FPDenormalType == FPDenormal::PreserveSign)
+      TM.Options.FPDenormalMode == FPDenormal::PreserveSign)
     ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal,
                       ARMBuildAttrs::PreserveFPSign);
   else if (haveAllFunctionsAttribute(*MMI->getModule(), "denormal-fp-math",
                                      "positive-zero") ||
-           TM.Options.FPDenormalType == FPDenormal::PositiveZero)
+           TM.Options.FPDenormalMode == FPDenormal::PositiveZero)
     ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal,
                       ARMBuildAttrs::PositiveZero);
   else if (!TM.Options.UnsafeFPMath)
Index: llvm/trunk/lib/Target/TargetMachine.cpp
===================================================================
--- llvm/trunk/lib/Target/TargetMachine.cpp
+++ llvm/trunk/lib/Target/TargetMachine.cpp
@@ -82,11 +82,11 @@
   StringRef Denormal =
     F.getFnAttribute("denormal-fp-math").getValueAsString();
   if (Denormal == "ieee")
-    Options.FPDenormalType = FPDenormal::IEEE;
+    Options.FPDenormalMode = FPDenormal::IEEE;
   else if (Denormal == "preserve-sign")
-    Options.FPDenormalType = FPDenormal::PreserveSign;
+    Options.FPDenormalMode = FPDenormal::PreserveSign;
   else if (Denormal == "positive-zero")
-    Options.FPDenormalType = FPDenormal::PositiveZero;
+    Options.FPDenormalMode = FPDenormal::PositiveZero;
 }
 
 /// Returns the code generation relocation model. The choices are static, PIC,