From 8a2aa076ee63f49de0f1248082d983e306d08163 Mon Sep 17 00:00:00 2001
From: Folkert <folkert@folkertdev.nl>
Date: Sun, 4 Sep 2022 16:56:37 +0200
Subject: [PATCH] cleanup

---
 crates/linker/src/generate_dylib/elf64.rs | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/crates/linker/src/generate_dylib/elf64.rs b/crates/linker/src/generate_dylib/elf64.rs
index fe7a8592d8..5424e340ee 100644
--- a/crates/linker/src/generate_dylib/elf64.rs
+++ b/crates/linker/src/generate_dylib/elf64.rs
@@ -1,19 +1,5 @@
 use object::{elf, Endianness};
 
-pub const fn round_up_to_alignment(width: usize, alignment: usize) -> usize {
-    match alignment {
-        0 => width,
-        1 => width,
-        _ => {
-            if width % alignment > 0 {
-                width + alignment - (width % alignment)
-            } else {
-                width
-            }
-        }
-    }
-}
-
 pub fn create_dylib_elf64(custom_names: &[String]) -> object::read::Result<Vec<u8>> {
     let endian = Endianness::Little;
 
@@ -44,8 +30,6 @@ pub fn create_dylib_elf64(custom_names: &[String]) -> object::read::Result<Vec<u
         })
         .collect();
 
-    let dynamic_count = out_dynamic.len();
-
     writer.reserve_file_header();
 
     let dynsym_address = writer.reserved_len();
@@ -54,15 +38,16 @@ pub fn create_dylib_elf64(custom_names: &[String]) -> object::read::Result<Vec<u
     let dynstr_address = writer.reserved_len();
     writer.reserve_dynstr();
 
-    let dynamic_address = round_up_to_alignment(writer.reserved_len(), 8);
-    writer.reserve_dynamic(dynamic_count);
+    // aligned to the next multiple of 8
+    let dynamic_address = (writer.reserved_len() + 7) & !7;
+    writer.reserve_dynamic(out_dynamic.len());
 
     writer.reserve_strtab();
     writer.reserve_shstrtab();
 
     writer.reserve_section_headers();
 
-    // writing
+    // WRITING SECTION CONTENT
 
     writer
         .write_file_header(&object::write::elf::FileHeader {