svn commit: r323485 - in stable/11/sys/boot: arm/uboot efi/boot1 efi/loader

[Ryan Libby]

Author: rlibby
Date: Tue Sep 12 06:21:43 2017
New Revision: 323485
URL: https://svnweb.freebsd.org/changeset/base/323485

Log:
  MFC r316119 (by ngie):
  
    self_reloc.c: Pass -Wno-error=maybe-uninitialized to gcc versions
    greater than 4.2.1

Modified:
  stable/11/sys/boot/arm/uboot/Makefile
  stable/11/sys/boot/efi/boot1/Makefile
  stable/11/sys/boot/efi/loader/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/arm/uboot/Makefile
==============================================================================
--- stable/11/sys/boot/arm/uboot/Makefile	Tue Sep 12 06:19:19 2017	(r323484)
+++ stable/11/sys/boot/arm/uboot/Makefile	Tue Sep 12 06:21:43 2017	(r323485)
@@ -15,6 +15,10 @@ UBLDR_LOADADDR?=	0x1000000
 # Architecture-specific loader code
 SRCS=		start.S conf.c self_reloc.c vers.c
 
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201
+CWARNFLAGS.self_reloc.c+=	-Wno-error=maybe-uninitialized
+.endif
+
 .if !defined(LOADER_NO_DISK_SUPPORT)
 LOADER_DISK_SUPPORT?=	yes
 .else

Modified: stable/11/sys/boot/efi/boot1/Makefile
==============================================================================
--- stable/11/sys/boot/efi/boot1/Makefile	Tue Sep 12 06:19:19 2017	(r323484)
+++ stable/11/sys/boot/efi/boot1/Makefile	Tue Sep 12 06:21:43 2017	(r323485)
@@ -27,6 +27,10 @@ SRCS=	boot1.c self_reloc.c start.S ufs_module.c
 SRCS+=		zfs_module.c
 .endif
 
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201
+CWARNFLAGS.self_reloc.c+=	-Wno-error=maybe-uninitialized
+.endif
+
 CFLAGS+=	-I.
 CFLAGS+=	-I${.CURDIR}/../include
 CFLAGS+=	-I${.CURDIR}/../include/${MACHINE}

Modified: stable/11/sys/boot/efi/loader/Makefile
==============================================================================
--- stable/11/sys/boot/efi/loader/Makefile	Tue Sep 12 06:19:19 2017	(r323484)
+++ stable/11/sys/boot/efi/loader/Makefile	Tue Sep 12 06:21:43 2017	(r323485)
@@ -31,6 +31,10 @@ CWARNFLAGS.zfs.c+=	-Wno-array-bounds
 CWARNFLAGS.zfs.c+=	-Wno-missing-prototypes
 .endif
 
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201
+CWARNFLAGS.self_reloc.c+=	-Wno-error=maybe-uninitialized
+.endif
+
 # 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