}
}
-static codeview::CPUType toCodeViewMachine(COFF::MachineTypes Machine) {
- switch (Machine) {
- case COFF::IMAGE_FILE_MACHINE_AMD64:
- return codeview::CPUType::X64;
- case COFF::IMAGE_FILE_MACHINE_ARM:
- return codeview::CPUType::ARM7;
- case COFF::IMAGE_FILE_MACHINE_ARM64:
- return codeview::CPUType::ARM64;
- case COFF::IMAGE_FILE_MACHINE_ARMNT:
- return codeview::CPUType::ARMNT;
- case COFF::IMAGE_FILE_MACHINE_I386:
- return codeview::CPUType::Intel80386;
- default:
- llvm_unreachable("Unsupported CPU Type");
- }
-}
-
static void addCommonLinkerModuleSymbols(StringRef Path,
pdb::DbiModuleDescriptorBuilder &Mod,
BumpPtrAllocator &Allocator) {
ONS.Name = "* Linker *";
ONS.Signature = 0;
- CS.Machine = toCodeViewMachine(Config->Machine);
+ CS.Machine = Config->is64() ? CPUType::X64 : CPUType::Intel80386;
// Interestingly, if we set the string to 0.0.0.0, then when trying to view
// local variables WinDbg emits an error that private symbols are not present.
// By setting this to a valid MSVC linker version string, local variables are
pdb::DbiStreamBuilder &DbiBuilder = Builder.getDbiBuilder();
DbiBuilder.setAge(BuildId.PDB70.Age);
DbiBuilder.setVersionHeader(pdb::PdbDbiV70);
- DbiBuilder.setMachineType(Config->is64() ? pdb::PDB_Machine::Amd64
- : pdb::PDB_Machine::x86);
- // Technically we are not link.exe 14.11, but there are known cases where
- // debugging tools on Windows expect Microsoft-specific version numbers or
- // they fail to work at all. Since we know we produce PDBs that are
- // compatible with LINK 14.11, we set that version number here.
- DbiBuilder.setBuildNumber(14, 11);
}
void PDBLinker::addSectionContrib(pdb::DbiModuleDescriptorBuilder &LinkerModule,
void DbiStreamBuilder::setBuildNumber(uint16_t B) { BuildNumber = B; }
-void DbiStreamBuilder::setBuildNumber(uint8_t Major, uint8_t Minor) {
- BuildNumber = (uint16_t(Major) << DbiBuildNo::BuildMajorShift) &
- DbiBuildNo::BuildMajorMask;
- BuildNumber |= (uint16_t(Minor) << DbiBuildNo::BuildMinorShift) &
- DbiBuildNo::BuildMinorMask;
- BuildNumber |= DbiBuildNo::NewVersionFormatMask;
-}
-
void DbiStreamBuilder::setPdbDllVersion(uint16_t V) { PdbDllVersion = V; }
void DbiStreamBuilder::setPdbDllRbld(uint16_t R) { PdbDllRbld = R; }
H->TypeServerSize = 0;
H->SymRecordStreamIndex = SymRecordStreamIndex;
H->PublicSymbolStreamIndex = PublicsStreamIndex;
- H->MFCTypeServerIndex = 0; // Not sure what this is, but link.exe writes 0.
+ H->MFCTypeServerIndex = kInvalidStreamIndex;
H->GlobalSymbolStreamIndex = GlobalsStreamIndex;
Header = H;