[src/trunk]: src/external/mit/xorg/server/drivers More clang -Werror avoidance

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d09d7c79d19
branches:  trunk
changeset: 347542:8d09d7c79d19
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Sep 02 04:49:48 2016 +0000

description:
More clang -Werror avoidance

diffstat:

 external/mit/xorg/server/drivers/xf86-video-s3/Makefile            |  3 ++-
 external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile |  3 ++-
 external/mit/xorg/server/drivers/xf86-video-sis/Makefile           |  5 ++++-
 external/mit/xorg/server/drivers/xf86-video-tseng/Makefile         |  3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diffs (67 lines):

diff -r 4f28da5e6a7f -r 8d09d7c79d19 external/mit/xorg/server/drivers/xf86-video-s3/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-s3/Makefile   Fri Sep 02 04:27:13 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-s3/Makefile   Fri Sep 02 04:49:48 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2016/08/20 06:49:21 mrg Exp $
+#      $NetBSD: Makefile,v 1.16 2016/09/02 04:49:48 jakllsch Exp $
 
 DRIVER=                xf86-video-s3
 DRIVER_NAME=   s3_drv
@@ -23,6 +23,7 @@
 
 # XXX xf86PciInfo.h
 COPTS+=                ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
+COPTS+=                ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
 
 CWARNFLAGS.clang+=     -Wno-parentheses
 
diff -r 4f28da5e6a7f -r 8d09d7c79d19 external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile        Fri Sep 02 04:27:13 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile        Fri Sep 02 04:49:48 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2016/08/21 18:23:58 joerg Exp $
+#      $NetBSD: Makefile,v 1.11 2016/09/02 04:49:48 jakllsch Exp $
 
 DRIVER=                xf86-video-siliconmotion
 DRIVER_NAME=   siliconmotion_drv
@@ -17,6 +17,7 @@
 .if ${HAVE_GCC:U0} > 48
 COPTS.smi_video.c+=    ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 .endif
+COPTS.smi_video.c+=    ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
 
 XORG_PKG_VER_PROG=     ${DRIVER}
 .include "../../../xorg-pkg-ver.mk"
diff -r 4f28da5e6a7f -r 8d09d7c79d19 external/mit/xorg/server/drivers/xf86-video-sis/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile  Fri Sep 02 04:27:13 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile  Fri Sep 02 04:49:48 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2016/08/21 18:23:58 joerg Exp $
+#      $NetBSD: Makefile,v 1.15 2016/09/02 04:49:48 jakllsch Exp $
 
 DRIVER=                xf86-video-sis
 DRIVER_NAME=   sis_drv
@@ -28,3 +28,6 @@
 COPTS.sis_utility.c+=  ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 COPTS.initextx.c+=     ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 .endif
+COPTS.sis_driver.c+=   ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+COPTS.sis_utility.c+=  ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+COPTS.initextx.c+=     ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
diff -r 4f28da5e6a7f -r 8d09d7c79d19 external/mit/xorg/server/drivers/xf86-video-tseng/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile        Fri Sep 02 04:27:13 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile        Fri Sep 02 04:49:48 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2016/08/20 06:49:21 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2016/09/02 04:49:48 jakllsch Exp $
 
 DRIVER=                xf86-video-tseng
 DRIVER_NAME=   tseng_drv
@@ -10,6 +10,7 @@
 CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/../include
 
 COPTS+=                ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
+COPTS+=                ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
 
 CWARNFLAGS.clang+=     -Wno-pointer-sign