hrev53128 adds 1 changeset to branch 'master'
old head: 0f916d6641867effda06db89844fd01fb803c821
new head: aefa412c98327a6a0c14898f8a43e399dfd1e37e
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=aefa412c9832+%5E0f916d664186
----------------------------------------------------------------------------
aefa412c9832: ppc: Minor tweaks to move PowerPC build towards working
Change-Id: Id9a4e0fd483d2a0c05cf2a8475d3689a13bcc5f6
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53128
Commit: aefa412c98327a6a0c14898f8a43e399dfd1e37e
URL: https://git.haiku-os.org/haiku/commit/?id=aefa412c9832
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed May 15 02:13:29 2019 UTC
----------------------------------------------------------------------------
2 files changed, 8 insertions(+), 7 deletions(-)
build/jam/repositories/HaikuPortsCross/ppc | 6 +++---
src/system/kernel/arch/ppc/arch_elf.cpp | 9 +++++----
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPortsCross/ppc
b/build/jam/repositories/HaikuPortsCross/ppc
index 8a975a4776..1ef0592bbc 100644
--- a/build/jam/repositories/HaikuPortsCross/ppc
+++ b/build/jam/repositories/HaikuPortsCross/ppc
@@ -5,9 +5,9 @@ BootstrapPackageRepository HaikuPortsCross
haikuporter-0-1
:
# repository architecture packages (stage 0)
- gcc_bootstrap-5.4.0_2016_06_04-1
- gcc_bootstrap_syslibs-5.4.0_2016_06_04-1
- gcc_bootstrap_syslibs_devel-5.4.0_2016_06_04-1
+ gcc_bootstrap-7.3.0_2019_04_04-1
+ gcc_bootstrap_syslibs-7.3.0_2019_04_04-1
+ gcc_bootstrap_syslibs_devel-7.3.0_2019_04_04-1
:
# repository architecture packages (stage 1)
bash_bootstrap-4.4.012-1
diff --git a/src/system/kernel/arch/ppc/arch_elf.cpp
b/src/system/kernel/arch/ppc/arch_elf.cpp
index 47c25a2fe8..fe13a465c9 100644
--- a/src/system/kernel/arch/ppc/arch_elf.cpp
+++ b/src/system/kernel/arch/ppc/arch_elf.cpp
@@ -126,11 +126,12 @@ arch_elf_relocate_rela(struct elf_image_info *image,
int i;
Elf32_Sym *sym;
int vlErr;
- addr_t S = 0; // symbol address
- addr_t R = 0; // section relative symbol address
- addr_t G = 0; // GOT address
- addr_t L = 0; // PLT address
+ Elf32_Addr S = 0; // symbol address
+ addr_t R = 0; // section relative symbol address
+
+ addr_t G = 0; // GOT address
+ addr_t L = 0; // PLT address
#define P ((addr_t)(image->text_region.delta + rel[i].r_offset))
#define A ((addr_t)rel[i].r_addend)
