summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/src/cmd/mdb/sparc/v9/genunix/Makefile2
-rw-r--r--usr/src/lib/libdtrace/sparc/Makefile4
-rw-r--r--usr/src/lib/libdtrace/sparcv9/Makefile4
-rw-r--r--usr/src/lib/libm/common/Q/asinhl.c2
-rw-r--r--usr/src/lib/libm/common/Q/asinl.c2
-rw-r--r--usr/src/lib/libm/common/Q/tanhl.c2
-rw-r--r--usr/src/lib/libumem/sparc/umem_genasm.c9
-rw-r--r--usr/src/pkg/manifests/driver-network-bnxe.mf4
-rw-r--r--usr/src/uts/sparc/bnxe/Makefile2
-rw-r--r--usr/src/uts/sun4v/bge/Makefile2
10 files changed, 23 insertions, 10 deletions
diff --git a/usr/src/cmd/mdb/sparc/v9/genunix/Makefile b/usr/src/cmd/mdb/sparc/v9/genunix/Makefile
index 7eaef5c824..a9a8a60aa2 100644
--- a/usr/src/cmd/mdb/sparc/v9/genunix/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/genunix/Makefile
@@ -71,4 +71,6 @@ CERRWARN += -_gcc=-Wno-uninitialized
CERRWARN += -_gcc=-Wno-parentheses
CERRWARN += -_gcc=-Wno-type-limits
+LINTFLAGS64 += -erroff=E_EMPTY_TRANSLATION_UNIT
+
MODSRCS_DIR = ../../../sparc/modules/genunix
diff --git a/usr/src/lib/libdtrace/sparc/Makefile b/usr/src/lib/libdtrace/sparc/Makefile
index 99c63ef951..6065e14810 100644
--- a/usr/src/lib/libdtrace/sparc/Makefile
+++ b/usr/src/lib/libdtrace/sparc/Makefile
@@ -22,12 +22,12 @@
# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
ASFLAGS += -D_ASM -K PIC -P
include ../Makefile.com
+LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+
install yydebug: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
$(ROOTDLIBS) $(ROOTDOBJS)
diff --git a/usr/src/lib/libdtrace/sparcv9/Makefile b/usr/src/lib/libdtrace/sparcv9/Makefile
index 0e3892db51..a45f315e94 100644
--- a/usr/src/lib/libdtrace/sparcv9/Makefile
+++ b/usr/src/lib/libdtrace/sparcv9/Makefile
@@ -22,8 +22,6 @@
# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
ASFLAGS += -D_ASM -K PIC -P
@@ -32,5 +30,7 @@ include ../../Makefile.lib.64
CPPFLAGS += -D_ELF64
+LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN
+
install yydebug: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) \
$(ROOTDLIBS) $(ROOTDOBJS64)
diff --git a/usr/src/lib/libm/common/Q/asinhl.c b/usr/src/lib/libm/common/Q/asinhl.c
index e3dd9de026..fd6ea48b84 100644
--- a/usr/src/lib/libm/common/Q/asinhl.c
+++ b/usr/src/lib/libm/common/Q/asinhl.c
@@ -40,7 +40,9 @@ static const long double
long double
asinhl(long double x) {
long double t, w;
+#ifndef lint
volatile long double dummy;
+#endif
w = fabsl(x);
if (isnanl(x))
diff --git a/usr/src/lib/libm/common/Q/asinl.c b/usr/src/lib/libm/common/Q/asinl.c
index 620e477762..3c6c5366f1 100644
--- a/usr/src/lib/libm/common/Q/asinl.c
+++ b/usr/src/lib/libm/common/Q/asinl.c
@@ -51,7 +51,9 @@ static const long double big = 1.0e+20L;
long double
asinl(long double x) {
long double t, w;
+#ifndef lint
volatile long double dummy;
+#endif
w = fabsl(x);
if (isnanl(x))
diff --git a/usr/src/lib/libm/common/Q/tanhl.c b/usr/src/lib/libm/common/Q/tanhl.c
index 453adf3829..f5846d6bc3 100644
--- a/usr/src/lib/libm/common/Q/tanhl.c
+++ b/usr/src/lib/libm/common/Q/tanhl.c
@@ -70,7 +70,9 @@ long double
tanhl(long double x) {
long double t, y, z;
int signx;
+#ifndef lint
volatile long double dummy;
+#endif
if (isnanl(x))
return (x + x); /* x is NaN */
diff --git a/usr/src/lib/libumem/sparc/umem_genasm.c b/usr/src/lib/libumem/sparc/umem_genasm.c
index 4bdea8122d..202d642b0b 100644
--- a/usr/src/lib/libumem/sparc/umem_genasm.c
+++ b/usr/src/lib/libumem/sparc/umem_genasm.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright (c) 2012 Joyent, Inc. All rights reserved.
+ * Copyright (c) 2014 Joyent, Inc. All rights reserved.
*/
/*
@@ -28,11 +28,16 @@
* statement in lib/libumem/common/umem.c, particularly section eight.
*/
+#include <inttypes.h>
+#include <strings.h>
+#include <umem_impl.h>
+#include "umem_base.h"
+
const int umem_genasm_supported = 0;
/*ARGSUSED*/
int
-umem_genasm(int *cp, int nc)
+umem_genasm(int *alloc_sizes, umem_cache_t **caches, int ncaches)
{
return (1);
}
diff --git a/usr/src/pkg/manifests/driver-network-bnxe.mf b/usr/src/pkg/manifests/driver-network-bnxe.mf
index 6f57515a02..468211968d 100644
--- a/usr/src/pkg/manifests/driver-network-bnxe.mf
+++ b/usr/src/pkg/manifests/driver-network-bnxe.mf
@@ -35,7 +35,7 @@ set name=pkg.description \
set name=pkg.summary value="Broadcom NetXtreme II 10GbE NIC Driver"
set name=info.classification \
value=org.opensolaris.category.2008:Drivers/Networking
-set name=variant.arch value=i386
+set name=variant.arch value=$(ARCH)
dir path=kernel group=sys
dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
@@ -59,7 +59,7 @@ driver name=bnxe perms="* 0666 root sys" \
alias=pciex14e4,16ab \
alias=pciex14e4,16ae
file path=kernel/drv/$(ARCH64)/bnxe group=sys
-file path=kernel/drv/bnxe group=sys
+$(i386_ONLY)file path=kernel/drv/bnxe group=sys
file path=kernel/drv/bnxe.conf group=sys \
original_name=BRCMbnxe:kernel/drv/bnxe.conf preserve=renameold
file path=usr/share/man/man7d/bnxe.7d
diff --git a/usr/src/uts/sparc/bnxe/Makefile b/usr/src/uts/sparc/bnxe/Makefile
index ad1061e257..d8e2b3ac60 100644
--- a/usr/src/uts/sparc/bnxe/Makefile
+++ b/usr/src/uts/sparc/bnxe/Makefile
@@ -32,7 +32,7 @@ UTSBASE = ../..
#
MODULE = bnxe
OBJECTS = $(BNXE_OBJS:%=$(OBJS_DIR)/%)
-LINTS = $(BNXE_OBJS:%.o=$(LINTS_DIR)/%.ln)
+LINTS = $(LINTS_DIR)/bnxe_lint.ln
ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE)
SRCDIR = $(UTSBASE)/common/io/bnxe
CONF_SRCDIR = $(SRCDIR)
diff --git a/usr/src/uts/sun4v/bge/Makefile b/usr/src/uts/sun4v/bge/Makefile
index c36ac0dcab..a062204337 100644
--- a/usr/src/uts/sun4v/bge/Makefile
+++ b/usr/src/uts/sun4v/bge/Makefile
@@ -38,7 +38,7 @@ UTSBASE = ../..
#
MODULE = bge
OBJECTS = $(BGE_OBJS:%=$(OBJS_DIR)/%)
-LINTS = $(BGE_OBJS:%.o=$(LINTS_DIR)/%.ln)
+LINTS = $(LINTS_DIR)/bge_lint.ln
ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE)
CONF_SRCDIR = $(UTSBASE)/common/io/bge