From 4a61d008be5d2b9c3036ce25a2d5c41b890e8cac Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Thu, 6 Feb 2014 01:43:21 +0100 Subject: [PATCH] base: beautify BSS stuff in CRT0s fix #989 --- base/src/platform/arm/crt0.s | 7 ------- base/src/platform/init_main_thread.cc | 2 +- base/src/platform/x86_32/crt0.s | 17 +++++------------ base/src/platform/x86_64/crt0.s | 11 ++--------- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/base/src/platform/arm/crt0.s b/base/src/platform/arm/crt0.s index e41114de09..1c05769a1f 100644 --- a/base/src/platform/arm/crt0.s +++ b/base/src/platform/arm/crt0.s @@ -52,8 +52,6 @@ /* stack of the temporary initial environment */ .p2align 4 - .global _stack_low - _stack_low: .space 32 * 1024 .global _stack_high _stack_high: @@ -62,8 +60,3 @@ .global __initial_sp __initial_sp: .space 4 - - /* return value of init_main_thread */ - .global init_main_thread_result - init_main_thread_result: - .space 4 diff --git a/base/src/platform/init_main_thread.cc b/base/src/platform/init_main_thread.cc index 596b0401ba..74579c44f6 100644 --- a/base/src/platform/init_main_thread.cc +++ b/base/src/platform/init_main_thread.cc @@ -21,7 +21,7 @@ using namespace Genode; -extern addr_t init_main_thread_result; +addr_t init_main_thread_result; extern void init_exception_handling(); diff --git a/base/src/platform/x86_32/crt0.s b/base/src/platform/x86_32/crt0.s index 3b1d4ae7b9..cc5530f9a9 100644 --- a/base/src/platform/x86_32/crt0.s +++ b/base/src/platform/x86_32/crt0.s @@ -55,24 +55,17 @@ /* stack of the temporary initial environment */ .p2align 4 - .global _stack_low - _stack_low: - .space 32 * 1024 - .global _stack_high + .space 32 * 1024 + .global _stack_high _stack_high: /* initial value of the ESP, EAX and EDI register */ - .global __initial_sp + .global __initial_sp __initial_sp: .space 4 - .global __initial_ax + .global __initial_ax __initial_ax: .space 4 - .global __initial_di + .global __initial_di __initial_di: .space 4 - - /* return value of init_main_thread */ - .global init_main_thread_result - init_main_thread_result: - .space 4 diff --git a/base/src/platform/x86_64/crt0.s b/base/src/platform/x86_64/crt0.s index c60240a6dc..4412be3233 100644 --- a/base/src/platform/x86_64/crt0.s +++ b/base/src/platform/x86_64/crt0.s @@ -66,10 +66,8 @@ /* stack of the temporary initial environment */ .p2align 8 - .global _stack_low - _stack_low: - .space 32 * 1024 - .global _stack_high + .space 32 * 1024 + .global _stack_high _stack_high: /* initial value of the RSP, RAX and RDI register */ @@ -82,8 +80,3 @@ .globl __initial_di __initial_di: .space 8 - - /* return value of init_main_thread */ - .globl init_main_thread_result - init_main_thread_result: - .space 8