From 129795497d3021c81bd3e68741e4795f48f776c5 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Fri, 30 Sep 2016 20:53:45 +0000 Subject: [PATCH] Change for LLVM upstream change r282944. llvm-svn: 282945 --- lld/COFF/PDB.cpp | 13 +------------ lld/test/COFF/pdb.test | 10 +++++----- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/lld/COFF/PDB.cpp b/lld/COFF/PDB.cpp index 333d43c..e8a3756 100644 --- a/lld/COFF/PDB.cpp +++ b/lld/COFF/PDB.cpp @@ -31,20 +31,9 @@ using namespace llvm::support::endian; static ExitOnError ExitOnErr; void coff::createPDB(StringRef Path) { - // Create the superblock. - msf::SuperBlock SB; - memcpy(SB.MagicBytes, msf::Magic, sizeof(msf::Magic)); - SB.BlockSize = 4096; - SB.FreeBlockMapBlock = 2; - SB.NumBlocks = 10; - SB.NumDirectoryBytes = 0; - SB.Unknown1 = 0; - SB.BlockMapAddr = 9; - BumpPtrAllocator Alloc; pdb::PDBFileBuilder Builder(Alloc); - ExitOnErr(Builder.initialize(SB)); - ExitOnErr(Builder.getMsfBuilder().setDirectoryBlocksHint({8})); + ExitOnErr(Builder.initialize(4096)); // 4096 is blocksize ExitOnErr(Builder.getMsfBuilder().addStream(1, {4})); ExitOnErr(Builder.getMsfBuilder().addStream(1, {5})); diff --git a/lld/test/COFF/pdb.test b/lld/test/COFF/pdb.test index 1747e71..57d64e8 100644 --- a/lld/test/COFF/pdb.test +++ b/lld/test/COFF/pdb.test @@ -6,15 +6,15 @@ # CHECK: MSF: # CHECK-NEXT: SuperBlock: # CHECK-NEXT: BlockSize: 4096 -# CHECK-NEXT: FreeBlockMap: 2 -# CHECK-NEXT: NumBlocks: 10 +# CHECK-NEXT: FreeBlockMap: +# CHECK-NEXT: NumBlocks: 8 # CHECK-NEXT: NumDirectoryBytes: 28 # CHECK-NEXT: Unknown1: 0 -# CHECK-NEXT: BlockMapAddr: 9 +# CHECK-NEXT: BlockMapAddr: 3 # CHECK-NEXT: NumDirectoryBlocks: 1 -# CHECK-NEXT: DirectoryBlocks: [ 8 ] +# CHECK-NEXT: DirectoryBlocks: [ 7 ] # CHECK-NEXT: NumStreams: 3 -# CHECK-NEXT: FileSize: 40960 +# CHECK-NEXT: FileSize: 32768 # CHECK-NEXT: StreamSizes: [ 1, 48, 56 ] # CHECK-NEXT: StreamMap: # CHECK-NEXT: - Stream: [ 4 ] -- 2.7.4