Index: sys/sys/vdso.h
===================================================================
--- sys/sys/vdso.h	(revision 275815)
+++ sys/sys/vdso.h	(working copy)
@@ -60,9 +60,13 @@
 struct timeval;
 struct timezone;
 
+#pragma weak __vdso_clock_gettime
 int __vdso_clock_gettime(clockid_t clock_id, struct timespec *ts);
+#pragma weak __vdso_gettimeofday
 int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz);
+#pragma weak __vdso_gettc
 u_int __vdso_gettc(const struct vdso_timehands *vdso_th);
+#pragma weak __vdso_gettimekeep
 int __vdso_gettimekeep(struct vdso_timekeep **tk);
 
 #endif
Index: lib/libc/db/btree/Makefile.inc
===================================================================
--- lib/libc/db/btree/Makefile.inc	(revision 275815)
+++ lib/libc/db/btree/Makefile.inc	(working copy)
@@ -6,3 +6,5 @@
 SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
 	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \
 	bt_utils.c
+
+CFLAGS.bt_split.c=	-fno-strict-aliasing
Index: lib/libc/db/btree/bt_split.c
===================================================================
--- lib/libc/db/btree/bt_split.c	(revision 275815)
+++ lib/libc/db/btree/bt_split.c	(working copy)
@@ -237,7 +237,7 @@
 			    rchild->pgno, bl->flags & P_BIGKEY);
 			memmove(dest, bl->bytes, nksize ? nksize : bl->ksize);
 			if (bl->flags & P_BIGKEY &&
-			    bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
+			    bt_preserve(t, *((pgno_t *)(void *)bl->bytes)) == RET_ERROR)
 				goto err1;
 			break;
 		case P_RINTERNAL:
@@ -545,7 +545,7 @@
 		 * so it isn't deleted when the leaf copy of the key is deleted.
 		 */
 		if (bl->flags & P_BIGKEY &&
-		    bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
+		    bt_preserve(t, *(pgno_t *)(void *)bl->bytes) == RET_ERROR)
 			return (RET_ERROR);
 		break;
 	case P_BINTERNAL:
Index: lib/libc/db/recno/Makefile.inc
===================================================================
--- lib/libc/db/recno/Makefile.inc	(revision 275815)
+++ lib/libc/db/recno/Makefile.inc	(working copy)
@@ -5,3 +5,5 @@
 
 SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
 	rec_seq.c rec_utils.c
