Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compiling issues for aarch64

Browse Source
This commit is contained in:
Alex 2023-05-13 07:42:36 +03:00
parent 816e5461c9
commit f3044ceb5f
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/Symbols.cpp
View File

@ -55,7 +55,7 @@ namespace SymbolResolver
return; return;
} }
#if defined(a64) #if defined(a64) || defined(aa64)
Elf64_Shdr *ElfSections = (Elf64_Shdr *)(Sections); Elf64_Shdr *ElfSections = (Elf64_Shdr *)(Sections);
Elf64_Sym *ElfSymbols = nullptr; Elf64_Sym *ElfSymbols = nullptr;
#elif defined(a32) #elif defined(a32)
@ -68,7 +68,7 @@ namespace SymbolResolver
switch (ElfSections[i].sh_type) switch (ElfSections[i].sh_type)
{ {
case SHT_SYMTAB: case SHT_SYMTAB:
#if defined(a64) #if defined(a64) || defined(aa64)
ElfSymbols = (Elf64_Sym *)(Sections + ElfSections[i].sh_offset); ElfSymbols = (Elf64_Sym *)(Sections + ElfSections[i].sh_offset);
this->TotalEntries = ElfSections[i].sh_size / sizeof(Elf64_Sym); this->TotalEntries = ElfSections[i].sh_size / sizeof(Elf64_Sym);
#elif defined(a32) #elif defined(a32)
@ -104,7 +104,7 @@ namespace SymbolResolver
for (Index = i + 1; Index < this->TotalEntries; Index++) for (Index = i + 1; Index < this->TotalEntries; Index++)
if (ElfSymbols[Index].st_value < ElfSymbols[MinimumIndex].st_value) if (ElfSymbols[Index].st_value < ElfSymbols[MinimumIndex].st_value)
MinimumIndex = Index; MinimumIndex = Index;
#if defined(a64) #if defined(a64) || defined(aa64)
Elf64_Sym tmp = ElfSymbols[MinimumIndex]; Elf64_Sym tmp = ElfSymbols[MinimumIndex];
#elif defined(a32) #elif defined(a32)
Elf32_Sym tmp = ElfSymbols[MinimumIndex]; Elf32_Sym tmp = ElfSymbols[MinimumIndex];
@ -148,7 +148,7 @@ namespace SymbolResolver
this->Image = (void *)ImageAddress; this->Image = (void *)ImageAddress;
debug("Solving symbols for address: %#llx", ImageAddress); debug("Solving symbols for address: %#llx", ImageAddress);
#if defined(a64) #if defined(a64) || defined(aa64)
Elf64_Ehdr *Header = (Elf64_Ehdr *)ImageAddress; Elf64_Ehdr *Header = (Elf64_Ehdr *)ImageAddress;
#elif defined(a32) #elif defined(a32)
Elf32_Ehdr *Header = (Elf32_Ehdr *)ImageAddress; Elf32_Ehdr *Header = (Elf32_Ehdr *)ImageAddress;
@ -161,7 +161,7 @@ namespace SymbolResolver
error("Invalid ELF header"); error("Invalid ELF header");
return; return;
} }
#if defined(a64) #if defined(a64) || defined(aa64)
Elf64_Shdr *ElfSections = (Elf64_Shdr *)(ImageAddress + Header->e_shoff); Elf64_Shdr *ElfSections = (Elf64_Shdr *)(ImageAddress + Header->e_shoff);
Elf64_Sym *ElfSymbols = nullptr; Elf64_Sym *ElfSymbols = nullptr;
#elif defined(a32) #elif defined(a32)
@ -174,7 +174,7 @@ namespace SymbolResolver
switch (ElfSections[i].sh_type) switch (ElfSections[i].sh_type)
{ {
case SHT_SYMTAB: case SHT_SYMTAB:
#if defined(a64) #if defined(a64) || defined(aa64)
ElfSymbols = (Elf64_Sym *)(ImageAddress + ElfSections[i].sh_offset); ElfSymbols = (Elf64_Sym *)(ImageAddress + ElfSections[i].sh_offset);
this->TotalEntries = ElfSections[i].sh_size / sizeof(Elf64_Sym); this->TotalEntries = ElfSections[i].sh_size / sizeof(Elf64_Sym);
#elif defined(a32) #elif defined(a32)
@ -210,7 +210,7 @@ namespace SymbolResolver
for (Index = i + 1; Index < this->TotalEntries; Index++) for (Index = i + 1; Index < this->TotalEntries; Index++)
if (ElfSymbols[Index].st_value < ElfSymbols[MinimumIndex].st_value) if (ElfSymbols[Index].st_value < ElfSymbols[MinimumIndex].st_value)
MinimumIndex = Index; MinimumIndex = Index;
#if defined(a64) #if defined(a64) || defined(aa64)
Elf64_Sym tmp = ElfSymbols[MinimumIndex]; Elf64_Sym tmp = ElfSymbols[MinimumIndex];
#elif defined(a32) #elif defined(a32)
Elf32_Sym tmp = ElfSymbols[MinimumIndex]; Elf32_Sym tmp = ElfSymbols[MinimumIndex];