mergegcc9

7 files changed, 13 insertions, 25 deletions

diff --git a/usr/src/lib/libm/Makefile b/usr/src/lib/libm/Makefile
index 99e533aca2..ede79030eb 100644
--- a/usr/src/lib/libm/Makefile
+++ b/usr/src/lib/libm/Makefile
@@ -19,20 +19,19 @@ VERS=		.2
 # include common library definitions
 include $(SRC)/lib/Makefile.lib
 
-SUBDIRS 	= $(MACH)
+SUBDIRS		= $(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all	:=	TARGET= all
 install	:=	TARGET= install
 clean	:=	TARGET= clean
 clobber	:=	TARGET= clobber
-lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
 .PARALLEL: $(SUBDIRS)
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libm/Makefile.com b/usr/src/lib/libm/Makefile.com
index 804d12f1e2..217d7a360a 100644
--- a/usr/src/lib/libm/Makefile.com
+++ b/usr/src/lib/libm/Makefile.com
@@ -390,7 +390,7 @@ ROBJS		= \
 # LSARC/2003/658 adds isnanf/isnanl
 #
 
-SOBJS_sparc 	= \
+SOBJS_sparc	= \
 		copysign.o \
 		exp.o \
 		fabs.o \
@@ -496,20 +496,11 @@ complexOBJS	= \
 OBJECTS		= $(COBJS) $(ROBJS) $(QOBJS) $(SOBJS) $(m9xOBJS) $(complexOBJS)
 
 include		$(SRC)/lib/Makefile.lib
-include 	$(LIBMDIR)/Makefile.libm.com
+include		$(LIBMDIR)/Makefile.libm.com
 include		$(SRC)/lib/Makefile.rootfs
 
 SRCDIR		= ../common/
-LIBS		= $(DYNLIB) $(LINTLIB)
-
-LINTERROFF	= -erroff=E_FUNC_SET_NOT_USED
-LINTERROFF	+= -erroff=E_FUNC_RET_ALWAYS_IGNOR2
-LINTERROFF	+= -erroff=E_FUNC_RET_MAYBE_IGNORED2
-LINTERROFF	+= -erroff=E_IMPL_CONV_RETURN
-LINTERROFF	+= -erroff=E_NAME_MULTIPLY_DEF2
-LINTFLAGS	+= $(LINTERROFF)
-LINTFLAGS64	+= $(LINTERROFF)
-LINTFLAGS64	+= -errchk=longptr64
+LIBS		= $(DYNLIB)
 
 CFLAGS		+= $(C_BIGPICFLAGS)
 CFLAGS64	+= $(C_BIGPICFLAGS)
@@ -928,7 +919,7 @@ SRCS_C_sparc = \
 	../common/C/sincos.c \
 	../common/C/tan.c
 
-SRCS_i386_i386 	= \
+SRCS_i386_i386	= \
 	../common/C/__libx_errno.c
 
 SRCS_sparc_sparc = \
@@ -1023,5 +1014,4 @@ SRCS	= \
 
 all:	$(LIBS)
 
-lint:	lintcheck
 
diff --git a/usr/src/lib/libm/Makefile.libm.com b/usr/src/lib/libm/Makefile.libm.com
index dc7a353d97..5d404bd423 100644
--- a/usr/src/lib/libm/Makefile.libm.com
+++ b/usr/src/lib/libm/Makefile.libm.com
@@ -68,11 +68,10 @@ CFLAGS64	+= -_gcc=-fno-strict-overflow
 CFLAGS		+= -_smatch=off
 CFLAGS64	+= -_smatch=off
 
-$(DYNLIB) 	:= LDLIBS += -lc
+$(DYNLIB)	:= LDLIBS += -lc
 
-$(LINTLIB) 	:= SRCS = $(LIBMSRC)/$(LINTSRC)
 
-CLEANFILES 	+= pics/*.s pics/*.S
+CLEANFILES	+= pics/*.s pics/*.S
 
 FPDEF_amd64	= -DARCH_amd64
 FPDEF_sparc	= -DCG89 -DARCH_v8plus -DFPADD_TRAPS_INCOMPLETE_ON_NAN
@@ -89,7 +88,7 @@ XARCH		= $(XARCH_$(TARGET_ARCH))
 
 ASOPT_sparc	= -xarch=$(XARCH) $(AS_PICFLAGS)
 ASOPT_sparcv9	= -xarch=$(XARCH) $(AS_PICFLAGS)
-ASOPT_i386	= 
+ASOPT_i386	=
 ASOPT_amd64	= -xarch=$(XARCH) $(AS_PICFLAGS)
 ASOPT		= $(ASOPT_$(TARGET_ARCH))
 
diff --git a/usr/src/lib/libm/amd64/Makefile b/usr/src/lib/libm/amd64/Makefile
index c67cf5c91d..2e245b6732 100644
--- a/usr/src/lib/libm/amd64/Makefile
+++ b/usr/src/lib/libm/amd64/Makefile
@@ -17,6 +17,6 @@ TARGET_ARCH=	amd64
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include ../Makefile.targ
diff --git a/usr/src/lib/libm/i386/Makefile b/usr/src/lib/libm/i386/Makefile
index 0a710fb63a..89754fc049 100644
--- a/usr/src/lib/libm/i386/Makefile
+++ b/usr/src/lib/libm/i386/Makefile
@@ -23,6 +23,6 @@ include ../Makefile.com
 CFLAGS		+= -_gcc=-ffloat-store
 $(OBJS_M9XSSE)	:= CFLAGS += -xarch=sse2
 
-install: 	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
 
 include ../Makefile.targ
diff --git a/usr/src/lib/libm/sparc/Makefile b/usr/src/lib/libm/sparc/Makefile
index ddb6f2cc98..5c5fc318b8 100644
--- a/usr/src/lib/libm/sparc/Makefile
+++ b/usr/src/lib/libm/sparc/Makefile
@@ -18,6 +18,6 @@ include ../Makefile.com
 
 CHIP		= ultra
 
-install: 	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
 
 include ../Makefile.targ
diff --git a/usr/src/lib/libm/sparcv9/Makefile b/usr/src/lib/libm/sparcv9/Makefile
index 91181acd63..ec82c4d735 100644
--- a/usr/src/lib/libm/sparcv9/Makefile
+++ b/usr/src/lib/libm/sparcv9/Makefile
@@ -20,6 +20,6 @@ include $(SRC)/lib/Makefile.lib.64
 
 CHIP		= ultra
 
-install: 	all $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include ../Makefile.targ