From cea635293a0c04670f42e9072b425c569429f87e Mon Sep 17 00:00:00 2001 From: plutoo Date: Sun, 8 Oct 2017 00:35:58 +0200 Subject: [PATCH 1/2] Test commit for ircbot 5 --- nx/source/system/dynamic.c | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/nx/source/system/dynamic.c b/nx/source/system/dynamic.c index 5f27a662..1af36533 100644 --- a/nx/source/system/dynamic.c +++ b/nx/source/system/dynamic.c @@ -3,35 +3,35 @@ void __nx_dynamic(uintptr_t base, const Elf64_Dyn* dyn) { - const Elf64_Rela* rela = NULL; - u64 relasz = 0; + const Elf64_Rela* rela = NULL; + u64 relasz = 0; - for (; dyn->d_tag != DT_NULL; dyn++) - { - switch (dyn->d_tag) - { - case DT_RELA: - rela = (const Elf64_Rela*)(base + dyn->d_un.d_ptr); - break; - case DT_RELASZ: - relasz = dyn->d_un.d_val / sizeof(Elf64_Rela); - break; - } - } + for (; dyn->d_tag != DT_NULL; dyn++) + { + switch (dyn->d_tag) + { + case DT_RELA: + rela = (const Elf64_Rela*)(base + dyn->d_un.d_ptr); + break; + case DT_RELASZ: + relasz = dyn->d_un.d_val / sizeof(Elf64_Rela); + break; + } + } - if (rela == NULL) - fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADRELOC)); + if (rela == NULL) + fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADRELOC)); - for (; relasz--; rela++) - { - switch (ELF64_R_TYPE(rela->r_info)) - { - case R_AARCH64_RELATIVE: - { - u64* ptr = (u64*)(base + rela->r_offset); - *ptr = base + rela->r_addend; - break; - } - } - } + for (; relasz--; rela++) + { + switch (ELF64_R_TYPE(rela->r_info)) + { + case R_AARCH64_RELATIVE: + { + u64* ptr = (u64*)(base + rela->r_offset); + *ptr = base + rela->r_addend; + break; + } + } + } } From 93cd5cc5203100dc80cb9a3aede95f0d9ed791b0 Mon Sep 17 00:00:00 2001 From: plutoo Date: Sun, 8 Oct 2017 00:44:57 +0200 Subject: [PATCH 2/2] Test2 --- nx/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/nx/Makefile b/nx/Makefile index adb01059..22efca5c 100644 --- a/nx/Makefile +++ b/nx/Makefile @@ -160,3 +160,4 @@ $(OUTPUT) : $(OFILES) endif #--------------------------------------------------------------------------------------- +