Index: llvm-svn.src/include/llvm/ADT/APInt.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/APInt.h
+++ llvm-svn.src/include/llvm/ADT/APInt.h
@@ -1904,11 +1904,11 @@
 /// Performs a bitwise complement operation on APInt.
 inline APInt Not(const APInt &APIVal) { return ~APIVal; }
 
-} // End of APIntOps namespace
+} // namespace APIntOps
 
 // See friend declaration above. This additional declaration is required in
 // order to compile LLVM with IBM xlC compiler.
 hash_code hash_value(const APInt &Arg);
-} // End of llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/ArrayRef.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/ArrayRef.h
+++ llvm-svn.src/include/llvm/ADT/ArrayRef.h
@@ -366,6 +366,6 @@
   template <typename T> struct isPodLike<ArrayRef<T> > {
     static const bool value = true;
   };
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/DenseMap.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/DenseMap.h
+++ llvm-svn.src/include/llvm/ADT/DenseMap.h
@@ -42,7 +42,7 @@
   ValueT &getSecond() { return std::pair<KeyT, ValueT>::second; }
   const ValueT &getSecond() const { return std::pair<KeyT, ValueT>::second; }
 };
-}
+} // namespace detail
 
 template <
     typename KeyT, typename ValueT, typename KeyInfoT = DenseMapInfo<KeyT>,
Index: llvm-svn.src/include/llvm/ADT/DenseSet.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/DenseSet.h
+++ llvm-svn.src/include/llvm/ADT/DenseSet.h
@@ -32,7 +32,7 @@
   DenseSetEmpty &getSecond() { return *this; }
   const DenseSetEmpty &getSecond() const { return *this; }
 };
-}
+} // namespace detail
 
 /// DenseSet - This implements a dense probed hash-table based set.
 template<typename ValueT, typename ValueInfoT = DenseMapInfo<ValueT> >
Index: llvm-svn.src/include/llvm/ADT/None.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/None.h
+++ llvm-svn.src/include/llvm/ADT/None.h
@@ -21,6 +21,6 @@
 /// and similar types without having to spell out the specialization's name.
 enum class NoneType { None };
 const NoneType None = None;
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/Optional.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/Optional.h
+++ llvm-svn.src/include/llvm/ADT/Optional.h
@@ -204,6 +204,6 @@
 template<typename T, typename U>
 void operator>(const Optional<T> &X, const Optional<U> &Y);
 
-} // end llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/PointerUnion.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/PointerUnion.h
+++ llvm-svn.src/include/llvm/ADT/PointerUnion.h
@@ -507,6 +507,6 @@
                                   RHS.template get<U>()));
     }
   };
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/STLExtras.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/STLExtras.h
+++ llvm-svn.src/include/llvm/ADT/STLExtras.h
@@ -417,6 +417,6 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/SetVector.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/SetVector.h
+++ llvm-svn.src/include/llvm/ADT/SetVector.h
@@ -247,7 +247,7 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 // vim: sw=2 ai
 #endif
Index: llvm-svn.src/include/llvm/ADT/SmallPtrSet.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/SmallPtrSet.h
+++ llvm-svn.src/include/llvm/ADT/SmallPtrSet.h
@@ -334,7 +334,7 @@
   }
 };
 
-}
+} // namespace llvm
 
 namespace std {
   /// Implement std::swap in terms of SmallPtrSet swap.
@@ -342,6 +342,6 @@
   inline void swap(llvm::SmallPtrSet<T, N> &LHS, llvm::SmallPtrSet<T, N> &RHS) {
     LHS.swap(RHS);
   }
-}
+} // namespace std
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/SmallString.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/SmallString.h
+++ llvm-svn.src/include/llvm/ADT/SmallString.h
@@ -292,6 +292,6 @@
   }
 };
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/SmallVector.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/SmallVector.h
+++ llvm-svn.src/include/llvm/ADT/SmallVector.h
@@ -924,7 +924,7 @@
   return X.capacity_in_bytes();
 }
 
-} // End llvm namespace
+} // namespace llvm
 
 namespace std {
   /// Implement std::swap in terms of SmallVector swap.
@@ -940,6 +940,6 @@
   swap(llvm::SmallVector<T, N> &LHS, llvm::SmallVector<T, N> &RHS) {
     LHS.swap(RHS);
   }
-}
+} // namespace std
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/StringExtras.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/StringExtras.h
+++ llvm-svn.src/include/llvm/ADT/StringExtras.h
@@ -207,6 +207,6 @@
   return join_impl(Begin, End, Separator, tag());
 }
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/StringMap.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/StringMap.h
+++ llvm-svn.src/include/llvm/ADT/StringMap.h
@@ -447,6 +447,6 @@
   }
 };
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/StringRef.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/StringRef.h
+++ llvm-svn.src/include/llvm/ADT/StringRef.h
@@ -566,6 +566,6 @@
   // StringRefs can be treated like a POD type.
   template <typename T> struct isPodLike;
   template <> struct isPodLike<StringRef> { static const bool value = true; };
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/StringSet.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/StringSet.h
+++ llvm-svn.src/include/llvm/ADT/StringSet.h
@@ -29,6 +29,6 @@
       return base::insert(std::make_pair(Key, '\0'));
     }
   };
