Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elf.h: rename ELF_MAGIC to ELFMAG

Browse Source 
- This is how it is named in other versions of elf.h (Linux, glibc, possibly more)
- ELF_MAGIC is used by libelf for the same thing, and the defines conflicts,
  breaking libelf build on Haiku.
This commit is contained in:
Adrien Destugues 2016-08-06 20:32:47 +02:00
parent b4aed463ac
commit 8efb6db7b9
9 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/os/kernel/elf.h
View File

@ -75,7 +75,7 @@ typedef struct {
#endif
} Elf64_Ehdr;
#define ELF_MAGIC "\x7f""ELF"
#define ELFMAG "\x7f""ELF"
/* e_ident[] indices */
#define EI_MAG0 0

2
src/kits/debug/Image.cpp
View File

@ -277,7 +277,7 @@ ImageFile::_LoadFile(const char* path, addr_t* _textAddress, size_t* _textSize,
// examine the elf header
elf_ehdr* elfHeader = (elf_ehdr*)fMappedFile;
if (memcmp(elfHeader->e_ident, ELF_MAGIC, 4) != 0)
if (memcmp(elfHeader->e_ident, ELFMAG, 4) != 0)
return B_NOT_AN_EXECUTABLE;
if (elfHeader->e_ident[4] != ELF_CLASS)

2
src/kits/debugger/elf/ElfFile.cpp
View File

@ -224,7 +224,7 @@ ElfFile::Init(const char* fileName)
return bytesRead < 0 ? errno : B_ERROR;
// magic
if (!memcmp(elfIdent, ELF_MAGIC, 4) == 0)
if (!memcmp(elfIdent, ELFMAG, 4) == 0)
return B_ERROR;
// endianess

3
src/libs/libunwind/elfxx.h
View File

@ -42,9 +42,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
# define elf_w(x) _Uelf64_##x
#endif
#ifdef __HAIKU__
# define ELFMAG ELF_MAGIC
#endif
#ifndef SELFMAG
# define SELFMAG 4
#endif

2
src/system/boot/loader/elf.cpp
View File

@ -161,7 +161,7 @@ ELFLoader<Class>::Create(int fd, preloaded_image** _image)
const EhdrType& elfHeader = image->elf_header;
if (memcmp(elfHeader.e_ident, ELF_MAGIC, 4) != 0
if (memcmp(elfHeader.e_ident, ELFMAG, 4) != 0
|| elfHeader.e_ident[4] != Class::kIdentClass
|| elfHeader.e_phoff == 0
|| !elfHeader.IsHostEndian()

8
src/system/kernel/debug/core_dump.cpp
View File

@ -1093,10 +1093,10 @@ private:
memset(&header, 0, sizeof(header));
// e_ident
header.e_ident[EI_MAG0] = ELF_MAGIC[0];
header.e_ident[EI_MAG1] = ELF_MAGIC[1];
header.e_ident[EI_MAG2] = ELF_MAGIC[2];
header.e_ident[EI_MAG3] = ELF_MAGIC[3];
header.e_ident[EI_MAG0] = ELFMAG[0];
header.e_ident[EI_MAG1] = ELFMAG[1];
header.e_ident[EI_MAG2] = ELFMAG[2];
header.e_ident[EI_MAG3] = ELFMAG[3];
#ifdef B_HAIKU_64_BIT
header.e_ident[EI_CLASS] = ELFCLASS64;
#else

2
src/system/kernel/elf.cpp
View File

@ -1107,7 +1107,7 @@ elf_relocate(struct elf_image_info* image, struct elf_image_info* resolveImage)
static int
verify_eheader(elf_ehdr *elfHeader)
{
if (memcmp(elfHeader->e_ident, ELF_MAGIC, 4) != 0)
if (memcmp(elfHeader->e_ident, ELFMAG, 4) != 0)
return B_NOT_AN_EXECUTABLE;
if (elfHeader->e_ident[4] != ELF_CLASS)

2
src/system/runtime_loader/elf_load_image.cpp
View File

@ -375,7 +375,7 @@ status_t
parse_elf_header(elf_ehdr* eheader, int32* _pheaderSize,
int32* _sheaderSize)
{
if (memcmp(eheader->e_ident, ELF_MAGIC, 4) != 0)
if (memcmp(eheader->e_ident, ELFMAG, 4) != 0)
return B_NOT_AN_EXECUTABLE;
if (eheader->e_ident[4] != ELF_CLASS)

2
src/system/runtime_loader/runtime_loader.cpp
View File

@ -629,7 +629,7 @@ get_executable_architecture(int fd, const char** _architecture)
return B_NOT_AN_EXECUTABLE;
// check whether this is indeed an ELF file
if (memcmp(elfHeader.e_ident, ELF_MAGIC, 4) != 0)
if (memcmp(elfHeader.e_ident, ELFMAG, 4) != 0)
return B_NOT_AN_EXECUTABLE;
// check the architecture