Added arch-alignment to wasmer-object

JesseStutler · May 15, 2021 · 96643d8 · 96643d8
1 parent 0722dd8
commit 96643d8
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/lib/object/src/module.rs b/lib/object/src/module.rs
@@ -138,6 +138,13 @@ pub fn emit_compilation(
 
     let debug_index = compilation.get_debug().map(|d| d.eh_frame);
 
+    let align = match triple.architecture {
+        Architecture::X86_64 => 1,
+        // In Arm64 is recommended a 4-byte alignment
+        Architecture::Aarch64(_) => 4,
+        _ => 1,
+    };
+
     // Add sections
     let custom_section_ids = custom_sections
         .into_iter()
@@ -147,7 +154,7 @@ pub fn emit_compilation(
                 let segment = obj.segment_name(StandardSegment::Debug).to_vec();
                 let section_id =
                     obj.add_section(segment, DWARF_SECTION_NAME.to_vec(), SectionKind::Debug);
-                obj.append_section_data(section_id, custom_section.bytes.as_slice(), 1);
+                obj.append_section_data(section_id, custom_section.bytes.as_slice(), align);
                 let section_name = symbol_registry.symbol_to_name(Symbol::Section(section_index));
                 let symbol_id = obj.add_symbol(ObjSymbol {
                     name: section_name.into_bytes(),
@@ -179,7 +186,7 @@ pub fn emit_compilation(
                     section: SymbolSection::Section(section_id),
                     flags: SymbolFlags::None,
                 });
-                obj.add_symbol_data(symbol_id, section_id, custom_section.bytes.as_slice(), 1);
+                obj.add_symbol_data(symbol_id, section_id, custom_section.bytes.as_slice(), align);
                 (section_id, symbol_id)
             }
         })
@@ -202,7 +209,7 @@ pub fn emit_compilation(
                 section: SymbolSection::Section(section_id),
                 flags: SymbolFlags::None,
             });
-            obj.add_symbol_data(symbol_id, section_id, &function.body, 1);
+            obj.add_symbol_data(symbol_id, section_id, &function.body, align);
             (section_id, symbol_id)
         })
         .collect::<PrimaryMap<LocalFunctionIndex, _>>();
@@ -222,7 +229,7 @@ pub fn emit_compilation(
             section: SymbolSection::Section(section_id),
             flags: SymbolFlags::None,
         });
-        obj.add_symbol_data(symbol_id, section_id, &function.body, 1);
+        obj.add_symbol_data(symbol_id, section_id, &function.body, align);
     }
 
     // Add dynamic function trampolines
@@ -240,7 +247,7 @@ pub fn emit_compilation(
             section: SymbolSection::Section(section_id),
             flags: SymbolFlags::None,
         });
-        obj.add_symbol_data(symbol_id, section_id, &function.body, 1);
+        obj.add_symbol_data(symbol_id, section_id, &function.body, align);
     }
 
     let mut all_relocations = Vec::new();