summaryrefslogtreecommitdiffstats
path: root/drivers/xen/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-07-26 15:36:23 +0200
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-08-21 09:05:59 +0900
commit8c97023cf0518f172b8cb7a9fffc28b89401abbf (patch)
tree47d64b4872b39ddddee491bfbc95417ab7674444 /drivers/xen/Makefile
parent4e433fc4d1a93310d31e7671faca8660a2890908 (diff)
downloadlinux-8c97023cf0518f172b8cb7a9fffc28b89401abbf.tar.bz2
Kbuild: use -fshort-wchar globally
Commit 971a69db7dc0 ("Xen: don't warn about 2-byte wchar_t in efi") added the --no-wchar-size-warning to the Makefile to avoid this harmless warning: arm-linux-gnueabi-ld: warning: drivers/xen/efi.o uses 2-byte wchar_t yet the output is to use 4-byte wchar_t; use of wchar_t values across objects may fail Changing kbuild to use thin archives instead of recursive linking unfortunately brings the same warning back during the final link. The kernel does not use wchar_t string literals at this point, and xen does not use wchar_t at all (only efi_char16_t), so the flag has no effect, but as pointed out by Jan Beulich, adding a wchar_t string literal would be bad here. Since wchar_t is always defined as u16, independent of the toolchain default, always passing -fshort-wchar is correct and lets us remove the Xen specific hack along with fixing the warning. Link: https://patchwork.kernel.org/patch/9275217/ Fixes: 971a69db7dc0 ("Xen: don't warn about 2-byte wchar_t in efi") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: David Vrabel <david.vrabel@citrix.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'drivers/xen/Makefile')
-rw-r--r--drivers/xen/Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 8feab810aed9..7f188b8d0c67 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -7,9 +7,6 @@ obj-y += xenbus/
nostackp := $(call cc-option, -fno-stack-protector)
CFLAGS_features.o := $(nostackp)
-CFLAGS_efi.o += -fshort-wchar
-LDFLAGS += $(call ld-option, --no-wchar-size-warning)
-
dom0-$(CONFIG_ARM64) += arm-device.o
dom0-$(CONFIG_PCI) += pci.o
dom0-$(CONFIG_USB_SUPPORT) += dbgp.o