From owner-svn-src-all@freebsd.org  Tue May 12 18:35:04 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id B27CC2F759C;
 Tue, 12 May 2020 18:35:04 +0000 (UTC)
 (envelope-from rpokala@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49M6144f2kz4crn;
 Tue, 12 May 2020 18:35:04 +0000 (UTC)
 (envelope-from rpokala@freebsd.org)
Received: from [192.168.1.10] (c-98-207-126-143.hsd1.ca.comcast.net
 [98.207.126.143])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 (Authenticated sender: rpokala)
 by smtp.freebsd.org (Postfix) with ESMTPSA id D865B298A2;
 Tue, 12 May 2020 18:35:03 +0000 (UTC)
 (envelope-from rpokala@freebsd.org)
User-Agent: Microsoft-MacOutlook/16.37.20051002
Date: Tue, 12 May 2020 11:34:59 -0700
Subject: Re: svn commit: r360964 - in head: lib/libclang_rt lib/libthr
 lib/msun libexec/rtld-elf libexec/tftpd/tests share/mk stand stand/arm/uboot
 stand/efi stand/efi/boot1 stand/efi/loader stand/i386/boot2 st...
From: Ravi Pokala <rpokala@freebsd.org>
To: Eric van Gyzen <vangyzen@FreeBSD.org>, <src-committers@freebsd.org>,
 <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org>
Message-ID: <B7A8940D-9823-43A7-AC98-85ACD883AC44@panasas.com>
Thread-Topic: svn commit: r360964 - in head: lib/libclang_rt lib/libthr
 lib/msun libexec/rtld-elf libexec/tftpd/tests share/mk stand stand/arm/uboot
 stand/efi stand/efi/boot1 stand/efi/loader stand/i386/boot2 st...
References: <202005121522.04CFMfuo007680@repo.freebsd.org>
In-Reply-To: <202005121522.04CFMfuo007680@repo.freebsd.org>
Mime-version: 1.0
Content-type: text/plain;
	charset="UTF-8"
Content-transfer-encoding: quoted-printable
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2020 18:35:04 -0000

This feels like it deserves an UPDATING (and possibly a RELNOTES) entry.

-Ravi (rpokala@)

=EF=BB=BF-----Original Message-----
From: <owner-src-committers@freebsd.org> on behalf of Eric van Gyzen <vangy=
zen@FreeBSD.org>
Date: 2020-05-12, Tuesday at 08:22
To: <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@=
freebsd.org>
Subject: svn commit: r360964 - in head: lib/libclang_rt lib/libthr lib/msun=
 libexec/rtld-elf libexec/tftpd/tests share/mk stand stand/arm/uboot stand/e=
fi stand/efi/boot1 stand/efi/loader stand/i386/boot2 st...

    Author: vangyzen
    Date: Tue May 12 15:22:40 2020
    New Revision: 360964
    URL: https://svnweb.freebsd.org/changeset/base/360964

    Log:
      Remove tests for obsolete compilers in the build system

      Assume gcc is at least 6.4, the oldest xtoolchain in the ports tree.
      Assume clang is at least 6, which was in 11.2-RELEASE.  Drop conditio=
ns
      for older compilers.

      Reviewed by:	imp (earlier version), emaste, jhb
      MFC after:	2 weeks
      Sponsored by:	Dell EMC Isilon
      Differential Revision:	https://reviews.freebsd.org/D24802

    Modified:
      head/lib/libclang_rt/Makefile.inc
      head/lib/libthr/Makefile
      head/lib/msun/Makefile
      head/libexec/rtld-elf/Makefile
      head/libexec/tftpd/tests/Makefile
      head/share/mk/bsd.compiler.mk
      head/share/mk/bsd.sys.mk
      head/stand/arm/uboot/Makefile
      head/stand/defs.mk
      head/stand/efi/Makefile
      head/stand/efi/boot1/Makefile
      head/stand/efi/loader/Makefile
      head/stand/i386/boot2/Makefile
      head/stand/i386/isoboot/Makefile
      head/stand/libsa/Makefile
      head/sys/conf/Makefile.arm
      head/sys/conf/Makefile.powerpc
      head/sys/conf/kern.mk
      head/sys/conf/kern.post.mk
      head/sys/conf/kern.pre.mk
      head/sys/conf/kmod.mk
      head/sys/modules/Makefile
      head/usr.sbin/acpi/acpidb/Makefile
      head/usr.sbin/trpt/Makefile
      head/usr.sbin/zic/zic/Makefile

    Modified: head/lib/libclang_rt/Makefile.inc
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/lib/libclang_rt/Makefile.inc	Tue May 12 14:47:38 2020	(r360963=
)
    +++ head/lib/libclang_rt/Makefile.inc	Tue May 12 15:22:40 2020	(r360964=
)
    @@ -32,7 +32,7 @@ CFLAGS+=3D	${PICFLAG}
     CFLAGS+=3D	-fno-builtin
     CFLAGS+=3D	-fno-exceptions
     CXXFLAGS+=3D	-fno-rtti
    -.if ${COMPILER_TYPE} =3D=3D clang && ${COMPILER_VERSION} >=3D 30700
    +.if ${COMPILER_TYPE} =3D=3D clang
     CFLAGS+=3D	-fno-sanitize=3Dsafe-stack
     .endif
     CFLAGS+=3D	-fno-stack-protector

    Modified: head/lib/libthr/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/lib/libthr/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/lib/libthr/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -29,10 +29,7 @@ CFLAGS+=3D-Winline

     CFLAGS.thr_stack.c+=3D	-Wno-cast-align
     CFLAGS.rtld_malloc.c+=3D	-Wno-cast-align
    -.include <bsd.compiler.mk>
    -.if !(${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} < 40300)
     CFLAGS.thr_symbols.c+=3D	-Wno-missing-variable-declarations
    -.endif

     .ifndef NO_THREAD_UNWIND_STACK
     CFLAGS+=3D-fexceptions

    Modified: head/lib/msun/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/lib/msun/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/lib/msun/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -108,13 +108,13 @@ COMMON_SRCS+=3D	catrigl.c \
     	s_nextafterl.c s_nexttoward.c s_remquol.c s_rintl.c s_roundl.c \
     	s_scalbnl.c s_sinl.c s_sincosl.c \
     	s_tanhl.c s_tanl.c s_truncl.c w_cabsl.c
    -# Work around this warning from gcc 6:
    +# Work around this warning from gcc:
     #     lib/msun/ld80/e_powl.c:275:1: error: floating constant exceeds r=
ange of
     #     'long double' [-Werror=3Doverflow]
     #     if( y >=3D LDBL_MAX )
     # See also: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D130067
     .include <bsd.compiler.mk>
    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 60000
    +.if ${COMPILER_TYPE} =3D=3D "gcc"
     CFLAGS.e_powl.c+=3D -Wno-error=3Doverflow
     .endif
     .endif

    Modified: head/libexec/rtld-elf/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/libexec/rtld-elf/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/libexec/rtld-elf/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -90,8 +90,4 @@ ${PROG_FULL}:	${VERSION_MAP}
     # GCC warns about redeclarations even though they have __exported
     # and are therefore not identical to the ones from the system headers.
     CFLAGS+=3D	-Wno-redundant-decls
    -.if ${COMPILER_VERSION} < 40300
    -# Silence -Wshadow false positives in ancient GCC
    -CFLAGS+=3D	-Wno-shadow
    -.endif
     .endif

    Modified: head/libexec/tftpd/tests/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/libexec/tftpd/tests/Makefile	Tue May 12 14:47:38 2020	(r360963=
)
    +++ head/libexec/tftpd/tests/Makefile	Tue May 12 15:22:40 2020	(r360964=
)
    @@ -2,11 +2,8 @@

     .include <bsd.own.mk>

    -# Skip on GCC 4.2, because it lacks __COUNTER__
    -.if ${COMPILER_TYPE} !=3D "gcc" || ${COMPILER_VERSION} >=3D 40300
     ATF_TESTS_C=3D	functional
     TEST_METADATA.functional+=3D	timeout=3D15
    -.endif

     LIBADD=3D	util
     WARNS?=3D	6

    Modified: head/share/mk/bsd.compiler.mk
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/share/mk/bsd.compiler.mk	Tue May 12 14:47:38 2020	(r360963)
    +++ head/share/mk/bsd.compiler.mk	Tue May 12 15:22:40 2020	(r360964)
    @@ -205,20 +205,12 @@ ${X_}COMPILER_FREEBSD_VERSION=3D	unknown
     ${X_}COMPILER_RESOURCE_DIR!=3D	${${cc}:N${CCACHE_BIN}} -print-resource-d=
ir 2>/dev/null || echo unknown
     .endif

    -${X_}COMPILER_FEATURES=3D
    -.if (${${X_}COMPILER_TYPE} =3D=3D "clang" && ${${X_}COMPILER_VERSION} >=3D 3=
0300) || \
    -	(${${X_}COMPILER_TYPE} =3D=3D "gcc" && ${${X_}COMPILER_VERSION} >=3D 40800)
    -${X_}COMPILER_FEATURES+=3D	c++11
    -.endif
    -.if (${${X_}COMPILER_TYPE} =3D=3D "clang" && ${${X_}COMPILER_VERSION} >=3D 3=
0400) || \
    -	(${${X_}COMPILER_TYPE} =3D=3D "gcc" && ${${X_}COMPILER_VERSION} >=3D 50000)
    -${X_}COMPILER_FEATURES+=3D	c++14
    -.endif
    -.if (${${X_}COMPILER_TYPE} =3D=3D "clang" && ${${X_}COMPILER_VERSION} >=3D 5=
0000) || \
    +${X_}COMPILER_FEATURES=3D		c++11 c++14
    +.if ${${X_}COMPILER_TYPE} =3D=3D "clang" || \
     	(${${X_}COMPILER_TYPE} =3D=3D "gcc" && ${${X_}COMPILER_VERSION} >=3D 70000)
     ${X_}COMPILER_FEATURES+=3D	c++17
     .endif
    -.if ${${X_}COMPILER_TYPE} =3D=3D "clang" && ${${X_}COMPILER_VERSION} >=3D 60=
000
    +.if ${${X_}COMPILER_TYPE} =3D=3D "clang"
     ${X_}COMPILER_FEATURES+=3D	retpoline
     .endif


    Modified: head/share/mk/bsd.sys.mk
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/share/mk/bsd.sys.mk	Tue May 12 14:47:38 2020	(r360963)
    +++ head/share/mk/bsd.sys.mk	Tue May 12 15:22:40 2020	(r360964)
    @@ -6,8 +6,7 @@
     # Enable various levels of compiler warning checks.  These may be
     # overridden (e.g. if using a non-gcc compiler) by defining MK_WARNS=3Dn=
o.

    -# for 4.2.1 GCC:   http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Warning=
-Options.html
    -# for current GCC: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.=
html
    +# for GCC:   https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
     # for clang: https://clang.llvm.org/docs/DiagnosticsReference.html

     .include <bsd.compiler.mk>
    @@ -29,15 +28,6 @@ CFLAGS+=3D	-std=3D${CSTD}
     CXXFLAGS+=3D	-std=3D${CXXSTD}
     .endif

    -#
    -# Turn off -Werror for gcc 4.2.1. The compiler is on the glide path ou=
t of the
    -# system, and any warnings specific to it are no longer relevant as th=
ere are
    -# too many false positives.
    -#
    -.if ${COMPILER_VERSION} <  50000
    -NO_WERROR.gcc=3D	yes
    -.endif
    -
     # -pedantic is problematic because it also imposes namespace restricti=
ons
     #CFLAGS+=3D	-pedantic
     .if defined(WARNS)
    @@ -81,19 +71,13 @@ CWARNFLAGS+=3D	-Wno-pointer-sign
     # is set to low values, these have to be disabled explicitly.
     .if ${WARNS} <=3D 6
     CWARNFLAGS.clang+=3D	-Wno-empty-body -Wno-string-plus-int
    -.if ${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} >=3D 30400
     CWARNFLAGS.clang+=3D	-Wno-unused-const-variable
    -.endif
     .endif # WARNS <=3D 6
     .if ${WARNS} <=3D 3
     CWARNFLAGS.clang+=3D	-Wno-tautological-compare -Wno-unused-value\
     		-Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion
    -.if ${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} >=3D 30600
     CWARNFLAGS.clang+=3D	-Wno-unused-local-typedef
    -.endif
    -.if ${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} >=3D 40000
     CWARNFLAGS.clang+=3D	-Wno-address-of-packed-member
    -.endif
     .if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 90100
     CWARNFLAGS.gcc+=3D	-Wno-address-of-packed-member
     .endif
    @@ -113,7 +97,7 @@ CWARNFLAGS.clang+=3D	-Wno-array-bounds
     .endif # NO_WARRAY_BOUNDS
     .if defined(NO_WMISLEADING_INDENTATION) && \
         ((${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} >=3D 100000) ||=
 \
    -     (${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 60100))
    +      ${COMPILER_TYPE} =3D=3D "gcc")
     CWARNFLAGS+=3D		-Wno-misleading-indentation
     .endif # NO_WMISLEADING_INDENTATION
     .endif # WARNS
    @@ -137,8 +121,10 @@ CWARNFLAGS+=3D	-Werror
     CWARNFLAGS+=3D	-Wno-format
     .endif # NO_WFORMAT || NO_WFORMAT.${COMPILER_TYPE}

    -# GCC 5.2.0
    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 50200
    +# GCC
    +# We should clean up warnings produced with these flags.
    +# They were originally added as a quick hack to enable gcc5/6.
    +.if ${COMPILER_TYPE} =3D=3D "gcc"
     CWARNFLAGS+=3D	-Wno-error=3Daddress			\
     		-Wno-error=3Darray-bounds			\
     		-Wno-error=3Dattributes			\
    @@ -150,23 +136,18 @@ CWARNFLAGS+=3D	-Wno-error=3Daddress			\
     		-Wno-error=3Dextra			\
     		-Wno-error=3Dinline			\
     		-Wno-error=3Dlogical-not-parentheses	\
    +		-Wno-error=3Dnonnull-compare		\
    +		-Wno-error=3Dshift-negative-value		\
     		-Wno-error=3Dstrict-aliasing		\
    +		-Wno-error=3Dtautological-compare		\
     		-Wno-error=3Duninitialized		\
     		-Wno-error=3Dunused-but-set-variable	\
    +		-Wno-error=3Dunused-const-variable	\
     		-Wno-error=3Dunused-function		\
     		-Wno-error=3Dunused-value
    -.endif

    -# GCC 6.1.0
    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 60100
    -CWARNFLAGS+=3D	-Wno-error=3Dnonnull-compare		\
    -		-Wno-error=3Dshift-negative-value		\
    -		-Wno-error=3Dtautological-compare		\
    -		-Wno-error=3Dunused-const-variable
    -.endif
    -
     # GCC 7.1.0
    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 70100
    +.if ${COMPILER_VERSION} >=3D 70100
     CWARNFLAGS+=3D	-Wno-error=3Dbool-operation		\
     		-Wno-error=3Ddeprecated			\
     		-Wno-error=3Dexpansion-to-defined		\
    @@ -182,7 +163,7 @@ CWARNFLAGS+=3D	-Wno-error=3Dbool-operation		\
     .endif

     # GCC 8.1.0
    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 80100
    +.if ${COMPILER_VERSION} >=3D 80100
     CWARNFLAGS+=3D	-Wno-error=3Daggressive-loop-optimizations	\
     		-Wno-error=3Dcast-function-type			\
     		-Wno-error=3Dcatch-value				\
    @@ -191,9 +172,10 @@ CWARNFLAGS+=3D	-Wno-error=3Daggressive-loop-optimizati=
ons	
     		-Wno-error=3Dsizeof-pointer-memaccess		\
     		-Wno-error=3Dstringop-truncation
     .endif
    +.endif	# gcc

     # How to handle FreeBSD custom printf format specifiers.
    -.if ${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} >=3D 30600
    +.if ${COMPILER_TYPE} =3D=3D "clang"
     FORMAT_EXTENSIONS=3D	-D__printf__=3D__freebsd_kprintf__
     .else
     FORMAT_EXTENSIONS=3D	-fformat-extensions
    @@ -223,11 +205,7 @@ CFLAGS+=3D-nobuiltininc -idirafter ${COMPILER_RESOUR=
CE_D

     CLANG_OPT_SMALL=3D -mstack-alignment=3D8 -mllvm -inline-threshold=3D3\
     		 -mllvm -simplifycfg-dup-ret
    -.if ${COMPILER_VERSION} >=3D 30500 && ${COMPILER_VERSION} < 30700
    -CLANG_OPT_SMALL+=3D -mllvm -enable-gvn=3Dfalse
    -.else
     CLANG_OPT_SMALL+=3D -mllvm -enable-load-pre=3Dfalse
    -.endif
     CFLAGS.clang+=3D	 -Qunused-arguments
     # The libc++ headers use c++11 extensions.  These are normally silence=
d because
     # they are treated as system headers, but we explicitly disable that w=
arning
    @@ -238,14 +216,8 @@ CXXFLAGS.clang+=3D	 -Wno-c++11-extensions

     .if ${MK_SSP} !=3D "no" && \
         ${MACHINE_CPUARCH} !=3D "arm" && ${MACHINE_CPUARCH} !=3D "mips"
    -.if (${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} >=3D 30500) || \
    -    (${COMPILER_TYPE} =3D=3D "gcc" && \
    -     (${COMPILER_VERSION} =3D=3D 40201 || ${COMPILER_VERSION} >=3D 40900))
     # Don't use -Wstack-protector as it breaks world with -Werror.
     SSP_CFLAGS?=3D	-fstack-protector-strong
    -.else
    -SSP_CFLAGS?=3D	-fstack-protector
    -.endif
     CFLAGS+=3D	${SSP_CFLAGS}
     .endif # SSP && !ARM && !MIPS


    Modified: head/stand/arm/uboot/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/stand/arm/uboot/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/stand/arm/uboot/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -24,7 +24,7 @@ UBLDR_LOADADDR?=3D	0x1000000
     # Architecture-specific loader code
     SRCS=3D		start.S conf.c self_reloc.c vers.c

    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} > 40201
    +.if ${COMPILER_TYPE} =3D=3D "gcc"
     CWARNFLAGS.self_reloc.c+=3D	-Wno-error=3Dmaybe-uninitialized
     .endif


    Modified: head/stand/defs.mk
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/stand/defs.mk	Tue May 12 14:47:38 2020	(r360963)
    +++ head/stand/defs.mk	Tue May 12 15:22:40 2020	(r360964)
    @@ -143,11 +143,7 @@ CFLAGS+=3D	-fPIC -mno-red-zone
     # Do not generate movt/movw, because the relocation fixup for them doe=
s not
     # translate to the -Bsymbolic -pie format required by self_reloc() in =
loader(8).
     # Also, the fpu is not available in a standalone environment.
    -.if ${COMPILER_VERSION} < 30800
    -CFLAGS.clang+=3D	-mllvm -arm-use-movt=3D0
    -.else
     CFLAGS.clang+=3D	-mno-movt
    -.endif
     CFLAGS.clang+=3D  -mfpu=3Dnone
     CFLAGS+=3D	-fPIC
     .endif

    Modified: head/stand/efi/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/stand/efi/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/stand/efi/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -4,16 +4,10 @@ NO_OBJ=3Dt

     .include <bsd.init.mk>

    -# In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
    -# than 4.5 supports it.
    -.if ${COMPILER_TYPE} !=3D "gcc" || ${COMPILER_VERSION} >=3D 40500
    -
     SUBDIR.${MK_FDT}+=3D	fdt
     SUBDIR.yes+=3D	libefi boot1 gptboot
     SUBDIR.${MK_FORTH}+=3D loader_4th
     SUBDIR.${MK_LOADER_LUA}+=3D loader_lua
     SUBDIR.yes+=3D	loader_simp
    -
    -.endif # ${COMPILER_TYPE} !=3D "gcc" || ${COMPILER_VERSION} >=3D 40500

     .include <bsd.subdir.mk>

    Modified: head/stand/efi/boot1/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/stand/efi/boot1/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/stand/efi/boot1/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -42,10 +42,6 @@ CFLAGS.zfs_module.c+=3D	-I${SYSDIR}/cddl/contrib/opens=
ol
     CFLAGS+=3D	-DEFI_ZFS_BOOT
     .endif

    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} > 40201
    -CWARNFLAGS.self_reloc.c+=3D	-Wno-error=3Dmaybe-uninitialized
    -.endif
    -
     CFLAGS+=3D	-I${EFIINC}
     CFLAGS+=3D	-I${EFIINCMD}
     CFLAGS+=3D	-I${SYSDIR}/contrib/dev/acpica/include

    Modified: head/stand/efi/loader/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/stand/efi/loader/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/stand/efi/loader/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -31,10 +31,6 @@ CFLAGS+=3D	-DEFI_ZFS_BOOT
     HAVE_ZFS=3D	yes
     .endif

    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} > 40201
    -CWARNFLAGS.self_reloc.c+=3D	-Wno-error=3Dmaybe-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

    Modified: head/stand/i386/boot2/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/stand/i386/boot2/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/stand/i386/boot2/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -37,9 +37,6 @@ CFLAGS+=3D-fomit-frame-pointer \
     CFLAGS.gcc+=3D	-Os \
     		-fno-asynchronous-unwind-tables \
     		--param max-inline-insns-single=3D100
    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} <=3D 40201
    -CFLAGS.gcc+=3D   -mno-align-long-strings
    -.endif

     CFLAGS.clang+=3D	-Oz ${CLANG_OPT_SMALL}


    Modified: head/stand/i386/isoboot/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/stand/i386/isoboot/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/stand/i386/isoboot/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -32,9 +32,6 @@ CFLAGS+=3D-DBOOTPROG=3D\"isoboot\" \
     	-Winline -Wno-pointer-sign

     CFLAGS.gcc+=3D	--param max-inline-insns-single=3D100
    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} <=3D 40201
    -CFLAGS.gcc+=3D	-Wno-uninitialized
    -.endif
     CFLAGS.clang+=3D  -Oz ${CLANG_OPT_SMALL}

     LD_FLAGS+=3D${LD_FLAGS_BIN}

    Modified: head/stand/libsa/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/stand/libsa/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/stand/libsa/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -46,11 +46,7 @@ SRCS+=3D	subr_boot.c
     # Do not generate movt/movw, because the relocation fixup for them doe=
