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. Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx> --- 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 -- 2.33.0 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox