ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-21 22:47:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix minor inconsistencies in mk files

Browse Source 
Fixes #3972
This commit is contained in:
Tomasz Gajewski 2020-10-05 19:49:57 +02:00 committed by Norman Feske
parent 8bed4c1d54
commit 98798f18b5
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk
View File

@ -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

2
repos/base-hw/lib/mk/spec/arm_v7/core-hw.inc
View File

@ -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

1
repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc
View File

@ -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

2
repos/base-linux/src/test/lx_hybrid_errno/target.mk
View File

@ -1,3 +1,3 @@
TARGET = test-lx_hybrid_errno
SRC_CC = main.c
SRC_CC = main.cc
LIBS = lx_hybrid

2
repos/base-linux/src/test/lx_hybrid_pthread_ipc/target.mk
View File

@ -1,3 +1,3 @@
TARGET = test-lx_hybrid_pthread_ipc
SRC_CC = main.c
SRC_CC = main.cc
LIBS = lx_hybrid

6
repos/base/lib/mk/cxx.mk
View File

@ -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)$@