Rebased PNaCl localmods in LLVM to 223109

include/llvm/Support/ELF.h

Index: include/llvm/Support/ELF.h
diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h
index 3d49205fa168d50923b0b2df49ce7ee3d29de582..8b32926722f37c2db15c9110d9fe6c6851781491 100644
--- a/include/llvm/Support/ELF.h
+++ b/include/llvm/Support/ELF.h
@@ -935,6 +935,13 @@ enum : unsigned {
   PF_MASKPROC = 0xf0000000 // Bits for processor-specific semantics.
 };
 
+// @LOCALMOD-BEGIN
+// Note segment descriptor types (for object files).
+enum {
+  NT_VERSION  = 1          // Note contains a version string.
+};
+// @LOCALMOD-END
+
 // Dynamic table entry for ELF32.
 struct Elf32_Dyn
 {