FileFlags::Elf: Add os_abi

gimli-rs · Jun 1, 2022 · 79e9579 · 79e9579
1 parent b706982
commit 79e9579
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/common.rs b/src/common.rs
@@ -353,6 +353,8 @@ pub enum FileFlags {
     None,
     /// ELF file flags.
     Elf {
+        /// `os_abi` field in the ELF file header.
+        os_abi: u8,
         /// `e_flags` field in the ELF file header.
         e_flags: u32,
     },

diff --git a/src/read/elf/file.rs b/src/read/elf/file.rs
@@ -419,6 +419,7 @@ where
 
     fn flags(&self) -> FileFlags {
         FileFlags::Elf {
+            os_abi: self.header.e_ident().os_abi,
             e_flags: self.header.e_flags(self.endian),
         }
     }

diff --git a/src/write/elf/object.rs b/src/write/elf/object.rs
@@ -288,13 +288,13 @@ impl<'a> Object<'a> {
                 )));
             }
         };
-        let e_flags = if let FileFlags::Elf { e_flags } = self.flags {
-            e_flags
+        let (os_abi, e_flags) = if let FileFlags::Elf { os_abi, e_flags } = self.flags {
+            (os_abi, e_flags)
         } else {
-            0
+            (elf::ELFOSABI_NONE, 0)
         };
         writer.write_file_header(&FileHeader {
-            os_abi: elf::ELFOSABI_NONE,
+            os_abi,
             abi_version: 0,
             e_type,
             e_machine,