Fcalva/fxlibc
1
0
Fork 0
mirror of https://git.planet-casio.com/Vhex-Kernel-Core/fxlibc.git synced 2024-12-28 20:43:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix compilation error (vhex)

Browse source
This commit is contained in:
Yatis 2020-10-14 12:18:34 +02:00
parent 3764de9a27
commit 9f60f2bbf9
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
make/Makefile.default
View file

@ -34,7 +34,7 @@
#--- #---
MAJOR := 0 MAJOR := 0
MINOR := 2 MINOR := 2
PATCH := 1 PATCH := 2
EXTRAVERSION := -alpha EXTRAVERSION := -alpha
@ -120,13 +120,13 @@ first: all
# @params: # @params:
# *1 - source file path # *1 - source file path
# *2 - build directory path (output) # *2 - build directory path (output)
# *3 - build flags
# TODO: # TODO:
# * handle custom cflags (format, abi management)
# * handle verbose option # * handle verbose option
define compile-src define compile-src
$(patsubst .._src_%,$2%.o,$(subst /,_,$(basename $1))): $1 | $2/ $(patsubst .._src_%,$2%.o,$(subst /,_,$(basename $1))): $1 | $2/
@ printf "$(green)>$(nocolor) $(white)$$@$(nocolor)\n" @ printf "$(green)>$(nocolor) $(white)$$@$(nocolor)\n"
@ $(gcc) $(cflags) -o $$@ -c $$< -lgcc @ $(gcc) $3 -o $$@ -c $$< -lgcc
endef endef
# common part used by all library geneation # common part used by all library geneation
@ -160,7 +160,7 @@ endif
# generate all file object name # generate all file object name
$$(foreach source,$3,$$(eval \ $$(foreach source,$3,$$(eval \
$$(call compile-src,$$(source),$$(lib-build-dir)) \ $$(call compile-src,$$(source),$$(lib-build-dir),$$(lib-cflags)) \
)) ))
# link the library # link the library
@ -206,7 +206,7 @@ all: $(generated-libs)
version: version:
@ echo "$(lib-version)" @ echo "$(lib-version)"
DEBUG=$(call generate-target,fxlibc,static,$(dir_objects),$(src)) DEBUG=$(call generate-target,fxlibc-vhex,static,$(dir_objects),$(src))
export DEBUG export DEBUG
debug: debug:
@ echo "$$DEBUG" @ echo "$$DEBUG"
@ -222,5 +222,5 @@ clean:
rm -rf $(dir_object) rm -rf $(dir_object)
fclean: clean fclean: clean
rm -rf $(dir_output) rm -rf $(dir_output)
re: fclean clean re: fclean all
.PHONY: clean fclean re .PHONY: clean fclean re

2
src/stdlib/arch/vhex/realloc.S
View file

@ -20,7 +20,7 @@ _realloc:
tst r4, r4 tst r4, r4
bf check_free bf check_free
mov r5, r4 mov r5, r4
trapa #__NR_proc_head_alloc trapa #__NR_proc_heap_alloc
rts rts
nop nop