s not
     # translate to the -Bsymbolic -pie format required by self_reloc() in =
loader(8).
     # Also, the fpu is not available in a standalone environment.
    -.if ${COMPILER_VERSION} < 30800
    -CFLAGS.clang+=3D	-mllvm -arm-use-movt=3D0
    -.else
     CFLAGS.clang+=3D	-mno-movt
    -.endif
     CFLAGS.clang+=3D	-mfpu=3Dnone

     .PATH: ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/builtins/arm/

    Modified: head/sys/conf/Makefile.arm
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/sys/conf/Makefile.arm	Tue May 12 14:47:38 2020	(r360963)
    +++ head/sys/conf/Makefile.arm	Tue May 12 15:22:40 2020	(r360964)
    @@ -44,10 +44,6 @@ CFLAGS.clang +=3D -mfpu=3Dnone

     .if !empty(DDB_ENABLED)
     CFLAGS +=3D -funwind-tables
    -.if ${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} < 30500
    -# clang < 3.5.0 requires us to tell it to emit assembly with unwind in=
formation
    -CFLAGS +=3D -mllvm -arm-enable-ehabi
    -.endif
     .endif

     # "makeoptions KERNVIRTADDR=3D" is now optional, supply the default valu=
e.

    Modified: head/sys/conf/Makefile.powerpc
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/sys/conf/Makefile.powerpc	Tue May 12 14:47:38 2020	(r360963)
    +++ head/sys/conf/Makefile.powerpc	Tue May 12 15:22:40 2020	(r360964)
    @@ -51,7 +51,7 @@ DPAAWARNFLAGS +=3D \
             -Wno-error=3Dincompatible-pointer-types-discards-qualifiers \
             -Wno-error=3Dnon-literal-null-conversion \
             -Wno-error=3Denum-conversion
    -.elif "${COMPILER_TYPE}" =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 50200
    +.elif "${COMPILER_TYPE}" =3D=3D "gcc"
     DPAAWARNFLAGS +=3D \
     	-Wno-error=3Dredundant-decls \
     	-Wno-error=3Dint-in-bool-context

    Modified: head/sys/conf/kern.mk
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/sys/conf/kern.mk	Tue May 12 14:47:38 2020	(r360963)
    +++ head/sys/conf/kern.mk	Tue May 12 15:22:40 2020	(r360964)
    @@ -31,19 +31,14 @@ NO_WTAUTOLOGICAL_POINTER_COMPARE=3D -Wno-tautological=