-}
+} // namespace llvm
 
 #endif // LLVM_ADT_STRINGSET_H
Index: llvm-svn.src/include/llvm/ADT/Triple.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/Triple.h
+++ llvm-svn.src/include/llvm/ADT/Triple.h
@@ -627,7 +627,6 @@
   /// @}
 };
 
-} // End llvm namespace
+} // namespace llvm
 
-
 #endif
Index: llvm-svn.src/include/llvm/ADT/Twine.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/Twine.h
+++ llvm-svn.src/include/llvm/ADT/Twine.h
@@ -537,6 +537,6 @@
   }
 
   /// @}
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/ilist.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/ilist.h
+++ llvm-svn.src/include/llvm/ADT/ilist.h
@@ -655,7 +655,7 @@
   void resize(size_type newsize) { resize(newsize, NodeTy()); }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 namespace std {
   // Ensure that swap uses the fast list swap...
@@ -663,6 +663,6 @@
   void swap(llvm::iplist<Ty> &Left, llvm::iplist<Ty> &Right) {
     Left.swap(Right);
   }
-}  // End 'std' extensions...
+} // namespace std
 
 #endif // LLVM_ADT_ILIST_H
Index: llvm-svn.src/include/llvm/ADT/ilist_node.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/ilist_node.h
+++ llvm-svn.src/include/llvm/ADT/ilist_node.h
@@ -101,6 +101,6 @@
   /// @}
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/iterator.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/iterator.h
+++ llvm-svn.src/include/llvm/ADT/iterator.h
@@ -241,6 +241,6 @@
   T &operator*() const { return **this->I; }
 };
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ADT/iterator_range.h
===================================================================
--- llvm-svn.src/include/llvm/ADT/iterator_range.h
+++ llvm-svn.src/include/llvm/ADT/iterator_range.h
@@ -63,6 +63,6 @@
 iterator_range<decltype(begin(std::declval<T>()))> drop_begin(T &&t, int n) {
   return make_range(std::next(begin(t), n), end(t));
 }
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Bitcode/BitCodes.h
===================================================================
--- llvm-svn.src/include/llvm/Bitcode/BitCodes.h
+++ llvm-svn.src/include/llvm/Bitcode/BitCodes.h
@@ -77,7 +77,7 @@
                                       //                             [id, name]
   };
 
-} // End bitc namespace
+} // namespace bitc
 
 /// BitCodeAbbrevOp - This describes one or more operands in an abbreviation.
 /// This is actually a union of two different things:
@@ -180,6 +180,6 @@
     OperandList.push_back(OpInfo);
   }
 };
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Bitcode/BitstreamReader.h
===================================================================
--- llvm-svn.src/include/llvm/Bitcode/BitstreamReader.h
+++ llvm-svn.src/include/llvm/Bitcode/BitstreamReader.h
@@ -512,6 +512,6 @@
   bool ReadBlockInfoBlock();
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/DebugInfo/DIContext.h
===================================================================
--- llvm-svn.src/include/llvm/DebugInfo/DIContext.h
+++ llvm-svn.src/include/llvm/DebugInfo/DIContext.h
@@ -172,6 +172,6 @@
   virtual std::unique_ptr<LoadedObjectInfo> clone() const = 0;
 };
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ExecutionEngine/ExecutionEngine.h
===================================================================
--- llvm-svn.src/include/llvm/ExecutionEngine/ExecutionEngine.h
+++ llvm-svn.src/include/llvm/ExecutionEngine/ExecutionEngine.h
@@ -54,7 +54,7 @@
 namespace object {
   class Archive;
   class ObjectFile;
-}
+} // namespace object
 
 /// \brief Helper class for helping synchronize access to the global address map
 /// table.  Access to this class should be serialized under a mutex.
@@ -504,7 +504,7 @@
     Interpreter = 0x2
   };
   const static Kind Either = (Kind)(JIT | Interpreter);
-}
+} // namespace EngineKind
 
 /// Builder class for ExecutionEngines. Use this by stack-allocating a builder,
 /// chaining the various set* methods, and terminating it with a .create()
@@ -644,6 +644,6 @@
 // Create wrappers for C Binding types (see CBindingWrapping.h).
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine, LLVMExecutionEngineRef)
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/ExecutionEngine/MCJIT.h
===================================================================
--- llvm-svn.src/include/llvm/ExecutionEngine/MCJIT.h
+++ llvm-svn.src/include/llvm/ExecutionEngine/MCJIT.h
@@ -33,6 +33,6 @@
       LLVMLinkInMCJIT();
     }
   } ForceMCJITLinking;
-}
+} // namespace
 
 #endif
