[src/trunk]: src/external/mit/xorg Various warning adjustments for clang

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

details:   https://anonhg.NetBSD.org/src/rev/ac79a7b58704
branches:  trunk
changeset: 768213:ac79a7b58704
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Aug 11 23:15:35 2011 +0000

description:
Various warning adjustments for clang

diffstat:

 external/mit/xorg/bin/bitmap/Makefile                               |  4 +++-
 external/mit/xorg/bin/editres/Makefile                              |  4 +++-
 external/mit/xorg/bin/fonttosfnt/Makefile                           |  4 +++-
 external/mit/xorg/bin/twm/Makefile                                  |  4 +++-
 external/mit/xorg/bin/xedit/lisp/Makefile                           |  4 +++-
 external/mit/xorg/bin/xkbcomp/Makefile                              |  4 +++-
 external/mit/xorg/bin/xmh/Makefile                                  |  4 +++-
 external/mit/xorg/bin/xrandr/Makefile                               |  4 +++-
 external/mit/xorg/bin/xwininfo/Makefile                             |  4 +++-
 external/mit/xorg/lib/dri/i810/Makefile                             |  4 +++-
 external/mit/xorg/lib/dri/i915/Makefile                             |  4 +++-
 external/mit/xorg/lib/dri/i965/Makefile                             |  3 ++-
 external/mit/xorg/lib/dri/libmesa/Makefile                          |  4 +++-
 external/mit/xorg/lib/dri/mach64/Makefile                           |  4 +++-
 external/mit/xorg/lib/dri/mga/Makefile                              |  4 +++-
 external/mit/xorg/lib/dri/r128/Makefile                             |  3 ++-
 external/mit/xorg/lib/dri/r200/Makefile                             |  5 ++++-
 external/mit/xorg/lib/dri/r300/Makefile                             |  5 ++++-
 external/mit/xorg/lib/dri/r600/Makefile                             |  5 ++++-
 external/mit/xorg/lib/dri/radeon/Makefile                           |  5 ++++-
 external/mit/xorg/lib/dri/savage/Makefile                           |  4 +++-
 external/mit/xorg/lib/dri/sis/Makefile                              |  4 +++-
 external/mit/xorg/lib/dri/tdfx/Makefile                             |  4 +++-
 external/mit/xorg/lib/dri/unichrome/Makefile                        |  4 +++-
 external/mit/xorg/lib/fontconfig/src/Makefile                       |  4 +++-
 external/mit/xorg/lib/libGL/Makefile                                |  4 +++-
 external/mit/xorg/lib/libGLU/Makefile                               |  4 +++-
 external/mit/xorg/lib/libIntelXvMC/Makefile                         |  4 +++-
 external/mit/xorg/lib/libOSMesa/Makefile                            |  4 +++-
 external/mit/xorg/lib/libX11/dynamic/Makefile                       |  4 +++-
 external/mit/xorg/lib/libX11/static/Makefile                        |  4 +++-
 external/mit/xorg/lib/libX11/ximcp/Makefile                         |  4 +++-
 external/mit/xorg/lib/libXaw/Makefile                               |  4 +++-
 external/mit/xorg/lib/libXfont/Makefile                             |  4 +++-
 external/mit/xorg/lib/libXi/Makefile                                |  4 +++-
 external/mit/xorg/lib/libXrandr/Makefile                            |  4 +++-
 external/mit/xorg/lib/libXt/Makefile                                |  4 +++-
 external/mit/xorg/lib/libdrm/Makefile                               |  4 +++-
 external/mit/xorg/lib/libdrm_intel/Makefile                         |  4 +++-
 external/mit/xorg/lib/xcb-util/image/Makefile                       |  4 +++-
 external/mit/xorg/lib/xcb-util/render-util/Makefile                 |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-ast/Makefile            |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-glint/Makefile          |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-intel/Makefile          |  5 ++++-
 external/mit/xorg/server/drivers/xf86-video-mach64/Makefile         |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-mga/Makefile            |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile     |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-r128/Makefile           |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-s3/Makefile             |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile        |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-savage/Makefile         |  5 ++++-
 external/mit/xorg/server/drivers/xf86-video-sis/Makefile            |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile           |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-trident/Makefile        |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-tseng/Makefile          |  4 +++-
 external/mit/xorg/server/xorg-server/Xi/Makefile                    |  4 +++-
 external/mit/xorg/server/xorg-server/dix/Makefile                   |  4 +++-
 external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile        |  4 +++-
 external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile      |  4 +++-
 external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile |  4 +++-
 external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile  |  4 +++-
 61 files changed, 187 insertions(+), 61 deletions(-)

