From 86533d64cac6ddc3090dad528af3f26e2a04a612 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Thu, 11 May 2006 09:08:09 +0000
Subject: [PATCH] sprinkle some -fno-strict-aliasing with GCC4.

---
 usr.sbin/amd/amd/Makefile    | 6 +++++-
 usr.sbin/amd/amq/Makefile    | 7 ++++++-
 usr.sbin/amd/libamu/Makefile | 7 ++++++-
 usr.sbin/amd/pawd/Makefile   | 6 +++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 3a3194056a49..5269cd34c0c5 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.26 2005/04/23 18:41:43 christos Exp $
+#	$NetBSD: Makefile,v 1.27 2006/05/11 09:08:09 mrg Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -28,6 +28,10 @@ SRCS+=	info_hesiod.c
 SRCS+=	info_nis.c
 .endif
 
+.if ${HAVE_GCC} == 4
+COPTS.amq_subr.c+=	-fno-strict-aliasing
+.endif
+
 # the following are not supported on NetBSD
 #	info_ldap.c info_nisplus.c ops_cachefs.c ops_efs.c ops_lofs.c ops_xfs.c
 MAN+=	amd.8
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 068f518f4fea..c4587b5734c6 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2000/11/20 00:25:01 wiz Exp $
+#	$NetBSD: Makefile,v 1.14 2006/05/11 09:08:09 mrg Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -13,4 +13,9 @@ MAN+=	amq.8
 CPPFLAGS+=	-I${DIST}
 LDADD+=		${LIBAMU}
 
+.if ${HAVE_GCC} == 4
+COPTS.amq_xdr.c+=	-fno-strict-aliasing
+COPTS.amq.c+=		-fno-strict-aliasing
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index 25fed81e7a95..f30abcb86166 100644
--- a/usr.sbin/amd/libamu/Makefile
+++ b/usr.sbin/amd/libamu/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2006/02/05 16:29:00 christos Exp $
+#	$NetBSD: Makefile,v 1.20 2006/05/11 09:08:09 mrg Exp $
 
 NOLINKLIB=	# defined
 
@@ -15,6 +15,11 @@ SRCS=	hasmntopt.c misc_rpc.c mount_fs.c mtab.c mtab_bsd.c \
 	nfs_prot_xdr.c strutil.c transp_sockets.c ualarm.c umount_bsd44.c \
 	wire.c xdr_func.c xutil.c
 
+# XXX
+.if ${HAVE_GCC} == 4
+COPTS.xdr_func.c+=	-fno-strict-aliasing
+.endif
+
 # some host specific compile time settings amd wants to have compiled in
 config_local.h: mkconf
 	${_MKTARGET_CREATE}
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
index d93249613c22..c757644caff3 100644
--- a/usr.sbin/amd/pawd/Makefile
+++ b/usr.sbin/amd/pawd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2000/11/20 00:25:29 wiz Exp $
+#	$NetBSD: Makefile,v 1.5 2006/05/11 09:08:09 mrg Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -15,4 +15,8 @@ MAN+=	pawd.1
 CPPFLAGS+=	-I${DIST}
 LDADD+=		${LIBAMU}
 
+.if ${HAVE_GCC} == 4
+COPTS.amq_xdr.c+=	-fno-strict-aliasing
+.endif
+
 .include <bsd.prog.mk>