Remove always_hybrid spec
With always_hybrid also the lx_hybrid_x86 platform in tool/create_builddir vanishes. Fixes #1619
This commit is contained in:
Christian Helmuth
parent
b6c440852b
commit
ae43d13b90
|
|
@ -36,16 +36,6 @@ INC_DIR += $(REP_DIR)/src/core/include \
|
|||
|
||||
HOST_INC_DIR += /usr/include
|
||||
|
||||
#
|
||||
# core does not use POSIX threads when built for the 'lx_hybrid_x86' platform,
|
||||
# so we need to reserve the thread-context area via a segment in the program to
|
||||
# prevent clashes with vdso and shared libraries.
|
||||
#
|
||||
ifeq ($(findstring always_hybrid, $(SPECS)), always_hybrid)
|
||||
LD_SCRIPT_STATIC = $(LD_SCRIPT_DEFAULT) \
|
||||
$(call select_from_repositories,src/platform/context_area.stdlib.ld)
|
||||
endif
|
||||
|
||||
include $(GEN_CORE_DIR)/version.inc
|
||||
|
||||
vpath main.cc $(GEN_CORE_DIR)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
# dynamic variant is not supported in hybrid mode
|
||||
ifeq ($(filter-out $(SPECS),always_hybrid),)
|
||||
REQUIRES = plain_linux
|
||||
endif
|
||||
|
||||
TARGET = test-lx_rmap_dynamic
|
||||
SRC_CC = main.cc
|
||||
LIBS = base ld
|
||||
|
|
|
|||
|
|
@ -14,14 +14,6 @@ include $(BASE_DIR)/mk/util.inc
|
|||
PRG_DIR := $(dir $(TARGET_MK))
|
||||
include $(TARGET_MK)
|
||||
|
||||
#
|
||||
# Enforce use of 'lx_hybrid' library for all targets when 'always_hybrid' is
|
||||
# enabled
|
||||
#
|
||||
ifeq ($(filter-out $(SPECS),always_hybrid),)
|
||||
LIBS += lx_hybrid
|
||||
endif
|
||||
|
||||
#
|
||||
# Include lib-import description files
|
||||
#
|
||||
|
|
|
|||
|
|
@ -30,14 +30,6 @@ include $(BASE_DIR)/mk/util.inc
|
|||
PRG_DIR := $(REP_DIR)/src/$(PRG_REL_DIR)
|
||||
include $(PRG_DIR)/target.mk
|
||||
|
||||
#
|
||||
# Enforce use of 'lx_hybrid' library for all targets when 'always_hybrid' is
|
||||
# enabled
|
||||
#
|
||||
ifeq ($(filter-out $(SPECS),always_hybrid),)
|
||||
LIBS += lx_hybrid
|
||||
endif
|
||||
|
||||
#
|
||||
# Include lib-import description files
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,7 +1,3 @@
|
|||
|
||||
if {[have_spec always_hybrid]} {
|
||||
puts "Run script does not support hybrid Linux/Genode."; exit 0 }
|
||||
|
||||
build "core init test/ldso test/ldso/dl"
|
||||
|
||||
create_boot_directory
|
||||
|
|
|
|||
|
|
@ -309,11 +309,6 @@ foreach platform $platforms {
|
|||
if {[info exists ::env(RUN_OPT_AUTOPILOT)]} {
|
||||
set kernel [exec echo $platform |& sed {s/_.*//}]
|
||||
|
||||
# lx_hybrid is a special case, it also uses boot_dir/linux
|
||||
if {[string equal $kernel "lx"]} {
|
||||
set kernel linux
|
||||
}
|
||||
|
||||
exec echo "RUN_OPT=--include boot_dir/$kernel $::env(RUN_OPT_AUTOPILOT)" >> $build_conf
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,11 +95,8 @@ endif
|
|||
#
|
||||
# Tool chain version check
|
||||
#
|
||||
# If SPECS contains 'always_hybrid' we skip the check as the host tool chain is
|
||||
# used. Also, empty DST_DIRS is interpreted as a tool-chain agnostic target,
|
||||
# e.g., clean.
|
||||
# Empty DST_DIRS is interpreted as a tool-chain agnostic target, e.g., clean.
|
||||
#
|
||||
ifeq ($(filter always_hybrid,$(SPECS)),)
|
||||
ifneq ($(DST_DIRS),)
|
||||
REQUIRED_GCC_VERSION ?= 4.9.2
|
||||
GCC_VERSION := $(filter $(REQUIRED_GCC_VERSION) ,$(shell $(CUSTOM_CXX) --version))
|
||||
|
|
@ -107,7 +104,6 @@ ifneq ($(GCC_VERSION), $(REQUIRED_GCC_VERSION))
|
|||
$(error "$(CUSTOM_CXX) version $(REQUIRED_GCC_VERSION) is required")
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# Default rule: build all directories specified as make arguments
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
REPOSITORIES = $(GENODE_DIR)/repos/base-linux
|
||||
|
||||
##
|
||||
## Kernel-specific run tool configuration
|
||||
##
|
||||
|
||||
RUN_OPT = --include boot_dir/linux \
|
||||
--include power_on/linux --include log/linux
|
||||
|
|
@ -47,7 +47,6 @@ usage:
|
|||
@echo " 'foc_rpi'"
|
||||
@echo " 'foc_odroid_x2'"
|
||||
@echo " 'sel4_x86_32'"
|
||||
@echo " 'lx_hybrid_x86'"
|
||||
@echo
|
||||
@echo " The definition of BUILD_DIR is optional. If specified,"
|
||||
@echo " <build-dir> is the location of the build directory to create."
|
||||
|
|
@ -129,15 +128,13 @@ $(BUILD_DIR)/etc/build.conf:: $(BUILD_CONF_PLATFORM)
|
|||
@cat $(BUILD_CONF).generic >> $@
|
||||
|
||||
#
|
||||
# Add optional repositories for all platforms except for lx_hybrid
|
||||
# Add optional repositories for all platforms
|
||||
#
|
||||
# Those repositories rely on Genode's libc or contain device drivers.
|
||||
# Both prerequisites are not available for hybrid Linux/Genode programs.
|
||||
#
|
||||
ifneq ($(PLATFORM),lx_hybrid_x86)
|
||||
$(BUILD_DIR)/etc/build.conf::
|
||||
@cat $(BUILD_CONF).optional >> $@
|
||||
endif
|
||||
|
||||
$(BUILD_DIR)/Makefile:
|
||||
@ln -sf $(GENODE_ABS_DIR)/tool/builddir/build.mk $@
|
||||
|
|
@ -266,10 +263,6 @@ hw_x86_64::
|
|||
hw_x86_64_muen::
|
||||
@echo "SPECS = genode hw_x86_64_muen" > $(BUILD_DIR)/etc/specs.conf
|
||||
|
||||
lx_hybrid_x86::
|
||||
@echo "CROSS_DEV_PREFIX =" > $(BUILD_DIR)/etc/tools.conf
|
||||
@echo "SPECS += always_hybrid" >> $(BUILD_DIR)/etc/specs.conf
|
||||
|
||||
$(PLATFORM)::
|
||||
@echo "Successfully created build directory at $(BUILD_DIR)."
|
||||
@echo "Please adjust $(BUILD_DIR)/etc/build.conf according to your needs."
|
||||
|
|
|
|||
Loading…
Reference in New Issue