[PATCH] D55618: [llvm-objcopy] Change Segment::Type from uint64_t to uint32_t

[Fangrui Song via Phabricator via llvm-commits]

MaskRay created this revision.
MaskRay added reviewers: rupprecht, jhenderson, jakehehrlich, alexshap.
Herald added subscribers: llvm-commits, arichardson, emaste.
Herald added a reviewer: espindola.

Elf{32,64}_Word p_type is uint32_t.

Also reorder the fields to be similar to Elf64_Phdr (different from
Elf32_Phdr but quite similar).


Repository:
  rL LLVM

https://reviews.llvm.org/D55618

Files:
  tools/llvm-objcopy/ELF/Object.h


Index: tools/llvm-objcopy/ELF/Object.h
===================================================================
--- tools/llvm-objcopy/ELF/Object.h
+++ tools/llvm-objcopy/ELF/Object.h
@@ -256,16 +256,16 @@
   std::set<const SectionBase *, SectionCompare> Sections;
 
 public:
-  uint64_t Align;
+  uint32_t Type;
+  uint32_t Flags;
+  uint64_t Offset;
+  uint64_t VAddr;
+  uint64_t PAddr;
   uint64_t FileSize;
-  uint32_t Flags;
-  uint32_t Index;
   uint64_t MemSize;
-  uint64_t Offset;
-  uint64_t PAddr;
-  uint64_t Type;
-  uint64_t VAddr;
+  uint64_t Align;
 
+  uint32_t Index;
   uint64_t OriginalOffset;
   Segment *ParentSegment = nullptr;
   ArrayRef<uint8_t> Contents;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D55618.177920.patch
Type: text/x-patch
Size: 678 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181212/0e028557/attachment.bin>