From f5cd12dcf9ab19299d99ddb8ca029bf0c4a6addd Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Wed, 17 Feb 2021 17:04:59 +0100 Subject: [PATCH] base/base-hw: unify startup library builds - Use 'select_from_repositories' for crt0.s of startup library - Move RISC-V crt0.s to base (where the other archs are located) issue #4019 --- repos/base-hw/lib/mk/spec/arm_64/startup-hw.mk | 2 +- repos/base/lib/mk/spec/arm/startup.inc | 2 +- repos/base/lib/mk/spec/x86_64/startup.inc | 2 +- repos/{base-hw => base}/src/lib/startup/spec/riscv/crt0.s | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename repos/{base-hw => base}/src/lib/startup/spec/riscv/crt0.s (100%) diff --git a/repos/base-hw/lib/mk/spec/arm_64/startup-hw.mk b/repos/base-hw/lib/mk/spec/arm_64/startup-hw.mk index 613d120742..2e0b44eb62 100644 --- a/repos/base-hw/lib/mk/spec/arm_64/startup-hw.mk +++ b/repos/base-hw/lib/mk/spec/arm_64/startup-hw.mk @@ -1,3 +1,3 @@ include $(BASE_DIR)/lib/mk/startup.inc -vpath crt0.s $(BASE_DIR)/src/lib/startup/spec/arm_64 +vpath crt0.s $(call select_from_repositories,src/lib/startup/spec/arm_64) diff --git a/repos/base/lib/mk/spec/arm/startup.inc b/repos/base/lib/mk/spec/arm/startup.inc index d08fe25098..c051a095b5 100644 --- a/repos/base/lib/mk/spec/arm/startup.inc +++ b/repos/base/lib/mk/spec/arm/startup.inc @@ -1,3 +1,3 @@ include $(BASE_DIR)/lib/mk/startup.inc -vpath crt0.s $(BASE_DIR)/src/lib/startup/spec/arm +vpath crt0.s $(call select_from_repositories,src/lib/startup/spec/arm) diff --git a/repos/base/lib/mk/spec/x86_64/startup.inc b/repos/base/lib/mk/spec/x86_64/startup.inc index e713371875..267bbc21d8 100644 --- a/repos/base/lib/mk/spec/x86_64/startup.inc +++ b/repos/base/lib/mk/spec/x86_64/startup.inc @@ -1,3 +1,3 @@ include $(BASE_DIR)/lib/mk/startup.inc -vpath crt0.s $(BASE_DIR)/src/lib/startup/spec/x86_64 +vpath crt0.s $(call select_from_repositories,src/lib/startup/spec/x86_64) diff --git a/repos/base-hw/src/lib/startup/spec/riscv/crt0.s b/repos/base/src/lib/startup/spec/riscv/crt0.s similarity index 100% rename from repos/base-hw/src/lib/startup/spec/riscv/crt0.s rename to repos/base/src/lib/startup/spec/riscv/crt0.s