i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

runtime_loader: fixes the 64-bit build.

Browse Source 
1/ error: no matching function for call to 'min(long unsigned int,
uint32&)'.
2/ error: comparison between signed and unsigned integer expressions.
This commit is contained in:
Jérôme Duval
2013-11-19 20:17:08 +01:00
parent 3a7e0b0014
commit 72950e7c15
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/runtime_loader/runtime_loader.cpp
+3 -2
View File
@@ -494,7 +494,8 @@ determine_x86_abi(int fd, const Elf32_Ehdr& elfHeader, bool& _isGcc2)
if (symbolHash == NULL || symbolTable == NULL || stringTable == NULL) if (symbolHash == NULL || symbolTable == NULL || stringTable == NULL)
return false; return false;
uint32 symbolCount uint32 symbolCount
= std::min(symbolTableSize / sizeof(Elf32_Sym), symbolHashChainSize); = std::min(symbolTableSize / (uint32)sizeof(Elf32_Sym),
symbolHashChainSize);
if (symbolCount < symbolHashSize) if (symbolCount < symbolHashSize)
return false; return false;
@@ -520,7 +521,7 @@ determine_x86_abi(int fd, const Elf32_Ehdr& elfHeader, bool& _isGcc2)
<= sectionHeader->sh_addr + sectionHeader->sh_size) { <= sectionHeader->sh_addr + sectionHeader->sh_size) {
off_t fileOffset = symbol->st_value - sectionHeader->sh_addr off_t fileOffset = symbol->st_value - sectionHeader->sh_addr
+ sectionHeader->sh_offset; + sectionHeader->sh_offset;
if (fileOffset + sizeof(uint32) <= st.st_size) { if (fileOffset + (off_t)sizeof(uint32) <= st.st_size) {
uint32 abi uint32 abi
= *(uint32*)((uint8*)fileBaseAddress + fileOffset); = *(uint32*)((uint8*)fileBaseAddress + fileOffset);
_isGcc2 = (abi & B_HAIKU_ABI_MAJOR) _isGcc2 = (abi & B_HAIKU_ABI_MAJOR)