Index: lld/COFF/PDB.cpp
===================================================================
--- lld/COFF/PDB.cpp
+++ lld/COFF/PDB.cpp
@@ -188,7 +188,8 @@
 
   // Add an Info stream.
   auto &InfoBuilder = Builder.getInfoBuilder();
-  InfoBuilder.setAge(DI ? DI->PDB70.Age : 0);
+  uint32_t Age = DI ? DI->PDB70.Age : 0;
+  InfoBuilder.setAge(Age);
 
   pdb::PDB_UniqueId uuid{};
   if (DI)
@@ -201,6 +202,11 @@
   // Add an empty DPI stream.
   auto &DbiBuilder = Builder.getDbiBuilder();
   DbiBuilder.setVersionHeader(pdb::PdbDbiV110);
+  DbiBuilder.setAge(Age);
+  if (!Symtab->ObjectFiles.empty()) {
+    auto M = Symtab->ObjectFiles.front()->getMachineType();
+    DbiBuilder.setMachineType(static_cast<pdb::PDB_Machine>(M));
+  }
 
   codeview::TypeTableBuilder TypeTable(BAlloc);
   codeview::TypeTableBuilder IDTable(BAlloc);