last fixes hopefullysmatch

8 files changed, 29 insertions, 1 deletions

diff --git a/usr/src/cmd/mdb/intel/amd64/ip/Makefile b/usr/src/cmd/mdb/intel/amd64/ip/Makefile
index 5112aeaac0..f7ebb0c677 100644
--- a/usr/src/cmd/mdb/intel/amd64/ip/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/ip/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE = ip.so
 MDBTGT = kvm
@@ -34,3 +35,6 @@ include ../../Makefile.amd64
 include ../../../Makefile.module
 
 CPPFLAGS += -I$(SRC)/uts/common/inet
+
+# needs work
+SMOFF += shift_to_zero
diff --git a/usr/src/lib/iconv_modules/hi_IN/Makefile.com b/usr/src/lib/iconv_modules/hi_IN/Makefile.com
index ced4ae69a5..2a1d4996f4 100644
--- a/usr/src/lib/iconv_modules/hi_IN/Makefile.com
+++ b/usr/src/lib/iconv_modules/hi_IN/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SRCS	=	iscii91%UTF-8.c \
 		UTF-8%iscii91.c \
@@ -36,4 +37,7 @@ include $(SRC)/lib/iconv_modules/Makefile.iconv
 
 CFLAGS += -I../include
 
+# needs work
+SMOFF += index_overflow
+
 all: $(PROGS)
diff --git a/usr/src/lib/iconv_modules/ja/Makefile.com b/usr/src/lib/iconv_modules/ja/Makefile.com
index bf8a026394..a7e10f6fed 100644
--- a/usr/src/lib/iconv_modules/ja/Makefile.com
+++ b/usr/src/lib/iconv_modules/ja/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/Makefile.master
 
@@ -34,6 +35,9 @@ LIB64 = $(MODULES:%.c=$(MACH64)/%.so)
 
 LDLIBS=	-lc
 
+# needs work
+SMATCH=off
+
 INSTALL_MODULES = .modules_installed
 CLEANFILES += $(INSTALL_MODULES)
 
diff --git a/usr/src/lib/iconv_modules/ko/Makefile.com b/usr/src/lib/iconv_modules/ko/Makefile.com
index 252771e423..25ae7bb98e 100644
--- a/usr/src/lib/iconv_modules/ko/Makefile.com
+++ b/usr/src/lib/iconv_modules/ko/Makefile.com
@@ -22,6 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 
 include $(SRC)/lib/iconv_modules/Makefile.iconv
 
@@ -92,6 +94,9 @@ ALL_SOS   = $(E2I) $(I2E) $(E2J92) $(J922E) $(E2J) $(J2E) $(E2NB) $(NB2E) \
 LDFLAGS = $(DYNFLAGS) $(LDLIBS) $(CFLAG_OPT)
 CFLAGS += -I$(ICONV_COMMON) -I../inc
 
+# needs work
+SMATCH=off
+
 LINK_TARGETS = $(U2UH) $(C9332U) $(UH2U) $(E2U) $(I2U) $(O2U) $(N2U) \
 	$(E2I) $(E2J) $(E2J92) $(E2NB) $(I2E) $(J2E) $(J922E) $(NVBE) \
 	$(UCS2BE2UH) $(U2LE2UH) $(U2C933) $(U2E) $(U2I) $(U2O) $(U2N) \
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile.com b/usr/src/lib/iconv_modules/utf-8/Makefile.com
index f674e3a392..2136e0ea66 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile.com
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/Makefile.master
 
@@ -75,6 +76,9 @@ LDLIBS			= -lc
 
 LDFLAGS = $(DYNFLAGS) $(LDLIBS) $(CFLAG_OPT)
 
+# needs work
+SMATCH=off
+
 $(DYNOBJS)		:= CFLAGS += $(XREGSFLAG) $(C_PICFLAGS) -D_REENTRANT \
 					-I$(COMMON) -I$(COMMON)/tbls \
 					-I$(ADJUNCT_PROTO)/usr/include
diff --git a/usr/src/lib/iconv_modules/vi/Makefile.com b/usr/src/lib/iconv_modules/vi/Makefile.com
index 3c773932e6..c3d8d12904 100644
--- a/usr/src/lib/iconv_modules/vi/Makefile.com
+++ b/usr/src/lib/iconv_modules/vi/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SRCS		=	tcvn%UCS-2.c \
             tcvn%UTF-8.c \
@@ -38,6 +39,9 @@ COMMON = ../common/
 LINK_TARGETS  = UCS-2BE%tcvn.so tcvn%UCS-2BE.so
 LINK_TARGETS += UCS-2BE%viscii.so viscii%UCS-2BE.so
 
+# needs work
+SMOFF += all_func_returns,deref_check
+
 dummy: all
 
 tcvn%UCS-2LE.o: $(COMMON)tcvn%UCS-2.c
diff --git a/usr/src/lib/iconv_modules/zh/Makefile.com b/usr/src/lib/iconv_modules/zh/Makefile.com
index 65523522fd..741b71d069 100644
--- a/usr/src/lib/iconv_modules/zh/Makefile.com
+++ b/usr/src/lib/iconv_modules/zh/Makefile.com
@@ -22,9 +22,13 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LDFLAGS	=	$(DYNFLAGS) $(LDLIBS)
 
+# needs work
+SMATCH=off
+
 COMMON = ../common/
 
 ICONV_COMMON  = ../../common/
diff --git a/usr/src/uts/intel/ip/Makefile b/usr/src/uts/intel/ip/Makefile
index 4b2cf81964..db2647e0a3 100644
--- a/usr/src/uts/intel/ip/Makefile
+++ b/usr/src/uts/intel/ip/Makefile
@@ -74,7 +74,6 @@ SMOFF += index_overflow
 
 # need work still
 $(OBJS_DIR)/igmp.o := SMOFF += shift_to_zero
-$(OBJS_DIR)/ip.o := SMOFF += shift_to_zero
 $(OBJS_DIR)/tnet.o := SMOFF += shift_to_zero
 SMOFF += signed,all_func_returns
 SMOFF += signed_integer_overflow_check