mergegcc9

7 files changed, 7 insertions, 21 deletions

diff --git a/usr/src/lib/libdisasm/Makefile b/usr/src/lib/libdisasm/Makefile
index fbff822dc2..07daaf70f2 100644
--- a/usr/src/lib/libdisasm/Makefile
+++ b/usr/src/lib/libdisasm/Makefile
@@ -22,8 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.lib
 
@@ -33,15 +31,14 @@ HDRDIR=		common
 SUBDIRS= $(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
-all := 		TARGET = all
+all :=		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
 install	:=	TARGET = install
-lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
diff --git a/usr/src/lib/libdisasm/Makefile.com b/usr/src/lib/libdisasm/Makefile.com
index 543b8e08cd..2173e5bb2c 100644
--- a/usr/src/lib/libdisasm/Makefile.com
+++ b/usr/src/lib/libdisasm/Makefile.com
@@ -104,7 +104,7 @@ CLOBBERFILES_standalone = $(LINKTEST_OBJ)
 CLOBBERFILES += $(CLOBBERFILES_$(CURTYPE))
 
 LIBS_standalone	= $(STANDLIBRARY)
-LIBS_library = $(DYNLIB) $(LINTLIB)
+LIBS_library = $(DYNLIB)
 LIBS = $(LIBS_$(CURTYPE))
 
 MAPFILES =	$(COMDIR)/mapfile-vers
@@ -118,8 +118,6 @@ ASFLAGS_standalone = -DDIS_STANDALONE
 ASFLAGS_library =
 ASFLAGS += -P $(ASFLAGS_$(CURTYPE)) -D_ASM
 
-$(LINTLIB) := SRCS = $(COMDIR)/$(LINTSRC)
-
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	$(CNOWARN_UNINIT)
 
diff --git a/usr/src/lib/libdisasm/Makefile.targ b/usr/src/lib/libdisasm/Makefile.targ
index cdd938135f..21c89f507c 100644
--- a/usr/src/lib/libdisasm/Makefile.targ
+++ b/usr/src/lib/libdisasm/Makefile.targ
@@ -47,11 +47,6 @@ install.standalone.targ: all.standalone $(INSTALL_DEPS_standalone)
 all.library.targ: $(LIBS)
 all.standalone.targ: $(STANDLIBRARY)
 
-lint: $(TYPES:%=lint.%)
-
-$(TYPES:%=lint.%):
-	@$(MAKE) lintcheck CURTYPE=$(@:lint.%=%)
-
 $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ)
 	$(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ)
 	rm $@.linktest
@@ -83,10 +78,6 @@ objs/%.o pics/%.o: $(COMDIR)/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
 
-# install rule for lint library target
-$(ROOTLINTDIR)/%: $(COMDIR)/%
-	$(INS.file)
-
 # install rule for x86 common source
 objs/%.o pics/%.o: $(SRC)/common/dis/i386/%.c
 	$(COMPILE.c) -o $@ $<
diff --git a/usr/src/lib/libdisasm/amd64/Makefile b/usr/src/lib/libdisasm/amd64/Makefile
index 86dddcf5fa..3f3ad54381 100644
--- a/usr/src/lib/libdisasm/amd64/Makefile
+++ b/usr/src/lib/libdisasm/amd64/Makefile
@@ -30,7 +30,7 @@ include ../../Makefile.lib.64
 
 TYPES=library standalone
 
-INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64)
+INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64)
 INSTALL_DEPS_standalone = $(ROOTLIBS64)
 
 include ../Makefile.targ
diff --git a/usr/src/lib/libdisasm/i386/Makefile b/usr/src/lib/libdisasm/i386/Makefile
index 42cabb8143..9b38cfd3bc 100644
--- a/usr/src/lib/libdisasm/i386/Makefile
+++ b/usr/src/lib/libdisasm/i386/Makefile
@@ -29,7 +29,7 @@ include ../Makefile.com
 
 TYPES=library standalone
 
-INSTALL_DEPS_library =		$(ROOTLINKS) $(ROOTLINT) $(ROOTLIBS)
+INSTALL_DEPS_library =		$(ROOTLINKS) $(ROOTLIBS)
 INSTALL_DEPS_standalone =	$(ROOTLIBS)
 
 include ../Makefile.targ
diff --git a/usr/src/lib/libdisasm/sparc/Makefile b/usr/src/lib/libdisasm/sparc/Makefile
index a4e01c0419..a8c173f3a6 100644
--- a/usr/src/lib/libdisasm/sparc/Makefile
+++ b/usr/src/lib/libdisasm/sparc/Makefile
@@ -29,7 +29,7 @@ include ../Makefile.com
 
 TYPES=library standalone
 
-INSTALL_DEPS_library =		$(ROOTLINKS) $(ROOTLINT) $(ROOTLIBS)
+INSTALL_DEPS_library =		$(ROOTLINKS) $(ROOTLIBS)
 INSTALL_DEPS_standalone =	$(ROOTLIBS)
 
 include ../Makefile.targ
diff --git a/usr/src/lib/libdisasm/sparcv9/Makefile b/usr/src/lib/libdisasm/sparcv9/Makefile
index 72b4ee6a4a..b0ff2f074f 100644
--- a/usr/src/lib/libdisasm/sparcv9/Makefile
+++ b/usr/src/lib/libdisasm/sparcv9/Makefile
@@ -30,7 +30,7 @@ include ../../Makefile.lib.64
 
 TYPES=library standalone
 
-INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64)
+INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64)
 INSTALL_DEPS_standalone = $(ROOTLIBS64)
 
 include ../Makefile.targ