From 9f60f2bbf938c3e76642efc8f107a8f64189b507 Mon Sep 17 00:00:00 2001 From: Yatis Date: Wed, 14 Oct 2020 12:18:34 +0200 Subject: [PATCH] fix compilation error (vhex) --- make/Makefile.default | 12 ++++++------ src/stdlib/arch/vhex/realloc.S | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/make/Makefile.default b/make/Makefile.default index 4a6907a..213f304 100644 --- a/make/Makefile.default +++ b/make/Makefile.default @@ -34,7 +34,7 @@ #--- MAJOR := 0 MINOR := 2 -PATCH := 1 +PATCH := 2 EXTRAVERSION := -alpha @@ -120,13 +120,13 @@ first: all # @params: # *1 - source file path # *2 - build directory path (output) +# *3 - build flags # TODO: -# * handle custom cflags (format, abi management) # * handle verbose option define compile-src $(patsubst .._src_%,$2%.o,$(subst /,_,$(basename $1))): $1 | $2/ @ printf "$(green)>$(nocolor) $(white)$$@$(nocolor)\n" - @ $(gcc) $(cflags) -o $$@ -c $$< -lgcc + @ $(gcc) $3 -o $$@ -c $$< -lgcc endef # common part used by all library geneation @@ -160,7 +160,7 @@ endif # generate all file object name $$(foreach source,$3,$$(eval \ - $$(call compile-src,$$(source),$$(lib-build-dir)) \ + $$(call compile-src,$$(source),$$(lib-build-dir),$$(lib-cflags)) \ )) # link the library @@ -206,7 +206,7 @@ all: $(generated-libs) 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 debug: @ echo "$$DEBUG" @@ -222,5 +222,5 @@ clean: rm -rf $(dir_object) fclean: clean rm -rf $(dir_output) -re: fclean clean +re: fclean all .PHONY: clean fclean re diff --git a/src/stdlib/arch/vhex/realloc.S b/src/stdlib/arch/vhex/realloc.S index 8cc9538..e9acfa3 100644 --- a/src/stdlib/arch/vhex/realloc.S +++ b/src/stdlib/arch/vhex/realloc.S @@ -20,7 +20,7 @@ _realloc: tst r4, r4 bf check_free mov r5, r4 - trapa #__NR_proc_head_alloc + trapa #__NR_proc_heap_alloc rts nop