+
+CFLAGS.rec_put.c=	-fno-strict-aliasing
Index: lib/libc/gen/dlfcn.c
===================================================================
--- lib/libc/gen/dlfcn.c	(revision 275815)
+++ lib/libc/gen/dlfcn.c	(working copy)
@@ -149,10 +149,8 @@
 dl_init_phdr_info(void)
 {
 	Elf_Auxinfo *auxp;
-	size_t phent;
 	unsigned int i;
 
-	phent = 0;
 	for (auxp = __elf_aux_vector; auxp->a_type != AT_NULL; auxp++) {
 		switch (auxp->a_type) {
 		case AT_BASE:
@@ -165,9 +163,6 @@
 			phdr_info.dlpi_phdr =
 			    (const Elf_Phdr *)auxp->a_un.a_ptr;
 			break;
-		case AT_PHENT:
-			phent = auxp->a_un.a_val;
-			break;
 		case AT_PHNUM:
 			phdr_info.dlpi_phnum = (Elf_Half)auxp->a_un.a_val;
 			break;
Index: lib/libc/gen/getgrent.c
===================================================================
--- lib/libc/gen/getgrent.c	(revision 275815)
+++ lib/libc/gen/getgrent.c	(working copy)
@@ -207,11 +207,7 @@
 grp_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	gid_t gid;
 	struct group *grp;
-	char *orig_buf;
-	size_t orig_buf_size;
 
 	struct group new_grp;
 	size_t desired_size, size, mem_size;
@@ -219,10 +215,10 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
+		va_arg(ap, gid_t);
 		break;
 	case nss_lt_all:
 		break;
@@ -232,8 +228,8 @@
 	}
 
 	grp = va_arg(ap, struct group *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
+	va_arg(ap, char *);
+	va_arg(ap, size_t);
 
 	desired_size = _ALIGNBYTES + sizeof(struct group) + sizeof(char *);
 
@@ -302,8 +298,6 @@
 grp_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	gid_t gid;
 	struct group *grp;
 	char *orig_buf;
 	size_t orig_buf_size;
@@ -314,10 +308,10 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
+		va_arg(ap, gid_t);
 		break;
 	case nss_lt_all:
 		break;
@@ -659,7 +653,6 @@
 		NS_FALLBACK_CB(getgroupmembership_fallback)
 		{ NULL, NULL, NULL }
 	};
-	int rv;
 
 	assert(uname != NULL);
 	/* groups may be NULL if just sizing when invoked with maxgrp = 0 */
@@ -666,7 +659,7 @@
 	assert(grpcnt != NULL);
 
 	*grpcnt = 0;
-	rv = _nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership",
+	_nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership",
 	    defaultsrc, uname, agroup, groups, maxgrp, grpcnt);
 
 	/* too many groups found? */
Index: lib/libc/gen/getpwent.c
===================================================================
--- lib/libc/gen/getpwent.c	(revision 275815)
+++ lib/libc/gen/getpwent.c	(working copy)
@@ -257,11 +257,7 @@
 pwd_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uid_t uid;
 	struct passwd *pwd;
-	char *orig_buf;
-	size_t orig_buf_size;
 
 	struct passwd new_pwd;
 	size_t desired_size, size;
@@ -269,10 +265,10 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
+		va_arg(ap, uid_t);
 		break;
 	case nss_lt_all:
 		break;
@@ -282,8 +278,8 @@
 	}
 
 	pwd = va_arg(ap, struct passwd *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
+	va_arg(ap, char *);
+	va_arg(ap, size_t);
 
 	desired_size = sizeof(struct passwd) + sizeof(char *) +
 	    strlen(pwd->pw_name) + 1;
@@ -361,8 +357,6 @@
 pwd_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uid_t uid;
 	struct passwd *pwd;
 	char *orig_buf;
 	size_t orig_buf_size;
@@ -372,10 +366,10 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
+		va_arg(ap, uid_t);
 		break;
 	case nss_lt_all:
 		break;
Index: lib/libc/iconv/citrus_prop.c
===================================================================
--- lib/libc/iconv/citrus_prop.c	(revision 275815)
+++ lib/libc/iconv/citrus_prop.c	(working copy)
@@ -109,14 +109,12 @@
 _citrus_prop_read_##_func_(struct _memstream * __restrict ms,	\
     _citrus_prop_object_t * __restrict obj)			\
 {								\
-	int base, ch, neg;					\
+	int base, ch;						\
 								\
 	_memstream_skip_ws(ms);					\
 	ch = _memstream_getc(ms);				\
-	neg = 0;						\
 	switch (ch) {						\
 	case '-':						\
-		neg = 1;					\
 	case '+':						\
 		ch = _memstream_getc(ms);			\
 	}							\
Index: lib/libc/net/gethostnamadr.c
===================================================================
--- lib/libc/net/gethostnamadr.c	(revision 275815)
+++ lib/libc/net/gethostnamadr.c	(working copy)
@@ -263,10 +263,6 @@
 host_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *str;
-	void *addr;
-	socklen_t len;
-	int type;
 	struct hostent *ht;
 
 	struct hostent new_ht;
@@ -275,13 +271,13 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		str = va_arg(ap, char *);
-		type = va_arg(ap, int);
+		va_arg(ap, char *);
+		va_arg(ap, int);
 		break;
 	case nss_lt_id:
-		addr = va_arg(ap, void *);
-		len = va_arg(ap, socklen_t);
-		type = va_arg(ap, int);
+		va_arg(ap, void *);
+		va_arg(ap, socklen_t);
+		va_arg(ap, int);
 		break;
 	default:
 		/* should be unreachable */
@@ -369,10 +365,6 @@
 host_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *str;
-	void *addr;
-	socklen_t len;
-	int type;
 	struct hostent *ht;
 
 	char *p;
@@ -382,13 +374,13 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		str = va_arg(ap, char *);
-		type = va_arg(ap, int);
+		va_arg(ap, char *);
+		va_arg(ap, int);
 		break;
 	case nss_lt_id:
-		addr = va_arg(ap, void *);
-		len = va_arg(ap, socklen_t);
-		type = va_arg(ap, int);
+		va_arg(ap, void *);
+		va_arg(ap, socklen_t);
+		va_arg(ap, int);
 		break;
 	default:
 		/* should be unreachable */
Index: lib/libc/net/getnetnamadr.c
===================================================================
--- lib/libc/net/getnetnamadr.c	(revision 275815)
+++ lib/libc/net/getnetnamadr.c	(working copy)
@@ -126,12 +126,7 @@
 net_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uint32_t net;
-	int type;
 	struct netent *ne;
-	char *orig_buf;
-	size_t orig_buf_size;
 
 	struct netent new_ne;
 	size_t desired_size, size, aliases_size;
@@ -140,11 +135,11 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		net = va_arg(ap, uint32_t);
-		type = va_arg(ap, int);
+		va_arg(ap, uint32_t);
+		va_arg(ap, int);
 	break;
 	case nss_lt_all:
 		break;
@@ -154,8 +149,8 @@
 	}
 
 	ne = va_arg(ap, struct netent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
+	va_arg(ap, char *);
+	va_arg(ap, size_t);
 
 	desired_size = _ALIGNBYTES + sizeof(struct netent) + sizeof(char *);
 	if (ne->n_name != NULL)
@@ -215,9 +210,6 @@
 net_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uint32_t net;
-	int type;
 	struct netent *ne;
 	char *orig_buf;
 	size_t orig_buf_size;
@@ -228,11 +220,11 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		net = va_arg(ap, uint32_t);
-		type = va_arg(ap, int);
+		va_arg(ap, uint32_t);
+		va_arg(ap, int);
 		break;
 	case nss_lt_all:
 		break;
Index: lib/libc/net/getprotoent.c
===================================================================
--- lib/libc/net/getprotoent.c	(revision 275815)
+++ lib/libc/net/getprotoent.c	(working copy)
@@ -143,11 +143,7 @@
 __proto_marshal_func(char *buffer, size_t *buffer_size, void *retval,
     va_list ap, void *cache_mdata)
 {
-	char *name;
-	int num;
 	struct protoent *proto;
-	char *orig_buf;
-	size_t orig_buf_size;
 
 	struct protoent new_proto;
 	size_t desired_size, size, aliases_size;
@@ -156,10 +152,10 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		num = va_arg(ap, int);
+		va_arg(ap, int);
 		break;
 	case nss_lt_all:
 		break;
@@ -169,8 +165,8 @@
 	}
 
 	proto = va_arg(ap, struct protoent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
+	va_arg(ap, char *);
+	va_arg(ap, size_t);
 
 	desired_size = _ALIGNBYTES + sizeof(struct protoent) + sizeof(char *);
 	if (proto->p_name != NULL)
@@ -230,8 +226,6 @@
 __proto_unmarshal_func(char *buffer, size_t buffer_size, void *retval,
     va_list ap, void *cache_mdata)
 {
-	char *name;
-	int num;
 	struct protoent *proto;
 	char *orig_buf;
 	size_t orig_buf_size;
@@ -242,10 +236,10 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		num = va_arg(ap, int);
+		va_arg(ap, int);
 		break;
 	case nss_lt_all:
 		break;
Index: lib/libc/net/getservent.c
===================================================================
--- lib/libc/net/getservent.c	(revision 275815)
+++ lib/libc/net/getservent.c	(working copy)
@@ -939,12 +939,7 @@
 serv_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	char *proto;
-	int port;
 	struct servent *serv;
-	char *orig_buf;
-	size_t orig_buf_size;
 
 	struct servent new_serv;
 	size_t desired_size;
@@ -955,12 +950,12 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
-		proto = va_arg(ap, char *);
+		va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		port = va_arg(ap, int);
-		proto = va_arg(ap, char *);
+		va_arg(ap, int);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_all:
 		break;
@@ -970,8 +965,8 @@
 	}
 
 	serv = va_arg(ap, struct servent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
+	va_arg(ap, char *);
+	va_arg(ap, size_t);
 
 	desired_size = _ALIGNBYTES + sizeof(struct servent) + sizeof(char *);
 	if (serv->s_name != NULL)
@@ -1040,9 +1035,6 @@
 serv_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	char *proto;
-	int port;
 	struct servent *serv;
 	char *orig_buf;
 	char *p;
@@ -1052,12 +1044,12 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
-		proto = va_arg(ap, char *);
+		va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		port = va_arg(ap, int);
-		proto = va_arg(ap, char *);
+		va_arg(ap, int);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_all:
 		break;
Index: lib/libc/net/nscachedcli.c
===================================================================
--- lib/libc/net/nscachedcli.c	(revision 275815)
+++ lib/libc/net/nscachedcli.c	(working copy)
@@ -145,7 +145,6 @@
 	struct kevent eventlist;
 	int nevents;
 	ssize_t result;
-	int res;
 
 	struct msghdr cred_hdr;
 	struct iovec iov;
@@ -171,7 +170,7 @@
 
 	EV_SET(&eventlist, connection->sockfd, EVFILT_WRITE, EV_ADD,
 	    NOTE_LOWAT, sizeof(int), NULL);
-	res = _kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL);
+	_kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL);
 
 	nevents = _kevent(connection->write_queue, NULL, 0, &eventlist, 1,
 	    NULL);
@@ -225,13 +224,13 @@
 	assert(retval->write_queue != -1);
 
 	EV_SET(&eventlist, retval->sockfd, EVFILT_WRITE, EV_ADD, 0, 0, NULL);
-	res = _kevent(retval->write_queue, &eventlist, 1, NULL, 0, NULL);
+	_kevent(retval->write_queue, &eventlist, 1, NULL, 0, NULL);
 
 	retval->read_queue = kqueue();
 	assert(retval->read_queue != -1);
 
 	EV_SET(&eventlist, retval->sockfd, EVFILT_READ, EV_ADD, 0, 0, NULL);
-	res = _kevent(retval->read_queue, &eventlist, 1, NULL, 0, NULL);
+	_kevent(retval->read_queue, &eventlist, 1, NULL, 0, NULL);
 
 	return (retval);
 }
