[src/trunk]: src Remove many HAVE_GCC || HAVE_PCC conditionals as the options...

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

details:   https://anonhg.NetBSD.org/src/rev/16e6f71a535b
branches:  trunk
changeset: 780872:16e6f71a535b
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 10 12:10:27 2012 +0000

description:
Remove many HAVE_GCC || HAVE_PCC conditionals as the options also apply
to Clang. Add a few cases of HAVE_LLVM for -fno-strict-aliasing.

diffstat:

 usr.bin/ctags/Makefile              |  8 +++-----
 usr.bin/telnet/Makefile             |  4 +---
 usr.bin/tr/Makefile                 |  8 +++-----
 usr.sbin/bootp/bootptest/Makefile   |  8 +++-----
 usr.sbin/dev_mkdb/Makefile          |  4 +++-
 usr.sbin/dhcp/Makefile.inc          |  4 ++--
 usr.sbin/dumplfs/Makefile           |  4 ++--
 usr.sbin/installboot/Makefile       |  4 +---
 usr.sbin/isdn/isdnd/Makefile        |  4 +---
 usr.sbin/isdn/isdnmonitor/Makefile  |  4 +---
 usr.sbin/isdn/isdntel/Makefile      |  4 +---
 usr.sbin/isdn/isdntrace/Makefile    |  4 +---
 usr.sbin/makefs/cd9660/Makefile.inc |  4 +---
 usr.sbin/mopd/common/Makefile       |  5 +----
 usr.sbin/mopd/mopd/Makefile         |  4 +---
 usr.sbin/mopd/mopprobe/Makefile     |  4 +---
 usr.sbin/mscdlabel/Makefile         |  4 +---
 usr.sbin/pppd/Makefile.inc          |  4 ++--
 usr.sbin/pppd/pppd/Makefile         |  4 +---
 usr.sbin/rarpd/Makefile             |  4 +---
 usr.sbin/rbootd/Makefile            |  4 ++--
 usr.sbin/rpc.pcnfsd/Makefile        |  4 +---
 usr.sbin/rtadvd/Makefile            |  4 ++--
 usr.sbin/wiconfig/Makefile          |  4 ++--
 24 files changed, 38 insertions(+), 71 deletions(-)

diffs (truncated from 431 to 300 lines):

diff -r b8716792a46a -r 16e6f71a535b usr.bin/ctags/Makefile
--- a/usr.bin/ctags/Makefile    Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.bin/ctags/Makefile    Fri Aug 10 12:10:27 2012 +0000
@@ -1,14 +1,12 @@
-#      $NetBSD: Makefile,v 1.12 2011/06/20 07:44:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.13 2012/08/10 12:10:27 joerg Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
 PROG=  ctags
 CPPFLAGS+=-I${.CURDIR}
 SRCS=  C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c
 
-.include <bsd.prog.mk>
-
 .if !defined(HOSTPROGNAME)
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.ctags.c+=        -Wno-pointer-sign
 .endif
-.endif
+
+.include <bsd.prog.mk>
diff -r b8716792a46a -r 16e6f71a535b usr.bin/telnet/Makefile
--- a/usr.bin/telnet/Makefile   Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.bin/telnet/Makefile   Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.49 2012/01/09 16:08:55 christos Exp $
+#      $NetBSD: Makefile,v 1.50 2012/08/10 12:10:27 joerg Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -80,10 +80,8 @@
 DPADD+=        ${LIBPAM} ${PAM_STATIC_DPADD}
 .endif
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 .for f in commands telnet terminal utilities
 COPTS.${f}.c+=  -Wno-pointer-sign
 .endfor
-.endif
 
 .include <bsd.prog.mk>
diff -r b8716792a46a -r 16e6f71a535b usr.bin/tr/Makefile
--- a/usr.bin/tr/Makefile       Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.bin/tr/Makefile       Fri Aug 10 12:10:27 2012 +0000
@@ -1,13 +1,11 @@
-#      $NetBSD: Makefile,v 1.7 2011/06/20 07:44:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2012/08/10 12:10:28 joerg Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
 PROG=  tr
 SRCS=  str.c tr.c
 
-.include <bsd.prog.mk>
-
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 .for f in str tr
 COPTS.${f}.c+=  -Wno-pointer-sign
 .endfor