diffs (truncated from 1013 to 300 lines):

diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/bin/bitmap/Makefile
--- a/external/mit/xorg/bin/bitmap/Makefile     Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/bin/bitmap/Makefile     Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2010/11/21 02:33:40 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/08/11 23:15:35 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,6 +20,8 @@
 
 .PATH: ${X11SRCDIR.bitmap}
 
+CWARNFLAGS.clang+=     -Wno-format
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/bin/editres/Makefile
--- a/external/mit/xorg/bin/editres/Makefile    Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/bin/editres/Makefile    Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2011/08/11 23:15:35 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -14,5 +14,7 @@
 
 .PATH: ${X11SRCDIR.${PROG}}
 
+CWARNFLAGS.clang+=     -Wno-format
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/bin/fonttosfnt/Makefile
--- a/external/mit/xorg/bin/fonttosfnt/Makefile Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/bin/fonttosfnt/Makefile Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2011/08/11 23:15:35 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -18,5 +18,7 @@
 
 .PATH: ${X11SRCDIR.${PROG}}
 
+CWARNFLAGS.clang+=     -Wno-format
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/bin/twm/Makefile
--- a/external/mit/xorg/bin/twm/Makefile        Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/bin/twm/Makefile        Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2010/11/21 02:33:41 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2011/08/11 23:15:35 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -44,5 +44,7 @@
 
 .PATH: ${TWMDIR}/src ${TWMDIR}/man
 
+CWARNFLAGS.clang+=     -Wno-pointer-sign
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/bin/xedit/lisp/Makefile
--- a/external/mit/xorg/bin/xedit/lisp/Makefile Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/bin/xedit/lisp/Makefile Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2011/03/18 10:50:36 plunky Exp $
+#      $NetBSD: Makefile,v 1.3 2011/08/11 23:15:35 joerg Exp $
 
 MKPRIVATELIB=  yes
 
@@ -23,5 +23,7 @@
 
 .PATH:         ${X11SRCDIR.xedit}/lisp
 
+CWARNFLAGS.clang+=     -Wno-format
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/bin/xkbcomp/Makefile
--- a/external/mit/xorg/bin/xkbcomp/Makefile    Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/bin/xkbcomp/Makefile    Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2011/07/30 11:18:23 tron Exp $
+#      $NetBSD: Makefile,v 1.9 2011/08/11 23:15:35 joerg Exp $
 
 .include <bsd.own.mk>
 .include "Makefile.common"
@@ -27,5 +27,7 @@
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+CWARNFLAGS.clang+=     -Wno-parentheses
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/bin/xmh/Makefile
--- a/external/mit/xorg/bin/xmh/Makefile        Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/bin/xmh/Makefile        Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2010/11/20 23:47:30 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2011/08/11 23:15:36 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,5 +20,7 @@
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
 
+CWARNFLAGS.clang+=     -Wno-format
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/bin/xrandr/Makefile
--- a/external/mit/xorg/bin/xrandr/Makefile     Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/bin/xrandr/Makefile     Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/07/23 06:06:41 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2011/08/11 23:15:36 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,5 +11,7 @@
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
+CWARNFLAGS.clang+=     -Wno-parentheses
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/bin/xwininfo/Makefile
--- a/external/mit/xorg/bin/xwininfo/Makefile   Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/bin/xwininfo/Makefile   Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/07/23 07:11:49 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2011/08/11 23:15:36 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -13,5 +13,7 @@
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXext -lX11 -lxcb -lxcb-shape
 DPADD+=        ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXCB} ${LIBXCB_SHAPE}
 
+CWARNFLAGS.clang+=     -Wno-tautological-compare
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/lib/dri/i810/Makefile
--- a/external/mit/xorg/lib/dri/i810/Makefile   Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/lib/dri/i810/Makefile   Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:45 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:36 joerg Exp $
 
 MODULE=        i810
 
@@ -6,4 +6,6 @@
        i810state.c i810tex.c i810texmem.c i810texstate.c i810tris.c \
        i810vb.c
 
+CWARNFLAGS.clang+=     -Wno-constant-logical-operand
+
 .include "${.CURDIR}/../dri.mk"
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/lib/dri/i915/Makefile
--- a/external/mit/xorg/lib/dri/i915/Makefile   Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/lib/dri/i915/Makefile   Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/07/19 05:34:24 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2011/08/11 23:15:36 joerg Exp $
 
 MODULE=        i915
 
