[PATCH] kbuild: force 16-bit wchar_t treewide

Ahmad Fatoum a.fatoum at pengutronix.de
Tue Oct 5 00:08:05 PDT 2021


On 05.10.21 09:00, Ahmad Fatoum wrote:
> All current uses of wchar_t assume 16 bit code units. We enforce this
> via -fshort-wchar on x86 and by typedefing in <linux/nls.h>.
> 
> Make wchar_t universally 16-bit to acknowledge this, a small step
> towards ARM and RISC-V EFI support in barebox.

Please dismiss. Reasoning is not sound. We have our own (two!) definitions
of wchar_t, so this would only affect host/target tool build.

Will respin later.

> Signed-off-by: Ahmad Fatoum <ahmad at a3f.at>
> ---
>  Makefile          | 2 +-
>  arch/x86/Makefile | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 74e4893f02c8..cc01e5656d7c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -438,7 +438,7 @@ LINUXINCLUDE    := -Iinclude -I$(srctree)/dts/include \
>  KBUILD_CPPFLAGS        := -D__KERNEL__ -D__BAREBOX__ $(LINUXINCLUDE) -fno-builtin -ffreestanding
>  
>  KBUILD_CFLAGS   := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \
> -		   -fno-strict-aliasing -fno-common \
> +		   -fno-strict-aliasing -fno-common -fshort-wchar \
>                     -Werror=implicit-function-declaration -Werror=implicit-int \
>                     -Os -pipe -Wmissing-prototypes -std=gnu89
>  KBUILD_AFLAGS          := -D__ASSEMBLY__
> diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> index fd871ca21419..532246647b63 100644
> --- a/arch/x86/Makefile
> +++ b/arch/x86/Makefile
> @@ -5,7 +5,7 @@ KBUILD_CPPFLAGS += -D__X86__
>  TEXT_BASE = $(CONFIG_TEXT_BASE)
>  
>  machine-y := efi
> -KBUILD_CFLAGS += -fpic -fshort-wchar -mno-sse -mno-mmx
> +KBUILD_CFLAGS += -fpic -mno-sse -mno-mmx
>  ifeq ($(CONFIG_X86_32),y)
>  	TARGET = efi-app-ia32
>  else
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



More information about the barebox mailing list