From 98798f18b5f4333697aaf5ccfb1473597e2f34d7 Mon Sep 17 00:00:00 2001 From: Tomasz Gajewski Date: Mon, 5 Oct 2020 19:49:57 +0200 Subject: [PATCH] Fix minor inconsistencies in mk files Fixes #3972 --- repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk | 1 - repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc | 2 +- repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc | 1 - repos/base-linux/src/test/lx_hybrid_errno/target.mk | 2 +- repos/base-linux/src/test/lx_hybrid_pthread_ipc/target.mk | 2 +- repos/base/lib/mk/cxx.mk | 6 +++--- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk b/repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk index 88dd5c10b3..d777f12dae 100644 --- a/repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk +++ b/repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk @@ -11,7 +11,6 @@ INC_DIR += $(REP_DIR)/src/core/spec/rpi SRC_CC += platform_services.cc SRC_CC += spec/arm/bcm2835_pic.cc SRC_CC += spec/arm/bcm2835_system_timer.cc -SRC_CC += spec/arm/cpu.cc # include less specific configuration include $(REP_DIR)/lib/mk/spec/arm_v6/core-hw.inc diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc b/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc index 56033ea082..81b5a04811 100644 --- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc @@ -13,7 +13,7 @@ INC_DIR += $(BASE_HW_DIR)/src/core/spec/arm_v7 # add C++ sources SRC_CC += spec/arm_v7/perf_counter.cc -SRC_S += spec/arm/vfpv3-d32.cc +SRC_S += spec/arm/vfpv3-d32.s # include less specific configuration include $(BASE_HW_DIR)/lib/mk/spec/arm/core-hw.inc diff --git a/repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc b/repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc index 3676da05a5..793980efad 100644 --- a/repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc +++ b/repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc @@ -17,7 +17,6 @@ SRC_CC += spec/arm/gicv2.cc SRC_CC += spec/arm/kernel/lock.cc SRC_CC += kernel/vm_thread_off.cc SRC_CC += kernel/cpu_mp.cc -SRC_CC += kernel/kernel.cc # include less specific configuration include $(BASE_HW_DIR)/lib/mk/spec/arm_v7/core-hw.inc diff --git a/repos/base-linux/src/test/lx_hybrid_errno/target.mk b/repos/base-linux/src/test/lx_hybrid_errno/target.mk index ff7543a6d3..b2fc08d19b 100644 --- a/repos/base-linux/src/test/lx_hybrid_errno/target.mk +++ b/repos/base-linux/src/test/lx_hybrid_errno/target.mk @@ -1,3 +1,3 @@ TARGET = test-lx_hybrid_errno -SRC_CC = main.c +SRC_CC = main.cc LIBS = lx_hybrid diff --git a/repos/base-linux/src/test/lx_hybrid_pthread_ipc/target.mk b/repos/base-linux/src/test/lx_hybrid_pthread_ipc/target.mk index 1340121da7..1fb8ee5dcf 100644 --- a/repos/base-linux/src/test/lx_hybrid_pthread_ipc/target.mk +++ b/repos/base-linux/src/test/lx_hybrid_pthread_ipc/target.mk @@ -1,3 +1,3 @@ TARGET = test-lx_hybrid_pthread_ipc -SRC_CC = main.c +SRC_CC = main.cc LIBS = lx_hybrid diff --git a/repos/base/lib/mk/cxx.mk b/repos/base/lib/mk/cxx.mk index 80faa49f3f..4d115feae1 100644 --- a/repos/base/lib/mk/cxx.mk +++ b/repos/base/lib/mk/cxx.mk @@ -43,8 +43,8 @@ LIBCXX_GCC = $(shell $(CUSTOM_CXX_LIB) $(CC_MARCH) -print-file-name=libsupc++.a) # # Dummy target used by the build system # -SRC_S = supc++.o -SRC_C = unwind.o +SRC_O = supc++.o +SRC_C = unwind.c CXX_SRC = $(sort $(CXX_SRC_CC)) CXX_OBJECTS = $(addsuffix .o,$(basename $(CXX_SRC))) LOCAL_SYMBOLS = $(patsubst %,--localize-symbol=%,$(LIBC_SYMBOLS)) @@ -89,7 +89,7 @@ endif # Rule to link all libc definitions and libsupc++ libraries # and to hide after that the exported libc symbols # -$(SRC_S): $(CXX_OBJECTS) +$(SRC_O): $(CXX_OBJECTS) $(MSG_MERGE)$@ $(VERBOSE)$(LD) $(LD_MARCH) $(addprefix -u ,$(KEEP_SYMBOLS)) -r $(CXX_OBJECTS) $(LIBCXX_GCC) -o $@.tmp $(MSG_CONVERT)$@