hrev49731 adds 2 changesets to branch 'master'
old head: 4c7d851f15025f750b20d98ab65d2a17e1689d7a
new head: 874e9521b2bcdbe346bafe6ef4c59f106cc80327
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=874e9521b2bc+%5E4c7d851f1502
----------------------------------------------------------------------------
6c009cde0bf1: kernel: avoid dprintf messages for known header types we don't
use.
* fix a typo in runtime_loader/count_regions().
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
874e9521b2bc: x86_64: Glue code: Keep stack 16-byte-aligned
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Simon South <ssouth@xxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 11 insertions(+), 1 deletion(-)
src/system/glue/arch/x86_64/crti.S | 2 ++
src/system/glue/arch/x86_64/crtn.S | 2 ++
src/system/kernel/elf.cpp | 6 ++++++
src/system/runtime_loader/elf_load_image.cpp | 2 +-
############################################################################
Commit: 6c009cde0bf1d306c7d13d2b85f39f9f683761dd
URL: http://cgit.haiku-os.org/haiku/commit/?id=6c009cde0bf1
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Wed Oct 28 20:20:38 2015 UTC
kernel: avoid dprintf messages for known header types we don't use.
* fix a typo in runtime_loader/count_regions().
----------------------------------------------------------------------------
diff --git a/src/system/kernel/elf.cpp b/src/system/kernel/elf.cpp
index 66764f7..2ed0240 100644
--- a/src/system/kernel/elf.cpp
+++ b/src/system/kernel/elf.cpp
@@ -2231,6 +2231,12 @@ load_kernel_add_on(const char *path)
case PT_DYNAMIC:
image->dynamic_section =
programHeaders[i].p_vaddr;
continue;
+ case PT_INTERP:
+ // should check here for appropriate interpreter
+ continue;
+ case PT_PHDR:
+ // we don't use it
+ continue;
default:
dprintf("%s: unhandled pheader type %#"
B_PRIx32 "\n", fileName,
programHeaders[i].p_type);
diff --git a/src/system/runtime_loader/elf_load_image.cpp
b/src/system/runtime_loader/elf_load_image.cpp
index 8455645..c6bcbbf 100644
--- a/src/system/runtime_loader/elf_load_image.cpp
+++ b/src/system/runtime_loader/elf_load_image.cpp
@@ -64,7 +64,7 @@ count_regions(const char* imagePath, char const* buff, int
phnum, int phentsize)
// will be handled at some other place
break;
case PT_INTERP:
- // should check here for appropiate interpreter
+ // should check here for appropriate interpreter
break;
case PT_NOTE:
// unsupported
############################################################################
Revision: hrev49731
Commit: 874e9521b2bcdbe346bafe6ef4c59f106cc80327
URL: http://cgit.haiku-os.org/haiku/commit/?id=874e9521b2bc
Author: Simon South <ssouth@xxxxxxxxxxxxxx>
Date: Wed Oct 28 13:53:43 2015 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Wed Oct 28 20:24:34 2015 UTC
x86_64: Glue code: Keep stack 16-byte-aligned
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/system/glue/arch/x86_64/crti.S
b/src/system/glue/arch/x86_64/crti.S
index 3ef8e5f..ec26b6d 100644
--- a/src/system/glue/arch/x86_64/crti.S
+++ b/src/system/glue/arch/x86_64/crti.S
@@ -30,6 +30,7 @@ FUNCTION(_init):
// Preserve image ID for call to __haiku_init_after.
push %rdi
+ sub $0x8, %rsp
call __haiku_init_before
// crtbegin.o stuff comes here
@@ -39,5 +40,6 @@ FUNCTION(_fini):
push %rbp
movq %rsp, %rbp
push %rdi
+ sub $0x8, %rsp
call __haiku_term_before
// crtend.o stuff comes here
diff --git a/src/system/glue/arch/x86_64/crtn.S
b/src/system/glue/arch/x86_64/crtn.S
index 8ed6433..6eb07e1 100644
--- a/src/system/glue/arch/x86_64/crtn.S
+++ b/src/system/glue/arch/x86_64/crtn.S
@@ -13,6 +13,7 @@
.section .init
// The image ID is preserved on the stack.
+ add $0x8, %rsp
pop %rdi
call __haiku_init_after
movq %rbp, %rsp
@@ -20,6 +21,7 @@
ret
.section .fini
+ add $0x8, %rsp
pop %rdi
call __haiku_term_after
movq %rbp, %rsp
