forked from OSchip/llvm-project
				
			
							parent
							
								
									d84c13cdb8
								
							
						
					
					
						commit
						ad87ff7235
					
				| 
						 | 
					@ -1118,9 +1118,9 @@ void MergeOutputSection<ELFT>::addSection(InputSectionBase<ELFT> *C) {
 | 
				
			||||||
  ArrayRef<uint8_t> D = S->getSectionData();
 | 
					  ArrayRef<uint8_t> D = S->getSectionData();
 | 
				
			||||||
  StringRef Data((const char *)D.data(), D.size());
 | 
					  StringRef Data((const char *)D.data(), D.size());
 | 
				
			||||||
  uintX_t EntSize = S->getSectionHdr()->sh_entsize;
 | 
					  uintX_t EntSize = S->getSectionHdr()->sh_entsize;
 | 
				
			||||||
  uintX_t Offset = 0;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (this->Header.sh_flags & SHF_STRINGS) {
 | 
					  if (this->Header.sh_flags & SHF_STRINGS) {
 | 
				
			||||||
 | 
					    uintX_t Offset = 0;
 | 
				
			||||||
    while (!Data.empty()) {
 | 
					    while (!Data.empty()) {
 | 
				
			||||||
      size_t End = findNull(Data, EntSize);
 | 
					      size_t End = findNull(Data, EntSize);
 | 
				
			||||||
      if (End == StringRef::npos)
 | 
					      if (End == StringRef::npos)
 | 
				
			||||||
| 
						 | 
					@ -1138,8 +1138,7 @@ void MergeOutputSection<ELFT>::addSection(InputSectionBase<ELFT> *C) {
 | 
				
			||||||
    for (unsigned I = 0, N = Data.size(); I != N; I += EntSize) {
 | 
					    for (unsigned I = 0, N = Data.size(); I != N; I += EntSize) {
 | 
				
			||||||
      StringRef Entry = Data.substr(I, EntSize);
 | 
					      StringRef Entry = Data.substr(I, EntSize);
 | 
				
			||||||
      size_t OutputOffset = Builder.add(Entry);
 | 
					      size_t OutputOffset = Builder.add(Entry);
 | 
				
			||||||
      S->Offsets.push_back(std::make_pair(Offset, OutputOffset));
 | 
					      S->Offsets.push_back(std::make_pair(I, OutputOffset));
 | 
				
			||||||
      Offset += EntSize;
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue