Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Sep 2017 07:30:24 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r323261 - head/sys/boot/efi/boot1
Message-ID:  <201709070730.v877UO9q007077@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Thu Sep  7 07:30:24 2017
New Revision: 323261
URL: https://svnweb.freebsd.org/changeset/base/323261

Log:
  Fix armv6 build
  
  We need to extend the -Wno-format hack to yet another Makefile to cope
  with %S meaning (CHAR16 *) not (wchar_t *) in the context of the EFI
  boot loaders.
  
  Sponsored by: Netflix

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

Modified: head/sys/boot/efi/boot1/Makefile
==============================================================================
--- head/sys/boot/efi/boot1/Makefile	Thu Sep  7 07:30:19 2017	(r323260)
+++ head/sys/boot/efi/boot1/Makefile	Thu Sep  7 07:30:24 2017	(r323261)
@@ -10,6 +10,13 @@ PROG=		boot1.sym
 INTERNALPROG=
 WARNS?=		6
 
+# 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.boot1.c+=	-Wno-format
+
 # Disable warnings that are currently incompatible with the zfs boot code
 CWARNFLAGS.zfs_module.c += -Wno-array-bounds
 CWARNFLAGS.zfs_module.c += -Wno-cast-align



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709070730.v877UO9q007077>