Create a library file for libc

TF Makefile was linking all the objects files generated for the
c library instead of creating a static library that could be
used in the linking stage.

Change-Id: I721daea097e9b13cbb42c9f8eaa2af8fea0799cf
Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>
This commit is contained in:
Roberto Vargas 2018-05-08 10:27:10 +01:00
parent fec3648478
commit 61f72a3425
46 changed files with 10 additions and 10 deletions

View File

@ -45,7 +45,7 @@ CHECKCODE_ARGS := --no-patch
# Do not check the coding style on imported library files or documentation files # Do not check the coding style on imported library files or documentation files
INC_LIB_DIRS_TO_CHECK := $(sort $(filter-out \ INC_LIB_DIRS_TO_CHECK := $(sort $(filter-out \
include/lib/libfdt \ include/lib/libfdt \
include/lib/stdlib, \ include/lib/libc, \
$(wildcard include/lib/*))) $(wildcard include/lib/*)))
INC_DIRS_TO_CHECK := $(sort $(filter-out \ INC_DIRS_TO_CHECK := $(sort $(filter-out \
include/lib, \ include/lib, \
@ -53,7 +53,7 @@ INC_DIRS_TO_CHECK := $(sort $(filter-out \
LIB_DIRS_TO_CHECK := $(sort $(filter-out \ LIB_DIRS_TO_CHECK := $(sort $(filter-out \
lib/compiler-rt \ lib/compiler-rt \
lib/libfdt% \ lib/libfdt% \
lib/stdlib, \ lib/libc, \
$(wildcard lib/*))) $(wildcard lib/*)))
ROOT_DIRS_TO_CHECK := $(sort $(filter-out \ ROOT_DIRS_TO_CHECK := $(sort $(filter-out \
lib \ lib \
@ -198,7 +198,7 @@ DTC_FLAGS += -I dts -O dtb
# Common sources and include directories # Common sources and include directories
################################################################################ ################################################################################
include lib/compiler-rt/compiler-rt.mk include lib/compiler-rt/compiler-rt.mk
include lib/stdlib/stdlib.mk include lib/libc/libc.mk
BL_COMMON_SOURCES += common/bl_common.c \ BL_COMMON_SOURCES += common/bl_common.c \
common/tf_log.c \ common/tf_log.c \
@ -211,8 +211,7 @@ BL_COMMON_SOURCES += common/bl_common.c \
plat/common/plat_log_common.c \ plat/common/plat_log_common.c \
plat/common/${ARCH}/plat_common.c \ plat/common/${ARCH}/plat_common.c \
plat/common/${ARCH}/platform_helpers.S \ plat/common/${ARCH}/platform_helpers.S \
${COMPILER_RT_SRCS} \ ${COMPILER_RT_SRCS}
${STDLIB_SRCS}
INCLUDES += -Iinclude \ INCLUDES += -Iinclude \
-Iinclude/bl1 \ -Iinclude/bl1 \
@ -671,6 +670,7 @@ ifeq (${ERROR_DEPRECATED},0)
endif endif
$(eval $(call MAKE_LIB_DIR)) $(eval $(call MAKE_LIB_DIR))
$(eval $(call MAKE_LIB,c))
# Expand build macros for the different images # Expand build macros for the different images
ifeq (${NEED_BL1},yes) ifeq (${NEED_BL1},yes)
@ -747,7 +747,7 @@ realclean distclean:
checkcodebase: locate-checkpatch checkcodebase: locate-checkpatch
@echo " CHECKING STYLE" @echo " CHECKING STYLE"
@if test -d .git ; then \ @if test -d .git ; then \
git ls-files | grep -E -v 'libfdt|stdlib|docs|\.md' | \ git ls-files | grep -E -v 'libfdt|libc|docs|\.md' | \
while read GIT_FILE ; \ while read GIT_FILE ; \
do ${CHECKPATCH} ${CHECKCODE_ARGS} -f $$GIT_FILE ; \ do ${CHECKPATCH} ${CHECKCODE_ARGS} -f $$GIT_FILE ; \
done ; \ done ; \
@ -755,7 +755,7 @@ checkcodebase: locate-checkpatch
find . -type f -not -iwholename "*.git*" \ find . -type f -not -iwholename "*.git*" \
-not -iwholename "*build*" \ -not -iwholename "*build*" \
-not -iwholename "*libfdt*" \ -not -iwholename "*libfdt*" \
-not -iwholename "*stdlib*" \ -not -iwholename "*libc*" \
-not -iwholename "*docs*" \ -not -iwholename "*docs*" \
-not -iwholename "*.md" \ -not -iwholename "*.md" \
-exec ${CHECKPATCH} ${CHECKCODE_ARGS} -f {} \; ; \ -exec ${CHECKPATCH} ${CHECKCODE_ARGS} -f {} \; ; \

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
STDLIB_SRCS := $(addprefix lib/stdlib/, \ LIBC_SRCS := $(addprefix lib/libc/, \
abort.c \ abort.c \
assert.c \ assert.c \
exit.c \ exit.c \
@ -21,5 +21,5 @@ STDLIB_SRCS := $(addprefix lib/stdlib/, \
subr_prf.c \ subr_prf.c \
timingsafe_bcmp.c) timingsafe_bcmp.c)
INCLUDES += -Iinclude/lib/stdlib \ INCLUDES += -Iinclude/lib/libc \
-Iinclude/lib/stdlib/sys -Iinclude/lib/libc/sys