Index: llvm-svn.src/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
===================================================================
--- llvm-svn.src/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
+++ llvm-svn.src/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
@@ -26,7 +26,7 @@
 
   namespace object {
     class ObjectFile;
-  }
+  } // namespace object
 
 class MCJITMemoryManager : public RuntimeDyld::MemoryManager {
 public:
Index: llvm-svn.src/include/llvm/ExecutionEngine/RuntimeDyld.h
===================================================================
--- llvm-svn.src/include/llvm/ExecutionEngine/RuntimeDyld.h
+++ llvm-svn.src/include/llvm/ExecutionEngine/RuntimeDyld.h
@@ -26,7 +26,7 @@
 namespace object {
   class ObjectFile;
   template <typename T> class OwningBinary;
-}
+} // namespace object
 
 class RuntimeDyldImpl;
 class RuntimeDyldCheckerImpl;
Index: llvm-svn.src/include/llvm/ExecutionEngine/SectionMemoryManager.h
===================================================================
--- llvm-svn.src/include/llvm/ExecutionEngine/SectionMemoryManager.h
+++ llvm-svn.src/include/llvm/ExecutionEngine/SectionMemoryManager.h
@@ -100,7 +100,7 @@
   MemoryGroup RODataMem;
 };
 
-}
+} // namespace llvm
 
 #endif // LLVM_EXECUTION_ENGINE_SECTION_MEMORY_MANAGER_H
 
Index: llvm-svn.src/include/llvm/IR/Argument.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Argument.h
+++ llvm-svn.src/include/llvm/IR/Argument.h
@@ -131,6 +131,6 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Attributes.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Attributes.h
+++ llvm-svn.src/include/llvm/IR/Attributes.h
@@ -575,8 +575,8 @@
 /// \brief Which attributes cannot be applied to a type.
 AttrBuilder typeIncompatible(const Type *Ty);
 
-} // end AttributeFuncs namespace
+} // namespace AttributeFuncs
 
-} // end llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/BasicBlock.h
===================================================================
--- llvm-svn.src/include/llvm/IR/BasicBlock.h
+++ llvm-svn.src/include/llvm/IR/BasicBlock.h
@@ -346,6 +346,6 @@
 // Create wrappers for C Binding types (see CBindingWrapping.h).
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(BasicBlock, LLVMBasicBlockRef)
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/CallingConv.h
===================================================================
--- llvm-svn.src/include/llvm/IR/CallingConv.h
+++ llvm-svn.src/include/llvm/IR/CallingConv.h
@@ -146,8 +146,8 @@
     /// in SSE registers.
     X86_VectorCall = 80
   };
-} // End CallingConv namespace
+} // namespace CallingConv
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Comdat.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Comdat.h
+++ llvm-svn.src/include/llvm/IR/Comdat.h
@@ -61,6 +61,6 @@
   return OS;
 }
 
-} // end llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Constant.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Constant.h
+++ llvm-svn.src/include/llvm/IR/Constant.h
@@ -176,6 +176,6 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Constants.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Constants.h
+++ llvm-svn.src/include/llvm/IR/Constants.h
@@ -1263,6 +1263,6 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/DataLayout.h
===================================================================
--- llvm-svn.src/include/llvm/IR/DataLayout.h
+++ llvm-svn.src/include/llvm/IR/DataLayout.h
@@ -544,6 +544,6 @@
   }
 }
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/DerivedTypes.h
===================================================================
--- llvm-svn.src/include/llvm/IR/DerivedTypes.h
+++ llvm-svn.src/include/llvm/IR/DerivedTypes.h
@@ -477,6 +477,6 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Function.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Function.h
+++ llvm-svn.src/include/llvm/IR/Function.h
@@ -628,6 +628,6 @@
 
 DEFINE_TRANSPARENT_OPERAND_ACCESSORS(Function, Value)
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/GlobalAlias.h
===================================================================
--- llvm-svn.src/include/llvm/IR/GlobalAlias.h
+++ llvm-svn.src/include/llvm/IR/GlobalAlias.h
@@ -118,6 +118,6 @@
 
 DEFINE_TRANSPARENT_OPERAND_ACCESSORS(GlobalAlias, Constant)
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/GlobalObject.h
===================================================================
--- llvm-svn.src/include/llvm/IR/GlobalObject.h
+++ llvm-svn.src/include/llvm/IR/GlobalObject.h
@@ -71,6 +71,6 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/GlobalValue.h
===================================================================
--- llvm-svn.src/include/llvm/IR/GlobalValue.h
+++ llvm-svn.src/include/llvm/IR/GlobalValue.h
@@ -30,7 +30,7 @@
 
 namespace Intrinsic {
   enum ID : unsigned;
-}
+} // namespace Intrinsic
 
 class GlobalValue : public Constant {
   GlobalValue(const GlobalValue &) = delete;
@@ -373,6 +373,6 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/GlobalVariable.h
===================================================================
--- llvm-svn.src/include/llvm/IR/GlobalVariable.h
+++ llvm-svn.src/include/llvm/IR/GlobalVariable.h
@@ -178,6 +178,6 @@
 
 DEFINE_TRANSPARENT_OPERAND_ACCESSORS(GlobalVariable, Value)
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/InstrTypes.h
===================================================================
--- llvm-svn.src/include/llvm/IR/InstrTypes.h
+++ llvm-svn.src/include/llvm/IR/InstrTypes.h
@@ -898,6 +898,6 @@
 
 DEFINE_TRANSPARENT_OPERAND_ACCESSORS(CmpInst, Value)
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Instruction.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Instruction.h
+++ llvm-svn.src/include/llvm/IR/Instruction.h
@@ -538,6 +538,6 @@
   enum { NumLowBitsAvailable = 2 };
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Instructions.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Instructions.h
+++ llvm-svn.src/include/llvm/IR/Instructions.h
@@ -4119,6 +4119,6 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Intrinsics.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Intrinsics.h
+++ llvm-svn.src/include/llvm/IR/Intrinsics.h
@@ -126,8 +126,8 @@
   /// of IITDescriptors.
   void getIntrinsicInfoTableEntries(ID id, SmallVectorImpl<IITDescriptor> &T);
 
-} // End Intrinsic namespace
+} // namespace Intrinsic
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/LLVMContext.h
===================================================================
--- llvm-svn.src/include/llvm/IR/LLVMContext.h
+++ llvm-svn.src/include/llvm/IR/LLVMContext.h
@@ -209,6 +209,6 @@
   return reinterpret_cast<LLVMContextRef*>(const_cast<LLVMContext**>(Tys));
 }
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/LegacyPassManager.h
===================================================================
--- llvm-svn.src/include/llvm/IR/LegacyPassManager.h
+++ llvm-svn.src/include/llvm/IR/LegacyPassManager.h
@@ -93,11 +93,11 @@
   Module *M;
 };
 
