4698 fix builds by gcc44 on sparc

Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@omniti.com>

5 files changed, 13 insertions, 9 deletions

diff --git a/usr/src/cmd/mdb/common/modules/libumem/libumem.c b/usr/src/cmd/mdb/common/modules/libumem/libumem.c
index 0984edbdf0..d7beeb356d 100644
--- a/usr/src/cmd/mdb/common/modules/libumem/libumem.c
+++ b/usr/src/cmd/mdb/common/modules/libumem/libumem.c
@@ -39,7 +39,6 @@
 #include <umem_impl.h>
 #include <sys/vmem_impl_user.h>
 #include <thr_uberdata.h>
-#include <stdio.h>
 
 #include "umem_pagesize.h"
 
@@ -160,7 +159,8 @@ umastat_lwp_cache(uintptr_t addr, const umem_cache_t *cp, ulwp_t *ulwp)
 	if (!(cp->cache_flags & UMF_PTC))
 		return (WALK_NEXT);
 
-	(void) snprintf(walk, sizeof (walk), "umem_ptc_%d", cp->cache_bufsize);
+	(void) mdb_snprintf(walk, sizeof (walk), "umem_ptc_%d",
+	    cp->cache_bufsize);
 
 	if (mdb_pwalk(walk, (mdb_walk_cb_t)umastat_lwp_ptc,
 	    &nbufs, (uintptr_t)ulwp->ul_self) == -1) {
@@ -239,7 +239,7 @@ umastat_cache(uintptr_t addr, const umem_cache_t *cp, umastat_vmem_t **kvp)
 	if (cp->cache_flags & UMF_PTC) {
 		char walk[60];
 
-		(void) snprintf(walk, sizeof (walk),
+		(void) mdb_snprintf(walk, sizeof (walk),
 		    "umem_ptc_%d", cp->cache_bufsize);
 
 		if (mdb_walk(walk,
@@ -248,7 +248,7 @@ umastat_cache(uintptr_t addr, const umem_cache_t *cp, umastat_vmem_t **kvp)
 			return (WALK_ERR);
 		}
 
-		(void) snprintf(buf, sizeof (buf), "%d", nptc);
+		(void) mdb_snprintf(buf, sizeof (buf), "%d", nptc);
 	}
 
 	for (kv = *kvp; kv != NULL; kv = kv->kv_next) {
diff --git a/usr/src/cmd/mdb/common/modules/libumem/umem.c b/usr/src/cmd/mdb/common/modules/libumem/umem.c
index 73dd4d6e89..250a090b12 100644
--- a/usr/src/cmd/mdb/common/modules/libumem/umem.c
+++ b/usr/src/cmd/mdb/common/modules/libumem/umem.c
@@ -37,7 +37,6 @@
 #include <limits.h>
 #include <mdb/mdb_whatis.h>
 #include <thr_uberdata.h>
-#include <stdio.h>
 
 #include "misc.h"
 #include "leaky.h"
@@ -1040,7 +1039,8 @@ umem_read_ptc(umem_cache_t *cp,
 	if (!(cp->cache_flags & UMF_PTC))
 		return (0);
 
-	(void) snprintf(walk, sizeof (walk), "umem_ptc_%d", cp->cache_bufsize);
+	(void) mdb_snprintf(walk, sizeof (walk), "umem_ptc_%d",
+	    cp->cache_bufsize);
 
 	urpw.urpw_buf = *buflistp;
 	urpw.urpw_cnt = *bufcntp;
diff --git a/usr/src/uts/common/fs/zfs/lz4.c b/usr/src/uts/common/fs/zfs/lz4.c
index cc73a4eb8c..40cb0711e0 100644
--- a/usr/src/uts/common/fs/zfs/lz4.c
+++ b/usr/src/uts/common/fs/zfs/lz4.c
@@ -237,7 +237,9 @@ lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
 #define	LZ4_FORCE_UNALIGNED_ACCESS 1
 #endif
 
-/* #define	LZ4_FORCE_SW_BITCOUNT */
+#ifdef __sparc
+#define	LZ4_FORCE_SW_BITCOUNT
+#endif
 
 /*
  * Compiler Options
diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc
index 600e8f07ee..5a1639a692 100644
--- a/usr/src/uts/sparc/Makefile.sparc
+++ b/usr/src/uts/sparc/Makefile.sparc
@@ -219,6 +219,7 @@ DRV_KMODS	+= spdsock
 DRV_KMODS	+= tcp tcp6 tl tnf ttymux udp udp6 wc winlock zcons
 DRV_KMODS	+= ippctl
 DRV_KMODS	+= dld
+DRV_KMODS	+= ipd
 DRV_KMODS	+= ipf
 DRV_KMODS	+= rpcib
 DRV_KMODS	+= dlpistub
diff --git a/usr/src/uts/sparc/ipd/Makefile b/usr/src/uts/sparc/ipd/Makefile
index 27a0b6b79c..9239c97203 100644
--- a/usr/src/uts/sparc/ipd/Makefile
+++ b/usr/src/uts/sparc/ipd/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2012 Joyent, Inc.  All rights reserved.
+# Copyright (c) 2014 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Use is subject to license terms.
 #
 
@@ -22,7 +23,7 @@ LINTS		= $(IPD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/inet/ipd
 
-include $(UTSBASE)/intel/Makefile.intel
+include $(UTSBASE)/sparc/Makefile.sparc
 
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
 LINT_TARGET	= $(MODULE).lint
@@ -48,4 +49,4 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 
 install:	$(INSTALL_DEPS)
 
-include $(UTSBASE)/intel/Makefile.targ
+include $(UTSBASE)/sparc/Makefile.targ