[MC/Mach-O] Load commands are supposed to 8-byte aligned on 64-bit.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173120 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp
index d13c178a9c496dcc330427e6ba99d295112bdeb5..a5ba3c36532a2e6ebbe1edb4fa8523216db1bd56 100644 (file)
--- a/lib/MC/MachObjectWriter.cpp
+++ b/lib/MC/MachObjectWriter.cpp
@@ -377,25 +377,25 @@ void MachObjectWriter::WriteLinkeditLoadCommand(uint32_t Type,
 }
 
 static unsigned ComputeLinkerOptionsLoadCommandSize(
-  const std::vector<std::string> &Options)
+  const std::vector<std::string> &Options, bool is64Bit)
 {
   unsigned Size = sizeof(macho::LinkerOptionsLoadCommand);
   for (unsigned i = 0, e = Options.size(); i != e; ++i)
     Size += Options[i].size() + 1;
-  return RoundUpToAlignment(Size, 4);
+  return RoundUpToAlignment(Size, is64Bit ? 8 : 4);
 }
 
 void MachObjectWriter::WriteLinkerOptionsLoadCommand(
   const std::vector<std::string> &Options)
 {
-  unsigned Size = ComputeLinkerOptionsLoadCommandSize(Options);
+  unsigned Size = ComputeLinkerOptionsLoadCommandSize(Options, is64Bit());
   uint64_t Start = OS.tell();
   (void) Start;
 
   Write32(macho::LCT_LinkerOptions);
   Write32(Size);
   Write32(Options.size());
-  uint64_t BytesWritten = 0;
+  uint64_t BytesWritten = sizeof(macho::LinkerOptionsLoadCommand);
   for (unsigned i = 0, e = Options.size(); i != e; ++i) {
     // Write each string, including the null byte.
     const std::string &Option = Options[i];
@@ -403,8 +403,8 @@ void MachObjectWriter::WriteLinkerOptionsLoadCommand(
     BytesWritten += Option.size() + 1;
   }
 
-  // Pad to a multiple of 4.
-  WriteBytes("", OffsetToAlignment(BytesWritten, 4));
+  // Pad to a multiple of the pointer size.
+  WriteBytes("", OffsetToAlignment(BytesWritten, is64Bit() ? 8 : 4));
 
   assert(OS.tell() - Start == Size);
 }
@@ -747,7 +747,8 @@ void MachObjectWriter::WriteObject(MCAssembler &Asm,
     Asm.getLinkerOptions();
   for (unsigned i = 0, e = LinkerOptions.size(); i != e; ++i) {
     ++NumLoadCommands;
-    LoadCommandsSize += ComputeLinkerOptionsLoadCommandSize(LinkerOptions[i]);
+    LoadCommandsSize += ComputeLinkerOptionsLoadCommandSize(LinkerOptions[i],
+                                                            is64Bit());
   }
   
   // Compute the total size of the section data, as well as its file size and vm

diff --git a/test/MC/MachO/linker-options.ll b/test/MC/MachO/linker-options.ll
index f43cc28b7da84874f33a3596cfdcadcc686f5595..827adfd708905c82cc41c2ca01ff5c67cca209ae 100644 (file)
--- a/test/MC/MachO/linker-options.ll
+++ b/test/MC/MachO/linker-options.ll
@@ -24,12 +24,20 @@
 ; CHECK-OBJ:   "-framework",
 ; CHECK-OBJ:   "Cocoa",
 ; CHECK-OBJ:   ])
+; CHECK-OBJ:   # Load Command 3
+; CHECK-OBJ:  (('command', 45)
+; CHECK-OBJ:   ('size', 24)
+; CHECK-OBJ:   ('count', 1)
+; CHECK-OBJ:   ('_strings', [
+; CHECK-OBJ:   "-lmath",
+; CHECK-OBJ:   ])
 ; CHECK-OBJ:  ),
 ; CHECK-OBJ: ])
 
 !0 = metadata !{ i32 6, metadata !"Linker Options", 
    metadata !{
       metadata !{ metadata !"-lz" },
-      metadata !{ metadata !"-framework", metadata !"Cocoa" } } }
+      metadata !{ metadata !"-framework", metadata !"Cocoa" },
+      metadata !{ metadata !"-lmath" } } }
 
 !llvm.module.flags = !{ !0 }