-} // End legacy namespace
+} // namespace legacy
 
 // Create wrappers for C Binding types (see CBindingWrapping.h).
 DEFINE_STDCXX_CONVERSION_FUNCTIONS(legacy::PassManagerBase, LLVMPassManagerRef)
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Metadata.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Metadata.h
+++ llvm-svn.src/include/llvm/IR/Metadata.h
@@ -1215,6 +1215,6 @@
   }
 };
 
-} // end llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Module.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Module.h
+++ llvm-svn.src/include/llvm/IR/Module.h
@@ -694,6 +694,6 @@
   return reinterpret_cast<Module*>(MP);
 }
   
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/OperandTraits.h
===================================================================
--- llvm-svn.src/include/llvm/IR/OperandTraits.h
+++ llvm-svn.src/include/llvm/IR/OperandTraits.h
@@ -154,7 +154,6 @@
   return this->OpFrom<Idx_nocapture>(this); \
 }
 
+} // namespace llvm
 
-} // End llvm namespace
-
 #endif
Index: llvm-svn.src/include/llvm/IR/SymbolTableListTraits.h
===================================================================
--- llvm-svn.src/include/llvm/IR/SymbolTableListTraits.h
+++ llvm-svn.src/include/llvm/IR/SymbolTableListTraits.h
@@ -73,6 +73,6 @@
   static ValueSymbolTable *toPtr(ValueSymbolTable &R) { return &R; }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Type.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Type.h
+++ llvm-svn.src/include/llvm/IR/Type.h
@@ -484,6 +484,6 @@
   return reinterpret_cast<LLVMTypeRef*>(const_cast<Type**>(Tys));
 }
   
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Use.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Use.h
+++ llvm-svn.src/include/llvm/IR/Use.h
@@ -168,6 +168,6 @@
 // Create wrappers for C Binding types (see CBindingWrapping.h).
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Use, LLVMUseRef)
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/User.h
===================================================================
--- llvm-svn.src/include/llvm/IR/User.h
+++ llvm-svn.src/include/llvm/IR/User.h
@@ -259,6 +259,6 @@
   }
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/Value.h
===================================================================
--- llvm-svn.src/include/llvm/IR/Value.h
+++ llvm-svn.src/include/llvm/IR/Value.h
@@ -704,6 +704,6 @@
   return reinterpret_cast<LLVMValueRef*>(const_cast<Value**>(Vals));
 }
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/ValueHandle.h
===================================================================
--- llvm-svn.src/include/llvm/IR/ValueHandle.h
+++ llvm-svn.src/include/llvm/IR/ValueHandle.h
@@ -382,6 +382,6 @@
   virtual void allUsesReplacedWith(Value *) {}
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/IR/ValueSymbolTable.h
===================================================================
--- llvm-svn.src/include/llvm/IR/ValueSymbolTable.h
+++ llvm-svn.src/include/llvm/IR/ValueSymbolTable.h
@@ -128,6 +128,6 @@
 /// @}
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/InitializePasses.h
===================================================================
--- llvm-svn.src/include/llvm/InitializePasses.h
+++ llvm-svn.src/include/llvm/InitializePasses.h
@@ -304,6 +304,6 @@
 void initializeFloat2IntPass(PassRegistry&);
 void initializeLoopDistributePass(PassRegistry&);
 void initializeSjLjEHPreparePass(PassRegistry&);
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Object/Binary.h
===================================================================
--- llvm-svn.src/include/llvm/Object/Binary.h
+++ llvm-svn.src/include/llvm/Object/Binary.h
@@ -178,7 +178,7 @@
 }
 
 ErrorOr<OwningBinary<Binary>> createBinary(StringRef Path);
