Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b081bc8b authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Greg Kroah-Hartman
Browse files

xen: Fix 4.9.139 merge resolution 



Commit 86e51430 ("Kbuild: use -fshort-wchar globally") applied this
flag globally so the issue noted in commit aadfde87 ("xen/efi: don't
use -fshort-wchar") is no longer valid. I have verified that the Pixel
3's kernel builds with this resolution.

Change-Id: I8fb92e81222e937070c4edb6b53b5f8b50fae5dd
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
parent 6301a71f

drivers/xen/Makefile

+0 −5
Original line number Original line Diff line number Diff line
@@ -7,11 +7,6 @@ obj-y += xenbus/ 
nostackp := $(call cc-option, -fno-stack-protector)

nostackp := $(call cc-option, -fno-stack-protector)

CFLAGS_features.o			:= $(nostackp)

CFLAGS_features.o			:= $(nostackp)





ifndef CONFIG_LTO_CLANG

CFLAGS_efi.o				+= -fshort-wchar

LDFLAGS					+= $(call ld-option, --no-wchar-size-warning)

endif



dom0-$(CONFIG_ARM64) += arm-device.o

dom0-$(CONFIG_ARM64) += arm-device.o

dom0-$(CONFIG_PCI) += pci.o

dom0-$(CONFIG_PCI) += pci.o

dom0-$(CONFIG_USB_SUPPORT) += dbgp.o

dom0-$(CONFIG_USB_SUPPORT) += dbgp.o