@@ -474,10 +473,9 @@
 __close_cached_mp_write_session(struct cached_connection_ *ws)
 {
 	int notification;
-	int result;
 
 	notification = CET_MP_WRITE_SESSION_CLOSE_NOTIFICATION;
-	result = safe_write(ws, &notification, sizeof(int));
+	safe_write(ws, &notification, sizeof(int));
 	__close_cached_connection(ws);
 	return (0);
 }
Index: lib/libc/posix1e/acl_delete_entry.c
===================================================================
--- lib/libc/posix1e/acl_delete_entry.c	(revision 275815)
+++ lib/libc/posix1e/acl_delete_entry.c	(working copy)
@@ -74,7 +74,6 @@
 int
 acl_delete_entry(acl_t acl, acl_entry_t entry_d)
 {
-	struct acl *acl_int;
 	struct acl_entry entry_int;
 	int i, j, found = 0;
 
@@ -83,8 +82,6 @@
 		return (-1);
 	}
 
-	acl_int = &acl->ats_acl;
-
 	if (_entry_brand(entry_d) != _acl_brand(acl)) {
 		errno = EINVAL;
 		return (-1);
Index: lib/libc/regex/engine.c
===================================================================
--- lib/libc/regex/engine.c	(revision 275815)
+++ lib/libc/regex/engine.c	(working copy)
@@ -385,7 +385,9 @@
 	const char *ssp;	/* start of string matched by subsubRE */
 	const char *sep;	/* end of string matched by subsubRE */
 	const char *oldssp;	/* previous ssp */
+#ifndef NDEBUG
 	const char *dp;
+#endif
 
 	AT("diss", start, stop, startst, stopst);
 	sp = start;
@@ -444,8 +446,12 @@
 			esub = es - 1;
 			/* did innards match? */
 			if (slow(m, sp, rest, ssub, esub) != NULL) {
+#ifndef NDEBUG
 				dp = dissect(m, sp, rest, ssub, esub);
 				assert(dp == rest);
+#else
+				dissect(m, sp, rest, ssub, esub);
+#endif
 			} else		/* no */
 				assert(sp == rest);
 			sp = rest;
@@ -482,8 +488,12 @@
 			}
 			assert(sep == rest);	/* must exhaust substring */
 			assert(slow(m, ssp, sep, ssub, esub) == rest);