-}
-}
+} // namespace object
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Object/ELFObjectFile.h
===================================================================
--- llvm-svn.src/include/llvm/Object/ELFObjectFile.h
+++ llvm-svn.src/include/llvm/Object/ELFObjectFile.h
@@ -883,7 +883,7 @@
   return EF.getHeader()->e_type == ELF::ET_REL;
 }
 
-}
-}
+} // namespace object
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Object/Error.h
===================================================================
--- llvm-svn.src/include/llvm/Object/Error.h
+++ llvm-svn.src/include/llvm/Object/Error.h
@@ -46,6 +46,6 @@
 namespace std {
 template <>
 struct is_error_code_enum<llvm::object::object_error> : std::true_type {};
-}
+} // namespace std
 
 #endif
Index: llvm-svn.src/include/llvm/Object/MachO.h
===================================================================
--- llvm-svn.src/include/llvm/Object/MachO.h
+++ llvm-svn.src/include/llvm/Object/MachO.h
@@ -500,8 +500,8 @@
   return OwningObject;
 }
 
-}
-}
+} // namespace object
+} // namespace llvm
 
 #endif
 
Index: llvm-svn.src/include/llvm/Object/RelocVisitor.h
===================================================================
--- llvm-svn.src/include/llvm/Object/RelocVisitor.h
+++ llvm-svn.src/include/llvm/Object/RelocVisitor.h
@@ -415,6 +415,7 @@
   }
 };
 
-}
-}
+} // namespace object
+} // namespace llvm
+
 #endif
Index: llvm-svn.src/include/llvm/Object/SymbolicFile.h
===================================================================
--- llvm-svn.src/include/llvm/Object/SymbolicFile.h
+++ llvm-svn.src/include/llvm/Object/SymbolicFile.h
@@ -193,7 +193,7 @@
   return OwningObject;
 }
 
-}
-}
+} // namespace object
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Option/OptSpecifier.h
===================================================================
--- llvm-svn.src/include/llvm/Option/OptSpecifier.h
+++ llvm-svn.src/include/llvm/Option/OptSpecifier.h
@@ -35,7 +35,7 @@
     bool operator==(OptSpecifier Opt) const { return ID == Opt.getID(); }
     bool operator!=(OptSpecifier Opt) const { return !(*this == Opt); }
   };
-}
-}
+} // namespace opt
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Pass.h
===================================================================
--- llvm-svn.src/include/llvm/Pass.h
+++ llvm-svn.src/include/llvm/Pass.h
@@ -369,7 +369,7 @@
 /// @brief This is the storage for the -time-passes option.
 extern bool TimePassesIsEnabled;
 
-} // End llvm namespace
+} // namespace llvm
 
 // Include support files that contain important APIs commonly used by Passes,
 // but that we want to separate out to make it easier to read the header files.
Index: llvm-svn.src/include/llvm/PassAnalysisSupport.h
===================================================================
--- llvm-svn.src/include/llvm/PassAnalysisSupport.h
+++ llvm-svn.src/include/llvm/PassAnalysisSupport.h
@@ -245,6 +245,6 @@
   return *(AnalysisType*)ResultPass->getAdjustedAnalysisPointer(PI);
 }
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/PassInfo.h
===================================================================
--- llvm-svn.src/include/llvm/PassInfo.h
+++ llvm-svn.src/include/llvm/PassInfo.h
@@ -142,6 +142,6 @@
   PassInfo(const PassInfo &) = delete;
 };
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/PassRegistry.h
===================================================================
--- llvm-svn.src/include/llvm/PassRegistry.h
+++ llvm-svn.src/include/llvm/PassRegistry.h
@@ -95,6 +95,6 @@
 // Create wrappers for C Binding types (see CBindingWrapping.h).
 DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassRegistry, LLVMPassRegistryRef)
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/PassSupport.h
===================================================================
--- llvm-svn.src/include/llvm/PassSupport.h
+++ llvm-svn.src/include/llvm/PassSupport.h
@@ -244,7 +244,6 @@
   virtual void passEnumerate(const PassInfo *) {}
 };
 
+} // namespace llvm
 
-} // End llvm namespace
-
 #endif
Index: llvm-svn.src/include/llvm/Support/Atomic.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Atomic.h
+++ llvm-svn.src/include/llvm/Support/Atomic.h
@@ -33,7 +33,7 @@
     cas_flag AtomicAdd(volatile cas_flag* ptr, cas_flag val);
     cas_flag AtomicMul(volatile cas_flag* ptr, cas_flag val);
     cas_flag AtomicDiv(volatile cas_flag* ptr, cas_flag val);
-  }
-}
+  } // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/Casting.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Casting.h
+++ llvm-svn.src/include/llvm/Support/Casting.h
@@ -321,6 +321,6 @@
   return (Val && isa<X>(Val)) ? cast<X>(Val) : nullptr;
 }
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/CodeGen.h
===================================================================
--- llvm-svn.src/include/llvm/Support/CodeGen.h
+++ llvm-svn.src/include/llvm/Support/CodeGen.h
@@ -23,16 +23,16 @@
   // Relocation model types.
   namespace Reloc {
     enum Model { Default, Static, PIC_, DynamicNoPIC };
-  }
+  } // namespace Reloc
 
   // Code model types.
   namespace CodeModel {
     enum Model { Default, JITDefault, Small, Kernel, Medium, Large };
-  }
+  } // namespace CodeModel
 
   namespace PICLevel {
     enum Level { Default=0, Small=1, Large=2 };
-  }
+  } // namespace PICLevel
 
   // TLS models.
   namespace TLSModel {
@@ -42,7 +42,7 @@
       InitialExec,
       LocalExec
     };
-  }
+  } // namespace TLSModel
 
   // Code generation optimization level.
   namespace CodeGenOpt {
@@ -52,7 +52,7 @@
       Default,     // -O2, -Os
       Aggressive   // -O3
     };
-  }
+  } // namespace CodeGenOpt
 
   // Create wrappers for C Binding types (see CBindingWrapping.h).
   inline CodeModel::Model unwrap(LLVMCodeModel Model) {
@@ -90,6 +90,6 @@
     }
     llvm_unreachable("Bad CodeModel!");
   }
-}  // end llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/DataStream.h
===================================================================
--- llvm-svn.src/include/llvm/Support/DataStream.h
+++ llvm-svn.src/include/llvm/Support/DataStream.h
@@ -33,6 +33,6 @@
 
 std::unique_ptr<DataStreamer> getDataFileStreamer(const std::string &Filename,
                                                   std::string *Err);
-}
+} // namespace llvm
 
 #endif  // LLVM_SUPPORT_DATASTREAM_H_
Index: llvm-svn.src/include/llvm/Support/Debug.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Debug.h
+++ llvm-svn.src/include/llvm/Support/Debug.h
@@ -91,6 +91,6 @@
 //
 #define DEBUG(X) DEBUG_WITH_TYPE(DEBUG_TYPE, X)
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/DynamicLibrary.h
===================================================================
--- llvm-svn.src/include/llvm/Support/DynamicLibrary.h
+++ llvm-svn.src/include/llvm/Support/DynamicLibrary.h
@@ -99,7 +99,7 @@
     static void AddSymbol(StringRef symbolName, void *symbolValue);
   };
 
-} // End sys namespace
-} // End llvm namespace
+} // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/ErrorHandling.h
===================================================================
--- llvm-svn.src/include/llvm/Support/ErrorHandling.h
+++ llvm-svn.src/include/llvm/Support/ErrorHandling.h
@@ -84,7 +84,7 @@
   LLVM_ATTRIBUTE_NORETURN void
   llvm_unreachable_internal(const char *msg=nullptr, const char *file=nullptr,
                             unsigned line=0);
-}
+} // namespace llvm
 
 /// Marks that the current location is not supposed to be reachable.
 /// In !NDEBUG builds, prints the message and location info to stderr.
Index: llvm-svn.src/include/llvm/Support/FileSystem.h
===================================================================
--- llvm-svn.src/include/llvm/Support/FileSystem.h
+++ llvm-svn.src/include/llvm/Support/FileSystem.h
@@ -724,7 +724,7 @@
     intptr_t IterationHandle;
     directory_entry CurrentEntry;
   };
-}
+} // namespace detail
 
 /// directory_iterator - Iterates through the entries in path. There is no
 /// operator++ because we need an error_code. If it's really needed we can make
@@ -786,7 +786,7 @@
     uint16_t Level;
     bool HasNoPushRequest;
   };
-}
+} // namespace detail
 
 /// recursive_directory_iterator - Same as directory_iterator except for it
 /// recurses down into child directories.
Index: llvm-svn.src/include/llvm/Support/FileUtilities.h
===================================================================
--- llvm-svn.src/include/llvm/Support/FileUtilities.h
+++ llvm-svn.src/include/llvm/Support/FileUtilities.h
@@ -73,6 +73,6 @@
     /// will not be removed when the object is destroyed.
     void releaseFile() { DeleteIt = false; }
   };
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/FormattedStream.h
===================================================================
--- llvm-svn.src/include/llvm/Support/FormattedStream.h
+++ llvm-svn.src/include/llvm/Support/FormattedStream.h
@@ -156,7 +156,6 @@
 /// debug output.  Use it like: fdbgs() << "foo" << "bar";
 formatted_raw_ostream &fdbgs();
 
-} // end llvm namespace
+} // namespace llvm
 
-
 #endif
