Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Side by Side Diff: include/llvm/Support/ELF.h

Issue 939073008: Rebased PNaCl localmods in LLVM to 223109 (Closed)
Patch Set: undo localmod Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/llvm/MC/MCNaCl.h ('k') | include/llvm/Support/StreamingMemoryObject.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 //===-- llvm/Support/ELF.h - ELF constants and data structures --*- C++ -*-===// 1 //===-- llvm/Support/ELF.h - ELF constants and data structures --*- C++ -*-===//
2 // 2 //
3 // The LLVM Compiler Infrastructure 3 // The LLVM Compiler Infrastructure
4 // 4 //
5 // This file is distributed under the University of Illinois Open Source 5 // This file is distributed under the University of Illinois Open Source
6 // License. See LICENSE.TXT for details. 6 // License. See LICENSE.TXT for details.
7 // 7 //
8 //===----------------------------------------------------------------------===// 8 //===----------------------------------------------------------------------===//
9 // 9 //
10 // This header contains common, non-processor-specific data structures and 10 // This header contains common, non-processor-specific data structures and
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 928
929 // Segment flag bits. 929 // Segment flag bits.
930 enum : unsigned { 930 enum : unsigned {
931 PF_X = 1, // Execute 931 PF_X = 1, // Execute
932 PF_W = 2, // Write 932 PF_W = 2, // Write
933 PF_R = 4, // Read 933 PF_R = 4, // Read
934 PF_MASKOS = 0x0ff00000,// Bits for operating system-specific semantics. 934 PF_MASKOS = 0x0ff00000,// Bits for operating system-specific semantics.
935 PF_MASKPROC = 0xf0000000 // Bits for processor-specific semantics. 935 PF_MASKPROC = 0xf0000000 // Bits for processor-specific semantics.
936 }; 936 };
937 937
938 // @LOCALMOD-BEGIN
939 // Note segment descriptor types (for object files).
940 enum {
941 NT_VERSION = 1 // Note contains a version string.
942 };
943 // @LOCALMOD-END
944
938 // Dynamic table entry for ELF32. 945 // Dynamic table entry for ELF32.
939 struct Elf32_Dyn 946 struct Elf32_Dyn
940 { 947 {
941 Elf32_Sword d_tag; // Type of dynamic table entry. 948 Elf32_Sword d_tag; // Type of dynamic table entry.
942 union 949 union
943 { 950 {
944 Elf32_Word d_val; // Integer value of entry. 951 Elf32_Word d_val; // Integer value of entry.
945 Elf32_Addr d_ptr; // Pointer value of entry. 952 Elf32_Addr d_ptr; // Pointer value of entry.
946 } d_un; 953 } d_un;
947 }; 954 };
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 enum { 1174 enum {
1168 VER_NEED_NONE = 0, 1175 VER_NEED_NONE = 0,
1169 VER_NEED_CURRENT = 1 1176 VER_NEED_CURRENT = 1
1170 }; 1177 };
1171 1178
1172 } // end namespace ELF 1179 } // end namespace ELF
1173 1180
1174 } // end namespace llvm 1181 } // end namespace llvm
1175 1182
1176 #endif 1183 #endif
OLDNEW
« no previous file with comments | « include/llvm/MC/MCNaCl.h ('k') | include/llvm/Support/StreamingMemoryObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698