mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 04:30:23 +00:00
yaml2coff/elf: Touchup for compatibility.
* std::string::append(int, int) can be ambiguous. * std::vector<>::data() is a C++11 feature, use ArrayRef abstraction. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192542 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
24732c3363
commit
6dd7893e8c
@ -32,7 +32,7 @@ struct COFFParser {
|
||||
COFFParser(COFFYAML::Object &Obj) : Obj(Obj) {
|
||||
// A COFF string table always starts with a 4 byte size field. Offsets into
|
||||
// it include this size, so allocate it now.
|
||||
StringTable.append(4, 0);
|
||||
StringTable.append(4, char(0));
|
||||
}
|
||||
|
||||
bool parseSections() {
|
||||
|
@ -13,6 +13,7 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "yaml2obj.h"
|
||||
#include "llvm/ADT/ArrayRef.h"
|
||||
#include "llvm/Object/ELFObjectFile.h"
|
||||
#include "llvm/Object/ELFYAML.h"
|
||||
#include "llvm/Support/ELF.h"
|
||||
@ -119,13 +120,13 @@ public:
|
||||
} // end anonymous namespace
|
||||
|
||||
template <class T>
|
||||
static size_t vectorDataSize(const std::vector<T> &Vec) {
|
||||
return Vec.size() * sizeof(T);
|
||||
static size_t arrayDataSize(ArrayRef<T> A) {
|
||||
return A.size() * sizeof(T);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
static void writeVectorData(raw_ostream &OS, const std::vector<T> &Vec) {
|
||||
OS.write((const char *)Vec.data(), vectorDataSize(Vec));
|
||||
static void writeArrayData(raw_ostream &OS, ArrayRef<T> A) {
|
||||
OS.write((const char *)A.data(), arrayDataSize(A));
|
||||
}
|
||||
|
||||
template <class T>
|
||||
@ -235,8 +236,9 @@ handleSymtabSectionHeader(const ELFYAML::LocalGlobalWeakSymbols &Symbols,
|
||||
addSymbols(Symbols.Weak, State, Syms, ELF::STB_WEAK);
|
||||
|
||||
ContiguousBlobAccumulator &CBA = State.getSectionContentAccum();
|
||||
writeVectorData(CBA.getOSAndAlignedOffset(SHeader.sh_offset), Syms);
|
||||
SHeader.sh_size = vectorDataSize(Syms);
|
||||
writeArrayData(CBA.getOSAndAlignedOffset(SHeader.sh_offset),
|
||||
makeArrayRef(Syms));
|
||||
SHeader.sh_size = arrayDataSize(makeArrayRef(Syms));
|
||||
}
|
||||
|
||||
template <class ELFT>
|
||||
@ -359,7 +361,7 @@ static int writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
|
||||
SHeaders.push_back(SHStrTabSHeader);
|
||||
|
||||
OS.write((const char *)&Header, sizeof(Header));
|
||||
writeVectorData(OS, SHeaders);
|
||||
writeArrayData(OS, makeArrayRef(SHeaders));
|
||||
CBA.writeBlobToStream(OS);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user