Index: llvm-svn.src/include/llvm/Support/Host.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Host.h
+++ llvm-svn.src/include/llvm/Support/Host.h
@@ -68,7 +68,7 @@
   ///
   /// \return - True on success.
   bool getHostCPUFeatures(StringMap<bool> &Features);
-}
-}
+} // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/MD5.h
===================================================================
--- llvm-svn.src/include/llvm/Support/MD5.h
+++ llvm-svn.src/include/llvm/Support/MD5.h
@@ -65,6 +65,6 @@
   const uint8_t *body(ArrayRef<uint8_t> Data);
 };
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/ManagedStatic.h
===================================================================
--- llvm-svn.src/include/llvm/Support/ManagedStatic.h
+++ llvm-svn.src/include/llvm/Support/ManagedStatic.h
@@ -106,6 +106,6 @@
   ~llvm_shutdown_obj() { llvm_shutdown(); }
 };
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/MathExtras.h
===================================================================
--- llvm-svn.src/include/llvm/Support/MathExtras.h
+++ llvm-svn.src/include/llvm/Support/MathExtras.h
@@ -642,6 +642,6 @@
 }
 
 extern const float huge_valf;
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/Memory.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Memory.h
+++ llvm-svn.src/include/llvm/Support/Memory.h
@@ -155,7 +155,7 @@
     /// as writable.
     static bool setRangeWritable(const void *Addr, size_t Size);
   };
-}
-}
+} // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/MemoryObject.h
===================================================================
--- llvm-svn.src/include/llvm/Support/MemoryObject.h
+++ llvm-svn.src/include/llvm/Support/MemoryObject.h
@@ -63,6 +63,6 @@
   virtual bool isValidAddress(uint64_t address) const = 0;
 };
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/Mutex.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Mutex.h
+++ llvm-svn.src/include/llvm/Support/Mutex.h
@@ -152,7 +152,7 @@
     };
 
     typedef SmartScopedLock<false> ScopedLock;
-  }
-}
+  } // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/Program.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Program.h
+++ llvm-svn.src/include/llvm/Support/Program.h
@@ -187,7 +187,7 @@
       ///< string is non-empty upon return an error occurred while invoking the
       ///< program.
       );
-  }
-}
+  } // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/RWMutex.h
===================================================================
--- llvm-svn.src/include/llvm/Support/RWMutex.h
+++ llvm-svn.src/include/llvm/Support/RWMutex.h
@@ -171,7 +171,7 @@
       }
     };
     typedef SmartScopedWriter<false> ScopedWriter;
-  }
-}
+  } // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/Regex.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Regex.h
+++ llvm-svn.src/include/llvm/Support/Regex.h
@@ -100,6 +100,6 @@
     struct llvm_regex *preg;
     int error;
   };
-}
+} // namespace llvm
 
 #endif // LLVM_SUPPORT_REGEX_H
Index: llvm-svn.src/include/llvm/Support/Registry.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Registry.h
+++ llvm-svn.src/include/llvm/Support/Registry.h
@@ -228,6 +228,6 @@
   template <typename T, typename U>
   typename Registry<T,U>::listener *Registry<T,U>::ListenerTail;
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/Signals.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Signals.h
+++ llvm-svn.src/include/llvm/Support/Signals.h
@@ -65,7 +65,7 @@
   /// different thread on some platforms.
   /// @brief Register a function to be called when ctrl-c is pressed.
   void SetInterruptFunction(void (*IF)());
-} // End sys namespace
-} // End llvm namespace
+} // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/SourceMgr.h
===================================================================
--- llvm-svn.src/include/llvm/Support/SourceMgr.h
+++ llvm-svn.src/include/llvm/Support/SourceMgr.h
@@ -280,6 +280,6 @@
              bool ShowKindLabel = true) const;
 };
 
-}  // end llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/StreamingMemoryObject.h
===================================================================
--- llvm-svn.src/include/llvm/Support/StreamingMemoryObject.h
+++ llvm-svn.src/include/llvm/Support/StreamingMemoryObject.h
@@ -89,5 +89,6 @@
 MemoryObject *getNonStreamedMemoryObject(
     const unsigned char *Start, const unsigned char *End);
 
-}
+} // namespace llvm
+
 #endif  // STREAMINGMEMORYOBJECT_H_
Index: llvm-svn.src/include/llvm/Support/TargetSelect.h
===================================================================
--- llvm-svn.src/include/llvm/Support/TargetSelect.h
+++ llvm-svn.src/include/llvm/Support/TargetSelect.h
@@ -161,6 +161,6 @@
 #endif
   }  
 
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/Threading.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Threading.h
+++ llvm-svn.src/include/llvm/Support/Threading.h
@@ -34,6 +34,6 @@
   /// the thread stack.
   void llvm_execute_on_thread(void (*UserFn)(void*), void *UserData,
                               unsigned RequestedStackSize = 0);
-}
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/TimeValue.h
===================================================================
--- llvm-svn.src/include/llvm/Support/TimeValue.h
+++ llvm-svn.src/include/llvm/Support/TimeValue.h
@@ -380,7 +380,7 @@
   return difference;
 }
 
-}
-}
+} // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/Timer.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Timer.h
+++ llvm-svn.src/include/llvm/Support/Timer.h
@@ -184,6 +184,6 @@
   void PrintQueuedTimers(raw_ostream &OS);
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/UniqueLock.h
===================================================================
--- llvm-svn.src/include/llvm/Support/UniqueLock.h
+++ llvm-svn.src/include/llvm/Support/UniqueLock.h
@@ -62,6 +62,6 @@
 
     bool owns_lock() { return locked; }
   };
-}
+} // namespace llvm
 
 #endif // LLVM_SUPPORT_UNIQUE_LOCK_H
Index: llvm-svn.src/include/llvm/Support/Valgrind.h
===================================================================
--- llvm-svn.src/include/llvm/Support/Valgrind.h
+++ llvm-svn.src/include/llvm/Support/Valgrind.h
@@ -67,7 +67,7 @@
   #define TsanIgnoreWritesBegin()
   #define TsanIgnoreWritesEnd()
 #endif
-}
-}
+} // namespace sys
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/raw_os_ostream.h
===================================================================
--- llvm-svn.src/include/llvm/Support/raw_os_ostream.h
+++ llvm-svn.src/include/llvm/Support/raw_os_ostream.h
@@ -37,6 +37,6 @@
   ~raw_os_ostream() override;
 };
 
-} // end llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/raw_ostream.h
===================================================================
--- llvm-svn.src/include/llvm/Support/raw_ostream.h
+++ llvm-svn.src/include/llvm/Support/raw_ostream.h
@@ -28,8 +28,8 @@
 namespace sys {
 namespace fs {
 enum OpenFlags : unsigned;
-}
-}
+} // namespace fs
+} // namespace sys
 
 /// This class implements an extremely fast bulk output stream that can *only*
 /// output to a stream.  It does not support seeking, reopening, rewinding, line
@@ -547,6 +547,6 @@
   ~buffer_ostream() { OS << str(); }
 };
 
-} // end llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Support/type_traits.h
===================================================================
--- llvm-svn.src/include/llvm/Support/type_traits.h
+++ llvm-svn.src/include/llvm/Support/type_traits.h
@@ -91,7 +91,7 @@
   typedef const typename std::remove_pointer<T>::type *type;
 };
 
-}
+} // namespace llvm
 
 #ifdef LLVM_DEFINED_HAS_FEATURE
 #undef __has_feature
Index: llvm-svn.src/include/llvm/Target/TargetMachine.h
===================================================================
--- llvm-svn.src/include/llvm/Target/TargetMachine.h
+++ llvm-svn.src/include/llvm/Target/TargetMachine.h
@@ -56,7 +56,7 @@
 // The old pass manager infrastructure is hidden in a legacy namespace now.
 namespace legacy {
 class PassManagerBase;
-}
+} // namespace legacy
 using legacy::PassManagerBase;
 
 //===----------------------------------------------------------------------===//
@@ -273,6 +273,6 @@
                          bool DisableVerify = true) override;
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Target/TargetOptions.h
===================================================================
--- llvm-svn.src/include/llvm/Target/TargetOptions.h
+++ llvm-svn.src/include/llvm/Target/TargetOptions.h
@@ -30,7 +30,7 @@
       Soft,    // Soft float.
       Hard     // Hard float.
     };
-  }
+  } // namespace FloatABI
 
   namespace FPOpFusion {
     enum FPOpFusionMode {
@@ -38,7 +38,7 @@
       Standard, // Only allow fusion of 'blessed' ops (currently just fmuladd).
       Strict    // Never fuse FP-ops.
     };
-  }
+  } // namespace FPOpFusion
 
   namespace JumpTable {
     enum JumpTableType {
@@ -49,14 +49,14 @@
                        // primitive, and function pointer.
       Full             // Use one table per unique function type
     };
-  }
+  } // namespace JumpTable
 
   namespace ThreadModel {
     enum Model {
       POSIX,  // POSIX Threads
       Single  // Single Threaded Environment
     };
-  }
+  } // namespace ThreadModel
 
   class TargetOptions {
   public:
@@ -245,6 +245,6 @@
   return !(LHS == RHS);
 }
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Target/TargetRecip.h
===================================================================
--- llvm-svn.src/include/llvm/Target/TargetRecip.h
+++ llvm-svn.src/include/llvm/Target/TargetRecip.h
@@ -68,6 +68,6 @@
   void parseIndividualParams(const std::vector<std::string> &Args);
 };
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif
Index: llvm-svn.src/include/llvm/Transforms/IPO.h
===================================================================
--- llvm-svn.src/include/llvm/Transforms/IPO.h
+++ llvm-svn.src/include/llvm/Transforms/IPO.h
@@ -209,6 +209,6 @@
 /// to bitsets.
 ModulePass *createLowerBitSetsPass();
 
-} // End llvm namespace
+} // namespace llvm
 
 #endif