svn commit: r300790 - head/sys/boot/efi/libefi

John Baldwin jhb at FreeBSD.org
Thu May 26 23:07:22 UTC 2016


Author: jhb
Date: Thu May 26 23:07:20 2016
New Revision: 300790
URL: https://svnweb.freebsd.org/changeset/base/300790

Log:
  Apply the printf %S band-aid for efinet.c to fix the arm64 build.

Modified:
  head/sys/boot/efi/libefi/Makefile

Modified: head/sys/boot/efi/libefi/Makefile
==============================================================================
--- head/sys/boot/efi/libefi/Makefile	Thu May 26 23:06:36 2016	(r300789)
+++ head/sys/boot/efi/libefi/Makefile	Thu May 26 23:07:20 2016	(r300790)
@@ -7,6 +7,13 @@ WARNS?=	2
 SRCS=	delay.c devpath.c efi_console.c efinet.c efipart.c env.c errno.c \
 	handles.c libefi.c time.c
 
+# We implement a slightly non-standard %S in that it always takes a
+# CHAR16 that's common in UEFI-land instead of a wchar_t. This only
+# seems to matter on arm64 where wchar_t defaults to an int instead
+# of a short. There's no good cast to use here so just ignore the
+# warnings for now.
+CWARNFLAGS.efinet.c+=	-Wno-format
+
 .if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-msoft-float -mgeneral-regs-only
 .endif


More information about the svn-src-head mailing list