From b38e499ebf6ca11765dc0acb089ff4d3134bb0c1 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 29 Jun 2019 11:46:02 +0200 Subject: [PATCH] Build variants --- .gitignore | 7 ------- Tuprules.tup | 14 +++++++++----- build-x86_64/.gitignore | 1 - configs/arm_v8.config | 12 ++++++++++++ configs/i386.config | 14 ++++++++++++++ build-x86_64/tup.config => configs/x86_64.config | 10 ++++------ libretro/cores/Tuprules.tup | 2 +- libretro/cores/samples/Tuprules.tup | 2 +- libretro/games/streemerz/Tupfile | 2 +- upstream | 2 +- 10 files changed, 43 insertions(+), 23 deletions(-) delete mode 100644 build-x86_64/.gitignore create mode 100644 configs/arm_v8.config create mode 100644 configs/i386.config rename build-x86_64/tup.config => configs/x86_64.config (94%) diff --git a/.gitignore b/.gitignore index 781ff43ee..e783c2953 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,3 @@ ##### Do not edit. .tup /.gitignore -/Makefile -/bin-list -/depot -/pkg.sed -/public -/raw-list -/versions.sed diff --git a/Tuprules.tup b/Tuprules.tup index 55eea9c30..91ca2b9dc 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -1,5 +1,9 @@ .gitignore +ifndef TOOL_CHAIN_PREFIX + error TOOL_CHAIN_PREFIX not configured, missing variant? +endif + ifeq (@(TUP_ARCH),i386) CC_MARCH = -march=i686 -m32 LD_MARCH = -melf_i386 @@ -10,6 +14,10 @@ CC_MARCH = -m64 -mcmodel=large LD_MARCH = -melf_x86_64 endif +ifeq (@(TUP_ARCH),arm_v8) +CC_MARCH = -march=armv8-a +endif + GENODE_DIR = $(TUP_CWD)/upstream &STUB_DIR = upstream/stub @@ -95,7 +103,7 @@ AWK_LOCAL_ARCHIVES = awk -F '/' \ |> $(RAW_DIR)/%b !collect_bin = |> ^ COLLECT %o^ \ - strip -o %o %f \ + @(TOOL_CHAIN_PREFIX)strip -o %o %f \ |> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/%b !collect_pkg_runtime = | $(VERSIONS_SED_FILE) |> ^ package %f^ \ @@ -130,10 +138,6 @@ ERRATA_DIR = $(TUP_CWD)/errata export PKG_CONFIG_PATH PKG_CONFIG = PKG_CONFIG_PATH=$(GENODE_DIR)/upstream:pkg-config:$PKG_CONFIG_PATH pkg-config -ifndef TOOL_CHAIN_PREFIX - error TOOL_CHAIN_PREFIX not configured -endif - CC = @(TOOL_CHAIN_PREFIX)gcc CXX = @(TOOL_CHAIN_PREFIX)g++ LD= @(TOOL_CHAIN_PREFIX)ld diff --git a/build-x86_64/.gitignore b/build-x86_64/.gitignore deleted file mode 100644 index b64adb04b..000000000 --- a/build-x86_64/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.gitignore diff --git a/configs/arm_v8.config b/configs/arm_v8.config new file mode 100644 index 000000000..a14fae009 --- /dev/null +++ b/configs/arm_v8.config @@ -0,0 +1,12 @@ +CONFIG_TUP_ARCH=arm_v8 +CONFIG_TOOL_CHAIN_PREFIX=genode-aarch64- + +CONFIG_CC_WRAPPER=ccache +CONFIG_CXX_WRAPPER=ccache + +CONFIG_OFFLINE= +CONFIG_NO_NETWORK= + +CONFIG_SCULPT_VERSION=19.05 +CONFIG_PUBLIC_USER=ehmry +CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7 diff --git a/configs/i386.config b/configs/i386.config new file mode 100644 index 000000000..22c5e90f0 --- /dev/null +++ b/configs/i386.config @@ -0,0 +1,14 @@ +CONFIG_TUP_ARCH=x86_64 +CONFIG_TOOL_CHAIN_PREFIX=genode-x86- + +CONFIG_CC_WRAPPER=ccache +CONFIG_CXX_WRAPPER=ccache + +CONFIG_OFFLINE= +CONFIG_NO_NETWORK= + +CONFIG_BUILD_NOVA=y + +CONFIG_SCULPT_VERSION=19.05 +CONFIG_PUBLIC_USER=ehmry +CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7 diff --git a/build-x86_64/tup.config b/configs/x86_64.config similarity index 94% rename from build-x86_64/tup.config rename to configs/x86_64.config index 118e41390..aaaffecf5 100644 --- a/build-x86_64/tup.config +++ b/configs/x86_64.config @@ -1,16 +1,14 @@ CONFIG_TUP_ARCH=x86_64 CONFIG_TOOL_CHAIN_PREFIX=genode-x86- -CONFIG_SCULPT_VERSION=19.05 -CONFIG_PKG_CONFIG_PATH=/opt/genode/sdk-19.05/pkgconfig/x86_64 -CONFIG_TOOLCHAIN_PATH=/opt/genode/toolchain-19.05/bin - CONFIG_CC_WRAPPER=ccache CONFIG_CXX_WRAPPER=ccache -#CONFIG_NO_NETWORK= -CONFIG_SKIP_INCOMPATIBLE= +CONFIG_OFFLINE= +CONFIG_BUILD_NOVA=y + +CONFIG_SCULPT_VERSION=19.05 CONFIG_PUBLIC_USER=ehmry CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7 diff --git a/libretro/cores/Tuprules.tup b/libretro/cores/Tuprules.tup index dbc70a58b..e225f1c90 100644 --- a/libretro/cores/Tuprules.tup +++ b/libretro/cores/Tuprules.tup @@ -33,6 +33,6 @@ PKG_DEPENDS += \ |> libretro.so LINK_T = $(TUP_CWD)/link.T -DEFINES += -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 +DEFINES += -fPIC -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 DEFINES += -DGIT_VERSION=\"$(GIT_VERSION)\" NO_UNDEFINED = --no-undefined diff --git a/libretro/cores/samples/Tuprules.tup b/libretro/cores/samples/Tuprules.tup index 77fb18678..c8ac0ae84 100644 --- a/libretro/cores/samples/Tuprules.tup +++ b/libretro/cores/samples/Tuprules.tup @@ -84,7 +84,7 @@ endif ifeq ($(TARGET_NAME),testgl_compute_shaders) CORE_PKGS += mesa - CFLAGS += -Igl -DNDEBUG -fPIC -DHAVE_ZIP_DEFLATE + CFLAGS += -Igl -DNDEBUG -DHAVE_ZIP_DEFLATE SOURCES_CXX += libretro/libretro.cpp SOURCES_CXX += gl/*.cpp SOURCES_CXX += app/boxes.cpp diff --git a/libretro/games/streemerz/Tupfile b/libretro/games/streemerz/Tupfile index 199824dfb..c73886201 100644 --- a/libretro/games/streemerz/Tupfile +++ b/libretro/games/streemerz/Tupfile @@ -20,6 +20,6 @@ PKG_DEPENDS += \ : runtime |> !collect_pkg_runtime |> -include &RAW_RULES) +include &(RAW_RULES) endif diff --git a/upstream b/upstream index b6422c3dc..c1cf7c9ad 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit b6422c3dcc20b30a652557dca97ccd8a73f3111e +Subproject commit c1cf7c9ad6d43a35b1f28f5f7ebe1472bf293585