-po
     CWARNEXTRA?=3D	-Wno-error-tautological-compare -Wno-error-empty-body \
     		-Wno-error-parentheses-equality -Wno-error-unused-function \
     		-Wno-error-pointer-sign
    -.if ${COMPILER_VERSION} >=3D 30700
     CWARNEXTRA+=3D	-Wno-error-shift-negative-value
    -.endif
    -.if ${COMPILER_VERSION} >=3D 40000
     CWARNEXTRA+=3D	-Wno-address-of-packed-member
    -.endif
     .if ${COMPILER_VERSION} >=3D 100000
     NO_WMISLEADING_INDENTATION=3D	-Wno-misleading-indentation
     .endif
    -.endif
    +.endif	# clang

     .if ${COMPILER_TYPE} =3D=3D "gcc"
    -.if ${COMPILER_VERSION} >=3D 40800
     # Catch-all for all the things that are in our tree, but for which we'=
re
     # not yet ready for this compiler.
     NO_WUNUSED_BUT_SET_VARIABLE =3D -Wno-unused-but-set-variable
    @@ -55,15 +50,13 @@ CWARNEXTRA?=3D	-Wno-error=3Daddress				\
     		-Wno-error=3Denum-compare				\
     		-Wno-error=3Dinline				\
     		-Wno-error=3Dmaybe-uninitialized			\
    +		-Wno-error=3Dmisleading-indentation		\
    +		-Wno-error=3Dnonnull-compare			\
     		-Wno-error=3Doverflow				\
     		-Wno-error=3Dsequence-point			\
    -		-Wno-unused-but-set-variable
    -.if ${COMPILER_VERSION} >=3D 60100
    -CWARNEXTRA+=3D	-Wno-error=3Dmisleading-indentation		\
    -		-Wno-error=3Dnonnull-compare			\
     		-Wno-error=3Dshift-overflow			\
    -		-Wno-error=3Dtautological-compare
    -.endif
    +		-Wno-error=3Dtautological-compare			\
    +		-Wno-unused-but-set-variable
     .if ${COMPILER_VERSION} >=3D 70100
     CWARNEXTRA+=3D	-Wno-error=3Dstringop-overflow
     .endif
    @@ -76,15 +69,7 @@ CWARNEXTRA+=3D	-Wno-error=3Dpacked-not-aligned
     .if ${COMPILER_VERSION} >=3D 90100
     CWARNEXTRA+=3D	-Wno-address-of-packed-member
     .endif
    -.else
    -# For gcc 4.2, eliminate the too-often-wrong warnings about uninitiali=
