forked from OSchip/llvm-project
use 64-bit types instead of off_t/size_t to avoid the issue when
gold plugin is built with Large File Support (sizeof(off_t) == 64 on i686) and the rest of LLVM is built w/o Large File Support (sizeof(off_t) == 32 on i686) which corrupts the stack. llvm-svn: 139873
This commit is contained in:
parent
7b43568a93
commit
639222d090
|
@ -75,9 +75,9 @@ public:
|
|||
/// return a MemoryBuffer.
|
||||
static error_code getOpenFile(int FD, const char *Filename,
|
||||
OwningPtr<MemoryBuffer> &result,
|
||||
size_t FileSize = -1,
|
||||
size_t MapSize = -1,
|
||||
off_t Offset = 0,
|
||||
uint64_t FileSize = -1,
|
||||
uint64_t MapSize = -1,
|
||||
int64_t Offset = 0,
|
||||
bool RequiresNullTerminator = true);
|
||||
|
||||
/// getMemBuffer - Open the specified memory range as a MemoryBuffer. Note
|
||||
|
|
|
@ -275,16 +275,16 @@ static bool shouldUseMmap(int FD,
|
|||
|
||||
error_code MemoryBuffer::getOpenFile(int FD, const char *Filename,
|
||||
OwningPtr<MemoryBuffer> &result,
|
||||
size_t FileSize, size_t MapSize,
|
||||
off_t Offset,
|
||||
uint64_t FileSize, uint64_t MapSize,
|
||||
int64_t Offset,
|
||||
bool RequiresNullTerminator) {
|
||||
static int PageSize = sys::Process::GetPageSize();
|
||||
|
||||
// Default is to map the full file.
|
||||
if (MapSize == size_t(-1)) {
|
||||
if (MapSize == uint64_t(-1)) {
|
||||
// If we don't know the file size, use fstat to find out. fstat on an open
|
||||
// file descriptor is cheaper than stat on a random path.
|
||||
if (FileSize == size_t(-1)) {
|
||||
if (FileSize == uint64_t(-1)) {
|
||||
struct stat FileInfo;
|
||||
// TODO: This should use fstat64 when available.
|
||||
if (fstat(FD, &FileInfo) == -1) {
|
||||
|
|
|
@ -246,7 +246,7 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
|
|||
return LDPS_ERR;
|
||||
}
|
||||
} else {
|
||||
off_t offset = 0;
|
||||
int64_t offset = 0;
|
||||
// Gold has found what might be IR part-way inside of a file, such as
|
||||
// an .a archive.
|
||||
if (file->offset) {
|
||||
|
|
Loading…
Reference in New Issue