@@ -58,5 +58,7 @@
 
 COPTS.intel_context.c+=        -Wno-error      # XXX
 COPTS.intel_tex.c+=    -Wno-error      # XXX
+CWARNFLAGS.clang+=     -Wno-tautological-compare -Wno-format \
+                       -Wno-constant-logical-operand
 
 .include "${.CURDIR}/../dri.mk"
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/lib/dri/i965/Makefile
--- a/external/mit/xorg/lib/dri/i965/Makefile   Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/lib/dri/i965/Makefile   Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/07/19 05:34:24 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2011/08/11 23:15:36 joerg Exp $
 
 MODULE=        i965
 
@@ -102,6 +102,7 @@
        gen6_wm_state.c
 
 COPTS.brw_draw_upload.c=       -Wno-error
+CWARNFLAGS.clang+=     -Wno-format
 
 LIBDPLIBS+=    drm_intel       ${.CURDIR}/../../libdrm_intel
 
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/lib/dri/libmesa/Makefile
--- a/external/mit/xorg/lib/dri/libmesa/Makefile        Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/lib/dri/libmesa/Makefile        Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2010/07/19 05:34:24 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2011/08/11 23:15:36 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -35,4 +35,6 @@
 
 #LIBDPLIBS+=   GL      ${.CURDIR}/../../libGL
 
+CWARNFLAGS.clang+=     -Wno-format
+
 .include <bsd.lib.mk>
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/lib/dri/mach64/Makefile
--- a/external/mit/xorg/lib/dri/mach64/Makefile Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/lib/dri/mach64/Makefile Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:45 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:36 joerg Exp $
 
 MODULE=        mach64
 
@@ -6,4 +6,6 @@
        mach64_state.c mach64_tex.c mach64_texmem.c mach64_texstate.c \
        mach64_tris.c mach64_vb.c mach64_dd.c mach64_lock.c
 
+CWARNFLAGS.clang+=     -Wno-constant-logical-operand
+
 .include "${.CURDIR}/../dri.mk"
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/lib/dri/mga/Makefile
--- a/external/mit/xorg/lib/dri/mga/Makefile    Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/lib/dri/mga/Makefile    Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:45 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:36 joerg Exp $
 
 MODULE=        mga
 
@@ -6,4 +6,6 @@
        mgaspan.c mgatex.c mgatexmem.c mga_texstate.c mga_texcombine.c \
        mgavb.c mga_xmesa.c
 
+CWARNFLAGS.clang+=     -Wno-constant-logical-operand
+
 .include "${.CURDIR}/../dri.mk"
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/lib/dri/r128/Makefile
--- a/external/mit/xorg/lib/dri/r128/Makefile   Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/lib/dri/r128/Makefile   Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/11 01:47:08 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:37 joerg Exp $
 
 MODULE=        r128
 
@@ -7,5 +7,6 @@
        r128_texmem.c
 
 COPTS.r128_span.c=  -Wno-error # XXX const
+CWARNFLAGS.clang+=     -Wno-constant-logical-operand
 
 .include "${.CURDIR}/../dri.mk"
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/lib/dri/r200/Makefile
--- a/external/mit/xorg/lib/dri/r200/Makefile   Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/lib/dri/r200/Makefile   Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:24 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:37 joerg Exp $
 
 MODULE=        r200
 
@@ -55,4 +55,7 @@
 
 COPTS.radeon_screen.c=  -Wno-error     # XXX const
 
+CWARNFLAGS.clang+=     -Wno-format -Wno-constant-logical-operand \
+                       -Wno-empty-body
+
 .include "${.CURDIR}/../dri.mk"
diff -r 5cfdef36a691 -r ac79a7b58704 external/mit/xorg/lib/dri/r300/Makefile
--- a/external/mit/xorg/lib/dri/r300/Makefile   Thu Aug 11 23:04:43 2011 +0000
+++ b/external/mit/xorg/lib/dri/r300/Makefile   Thu Aug 11 23:15:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:25 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:37 joerg Exp $
 
 MODULE=        r300
 
@@ -87,4 +87,7 @@
 # uses C99 variable decl scoping
 CFLAGS+=       -std=c99        
 
+CWARNFLAGS.clang+=     -Wno-empty-body -Wno-format -Wno-constant-conversion \
+                       -Wno-constant-logical-operand