zed vars.
    -CWARNEXTRA?=3D	-Wno-uninitialized
    -# GCC 4.2 doesn't have -Wno-error=3Dcast-qual, so just disable the warni=
ng for
    -# the few files that are already known to generate cast-qual warnings.
    -NO_WCAST_QUAL=3D -Wno-cast-qual
    -NO_WNONNULL=3D	-Wno-nonnull
    -.endif
    -.endif
    +.endif	# gcc

     # This warning is utter nonsense
     CWARNFLAGS+=3D	-Wno-format-zero-length
    @@ -93,7 +78,7 @@ CWARNFLAGS+=3D	-Wno-format-zero-length
     # to be disabled.  WARNING: format checking is disabled in this case.
     .if ${MK_FORMAT_EXTENSIONS} =3D=3D "no"
     FORMAT_EXTENSIONS=3D	-Wno-format
    -.elif ${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} >=3D 30600
    +.elif ${COMPILER_TYPE} =3D=3D "clang"
     FORMAT_EXTENSIONS=3D	-D__printf__=3D__freebsd_kprintf__
     .else
     FORMAT_EXTENSIONS=3D	-fformat-extensions
    @@ -201,12 +186,7 @@ CFLAGS.gcc+=3D	-mno-spe
     # DDB happy. ELFv2, if available, has some other efficiency benefits.
     #
     .if ${MACHINE_ARCH} =3D=3D "powerpc64"
    -.if ${COMPILER_VERSION} >=3D 40900
    -CFLAGS.gcc+=3D	-mabi=3Delfv2
    -.else
    -CFLAGS.gcc+=3D	-mcall-aixdesc
    -.endif
    -CFLAGS.clang+=3D	-mabi=3Delfv2
    +CFLAGS+=3D	-mabi=3Delfv2
     .endif

     #

    Modified: head/sys/conf/kern.post.mk
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/sys/conf/kern.post.mk	Tue May 12 14:47:38 2020	(r360963)
    +++ head/sys/conf/kern.post.mk	Tue May 12 15:22:40 2020	(r360964)
    @@ -345,10 +345,7 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}

     .depend: .PRECIOUS ${SRCS}

    -.if ${COMPILER_TYPE} =3D=3D "clang" || \
    -    (${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 60000)
     _MAP_DEBUG_PREFIX=3D yes
    -.endif

     _ILINKS=3D machine
     .if ${MACHINE} !=3D ${MACHINE_CPUARCH} && ${MACHINE} !=3D "arm64"

    Modified: head/sys/conf/kern.pre.mk
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/sys/conf/kern.pre.mk	Tue May 12 14:47:38 2020	(r360963)
    +++ head/sys/conf/kern.pre.mk	Tue May 12 15:22:40 2020	(r360964)
    @@ -93,11 +93,7 @@ CFLAGS.gcc+=3D -fms-extensions
     .if defined(CFLAGS_ARCH_PARAMS)
     CFLAGS.gcc+=3D${CFLAGS_ARCH_PARAMS}
     .endif
    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} < 50000
    -WERROR?=3D	-Wno-error
    -.else
     WERROR?=3D	-Werror
    -.endif
     # The following should be removed no earlier than LLVM11 being importe=
