ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base-linux: Repair hybrid programs 

Do not link 'startup' and 'cxx' libraries against hybrid programs.
This commit is contained in:
Sebastian Sumpf 2014-02-21 13:34:27 +01:00 committed by Christian Helmuth
parent 961bd41b05
commit b4612d24ce
5 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base-linux/lib/mk/base-common.mk
View File

@ -4,7 +4,7 @@
# \date 2013-02-14
#
LIBS += startup syscall
LIBS += syscall
SRC_CC += ipc/ipc.cc
SRC_CC += avl_tree/avl_tree.cc

20
base-linux/lib/mk/base.inc Normal file
View File

@ -0,0 +1,20 @@
#
# \brief Portions of base library that are exclusive to non-core processes
# \author Norman Feske
# \date 2013-02-14
#
# The content of this file is used for both native Genode as well as hybrid
# Linux/Genode programs. Hence, it must be void of any thread-related code.
#
LIBS += base-common syscall cxx
SRC_CC += console/log_console.cc
SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc
INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base
# vi:set ft=make :

23
base-linux/lib/mk/base.mk
View File

@ -1,19 +1,16 @@
#
# \brief Portions of base library that are exclusive to non-core processes
# \author Norman Feske
# \date 2013-02-14
#
# The content of this file is used for both native Genode as well as hybrid
# Linux/Genode programs. Hence, it must be void of any thread-related code.
# \brief Base lib parts that are not used by hybrid applications
# \author Sebastian Sumpf
# \date 2014-02-21
#
LIBS += base-common syscall cxx
LIBS += startup cxx
SRC_CC += thread.cc thread_linux.cc
vpath %.cc $(REP_DIR)/src/base/thread
vpath %.cc $(BASE_DIR)/src/base/thread
include $(REP_DIR)/lib/mk/base.inc
SRC_CC += console/log_console.cc
SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc
SRC_CC += thread/thread.cc thread/thread_linux.cc
INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

2
base-linux/src/core/target.mk
View File

@ -1,6 +1,6 @@
TARGET = core
REQUIRES = linux
LIBS = cxx base-common syscall
LIBS = cxx base-common syscall startup
GEN_CORE_DIR = $(BASE_DIR)/src/core

5
base/mk/prg.mk
View File

@ -162,8 +162,9 @@ STATIC_LIBS := $(sort $(wildcard $(STATIC_LIBS)))
# 'src/platform/lx_hybrid.cc'.
#
ifeq ($(USE_HOST_LD_SCRIPT),yes)
STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/base/base.lib.a, $(STATIC_LIBS))
STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/cxx/cxx.lib.a, $(STATIC_LIBS))
STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/startup/startup.lib.a, $(STATIC_LIBS))
STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/base/base.lib.a, $(STATIC_LIBS))
STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/cxx/cxx.lib.a, $(STATIC_LIBS))
endif
#