svn commit: r305394 - in projects/clang390-import/sys: arm64/arm64 conf modules/bwn

[Dimitry Andric]

Author: dim
Date: Sun Sep  4 18:00:14 2016
New Revision: 305394
URL: https://svnweb.freebsd.org/changeset/base/305394

Log:
  Merge ^/head r305390 through r305393.

Modified:
  projects/clang390-import/sys/arm64/arm64/pmap.c
  projects/clang390-import/sys/conf/files
  projects/clang390-import/sys/conf/kern.mk
  projects/clang390-import/sys/modules/bwn/Makefile
Directory Properties:
  projects/clang390-import/   (props changed)

Modified: projects/clang390-import/sys/arm64/arm64/pmap.c
==============================================================================
--- projects/clang390-import/sys/arm64/arm64/pmap.c	Sun Sep  4 17:56:55 2016	(r305393)
+++ projects/clang390-import/sys/arm64/arm64/pmap.c	Sun Sep  4 18:00:14 2016	(r305394)
@@ -242,7 +242,7 @@ extern pt_entry_t pagetable_dmap[];
 
 static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
 
-static int superpages_enabled = 0;
+static int superpages_enabled = 1;
 SYSCTL_INT(_vm_pmap, OID_AUTO, superpages_enabled,
     CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &superpages_enabled, 0,
     "Are large page mappings enabled?");

Modified: projects/clang390-import/sys/conf/files
==============================================================================
--- projects/clang390-import/sys/conf/files	Sun Sep  4 17:56:55 2016	(r305393)
+++ projects/clang390-import/sys/conf/files	Sun Sep  4 18:00:14 2016	(r305394)
@@ -1211,13 +1211,13 @@ dev/bwi/bwiphy.c		optional bwi
 dev/bwi/bwirf.c			optional bwi
 dev/bwi/if_bwi.c		optional bwi
 dev/bwi/if_bwi_pci.c		optional bwi pci
-# XXX Work around clang warning, until maintainer approves fix.
+# XXX Work around clang warnings, until maintainer approves fix.
 dev/bwn/if_bwn.c		optional bwn siba_bwn \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/bwn/if_bwn_pci.c		optional bwn pci bhnd
 dev/bwn/if_bwn_phy_common.c	optional bwn siba_bwn
 dev/bwn/if_bwn_phy_g.c		optional bwn siba_bwn \
-	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
+	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED} ${NO_WCONSTANT_CONVERSION}"
 dev/bwn/if_bwn_phy_lp.c		optional bwn siba_bwn \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/bwn/if_bwn_phy_n.c		optional bwn siba_bwn

Modified: projects/clang390-import/sys/conf/kern.mk
==============================================================================
--- projects/clang390-import/sys/conf/kern.mk	Sun Sep  4 17:56:55 2016	(r305393)
+++ projects/clang390-import/sys/conf/kern.mk	Sun Sep  4 18:00:14 2016	(r305394)
@@ -17,13 +17,13 @@ CWARNFLAGS?=	-Wall -Wredundant-decls -Wn
 # kernel where fixing them is more trouble than it is worth, or where there is
 # a false positive.
 .if ${COMPILER_TYPE} == "clang"
-NO_WCONSTANT_CONVERSION=	-Wno-constant-conversion
-NO_WSHIFT_COUNT_NEGATIVE=	-Wno-shift-count-negative
-NO_WSHIFT_COUNT_OVERFLOW=	-Wno-shift-count-overflow
-NO_WSELF_ASSIGN=		-Wno-self-assign
-NO_WUNNEEDED_INTERNAL_DECL=	-Wno-unneeded-internal-declaration
+NO_WCONSTANT_CONVERSION=	-Wno-error-constant-conversion
+NO_WSHIFT_COUNT_NEGATIVE=	-Wno-error-shift-count-negative
+NO_WSHIFT_COUNT_OVERFLOW=	-Wno-error-shift-count-overflow
+NO_WSELF_ASSIGN=		-Wno-error-self-assign
+NO_WUNNEEDED_INTERNAL_DECL=	-Wno-error-unneeded-internal-declaration
 NO_WSOMETIMES_UNINITIALIZED=	-Wno-error-sometimes-uninitialized
-NO_WCAST_QUAL=			-Wno-cast-qual
+NO_WCAST_QUAL=			-Wno-error-cast-qual
 # Several other warnings which might be useful in some cases, but not severe
 # enough to error out the whole kernel build.  Display them anyway, so there is
 # some incentive to fix them eventually.

Modified: projects/clang390-import/sys/modules/bwn/Makefile
==============================================================================
--- projects/clang390-import/sys/modules/bwn/Makefile	Sun Sep  4 17:56:55 2016	(r305393)
+++ projects/clang390-import/sys/modules/bwn/Makefile	Sun Sep  4 18:00:14 2016	(r305394)
@@ -28,7 +28,7 @@ SRCS+=	device_if.h bus_if.h pci_if.h opt
 
 .include <bsd.kmod.mk>
 
-# XXX Work around clang warning, until maintainer approves fix.
+# XXX Work around clang warnings, until maintainer approves fix.
 CWARNFLAGS.if_bwn.c=	${NO_WSOMETIMES_UNINITIALIZED}
-CWARNFLAGS.if_bwn_phy_g.c=	${NO_WSOMETIMES_UNINITIALIZED}
+CWARNFLAGS.if_bwn_phy_g.c=	${NO_WSOMETIMES_UNINITIALIZED} ${NO_WCONSTANT_CONVERSION}
 CWARNFLAGS.if_bwn_phy_lp.c=	${NO_WSOMETIMES_UNINITIALIZED}