d into the
     # tree, to ensure we don't regress the build.  LLVM11 and GCC10 will s=
witch the
     # default over to -fno-common, making this redundant.

    Modified: head/sys/conf/kmod.mk
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/sys/conf/kmod.mk	Tue May 12 14:47:38 2020	(r360963)
    +++ head/sys/conf/kmod.mk	Tue May 12 15:22:40 2020	(r360964)
    @@ -88,11 +88,7 @@ __KLD_SHARED=3Dno
     .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
     CFLAGS+=3D	-fno-strict-aliasing
     .endif
    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} < 50000
    -WERROR?=3D	-Wno-error
    -.else
     WERROR?=3D	-Werror
    -.endif

     LINUXKPI_GENSRCS+=3D \
     	bus_if.h \
    @@ -160,11 +156,7 @@ CFLAGS+=3D	-fPIC
     # Temporary workaround for PR 196407, which contains the fascinating d=
etails.
     # Don't allow clang to use fpu instructions or registers in kernel mod=
ules.
     .if ${MACHINE_CPUARCH} =3D=3D arm
    -.if ${COMPILER_VERSION} < 30800
    -CFLAGS.clang+=3D	-mllvm -arm-use-movt=3D0
    -.else
     CFLAGS.clang+=3D	-mno-movt
    -.endif
     CFLAGS.clang+=3D	-mfpu=3Dnone
     CFLAGS+=3D	-funwind-tables
     .endif
    @@ -283,10 +275,7 @@ ${FULLPROG}: ${OBJS}
     	${OBJCOPY} --strip-debug ${.TARGET}
     .endif

    -.if ${COMPILER_TYPE} =3D=3D "clang" || \
    -    (${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 60000)
     _MAP_DEBUG_PREFIX=3D yes
    -.endif

     _ILINKS=3Dmachine
     .if ${MACHINE_CPUARCH} =3D=3D "i386" || ${MACHINE_CPUARCH} =3D=3D "amd64"

    Modified: head/sys/modules/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/sys/modules/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/sys/modules/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -620,9 +620,7 @@ _aac=3D		aac
     _aacraid=3D	aacraid
     _acpi=3D		acpi
     .if ${MK_CRYPT} !=3D "no" || defined(ALL_MODULES)
    -.if ${COMPILER_TYPE} !=3D "gcc" || ${COMPILER_VERSION} > 40201
     _aesni=3D		aesni
    -.endif
     .endif
     _amd_ecc_inject=3Damd_ecc_inject
     _amdsbwd=3D	amdsbwd

    Modified: head/usr.sbin/acpi/acpidb/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/usr.sbin/acpi/acpidb/Makefile	Tue May 12 14:47:38 2020	(r36096=
3)
    +++ head/usr.sbin/acpi/acpidb/Makefile	Tue May 12 15:22:40 2020	(r36096=
4)
    @@ -87,6 +87,6 @@ LIBADD=3D	pthread
     # integer to pointer, which is a GNU extension.
     #
     # Turn off the warning, because this is in contributed code.
    -.if ${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} >=3D 60000
    +.if ${COMPILER_TYPE} =3D=3D "clang"
     CWARNFLAGS+=3D	-Wno-null-pointer-arithmetic
     .endif

    Modified: head/usr.sbin/trpt/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/usr.sbin/trpt/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/usr.sbin/trpt/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -8,18 +8,12 @@ MAN=3D	trpt.8
     BINGRP=3D	kmem
     BINMODE=3D 2555

    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} < 50000
    -WARNS?=3D	4
    -.endif
    -
     .if ${MK_INET6_SUPPORT} !=3D "no"
     CFLAGS+=3D -DINET6
     .endif

     .include <bsd.prog.mk>

    -.if ${COMPILER_TYPE} !=3D "gcc" || ${COMPILER_VERSION} >=3D 50000
     # Several included system headers tickle this warning in ways that are
     # difficult to work around in this program.
     CFLAGS+=3D -Wno-missing-variable-declarations
    -.endif

    Modified: head/usr.sbin/zic/zic/Makefile
    =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
    --- head/usr.sbin/zic/zic/Makefile	Tue May 12 14:47:38 2020	(r360963)
    +++ head/usr.sbin/zic/zic/Makefile	Tue May 12 15:22:40 2020	(r360964)
    @@ -15,7 +15,7 @@ CFLAGS+=3D -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/st=
d

     WARNS?=3D	2

    -.if ${COMPILER_TYPE} =3D=3D "gcc" && ${COMPILER_VERSION} >=3D 50300
    +.if ${COMPILER_TYPE} =3D=3D "gcc"
     CWARNFLAGS+=3D	-Wno-error=3Dstrict-overflow
     .endif