-.endif
+
+.include <bsd.prog.mk>
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/bootp/bootptest/Makefile
--- a/usr.sbin/bootp/bootptest/Makefile Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/bootp/bootptest/Makefile Fri Aug 10 12:10:27 2012 +0000
@@ -1,11 +1,9 @@
-#      $NetBSD: Makefile,v 1.4 2011/06/20 07:44:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2012/08/10 12:10:28 joerg Exp $
 
 PROG=  bootptest
 SRCS=  bootptest.c print-bootp.c getether.c
 MAN=   bootptest.8
 
-.include <bsd.prog.mk>
+COPTS.print-bootp.c+=  -Wno-pointer-sign
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
-COPTS.print-bootp.c+=  -Wno-pointer-sign
-.endif
+.include <bsd.prog.mk>
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/dev_mkdb/Makefile
--- a/usr.sbin/dev_mkdb/Makefile        Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/dev_mkdb/Makefile        Fri Aug 10 12:10:27 2012 +0000
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      8.1 (Berkeley) 6/6/93
-#      $NetBSD: Makefile,v 1.8 2012/06/03 21:42:47 joerg Exp $
+#      $NetBSD: Makefile,v 1.9 2012/08/10 12:10:28 joerg Exp $
 
 PROG=  dev_mkdb
 MAN=   dev_mkdb.8
@@ -8,3 +8,5 @@
 DPADD+=        ${LIBUTIL}
 
 .include <bsd.prog.mk>
+
+LDFLAGS+=      -Wl,--no-fatal-warnings
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/dhcp/Makefile.inc
--- a/usr.sbin/dhcp/Makefile.inc        Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/dhcp/Makefile.inc        Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2011/08/09 13:04:28 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.27 2012/08/10 12:10:28 joerg Exp $
 
 WARNS?=        1       # XXX -Wshadow -Wcast-qual -Wsign-compare
 
@@ -17,7 +17,7 @@
 MROBJDIR!=cd $(.CURDIR)/../minires && ${PRINTOBJDIR}
 DSTOBJDIR!=cd $(.CURDIR)/../dst && ${PRINTOBJDIR}
 
-.if defined(HAVE_GCC)
+.if defined(HAVE_GCC) || defined(HAVE_LLVM)
 COPTS+=        -fno-strict-aliasing
 .endif
 
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/dumplfs/Makefile
--- a/usr.sbin/dumplfs/Makefile Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/dumplfs/Makefile Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2011/06/20 07:44:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2012/08/10 12:10:28 joerg Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 WARNS?=        3       # XXX -Wsign-compare
@@ -10,7 +10,7 @@
 .PATH: ${NETBSDSRCDIR}/sys/ufs/lfs
 MAN=   dumplfs.8
 
-.if defined(HAVE_GCC)
+.if defined(HAVE_GCC) || defined(HAVE_LLVM)
 COPTS+=        -fno-strict-aliasing
 .endif
 
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/installboot/Makefile
--- a/usr.sbin/installboot/Makefile     Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/installboot/Makefile     Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.46 2011/08/14 17:50:16 christos Exp $
+#      $NetBSD: Makefile,v 1.47 2012/08/10 12:10:28 joerg Exp $
 #
 
 .include <bsd.own.mk>
@@ -44,11 +44,9 @@
 .PATH:         ${.CURDIR}/arch ${UFSSRC}/ffs ${UFSSRC}/ext2fs
 
 .if !defined(HOSTPROGNAME)
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 .for f in i386 macppc
 COPTS.${f}.c+=  -Wno-pointer-sign
 .endfor
 .endif
-.endif
 
 .include <bsd.prog.mk>
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/isdn/isdnd/Makefile
--- a/usr.sbin/isdn/isdnd/Makefile      Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/isdn/isdnd/Makefile      Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2011/06/20 07:44:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2012/08/10 12:10:28 joerg Exp $
 
 PROG   =       isdnd
 SRCS   =       rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c  \
@@ -32,8 +32,6 @@
 .endif
 .endif
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.alias.c+=                -Wno-pointer-sign
 COPTS.holiday.c+=      -Wno-pointer-sign
 COPTS.monitor.c+=      -Wno-pointer-sign
-.endif
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/isdn/isdnmonitor/Makefile
--- a/usr.sbin/isdn/isdnmonitor/Makefile        Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/isdn/isdnmonitor/Makefile        Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2011/06/20 07:44:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2012/08/10 12:10:28 joerg Exp $
 
 PROG   =       isdnmonitor
 SRCS   =       main.c curses.c
@@ -10,6 +10,4 @@
 
 .include <bsd.prog.mk>
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.main.c+=         -Wno-pointer-sign
-.endif
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/isdn/isdntel/Makefile
--- a/usr.sbin/isdn/isdntel/Makefile    Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/isdn/isdntel/Makefile    Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2011/08/16 08:18:19 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2012/08/10 12:10:28 joerg Exp $
 
 PROG    =      isdntel
 SRCS    =      main.c display.c files.c alias.c
@@ -7,7 +7,5 @@
 
 .include <bsd.prog.mk>
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.alias.c+=                -Wno-pointer-sign
-.endif
 COPTS.files.c+=                -Wno-format-nonliteral
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/isdn/isdntrace/Makefile
--- a/usr.sbin/isdn/isdntrace/Makefile  Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/isdn/isdntrace/Makefile  Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/06/20 07:44:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2012/08/10 12:10:28 joerg Exp $
 
 PROG    =      isdntrace
 SRCS    =      q921.c q931.c q931_util.c q932_fac.c 1tr6.c trace.c \
@@ -7,7 +7,5 @@
 
 .include <bsd.prog.mk>
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.q932_fac.c+=             -Wno-pointer-sign
 COPTS.trace.c+=                        -Wno-pointer-sign
-.endif
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/makefs/cd9660/Makefile.inc
--- a/usr.sbin/makefs/cd9660/Makefile.inc       Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/makefs/cd9660/Makefile.inc       Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.2 2011/06/20 07:44:03 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2012/08/10 12:10:29 joerg Exp $
 #
 
 .PATH: ${.CURDIR}/cd9660 ${NETBSDSRCDIR}/sys/fs/cd9660
@@ -9,9 +9,7 @@
 SRCS+= cd9660_write.c cd9660_conversion.c iso9660_rrip.c cd9660_archimedes.c
 
 .if !defined(HOSTPROGNAME)
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 .for f in cd9660_debug cd9660_write
 COPTS.${f}.c+=  -Wno-pointer-sign
 .endfor
 .endif
-.endif
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/mopd/common/Makefile
--- a/usr.sbin/mopd/common/Makefile     Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/mopd/common/Makefile     Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2011/08/25 16:47:20 joerg Exp $
+#      $NetBSD: Makefile,v 1.19 2012/08/10 12:10:29 joerg Exp $
 
 LIBISPRIVATE=  yes
 
@@ -20,8 +20,5 @@
 
 .include <bsd.lib.mk>
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.print.c+=        -Wno-pointer-sign
-.endif
-
 COPTS.log.c+=  -Wno-format-nonliteral
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/mopd/mopd/Makefile
--- a/usr.sbin/mopd/mopd/Makefile       Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/mopd/mopd/Makefile       Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2011/06/20 07:44:03 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2012/08/10 12:10:29 joerg Exp $
 
 PROG=  mopd
 SRCS=  mopd.c process.c
@@ -9,6 +9,4 @@
 
 .include <bsd.prog.mk>
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.process.c+=      -Wno-pointer-sign
-.endif
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/mopd/mopprobe/Makefile
--- a/usr.sbin/mopd/mopprobe/Makefile   Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/mopd/mopprobe/Makefile   Fri Aug 10 12:10:27 2012 +0000
@@ -1,9 +1,7 @@
-#      $NetBSD: Makefile,v 1.9 2011/06/20 07:44:03 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2012/08/10 12:10:29 joerg Exp $
 
 PROG=  mopprobe
 
 .include <bsd.prog.mk>
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.mopprobe.c+=     -Wno-pointer-sign
-.endif
diff -r b8716792a46a -r 16e6f71a535b usr.sbin/mscdlabel/Makefile
--- a/usr.sbin/mscdlabel/Makefile       Fri Aug 10 11:32:32 2012 +0000
+++ b/usr.sbin/mscdlabel/Makefile       Fri Aug 10 12:10:27 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/06/20 07:44:03 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2012/08/10 12:10:29 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -15,8 +15,6 @@
 .PATH: ${DISKLABEL_SRC}
 CPPFLAGS+=     -I${DISKLABEL_SRC}