From 79d5f9c5659ed45a6ba1023e80a29d9955a75699 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Wed, 20 Feb 2013 16:59:12 +0100 Subject: [PATCH] base-hw: Adaptation to new base library layout This is a follow-up fix of fae63f4fa9df237a5fa3d658b870def17e82f265 Fix #18 --- base-hw/lib/mk/arm/startup.mk | 10 ++++++++++ base-hw/lib/mk/{ => arm}/syscall.mk | 2 ++ base-hw/lib/mk/base-common.mk | 2 +- base-hw/src/core/arndale/target.mk | 4 +--- base-hw/src/platform/{ => arm}/crt0.s | 0 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100755 base-hw/lib/mk/arm/startup.mk rename base-hw/lib/mk/{ => arm}/syscall.mk (96%) rename base-hw/src/platform/{ => arm}/crt0.s (100%) diff --git a/base-hw/lib/mk/arm/startup.mk b/base-hw/lib/mk/arm/startup.mk new file mode 100755 index 0000000000..715f95ff5b --- /dev/null +++ b/base-hw/lib/mk/arm/startup.mk @@ -0,0 +1,10 @@ +# +# \brief Linked against any program expect LDSO and dynamic binaries +# \author Martin Stein +# \date 2012-04-16 +# + +include $(BASE_DIR)/lib/mk/startup.inc + +vpath crt0.s $(REP_DIR)/src/platform/arm + diff --git a/base-hw/lib/mk/syscall.mk b/base-hw/lib/mk/arm/syscall.mk similarity index 96% rename from base-hw/lib/mk/syscall.mk rename to base-hw/lib/mk/arm/syscall.mk index c074c776c6..aeef25abec 100644 --- a/base-hw/lib/mk/syscall.mk +++ b/base-hw/lib/mk/arm/syscall.mk @@ -1,3 +1,5 @@ + SRC_CC = syscall.cc vpath syscall.cc $(REP_DIR)/src/base/arm + diff --git a/base-hw/lib/mk/base-common.mk b/base-hw/lib/mk/base-common.mk index 9c7ee58806..c45b6a0003 100644 --- a/base-hw/lib/mk/base-common.mk +++ b/base-hw/lib/mk/base-common.mk @@ -6,7 +6,7 @@ LIBS += cxx syscall -SRC_CC += ipc.cc ipc/ipc_marshal_cap +SRC_CC += ipc.cc ipc/ipc_marshal_cap.cc SRC_CC += avl_tree/avl_tree.cc SRC_CC += allocator/slab.cc SRC_CC += allocator/allocator_avl.cc diff --git a/base-hw/src/core/arndale/target.mk b/base-hw/src/core/arndale/target.mk index 5966f4c9f5..aede21aeae 100644 --- a/base-hw/src/core/arndale/target.mk +++ b/base-hw/src/core/arndale/target.mk @@ -13,8 +13,7 @@ INC_DIR += $(REP_DIR)/src/core/arndale # add C++ sources SRC_CC += platform_services.cc \ - platform_support.cc \ - syscall.cc + platform_support.cc # add assembly sources SRC_S += mode_transition.s \ @@ -25,7 +24,6 @@ SRC_S += mode_transition.s \ vpath platform_services.cc $(BASE_DIR)/src/core vpath platform_support.cc $(REP_DIR)/src/core/arndale vpath mode_transition.s $(REP_DIR)/src/core/arm_v7 -vpath syscall.cc $(REP_DIR)/src/base/arm vpath crt0.s $(REP_DIR)/src/core/arm # diff --git a/base-hw/src/platform/crt0.s b/base-hw/src/platform/arm/crt0.s similarity index 100% rename from base-hw/src/platform/crt0.s rename to base-hw/src/platform/arm/crt0.s