mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-24 03:33:20 +01:00
21e60a9aff
This reverts commit r304561 and re-lands r303490 & co.
The fix was to use "SymbolName" when translating LLD's internal export
list to lib/Object's short export struct. The SymbolName reflects the
actual symbol name, which may include fastcall and stdcall mangling bits
not included in the /EXPORT or .def file EXPORTS name:
@@ -434,8 +434,7 @@ std::vector<COFFShortExport> createCOFFShortExportFromConfig() {
std::vector<COFFShortExport> Exports;
for (Export &E1 : Config->Exports) {
COFFShortExport E2;
- E2.Name = E1.Name;
+ // Use SymbolName, which will have any stdcall or fastcall qualifiers.
+ E2.Name = E1.SymbolName;
E2.ExtName = E1.ExtName;
E2.Ordinal = E1.Ordinal;
E2.Noname = E1.Noname;
llvm-svn: 304573
107 lines
3.1 KiB
C++
107 lines
3.1 KiB
C++
//===- COFFImportFile.h - COFF short import file implementation -*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// COFF short import file is a special kind of file which contains
|
|
// only symbol names for DLL-exported symbols. This class implements
|
|
// exporting of Symbols to create libraries and a SymbolicFile
|
|
// interface for the file type.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLVM_OBJECT_COFF_IMPORT_FILE_H
|
|
#define LLVM_OBJECT_COFF_IMPORT_FILE_H
|
|
|
|
#include "llvm/ADT/ArrayRef.h"
|
|
#include "llvm/Object/COFF.h"
|
|
#include "llvm/Object/IRObjectFile.h"
|
|
#include "llvm/Object/ObjectFile.h"
|
|
#include "llvm/Object/SymbolicFile.h"
|
|
#include "llvm/Support/MemoryBuffer.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
|
|
namespace llvm {
|
|
namespace object {
|
|
|
|
class COFFImportFile : public SymbolicFile {
|
|
public:
|
|
COFFImportFile(MemoryBufferRef Source)
|
|
: SymbolicFile(ID_COFFImportFile, Source) {}
|
|
|
|
static inline bool classof(Binary const *V) { return V->isCOFFImportFile(); }
|
|
|
|
void moveSymbolNext(DataRefImpl &Symb) const override { ++Symb.p; }
|
|
|
|
std::error_code printSymbolName(raw_ostream &OS,
|
|
DataRefImpl Symb) const override {
|
|
if (Symb.p == 0)
|
|
OS << "__imp_";
|
|
OS << StringRef(Data.getBufferStart() + sizeof(coff_import_header));
|
|
return std::error_code();
|
|
}
|
|
|
|
uint32_t getSymbolFlags(DataRefImpl Symb) const override {
|
|
return SymbolRef::SF_Global;
|
|
}
|
|
|
|
basic_symbol_iterator symbol_begin() const override {
|
|
return BasicSymbolRef(DataRefImpl(), this);
|
|
}
|
|
|
|
basic_symbol_iterator symbol_end() const override {
|
|
DataRefImpl Symb;
|
|
Symb.p = isData() ? 1 : 2;
|
|
return BasicSymbolRef(Symb, this);
|
|
}
|
|
|
|
const coff_import_header *getCOFFImportHeader() const {
|
|
return reinterpret_cast<const object::coff_import_header *>(
|
|
Data.getBufferStart());
|
|
}
|
|
|
|
private:
|
|
bool isData() const {
|
|
return getCOFFImportHeader()->getType() == COFF::IMPORT_DATA;
|
|
}
|
|
};
|
|
|
|
struct COFFShortExport {
|
|
std::string Name;
|
|
std::string ExtName;
|
|
|
|
uint16_t Ordinal = 0;
|
|
bool Noname = false;
|
|
bool Data = false;
|
|
bool Private = false;
|
|
bool Constant = false;
|
|
|
|
bool isWeak() {
|
|
return ExtName.size() && ExtName != Name;
|
|
}
|
|
|
|
friend bool operator==(const COFFShortExport &L, const COFFShortExport &R) {
|
|
return L.Name == R.Name && L.ExtName == R.ExtName &&
|
|
L.Ordinal == R.Ordinal && L.Noname == R.Noname &&
|
|
L.Data == R.Data && L.Private == R.Private;
|
|
}
|
|
|
|
friend bool operator!=(const COFFShortExport &L, const COFFShortExport &R) {
|
|
return !(L == R);
|
|
}
|
|
};
|
|
|
|
std::error_code writeImportLibrary(StringRef DLLName,
|
|
StringRef Path,
|
|
ArrayRef<COFFShortExport> Exports,
|
|
COFF::MachineTypes Machine);
|
|
|
|
} // namespace object
|
|
} // namespace llvm
|
|
|
|
#endif
|