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.
This commit is contained in:
joerg 2012-08-10 12:10:27 +00:00
parent 1e6fdc8162
commit 9edf9a0457
24 changed files with 38 additions and 71 deletions

View File

@ -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>

View File

@ -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 @@ LDADD+= -lpam ${PAM_STATIC_LDADD}
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>

View File

@ -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>

View File

@ -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>
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.print-bootp.c+= -Wno-pointer-sign
.endif
.include <bsd.prog.mk>

View File

@ -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 @@ LDADD+= -lutil
DPADD+= ${LIBUTIL}
.include <bsd.prog.mk>
LDFLAGS+= -Wl,--no-fatal-warnings

View File

@ -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 @@ OMOBJDIR!=cd $(.CURDIR)/../omapip && ${PRINTOBJDIR}
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

View File

@ -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 @@ SRCS= dumplfs.c lfs_cksum.c misc.c
.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs
MAN= dumplfs.8
.if defined(HAVE_GCC)
.if defined(HAVE_GCC) || defined(HAVE_LLVM)
COPTS+= -fno-strict-aliasing
.endif

View File

@ -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 @@ CPPFLAGS+= -I${.CURDIR} -I.
.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>

View File

@ -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 @@ CPPFLAGS+= -DI4B_NOTCPIP_MONITOR
.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

View File

@ -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 @@ MAN = isdnmonitor.8
.include <bsd.prog.mk>
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.main.c+= -Wno-pointer-sign
.endif

View File

@ -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 @@ MAN = isdntel.8
.include <bsd.prog.mk>
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.alias.c+= -Wno-pointer-sign
.endif
COPTS.files.c+= -Wno-format-nonliteral

View File

@ -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 @@ MAN = isdntrace.8
.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

View File

@ -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_strings.c cd9660_debug.c cd9660_eltorito.c
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

View File

@ -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 @@ version.c: VERSION
.include <bsd.lib.mk>
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.print.c+= -Wno-pointer-sign
.endif
COPTS.log.c+= -Wno-format-nonliteral

View File

@ -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 @@ DPADD+= ${LIBUTIL}
.include <bsd.prog.mk>
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.process.c+= -Wno-pointer-sign
.endif

View File

@ -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

View File

@ -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 @@ DISKLABEL_SRC= ${NETBSDSRCDIR}/sbin/disklabel
.PATH: ${DISKLABEL_SRC}
CPPFLAGS+= -I${DISKLABEL_SRC}
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.iso9660.c+= -Wno-pointer-sign
.endif
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.7 2011/06/20 07:44:03 mrg Exp $
# $NetBSD: Makefile.inc,v 1.8 2012/08/10 12:10:29 joerg Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@ -10,6 +10,6 @@ USE_FORT?=yes # network client/server
.include <bsd.own.mk>
.if defined(HAVE_GCC)
.if defined(HAVE_GCC) || defined(HAVE_LLVM)
COPTS+= -fno-strict-aliasing
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.41 2011/06/20 07:44:03 mrg Exp $
# $NetBSD: Makefile,v 1.42 2012/08/10 12:10:29 joerg Exp $
.include <bsd.own.mk>
@ -33,11 +33,9 @@ DPADD+=${LIBPAM} ${PAM_STATIC_DPADD}
LDADD+= -lpcap -lcrypt -lutil -Wl,--export-dynamic
DPADD+= ${LIBPCAP} ${LIBCRYPT} ${LIBUTIL}
.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in chap-md5 chap_ms eap
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
.endif
CWARNFLAGS.clang+= -Wno-tautological-compare

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2011/06/20 07:44:03 mrg Exp $
# $NetBSD: Makefile,v 1.14 2012/08/10 12:10:29 joerg Exp $
USE_FORT?= yes # network server
@ -16,6 +16,4 @@ DPADD+= ${LIBUTIL}
.include <bsd.prog.mk>
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.mkarp.c+= -Wno-pointer-sign
.endif

View File

@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
# $NetBSD: Makefile,v 1.13 2011/06/20 07:44:03 mrg Exp $
# $NetBSD: Makefile,v 1.14 2012/08/10 12:10:29 joerg Exp $
USE_FORT?= yes # network server
@ -12,7 +12,7 @@ DPADD+= ${LIBUTIL}
.include <bsd.own.mk>
.if defined(HAVE_GCC)
.if defined(HAVE_GCC) || defined(HAVE_LLVM)
COPTS.utils.c+= -fno-strict-aliasing
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.22 2011/06/20 07:44:04 mrg Exp $
# $NetBSD: Makefile,v 1.23 2012/08/10 12:10:30 joerg Exp $
.include <bsd.own.mk>
@ -24,10 +24,8 @@ RPC_SVCFILES= pcnfsd_svc.c
RPC_SVCCLASS= udp tcp
RPC_SVCFLAGS= -I
.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.pcnfsd_v1.c+= -Wno-pointer-sign
COPTS.pcnfsd_v2.c+= -Wno-pointer-sign
.endif
.include <bsd.rpc.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 2011/12/10 19:14:29 roy Exp $
# $NetBSD: Makefile,v 1.17 2012/08/10 12:10:30 joerg Exp $
WARNS?= 4
@ -21,6 +21,6 @@ FILES= rtadvd.conf
.include <bsd.prog.mk>
.if defined(HAVE_GCC)
.if defined(HAVE_GCC) || defined(HAVE_LLVM)
COPTS.dump.c=-fno-strict-aliasing
.endif

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.5 2011/06/20 07:44:04 mrg Exp $
# $NetBSD: Makefile,v 1.6 2012/08/10 12:10:30 joerg Exp $
PROG= wiconfig
MAN= wiconfig.8
.include <bsd.prog.mk>
.if defined(HAVE_GCC)
.if defined(HAVE_GCC) || defined(HAVE_LLVM)
COPTS+= -fno-strict-aliasing
.endif