From 47ef3bb1cbd8f0b9087a3e11789548f4ee87e0e7 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Mon, 13 Aug 2012 15:15:36 +0200 Subject: [PATCH] NOVA: Fix ldso test for 64bit The generic parent_cap.cc overwrote the beginning of the data segment with to much. Reserved are solely 16 byte, for 64bit we use however 32byte. Actually, the parent_cap copying is not required at all. The parent cap selector is at a fixed define place, so that no exported symbols are required for determination of the parent_cap. Remove it. --- os/lib/mk/nova/ldso-arch.mk | 5 +++++ os/src/lib/ldso/arch/nova/parent_cap.cc | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 os/lib/mk/nova/ldso-arch.mk create mode 100644 os/src/lib/ldso/arch/nova/parent_cap.cc diff --git a/os/lib/mk/nova/ldso-arch.mk b/os/lib/mk/nova/ldso-arch.mk new file mode 100644 index 0000000000..e32fe85aa6 --- /dev/null +++ b/os/lib/mk/nova/ldso-arch.mk @@ -0,0 +1,5 @@ +SRC_CC = parent_cap.cc binary_name.cc +LIBS = ldso_crt0 + +vpath parent_cap.cc $(REP_DIR)/src/lib/ldso/arch/nova +vpath binary_name.cc $(REP_DIR)/src/lib/ldso/arch diff --git a/os/src/lib/ldso/arch/nova/parent_cap.cc b/os/src/lib/ldso/arch/nova/parent_cap.cc new file mode 100644 index 0000000000..59dc2093f4 --- /dev/null +++ b/os/src/lib/ldso/arch/nova/parent_cap.cc @@ -0,0 +1,21 @@ +/* + * \brief Parent capability manipulation + * \author Alexander Boettcher + * \date 2012-08-13 + */ + +/* + * Copyright (C) 2009-2012 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU General Public License version 2. + */ + +#include + +void Genode::set_parent_cap_arch(void *ptr) +{ + /* Not required, determinig parent cap is done not using any exported + * symbols + */ +}