+#ifndef	NDEBUG
 			dp = dissect(m, ssp, sep, ssub, esub);
 			assert(dp == sep);
+#else
+			dissect(m, ssp, sep, ssub, esub);
+#endif
 			sp = rest;
 			break;
 		case OCH_:
@@ -517,8 +527,12 @@
 				else
 					assert(OP(m->g->strip[esub]) == O_CH);
 			}
+#ifndef NDEBUG
 			dp = dissect(m, sp, rest, ssub, esub);
 			assert(dp == rest);
+#else
+			dissect(m, sp, rest, ssub, esub);
+#endif
 			sp = rest;
 			break;
 		case O_PLUS:
Index: lib/libc/resolv/Makefile.inc
===================================================================
--- lib/libc/resolv/Makefile.inc	(revision 275815)
+++ lib/libc/resolv/Makefile.inc	(working copy)
@@ -10,3 +10,4 @@
 SYM_MAPS+= ${LIBC_SRCTOP}/resolv/Symbol.map
 
 CFLAGS+=-I${LIBC_SRCTOP}/../libmd
+CFLAGS.res_update.c=	-fno-strict-aliasing
Index: lib/libc/rpc/Makefile.inc
===================================================================
--- lib/libc/rpc/Makefile.inc	(revision 275815)
+++ lib/libc/rpc/Makefile.inc	(working copy)
@@ -30,6 +30,8 @@
 
 CFLAGS+= -DBROKEN_DES -DPORTMAP -DDES_BUILTIN
 CFLAGS+= -I${LIBC_SRCTOP}/rpc
