Date: Sat, 6 Feb 2016 22:01:25 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295356 - in head/sys/boot: common efi/boot1 Message-ID: <201602062201.u16M1PYS097437@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Sat Feb 6 22:01:25 2016 New Revision: 295356 URL: https://svnweb.freebsd.org/changeset/base/295356 Log: Fix EFI platform build failures With warnings now enabled some plaforms where failing due to warnings. * Fix st_size printed as a size_t when its actually an off_t. * Fix pointer conversion in load_elf for some 32bit platforms due to 64bit off in ef. MFC after: 2 days X-MFC-With: Sponsored by: Multiplay Modified: head/sys/boot/common/load_elf.c head/sys/boot/efi/boot1/zfs_module.c Modified: head/sys/boot/common/load_elf.c ============================================================================== --- head/sys/boot/common/load_elf.c Sat Feb 6 21:54:02 2016 (r295355) +++ head/sys/boot/common/load_elf.c Sat Feb 6 22:01:25 2016 (r295356) @@ -886,7 +886,7 @@ __elfN(parse_modmetadata)(struct preload error = __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md)); if (error == EOPNOTSUPP) { md.md_cval += ef->off; - md.md_data = (void *)((uintptr_t)md.md_data + ef->off); + md.md_data = (void *)((uintptr_t)md.md_data + (uintptr_t)ef->off); } else if (error != 0) return (error); #endif Modified: head/sys/boot/efi/boot1/zfs_module.c ============================================================================== --- head/sys/boot/efi/boot1/zfs_module.c Sat Feb 6 21:54:02 2016 (r295355) +++ head/sys/boot/efi/boot1/zfs_module.c Sat Feb 6 22:01:25 2016 (r295356) @@ -135,7 +135,7 @@ load(const char *filepath, dev_info_t *d if ((status = bs->AllocatePool(EfiLoaderData, (UINTN)st.st_size, &buf)) != EFI_SUCCESS) { - printf("Failed to allocate load buffer %zu for pool '%s' for '%s' " + printf("Failed to allocate load buffer %zd for pool '%s' for '%s' " "(%lu)\n", st.st_size, spa->spa_name, filepath, EFI_ERROR_CODE(status)); return (EFI_INVALID_PARAMETER); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602062201.u16M1PYS097437>