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

Fix printf error + uninstall rules generation error + update configure

Browse source
This commit is contained in:
Yatis 2020-11-01 11:01:39 +01:00
parent 15a286daf0
commit 6fa1e2498d
3 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure vendored
View file

@ -211,22 +211,23 @@ ln -s $src $dst
#--- #---
generate_config() generate_config()
{ {
echo 'CONFIG.CFLAGS := ' # build information
echo 'CONFIG.TARGET := '
echo 'CONFIG.FORMAT := '
echo "CONFIG.TOOLCHAIN := $toolchain" echo "CONFIG.TOOLCHAIN := $toolchain"
[ "$prefix" ] && echo "CONFIG.PREFIX := $prefix" [ "$prefix" ] && echo "CONFIG.PREFIX := $prefix"
[ "$cflags" ] && echo "CONFIG.CFLAGS += $cflags"
# debug / unit tests # extra flags
echo 'CONFIG.CFLAGS := '
[ "$cflags" ] && echo "CONFIG.CFLAGS += $cflags"
[ $debug = true ] && echo 'CONFIG.CFLAGS += -g3' [ $debug = true ] && echo 'CONFIG.CFLAGS += -g3'
# ABI support # ABI support
echo 'CONFIG.TARGET := fxlibc'
[ $support_vhex_kernel = true ] && echo 'CONFIG.TARGET += fxlibc-vhex' [ $support_vhex_kernel = true ] && echo 'CONFIG.TARGET += fxlibc-vhex'
[ $support_casio_abi_fx9860 = true ] && echo 'CONFIG.TARGET += fxlibc-fx9860g' [ $support_casio_abi_fx9860 = true ] && echo 'CONFIG.TARGET += fxlibc-fx9860g'
[ $support_casio_abi_fxcg50 = true ] && echo 'CONFIG.TARGET += fxlibc-fxcg50' [ $support_casio_abi_fxcg50 = true ] && echo 'CONFIG.TARGET += fxlibc-fxcg50'
# formats # formats
echo 'CONFIG.FORMAT := '
[ $format_static = true ] && echo 'CONFIG.FORMAT += static' [ $format_static = true ] && echo 'CONFIG.FORMAT += static'
[ $format_dynamic = true ] && echo 'CONFIG.FORMAT += dynamic' [ $format_dynamic = true ] && echo 'CONFIG.FORMAT += dynamic'
} }

19
make/Makefile.default
View file

@ -35,7 +35,7 @@
#--- #---
MAJOR := 0 MAJOR := 0
MINOR := 3 MINOR := 3
PATCH := 4 PATCH := 5
EXTRAVERSION := EXTRAVERSION :=
@ -210,25 +210,18 @@ version:
# @note: # @note:
# *1 - library pathname # *1 - library pathname
define generate-install-rule define generate-install-rule
# get the library name (remove path information)
lib-basename := $(notdir $1)
# Genetate rules name
lib-install-rule := $$(basename $$(lib-basename))-install
lib-uninstall-rule := $$(basename $$(lib-basename))-uninstall
# Generate the installation rule # Generate the installation rule
$$(lib-install-rule): $(basename $(notdir $1))-install:
install -d $(CONFIG.PREFIX) install -d $(CONFIG.PREFIX)
install $1 -m 644 $(CONFIG.PREFIX) install $1 -m 644 $(CONFIG.PREFIX)
# Generate the uninstallation rule # Generate the uninstallation rule
$$(lib-uninstall-rule): $(basename $(notdir $1))-uninstall:
rm -f $(CONFIG.PREFIX)$$(lib-basename) rm -f $(CONFIG.PREFIX)$(notdir $1)
# Register generated rules into their appropriate list # Register generated rules into their appropriate list
lib-installation-rules += $$(lib-install-rule) lib-installation-rules += $(basename $(notdir $1))-install
lib-uninstallation-rules += $$(lib-uninstall-rule) lib-uninstallation-rules += $(basename $(notdir $1))-uninstall
endef endef

4
src/stdio/internal/printf_common.c
View file

@ -20,8 +20,8 @@ int printf_common(struct printf_opt *opt, const char *restrict format)
// Check printable char // Check printable char
if (format[p] != '%' || format[p + 1] == '%') { if (format[p] != '%' || format[p + 1] == '%') {
tmp = format[p]; tmp = format[p];
if (format[p] != '%') if (format[p] == '%')
tmp = format[++p]; p = p + 1;
(*opt->disp_char)(opt,tmp); (*opt->disp_char)(opt,tmp);
continue; continue;
} }