+CFLAGS.clnt_vc.c=	-fno-strict-aliasing
+CFLAGS.clnt_dg.c=	-fno-strict-aliasing
 
 CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h
 
Index: lib/libc/rpc/clnt_dg.c
===================================================================
--- lib/libc/rpc/clnt_dg.c	(revision 275815)
+++ lib/libc/rpc/clnt_dg.c	(working copy)
@@ -327,7 +327,7 @@
 	struct sockaddr *sa;
 	sigset_t mask;
 	sigset_t newmask;
-	socklen_t inlen, salen;
+	socklen_t salen;
 	ssize_t recvlen = 0;
 	int kin_len, n, rpc_lock_value;
 	u_int32_t xid;
@@ -520,7 +520,6 @@
 				goto call_again_same_xid;
 		}
 	}
-	inlen = (socklen_t)recvlen;
 
 	/*
 	 * now decode and validate the response
Index: lib/libc/rpc/getrpcent.c
===================================================================
--- lib/libc/rpc/getrpcent.c	(revision 275815)
+++ lib/libc/rpc/getrpcent.c	(working copy)
@@ -646,11 +646,7 @@
 rpc_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	int num;
 	struct rpcent *rpc;
-	char *orig_buf;
-	size_t orig_buf_size;
 
 	struct rpcent new_rpc;
 	size_t desired_size, size, aliases_size;
@@ -659,10 +655,10 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		num = va_arg(ap, int);
+		va_arg(ap, int);
 		break;
 	case nss_lt_all:
 		break;
@@ -672,8 +668,8 @@
 	}
 
 	rpc = va_arg(ap, struct rpcent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
+	va_arg(ap, char *);
+	va_arg(ap, size_t);
 
 	desired_size = _ALIGNBYTES + sizeof(struct rpcent) + sizeof(char *);
 	if (rpc->r_name != NULL)
@@ -733,8 +729,6 @@
 rpc_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	int num;
 	struct rpcent *rpc;
 	char *orig_buf;
 	size_t orig_buf_size;
@@ -745,10 +739,10 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
+		va_arg(ap, char *);
 		break;
 	case nss_lt_id:
-		num = va_arg(ap, int);
+		va_arg(ap, int);
 		break;
 	case nss_lt_all:
 		break;
Index: lib/libc/rpc/rpc_soc.c
===================================================================
--- lib/libc/rpc/rpc_soc.c	(revision 275815)
+++ lib/libc/rpc/rpc_soc.c	(working copy)
@@ -462,12 +462,10 @@
 	u_int recvsz;
 {
 	struct netbuf *svcaddr;
-	struct netconfig *nconf;
 	CLIENT *cl;
 	int len;
 
 	cl = NULL;
-	nconf = NULL;
 	svcaddr = NULL;
 	if ((raddr->sun_len == 0) ||
 	   ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) ||
Index: lib/libc/stdio/vfwscanf.c
===================================================================
--- lib/libc/stdio/vfwscanf.c	(revision 275815)
+++ lib/libc/stdio/vfwscanf.c	(working copy)
@@ -266,7 +266,6 @@
 static __inline int
 convert_wstring(FILE *fp, wchar_t *wcp, int width, locale_t locale)
 {
-	wchar_t *wcp0;
 	wint_t wi;
 	int nread;
 
@@ -278,7 +277,6 @@
 		if (wi != WEOF)
 			__ungetwc(wi, fp, locale);
 	} else {
-		wcp0 = wcp;
 		while ((wi = __fgetwc(fp, locale)) != WEOF &&
 		    width-- != 0 && !iswspace(wi)) {
 			*wcp++ = (wchar_t)wi;
Index: lib/libc/stdio/xprintf_float.c
===================================================================
--- lib/libc/stdio/xprintf_float.c	(revision 275815)
+++ lib/libc/stdio/xprintf_float.c	(working copy)
@@ -168,7 +168,6 @@
 	int realsz;		/* field size expanded by dprec, sign, etc */
 	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
 	char ox[2];		/* space for 0x; ox[1] is either x, X, or \0 */
-	int prsize;             /* max size of printed field */
 	int ret;		/* return value accumulator */
 	char *decimal_point;	/* locale specific decimal point */
 	int n2;			/* XXX: for PRINTANDPAD */
@@ -344,8 +343,6 @@
 	if (ox[1])
 		realsz += 2;
 
-	prsize = pi->width > realsz ? pi->width : realsz;
-
 	/* right-adjusting blank padding */
 	if (pi->pad != '0' && pi->left == 0)
 		ret += __printf_pad(io, pi->width - realsz, 0);
Index: lib/libc/yp/Makefile.inc
===================================================================
--- lib/libc/yp/Makefile.inc	(revision 275815)
+++ lib/libc/yp/Makefile.inc	(working copy)
@@ -6,6 +6,7 @@
 
 SRCS+=	xdryp.c yp.h yp_xdr.c yplib.c
 CLEANFILES+=	yp.h yp_xdr.c
+CFLAGS.yplib.c=	-fno-strict-aliasing
 
 SYM_MAPS+=	${LIBC_SRCTOP}/yp/Symbol.map