diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2019-01-25 10:31:50 +0000 |
|---|---|---|
| committer | Hans Rosenfeld <hans.rosenfeld@joyent.com> | 2019-01-31 23:04:30 +0100 |
| commit | cf9a187ca73bc899270af62ab1cd99f2e205cf41 (patch) | |
| tree | 90cd9daf10114d0bb8d563364ed5051d0e560415 /usr | |
| parent | 29a77b73a1e7f5d2b94fed029b676b4eba33440b (diff) | |
| download | illumos-joyent-cf9a187ca73bc899270af62ab1cd99f2e205cf41.tar.gz | |
10293 usr/cmd/sgs - remove lint and lint libraries
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Approved by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
Diffstat (limited to 'usr')
220 files changed, 424 insertions, 3756 deletions
diff --git a/usr/src/Makefile.lint b/usr/src/Makefile.lint index 295d86054f..0f3406f3df 100644 --- a/usr/src/Makefile.lint +++ b/usr/src/Makefile.lint @@ -24,6 +24,7 @@ # Copyright (c) 2012 by Delphix. All rights reserved. # Copyright 2015 Garrett D'Amore <garrett@damore.org> # Copyright 2018 Nexenta Systems, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # include global definitions @@ -268,7 +269,6 @@ COMMON_SUBDIRS = \ cmd/sed \ cmd/setpgrp \ cmd/smbios \ - cmd/sgs \ cmd/smbsrv \ cmd/smserverd \ cmd/sort \ diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index b3705b47c9..d306eaeae2 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -28,7 +28,7 @@ # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> # Copyright 2016 Nexenta Systems, Inc. # Copyright 2017 RackTop Systems. -# Copyright 2018 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # @@ -690,9 +690,7 @@ $(ROOT)/usr/ccs/lib/values-Xt.o:= REALPATH=../../lib/values-Xt.o $(ROOT)/usr/ccs/lib/values-xpg4.o:= REALPATH=../../lib/values-xpg4.o $(ROOT)/usr/ccs/lib/values-xpg6.o:= REALPATH=../../lib/values-xpg6.o $(ROOT)/usr/ccs/lib/libl.so:= REALPATH=../../lib/libl.so.1 -$(ROOT)/usr/ccs/lib/llib-ll.ln:= REALPATH=../../lib/llib-ll.ln $(ROOT)/usr/ccs/lib/liby.so:= REALPATH=../../lib/liby.so.1 -$(ROOT)/usr/ccs/lib/llib-ly.ln:= REALPATH=../../lib/llib-ly.ln $(ROOT)/usr/lib/lwp/libthread.so.1:= REALPATH=../libthread.so.1 $(ROOT)/usr/lib/lwp/libthread_db.so.1:= REALPATH=../libthread_db.so.1 @@ -741,12 +739,8 @@ $(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg6.o:= \ REALPATH=../../../lib/$(MACH64)/values-xpg6.o $(ROOT)/usr/ccs/lib/$(MACH64)/libl.so:= \ REALPATH=../../../lib/$(MACH64)/libl.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/llib-ll.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ll.ln $(ROOT)/usr/ccs/lib/$(MACH64)/liby.so:= \ REALPATH=../../../lib/$(MACH64)/liby.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/llib-ly.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ly.ln $(ROOT)/usr/lib/lwp/$(MACH64)/libthread.so.1:= \ REALPATH=../../$(MACH64)/libthread.so.1 $(ROOT)/usr/lib/lwp/$(MACH64)/libthread_db.so.1:= \ @@ -782,9 +776,7 @@ SYM.USRCCSLIB= \ /usr/ccs/lib/values-xpg4.o \ /usr/ccs/lib/values-xpg6.o \ /usr/ccs/lib/libl.so \ - /usr/ccs/lib/llib-ll.ln \ /usr/ccs/lib/liby.so \ - /usr/ccs/lib/llib-ly.ln \ /usr/lib/lwp/libthread.so.1 \ /usr/lib/lwp/libthread_db.so.1 @@ -811,9 +803,7 @@ SYM.USRCCSLIB64= \ /usr/ccs/lib/$(MACH64)/values-xpg4.o \ /usr/ccs/lib/$(MACH64)/values-xpg6.o \ /usr/ccs/lib/$(MACH64)/libl.so \ - /usr/ccs/lib/$(MACH64)/llib-ll.ln \ /usr/ccs/lib/$(MACH64)/liby.so \ - /usr/ccs/lib/$(MACH64)/llib-ly.ln \ /usr/lib/lwp/$(MACH64)/libthread.so.1 \ /usr/lib/lwp/$(MACH64)/libthread_db.so.1 @@ -989,14 +979,10 @@ $(ROOT)/usr/lib/llib-ldhcpagent.ln:= REALPATH=../../lib/llib-ldhcpagent.ln $(ROOT)/usr/lib/llib-ldhcpagent:= REALPATH=../../lib/llib-ldhcpagent $(ROOT)/usr/lib/llib-ldhcputil.ln:= REALPATH=../../lib/llib-ldhcputil.ln $(ROOT)/usr/lib/llib-ldhcputil:= REALPATH=../../lib/llib-ldhcputil -$(ROOT)/usr/lib/llib-ldl.ln:= REALPATH=../../lib/llib-ldl.ln -$(ROOT)/usr/lib/llib-ldl:= REALPATH=../../lib/llib-ldl $(ROOT)/usr/lib/llib-ldoor.ln:= REALPATH=../../lib/llib-ldoor.ln $(ROOT)/usr/lib/llib-ldoor:= REALPATH=../../lib/llib-ldoor $(ROOT)/usr/lib/llib-lefi.ln:= REALPATH=../../lib/llib-lefi.ln $(ROOT)/usr/lib/llib-lefi:= REALPATH=../../lib/llib-lefi -$(ROOT)/usr/lib/llib-lelf.ln:= REALPATH=../../lib/llib-lelf.ln -$(ROOT)/usr/lib/llib-lelf:= REALPATH=../../lib/llib-lelf $(ROOT)/usr/lib/llib-lfdisk.ln:= REALPATH=../../lib/llib-lfdisk.ln $(ROOT)/usr/lib/llib-lfdisk:= REALPATH=../../lib/llib-lfdisk $(ROOT)/usr/lib/llib-lgen.ln:= REALPATH=../../lib/llib-lgen.ln @@ -1027,8 +1013,6 @@ $(ROOT)/usr/lib/llib-lrpcsvc.ln:= REALPATH=../../lib/llib-lrpcsvc.ln $(ROOT)/usr/lib/llib-lrpcsvc:= REALPATH=../../lib/llib-lrpcsvc $(ROOT)/usr/lib/llib-lrt.ln:= REALPATH=../../lib/llib-lrt.ln $(ROOT)/usr/lib/llib-lrt:= REALPATH=../../lib/llib-lrt -$(ROOT)/usr/lib/llib-lrtld_db.ln:= REALPATH=../../lib/llib-lrtld_db.ln -$(ROOT)/usr/lib/llib-lrtld_db:= REALPATH=../../lib/llib-lrtld_db $(ROOT)/usr/lib/llib-lscf.ln:= REALPATH=../../lib/llib-lscf.ln $(ROOT)/usr/lib/llib-lscf:= REALPATH=../../lib/llib-lscf $(ROOT)/usr/lib/llib-lsec.ln:= REALPATH=../../lib/llib-lsec.ln @@ -1361,14 +1345,10 @@ $(ROOT)/usr/lib/$(MACH64)/llib-ldevinfo.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-ldevinfo.ln $(ROOT)/usr/lib/$(MACH64)/llib-ldhcputil.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-ldhcputil.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ldl.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ldl.ln $(ROOT)/usr/lib/$(MACH64)/llib-ldoor.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-ldoor.ln $(ROOT)/usr/lib/$(MACH64)/llib-lefi.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-lefi.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lelf.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lelf.ln $(ROOT)/usr/lib/$(MACH64)/llib-lgen.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-lgen.ln $(ROOT)/usr/lib/$(MACH64)/llib-linetutil.ln:= \ @@ -1397,8 +1377,6 @@ $(ROOT)/usr/lib/$(MACH64)/llib-lrpcsvc.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-lrpcsvc.ln $(ROOT)/usr/lib/$(MACH64)/llib-lrt.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-lrt.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lrtld_db.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lrtld_db.ln $(ROOT)/usr/lib/$(MACH64)/llib-lscf.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-lscf.ln $(ROOT)/usr/lib/$(MACH64)/llib-lsec.ln:= \ @@ -1622,14 +1600,10 @@ SYM.USRLIB= \ /usr/lib/llib-ldhcpagent.ln \ /usr/lib/llib-ldhcputil \ /usr/lib/llib-ldhcputil.ln \ - /usr/lib/llib-ldl \ - /usr/lib/llib-ldl.ln \ /usr/lib/llib-ldoor \ /usr/lib/llib-ldoor.ln \ /usr/lib/llib-lefi \ /usr/lib/llib-lefi.ln \ - /usr/lib/llib-lelf \ - /usr/lib/llib-lelf.ln \ /usr/lib/llib-lgen \ /usr/lib/llib-lgen.ln \ /usr/lib/llib-linetutil \ @@ -1658,8 +1632,6 @@ SYM.USRLIB= \ /usr/lib/llib-lrpcsvc.ln \ /usr/lib/llib-lrt \ /usr/lib/llib-lrt.ln \ - /usr/lib/llib-lrtld_db \ - /usr/lib/llib-lrtld_db.ln \ /usr/lib/llib-lscf \ /usr/lib/llib-lscf.ln \ /usr/lib/llib-lsec \ @@ -1856,10 +1828,8 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/llib-ldevid.ln \ /usr/lib/$(MACH64)/llib-ldevinfo.ln \ /usr/lib/$(MACH64)/llib-ldhcputil.ln \ - /usr/lib/$(MACH64)/llib-ldl.ln \ /usr/lib/$(MACH64)/llib-ldoor.ln \ /usr/lib/$(MACH64)/llib-lefi.ln \ - /usr/lib/$(MACH64)/llib-lelf.ln \ /usr/lib/$(MACH64)/llib-lgen.ln \ /usr/lib/$(MACH64)/llib-linetutil.ln \ /usr/lib/$(MACH64)/llib-lintl.ln \ @@ -1874,7 +1844,6 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/llib-lresolv.ln \ /usr/lib/$(MACH64)/llib-lrpcsvc.ln \ /usr/lib/$(MACH64)/llib-lrt.ln \ - /usr/lib/$(MACH64)/llib-lrtld_db.ln \ /usr/lib/$(MACH64)/llib-lscf.ln \ /usr/lib/$(MACH64)/llib-lsec.ln \ /usr/lib/$(MACH64)/llib-lsecdb.ln \ diff --git a/usr/src/cmd/sgs/0@0/Makefile.com b/usr/src/cmd/sgs/0@0/Makefile.com index cb8aba4043..42da97d835 100644 --- a/usr/src/cmd/sgs/0@0/Makefile.com +++ b/usr/src/cmd/sgs/0@0/Makefile.com @@ -22,6 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # LIBRARY= 0@0.a @@ -32,7 +33,7 @@ CRTI= pics/crti.o CRTN= pics/crtn.o CRTS= $(CRTI) $(CRTN) -include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib MAPFILES= ASFLAGS= -P -D_ASM $(CPPFLAGS) @@ -43,7 +44,7 @@ BUILD.s= $(AS) $(ASFLAGS) $< -o $@ SRCS= $(OBJECTS:%.o=../common/%.c) -CLEANFILES += $(LINTOUT) $(CRTS) +CLEANFILES += $(CRTS) CLOBBERFILES += $(DYNLIB) ROOTDYNLIB= $(DYNLIB:%=$(ROOTLIBDIR)/%) diff --git a/usr/src/cmd/sgs/0@0/Makefile.targ b/usr/src/cmd/sgs/0@0/Makefile.targ index 07f3bdd901..9e9f4a645a 100644 --- a/usr/src/cmd/sgs/0@0/Makefile.targ +++ b/usr/src/cmd/sgs/0@0/Makefile.targ @@ -18,12 +18,11 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< @@ -41,7 +40,3 @@ include $(SRC)/lib/Makefile.targ delete: $(RM) $(DYNLIB) - -lint: - perl ../../tools/lint_hdr.pl 0@0.so.1 > $(LINTOUT) - $(LINT.c) $(SRCS) 2>&1 | tee -a $(LINTOUT) diff --git a/usr/src/cmd/sgs/Makefile b/usr/src/cmd/sgs/Makefile index f43ea16e2c..d9ac6c2305 100644 --- a/usr/src/cmd/sgs/Makefile +++ b/usr/src/cmd/sgs/Makefile @@ -22,6 +22,7 @@ # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2016 RackTop Systems. # Copyright 2017 Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/cmd/Makefile.cmd @@ -92,7 +93,7 @@ POFILES= $(POSUBDIRS:%=%/%.po) MSGSUBDIRS= ld ldd libld liblddbg \ libldstab librtld rtld libelf \ ldprof libcrle pvs elfdump \ - elfedit crle moe lari \ + elfedit crle moe lari \ librtld_db elfwrap ar MSGDIR= messages @@ -146,7 +147,7 @@ install_lib: FRC @ cd lex; pwd; $(MAKE) $@ @ cd yacc; pwd; $(MAKE) $@ -lint: $(SUBDIRS) +lint: delete \ clean clobber: native-clobber .WAIT $(SUBDIRS) $(MSGDIR) @@ -181,7 +182,7 @@ FRC: # and tweak the file globs slightly. # XRPRUNE= rtld.4.x packages abi -XRADD= *.msg mapfile* llib-[a-z]* +XRADD= *.msg mapfile* XRDEL= Makefile* kobj_* # diff --git a/usr/src/cmd/sgs/Makefile.com b/usr/src/cmd/sgs/Makefile.com index 9230fd96de..c2c5143c66 100644 --- a/usr/src/cmd/sgs/Makefile.com +++ b/usr/src/cmd/sgs/Makefile.com @@ -22,6 +22,7 @@ # # Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # .KEEP_STATE: @@ -135,46 +136,6 @@ native := DYNFLAGS = -R$(SGSLIBDIR) -L$(SGSLIBDIR) $(ZNOVERSION) \ CC_USE_PROTO = -Yl,$(SGSBINDIR) LD_USE_PROTO = $(SGSBINDIR)/ -# -# lint-related stuff -# -LIBNAME32 = $(LIBNAME:%=%32) -LIBNAME64 = $(LIBNAME:%=%64) -LIBNAMES = $(LIBNAME32) $(LIBNAME64) - -SGSLINTOUT = lint.out -LINTOUT1 = lint.out.1 -LINTOUT32 = lint.out.32 -LINTOUT64 = lint.out.64 -LINTOUTS = $(SGSLINTOUT) $(LINTOUT1) $(LINTOUT32) $(LINTOUT64) - -LINTLIBSRC = $(LINTLIB:%.ln=%) -LINTLIB32 = $(LINTLIB:%.ln=%32.ln) -LINTLIB64 = $(LINTLIB:%.ln=%64.ln) -LINTLIBS = $(LINTLIB32) $(LINTLIB64) - -LINTFLAGS = -m -errtags=yes -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -LINTFLAGS64 = -m -errtags=yes -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED \ - $(VAR_LINTFLAGS64) - -# -# When building a lint library, no other lint libraries are verified as -# dependencies, nor is the stardard C lint library processed. All dependency -# verification is carried out through linting the sources themselves. -# -$(LINTLIB) := LINTFLAGS += -n -$(LINTLIB) := LINTFLAGS64 += -n - -$(LINTLIB32) := LINTFLAGS += -n -$(LINTLIB32) := LINTFLAGS64 += -n -$(LINTLIB64) := LINTFLAGS += -n -$(LINTLIB64) := LINTFLAGS64 += -n - -# -# These libraries have two resulting lint libraries. If a dependency is -# declared using these variables, the substitution for the 32/64 versions at -# lint time happens automatically (see Makefile.targ). -# LD_LIB = -lld LD_LIB32 = -lld32 LD_LIB64 = -lld64 diff --git a/usr/src/cmd/sgs/Makefile.sub b/usr/src/cmd/sgs/Makefile.sub index 08fb449778..31d82769b8 100644 --- a/usr/src/cmd/sgs/Makefile.sub +++ b/usr/src/cmd/sgs/Makefile.sub @@ -19,13 +19,10 @@ # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Standard subdirs makefile for the sgs area. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/Makefile.master @@ -49,7 +46,6 @@ clean := TARGET= clean clobber := TARGET= clobber delete := TARGET= delete install := TARGET= install -lint := TARGET= lint catalog := TARGET= catalog package := TARGET= package chkmsg := TARGET= chkmsg @@ -57,7 +53,7 @@ chkmsg := TARGET= chkmsg .KEEP_STATE: .KEEP_STATE_FILE: .make.state.$(MACH) -all clean clobber delete install lint catalog package chkmsg: \ +all clean clobber delete install catalog package chkmsg: \ $(SUBDIRS) $(SUBDIRS): FRC diff --git a/usr/src/cmd/sgs/Makefile.targ b/usr/src/cmd/sgs/Makefile.targ index 4940367e99..776fedad57 100644 --- a/usr/src/cmd/sgs/Makefile.targ +++ b/usr/src/cmd/sgs/Makefile.targ @@ -22,11 +22,12 @@ # # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # Standard install rules # The VAR_SGSBIN and VAR_SGSBIN64 install rules included here are applicable -# to Solaris 10 and earlier releases. For post Solaris 10 releases, the +# to Solaris 10 and earlier releases. For post Solaris 10 releases, the # standard ROOTBIN and ROOTBIN64 rules defined in ../Makefile.cmd are used. # The new rules here are included to allow for easier backporting. Making # the appropriate updates in ./Makefile.var, will allow the SGS components @@ -38,188 +39,6 @@ $(VAR_SGSBIN)/%: % $(VAR_SGSBIN64)/%: % $(INS.file) -################################################################################ -# -# Linting the Linker Libraries -# -# Several of the linker's libraries are, in whole or in part, built in two -# passes, once as Elf32 and once as Elf64 (i.e. with -D_ELF64 defined). Lint -# needs to be able to do both passes, but combining the two is problematic for -# the 2nd pass of lint, as it sees many interfaces as being defined both ways -# and considers them to be incompatible. The targets defined here allow for -# both passes to live independently. This means that both the lint.out, and -# the lint library itself get generated separately, to different output files. -# The lint.out's get combined into a single lint.out report, and the lint -# libraries get generated with a 32/64 suffix. The dependents on these lint -# libraries, then, choose which version they need to use. Substitutions can -# be made automatically if the macro's defined in ./Makefile.com are used to -# specify the dependency, for those libs that need them. -# -# Don't -# -# Don't use the /*LINTLIBRARY*/ directive in linker libraries, this disables -# some important checks, including the ability to test format strings from the -# msg.h files. -# -# Don't use the `-x' option to lint when linting linker libraries. This masks -# all the dead wood in our own header files. Instead, there has been added to -# the relevant common directories a file called `lintsup.c' which is used to -# mask out the headers that we aren't interested in. This method is used for -# libraries, like libld, which have their own header files, but is irrelevant -# to libraries like libldstab which exports no interface of it's own. -# -# The `lintsup.c' file can also be used, in some cases, to mask out other -# issues that lint won't otherwise shut up about. -# -# Other Lint Options -# -# `-m' has been added to the LINTFLAGS. Warnings about globals that could be -# static are irrelevant as we use mapfiles to scope down unnecessary globals. -# -# `-u' is used in the LINTFLAGS for libraries, otherwise lint tends to be very -# noisy. -# -# `-x' is avoided for libraries, but is used for executables because all we -# care about is that what we use is defined, not about declarations in public -# headers that we don't use. -# -# Relevant variables: -# -# */Makefile.com -# SRCS= ../common/llib-l<libname> -# LINTSRCS= <source files> -# LDLIBS= ... [$(LDDBG_LIB) $(LD_LIB)] -# LINTFLAGS= ... -# LINTFLAGS64= ... -# CLEANFILES += ... $(LINTOUTS) -# CLOBBERFILES += ... $(LINTLIBS) -# -# Relevant targets: -# -# */Makefile.targ -# # this file for SGS lint targets. -# include $(SRC)/cmd/sgs/Makefile.targ -# -# lint: <choose the desired functionality> $(SGSLINTOUT) -# -# $(LINTLIB32), -# $(LINTLIB64) Create an Elf32 or Elf64 lint library from -# a proto file indicated by the $(SRCS) variable. -# -# $(LINTOUT32), -# $(LINTOUT64) Run lint on the sources indicated by the -# $(LINTSRCS) variable with respect to Elf32 -# or Elf64. Dependencies are gathered from -# the $(LDLIBS) variable. -# -# $(SGSLINTOUT) Create a `lint.out' file as the concatination -# of the lint output from the previous targets. -# This should be specified *last* in the list. -# -################################################################################ - -# -# Override the OS's $(LINTOUT) target to avoid confusion. -# -LINTOUT = $(LINTOUT1) - -# -# If LD_LIB, LDDBG_LIB, or CONV_LIB is added to LDLIBS, then the right lint -# library should be picked up automatically. -# -$(LINTOUT32) := LD_LIB=$(LD_LIB32) -$(LINTOUT32) := LDDBG_LIB=$(LDDBG_LIB32) -$(LINTOUT32) := CONV_LIB=$(CONV_LIB32) - -$(LINTOUT64) := LD_LIB=$(LD_LIB64) -$(LINTOUT64) := LDDBG_LIB=$(LDDBG_LIB64) -$(LINTOUT64) := CONV_LIB=$(CONV_LIB64) - -# -# Force $(LINTLIB) in order to help the $(SGSLINTOUT) -# target produce the same output on successive runs. -# -$(LINTLIB): FRC - -$(LINTLIB32): $(SRCS) - $(LINT.c) -o $(LIBNAME32) $(SRCS) - -$(LINTLIB64): $(SRCS) - $(LINT.c) -D_ELF64 -o $(LIBNAME64) $(SRCS) - -$(LINTOUT32): $(LINTSRCS) $(LINTSRCS32) - $(LINT.c) $(LINTSRCS) $(LINTSRCS32) $(LDLIBS) > $(LINTOUT32) 2>&1 - -$(LINTOUT64): $(LINTSRCS) $(LINTSRCS64) - $(LINT.c) -D_ELF64 $(LINTSRCS) $(LINTSRCS64) \ - $(LDLIBS) > $(LINTOUT64) 2>&1 - -# -# A couple of macros used in the SGSLINTOUT rule below -# -# LINT_HDR - Use sgs/tools/lint_hdr.pl to generate lint output headers -# LINT_TEE - Use tee to write output to stdout and also capture it -# in the SGSLINT output file. -# -# An additional complexity: We produce headers for all the lint -# output so that we can tell what came from where when we look -# at the resulting file. We also cat these headers to stdout so that -# the user of make will see them. However, we don't want the headers -# to go to stdout if there is only one of LINTOUT32 and LINTOUT64. To -# the interactive user, the headers are only interesting as a way to -# separate the two ELF classes. We only bother with this for the -# non-DYNLIB and non-RTLD case, because at the current time, both of these -# cases always have both 32 and 64-bit ELFCLASS support. -# -LINT_HDR= perl $(SGSTOOLS)/lint_hdr.pl -LINT_TEE= tee -a $(SGSLINTOUT) - -$(SGSLINTOUT): FRC - @ rm -f $(SGSLINTOUT) - @ if [ -r $(LINTOUT1) ]; then \ - $(LINT_HDR) $(LINTLIB) | $(LINT_TEE); \ - cat $(LINTOUT1) | $(LINT_TEE); \ - fi - @ if [ -r $(LINTOUT32) ]; then \ - if [ -n "$(DYNLIB)" ] ; then \ - $(LINT_HDR) $(DYNLIB) 32 | $(LINT_TEE); \ - elif [ -n "$(RTLD)" ] ; then \ - $(LINT_HDR) $(RTLD) 32 | $(LINT_TEE); \ - else \ - if [ -r $(LINTOUT64) ]; then \ - $(LINT_HDR) $(PROG) 32 | $(LINT_TEE); \ - else \ - $(LINT_HDR) $(PROG) 32 >> $(SGSLINTOUT); \ - fi; \ - fi; \ - cat $(LINTOUT32) | $(LINT_TEE); \ - fi - @ if [ -r $(LINTOUT64) ]; then \ - if [ -n "$(DYNLIB)" ] ; then \ - if [ $(DYNLIB) = "libld.so.2" ] ; then \ - $(LINT_HDR) libld.so.3 64 | $(LINT_TEE); \ - else \ - $(LINT_HDR) $(DYNLIB) 64 | $(LINT_TEE); \ - fi; \ - elif [ -n "$(RTLD)" ] ; then \ - $(LINT_HDR) $(RTLD) 64 | $(LINT_TEE); \ - else \ - if [ -r $(LINTOUT32) ]; then \ - $(LINT_HDR) $(PROG) 64 | $(LINT_TEE); \ - else \ - $(LINT_HDR) $(PROG) 64 >> $(SGSLINTOUT); \ - fi; \ - fi; \ - cat $(LINTOUT64) | $(LINT_TEE); \ - fi - @ rm -f $(LINTOUT1) $(LINTOUT32) $(LINTOUT64) - -# -# For those that install the lint library source file. -# -$(ROOTLIBDIR)/$(LINTLIBSRC): ../common/$(LINTLIBSRC) - $(INS.file) ../common/$(LINTLIBSRC) - $(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS) $(INS.liblink) diff --git a/usr/src/cmd/sgs/Makefile.var b/usr/src/cmd/sgs/Makefile.var index d6452d1f0e..2e27e5411b 100644 --- a/usr/src/cmd/sgs/Makefile.var +++ b/usr/src/cmd/sgs/Makefile.var @@ -21,16 +21,17 @@ # # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # The link-editor related source files and Makefile files have at times been # unified across all presently maintained release gates. However, some of the # compiler pre-processor flags and link-editor flags are different among the -# releases. This file is used to specify such flags. -# +# releases. This file is used to specify such flags. +# # This file is included by ./Makefile.com, but may also be included directly in # the case where the utility is relying on the contents of ../../Makefile.com. -# +# # This file should be the only file which is different among the presently # maintained release workspaces, when the sources are unified. # @@ -40,7 +41,7 @@ # Some source files need to use #ifdef to distinguish between the patch release, # and for the packages targeting to the pre-libc/libthread unified environment. # These values are available for CPPFLAGS: -# +# # SGS_PRE_UNIFIED_PROCESS # # is set if the target release is for pre-libc/libthread unified @@ -49,7 +50,6 @@ # # Common Macro definitions # -VAR_LINTFLAGS64= -m64 VAR_PLAT_sparc= sparc VAR_PLAT_i386= intel/ia32 diff --git a/usr/src/cmd/sgs/ar/Makefile.com b/usr/src/cmd/sgs/ar/Makefile.com index e2064d26ea..99e73f70ce 100644 --- a/usr/src/cmd/sgs/ar/Makefile.com +++ b/usr/src/cmd/sgs/ar/Makefile.com @@ -21,6 +21,7 @@ # # Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PROG= ar @@ -47,8 +48,6 @@ CERRWARN += -_gcc=-Wno-uninitialized SMOFF += signed LDLIBS += -lelf $(CONVLIBDIR) $(CONV_LIB) -lsendfile -LINTFLAGS= -x -LINTFLAGS64= -x $(XPG4) := CPPFLAGS += -DXPG4 @@ -65,6 +64,5 @@ SGSMSGALL = $(SGSMSGCOM) SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n ar_msg SRCS= $(COMOBJ:%.o=../common/%.c) $(BLTDATA:%.o=$(SGSTOOLS)/common/%.c) -LINTSRCS= $(SRCS) ../common/lintsup.c -CLEANFILES += $(LINTOUTS) $(BLTFILES) +CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/ar/Makefile.targ b/usr/src/cmd/sgs/ar/Makefile.targ index 6d28736736..c962a700fc 100644 --- a/usr/src/cmd/sgs/ar/Makefile.targ +++ b/usr/src/cmd/sgs/ar/Makefile.targ @@ -20,6 +20,7 @@ # # # Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. objs/%.o \ objs.xpg4/%.o: ../common/%.c @@ -39,10 +40,6 @@ delete: catalog: $(BLTMESG) -.PARALLEL: $(LINTOUT32) $(LINTOUT64) - -lint: $(LINTOUT32) $(SGSLINTOUT) - $(PROG): $(OBJS) $(LINK.c) -o $@ $(LLDFLAGS) $(OBJS) $(LDLIBS) $(POST_PROCESS) diff --git a/usr/src/cmd/sgs/ar/amd64/Makefile b/usr/src/cmd/sgs/ar/amd64/Makefile index 4077158a06..4522ff6331 100644 --- a/usr/src/cmd/sgs/ar/amd64/Makefile +++ b/usr/src/cmd/sgs/ar/amd64/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -31,7 +32,6 @@ LLDFLAGS = $(LLDFLAGS64) CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/ar/common/lintsup.c b/usr/src/cmd/sgs/ar/common/lintsup.c deleted file mode 100644 index e456077e2e..0000000000 --- a/usr/src/cmd/sgs/ar/common/lintsup.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - */ - -/* - * Supplemental Pseudo-code to get lint to consider these symbols used. - */ -#include <msg.h> - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -foo(void) -{ - (void) _ar_msg((Msg)&__ar_msg[0]); -} diff --git a/usr/src/cmd/sgs/ar/sparcv9/Makefile b/usr/src/cmd/sgs/ar/sparcv9/Makefile index dc3747cacb..d1d43e8fda 100644 --- a/usr/src/cmd/sgs/ar/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ar/sparcv9/Makefile @@ -20,6 +20,7 @@ # # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -30,7 +31,6 @@ LLDFLAGS = $(LLDFLAGS64) CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/crle/Makefile.com b/usr/src/cmd/sgs/crle/Makefile.com index 0a26a6845a..252ecd28a3 100644 --- a/usr/src/cmd/sgs/crle/Makefile.com +++ b/usr/src/cmd/sgs/crle/Makefile.com @@ -24,13 +24,15 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= crle include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/sgs/Makefile.com -COMOBJ= config.o crle.o depend.o dump.o \ +COMOBJ= config.o crle.o depend.o dump.o \ inspect.o hash.o print.o util.o BLTOBJ= msg.o TOOLSOBJ= alist.o @@ -50,8 +52,6 @@ LLDFLAGS64 = '-R$$ORIGIN/../../lib/$(MACH64)' LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPT) \ $(LLDFLAGS) $(ZNOLAZYLOAD) LDLIBS += -lelf $(CONVLIBDIR) $(CONV_LIB) $(DLLIB) -LINTFLAGS += -x -LINTFLAGS64 += -x BLTDEFS= msg.h BLTDATA= msg.c @@ -67,6 +67,5 @@ SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n crle_msg SRCS= $(COMOBJ:%.o=../common/%.c) $(BLTDATA) \ $(TOOLSOBJ:%.o=$(SGSTOOLS)/common/%.c) -LINTSRCS= $(SRCS) ../common/lintsup.c -CLEANFILES += $(SGSLINTOUT) $(BLTFILES) +CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/crle/Makefile.targ b/usr/src/cmd/sgs/crle/Makefile.targ index b851144f89..850e37892f 100644 --- a/usr/src/cmd/sgs/crle/Makefile.targ +++ b/usr/src/cmd/sgs/crle/Makefile.targ @@ -20,6 +20,9 @@ # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# %.o: ../common/%.c $(COMPILE.c) $< @@ -44,13 +47,11 @@ clean: delete: $(RM) $(PROG) -lint: $(SGSLINTOUT) - include $(SRC)/cmd/Makefile.targ include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). - + catalog: $(BLTMESG) chkmsg: $(SRCS) diff --git a/usr/src/cmd/sgs/crle/amd64/Makefile b/usr/src/cmd/sgs/crle/amd64/Makefile index 6f4bdc5f8c..a93a68d57b 100644 --- a/usr/src/cmd/sgs/crle/amd64/Makefile +++ b/usr/src/cmd/sgs/crle/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -35,11 +35,8 @@ LLDFLAGS = $(LLDFLAGS64) CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) -lint: $(LINTOUT64) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/crle/common/lintsup.c b/usr/src/cmd/sgs/crle/common/lintsup.c deleted file mode 100644 index 71be8eb2a4..0000000000 --- a/usr/src/cmd/sgs/crle/common/lintsup.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Supplimental Pseudo-code to get lint to consider these symbols used. - */ -#include "alist.h" -#include "msg.h" - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -foo() -{ - (void) _crle_msg((Msg)&__crle_msg[0]); - - (void) alist_append(NULL, NULL, 0, 0); - alist_delete_by_offset(NULL, NULL); - (void) alist_insert_by_offset(NULL, NULL, 0, 0, 0); - alist_reset(NULL); - - (void) aplist_delete_value(NULL, NULL); - aplist_reset(NULL); - (void) aplist_test(NULL, NULL, 0); -} diff --git a/usr/src/cmd/sgs/crle/i386/Makefile b/usr/src/cmd/sgs/crle/i386/Makefile index 76eacd820c..c516dbb377 100644 --- a/usr/src/cmd/sgs/crle/i386/Makefile +++ b/usr/src/cmd/sgs/crle/i386/Makefile @@ -18,16 +18,14 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com .KEEP_STATE: -lint: $(LINTOUT32) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/crle/sparc/Makefile b/usr/src/cmd/sgs/crle/sparc/Makefile index 76eacd820c..c516dbb377 100644 --- a/usr/src/cmd/sgs/crle/sparc/Makefile +++ b/usr/src/cmd/sgs/crle/sparc/Makefile @@ -18,16 +18,14 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com .KEEP_STATE: -lint: $(LINTOUT32) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/crle/sparcv9/Makefile b/usr/src/cmd/sgs/crle/sparcv9/Makefile index 6f4bdc5f8c..a93a68d57b 100644 --- a/usr/src/cmd/sgs/crle/sparcv9/Makefile +++ b/usr/src/cmd/sgs/crle/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -35,11 +35,8 @@ LLDFLAGS = $(LLDFLAGS64) CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) -lint: $(LINTOUT64) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/dump/Makefile.com b/usr/src/cmd/sgs/dump/Makefile.com index 4a0d909491..2224b6ffe1 100644 --- a/usr/src/cmd/sgs/dump/Makefile.com +++ b/usr/src/cmd/sgs/dump/Makefile.com @@ -24,11 +24,13 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= dump -include $(SRC)/cmd/Makefile.cmd -include $(SRC)/cmd/sgs/Makefile.com +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/sgs/Makefile.com COMOBJS= dump.o fcns.o @@ -47,7 +49,3 @@ CERRWARN += -_gcc=-Wno-uninitialized SMOFF += indenting LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -LINTFLAGS += -x -LINTSRCS = $(SRCS) - -CLEANFILES += $(LINTOUTS) diff --git a/usr/src/cmd/sgs/dump/amd64/Makefile b/usr/src/cmd/sgs/dump/amd64/Makefile index 57cd6b100e..b6617b6dad 100644 --- a/usr/src/cmd/sgs/dump/amd64/Makefile +++ b/usr/src/cmd/sgs/dump/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -40,7 +40,5 @@ VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) include ../Makefile.targ include ../../Makefile.sub.64 -lint: $(LINTOUT64) $(SGSLINTOUT) - install \ package: $(VAR_SGSBINPROG64) diff --git a/usr/src/cmd/sgs/dump/i386/Makefile b/usr/src/cmd/sgs/dump/i386/Makefile index 761372e144..ba0a4032e6 100644 --- a/usr/src/cmd/sgs/dump/i386/Makefile +++ b/usr/src/cmd/sgs/dump/i386/Makefile @@ -23,13 +23,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com .KEEP_STATE: -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/dump/sparc/Makefile b/usr/src/cmd/sgs/dump/sparc/Makefile index 761372e144..ba0a4032e6 100644 --- a/usr/src/cmd/sgs/dump/sparc/Makefile +++ b/usr/src/cmd/sgs/dump/sparc/Makefile @@ -23,13 +23,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com .KEEP_STATE: -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/dump/sparcv9/Makefile b/usr/src/cmd/sgs/dump/sparcv9/Makefile index 018d76d3bd..c0c824f3f3 100644 --- a/usr/src/cmd/sgs/dump/sparcv9/Makefile +++ b/usr/src/cmd/sgs/dump/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -40,7 +40,5 @@ VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) include ../Makefile.targ include ../../Makefile.sub.64 -lint: $(LINTOUT64) $(SGSLINTOUT) - install \ package: $(VAR_SGSBINPROG64) diff --git a/usr/src/cmd/sgs/elfdump/Makefile.com b/usr/src/cmd/sgs/elfdump/Makefile.com index fcc0489e9f..5d5c1f4345 100644 --- a/usr/src/cmd/sgs/elfdump/Makefile.com +++ b/usr/src/cmd/sgs/elfdump/Makefile.com @@ -22,6 +22,7 @@ # # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PROG= elfdump @@ -31,8 +32,8 @@ include $(SRC)/cmd/sgs/Makefile.com COMOBJ = main.o corenote.o \ dwarf.o struct_layout.o \ - struct_layout_i386.o struct_layout_amd64.o \ - struct_layout_sparc.o struct_layout_sparcv9.o + struct_layout_i386.o struct_layout_amd64.o \ + struct_layout_sparc.o struct_layout_sparcv9.o COMOBJ32 = elfdump32.o fake_shdr32.o @@ -56,9 +57,6 @@ LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPT) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \ $(CONVLIBDIR) $(CONV_LIB) -LINTFLAGS += -x -LINTFLAGS64 += -x - CERRWARN += -_gcc=-Wno-uninitialized # not linted @@ -78,6 +76,5 @@ SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n elfdump_msg SRCS = $(COMOBJ:%.o=../common/%.c) \ $(COMOBJ32:%32.o=../common/%.c) \ $(TOOLOBJ:%.o=../../tools/common/%.c) $(BLTDATA) -LINTSRCS = $(SRCS) ../common/lintsup.c -CLEANFILES += $(LINTOUTS) $(BLTFILES) gen_struct_layout +CLEANFILES += $(BLTFILES) gen_struct_layout diff --git a/usr/src/cmd/sgs/elfdump/Makefile.targ b/usr/src/cmd/sgs/elfdump/Makefile.targ index 5cb4d96437..4cbbec6bff 100644 --- a/usr/src/cmd/sgs/elfdump/Makefile.targ +++ b/usr/src/cmd/sgs/elfdump/Makefile.targ @@ -24,6 +24,7 @@ # Use is subject to license terms. # # Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # %.o: ../common/%.c @@ -79,10 +80,6 @@ delete: package \ install: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) -.PARALLEL: $(LINTOUT32) $(LINTOUT64) - -lint: $(LINTOUT32) $(LINTOUT64) $(SGSLINTOUT) - include $(SRC)/cmd/Makefile.targ include $(SRC)/cmd/sgs/Makefile.targ diff --git a/usr/src/cmd/sgs/elfdump/amd64/Makefile b/usr/src/cmd/sgs/elfdump/amd64/Makefile index be0f2c33f6..ec8341a69b 100644 --- a/usr/src/cmd/sgs/elfdump/amd64/Makefile +++ b/usr/src/cmd/sgs/elfdump/amd64/Makefile @@ -23,6 +23,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com @@ -33,7 +35,6 @@ LLDFLAGS = $(LLDFLAGS64) ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) VAR_SGSBINPROG= $(VAR_SGSBINPROG64) VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) diff --git a/usr/src/cmd/sgs/elfdump/common/lintsup.c b/usr/src/cmd/sgs/elfdump/common/lintsup.c deleted file mode 100644 index 7ace5b4906..0000000000 --- a/usr/src/cmd/sgs/elfdump/common/lintsup.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Supplemental Pseudo-code to get lint to consider these symbols used. - */ -#include <sys/types.h> -#include <libelf.h> -#include <conv.h> -#include <msg.h> -#include <_elfdump.h> - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -foo() -{ - (void) _elfdump_msg((Msg)&__elfdump_msg[0]); -} - -#if defined(_ELF64) -int -regular32(const char *file, int fd, Elf *elf, uint_t flags, - const char *wname, int wfd, uchar_t osabi) -{ - return (regular64(file, fd, elf, flags, wname, wfd, osabi)); -} -#else -int -regular64(const char *file, int fd, Elf *elf, uint_t flags, - const char *wname, int wfd, uchar_t osabi) -{ - return (regular32(file, fd, elf, flags, wname, wfd, osabi)); -} -#endif diff --git a/usr/src/cmd/sgs/elfdump/sparcv9/Makefile b/usr/src/cmd/sgs/elfdump/sparcv9/Makefile index e629729766..9dd92b9635 100644 --- a/usr/src/cmd/sgs/elfdump/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfdump/sparcv9/Makefile @@ -23,6 +23,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com @@ -33,7 +35,6 @@ LLDFLAGS = $(LLDFLAGS64) ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) VAR_SGSBINPROG= $(VAR_SGSBINPROG64) VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) diff --git a/usr/src/cmd/sgs/elfedit/Makefile.com b/usr/src/cmd/sgs/elfedit/Makefile.com index 67059f62b0..276d11972e 100644 --- a/usr/src/cmd/sgs/elfedit/Makefile.com +++ b/usr/src/cmd/sgs/elfedit/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= elfedit @@ -50,9 +52,6 @@ LDFLAGS += $(VERSREF) $(CC_USE_PROTO) -M$(MAPFILE) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \ $(CONVLIBDIR) $(CONV_LIB) -ltecla -LINTFLAGS += -x -LINTFLAGS64 += -x - CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized @@ -70,6 +69,5 @@ SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n elfedit_msg SRCS = $(COMOBJ:%.o=../common/%.c) \ $(COMOBJ32:%32.o=../common/%.c) \ $(BLTDATA) -LINTSRCS = $(SRCS) ../common/lintsup.c -CLEANFILES += $(LINTOUTS) $(BLTFILES) +CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/elfedit/amd64/Makefile b/usr/src/cmd/sgs/elfedit/amd64/Makefile index 75487b577b..0d3551cdc4 100644 --- a/usr/src/cmd/sgs/elfedit/amd64/Makefile +++ b/usr/src/cmd/sgs/elfedit/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -40,7 +40,5 @@ ROOTPROG= $(ROOTPROG64) include ../Makefile.targ include ../../Makefile.sub.64 -lint: $(LINTOUT64) $(SGSLINTOUT) - install \ package: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfedit/common/lintsup.c b/usr/src/cmd/sgs/elfedit/common/lintsup.c deleted file mode 100644 index f27def869c..0000000000 --- a/usr/src/cmd/sgs/elfedit/common/lintsup.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Supplemental Pseudo-code to get lint to consider these symbols used. - */ -#include <msg.h> -#include <debug.h> -#include <elfedit.h> - -/* - * Lint doesn't understand that both elfedit{32|64}_init_obj_state() - * gets built, because it doesn't know that elfedit_machelf.c gets - * compiled twice. The difference between this case and the others - * is that we don't use macros to give them both the same name, - * because elfedit.c needs to know about both explictly. So, - * supply the "missing" one here, for lint's benefit. - * - * This dummy routine eliminates the "name used but not defined" - * errors that otherwise result. - */ -#ifdef _ELF64 -/*ARGSUSED*/ -void -elfedit32_init_obj_state(const char *file, int fd, Elf *elf) -{ -} -#else -/*ARGSUSED*/ -void -elfedit64_init_obj_state(const char *file, int fd, Elf *elf) -{ -} -#endif - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -foo() -{ - dbg_print(NULL, NULL, 0); - - elfedit_array_elts_delete(NULL, NULL, 0, 0, 0, 0); - elfedit_array_elts_move(NULL, NULL, 0, 0, 0, 0, 0, NULL); - - (void) _elfedit_msg((Msg)&__elfedit_msg[0]); - - (void) elfedit_atoi(NULL, NULL); - (void) elfedit_atoui(NULL, NULL); - (void) elfedit_atoconst(NULL, 0); - - (void) elfedit_atoi2(NULL, NULL, NULL); - (void) elfedit_atoui2(NULL, NULL, NULL); - (void) elfedit_atoconst2(NULL, 0, NULL); - - (void) elfedit_atoi_range(NULL, NULL, 0, 0, NULL); - (void) elfedit_atoui_range(NULL, NULL, 0, 0, NULL); - (void) elfedit_atoconst_range(NULL, NULL, 0, 0, 0); - - (void) elfedit_atoi_range2(NULL, 0, 0, NULL, NULL); - (void) elfedit_atoui_range2(NULL, 0, 0, NULL, NULL); - (void) elfedit_atoconst_range2(NULL, 0, 0, 0, NULL); - - (void) elfedit_atoi_value_to_str(NULL, 0, 0); - (void) elfedit_atoui_value_to_str(NULL, 0, 0); - (void) elfedit_atoconst_value_to_str(0, 0, 0); - - (void) elfedit_atoshndx(NULL, 0); - - (void) elfedit_cpl_atoi(NULL, NULL); - (void) elfedit_cpl_atoui(NULL, NULL); - (void) elfedit_cpl_atoconst(NULL, 0); - (void) elfedit_cpl_ndx(NULL, 0); - - (void) elfedit_dyn_offset_to_str(NULL, NULL); - (void) elfedit_dynstr_insert(NULL, NULL, NULL, NULL); - (void) elfedit_flags(); - (void) elfedit_modified_ehdr(NULL); - (void) elfedit_modified_phdr(NULL); - (void) elfedit_modified_shdr(NULL); - (void) elfedit_name_to_shndx(NULL, NULL); - (void) elfedit_name_to_symndx(NULL, NULL, NULL, ELFEDIT_MSG_ERR, NULL); - (void) elfedit_outstyle(); - (void) elfedit_sec_get(NULL, NULL); - (void) elfedit_sec_getcap(NULL, NULL, NULL); - (void) elfedit_sec_getdyn(NULL, NULL, NULL); - (void) elfedit_sec_getstr(NULL, 0, 0); - (void) elfedit_sec_getsyminfo(NULL, NULL, NULL); - (void) elfedit_sec_getsymtab(NULL, 0, 0, NULL, NULL, NULL, NULL); - (void) elfedit_sec_getversym(NULL, NULL, NULL, NULL); - (void) elfedit_sec_getxshndx(NULL, NULL, NULL, NULL); - (void) elfedit_sec_msgprefix(NULL); - (void) elfedit_shndx_to_name(NULL, NULL); - elfedit_str_to_c_literal(NULL, NULL); - (void) elfedit_strtab_insert(NULL, NULL, NULL, NULL); - (void) elfedit_strtab_insert_test(NULL, NULL, NULL, NULL); - (void) elfedit_type_to_shndx(NULL, 0); -} diff --git a/usr/src/cmd/sgs/elfedit/i386/Makefile b/usr/src/cmd/sgs/elfedit/i386/Makefile index 11b6540fbb..756663813d 100644 --- a/usr/src/cmd/sgs/elfedit/i386/Makefile +++ b/usr/src/cmd/sgs/elfedit/i386/Makefile @@ -23,13 +23,11 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com .KEEP_STATE: -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/elfedit/modules/Makefile b/usr/src/cmd/sgs/elfedit/modules/Makefile index 864315211c..8171228077 100644 --- a/usr/src/cmd/sgs/elfedit/modules/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/Makefile @@ -18,12 +18,11 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include $(SRC)/Makefile.master @@ -37,11 +36,10 @@ install:= TARGET= install package:= TARGET= package clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint .KEEP_STATE: -package all chkmsg catalog clean clobber lint install: \ +package all chkmsg catalog clean clobber install: \ $(SUBDIRS) $(SUBDIRS): FRC diff --git a/usr/src/cmd/sgs/elfedit/modules/Makefile.com b/usr/src/cmd/sgs/elfedit/modules/Makefile.com index 226b8a4f13..e49e89a81f 100644 --- a/usr/src/cmd/sgs/elfedit/modules/Makefile.com +++ b/usr/src/cmd/sgs/elfedit/modules/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../../../../../lib/Makefile.lib include ../../../Makefile.com @@ -99,14 +101,11 @@ DYNFLAGS += $(VERSREF) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized -LINTFLAGS += -uaxs $(LDLIBS) -LINTFLAGS64 += -uaxs $(LDLIBS64) - BLTDEFS = $(ELFEDITLIBS:%.so=%_msg.h) BLTDATA = $(ELFEDITLIBS:%.so=%_msg.c) BLTFILES = $(BLTDEFS) $(BLTDATA) -CLEANFILES += $(BLTFILES) $(LINTOUT) $(PICDIR)/* +CLEANFILES += $(BLTFILES) $(PICDIR)/* CLOBBERFILES += $(ELFEDITLIBS) ROOTELFEDITDIR= $(ROOT)/usr/lib/elfedit diff --git a/usr/src/cmd/sgs/elfedit/modules/Makefile.targ b/usr/src/cmd/sgs/elfedit/modules/Makefile.targ index 231a6a083c..24f3b53e68 100644 --- a/usr/src/cmd/sgs/elfedit/modules/Makefile.targ +++ b/usr/src/cmd/sgs/elfedit/modules/Makefile.targ @@ -22,7 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # @@ -113,7 +113,6 @@ catalog: $(SGSMSGDIR)/elfedit_cap \ $(SGSMSGDIR)/elfedit_str \ $(SGSMSGDIR)/elfedit_sym \ $(SGSMSGDIR)/elfedit_syminfo - chkmsg: $(SRCS) sh $(CHKMSG) -m ../common/cap.msg ../common/cap.c @@ -126,32 +125,4 @@ chkmsg: $(SRCS) sh $(CHKMSG) -m ../common/syminfo.msg ../common/syminfo.c -LINT_HDR= perl $(SGSTOOLS)/lint_hdr.pl - -lint: - $(LINT_HDR) "elfedit modules" > $(LINTOUT) - $(LINT_HDR) -s "cap.so" >> $(LINTOUT) - $(LINT.c) ../common/cap.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s "dyn.so" >> $(LINTOUT) - $(LINT.c) ../common/dyn.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s "ehdr.so" >> $(LINTOUT) - $(LINT.c) ../common/ehdr.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s "phdr.so" >> $(LINTOUT) - $(LINT.c) ../common/phdr.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s "shdr.so" >> $(LINTOUT) - $(LINT.c) ../common/shdr.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s "str.so" >> $(LINTOUT) - $(LINT.c) ../common/str.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s "sym.so" >> $(LINTOUT) - $(LINT.c) ../common/sym.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s "syminfo.so" >> $(LINTOUT) - $(LINT.c) ../common/syminfo.c 2>&1 | tee -a $(LINTOUT) - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/cmd/sgs/elfedit/modules/amd64/Makefile b/usr/src/cmd/sgs/elfedit/modules/amd64/Makefile index c69276347c..61caecccdc 100644 --- a/usr/src/cmd/sgs/elfedit/modules/amd64/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -33,16 +33,10 @@ CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) MTARG = amd64/ -lint := CONV_LIB = $(CONV_LIB64) -lint := LDDBG_LIB = $(LDDBG_LIB64) - CFLAGS64 += $(C_PICFLAGS64) LLDFLAGS = $(LLDFLAGS64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - - .KEEP_STATE: all: $(PICDIR) .WAIT $(ELFEDITLIBS) diff --git a/usr/src/cmd/sgs/elfedit/modules/i386/Makefile b/usr/src/cmd/sgs/elfedit/modules/i386/Makefile index d8203060c0..cce4b929ec 100644 --- a/usr/src/cmd/sgs/elfedit/modules/i386/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/i386/Makefile @@ -23,14 +23,11 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com -lint := CONV_LIB = $(CONV_LIB32) -lint := LDDBG_LIB = $(LDDBG_LIB32) - CFLAGS += $(C_PICFLAGS) .KEEP_STATE: diff --git a/usr/src/cmd/sgs/elfedit/modules/sparc/Makefile b/usr/src/cmd/sgs/elfedit/modules/sparc/Makefile index d8203060c0..cce4b929ec 100644 --- a/usr/src/cmd/sgs/elfedit/modules/sparc/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/sparc/Makefile @@ -23,14 +23,11 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com -lint := CONV_LIB = $(CONV_LIB32) -lint := LDDBG_LIB = $(LDDBG_LIB32) - CFLAGS += $(C_PICFLAGS) .KEEP_STATE: diff --git a/usr/src/cmd/sgs/elfedit/modules/sparcv9/Makefile b/usr/src/cmd/sgs/elfedit/modules/sparcv9/Makefile index 13c70cd279..bae1a3208a 100644 --- a/usr/src/cmd/sgs/elfedit/modules/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -33,15 +33,10 @@ CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) MTARG = sparcv9/ -lint := CONV_LIB = $(CONV_LIB64) -lint := LDDBG_LIB = $(LDDBG_LIB64) - CFLAGS64 += $(C_PICFLAGS64) LLDFLAGS = $(LLDFLAGS64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - .KEEP_STATE: all: $(PICDIR) .WAIT $(ELFEDITLIBS) diff --git a/usr/src/cmd/sgs/elfedit/sparc/Makefile b/usr/src/cmd/sgs/elfedit/sparc/Makefile index 11b6540fbb..756663813d 100644 --- a/usr/src/cmd/sgs/elfedit/sparc/Makefile +++ b/usr/src/cmd/sgs/elfedit/sparc/Makefile @@ -23,13 +23,11 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com .KEEP_STATE: -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/elfedit/sparcv9/Makefile b/usr/src/cmd/sgs/elfedit/sparcv9/Makefile index 75487b577b..0d3551cdc4 100644 --- a/usr/src/cmd/sgs/elfedit/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfedit/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -40,7 +40,5 @@ ROOTPROG= $(ROOTPROG64) include ../Makefile.targ include ../../Makefile.sub.64 -lint: $(LINTOUT64) $(SGSLINTOUT) - install \ package: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfwrap/Makefile.com b/usr/src/cmd/sgs/elfwrap/Makefile.com index 0236d7a437..a167760c6b 100644 --- a/usr/src/cmd/sgs/elfwrap/Makefile.com +++ b/usr/src/cmd/sgs/elfwrap/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= elfwrap @@ -54,9 +56,6 @@ LLDFLAGS64 = LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(CONVLIBDIR) $(CONV_LIB) -LINTFLAGS += -x -LINTFLAGS64 += -x - CERRWARN += -_gcc=-Wno-uninitialized BLTDEFS = msg.h @@ -73,6 +72,5 @@ SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n elfwrap_msg SRCS = $(COMOBJ:%.o=../common/%.c) ../common/machine.c \ $(COMOBJ32:%32.o=../common/%.c) \ $(TOOLOBJ:%.o=../../tools/common/%.c) $(BLTDATA) -LINTSRCS = $(SRCS) ../common/lintsup.c -CLEANFILES += $(LINTOUTS) $(BLTFILES) +CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/elfwrap/Makefile.targ b/usr/src/cmd/sgs/elfwrap/Makefile.targ index 26b0b71032..b315de2c50 100644 --- a/usr/src/cmd/sgs/elfwrap/Makefile.targ +++ b/usr/src/cmd/sgs/elfwrap/Makefile.targ @@ -23,7 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # %.o: ../common/%.c @@ -73,10 +73,6 @@ delete: install \ package: all $(ROOTPROG) -.PARALLEL: $(LINTOUT32) $(LINTOUT64) - -lint: $(LINTOUT32) $(LINTOUT64) $(SGSLINTOUT) - include $(SRC)/cmd/Makefile.targ include $(SRC)/cmd/sgs/Makefile.targ diff --git a/usr/src/cmd/sgs/elfwrap/amd64/Makefile b/usr/src/cmd/sgs/elfwrap/amd64/Makefile index 0639219eef..b3fa261cff 100644 --- a/usr/src/cmd/sgs/elfwrap/amd64/Makefile +++ b/usr/src/cmd/sgs/elfwrap/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -32,7 +32,6 @@ include ../Makefile.com ELFLIBDIR = $(ELFLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG= $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfwrap/common/lintsup.c b/usr/src/cmd/sgs/elfwrap/common/lintsup.c deleted file mode 100644 index 83384f72fa..0000000000 --- a/usr/src/cmd/sgs/elfwrap/common/lintsup.c +++ /dev/null @@ -1,68 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Supplemental Pseudo-code to get lint to consider these symbols used. - */ -#include <msg.h> -#include <_elfwrap.h> - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -foo() -{ - (void) _elfwrap_msg((Msg)&__elfwrap_msg[0]); -} - -#if defined(_ELF64) -int -input32(int argc, char **argv, const char *prog, const char *ofile, - ObjDesc_t *odp) -{ - return (input64(argc, argv, prog, ofile, odp)); -} - -int -output32(const char *prog, int fd, const char *ofile, ushort_t mach, - ObjDesc_t *odp) -{ - return (output64(prog, fd, ofile, mach, odp)); -} -#else -int -input64(int argc, char **argv, const char *prog, const char *ofile, - ObjDesc_t *odp) -{ - return (input32(argc, argv, prog, ofile, odp)); -} -int -output64(const char *prog, int fd, const char *ofile, ushort_t mach, - ObjDesc_t *odp) -{ - return (output32(prog, fd, ofile, mach, odp)); -} -#endif diff --git a/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile b/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile index 0639219eef..b3fa261cff 100644 --- a/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -32,7 +32,6 @@ include ../Makefile.com ELFLIBDIR = $(ELFLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG= $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/error/Makefile b/usr/src/cmd/sgs/error/Makefile index 3f3caea185..f4601aac59 100644 --- a/usr/src/cmd/sgs/error/Makefile +++ b/usr/src/cmd/sgs/error/Makefile @@ -19,13 +19,8 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1993 by Sun Microsystems, Inc. -# -# cmd/sgs/error/Makefile -# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. include ../../../Makefile.master @@ -35,11 +30,10 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/error/i386/Makefile b/usr/src/cmd/sgs/error/i386/Makefile index 0154fd97fa..9d08117798 100644 --- a/usr/src/cmd/sgs/error/i386/Makefile +++ b/usr/src/cmd/sgs/error/i386/Makefile @@ -25,10 +25,12 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= error -include ../../../Makefile.cmd +include ../../../Makefile.cmd OBJS= errormain.o errorinput.o errorpi.o errorsubr.o \ errorfilter.o errortouch.o @@ -46,8 +48,6 @@ CERRWARN += -_gcc=-Wno-parentheses SMOFF += no_if_block,indenting -CLEANFILES += $(LINTOUT) - %.o: ../common/%.c $(COMPILE.c) $< @@ -64,10 +64,4 @@ install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(OBJS) $(CLEANFILES) -lint: $(LINTOUT) - -$(LINTOUT): $(SRCS) - perl ../../tools/lint_hdr.pl $(PROG) > $(LINTOUT) - $(LINT.c) $(SRCS) $(LDLIBS) 2>&1 | tee -a $(LINTOUT) - include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/error/sparc/Makefile b/usr/src/cmd/sgs/error/sparc/Makefile index 2023ad1a42..029bcd6f7d 100644 --- a/usr/src/cmd/sgs/error/sparc/Makefile +++ b/usr/src/cmd/sgs/error/sparc/Makefile @@ -24,11 +24,12 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/error/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= error -include ../../../Makefile.cmd +include ../../../Makefile.cmd OBJS= errormain.o errorinput.o errorpi.o errorsubr.o \ errorfilter.o errortouch.o @@ -43,8 +44,6 @@ CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses CSTD= $(CSTD_GNU99) -CLEANFILES += $(LINTOUT) - %.o: ../common/%.c $(COMPILE.c) $< @@ -61,10 +60,4 @@ install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(OBJS) $(CLEANFILES) -lint: $(LINTOUT) - -$(LINTOUT): $(SRCS) - perl ../../tools/lint_hdr.pl $(PROG) > $(LINTOUT) - $(LINT.c) $(SRCS) $(LDLIBS) 2>&1 | tee -a $(LINTOUT) - include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/gprof/Makefile b/usr/src/cmd/sgs/gprof/Makefile index 570c5e16f4..9888628550 100644 --- a/usr/src/cmd/sgs/gprof/Makefile +++ b/usr/src/cmd/sgs/gprof/Makefile @@ -20,11 +20,8 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1993 by Sun Microsystems, Inc. -# -# cmd/sgs/gprof/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../../Makefile.master @@ -35,11 +32,10 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/gprof/Makefile.com b/usr/src/cmd/sgs/gprof/Makefile.com index 435f86d0bd..4dd3a736aa 100644 --- a/usr/src/cmd/sgs/gprof/Makefile.com +++ b/usr/src/cmd/sgs/gprof/Makefile.com @@ -23,11 +23,13 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= gprof -include $(SRC)/cmd/Makefile.cmd -include $(SRC)/cmd/sgs/Makefile.com +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/sgs/Makefile.com COMOBJS= gprof.o arcs.o dfn.o lookup.o calls.o \ printgprof.o printlist.o readelf.o @@ -42,15 +44,11 @@ CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) CFLAGS += $(CCVERBOSE) CSTD= $(CSTD_GNU99) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -LINTSRCS = $(SRCS) -LINTFLAGS += -x CERRWARN += -_gcc=-Wno-uninitialized # not linted SMATCH=off -CLEANFILES += $(LINTOUTS) - ROOTLIBBLURB= $(BLURBS:%=$(ROOTSHLIBCCS)/%) $(ROOTLIBBLURB) := FILEMODE= 444 diff --git a/usr/src/cmd/sgs/gprof/i386/Makefile b/usr/src/cmd/sgs/gprof/i386/Makefile index b177dd3916..9919d6f606 100644 --- a/usr/src/cmd/sgs/gprof/i386/Makefile +++ b/usr/src/cmd/sgs/gprof/i386/Makefile @@ -18,16 +18,13 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/gprof/i386/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -include ../Makefile.com +include ../Makefile.com .KEEP_STATE: @@ -35,6 +32,4 @@ all: $(PROG) install: all .WAIT $(ROOTPROG) $(ROOTLIBBLURB) $(ROOTCCSBINLINK) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/gprof/sparc/Makefile b/usr/src/cmd/sgs/gprof/sparc/Makefile index c018b8f889..4d7b282d70 100644 --- a/usr/src/cmd/sgs/gprof/sparc/Makefile +++ b/usr/src/cmd/sgs/gprof/sparc/Makefile @@ -18,15 +18,13 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/gprof/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# -include ../Makefile.com +include ../Makefile.com DEFLIST += -DSPARC @@ -36,7 +34,5 @@ all: $(PROG) install: all .WAIT $(ROOTPROG) $(ROOTLIBBLURB) $(ROOTCCSBINLINK) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/lari/Makefile b/usr/src/cmd/sgs/lari/Makefile index 64e275975c..c9efe63689 100644 --- a/usr/src/cmd/sgs/lari/Makefile +++ b/usr/src/cmd/sgs/lari/Makefile @@ -19,10 +19,11 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= lari @@ -47,8 +48,7 @@ package: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) clean: $(RM) $(PROG) -chkmsg \ -lint: +chkmsg: catalog: $(POFILE) diff --git a/usr/src/cmd/sgs/ld/Makefile.com b/usr/src/cmd/sgs/ld/Makefile.com index 277b62c95b..9cf9e0a713 100644 --- a/usr/src/cmd/sgs/ld/Makefile.com +++ b/usr/src/cmd/sgs/ld/Makefile.com @@ -22,12 +22,13 @@ # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PROG = ld -include $(SRC)/cmd/Makefile.cmd -include $(SRC)/cmd/sgs/Makefile.com +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/sgs/Makefile.com COMOBJS = ld.o BLTOBJ = msg.o @@ -45,11 +46,6 @@ LDLIBS += $(LDLIBDIR) $(LD_LIB) $(ELFLIBDIR) -lelf \ CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-parentheses -LINTFLAGS += -x -LINTFLAGS64 += -x $(VAR_LINTFLAGS64) - -CLEANFILES += $(LINTOUTS) - native := LDFLAGS = -R$(SGSLIBDIR) $(ZNOVERSION) native := LDLIBS = -L$(SGSLIBDIR) $(LD_LIB) -lelf $(CONVLIBDIR) \ $(CONV_LIB) @@ -67,7 +63,6 @@ SGSMSGALL= $(SGSMSGCOM) SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n ld_msg SRCS= $(MACHOBJS:%.o=%.c) $(COMOBJS:%.o=../common/%.c) $(BLTDATA) -LINTSRCS= $(SRCS) ../common/lintsup.c CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/ld/Makefile.targ b/usr/src/cmd/sgs/ld/Makefile.targ index 8b1131d9e3..b2155c2a73 100644 --- a/usr/src/cmd/sgs/ld/Makefile.targ +++ b/usr/src/cmd/sgs/ld/Makefile.targ @@ -24,6 +24,7 @@ # Use is subject to license terms. # # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # all: $(PROG) @@ -45,8 +46,6 @@ clean: delete: $(RM) $(PROG) -lint: $(LINTOUT32) $(SGSLINTOUT) - include $(SRC)/cmd/Makefile.targ include $(SRC)/cmd/sgs/Makefile.targ diff --git a/usr/src/cmd/sgs/ld/common/lintsup.c b/usr/src/cmd/sgs/ld/common/lintsup.c deleted file mode 100644 index a47d0081d8..0000000000 --- a/usr/src/cmd/sgs/ld/common/lintsup.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Supplimental Pseudo-code to get lint to consider - * these symbols used. - */ - -#include <stdio.h> -#include "msg.h" - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -exit(int status) -{ - (void) printf("%s: %d\n", _ld_msg((Msg)&__ld_msg[0]), status); -} diff --git a/usr/src/cmd/sgs/ldd/Makefile.com b/usr/src/cmd/sgs/ldd/Makefile.com index 6530a3e5cb..d3ec53655c 100644 --- a/usr/src/cmd/sgs/ldd/Makefile.com +++ b/usr/src/cmd/sgs/ldd/Makefile.com @@ -24,6 +24,8 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= ldd @@ -46,8 +48,6 @@ LLDFLAGS = '-R$$ORIGIN/../../lib' LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lelf $(DLLIB) -LINTFLAGS += -x -LINTFLAGS64 += -x SMOFF += or_vs_and @@ -64,6 +64,5 @@ SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n ldd_msg SRCS= $(COMOBJ:%.o=../common/%.c) $(BLTDATA) \ $(TOOLSOBJ:%.o=$(SGSTOOLS)/common/%.c) -LINTSRCS= $(SRCS) ../common/lintsup.c -CLEANFILES += $(LINTOUTS) $(BLTFILES) +CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/ldd/amd64/Makefile b/usr/src/cmd/sgs/ldd/amd64/Makefile index a89bb7561d..1819ad03dc 100644 --- a/usr/src/cmd/sgs/ldd/amd64/Makefile +++ b/usr/src/cmd/sgs/ldd/amd64/Makefile @@ -18,12 +18,11 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com @@ -31,11 +30,8 @@ include ../Makefile.com CONVLIBDIR = $(CONVLIBDIR64) LLDFLAGS = $(LLDFLAGS64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) -lint: $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/ldd/common/lintsup.c b/usr/src/cmd/sgs/ldd/common/lintsup.c deleted file mode 100644 index 6c5115a05a..0000000000 --- a/usr/src/cmd/sgs/ldd/common/lintsup.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Supplimental Pseudo-code to get lint to consider these symbols used. - */ -#include "alist.h" -#include "msg.h" - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -foo() -{ - (void) _ldd_msg((Msg)&__ldd_msg[0]); - - (void) alist_append(NULL, NULL, 0, 0); - alist_delete_by_offset(NULL, NULL); - (void) alist_insert_by_offset(NULL, NULL, 0, 0, 0); - alist_reset(NULL); - - (void) aplist_delete_value(NULL, NULL); - aplist_reset(NULL); - (void) aplist_test(NULL, NULL, 0); -} diff --git a/usr/src/cmd/sgs/ldd/i386/Makefile b/usr/src/cmd/sgs/ldd/i386/Makefile index 32c0e146ac..c604f5274a 100644 --- a/usr/src/cmd/sgs/ldd/i386/Makefile +++ b/usr/src/cmd/sgs/ldd/i386/Makefile @@ -18,12 +18,11 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com @@ -32,6 +31,4 @@ include ../Makefile.com install \ package: $(ROOTPROG) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ldd/sparc/Makefile b/usr/src/cmd/sgs/ldd/sparc/Makefile index 32c0e146ac..c604f5274a 100644 --- a/usr/src/cmd/sgs/ldd/sparc/Makefile +++ b/usr/src/cmd/sgs/ldd/sparc/Makefile @@ -18,12 +18,11 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com @@ -32,6 +31,4 @@ include ../Makefile.com install \ package: $(ROOTPROG) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ldd/sparcv9/Makefile b/usr/src/cmd/sgs/ldd/sparcv9/Makefile index a89bb7561d..1819ad03dc 100644 --- a/usr/src/cmd/sgs/ldd/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ldd/sparcv9/Makefile @@ -18,12 +18,11 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com @@ -31,11 +30,8 @@ include ../Makefile.com CONVLIBDIR = $(CONVLIBDIR64) LLDFLAGS = $(LLDFLAGS64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) -lint: $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/lddstub/Makefile.targ b/usr/src/cmd/sgs/lddstub/Makefile.targ index b75c28e088..9575c44150 100644 --- a/usr/src/cmd/sgs/lddstub/Makefile.targ +++ b/usr/src/cmd/sgs/lddstub/Makefile.targ @@ -20,11 +20,11 @@ # CDDL HEADER END # # -#pragma ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1994-2001 by Sun Microsystems, Inc. # All rights reserved. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# .KEEP_STATE: @@ -42,6 +42,4 @@ delete: install: all -lint: - include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/ldprof/Makefile.com b/usr/src/cmd/sgs/ldprof/Makefile.com index f5ebebd867..81c85b2251 100644 --- a/usr/src/cmd/sgs/ldprof/Makefile.com +++ b/usr/src/cmd/sgs/ldprof/Makefile.com @@ -22,6 +22,7 @@ # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # LIBRARY= ldprof.a @@ -50,12 +51,8 @@ CFLAGS += $(C_PICFLAGS) SMOFF += indenting -lint := ZRECORD = LDLIBS += $(ZRECORD) -lmapmalloc -lc $(DLLIB) -LINTFLAGS += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 -LINTFLAGS64 += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 - BLTDEFS= msg.h BLTDATA= msg.c BLTMESG= $(SGSMSGDIR)/ldprof @@ -68,9 +65,8 @@ SGSMSGALL= $(SGSMSGCOM) SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n ldprof_msg SRCS= $(COMOBJS:%.o=../common/%.c) $(BLTDATA) -LINTSRCS= $(SRCS) ../common/lintsup.c -CLEANFILES += $(LINTOUTS) $(BLTFILES) -CLOBBERFILES += $(DYNLIB) $(LINTLIB) +CLEANFILES += $(BLTFILES) +CLOBBERFILES += $(DYNLIB) ROOTDYNLIB= $(DYNLIB:%=$(ROOTLIBDIR)/%) diff --git a/usr/src/cmd/sgs/ldprof/Makefile.targ b/usr/src/cmd/sgs/ldprof/Makefile.targ index a52407b7b6..abbea3f2cf 100644 --- a/usr/src/cmd/sgs/ldprof/Makefile.targ +++ b/usr/src/cmd/sgs/ldprof/Makefile.targ @@ -22,11 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -lint: $(SGSLINTOUT) - pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/cmd/sgs/ldprof/amd64/Makefile b/usr/src/cmd/sgs/ldprof/amd64/Makefile index 1958ced85c..5dff83cc9b 100644 --- a/usr/src/cmd/sgs/ldprof/amd64/Makefile +++ b/usr/src/cmd/sgs/ldprof/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -32,14 +32,12 @@ ROOTLIBDIR64= $(ROOT)/usr/lib/link_audit/$(MACH64) ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR64)/%) CFLAGS64 += $(C_PICFLAGS64) -D_ELF64 -LINTFLAGS64 += $(VAR_LINTFLAGS64) .KEEP_STATE: all: $(BLTDEFS) .WAIT $(DYNLIB) install package: all $(ROOTDYNLIB64) @echo doing make install $(ROOTDYNLIB64) -lint: $(LINTOUT64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/ldprof/common/lintsup.c b/usr/src/cmd/sgs/ldprof/common/lintsup.c deleted file mode 100644 index 616587919d..0000000000 --- a/usr/src/cmd/sgs/ldprof/common/lintsup.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1999 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * Supplimental definitions for lint that help us avoid - * options like `-x' that filter out things we want to - * know about as well as things we don't. - */ -#include "_rtld.h" - -int profile_rtld; -uintptr_t (* p_cg_interp)(int, caddr_t, caddr_t); diff --git a/usr/src/cmd/sgs/ldprof/i386/Makefile b/usr/src/cmd/sgs/ldprof/i386/Makefile index aa584f9c3a..2e70fda0be 100644 --- a/usr/src/cmd/sgs/ldprof/i386/Makefile +++ b/usr/src/cmd/sgs/ldprof/i386/Makefile @@ -19,12 +19,11 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com @@ -32,6 +31,5 @@ include ../Makefile.com all: $(BLTDEFS) .WAIT $(DYNLIB) install package: all $(ROOTDYNLIB) -lint: $(LINTOUT32) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ldprof/sparc/Makefile b/usr/src/cmd/sgs/ldprof/sparc/Makefile index aa584f9c3a..2e70fda0be 100644 --- a/usr/src/cmd/sgs/ldprof/sparc/Makefile +++ b/usr/src/cmd/sgs/ldprof/sparc/Makefile @@ -19,12 +19,11 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../Makefile.com @@ -32,6 +31,5 @@ include ../Makefile.com all: $(BLTDEFS) .WAIT $(DYNLIB) install package: all $(ROOTDYNLIB) -lint: $(LINTOUT32) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ldprof/sparcv9/Makefile b/usr/src/cmd/sgs/ldprof/sparcv9/Makefile index 1958ced85c..5dff83cc9b 100644 --- a/usr/src/cmd/sgs/ldprof/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ldprof/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -32,14 +32,12 @@ ROOTLIBDIR64= $(ROOT)/usr/lib/link_audit/$(MACH64) ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR64)/%) CFLAGS64 += $(C_PICFLAGS64) -D_ELF64 -LINTFLAGS64 += $(VAR_LINTFLAGS64) .KEEP_STATE: all: $(BLTDEFS) .WAIT $(DYNLIB) install package: all $(ROOTDYNLIB64) @echo doing make install $(ROOTDYNLIB64) -lint: $(LINTOUT64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/lex/Makefile b/usr/src/cmd/sgs/lex/Makefile index c60b9a3848..26fc646e8f 100644 --- a/usr/src/cmd/sgs/lex/Makefile +++ b/usr/src/cmd/sgs/lex/Makefile @@ -19,13 +19,10 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1993,1997 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/lex/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../../Makefile.master @@ -39,12 +36,10 @@ install := TARGET= install install_lib := TARGET= install_lib clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: -all clean clobber install install_lib lint: $(SUBDIRS) - +all clean clobber install install_lib: $(SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/lex/Makefile.com b/usr/src/cmd/sgs/lex/Makefile.com index e13b98168f..f2d2c37388 100644 --- a/usr/src/cmd/sgs/lex/Makefile.com +++ b/usr/src/cmd/sgs/lex/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= lex @@ -40,7 +42,7 @@ OBJECTS= $(LIBOBJS) $(LIBOBJS_W) $(LIBOBJS_E) FORMS= nceucform ncform nrform -include ../../../../lib/Makefile.lib +include ../../../../lib/Makefile.lib SRCDIR = ../common @@ -57,14 +59,7 @@ MACHSRCS= $(MACHOBJS:%.o=../common/%.c) LIBSRCS = $(LIBOBJS:%.o=../common/%.c) SRCS= $(MACHSRCS) $(LIBSRCS) -LIBS = $(DYNLIB) $(LINTLIB) - -# Append to LINTFLAGS and LINTFLAGS64 from lib/Makefile.lib -LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2 -erroff=E_FUNC_RET_MAYBE_IGNORED2 -LINTFLAGS64 += -erroff=E_NAME_MULTIPLY_DEF2 -erroff=E_FUNC_RET_MAYBE_IGNORED2 - -LINTSRCS= ../common/llib-l$(LIBNAME) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) +LIBS = $(DYNLIB) INCLIST= $(INCLIST_$(MACH)) -I../../include -I../../include/$(MACH) DEFLIST= -DELF @@ -83,15 +78,10 @@ pics/%_e.o:= DEFLIST = -DEUC -DJLSLEX -DEOPTION -D$*=$*_e CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) BUILD.AR= $(AR) $(ARFLAGS) $@ `$(LORDER) $(OBJS) | $(TSORT)` -LINTPOUT= lint.out - $(ROOTPROG):= FILEMODE = 0555 ROOTFORMS= $(FORMS:%=$(ROOTSHLIBCCS)/%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINT= $(LINTSRCS:../common/%=$(ROOTLINTDIR)/%) - DYNLINKLIBDIR= $(ROOTLIBDIR) DYNLINKLIB= $(LIBLINKS:%=$(DYNLINKLIBDIR)/%) @@ -101,7 +91,5 @@ $(DYNLIB) := CFLAGS64 += $(CCVERBOSE) LDLIBS += -lc -CLEANFILES += ../common/parser.c $(LINTPOUT) +CLEANFILES += ../common/parser.c CLOBBERFILES += $(LIBS) $(LIBRARY) - -lint: lintcheck diff --git a/usr/src/cmd/sgs/lex/Makefile.targ b/usr/src/cmd/sgs/lex/Makefile.targ index fcf853208f..c4653c5d75 100644 --- a/usr/src/cmd/sgs/lex/Makefile.targ +++ b/usr/src/cmd/sgs/lex/Makefile.targ @@ -23,6 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # $(PROG): objs .WAIT $(POBJS) @@ -79,19 +80,8 @@ objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) - $(DYNLINKLIBDIR)/%: %$(VERS) $(INS.liblink) clean: $(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES) - -$(LINTLIB): $$(SRCS) - $(LINT.c) -o $(LIBNAME) $(SRCS) > $(LINTOUT) 2>&1 - -lintcheck: $$(SRCS) - $(LINT.c) $(LINTCHECKFLAGS) $(SRCS) $(LDLIBS) - diff --git a/usr/src/cmd/sgs/lex/common/llib-ll b/usr/src/cmd/sgs/lex/common/llib-ll deleted file mode 100644 index 345b9fd191..0000000000 --- a/usr/src/cmd/sgs/lex/common/llib-ll +++ /dev/null @@ -1,43 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* Copyright (c) 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* from libl/common/allprint.c */ -extern void allprint(char); -extern void sprint(char *); -extern int printable(int); - -/* from libl/common/reject.c */ -extern int yyreject(void); -extern int yyracc(int); - -/* from libl/common/yyless.c */ -extern int yyless(int); - -/* from libl/common/yywrap.c */ -extern int yywrap(void); diff --git a/usr/src/cmd/sgs/lex/i386/Makefile b/usr/src/cmd/sgs/lex/i386/Makefile index 23cf9b00cf..7c4ed059ec 100644 --- a/usr/src/cmd/sgs/lex/i386/Makefile +++ b/usr/src/cmd/sgs/lex/i386/Makefile @@ -22,14 +22,12 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/sgs/lex/i386/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # INCLIST_i386= -I. -include ../../../Makefile.cmd +include ../../../Makefile.cmd include ../Makefile.com .KEEP_STATE: @@ -40,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/sparc/Makefile b/usr/src/cmd/sgs/lex/sparc/Makefile index 73f492b1e9..ca3f074cc4 100644 --- a/usr/src/cmd/sgs/lex/sparc/Makefile +++ b/usr/src/cmd/sgs/lex/sparc/Makefile @@ -22,14 +22,12 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/sgs/lex/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # INCLIST_sparc= -I../common -include ../../../Makefile.cmd +include ../../../Makefile.cmd include ../Makefile.com .KEEP_STATE: @@ -40,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/libconv/Makefile.com b/usr/src/cmd/sgs/libconv/Makefile.com index 3f095a9aeb..cfc99fce64 100644 --- a/usr/src/cmd/sgs/libconv/Makefile.com +++ b/usr/src/cmd/sgs/libconv/Makefile.com @@ -22,6 +22,7 @@ # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2018 Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # LIBRARY = libconv.a @@ -110,25 +111,10 @@ AS_CPPFLAGS= -P -D_ASM $(CPPFLAGS) BLTDATA= $(BLTOBJS:%.o=%.c) $(BLTOBJS:%.o=%.h) report_bufsize.h -SRCS= ../common/llib-lconv -LINTSRCS= $(COMOBJS:%.o=../common/%.c) \ - $(COMOBJS_NOMSG:%.o=../common/%.c) \ - $(ELFCOM_OBJS:%.o=$(ELFCAP)/%.c) ../common/lintsup.c -LINTSRCS32 = $(COMOBJS32:%32.o=../common/%.c) -LINTSRCS64 = $(COMOBJS64:%64.o=../common/%.c) - -# Since libconv uses dlopen(3C) to load libdemangle-sys.so (much like it did -# for the old Sun Studio libdemangle.so) in order to avoid messy bootstrapping -# problems, but it also needs the definitions from demangle-sys.h for -# SYSDEM_LANG_AUTO, lint will complain about sysdemangle() being defined but not -# used unless it is explicitly included during the lint pass -$(LINTOUT32) := LDLIBS += -ldemangle-sys -$(LINTOUT64) := LDLIBS += -ldemangle-sys +MSGSRCS= $(COMOBJS:%.o=../common/%.c) \ + $(COMOBJS_NOMSG:%.o=../common/%.c) \ + $(ELFCOM_OBJS:%.o=$(ELFCAP)/%.c) SGSMSGTARG= $(BLTOBJS:%_msg.o=../common/%.msg) -LINTFLAGS += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 -LINTFLAGS64 += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 - -CLEANFILES += $(BLTDATA) $(LINTOUTS) bld_vernote vernote.s -CLOBBERFILES += $(LINTLIBS) +CLEANFILES += $(BLTDATA) bld_vernote vernote.s diff --git a/usr/src/cmd/sgs/libconv/Makefile.targ b/usr/src/cmd/sgs/libconv/Makefile.targ index 9e23179a8a..94d9cf3fdf 100644 --- a/usr/src/cmd/sgs/libconv/Makefile.targ +++ b/usr/src/cmd/sgs/libconv/Makefile.targ @@ -23,6 +23,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< @@ -81,13 +83,8 @@ $(LIBRARY): pics $$(PICS) $(AR) $(ARFLAGS) $@ $(PICS) $(POST_PROCESS_A) -chkmsg: $(LINTSRCS) - sh $(CHKMSG) $(CHKMSGFLAGS) $(LINTSRCS) - -.PARALLEL: $(LINTOUT32) $(LINTOUT64) $(LINTLIB32) $(LINTLIB64) - -lint: $(LINTLIB32) $(LINTOUT32) $(LINTLIB64) $(LINTOUT64) \ - .WAIT $(SGSLINTOUT) +chkmsg: $(MSGSRCS) + sh $(CHKMSG) $(CHKMSGFLAGS) $(MSGSRCS) catalog: diff --git a/usr/src/cmd/sgs/libconv/common/lintsup.c b/usr/src/cmd/sgs/libconv/common/lintsup.c deleted file mode 100644 index 6f1dfc4125..0000000000 --- a/usr/src/cmd/sgs/libconv/common/lintsup.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2018, Joyent, Inc. - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Supplemental definitions for lint that help us avoid - * options like `-x' that filter out things we want to - * know about as well as things we don't. - */ - -/* - * The public interfaces are allowed to be "declared - * but not used". - */ -#include <stdio.h> -#include <sys/auxv.h> -#include <libelf.h> -#include <link.h> -#include <elfcap.h> -#include <dwarf.h> -#include "sgs.h" -#include "rtld.h" -#include "libld.h" -#include "conv.h" - -/* - * Suppress the actual message codes from the sgsmsg headers. - * With multiple string tables, we will have name collisions. - */ -#define LINTSUP_SUPPRESS_STRINGS -#include "arch_msg.h" -#include "audit_msg.h" -#include "c_literal_msg.h" -#include "cap_msg.h" -#include "config_msg.h" -#include "corenote_msg.h" -#include "data_msg.h" -#include "deftag_msg.h" -#include "demangle_msg.h" -#include "dl_msg.h" -#include "dwarf_ehe_msg.h" -#include "dwarf_msg.h" -#include "dynamic_msg.h" -#include "elf_msg.h" -#include "entry_msg.h" -#include "globals_msg.h" -#include "group_msg.h" -#include "lddstub_msg.h" -#include "map_msg.h" -#include "phdr_msg.h" -#include "relocate_amd64_msg.h" -#include "relocate_i386_msg.h" -#include "relocate_sparc_msg.h" -#include "sections_msg.h" -#include "segments_msg.h" -#include "symbols_msg.h" -#include "symbols_sparc_msg.h" -#include "syminfo_msg.h" -#include "time_msg.h" -#include "version_msg.h" - -void -foo() -{ -#define USE(name) (void) name((Msg)&_ ## name[0]) - - USE(_sgs_msg_libconv_arch); - USE(_sgs_msg_libconv_audit); - USE(_sgs_msg_libconv_c_literal); - USE(_sgs_msg_libconv_cap); - USE(_sgs_msg_libconv_config); - USE(_sgs_msg_libconv_corenote); - USE(_sgs_msg_libconv_data); - USE(_sgs_msg_libconv_deftag); - USE(_sgs_msg_libconv_demangle); - USE(_sgs_msg_libconv_dl); - USE(_sgs_msg_libconv_dwarf_ehe); - USE(_sgs_msg_libconv_dwarf); - USE(_sgs_msg_libconv_dynamic); - USE(_sgs_msg_libconv_elf); - USE(_sgs_msg_libconv_entry); - USE(_sgs_msg_libconv_globals); - USE(_sgs_msg_libconv_group); - USE(_sgs_msg_libconv_lddstub); - USE(_sgs_msg_libconv_map); - USE(_sgs_msg_libconv_phdr); - USE(_sgs_msg_libconv_relocate_amd64); - USE(_sgs_msg_libconv_relocate_i386); - USE(_sgs_msg_libconv_relocate_sparc); - USE(_sgs_msg_libconv_sections); - USE(_sgs_msg_libconv_segments); - USE(_sgs_msg_libconv_symbols); - USE(_sgs_msg_libconv_symbols_sparc); - USE(_sgs_msg_libconv_syminfo); - USE(_sgs_msg_libconv_time); - USE(_sgs_msg_libconv_version); - -#undef USE -} diff --git a/usr/src/cmd/sgs/libconv/common/llib-lconv b/usr/src/cmd/sgs/libconv/common/llib-lconv deleted file mode 100644 index 42006517ce..0000000000 --- a/usr/src/cmd/sgs/libconv/common/llib-lconv +++ /dev/null @@ -1,311 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <stdlib.h> -#include <libelf.h> -#include <_machelf.h> -#include <sgs.h> -#include <libld.h> -#include <conv.h> - -/* - * Generic miscellaneous interfaces - */ -uchar_t conv_check_native(char **, char **); -const char *conv_lddstub(int); -int conv_sys_eclass(void); -int conv_strproc_isspace(int); -char *conv_strproc_trim(char *); -Boolean conv_strproc_extract_value(char *, size_t, int, const char **); - - -/* - * Generic core formatting and iteration functionality - */ -conv_iter_ret_t _conv_iter_ds(conv_iter_osabi_t, Half, const conv_ds_t **, - conv_iter_cb_t, void *, const char *); -conv_iter_ret_t _conv_iter_ds_msg(const conv_ds_msg_t *, conv_iter_cb_t, - void *, const char *); -conv_iter_ret_t _conv_iter_msgarr(Conv_elfvalue_t, const Msg *, size_t, - conv_iter_cb_t, void *, const char *); -conv_iter_ret_t _conv_iter_vd(const Val_desc *, conv_iter_cb_t, - void *, const char *); -conv_iter_ret_t _conv_iter_vd2(conv_iter_osabi_t, Half, const Val_desc2 *, - conv_iter_cb_t, void *, const char *); -int conv_iter_strtol_init(const char *, conv_strtol_uvalue_t *); -conv_iter_ret_t conv_iter_strtol(const char *, Conv_elfvalue_t, void *); -const char *_conv_map2str(Conv_inv_buf_t *, Conv_elfvalue_t, - Conv_fmt_flags_t, size_t, const Msg *, const char *); -const char *_conv_map_ds(uchar_t, Half, Conv_elfvalue_t, - const conv_ds_t **, Conv_fmt_flags_t, Conv_inv_buf_t *, - const char *); -const char *_conv_map_vd2str(Conv_inv_buf_t *, Conv_elfvalue_t, - Conv_fmt_flags_t, const Val_desc *, const char *); -const char *_conv_map_vd22str(Conv_inv_buf_t *, uchar_t, Half, - Conv_elfvalue_t, Conv_fmt_flags_t, const Val_desc2 *, - const char *); - -/* - * Generic formatting interfaces. - */ -const char *conv_bnd_obj(uint_t, Conv_bnd_obj_buf_t *); -const char *conv_bnd_type(uint_t, Conv_bnd_type_buf_t *); -const char *conv_config_feat(int, Conv_config_feat_buf_t *); -const char *conv_config_obj(ushort_t, Conv_config_obj_buf_t *); -const char *conv_config_upm(const char *, const char *, - const char *, size_t); -const char *conv_cnote_auxv_af(Word, Conv_fmt_flags_t, - Conv_cnote_auxv_af_buf_t *); -const char *conv_cnote_auxv_type(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_cc_content(Lword, Conv_fmt_flags_t, - Conv_cnote_cc_content_buf_t *); -const char *conv_cnote_errno(int, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_fault(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_fltset(uint32_t *, int, Conv_fmt_flags_t, - Conv_cnote_fltset_buf_t *); -const char *conv_cnote_old_pr_flags(int, Conv_fmt_flags_t, - Conv_cnote_old_pr_flags_buf_t *); -const char *conv_cnote_pr_dmodel(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_pr_flags(int, Conv_fmt_flags_t, - Conv_cnote_pr_flags_buf_t *); -const char *conv_cnote_proc_flag(int, Conv_fmt_flags_t, - Conv_cnote_proc_flag_buf_t *); -const char *conv_cnote_pr_regname(Half, int, Conv_fmt_flags_t, - Conv_inv_buf_t *inv_buf); -const char *conv_cnote_pr_stype(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_pr_what(short, short, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_cnote_pr_why(short, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_priv(int, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_psetid(int, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_sa_flags(int, Conv_fmt_flags_t, - Conv_cnote_sa_flags_buf_t *); -const char *conv_cnote_signal(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_si_code(Half, int, int, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_cnote_sigset(uint32_t *, int, Conv_fmt_flags_t, - Conv_cnote_sigset_buf_t *); -const char *conv_cnote_ss_flags(int, Conv_fmt_flags_t, - Conv_cnote_ss_flags_buf_t *); -const char *conv_cnote_syscall(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_cnote_sysset(uint32_t *, int, Conv_fmt_flags_t, - Conv_cnote_sysset_buf_t *); -const char *conv_cnote_type(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_def_tag(Symref, Conv_inv_buf_t *); -const char *conv_demangle_name(const char *); -const char *conv_dl_flag(int, Conv_fmt_flags_t, Conv_dl_flag_buf_t *); -const char *conv_dl_info(int); -const char *conv_dl_mode(int, int, Conv_dl_mode_buf_t *); -const char *conv_dwarf_cfa(uchar_t, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_dwarf_ehe(uint_t, Conv_dwarf_ehe_buf_t *); -const char *conv_dwarf_regname(Half, Word, Conv_fmt_flags_t, - int *, Conv_inv_buf_t *); -const char *conv_ehdr_abivers(uchar_t, Word, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_ehdr_class(uchar_t, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_ehdr_data(uchar_t, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_ehdr_flags(Half, Word, Conv_fmt_flags_t, - Conv_ehdr_flags_buf_t *); -const char *conv_ehdr_mach(Half, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_ehdr_osabi(uchar_t, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_ehdr_type(uchar_t, Half, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_ehdr_vers(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_elfdata_type(Elf_Type, Conv_inv_buf_t *); -const char *conv_ent_flags(ec_flags_t, Conv_ent_flags_buf_t *); -const char *conv_ent_filcmp(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_grphdl_flags(uint_t, Conv_grphdl_flags_buf_t *); -const char *conv_grpdesc_flags(uint_t, Conv_grpdesc_flags_buf_t *); -const char *conv_la_activity(uint_t, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_la_bind(uint_t, Conv_la_bind_buf_t *); -const char *conv_la_search(uint_t, Conv_la_search_buf_t *); -const char *conv_la_symbind(uint_t, Conv_la_symbind_buf_t *); -Isa_desc *conv_isalist(void); -const char *conv_mapfile_version(Word, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_phdr_flags(uchar_t, Word, Conv_fmt_flags_t, - Conv_phdr_flags_buf_t *); -const char *conv_phdr_type(uchar_t, Half, Word, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_reject_desc(Rej_desc *, Conv_reject_desc_buf_t *, - Half mach); -const char *conv_reloc_type(Half, Word, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_reloc_type_static(Half, Word, Conv_fmt_flags_t); -const char *conv_reloc_386_type(Word, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_reloc_amd64_type(Word, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_reloc_SPARC_type(Word, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_sec_type(uchar_t, Half, Word, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_seg_flags(Half, Conv_seg_flags_buf_t *); -void conv_str_to_c_literal(const char *buf, size_t n, - Conv_str_to_c_literal_func_t *cb_func, void *uvalue); -const char *conv_sym_info_bind(uchar_t, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_sym_info_type(Half, uchar_t, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_sym_shndx(uchar_t, Half, Half, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_sym_other(uchar_t, Conv_inv_buf_t *); -const char *conv_sym_other_vis(uchar_t, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv_syminfo_boundto(Half, Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv_syminfo_flags(Half, Conv_fmt_flags_t, - Conv_syminfo_flags_buf_t *); -const char *conv_time(struct timeval *, struct timeval *, - Conv_time_buf_t *); -Uts_desc *conv_uts(void); -const char *conv_ver_flags(Half, Conv_fmt_flags_t, Conv_ver_flags_buf_t *); -const char *conv_ver_index(Versym, int, Conv_inv_buf_t *); - - -/* - * Generic iteration interfaces. - */ -conv_iter_ret_t conv_iter_cap_tags(Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_cap_val_hw1(Half, Conv_fmt_flags_t, - conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_cap_val_hw2(Half, Conv_fmt_flags_t, - conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_cap_val_sf1(Conv_fmt_flags_t, conv_iter_cb_t, void *); - -conv_iter_ret_t conv_iter_dyn_feature1(Conv_fmt_flags_t, - conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_dyn_flag(Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_dyn_flag1(Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_dyn_posflag1(Conv_fmt_flags_t, - conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_dyn_tag(conv_iter_osabi_t, Half, - Conv_fmt_flags_t, conv_iter_cb_t, void *); - -conv_iter_ret_t conv_iter_ehdr_abivers(conv_iter_osabi_t, - Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_ehdr_class(Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_ehdr_data(Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_ehdr_eident(Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_ehdr_flags(Half, Conv_fmt_flags_t, - conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_ehdr_mach(Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_ehdr_osabi(Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_ehdr_type(conv_iter_osabi_t, Conv_fmt_flags_t, - conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_ehdr_vers(Conv_fmt_flags_t, conv_iter_cb_t, void *); - -conv_iter_ret_t conv_iter_phdr_flags(conv_iter_osabi_t, - Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_phdr_type(conv_iter_osabi_t, Conv_fmt_flags_t, - conv_iter_cb_t, void *); - -conv_iter_ret_t conv_iter_sec_flags(conv_iter_osabi_t, Half, - Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_sec_symtab(conv_iter_osabi_t, - Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_sec_type(conv_iter_osabi_t, Half, - Conv_fmt_flags_t, conv_iter_cb_t, void *); - -conv_iter_ret_t conv_iter_sym_info_bind(Conv_fmt_flags_t, - conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_sym_other_vis(Conv_fmt_flags_t, - conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_sym_shndx(conv_iter_osabi_t, Half, - Conv_fmt_flags_t, conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_sym_info_type(Half, Conv_fmt_flags_t, - conv_iter_cb_t, void *); - -conv_iter_ret_t conv_iter_syminfo_boundto(Conv_fmt_flags_t, - conv_iter_cb_t, void *); -conv_iter_ret_t conv_iter_syminfo_flags(Conv_fmt_flags_t, - conv_iter_cb_t, void *); - - -/* - * ELFCLASS-specific core formatting functionality - */ -int _conv_expn_field(CONV_EXPN_FIELD_ARG *, - const Val_desc *, Conv_fmt_flags_t, const char *); -int _conv_expn_field2(CONV_EXPN_FIELD_ARG *, uchar_t, - Half, const Val_desc2 *, Conv_fmt_flags_t, const char *); -const char *conv_invalid_val(Conv_inv_buf_t *, Xword, Conv_fmt_flags_t); - - -/* - * Define all class specific routines. - */ -const char *conv32_cap_tag(Elf32_Word, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv64_cap_tag(Elf64_Xword, Conv_fmt_flags_t, - Conv_inv_buf_t *); -const char *conv32_cap_val(Elf32_Word, Elf32_Word, Half, - Conv_fmt_flags_t, Conv_cap_val_buf_t *); -const char *conv64_cap_val(Elf64_Xword, Elf64_Xword, Half, - Conv_fmt_flags_t, Conv_cap_val_buf_t *); -const char *conv32_cap_val_hw1(Elf32_Word, Half, Conv_fmt_flags_t, - Conv_cap_val_hw1_buf_t *); -const char *conv32_cap_val_hw2(Elf32_Word, Half, Conv_fmt_flags_t, - Conv_cap_val_hw2_buf_t *); -const char *conv64_cap_val_hw1(Elf64_Xword, Half, Conv_fmt_flags_t, - Conv_cap_val_hw1_buf_t *); -const char *conv64_cap_val_hw2(Elf64_Xword, Half, Conv_fmt_flags_t, - Conv_cap_val_hw2_buf_t *); -const char *conv32_cap_val_sf1(Elf32_Word, Half, Conv_fmt_flags_t, - Conv_cap_val_sf1_buf_t *); -const char *conv64_cap_val_sf1(Elf64_Xword, Half, Conv_fmt_flags_t, - Conv_cap_val_sf1_buf_t *); -const char *conv32_dyn_flag1(Elf32_Word, Conv_fmt_flags_t, - Conv_dyn_flag1_buf_t *); -const char *conv64_dyn_flag1(Elf64_Xword, Conv_fmt_flags_t, - Conv_dyn_flag1_buf_t *); -const char *conv32_dyn_flag(Elf32_Word, int, Conv_dyn_flag_buf_t *); -const char *conv64_dyn_flag(Elf64_Xword, int, Conv_dyn_flag_buf_t *); -const char *conv32_dyn_posflag1(Elf32_Word, int, - Conv_dyn_posflag1_buf_t *); -const char *conv64_dyn_posflag1(Elf64_Xword, int, - Conv_dyn_posflag1_buf_t *); -const char *conv32_dyn_tag(Elf32_Word, uchar_t, Elf32_Half, - Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv64_dyn_tag(Elf64_Xword, uchar_t, Elf64_Half, - Conv_fmt_flags_t, Conv_inv_buf_t *); -const char *conv32_dyn_feature1(Elf32_Word, int, - Conv_dyn_feature1_buf_t *); -const char *conv64_dyn_feature1(Elf64_Xword, int, - Conv_dyn_feature1_buf_t *); -const char *conv32_sec_flags(uchar_t, Half, Elf32_Word, Conv_fmt_flags_t, - Conv_sec_flags_buf_t *); -const char *conv64_sec_flags(uchar_t, Half, Elf64_Xword, Conv_fmt_flags_t, - Conv_sec_flags_buf_t *); -const char *conv32_sec_linkinfo(Elf32_Word, Elf32_Word, - Conv_inv_buf_t *); -const char *conv64_sec_linkinfo(Elf64_Word, Elf64_Xword, - Conv_inv_buf_t *); -const char *conv32_sym_value(Elf32_Half, uchar_t, Elf32_Addr, - Conv_inv_buf_t *); -const char *conv64_sym_value(Elf64_Half, uchar_t, Elf64_Addr, - Conv_inv_buf_t *); -const char *conv32_sym_SPARC_value(Elf32_Addr, int, Conv_inv_buf_t *); -const char *conv64_sym_SPARC_value(Elf64_Addr, int, Conv_inv_buf_t *); diff --git a/usr/src/cmd/sgs/libcrle/Makefile.com b/usr/src/cmd/sgs/libcrle/Makefile.com index 6419340503..92904198aa 100644 --- a/usr/src/cmd/sgs/libcrle/Makefile.com +++ b/usr/src/cmd/sgs/libcrle/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# LIBRARY= libcrle.a VERS= .1 @@ -38,16 +40,11 @@ include $(SRC)/cmd/sgs/Makefile.com SRCDIR = ../common -lint := ZRECORD = LDLIBS += $(ZRECORD) -lmapmalloc $(DLLIB) -lc -LINTFLAGS += -u -LINTFLAGS64 += -u - CPPFLAGS += -I$(SRCBASE)/lib/libc/inc -I$(SRC)/common/sgsrtcid DYNFLAGS += $(VERSREF) $(CONVLIBDIR) -lconv $(CC_USE_PROTO) - BLTDEFS= msg.h BLTDATA= msg.c BLTMESG= $(SGSMSGDIR)/libcrle @@ -60,9 +57,8 @@ SGSMSGTARG= $(SGSMSGCOM) SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n libcrle_msg LIBSRCS= $(COMOBJS:%.o=../common/%.c) $(BLTDATA) -LINTSRCS= $(LIBSRCS) -CLEANFILES += $(LINTOUTS) $(BLTFILES) -CLOBBERFILES += $(DYNLIB) $(LINTLIB) $(LIBLINKS) +CLEANFILES += $(BLTFILES) +CLOBBERFILES += $(DYNLIB) $(LIBLINKS) ROOTDYNLIB= $(DYNLIB:%=$(ROOTLIBDIR)/%) diff --git a/usr/src/cmd/sgs/libcrle/amd64/Makefile b/usr/src/cmd/sgs/libcrle/amd64/Makefile index 425d513e92..bdabb4e0f7 100644 --- a/usr/src/cmd/sgs/libcrle/amd64/Makefile +++ b/usr/src/cmd/sgs/libcrle/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -31,7 +31,6 @@ include ../Makefile.com CONVLIBDIR= $(CONVLIBDIR64) ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR64)/%) -LINTFLAGS64 += $(VAR_LINTFLAGS64) CPPFLAGS += -D_ELF64 .KEEP_STATE: @@ -41,7 +40,5 @@ all: $(DYNLIB) $(LIBLINKS) install \ package: all $(ROOTDYNLIB64) -lint: $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/libcrle/i386/Makefile b/usr/src/cmd/sgs/libcrle/i386/Makefile index 488cb7f9a8..683ffc3a05 100644 --- a/usr/src/cmd/sgs/libcrle/i386/Makefile +++ b/usr/src/cmd/sgs/libcrle/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -35,6 +35,4 @@ all: $(DYNLIB) $(LIBLINKS) install \ package: all $(ROOTDYNLIB) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libcrle/sparc/Makefile b/usr/src/cmd/sgs/libcrle/sparc/Makefile index 488cb7f9a8..683ffc3a05 100644 --- a/usr/src/cmd/sgs/libcrle/sparc/Makefile +++ b/usr/src/cmd/sgs/libcrle/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -35,6 +35,4 @@ all: $(DYNLIB) $(LIBLINKS) install \ package: all $(ROOTDYNLIB) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libcrle/sparcv9/Makefile b/usr/src/cmd/sgs/libcrle/sparcv9/Makefile index 425d513e92..bdabb4e0f7 100644 --- a/usr/src/cmd/sgs/libcrle/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libcrle/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -31,7 +31,6 @@ include ../Makefile.com CONVLIBDIR= $(CONVLIBDIR64) ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR64)/%) -LINTFLAGS64 += $(VAR_LINTFLAGS64) CPPFLAGS += -D_ELF64 .KEEP_STATE: @@ -41,7 +40,5 @@ all: $(DYNLIB) $(LIBLINKS) install \ package: all $(ROOTDYNLIB64) -lint: $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/libdl/Makefile.com b/usr/src/cmd/sgs/libdl/Makefile.com index eac0600bee..edc149f8ec 100644 --- a/usr/src/cmd/sgs/libdl/Makefile.com +++ b/usr/src/cmd/sgs/libdl/Makefile.com @@ -20,11 +20,10 @@ # # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # LIBRARY = libdl.a VERS = .1 include $(SRC)/lib/Makefile.rootfs - -LIBS += $(LINTLIB) diff --git a/usr/src/cmd/sgs/libdl/common/llib-ldl b/usr/src/cmd/sgs/libdl/common/llib-ldl deleted file mode 100644 index 66a16aa60d..0000000000 --- a/usr/src/cmd/sgs/libdl/common/llib-ldl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#include <sys/types.h> -#include <link.h> -#include <dlfcn.h> - -void * dlopen(const char *, int); -void * dlsym(void *_RESTRICT_KYWD, const char *_RESTRICT_KYWD); -int dlclose(void *); -char * dlerror(void); -void * dlmopen(Lmid_t, const char *, int); -int dladdr(void *, Dl_info *); -int dladdr1(void *, Dl_info *, void **, int); -int dldump(const char *, const char *, int); -int dlinfo(void *, int, void *); -void _ld_libc(void *); -int dl_iterate_phdr(int (*)(struct dl_phdr_info *, size_t, void *), void *); diff --git a/usr/src/cmd/sgs/libdl/i386/Makefile b/usr/src/cmd/sgs/libdl/i386/Makefile index 3faec045c9..ea152db4b2 100644 --- a/usr/src/cmd/sgs/libdl/i386/Makefile +++ b/usr/src/cmd/sgs/libdl/i386/Makefile @@ -22,12 +22,14 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include $(SRC)/lib/Makefile.filter.com include ../Makefile.com DYNFLAGS += -F /usr/lib/ld.so.1 -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/sparc/Makefile b/usr/src/cmd/sgs/libdl/sparc/Makefile index 6bc95b1ea1..371e25288e 100644 --- a/usr/src/cmd/sgs/libdl/sparc/Makefile +++ b/usr/src/cmd/sgs/libdl/sparc/Makefile @@ -22,6 +22,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include $(SRC)/lib/Makefile.filter.com include ../Makefile.com @@ -37,8 +39,7 @@ ROOT4LIBDIR = $(ROOT)/usr/4lib ROOT4LINKS = $(ROOT4LIBDIR)/$(4DYNLIB) $(ROOT4LINKS):= LIBLINKPATH = ../../lib/ -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \ - $(ROOT4LINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOT4LINKS) $(ROOT4LINKS): $(ROOTFS_DYNLIB) $(INS.liblink) diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com index 90c360940b..c715eba55e 100644 --- a/usr/src/cmd/sgs/libelf/Makefile.com +++ b/usr/src/cmd/sgs/libelf/Makefile.com @@ -22,6 +22,7 @@ # Copyright 2015 Gary Mills # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # LIBRARY= libelf.a @@ -66,9 +67,6 @@ MAPFILES = ../common/mapfile-vers DYNFLAGS += $(VERSREF) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lc -LINTFLAGS += -u -erroff=E_BAD_PTR_CAST_ALIGN -LINTFLAGS64 += -u -erroff=E_CAST_INT_TO_SMALL_INT - CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized @@ -96,20 +94,16 @@ SGSMSGFLAGS2= $(SGSMSGFLAGS) -h $(BLTDEFS) -d $(BLTDATA) -n libelf_msg BLTSRCS= $(BLTOBJS:%.o=%.c) LIBSRCS= $(COMOBJS:%.o=../common/%.c) $(MISCOBJS:%.o=../misc/%.c) \ $(MACHOBJS:%.o=%.c) $(BLTSRCS) -SRCS= ../common/llib-lelf -LINTSRCS= $(LIBSRCS) ../common/lintsup.c ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) -ROOTFS_LINTLIB= $(LINTLIB:%=$(ROOTFS_LIBDIR)/%) ROOTFS_DYNLIB64= $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -ROOTFS_LINTLIB64= $(LINTLIB:%=$(ROOTFS_LIBDIR64)/%) $(ROOTFS_DYNLIB) := FILEMODE= 755 $(ROOTFS_DYNLIB64) := FILEMODE= 755 -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) -CLEANFILES += $(LINTOUTS) $(BLTSRCS) $(BLTFILES) +CLEANFILES += $(BLTSRCS) $(BLTFILES) .PARALLEL: $(LIBS) diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ b/usr/src/cmd/sgs/libelf/Makefile.targ index 0ca8d64218..7fd082fb9f 100644 --- a/usr/src/cmd/sgs/libelf/Makefile.targ +++ b/usr/src/cmd/sgs/libelf/Makefile.targ @@ -21,6 +21,7 @@ # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # objs/%.o \ @@ -46,16 +47,7 @@ pics/%.o: ../common/%.c all: $(BLTSRCS) .WAIT $(LIBS) $(LIBLINKS) install: all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \ - $(ROOTFS_LINTLIB) \ - .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) \ - $(ROOTFS_LIBDIR)/$(LINTLIBSRC) - -$(ROOTFS_LIBDIR)/$(LINTLIBSRC): ../common/$(LINTLIBSRC) - $(VAR_POUND_1) $(INS.file) ../common/$(LINTLIBSRC) - -lint: $(LINTLIB) $(LINTOUT32) $(LINTOUT64) $(SGSLINTOUT) - -.PARALLEL: $(LINTOUT32) $(LINTOUT64) + .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) delete: $(RM) $(DYNLIB) diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ.64 b/usr/src/cmd/sgs/libelf/Makefile.targ.64 index 7ea67ef177..058ceace4c 100644 --- a/usr/src/cmd/sgs/libelf/Makefile.targ.64 +++ b/usr/src/cmd/sgs/libelf/Makefile.targ.64 @@ -20,6 +20,7 @@ # # # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # objs/%.o \ @@ -44,13 +45,7 @@ pics/%.o: ../common/%.c all: $(BLTSRCS) .WAIT $(LIBS) $(LIBLINKS) -install: all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) \ - $(ROOTFS_LINTLIB64) - -lint: $(LINTLIB) $(LINTOUT32) $(LINTOUT64) $(SGSLINTOUT) - -.PARALLEL: $(LINTOUT32) $(LINTOUT64) - +install: all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) delete: $(RM) $(DYNLIB) diff --git a/usr/src/cmd/sgs/libelf/amd64/Makefile b/usr/src/cmd/sgs/libelf/amd64/Makefile index 38303fff2e..99651ac38b 100644 --- a/usr/src/cmd/sgs/libelf/amd64/Makefile +++ b/usr/src/cmd/sgs/libelf/amd64/Makefile @@ -23,14 +23,13 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com CONVLIBDIR= $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) MISCOBJS= $(MISCOBJS64) .KEEP_STATE: diff --git a/usr/src/cmd/sgs/libelf/common/lintsup.c b/usr/src/cmd/sgs/libelf/common/lintsup.c deleted file mode 100644 index a13104e7c3..0000000000 --- a/usr/src/cmd/sgs/libelf/common/lintsup.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <malloc.h> -#include <link.h> -#include <sgs.h> -#include <_libelf.h> diff --git a/usr/src/cmd/sgs/libelf/common/llib-lelf b/usr/src/cmd/sgs/libelf/common/llib-lelf deleted file mode 100644 index f525dde839..0000000000 --- a/usr/src/cmd/sgs/libelf/common/llib-lelf +++ /dev/null @@ -1,152 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Generic interface definition for usr/src/lib/libelf. - */ - -#include <_libelf.h> -#include <nlist.h> - - -/* - * Elf32 Symbols - */ -size_t elf32_fsize(Elf_Type, size_t, uint_t); -Elf32_Ehdr * elf32_getehdr(Elf *); -Elf32_Phdr * elf32_getphdr(Elf *); -Elf32_Shdr * elf32_getshdr(Elf_Scn *); -Elf32_Ehdr * elf32_newehdr(Elf *); -Elf32_Phdr * elf32_newphdr(Elf *, size_t); -Elf_Data * elf32_xlatetof(Elf_Data *, const Elf_Data *, uint_t); -Elf_Data * elf32_xlatetom(Elf_Data *, const Elf_Data *, uint_t); - - -/* - * Elf64 Symbols - */ -size_t elf64_fsize(Elf_Type, size_t, uint_t); -Elf64_Ehdr * elf64_getehdr(Elf *); -Elf64_Phdr * elf64_getphdr(Elf *); -Elf64_Shdr * elf64_getshdr(Elf_Scn *); -Elf64_Ehdr * elf64_newehdr(Elf *); -Elf64_Phdr * elf64_newphdr(Elf *, size_t); -Elf_Data * elf64_xlatetof(Elf_Data *, const Elf_Data *, uint_t); -Elf_Data * elf64_xlatetom(Elf_Data *, const Elf_Data *, uint_t); - - -/* - * GElf Symbols - */ -size_t gelf_fsize(Elf *, Elf_Type, size_t, uint_t); -int gelf_getclass(Elf *); -GElf_Ehdr * gelf_getehdr(Elf *, GElf_Ehdr *); -int gelf_update_ehdr(Elf *, GElf_Ehdr *); -ulong_t gelf_newehdr(Elf *, int); -GElf_Phdr * gelf_getphdr(Elf *, int, GElf_Phdr *); -int gelf_update_phdr(Elf *, int, GElf_Phdr *); -ulong_t gelf_newphdr(Elf *, size_t); -GElf_Shdr * gelf_getshdr(Elf_Scn *, GElf_Shdr *); -int gelf_update_shdr(Elf_Scn *, GElf_Shdr *); -Elf_Data * gelf_xlatetof(Elf *, Elf_Data *, const Elf_Data *, uint_t); -Elf_Data * gelf_xlatetom(Elf *, Elf_Data *, const Elf_Data *, uint_t); -GElf_Sym * gelf_getsym(Elf_Data *, int, GElf_Sym *); -int gelf_update_sym(Elf_Data *, int, GElf_Sym *); -GElf_Syminfo * gelf_getsyminfo(Elf_Data *, int, GElf_Syminfo *); -int gelf_update_syminfo(Elf_Data *, int, GElf_Syminfo *); -GElf_Sym * gelf_getsymshndx(Elf_Data *, Elf_Data *, int, GElf_Sym *, - Elf32_Word *); -int gelf_update_symshndx(Elf_Data *, Elf_Data *, int, GElf_Sym *, - Elf32_Word); -GElf_Move * gelf_getmove(Elf_Data *, int, GElf_Move *); -int gelf_update_move(Elf_Data *, int, GElf_Move *); -GElf_Dyn * gelf_getdyn(Elf_Data *, int, GElf_Dyn *); -int gelf_update_dyn(Elf_Data *, int, GElf_Dyn *); -GElf_Rela * gelf_getrela(Elf_Data *, int, GElf_Rela *); -int gelf_update_rela(Elf_Data *, int, GElf_Rela *); -GElf_Rel * gelf_getrel(Elf_Data *, int, GElf_Rel *); -int gelf_update_rel(Elf_Data *, int, GElf_Rel *); -GElf_Cap * gelf_getcap(Elf_Data *, int, GElf_Cap *); -int gelf_update_cap(Elf_Data *, int, GElf_Cap *); - -GElf_Xword _gelf_getdyndtflags_1(Elf *); - -/* - * Class-Independent Elf Symbols - */ -Elf * elf_begin(int, Elf_Cmd, Elf *); -int elf_cntl(Elf *, Elf_Cmd); -int elf_end(Elf *); -const char * elf_errmsg(int); -int elf_errno(void); -void elf_fill(int); -uint_t elf_flagdata(Elf_Data *, Elf_Cmd, uint_t); -uint_t elf_flagehdr(Elf *, Elf_Cmd, uint_t); -uint_t elf_flagelf(Elf *, Elf_Cmd, uint_t); -uint_t elf_flagphdr(Elf *, Elf_Cmd, uint_t); -uint_t elf_flagscn(Elf_Scn *, Elf_Cmd, uint_t); -uint_t elf_flagshdr(Elf_Scn *, Elf_Cmd, uint_t); -Elf_Arhdr * elf_getarhdr(Elf *); -Elf_Arsym * elf_getarsym(Elf *, size_t *); -off_t elf_getbase(Elf *); -Elf_Data * elf_getdata(Elf_Scn *, Elf_Data *); -char * elf_getident(Elf *, size_t *); -int elf_getphnum(Elf *, size_t *); -int elf_getshnum(Elf *, size_t *); -int elf_getshstrndx(Elf *, size_t *); -Elf_Scn * elf_getscn(Elf *elf, size_t); -ulong_t elf_hash(const char *); -Elf_Kind elf_kind(Elf *); -Elf * elf_memory(char *, size_t); -size_t elf_ndxscn(Elf_Scn *); -Elf_Data * elf_newdata(Elf_Scn *); -Elf_Scn * elf_newscn(Elf *); -Elf_Cmd elf_next(Elf *); -Elf_Scn * elf_nextscn(Elf *, Elf_Scn *); -size_t _elf_outsync(int, char *, size_t, uint_t); -size_t elf_rand(Elf *, size_t); -Elf_Data * elf_rawdata(Elf_Scn *, Elf_Data *); -char * elf_rawfile(Elf *, size_t *); -char * elf_strptr(Elf *, size_t, size_t); -off_t elf_update(Elf *, Elf_Cmd); -uint_t elf_version(uint_t); -int nlist(const char *, struct nlist *); - - -/* - * Private Symbols - */ -extern void _elf_execfill(_elf_execfill_func_t *); -extern off_t _elf_getarhdrbase(Elf *); -extern size_t _elf_getarsymwordsize(Elf *); -extern size_t _elf_getnextoff(Elf *); -Elf64_Off _elf_getxoff(Elf_Data *); -int _elf_swap_wrimage(Elf *); -uint_t _elf_sys_encoding(void); - -extern GElf_Xword _gelf_getdyndtflags_1(Elf *); diff --git a/usr/src/cmd/sgs/libelf/sparcv9/Makefile b/usr/src/cmd/sgs/libelf/sparcv9/Makefile index 38303fff2e..99651ac38b 100644 --- a/usr/src/cmd/sgs/libelf/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libelf/sparcv9/Makefile @@ -23,14 +23,13 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com CONVLIBDIR= $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) MISCOBJS= $(MISCOBJS64) .KEEP_STATE: diff --git a/usr/src/cmd/sgs/libld/Makefile.com b/usr/src/cmd/sgs/libld/Makefile.com index 08efdd8315..44f372d088 100644 --- a/usr/src/cmd/sgs/libld/Makefile.com +++ b/usr/src/cmd/sgs/libld/Makefile.com @@ -24,6 +24,7 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. LIBRARY = libld.a VERS = .4 @@ -50,8 +51,7 @@ TOOLOBJS = alist.o assfail.o findprime.o string_table.o \ strhash.o AVLOBJ = avl.o -# Relocation engine objects. These are kept separate from the L_XXX_MACHOBJS -# lists below in order to facilitate linting them. +# Relocation engine objects. G_MACHOBJS32 = doreloc_sparc_32.o doreloc_x86_32.o G_MACHOBJS64 = doreloc_sparc_64.o doreloc_x86_64.o @@ -64,7 +64,6 @@ E_X86_TOOLOBJS = leb128.o L_X86_MACHOBJS32 = machrel.intel32.o L_X86_MACHOBJS64 = machrel.amd64.o - # All target specific objects rolled together E_TOOLOBJS = $(E_SPARC_TOOLOBJS) \ $(E_X86_TOOLOBJS) @@ -74,7 +73,6 @@ L_MACHOBJS64 = $(L_SPARC_MACHOBJS64) \ $(L_X86_MACHOBJS64) - BLTOBJ = msg.o ELFCAPOBJ = elfcap.o @@ -83,8 +81,8 @@ OBJECTS = $(BLTOBJ) $(G_MACHOBJS32) $(G_MACHOBJS64) \ $(COMOBJS) $(COMOBJS32) $(COMOBJS64) \ $(TOOLOBJS) $(E_TOOLOBJS) $(AVLOBJ) $(ELFCAPOBJ) -include $(SRC)/lib/Makefile.lib -include $(SRC)/cmd/sgs/Makefile.com +include $(SRC)/lib/Makefile.lib +include $(SRC)/cmd/sgs/Makefile.com SRCDIR = ../common @@ -110,9 +108,6 @@ CPPFLAGS += -DUSE_LIBLD_MALLOC -I$(SRCBASE)/lib/libc/inc \ LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(LDDBGLIBDIR) $(LDDBG_LIB) \ $(ELFLIBDIR) -lelf $(DLLIB) -lc -LINTFLAGS += -u -D_REENTRANT -LINTFLAGS64 += -u -D_REENTRANT - DYNFLAGS += $(VERSREF) $(CC_USE_PROTO) '-R$$ORIGIN' native:= DYNFLAGS += $(CONVLIBDIR) @@ -144,33 +139,13 @@ CHKSRCS = $(SRCBASE)/uts/common/krtld/reloc.h \ $(KRTLD_AMD64)/doreloc.c \ $(KRTLD_SPARC)/doreloc.c -SRCS = ../common/llib-lld LIBSRCS = $(TOOLOBJS:%.o=$(SGSTOOLS)/common/%.c) \ $(E_TOOLOBJS:%.o=$(SGSTOOLS)/common/%.c) \ $(COMOBJS:%.o=../common/%.c) \ $(AVLOBJS:%.o=$(VAR_AVLDIR)/%.c) \ $(BLTDATA) -LINTSRCS = $(LIBSRCS) ../common/lintsup.c -LINTSRCS32 = $(COMOBJS32:%32.o=../common/%.c) \ - $(L_MACHOBJS32:%32.o=../common/%.c) -LINTSRCS64 = $(COMOBJS64:%64.o=../common/%.c) \ - $(L_MACHOBJS64:%64.o=../common/%.c) - -# Add the shared relocation engine source files to the lint -# sources and add the necessary command line options to lint them -# correctly. Make can't derive the files since the source and object -# names are not directly related -$(LINTOUT32) := CPPFLAGS += -DDO_RELOC_LIBLD -$(LINTOUT64) := CPPFLAGS += -DDO_RELOC_LIBLD -D_ELF64 -$(LINTLIB32) := CPPFLAGS += -DDO_RELOC_LIBLD -$(LINTLIB64) := CPPFLAGS += -DDO_RELOC_LIBLD -D_ELF64 -LINTSRCS32 += $(KRTLD_I386)/doreloc.c \ - $(KRTLD_SPARC)/doreloc.c -LINTSRCS64 += $(KRTLD_AMD64)/doreloc.c \ - $(KRTLD_SPARC)/doreloc.c - -CLEANFILES += $(LINTOUTS) $(BLTFILES) -CLOBBERFILES += $(DYNLIB) $(LINTLIBS) $(LIBLINKS) +CLEANFILES += $(BLTFILES) +CLOBBERFILES += $(DYNLIB) $(LIBLINKS) ROOTFS_DYNLIB = $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/libld/Makefile.targ b/usr/src/cmd/sgs/libld/Makefile.targ index c8f514cd2f..f48f6fcd56 100644 --- a/usr/src/cmd/sgs/libld/Makefile.targ +++ b/usr/src/cmd/sgs/libld/Makefile.targ @@ -23,6 +23,7 @@ # Use is subject to license terms. # # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # pics/%.o: ../common/%.c @@ -93,11 +94,6 @@ $(LIBLINKS): delete: $(RM) $(DYNLIB) -.PARALLEL: $(LINTOUT32) $(LINTOUT64) $(LINTLIB32) $(LINTLIB64) - -lint: $(LINTLIB32) $(LINTOUT32) $(LINTLIB64) $(LINTOUT64) \ - .WAIT $(SGSLINTOUT) - # Special target for native builds (ie. when we need to build a version of ld # to build a version of ld :-). diff --git a/usr/src/cmd/sgs/libld/common/lintsup.c b/usr/src/cmd/sgs/libld/common/lintsup.c deleted file mode 100644 index 0091d28426..0000000000 --- a/usr/src/cmd/sgs/libld/common/lintsup.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <debug.h> -#include <elfcap.h> -#include <_libld.h> -#include <sys/debug.h> - - -void -foo() -{ - assfail3(NULL, 0, NULL, 0, NULL, 0); -} diff --git a/usr/src/cmd/sgs/libld/common/llib-lld b/usr/src/cmd/sgs/libld/common/llib-lld deleted file mode 100644 index 667cafa931..0000000000 --- a/usr/src/cmd/sgs/libld/common/llib-lld +++ /dev/null @@ -1,67 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#include "libld.h" - -/* - * Generic interface definition for usr/src/lib/libld. - */ -uintptr_t ld32_create_outfile(Ofl_desc *); -uintptr_t ld64_create_outfile(Ofl_desc *); - -uintptr_t ld32_ent_setup(Ofl_desc *, Xword); -uintptr_t ld64_ent_setup(Ofl_desc *, Xword); - -uintptr_t ld32_init_strings(Ofl_desc *); -uintptr_t ld64_init_strings(Ofl_desc *); - -int ld_getopt(Lm_list *, int, int, char **); - -int ld32_main(int, char **, Elf32_Half); -int ld64_main(int, char **, Elf64_Half); -uintptr_t ld32_make_sections(Ofl_desc *); -uintptr_t ld64_make_sections(Ofl_desc *); - -void ld32_ofl_cleanup(Ofl_desc *); -void ld64_ofl_cleanup(Ofl_desc *); - -Ifl_desc *ld32_process_open(const char *, const char *, int *, - Ofl_desc *, Elf32_Word, Rej_desc *); -Ifl_desc *ld64_process_open(const char *, const char *, int *, - Ofl_desc *, Elf64_Word, Rej_desc *); - -uintptr_t ld32_reloc_init(Ofl_desc *); -uintptr_t ld64_reloc_init(Ofl_desc *); -uintptr_t ld32_reloc_process(Ofl_desc *); -uintptr_t ld64_reloc_process(Ofl_desc *); - -uintptr_t ld32_sym_validate(Ofl_desc *); -uintptr_t ld64_sym_validate(Ofl_desc *); - -uintptr_t ld32_update_outfile(Ofl_desc *); -uintptr_t ld64_update_outfile(Ofl_desc *); diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com index 860c62369a..3cf7318715 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.com +++ b/usr/src/cmd/sgs/liblddbg/Makefile.com @@ -22,6 +22,7 @@ # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # LIBRARY = liblddbg.a @@ -56,9 +57,6 @@ include $(SRC)/cmd/sgs/Makefile.com SRCDIR = ../common -LINTFLAGS += -u -D_REENTRANT -LINTFLAGS64 += -u -D_REENTRANT - CERRWARN += -_gcc=-Wno-unused-value CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses @@ -83,15 +81,10 @@ SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n liblddbg_msg CHKSRCS = $(COMOBJS32:%32.o=../common/%.c) -SRCS = ../common/llib-llddbg LIBSRCS = $(COMOBJS:%.o=../common/%.c) \ $(TOOLOBJ:%.o=$(SGSTOOLS)/common/%.c) $(BLTDATA) -LINTSRCS = $(LIBSRCS) ../common/lintsup.c -LINTSRCS32 = $(COMOBJS32:%32.o=../common/%.c) -LINTSRCS64 = $(COMOBJS64:%64.o=../common/%.c) - -CLEANFILES += $(LINTOUTS) $(BLTFILES) -CLOBBERFILES += $(DYNLIB) $(LINTLIBS) $(LIBLINKS) +CLEANFILES += $(BLTFILES) +CLOBBERFILES += $(DYNLIB) $(LIBLINKS) ROOTFS_DYNLIB = $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.targ b/usr/src/cmd/sgs/liblddbg/Makefile.targ index 68978ceefa..30fb79e62a 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.targ +++ b/usr/src/cmd/sgs/liblddbg/Makefile.targ @@ -23,6 +23,7 @@ # Use is subject to license terms. # # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # pics/%.o: ../common/%.c @@ -47,11 +48,6 @@ $(LIBLINKS): delete: $(RM) $(DYNLIB) -.PARALLEL: $(LINTOUT32) $(LINTOUT64) $(LINTLIB32) $(LINTLIB64) - -lint: $(LINTLIB32) $(LINTOUT32) $(LINTLIB64) $(LINTOUT64) \ - .WAIT $(SGSLINTOUT) - # Special target for native builds (ie. when we need to build a version of ld # to build a version of ld :-). diff --git a/usr/src/cmd/sgs/liblddbg/amd64/Makefile b/usr/src/cmd/sgs/liblddbg/amd64/Makefile index e0c4b7125b..1d0ab295e0 100644 --- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile +++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -32,8 +33,6 @@ ROOTFS_DYNLIB64 = \ CONVLIBDIR = $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - .KEEP_STATE: $(ROOTFS_DYNLIB64) := FILEMODE= 755 diff --git a/usr/src/cmd/sgs/liblddbg/common/lintsup.c b/usr/src/cmd/sgs/liblddbg/common/lintsup.c deleted file mode 100644 index e61b8fbe94..0000000000 --- a/usr/src/cmd/sgs/liblddbg/common/lintsup.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Supplemental definitions for lint that help us avoid options like `-x' that - * filter out things we want to know about as well as things we don't. - */ -#include <libelf.h> -#include <link.h> -#include <sgs.h> -#include <libld.h> -#include <rtld.h> -#include <conv.h> -#include <msg.h> -#include <sys/debug.h> - -/* - * Get the Elf32 side to think that the _ELF64 side - * is defined, and vice versa. - */ -#if defined(_ELF64) -#undef _ELF64 -#include <debug.h> -#define _ELF64 -#else -#define _ELF64 -#include <debug.h> -#undef _ELF64 -#endif - -void Dbg_reloc_doactiverel(void); - -void -foo() -{ - assfail3(NULL, 0, NULL, 0, NULL, 0); -} diff --git a/usr/src/cmd/sgs/liblddbg/common/llib-llddbg b/usr/src/cmd/sgs/liblddbg/common/llib-llddbg deleted file mode 100644 index e3a43c6e0c..0000000000 --- a/usr/src/cmd/sgs/liblddbg/common/llib-llddbg +++ /dev/null @@ -1,601 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - */ - -#include <sys/types.h> -#include <sys/auxv.h> -#include <debug.h> - -int Dbg_setup(dbg_setup_caller_t, const char *, Dbg_desc *, const char **); -void Dbg_help(void); -void Dbg_version(void); -const char * - Dbg_demangle_name(const char *); - -void Dbg_args_file(Lm_list *, int, char *); -void Dbg_args_guidance_unknown(Lm_list *, const char *); -void Dbg_args_option(Lm_list *, int, int, char *); -void Dbg_args_str2chr(Lm_list *, int, const char *, int); -void Dbg_args_Wldel(Lm_list *, int, const char *); -void Dbg_audit_activity(Lm_list *, const char *, const char *, uint_t); -void Dbg_audit_ignore(Rt_map *); -void Dbg_audit_interface(Lm_list *, const char *, const char *); -void Dbg_audit_lib(Rt_map *, const char *, int); -void Dbg_audit_objclose(Lm_list *, const char *, const char *); -void Dbg_audit_objfilter(Lm_list *, int, const char *, const char *, - const char *, const char *); -void Dbg_audit_objopen(Lm_list *, int, const char *, const char *, uint_t, - Boolean); -void Dbg_audit_objsearch(Lm_list *, int, const char *, const char *, uint_t, - const char *); -void Dbg_audit_pltenter(Lm_list *, int, const char *, const char *, Addr); -void Dbg_audit_pltexit(Lm_list *, const char *, const char *); -void Dbg_audit_preinit(Lm_list *, const char *, const char *); -void Dbg_audit_symbind(Lm_list *, int, const char *, const char *, - Addr, uint_t); -void Dbg_audit_skip(Lm_list *, const char *, const char *); -void Dbg_audit_terminate(Lm_list *, const char *); -void Dbg_audit_version(Lm_list *, const char *, uint_t, uint_t); - -void Dbg_basic_collect(Lm_list *); -void Dbg_basic_create(Lm_list *); -void Dbg_basic_files(Lm_list *); -void Dbg_basic_finish(Lm_list *); -void Dbg_basic_options(Lm_list *); -void Dbg_basic_relocate(Lm_list *); -void Dbg_basic_validate(Lm_list *); - -void Dbg_tls_modactivity(Lm_list *, void *, uint_t); -void Dbg_tls_static_block(Lm_list *, void *, ulong_t, ulong_t); -void Dbg_tls_static_resv(Rt_map *, ulong_t, ulong_t); - -void Dbg32_bind_global(Rt_map *, Elf32_Addr, Elf32_Off, Elf32_Word, - Pltbindtype, Rt_map *, Elf32_Addr, Elf32_Off, const char *, uint_t); -void Dbg64_bind_global(Rt_map *, Elf64_Addr, Elf64_Off, Elf64_Xword, - Pltbindtype, Rt_map *, Elf64_Addr, Elf64_Off, const char *, uint_t); -void Dbg64_bind_pltpad_to(Rt_map *, Addr, const char *, const char *); -void Dbg64_bind_pltpad_from(Rt_map *, Addr, const char *); -void Dbg32_bind_reject(Rt_map *, Rt_map *, const char *, int); -void Dbg64_bind_reject(Rt_map *, Rt_map *, const char *, int); -void Dbg32_bind_weak(Rt_map *, Elf32_Addr, Elf32_Addr, const char *); -void Dbg64_bind_weak(Rt_map *, Elf64_Addr, Elf64_Addr, const char *); - -void Dbg32_cap_candidate(Lm_list *, const char *); -void Dbg64_cap_candidate(Lm_list *, const char *); -void Dbg32_cap_filter(Lm_list *, const char *, Rt_map *); -void Dbg64_cap_filter(Lm_list *, const char *, Rt_map *); -void Dbg32_cap_id(Lm_list *, Lineno, const char *, const char *); -void Dbg64_cap_id(Lm_list *, Lineno, const char *, const char *); -void Dbg32_cap_identical(Lm_list *, const char *, const char *); -void Dbg64_cap_identical(Lm_list *, const char *, const char *); -void Dbg32_cap_mapfile_title(Lm_list *, Lineno); -void Dbg64_cap_mapfile_title(Lm_list *, Lineno); -void Dbg32_cap_post_title(Lm_list *, int *); -void Dbg64_cap_post_title(Lm_list *, int *); -void Dbg32_cap_out_title(Lm_list *); -void Dbg64_cap_out_title(Lm_list *); -void Dbg32_cap_sec_title(Lm_list *, const char *); -void Dbg64_cap_sec_title(Lm_list *, const char *); -void Dbg32_cap_val(Lm_list *, Syscapset *, Syscapset *, Elf32_Half); -void Dbg64_cap_val(Lm_list *, Syscapset *, Syscapset *, Elf64_Half); - -void Dbg32_dl_dladdr(Rt_map *, void *); -void Dbg64_dl_dladdr(Rt_map *, void *); -void Dbg32_dl_dlclose(Rt_map *, const char *, int); -void Dbg64_dl_dlclose(Rt_map *, const char *, int); -void Dbg32_dl_dldump(Rt_map *, const char *, const char *, int); -void Dbg64_dl_dldump(Rt_map *, const char *, const char *, int); -void Dbg32_dl_dlerror(Rt_map *, const char *); -void Dbg64_dl_dlerror(Rt_map *, const char *); -void Dbg32_dl_dlinfo(Rt_map *, const char *, int, void *); -void Dbg64_dl_dlinfo(Rt_map *, const char *, int, void *); -void Dbg32_dl_dlopen(Rt_map *, const char *, int *, int); -void Dbg64_dl_dlopen(Rt_map *, const char *, int *, int); -void Dbg32_dl_dlsym(Rt_map *, const char *, int *, const char *, int); -void Dbg64_dl_dlsym(Rt_map *, const char *, int *, const char *, int); -void Dbg32_dl_iphdr_callback(Lm_list *, struct dl_phdr_info *); -void Dbg64_dl_iphdr_callback(Lm_list *, struct dl_phdr_info *); -void Dbg32_dl_iphdr_enter(Rt_map *, u_longlong_t, u_longlong_t); -void Dbg64_dl_iphdr_enter(Rt_map *, u_longlong_t, u_longlong_t); -void Dbg32_dl_iphdr_mapchange(Lm_list *, u_longlong_t, u_longlong_t); -void Dbg64_dl_iphdr_mapchange(Lm_list *, u_longlong_t, u_longlong_t); -void Dbg32_dl_iphdr_unmap_ret(Lm_list *); -void Dbg64_dl_iphdr_unmap_ret(Lm_list *); - -void Dbg32_ent_print(Lm_list *, uchar_t, Elf32_Half, APlist *); -void Dbg64_ent_print(Lm_list *, uchar_t, Elf64_Half, APlist *); - -void Dbg32_file_analyze(Rt_map *); -void Dbg64_file_analyze64(Rt_map *); -void Dbg32_file_aout(Lm_list *, const char *, Addr, size_t, const char *, - Aliste); -void Dbg64_file_aout(Lm_list *, const char *, Addr, size_t, const char *, - Aliste); -void Dbg32_file_ar(Lm_list *, const char *, Boolean); -void Dbg64_file_ar(Lm_list *, const char *, Boolean); -void Dbg32_file_archive(Lm_list *, const char *, int); -void Dbg64_file_archive(Lm_list *, const char *, int); -void Dbg32_file_bind_entry(Lm_list *, Bnd_desc *); -void Dbg64_file_bind_entry(Lm_list *, Bnd_desc *); -void Dbg32_file_bindings(Rt_map *, int); -void Dbg64_file_bindings(Rt_map *, int); -void Dbg32_file_bindings_done(Lm_list *); -void Dbg64_file_bindings_done(Lm_list *); -void Dbg32_file_config_dis(Lm_list *, const char *, int); -void Dbg64_file_config_dis(Lm_list *, const char *, int); -void Dbg32_file_config_obj(Lm_list *, const char *, const char *, - const char *); -void Dbg64_file_config_obj(Lm_list *, const char *, const char *, - const char *); -void Dbg32_file_cntl(Lm_list *, Aliste, Aliste); -void Dbg64_file_cntl(Lm_list *, Aliste, Aliste); -void Dbg32_file_cleanup(Lm_list *, const char *, Aliste); -void Dbg64_file_cleanup(Lm_list *, const char *, Aliste); -void Dbg32_file_deferred(Lm_list *, const char *, const char *); -void Dbg64_file_deferred(Lm_list *, const char *, const char *); -void Dbg32_file_del_rescan(Lm_list *); -void Dbg64_file_del_rescan(Lm_list *); -void Dbg32_file_delete(Rt_map *); -void Dbg64_file_delete(Rt_map *); -void Dbg32_file_elf(Lm_list *, const char *, Addr, size_t, const char *, - Aliste); -void Dbg64_file_elf(Lm_list *, const char *, Addr, size_t, const char *, - Aliste); -void Dbg32_file_filtee(Lm_list *, const char *, const char *, int); -void Dbg64_file_filtee(Lm_list *, const char *, const char *, int); -void Dbg32_file_filter(Lm_list *, const char *, const char *, int); -void Dbg64_file_filter(Lm_list *, const char *, const char *, int); -void Dbg64_file_fixname(Lm_list *, const char *, const char *); -void Dbg32_file_fixname(Lm_list *, const char *, const char *); -void Dbg32_file_hdl_action(Grp_hdl *, Rt_map *, int, uint_t); -void Dbg64_file_hdl_action(Grp_hdl *, Rt_map *, int, uint_t); -void Dbg32_file_hdl_collect(Grp_hdl *, const char *); -void Dbg64_file_hdl_collect(Grp_hdl *, const char *); -void Dbg32_file_hdl_title(int); -void Dbg64_file_hdl_title(int); -void Dbg64_file_lazyload(Rt_map *, const char *, const char *); -void Dbg32_file_lazyload(Rt_map *, const char *, const char *); -void Dbg32_file_ldso(Rt_map *, char **, auxv_t *, const char *, Aliste); -void Dbg64_file_ldso(Rt_map *, char **, auxv_t *, const char *, Aliste); -void Dbg32_file_mmapobj(Lm_list *, const char *, mmapobj_result_t *, uint_t); -void Dbg64_file_mmapobj(Lm_list *, const char *, mmapobj_result_t *, uint_t); -void Dbg32_file_mode_promote(Rt_map *, int); -void Dbg64_file_mode_promote(Rt_map *, int); -void Dbg32_file_modified(Lm_list *, const char *, const char *, const char *, - int, int, Elf *, Elf *); -void Dbg64_file_modified(Lm_list *, const char *, const char *, const char *, - int, int, Elf *, Elf *); -void Dbg32_file_needed(Rt_map *, const char *); -void Dbg64_file_needed(Rt_map *, const char *); -void Dbg32_file_output(Ofl_desc *); -void Dbg64_file_output64(Ofl_desc *); -void Dbg32_file_preload(Lm_list *, const char *); -void Dbg64_file_preload(Lm_list *, const char *); -void Dbg32_file_prot(Rt_map *, int); -void Dbg64_file_prot(Rt_map *, int); -void Dbg32_file_rejected(Lm_list *, Rej_desc *, Elf32_Half); -void Dbg64_file_rejected(Lm_list *, Rej_desc *, Elf32_Half); -void Dbg32_file_reuse(Lm_list *, const char *, const char *); -void Dbg64_file_reuse(Lm_list *, const char *, const char *); -void Dbg32_file_skip(Lm_list *, const char *, const char *); -void Dbg64_file_skip(Lm_list *, const char *, const char *); - -void Dbg32_got_display(Ofl_desc *, Elf32_Off, int, - Elf32_Word, size_t m_got_entsize); -void Dbg64_got_display(Ofl_desc *, Elf64_Off, int, - Elf64_Word, size_t m_got_entsize); - -void Dbg32_libs_audit(Lm_list *, const char *, const char *); -void Dbg64_libs_audit(Lm_list *, const char *, const char *); -void Dbg32_libs_find(Lm_list *, const char *); -void Dbg64_libs_find(Lm_list *, const char *); -void Dbg32_libs_found(Lm_list *, const char *, int); -void Dbg64_libs_found(Lm_list *, const char *, int); -void Dbg32_libs_insecure(Lm_list *, const char *, int); -void Dbg64_libs_insecure(Lm_list *, const char *, int); -void Dbg32_libs_init(Lm_list *, APlist *, APlist *); -void Dbg64_libs_init(Lm_list *, APlist *, APlist *); -void Dbg32_libs_l(Lm_list *, const char *, const char *); -void Dbg64_libs_l(Lm_list *, const char *, const char *); -void Dbg32_libs_path(Lm_list *, const char *, uint_t, const char *); -void Dbg64_libs_path(Lm_list *, const char *, uint_t, const char *); -void Dbg32_libs_req(Lm_list *, const char *, const char *, const char *); -void Dbg64_libs_req(Lm_list *, const char *, const char *, const char *); -void Dbg32_libs_update(Lm_list *, APlist *, APlist *); -void Dbg64_libs_update(Lm_list *, APlist *, APlist *); -void Dbg32_libs_yp(Lm_list *, const char *); -void Dbg64_libs_yp(Lm_list *, const char *); -void Dbg32_libs_ylu(Lm_list *, const char *, const char *, int); -void Dbg64_libs_ylu(Lm_list *, const char *, const char *, int); - -void Dbg32_map_cexp_id(Lm_list *, Boolean, const char *, ulong_t, - const char *); -void Dbg64_map_cexp_id(Lm_list *, Boolean, const char *, ulong_t, - const char *); -void Dbg32_map_dv(Lm_list *, const char *, Lineno); -void Dbg64_map_dv(Lm_list *, const char *, Lineno); -void Dbg32_map_dv_entry(Lm_list *, Lineno, int, const char *); -void Dbg64_map_dv_entry(Lm_list *, Lineno, int, const char *); -void Dbg32_map_ent(Lm_list *, Ent_desc *, Ofl_desc *, Lineno); -void Dbg64_map_ent(Lm_list *, Ent_desc *, Ofl_desc *, Lineno); -void Dbg32_map_ent_ord_title(Lm_list *, const char *); -void Dbg64_map_ent_ord_title(Lm_list *, const char *); -void Dbg32_map_hdr_noalloc(Lm_list *, Lineno); -void Dbg64_map_hdr_noalloc(Lm_list *, Lineno); -void Dbg32_map_parse(Lm_list *, const char *, int); -void Dbg64_map_parse(Lm_list *, const char *, int); -void Dbg32_map_pass(Lm_list *, Boolean, const char *, ulong_t, const char *); -void Dbg64_map_pass(Lm_list *, Boolean, const char *, ulong_t, const char *); -void Dbg32_map_post_title(Lm_list *); -void Dbg64_map_post_title(Lm_list *); -void Dbg32_map_seg_os_order(Lm_list *, Sg_desc *, const char *, - Elf32_Word, Lineno); -void Dbg64_map_seg_os_order(Lm_list *, Sg_desc *, const char *, - Elf64_Word, Lineno); -void Dbg32_map_seg(Ofl_desc *, uint_t, int, Sg_desc *, Lineno); -void Dbg64_map_seg(Ofl_desc *, uint_t, int, Sg_desc *, Lineno); -void Dbg32_map_size_new(Lm_list *, const char *, const char *, Lineno); -void Dbg64_map_size_new(Lm_list *, const char *, const char *, Lineno); -void Dbg32_map_size_old(Ofl_desc *, Sym_desc *, const char *, Lineno); -void Dbg64_map_size_old(Ofl_desc *, Sym_desc *, const char *, Lineno); -void Dbg32_map_sort_title(Lm_list *, Boolean); -void Dbg64_map_sort_title(Lm_list *, Boolean); -void Dbg32_map_sort_seg(Lm_list *, uchar_t, Elf32_Half, Sg_desc *); -void Dbg64_map_sort_seg(Lm_list *, uchar_t, Elf64_Half, Sg_desc *); -void Dbg32_map_symbol(Ofl_desc *, Sym_desc *); -void Dbg64_map_symbol(Ofl_desc *, Sym_desc *); -void Dbg32_map_version(Lm_list *, const char *, const char *, int); -void Dbg64_map_version(Lm_list *, const char *, const char *, int); - -void Dbg32_move_adjexpandreloc(Lm_list *, Elf32_Word, const char *); -void Dbg64_move_adjexpandreloc(Lm_list *, Elf64_Xword, const char *); -void Dbg32_move_adjmovereloc(Lm_list *, Elf32_Word, Elf32_Word, - const char *); -void Dbg64_move_adjmovereloc(Lm_list *, Elf64_Xword, Elf64_Xword, - const char *); -void Dbg32_move_bad(Lm_list *, ulong_t, const char *, Addr); -void Dbg64_move_bad(Lm_list *, ulong_t, const char *, Addr); -void Dbg32_move_data(Rt_map *); -void Dbg64_move_data(Rt_map *); -void Dbg32_move_entry1(Lm_list *, int, Move *, Sym_desc *); -void Dbg64_move_entry1(Lm_list *, int, Move *, Sym_desc *); -void Dbg32_move_entry2(Lm_list *, Elf32_Move *, Elf32_Word, const char *); -void Dbg64_move_entry2(Lm_list *, Elf64_Move *, Elf64_Word, const char *); -void Dbg32_move_expand(Lm_list *, Elf32_Move *, Elf32_Addr); -void Dbg64_move_expand(Lm_list *, Elf64_Move *, Elf64_Addr); -void Dbg32_move_input(Lm_list *, const char *); -void Dbg64_move_input(Lm_list *, const char *); -void Dbg32_move_outmove(Lm_list *, const char *); -void Dbg64_move_outmove(Lm_list *, const char *); -void Dbg32_move_outsctadj(Lm_list *, Sym_desc *); -void Dbg64_move_outsctadj(Lm_list *, Sym_desc *); -void Dbg32_move_parexpn(Lm_list *, const char *, const char *); -void Dbg64_move_parexpn(Lm_list *, const char *, const char *); - -void Dbg32_reloc_apply_reg(Lm_list *, int, Elf32_Half, Elf32_Word, - Elf32_Word); -void Dbg64_reloc_apply_reg(Lm_list *, int, Elf64_Half, Elf64_Xword, - Elf64_Xword); -void Dbg32_reloc_apply_val(Lm_list *, int, Elf32_Word, Elf32_Word); -void Dbg64_reloc_apply_val(Lm_list *, int, Elf64_Xword, Elf64_Xword); -void Dbg32_reloc_ars_entry(Lm_list *, int, Elf32_Word, Elf32_Half, Rel_desc *); -void Dbg64_reloc_ars_entry(Lm_list *, int, Elf64_Word, Elf64_Half, Rel_desc *); -void Dbg32_reloc_copy(Rt_map *, Rt_map *, const char *, int); -void Dbg64_reloc_copy(Rt_map *, Rt_map *, const char *, int); -void Dbg32_reloc_discard(Lm_list *, Elf32_Half, Rel_desc *); -void Dbg64_reloc_discard(Lm_list *, Elf64_Half, Rel_desc *); -void Dbg32_reloc_doact(Lm_list *, int, Elf32_Half, Elf32_Word, Rel_desc *, - Elf32_Word, Elf32_Word, rel_desc_sname_func_t); -void Dbg64_reloc_doact(Lm_list *, int, Elf64_Half, Elf64_Word, Rel_desc *, - Elf64_Xword, Elf64_Xword, rel_desc_sname_func_t); -void Dbg32_reloc_doact_title(Lm_list *); -void Dbg64_reloc_doact_title(Lm_list *); -void Dbg32_reloc_dooutrel(Lm_list *, Elf32_Word); -void Dbg64_reloc_dooutrel(Lm_list *, Elf64_Word); -void Dbg32_reloc_entry(Lm_list *, const char *, Elf32_Half, Elf32_Word, - void *, const char *, const char *, const char *); -void Dbg64_reloc_entry(Lm_list *, const char *, Elf64_Half, Elf64_Word, - void *, const char *, const char *, const char *); -void Dbg32_reloc_error(Lm_list *, int, Elf32_Half, Elf32_Word, void *, - const char *); -void Dbg64_reloc_error(Lm_list *, int, Elf64_Half, Elf64_Word, void *, - const char *); -void Dbg32_reloc_generate(Lm_list *, Os_desc *, Elf32_Word); -void Dbg64_reloc_generate(Lm_list *, Os_desc *, Elf64_Word); -void Dbg32_reloc_in(Lm_list *, int, Elf32_Half, Elf32_Word, void *, - const char *, Elf32_Word, const char *); -void Dbg64_reloc_in(Lm_list *, int, Elf64_Half, Elf64_Word, void *, - const char *, Elf64_Word, const char *); -void Dbg32_reloc_ors_entry(Lm_list *, int, Elf32_Word, Elf32_Half, Rel_desc *); -void Dbg64_reloc_ors_entry(Lm_list *, int, Elf64_Word, Elf64_Half, Rel_desc *); -void Dbg32_reloc_out(Ofl_desc *, int, Elf32_Word, void *, const char *, - const char *); -void Dbg64_reloc_out(Ofl_desc *, int, Elf64_Word, void *, const char *, - const char *); -void Dbg32_reloc_proc(Lm_list *, Os_desc *, Is_desc *, Is_desc *); -void Dbg64_reloc_proc(Lm_list *, Os_desc *, Is_desc *, Is_desc *); -void Dbg32_reloc_run(Rt_map *, uint_t, int, int); -void Dbg64_reloc_run(Rt_map *, uint_t, int, int); -void Dbg32_reloc_transition(Lm_list *, Elf32_Half, Elf32_Word, Rel_desc *, - rel_desc_sname_func_t); -void Dbg64_reloc_transition(Lm_list *, Elf64_Half, Elf64_Word, Rel_desc *, - rel_desc_sname_func_t); - -void Dbg32_sec_added(Lm_list *, Os_desc *, Sg_desc *); -void Dbg64_sec_added(Lm_list *, Os_desc *, Sg_desc *); -void Dbg32_sec_backing(Lm_list *); -void Dbg64_sec_backing(Lm_list *); -void Dbg32_sec_created(Lm_list *, Os_desc *, Sg_desc *); -void Dbg64_sec_created(Lm_list *, Os_desc *, Sg_desc *); -void Dbg32_sec_discarded(Lm_list *, Is_desc *, Is_desc *); -void Dbg64_sec_discarded(Lm_list *, Is_desc *, Is_desc *); -void Dbg32_sec_group(Lm_list *, Is_desc *, Group_desc *); -void Dbg64_sec_group(Lm_list *, Is_desc *, Group_desc *); -void Dbg32_sec_gnu_comdat(Lm_list *, Is_desc *, Boolean, Boolean); -void Dbg64_sec_gnu_comdat(Lm_list *, Is_desc *, Boolean, Boolean); -void Dbg32_sec_in(Lm_list *, Is_desc *); -void Dbg64_sec_in(Lm_list *, Is_desc *); -void Dbg32_sec_order_error(Lm_list *, Ifl_desc *, Elf32_Word, int); -void Dbg64_sec_order_error(Lm_list *, Ifl_desc *, Elf64_Word, int); -void Dbg32_sec_order_list(Ofl_desc *, int); -void Dbg64_sec_order_list(Ofl_desc *, int); -void Dbg32_sec_redirected(Lm_list *, Is_desc *, const char *); -void Dbg64_sec_redirected(Lm_list *, Is_desc *, const char *); -void Dbg32_sec_strtab(Lm_list *, Os_desc *, Str_tbl *); -void Dbg64_sec_strtab(Lm_list *, Os_desc *, Str_tbl *); - -void Dbg32_seg_desc_entry(Lm_list *, uchar_t, Elf32_Half, int, Sg_desc *, - Boolean); -void Dbg64_seg_desc_entry(Lm_list *, uchar_t, Elf64_Half, int, Sg_desc *, - Boolean); -void Dbg32_seg_entry(Ofl_desc *, int, Sg_desc *); -void Dbg64_seg_entry(Ofl_desc *, int, Sg_desc *); -void Dbg32_seg_list(Lm_list *, uchar_t, Elf32_Half, APlist *); -void Dbg64_seg_list(Lm_list *, uchar_t, Elf64_Half, APlist *); -void Dbg32_seg_os(Ofl_desc *, Os_desc *, int); -void Dbg64_seg_os(Ofl_desc *, Os_desc *, int); -void Dbg32_seg_title(Lm_list *); -void Dbg64_seg_title(Lm_list *); - -void Dbg32_shdr_modified(Lm_list *, const char *, uchar_t, Half, - Elf32_Word, Shdr *, Shdr *, const char *); -void Dbg64_shdr_modified(Lm_list *, const char *, uchar_t, Half, - Elf64_Word, Shdr *, Shdr *, const char *); - -void Dbg32_statistics_ar(Ofl_desc *); -void Dbg64_statistics_ar(Ofl_desc *); -void Dbg32_statistics_ld(Ofl_desc *); -void Dbg64_statistics_ld(Ofl_desc *); - -void Dbg32_support_action(Lm_list *, const char *, const char *, Support_ndx, - const char *); -void Dbg64_support_action(Lm_list *, const char *, const char *, Support_ndx, - const char *); -void Dbg32_support_load(Lm_list *, const char *, const char *); -void Dbg64_support_load(Lm_list *, const char *, const char *); -void Dbg32_support_req(Lm_list *, const char *, int); -void Dbg64_support_req(Lm_list *, const char *, int); - -void Dbg32_syminfo_entry(Lm_list *, Elf32_Word, Syminfo *, Sym *, const char *, - Dyn *); -void Dbg64_syminfo_entry(Lm_list *, Elf64_Word, Syminfo *, Sym *, const char *, - Dyn *); -void Dbg32_syminfo_title(Lm_list *); -void Dbg64_syminfo_title(Lm_list *); - -void Dbg32_syms_ar_checking(Lm_list *, const char *, const char *, - Elf_Arsym *); -void Dbg64_syms_ar_checking(Lm_list *, const char *, const char *, - Elf_Arsym *); -void Dbg32_syms_ar_entry(Lm_list *, Xword, Elf_Arsym *); -void Dbg64_syms_ar_entry(Lm_list *, Xword, Elf_Arsym *); -void Dbg32_syms_ar_force(Lm_list *, const char *, const char *); -void Dbg64_syms_ar_force(Lm_list *, const char *, const char *); -void Dbg32_syms_ar_resolve(Lm_list *, const char *, const char *, - Elf_Arsym *); -void Dbg64_syms_ar_resolve(Lm_list *, const char *, const char *, - Elf_Arsym *); -void Dbg32_syms_ar_skip(Lm_list *, const char *, Elf_Arsym *); -void Dbg64_syms_ar_skip(Lm_list *, const char *, Elf_Arsym *); -void Dbg32_syms_ar_title(Lm_list *, const char *, Boolean); -void Dbg64_syms_ar_title(Lm_list *, const char *, Boolean); -void Dbg32_syms_cap_convert(Ofl_desc *, Word, const char *, Sym *); -void Dbg64_syms_cap_convert(Ofl_desc *, Word, const char *, Sym *); -void Dbg32_syms_cap_local(Ofl_desc *, Word, const char *, Sym *, Sym_desc *); -void Dbg64_syms_cap_local(Ofl_desc *, Word, const char *, Sym *, Sym_desc *); -void Dbg32_syms_cap_lookup(Rt_map *, uint_t, const char *, uint_t, Half, - Syscapset *); -void Dbg64_syms_cap_lookup(Rt_map *, uint_t, const char *, uint_t, Half, - Syscapset *); -void Dbg32_syms_cap_title(Ofl_desc *); -void Dbg64_syms_cap_title(Ofl_desc *); -void Dbg32_syms_copy_reloc(Ofl_desc *, Sym_desc *, Word); -void Dbg64_syms_copy_reloc(Ofl_desc *, Sym_desc *, Word); -void Dbg32_syms_created(Lm_list *, const char *); -void Dbg64_syms_created(Lm_list *, const char *); -void Dbg32_syms_discarded(Lm_list *, Sym_desc *); -void Dbg64_syms_discarded(Lm_list *, Sym_desc *); -void Dbg32_syms_entered(Ofl_desc *, Sym *, Sym_desc *); -void Dbg64_syms_entered(Ofl_desc *, Sym *, Sym_desc *); -void Dbg32_syms_entry(Lm_list *, Elf32_Word, Sym_desc *); -void Dbg64_syms_entry(Lm_list *, Elf64_Word, Sym_desc *); -void Dbg32_syms_global(Lm_list *, Elf32_Word, const char *); -void Dbg64_syms_global(Lm_list *, Elf64_Word, const char *); -void Dbg32_syms_ignore(Ofl_desc *, Sym_desc *); -void Dbg64_syms_ignore(Ofl_desc *, Sym_desc *); -void Dbg32_syms_lazy_rescan(Lm_list *, const char *); -void Dbg64_syms_lazy_rescan(Lm_list *, const char *); -void Dbg32_syms_lookup(Rt_map *, const char *, const char *); -void Dbg64_syms_lookup(Rt_map *, const char *, const char *); -void Dbg32_syms_lookup_aout(Lm_list *, const char *); -void Dbg32_syms_new(Ofl_desc *, Sym *, Sym_desc *); -void Dbg64_syms_new(Ofl_desc *, Sym *, Sym_desc *); -void Dbg32_syms_old(Ofl_desc *, Sym_desc *); -void Dbg64_syms_old(Ofl_desc *, Sym_desc *); -void Dbg32_syms_process(Lm_list *, Ifl_desc *); -void Dbg64_syms_process(Lm_list *, Ifl_desc *); -void Dbg32_syms_reduce(Ofl_desc *, int, Sym_desc *, int, const char *); -void Dbg64_syms_reduce(Ofl_desc *, int, Sym_desc *, int, const char *); -void Dbg32_syms_resolved(Ofl_desc *, Sym_desc *); -void Dbg64_syms_resolved(Ofl_desc *, Sym_desc *); -void Dbg32_syms_resolving(Ofl_desc *, Elf32_Word, const char *, int, int, - Sym *, Sym *, Sym_desc *, Ifl_desc *); -void Dbg64_syms_resolving(Ofl_desc *, Elf64_Word, const char *, int, int, - Sym *, Sym *, Sym_desc *, Ifl_desc *); -void Dbg32_syms_sec_entry(Lm_list *, Elf32_Word, Sg_desc *, Os_desc *); -void Dbg64_syms_sec_entry(Lm_list *, Elf64_Word, Sg_desc *, Os_desc *); -void Dbg32_syms_sec_title(Lm_list *); -void Dbg64_syms_sec_title(Lm_list *); -void Dbg32_syms_spec_title(Lm_list *); -void Dbg64_syms_spec_title(Lm_list *); -void Dbg32_syms_updated(Ofl_desc *, Sym_desc *, const char *); -void Dbg64_syms_updated(Ofl_desc *, Sym_desc *, const char *); -void Dbg32_syms_up_title(Lm_list *); -void Dbg64_syms_up_title(Lm_list *); -void Dbg32_syms_wrap(Lm_list *, Elf32_Word, const char *, const char *); -void Dbg64_syms_wrap(Lm_list *, Elf64_Word, const char *, const char *); - -void Dbg32_util_broadcast(Rt_map *); -void Dbg64_util_broadcast(Rt_map *); -void Dbg32_util_call_array(Rt_map *, void *, int, Elf32_Word); -void Dbg64_util_call_array(Rt_map *, void *, int, Elf64_Word); -void Dbg32_util_call_fini(Rt_map *); -void Dbg64_util_call_fini(Rt_map *); -void Dbg32_util_call_init(Rt_map *, int); -void Dbg64_util_call_init(Rt_map *, int); -void Dbg32_util_call_main(Rt_map *); -void Dbg64_util_call_main(Rt_map *); -void Dbg32_util_collect(Rt_map *, int, int); -void Dbg64_util_collect(Rt_map *, int, int); -void Dbg32_util_dbnotify(Lm_list *, rd_event_e, r_state_e); -void Dbg64_util_dbnotify(Lm_list *, rd_event_e, r_state_e); -void Dbg32_util_edge_in(Lm_list *, Rt_map *, uint_t, Rt_map *, int, int); -void Dbg64_util_edge_in(Lm_list *, Rt_map *, uint_t, Rt_map *, int, int); -void Dbg32_util_edge_out(Rt_map *, Rt_map *); -void Dbg64_util_edge_out(Rt_map *, Rt_map *); -void Dbg32_util_intoolate(Rt_map *); -void Dbg64_util_intoolate(Rt_map *); -void Dbg32_util_lcinterface(Rt_map *, int, char *); -void Dbg64_util_lcinterface(Rt_map *, int, char *); -void Dbg32_util_nl(Lm_list *, int); -void Dbg64_util_nl(Lm_list *, int); -void Dbg32_util_scc_entry(Rt_map *, uint_t); -void Dbg64_util_scc_entry(Rt_map *, uint_t); -void Dbg32_util_scc_title(Lm_list *, int); -void Dbg64_util_scc_title(Lm_list *, int); -void Dbg32_util_str(Lm_list *, const char *); -void Dbg64_util_str(Lm_list *, const char *); -void Dbg32_util_wait(Rt_map *, Rt_map *, int); -void Dbg64_util_wait(Rt_map *, Rt_map *, int); - -void Dbg32_unused_file(Lm_list *, const char *, int, uint_t); -void Dbg64_unused_file(Lm_list *, const char *, int, uint_t); -void Dbg32_unused_lcinterface(Rt_map *, Rt_map *, int); -void Dbg64_unused_lcinterface(Rt_map *, Rt_map *, int); -void Dbg32_unused_path(Lm_list *, const char *, uint_t, uint_t, - const char *); -void Dbg64_unused_path(Lm_list *, const char *, uint_t, uint_t, - const char *); -void Dbg32_unused_sec(Lm_list *, Is_desc *); -void Dbg64_unused_sec(Lm_list *, Is_desc *); -void Dbg32_unused_unref(Rt_map *, const char *); -void Dbg64_unused_unref(Rt_map *, const char *); - -void Dbg32_ver_need_done(Lm_list *); -void Dbg64_ver_need_done(Lm_list *); -void Dbg32_ver_need_entry(Lm_list *, Half, const char *, const char *); -void Dbg64_ver_need_entry(Lm_list *, Half, const char *, const char *); -void Dbg32_ver_need_title(Lm_list *, const char *); -void Dbg64_ver_need_title(Lm_list *, const char *); - -const char *Elf_demangle_name(const char *); - -void Elf_syminfo_entry(Lm_list *, Word, Syminfo *, const char *, const char *); -void Elf_syminfo_title(Lm_list *); -void Elf_ver_def_title(Lm_list *); -void Elf_ver_need_title(Lm_list *, int); -void Elf_ver_line_1(Lm_list *, const char *, const char *, const char *, - const char *); -void Elf_ver_line_2(Lm_list *, const char *, const char *); -void Elf_ver_line_3(Lm_list *, const char *, const char *, const char *); -void Elf_ver_line_4(Lm_list *, const char *); -void Elf_ver_line_5(Lm_list *, const char *, const char *); - -void Elf64_cap_entry(Lm_list *, Elf64_Cap *, int ndx, const char *, size_t, - Elf64_Half); -void Elf32_cap_entry(Lm_list *, Elf32_Cap *, int ndx, const char *, size_t, - Elf32_Half); -void Elf64_cap_title(Lm_list *); -void Elf32_cap_title(Lm_list *); - -void Elf64_dyn_entry(Lm_list *, Elf64_Dyn *, int, const char *, uchar_t, - Elf64_Half); -void Elf32_dyn_entry(Lm_list *, Elf32_Dyn *, int, const char *, uchar_t, - Elf32_Half); -void Elf64_dyn_null_entry(Lm_list *, Elf64_Dyn *, int, int); -void Elf32_dyn_null_entry(Lm_list *, Elf32_Dyn *, int, int); -void Elf64_dyn_title(Lm_list *); -void Elf32_dyn_title(Lm_list *); - -void Elf64_ehdr(Lm_list *, Elf64_Ehdr *, Elf64_Shdr *); -void Elf32_ehdr(Lm_list *, Elf32_Ehdr *, Elf32_Shdr *); - -void Elf64_got_entry(Lm_list *, Elf64_Sword, Elf64_Addr, Elf64_Xword, - Elf64_Half, uchar_t, uchar_t, Elf64_Word, void *, const char *); -void Elf32_got_entry(Lm_list *, Elf32_Sword, Elf32_Addr, Elf32_Word, - Elf32_Half, uchar_t, uchar_t, Elf32_Word, void *, const char *); -void Elf64_got_title(Lm_list *); -void Elf32_got_title(Lm_list *); - -void Elf64_phdr(Lm_list *, uchar_t, Elf64_Half, Elf64_Phdr *); -void Elf32_phdr(Lm_list *, uchar_t, Elf32_Half, Elf32_Phdr *); - -void Elf64_reloc_apply_reg(Lm_list *, int, Elf64_Half, Elf64_Xword, - Elf64_Xword); -void Elf32_reloc_apply_reg(Lm_list *, int, Elf32_Half, Elf32_Word, - Elf32_Word); -void Elf64_reloc_apply_val(Lm_list *, int, Elf64_Xword, Elf64_Xword); -void Elf32_reloc_apply_val(Lm_list *, int, Elf32_Word, Elf32_Word); -void Elf64_reloc_entry_1(Lm_list *, int, const char *, Elf64_Half, Word, void *, - const char *, const char *, const char *); -void Elf32_reloc_entry_1(Lm_list *, int, const char *, Elf32_Half, Word, void *, - const char *, const char *, const char *); -void Elf64_reloc_entry_2(Lm_list *, int, const char *, Word, const char *, - Elf64_Addr, Elf64_Sxword, const char *, const char *, const char *); -void Elf32_reloc_entry_2(Lm_list *, int, const char *, Word, const char *, - Elf32_Addr, Elf32_Sword, const char *, const char *, const char *); -void Elf64_reloc_title(Lm_list *, int, Word); -void Elf32_reloc_title(Lm_list *, int, Word); - -void Elf64_shdr(Lm_list *, uchar_t, Elf64_Half, Elf64_Shdr *); -void Elf32_shdr(Lm_list *, uchar_t, Elf32_Half, Elf32_Shdr *); - -void Elf64_syms_table_entry(Lm_list *, int, const char *, uchar_t, Elf64_Half, - Elf64_Sym *, Elf64_Versym, int, const char *, const char *); -void Elf32_syms_table_entry(Lm_list *, int, const char *, uchar_t, Elf32_Half, - Elf32_Sym *, Elf32_Versym, int, const char *, const char *); -void Elf64_syms_table_title(Lm_list *, int); -void Elf32_syms_table_title(Lm_list *, int); diff --git a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile index 0554aaed96..b57167b378 100644 --- a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -32,8 +33,6 @@ ROOTFS_DYNLIB64 = \ CONVLIBDIR = $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - .KEEP_STATE: $(ROOTFS_DYNLIB64) := FILEMODE= 755 diff --git a/usr/src/cmd/sgs/libldmake/Makefile.com b/usr/src/cmd/sgs/libldmake/Makefile.com index 6333a7b795..76a89e0dfb 100644 --- a/usr/src/cmd/sgs/libldmake/Makefile.com +++ b/usr/src/cmd/sgs/libldmake/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# LIBRARY= libldmake.a VERS= .1 @@ -41,19 +43,11 @@ DYNFLAGS += $(CC_USE_PROTO) CFLAGS += $(C_PICFLAGS) CFLAGS64 += $(C_PICFLAGS64) -LINTFLAGS += -erroff=E_NAME_DECL_NOT_USED_DEF2 \ - -erroff=E_NAME_DEF_NOT_USED2 \ - -erroff=E_NAME_USED_NOT_DEF2 -LINTFLAGS64 += -erroff=E_NAME_DECL_NOT_USED_DEF2 \ - -erroff=E_NAME_DEF_NOT_USED2 \ - -erroff=E_NAME_USED_NOT_DEF2 -LINTSRCS = $(SRCS) - SRCS= $(OBJECTS:%.o=../common/%.c) LDLIBS += -lc CLEANFILES += -CLOBBERFILES += $(DYNLIB) $(LINTLIB) $(LINTOUTS) +CLOBBERFILES += $(DYNLIB) ROOTDYNLIB= $(DYNLIB:%=$(ROOTLIBDIR)/%) ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR64)/%) diff --git a/usr/src/cmd/sgs/libldmake/Makefile.targ b/usr/src/cmd/sgs/libldmake/Makefile.targ index de946c6334..72ed530854 100644 --- a/usr/src/cmd/sgs/libldmake/Makefile.targ +++ b/usr/src/cmd/sgs/libldmake/Makefile.targ @@ -22,11 +22,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -lint: $(LINTLIB) $(LINTOUT32) $(LINTOUT64) $(SGSLINTOUT) - pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/cmd/sgs/libldmake/amd64/Makefile b/usr/src/cmd/sgs/libldmake/amd64/Makefile index b8bf0f9232..c702bfff21 100644 --- a/usr/src/cmd/sgs/libldmake/amd64/Makefile +++ b/usr/src/cmd/sgs/libldmake/amd64/Makefile @@ -23,15 +23,13 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com .KEEP_STATE: -LINTFLAGS64 += $(VAR_LINTFLAGS64) - all: $(DYNLIB) install: all $(ROOTDYNLIB64) diff --git a/usr/src/cmd/sgs/libldmake/sparcv9/Makefile b/usr/src/cmd/sgs/libldmake/sparcv9/Makefile index 5b90c5deb9..18ab13446e 100644 --- a/usr/src/cmd/sgs/libldmake/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libldmake/sparcv9/Makefile @@ -23,15 +23,13 @@ # Copyright 1998-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com .KEEP_STATE: -LINTFLAGS64 += $(VAR_LINTFLAGS64) - all: $(DYNLIB) install: all $(ROOTDYNLIB64) diff --git a/usr/src/cmd/sgs/libldstab/Makefile.com b/usr/src/cmd/sgs/libldstab/Makefile.com index 93a0fa8b2a..16e3817397 100644 --- a/usr/src/cmd/sgs/libldstab/Makefile.com +++ b/usr/src/cmd/sgs/libldstab/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# LIBRARY= libldstab.a VERS= .1 @@ -43,17 +45,8 @@ CPPFLAGS += -I$(ELFCAP) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -lc DYNFLAGS += $(VERSREF) $(CC_USE_PROTO) -LINTFLAGS += -erroff=E_NAME_DECL_NOT_USED_DEF2 \ - -erroff=E_NAME_DEF_NOT_USED2 \ - -erroff=E_NAME_USED_NOT_DEF2 -LINTFLAGS64 += -erroff=E_NAME_DECL_NOT_USED_DEF2 \ - -erroff=E_NAME_DEF_NOT_USED2 \ - -erroff=E_NAME_USED_NOT_DEF2 - SRCS= $(COMOBJS:%.o=../common/%.c) -LINTSRCS= $(SRCS) -CLEANFILES += $(LINTOUTS) CLOBBERFILES += $(DYNLIB) ROOTDYNLIB= $(DYNLIB:%=$(ROOTLIBDIR)/%) diff --git a/usr/src/cmd/sgs/libldstab/Makefile.targ b/usr/src/cmd/sgs/libldstab/Makefile.targ index c9ba1b7467..490a987356 100644 --- a/usr/src/cmd/sgs/libldstab/Makefile.targ +++ b/usr/src/cmd/sgs/libldstab/Makefile.targ @@ -23,6 +23,7 @@ # Use is subject to license terms. # # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # pics/%.o: ../common/%.c @@ -33,8 +34,6 @@ pics/%64.o: ../common/%.c $(COMPILE.c) -o $@ -D_ELF64 $< $(POST_PROCESS_O) -lint: $(LINTOUT32) $(SGSLINTOUT) - delete: -$(RM) $(DYNLIB) diff --git a/usr/src/cmd/sgs/libldstab/amd64/Makefile b/usr/src/cmd/sgs/libldstab/amd64/Makefile index f8560e93bf..0d461c46b3 100644 --- a/usr/src/cmd/sgs/libldstab/amd64/Makefile +++ b/usr/src/cmd/sgs/libldstab/amd64/Makefile @@ -20,6 +20,7 @@ # # # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # DUPOBJS= stab64.o @@ -34,12 +35,9 @@ ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR)/%) CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - all: $(DYNLIB) install \ package: all $(ROOTDYNLIB64) -lint: $(LINTOUT64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/libldstab/sparc/Makefile b/usr/src/cmd/sgs/libldstab/sparc/Makefile index 9c4889da43..3d4d2d8b79 100644 --- a/usr/src/cmd/sgs/libldstab/sparc/Makefile +++ b/usr/src/cmd/sgs/libldstab/sparc/Makefile @@ -20,6 +20,7 @@ # # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # DUPOBJS= stab64.o @@ -30,7 +31,6 @@ include ../Makefile.com all: $(DYNLIB) install: all $(ROOTDYNLIB) -lint: $(LINTOUT64) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libldstab/sparcv9/Makefile b/usr/src/cmd/sgs/libldstab/sparcv9/Makefile index e0841a6ee6..93fef3421f 100644 --- a/usr/src/cmd/sgs/libldstab/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libldstab/sparcv9/Makefile @@ -20,6 +20,7 @@ # # # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # DUPOBJS= stab64.o @@ -34,12 +35,9 @@ ROOTDYNLIB64= $(DYNLIB:%=$(ROOTLIBDIR)/%) CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - all: $(DYNLIB) install \ package: all $(ROOTDYNLIB64) -lint: $(LINTOUT64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/librtld/Makefile.com b/usr/src/cmd/sgs/librtld/Makefile.com index f196ac328a..3c397c933c 100644 --- a/usr/src/cmd/sgs/librtld/Makefile.com +++ b/usr/src/cmd/sgs/librtld/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# LIBRARY= librtld.a VERS= .1 @@ -50,9 +52,6 @@ CERRWARN += -_gcc=-Wno-unused-value CERRWARN += -_gcc=-Wno-type-limits CERRWARN += -_gcc=-Wno-uninitialized -LINTFLAGS += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 -LINTFLAGS64 += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 - BLTDEFS= msg.h BLTDATA= msg.c BLTMESG= $(SGSMSGDIR)/librtld @@ -64,11 +63,10 @@ SGSMSGALL= $(SGSMSGCOM) SGSMSGTARG= $(SGSMSGCOM) SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n librtld_msg -SRCS= ../common/llib-lrtld -LINTSRCS= $(MACHOBJS:%.o=%.c) $(COMOBJS:%.o=../common/%.c) \ +MSGSRCS= $(MACHOBJS:%.o=%.c) $(COMOBJS:%.o=../common/%.c) \ $(BLTDATA) -CLEANFILES += $(BLTFILES) $(LINTOUTS) -CLOBBERFILES += $(DYNLIB) $(LINTLIB) $(LIBLINKS) +CLEANFILES += $(BLTFILES) +CLOBBERFILES += $(DYNLIB) $(LIBLINKS) ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/librtld/Makefile.targ b/usr/src/cmd/sgs/librtld/Makefile.targ index 30e03221a5..7747934999 100644 --- a/usr/src/cmd/sgs/librtld/Makefile.targ +++ b/usr/src/cmd/sgs/librtld/Makefile.targ @@ -23,6 +23,7 @@ # Use is subject to license terms. # # Copyright 2016 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # pics/%.o: ../common/%.c @@ -58,8 +59,8 @@ include $(SRC)/cmd/sgs/Makefile.targ catalog: $(BLTMESG) -chkmsg: $(LINTSRCS) - sh $(CHKMSG) $(CHKMSGFLAGS) $(LINTSRCS) +chkmsg: $(MSGSRCS) + sh $(CHKMSG) $(CHKMSGFLAGS) $(MSGSRCS) $(BLTDEFS) + \ $(BLTDATA) + \ diff --git a/usr/src/cmd/sgs/librtld/amd64/Makefile b/usr/src/cmd/sgs/librtld/amd64/Makefile index b642bc3270..ad8c67f0db 100644 --- a/usr/src/cmd/sgs/librtld/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld/amd64/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/cmd/sgs/librtld/Makefile.com @@ -32,14 +33,10 @@ CPPFLAGS += -I../../../../uts/intel/amd64/krtld ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) $(ROOTFS_DYNLIB64) := FILEMODE=755 -LINTFLAGS64 += $(VAR_LINTFLAGS64) - all: $(DYNLIB) $(LIBLINKS) install: all $(ROOTFS_DYNLIB64) -lint: $(LINTLIB) $(LINTOUT64) $(SGSLINTOUT) - CPPFLAGS += -D_ELF64 diff --git a/usr/src/cmd/sgs/librtld/common/llib-lrtld b/usr/src/cmd/sgs/librtld/common/llib-lrtld deleted file mode 100644 index 23c19d48d1..0000000000 --- a/usr/src/cmd/sgs/librtld/common/llib-lrtld +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 2000 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "rtld.h" - -int rt_dldump(Rt_map *, const char *, int, Addr); diff --git a/usr/src/cmd/sgs/librtld/i386/Makefile b/usr/src/cmd/sgs/librtld/i386/Makefile index 546a8504fe..54e5e30586 100644 --- a/usr/src/cmd/sgs/librtld/i386/Makefile +++ b/usr/src/cmd/sgs/librtld/i386/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/cmd/sgs/librtld/Makefile.com @@ -33,6 +34,4 @@ all: $(DYNLIB) $(LIBLINKS) install: all $(ROOTFS_DYNLIB) -lint: $(LINTLIB) $(LINTOUT32) $(SGSLINTOUT) - include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparc/Makefile b/usr/src/cmd/sgs/librtld/sparc/Makefile index 33efa5334e..ac07f8b8c0 100644 --- a/usr/src/cmd/sgs/librtld/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld/sparc/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/cmd/sgs/librtld/Makefile.com @@ -33,6 +34,4 @@ all: $(DYNLIB) $(LIBLINKS) install: all $(ROOTFS_DYNLIB) -lint: $(LINTLIB) $(LINTOUT32) $(SGSLINTOUT) - include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparcv9/Makefile b/usr/src/cmd/sgs/librtld/sparcv9/Makefile index 0fdca1ad1f..00a9c3ca48 100644 --- a/usr/src/cmd/sgs/librtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld/sparcv9/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/cmd/sgs/librtld/Makefile.com @@ -32,14 +33,10 @@ CPPFLAGS += -I../../../../uts/sparc/krtld ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) $(ROOTFS_DYNLIB64) := FILEMODE=755 -LINTFLAGS64 += $(VAR_LINTFLAGS64) - all: $(DYNLIB) $(LIBLINKS) install: all $(ROOTFS_DYNLIB64) -lint: $(LINTLIB) $(LINTOUT64) $(SGSLINTOUT) - CPPFLAGS += -D_ELF64 diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.com b/usr/src/cmd/sgs/librtld_db/Makefile.com index 955f3e21d8..46f35529b2 100644 --- a/usr/src/cmd/sgs/librtld_db/Makefile.com +++ b/usr/src/cmd/sgs/librtld_db/Makefile.com @@ -20,6 +20,7 @@ # # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # LIBRARY= librtld_db.a @@ -39,9 +40,6 @@ CPPFLAGS += -I$(SRCBASE)/lib/libc/inc DYNFLAGS += $(VERSREF) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lc -LINTFLAGS += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 -LINTFLAGS64 += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 - CERRWARN += -_gcc=-Wno-uninitialized BLTDEFS= msg.h @@ -56,18 +54,15 @@ SGSMSGTARG= $(SGSMSGCOM) SGSMSGALL= $(SGSMSGCOM) SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -SRCS= ../common/llib-lrtld_db -LINTSRCS= $(COMOBJS:%.o=../common/%.c) $(PLTSRCS) $(BLTDATA) +MSGSRCS= $(COMOBJS:%.o=../common/%.c) $(PLTSRCS) $(BLTDATA) -CLEANFILES += $(BLTFILES) $(LINTOUTS) -CLOBBERFILES += $(DYNLIB) $(LINTLIB) +CLEANFILES += $(BLTFILES) +CLOBBERFILES += $(DYNLIB) ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) -ROOTFS_LINTLIB= $(LINTLIB:%=$(ROOTFS_LIBDIR)/%) ROOTFS_LINKS= $(ROOTFS_LIBDIR)/$(LIBLINKS) ROOTFS_DYNLIB64= $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -ROOTFS_LINTLIB64= $(LINTLIB:%=$(ROOTFS_LIBDIR64)/%) ROOTFS_LINKS64= $(ROOTFS_LIBDIR64)/$(LIBLINKS) $(ROOTFS_DYNLIB) := FILEMODE= 755 diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.targ b/usr/src/cmd/sgs/librtld_db/Makefile.targ index 6a0c50d153..ca9d16cb03 100644 --- a/usr/src/cmd/sgs/librtld_db/Makefile.targ +++ b/usr/src/cmd/sgs/librtld_db/Makefile.targ @@ -20,6 +20,7 @@ # # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # pics/%.o: ../common/%.c @@ -36,9 +37,6 @@ pics/%64.o: ../common/%.c $(COMPILE.c) -D_ELF64 $(PICFLAGS) -o $@ $< $(POST_PROCESS_O) -$(ROOTFS_LIBDIR)/$(LINTLIBSRC): ../common/$(LINTLIBSRC) - $(INS.file) ../common/$(LINTLIBSRC) - delete: -$(RM) $(DYNLIB) @@ -49,8 +47,8 @@ include $(SRC)/cmd/sgs/Makefile.targ catalog: -chkmsg: $(LINTSRCS) - sh $(CHKMSG) $(CHKMSGFLAGS) $(LINTSRCS) +chkmsg: $(MSGSRCS) + sh $(CHKMSG) $(CHKMSGFLAGS) $(MSGSRCS) $(BLTDEFS) + \ $(BLTDATA): $(SGSMSGTARG) diff --git a/usr/src/cmd/sgs/librtld_db/amd64/Makefile b/usr/src/cmd/sgs/librtld_db/amd64/Makefile index 21fbeff150..705c6ef07a 100644 --- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # COMOBJS64 = rd_elf64.o @@ -31,23 +32,19 @@ include ../Makefile.com SGSMSGTARG += $(SGSMSGINTEL) -LINTFLAGS64 += $(VAR_LINTFLAGS64) CPPFLAGS += -D_SYSCALL32 CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: -all: $(DYNLIB) $(LINTLIB) +all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) \ - $(ROOTFS_LIBDIR64)/$(LINTLIB) +install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) pics/plt32_resolution.o: ../i386/plt32_resolution.c $(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \ ../i386/plt32_resolution.c $(POST_PROCESS_O) -lint: $(LINTLIB) $(LINTOUT32) $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/librtld_db/common/llib-lrtld_db b/usr/src/cmd/sgs/librtld_db/common/llib-lrtld_db deleted file mode 100644 index 15bf89cbec..0000000000 --- a/usr/src/cmd/sgs/librtld_db/common/llib-lrtld_db +++ /dev/null @@ -1,49 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <rtld_db.h> - - -void rd_delete(rd_agent_t *); -char * rd_errstr(rd_err_e rderr); -rd_err_e rd_event_addr(rd_agent_t *, rd_event_e, rd_notify_t *); -rd_err_e rd_event_enable(rd_agent_t *, int); -rd_err_e rd_event_getmsg(rd_agent_t *, rd_event_msg_t *); -rd_err_e rd_init(int); -rd_err_e rd_ctl(int, void *); -rd_err_e rd_loadobj_iter(rd_agent_t *, rl_iter_f *, - void *); -void rd_log(const int); -rd_agent_t * rd_new(struct ps_prochandle *); -rd_err_e rd_objpad_enable(struct rd_agent *, size_t); -rd_err_e rd_plt_resolution(rd_agent_t *, psaddr_t, lwpid_t, - psaddr_t, rd_plt_info_t *); -rd_err_e rd_get_dyns(rd_agent_t *, psaddr_t, void **, size_t *); -rd_err_e rd_reset(struct rd_agent *); diff --git a/usr/src/cmd/sgs/librtld_db/demo/Makefile b/usr/src/cmd/sgs/librtld_db/demo/Makefile index 3bacfe5125..abb486b6b7 100644 --- a/usr/src/cmd/sgs/librtld_db/demo/Makefile +++ b/usr/src/cmd/sgs/librtld_db/demo/Makefile @@ -19,6 +19,8 @@ # CDDL HEADER END # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include $(SRC)/Makefile.master @@ -90,7 +92,7 @@ CLEANFILES= *.demo */*.demo .KEEP_STATE: .PARALLEL: $(ROOTDEMOFILES) -all catalog chkmsg lint: +all catalog chkmsg: install: $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) diff --git a/usr/src/cmd/sgs/librtld_db/demo/Makefile.com b/usr/src/cmd/sgs/librtld_db/demo/Makefile.com index 0269de8a45..5b5b663b9e 100644 --- a/usr/src/cmd/sgs/librtld_db/demo/Makefile.com +++ b/usr/src/cmd/sgs/librtld_db/demo/Makefile.com @@ -19,11 +19,13 @@ # CDDL HEADER END # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= rdb # DEMO DELETE START -include ../../../../Makefile.cmd +include ../../../../Makefile.cmd # DEMO DELETE END MACH:sh= uname -p @@ -56,16 +58,6 @@ LDLIBS += -lrtld_db -lelf -ll -ly CLEANFILES += $(BLTSRC) $(BLTHDR) simp libsub.so.1 # DEMO DELETE START -# The following lint error suppression definitions are to remove lex errors -# we have no control over. -LINTERRS = -erroff=E_NAME_DEF_NOT_USED2 \ - -erroff=E_FUNC_RET_ALWAYS_IGNOR2 \ - -erroff=E_FUNC_RET_MAYBE_IGNORED2 \ - -erroff=E_BLOCK_DECL_UNUSED \ - -erroff=E_EQUALITY_NOT_ASSIGNMENT -LINTFLAGS += $(LDLIBS) -L../../$(MACH) $(LINTERRS) -LINTFLAGS64 += $(LDLIBS) -L../../$(MACH) $(LINTERRS) -CLEANFILES += $(LINTOUT) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label @@ -73,7 +65,7 @@ CERRWARN += -_gcc=-Wno-unused-variable # DEMO DELETE END test-sparc= test-sparc-regs -test-i386= +test-i386= TESTS= test-maps test-breaks test-steps test-plt_skip \ test-object-padding $(test-$(MACH)) diff --git a/usr/src/cmd/sgs/librtld_db/demo/Makefile.targ b/usr/src/cmd/sgs/librtld_db/demo/Makefile.targ index 308cf4b4fb..4d2a3b0303 100644 --- a/usr/src/cmd/sgs/librtld_db/demo/Makefile.targ +++ b/usr/src/cmd/sgs/librtld_db/demo/Makefile.targ @@ -19,6 +19,8 @@ # CDDL HEADER END # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# $(OBJDIR)/%.o: %.c $(COMPILE.c) $< -o $@ @@ -94,8 +96,5 @@ FRC: # DEMO DELETE START -$(LINTOUT): $(SRCS) - $(LINT.c) $(SRCS) > lint.out 2>&1 - include $(SRC)/cmd/sgs/Makefile.targ # DEMO DELETE END diff --git a/usr/src/cmd/sgs/librtld_db/demo/amd64/Makefile b/usr/src/cmd/sgs/librtld_db/demo/amd64/Makefile index 2fc47c2480..7cabf2ea7b 100644 --- a/usr/src/cmd/sgs/librtld_db/demo/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld_db/demo/amd64/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -48,8 +49,6 @@ test: $(TESTS) DEMOCFLAGS= install: all $(ROOTONLDBINPROG64) - -lint: $(LINTOUT) # DEMO DELETE END include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/demo/i386/Makefile b/usr/src/cmd/sgs/librtld_db/demo/i386/Makefile index d74a4ab742..da1bcc7f0e 100644 --- a/usr/src/cmd/sgs/librtld_db/demo/i386/Makefile +++ b/usr/src/cmd/sgs/librtld_db/demo/i386/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -33,8 +34,6 @@ test: $(TESTS) # DEMO DELETE START install: all $(ROOTONLDBINPROG) - -lint: $(LINTOUT) # DEMO DELETE END include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparc/Makefile b/usr/src/cmd/sgs/librtld_db/demo/sparc/Makefile index d74a4ab742..da1bcc7f0e 100644 --- a/usr/src/cmd/sgs/librtld_db/demo/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld_db/demo/sparc/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -33,8 +34,6 @@ test: $(TESTS) # DEMO DELETE START install: all $(ROOTONLDBINPROG) - -lint: $(LINTOUT) # DEMO DELETE END include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/Makefile b/usr/src/cmd/sgs/librtld_db/demo/sparcv9/Makefile index d189c38978..bfb094260f 100644 --- a/usr/src/cmd/sgs/librtld_db/demo/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld_db/demo/sparcv9/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -48,8 +49,6 @@ test: $(TESTS) DEMOCFLAGS= install: all $(ROOTONLDBINPROG64) - -lint: $(LINTOUT) # DEMO DELETE END include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/i386/Makefile b/usr/src/cmd/sgs/librtld_db/i386/Makefile index 86efe4257f..ff610a1129 100644 --- a/usr/src/cmd/sgs/librtld_db/i386/Makefile +++ b/usr/src/cmd/sgs/librtld_db/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PLTOBJS = plt32_resolution.o @@ -35,11 +35,8 @@ SGSMSGTARG += $(SGSMSGINTEL) .KEEP_STATE: -all: $(DYNLIB) $(LINTLIB) +all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) \ - $(ROOTFS_LIBDIR)/$(LINTLIB) $(ROOTFS_LIBDIR)/$(LINTLIBSRC) - -lint: $(LINTLIB) $(LINTOUT32) $(SGSLINTOUT) +install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/sparc/Makefile b/usr/src/cmd/sgs/librtld_db/sparc/Makefile index a9d2dde2a3..36c1b54df5 100644 --- a/usr/src/cmd/sgs/librtld_db/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PLTOBJS = plt32_resolution.o @@ -33,11 +33,8 @@ include ../Makefile.com .KEEP_STATE: -all: $(DYNLIB) $(LINTLIB) +all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) \ - $(ROOTFS_LIBDIR)/$(LINTLIB) $(ROOTFS_LIBDIR)/$(LINTLIBSRC) - -lint: $(LINTLIB) $(LINTOUT32) $(SGSLINTOUT) +install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile index cb2fb3b6d1..29be0d82b3 100644 --- a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # COMOBJS64 = rd_elf64.o @@ -31,23 +32,19 @@ include ../Makefile.com SGSMSGTARG += $(SGSMSGSPARCV9) -LINTFLAGS64 += $(VAR_LINTFLAGS64) CPPFLAGS += -D_SYSCALL32 CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: -all: $(DYNLIB) $(LINTLIB) +all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) \ - $(ROOTFS_LIBDIR64)/$(LINTLIB) +install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) pics/plt32_resolution.o: ../sparc/plt32_resolution.c $(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \ ../sparc/plt32_resolution.c $(POST_PROCESS_O) -lint: $(LINTLIB) $(LINTOUT32) $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/link_audit/Makefile b/usr/src/cmd/sgs/link_audit/Makefile index 7239f056fd..6001b17733 100644 --- a/usr/src/cmd/sgs/link_audit/Makefile +++ b/usr/src/cmd/sgs/link_audit/Makefile @@ -21,6 +21,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# include ../../../Makefile.master @@ -67,13 +69,12 @@ install:= TARGET= install package:= TARGET= package clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint .PARALLEL: $(ROOTDEMOFILES) .KEEP_STATE: -all clean clobber lint : \ +all clean clobber: \ $(SUBDIRS) package install : \ diff --git a/usr/src/cmd/sgs/link_audit/Makefile.com b/usr/src/cmd/sgs/link_audit/Makefile.com index b5de5f5be8..d02c71dc4f 100644 --- a/usr/src/cmd/sgs/link_audit/Makefile.com +++ b/usr/src/cmd/sgs/link_audit/Makefile.com @@ -21,6 +21,7 @@ # # Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../../../lib/Makefile.lib @@ -49,7 +50,7 @@ ONLIBS= $(SYMBINDREP) $(PERFLIB) $(BINDLIB) USRSCRIPTS= sotruss whocalls CCSLIBS= $(TRUSSLIB) $(WHOLIB) - + PICDIR= pics OBJDIR= objs @@ -93,10 +94,7 @@ CPPFLAGS += -D_REENTRANT LDFLAGS += $(CC_USE_PROTO) DYNFLAGS += $(VERSREF) -LINTFLAGS += -uaxs $(LDLIBS) -LINTFLAGS64 += -uaxs $(LDLIBS) - -CLEANFILES += $(LINTOUT) $(OBJDIR)/* $(PICDIR)/* +CLEANFILES += $(OBJDIR)/* $(PICDIR)/* CLOBBERFILES += $(ONSCRIPTS) $(ONPROGS) $(ONLIBS) $(CCSLIBS) $(USRSCRIPTS) ROOTONLDLIB= $(ROOT)/opt/SUNWonld/lib diff --git a/usr/src/cmd/sgs/link_audit/Makefile.targ b/usr/src/cmd/sgs/link_audit/Makefile.targ index 42dff453be..cb6c0443c3 100644 --- a/usr/src/cmd/sgs/link_audit/Makefile.targ +++ b/usr/src/cmd/sgs/link_audit/Makefile.targ @@ -23,6 +23,7 @@ # Use is subject to license terms. # # Copyright 2015 RackTop Systems. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # %: ../common/%.ksh @@ -94,32 +95,4 @@ $(ROOTCCSLIB): $(ROOTCCSLIB64): $(INS.dir) -LINT_HDR= perl ../../tools/lint_hdr.pl - -lint: - $(LINT_HDR) link_audit > $(LINTOUT) - $(LINT_HDR) -s truss.so.1 >> $(LINTOUT) - $(LINT.c) ../common/truss.c \ - ../common/env.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s symbindrep.so.1 >> $(LINTOUT) - $(LINT.c) ../common/symbindrep.c \ - ../common/env.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s perfcnt.so.1 >> $(LINTOUT) - $(LINT.c) ../common/perfcnt.c \ - ../common/hash.c \ - ../common/env.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s who.so.1 >> $(LINTOUT) - $(LINT.c) ../common/who.c \ - ../common/env.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s dumpbind >> $(LINTOUT) - $(LINT.c) ../common/dumpbind.c 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s bindings.so.1 >> $(LINTOUT) - $(LINT.c) ../common/bindings.c \ - ../common/env.c 2>&1 | tee -a $(LINTOUT) - include ../../../../lib/Makefile.targ diff --git a/usr/src/cmd/sgs/link_audit/amd64/Makefile b/usr/src/cmd/sgs/link_audit/amd64/Makefile index 2a7a9950c4..078a97e8f8 100644 --- a/usr/src/cmd/sgs/link_audit/amd64/Makefile +++ b/usr/src/cmd/sgs/link_audit/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -31,13 +31,9 @@ include ../Makefile.com CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) -lint := CONV_LIB = $(CONV_LIB64) - $(ONLIBS) \ $(CCSLIBS) := CFLAGS64 += $(C_PICFLAGS64) $(NO_ASM_WARN) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - .KEEP_STATE: all: $(PICDIR) .WAIT $(CCSLIBS) $(CCSSCRIPTS) \ diff --git a/usr/src/cmd/sgs/link_audit/i386/Makefile b/usr/src/cmd/sgs/link_audit/i386/Makefile index 107de46013..1e5c56bce7 100644 --- a/usr/src/cmd/sgs/link_audit/i386/Makefile +++ b/usr/src/cmd/sgs/link_audit/i386/Makefile @@ -23,13 +23,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com -lint := CONV_LIB = $(CONV_LIB32) - $(ONLIBS) \ $(CCSLIBS) := CFLAGS += $(C_PICFLAGS) $(NO_ASM_WARN) diff --git a/usr/src/cmd/sgs/link_audit/sparc/Makefile b/usr/src/cmd/sgs/link_audit/sparc/Makefile index 107de46013..1e5c56bce7 100644 --- a/usr/src/cmd/sgs/link_audit/sparc/Makefile +++ b/usr/src/cmd/sgs/link_audit/sparc/Makefile @@ -23,13 +23,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com -lint := CONV_LIB = $(CONV_LIB32) - $(ONLIBS) \ $(CCSLIBS) := CFLAGS += $(C_PICFLAGS) $(NO_ASM_WARN) diff --git a/usr/src/cmd/sgs/link_audit/sparcv9/Makefile b/usr/src/cmd/sgs/link_audit/sparcv9/Makefile index 2a7a9950c4..078a97e8f8 100644 --- a/usr/src/cmd/sgs/link_audit/sparcv9/Makefile +++ b/usr/src/cmd/sgs/link_audit/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -31,13 +31,9 @@ include ../Makefile.com CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) -lint := CONV_LIB = $(CONV_LIB64) - $(ONLIBS) \ $(CCSLIBS) := CFLAGS64 += $(C_PICFLAGS64) $(NO_ASM_WARN) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - .KEEP_STATE: all: $(PICDIR) .WAIT $(CCSLIBS) $(CCSSCRIPTS) \ diff --git a/usr/src/cmd/sgs/lorder/Makefile b/usr/src/cmd/sgs/lorder/Makefile index f50cab7252..e239506614 100644 --- a/usr/src/cmd/sgs/lorder/Makefile +++ b/usr/src/cmd/sgs/lorder/Makefile @@ -22,16 +22,14 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# -# cmd/sgs/lorder/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PROG= lorder SRCS= $(PROG:%=%.sh) -include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/sgs/Makefile.com .KEEP_STATE: @@ -42,6 +40,4 @@ install: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) clean: -lint: - include ../../Makefile.targ diff --git a/usr/src/cmd/sgs/m4/Makefile b/usr/src/cmd/sgs/m4/Makefile index 20ee889f2f..f0e6bb040a 100644 --- a/usr/src/cmd/sgs/m4/Makefile +++ b/usr/src/cmd/sgs/m4/Makefile @@ -19,13 +19,10 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1995 by Sun Microsystems, Inc. # All Rights Reserved. # -# cmd/sgs/m4/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../../Makefile.master @@ -38,7 +35,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint # for messaging catalog # @@ -47,11 +43,11 @@ POFILE= m4.po .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) catalog: $(POFILE) -$(POFILE): +$(POFILE): $(RM) $@ $(XGETTEXT) $(XGETFLAGS) $(CSRC) sed "/^domain/d" < messages.po > $@ diff --git a/usr/src/cmd/sgs/m4/i386/Makefile b/usr/src/cmd/sgs/m4/i386/Makefile index a3e69b92bb..1fe2b9b882 100644 --- a/usr/src/cmd/sgs/m4/i386/Makefile +++ b/usr/src/cmd/sgs/m4/i386/Makefile @@ -22,11 +22,13 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= m4 XPG4PROG= m4 -include ../../../Makefile.cmd +include ../../../Makefile.cmd include ../../../sgs/Makefile.var COBJS= m4.o m4ext.o m4macs.o @@ -56,8 +58,7 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-uninitialized -LINTFLAGS += $(LDLIBS) -CLEANFILES += $(LINTOUT) $(BLTSRCS) +CLEANFILES += $(BLTSRCS) m4objs.xpg4/%.o := CPPFLAGS += -DXPG4 @@ -88,16 +89,4 @@ install: all $(VAR_SGSBINPROG) $(ROOTXPG4PROG) $(VAR_SGSCCSLINK) clean: $(RM) $(ALLOBJS) $(CLEANFILES) -lint: $(LINTOUT) - -LINT_HDR= perl ../../tools/lint_hdr.pl - -$(LINTOUT): $(SRCS) - $(LINT_HDR) $(PROG) > $(LINTOUT) - $(LINT_HDR) -s m4 >> $(LINTOUT) - $(LINT.c) $(YSRCS) 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s "XPG m4" >> $(LINTOUT) - $(LINT.c) $(XPG4SRCS) 2>&1 | tee -a $(LINTOUT) - include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/m4/sparc/Makefile b/usr/src/cmd/sgs/m4/sparc/Makefile index dea00a256f..4581269a08 100644 --- a/usr/src/cmd/sgs/m4/sparc/Makefile +++ b/usr/src/cmd/sgs/m4/sparc/Makefile @@ -22,13 +22,13 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/m4/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PROG= m4 XPG4PROG= m4 -include ../../../Makefile.cmd +include ../../../Makefile.cmd include ../../../sgs/Makefile.var COBJS= m4.o m4ext.o m4macs.o @@ -57,8 +57,7 @@ CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-uninitialized CSTD= $(CSTD_GNU99) -LINTFLAGS += $(LDLIBS) -CLEANFILES += $(LINTOUT) $(BLTSRCS) +CLEANFILES += $(BLTSRCS) m4objs.xpg4/%.o := CPPFLAGS += -DXPG4 @@ -88,16 +87,4 @@ install: all $(VAR_SGSBINPROG) $(ROOTXPG4PROG) $(VAR_SGSCCSLINK) clean: $(RM) $(ALLOBJS) $(CLEANFILES) -lint: $(LINTOUT) - -LINT_HDR= perl ../../tools/lint_hdr.pl - -$(LINTOUT): $(SRCS) - $(LINT_HDR) $(PROG) > $(LINTOUT) - $(LINT_HDR) -s m4 >> $(LINTOUT) - $(LINT.c) $(YSRCS) 2>&1 | tee -a $(LINTOUT) - - $(LINT_HDR) -s "XPG m4" >> $(LINTOUT) - $(LINT.c) $(XPG4SRCS) 2>&1 | tee -a $(LINTOUT) - include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/mcs/Makefile.com b/usr/src/cmd/sgs/mcs/Makefile.com index 137286fc6c..6970c04bd0 100644 --- a/usr/src/cmd/sgs/mcs/Makefile.com +++ b/usr/src/cmd/sgs/mcs/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= mcs STRIPFILE= strip @@ -46,13 +48,9 @@ LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' LDFLAGS += $(VERSREF) $(LLDFLAGS) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -LINTFLAGS += -x -LINTFLAGS64 += -x - CERRWARN += -_gcc=-Wno-uninitialized SRCS = $(COMOBJS:%.o=../common/%.c) \ $(TOOLSOBJS:%.o=$(SGSTOOLS)/common/%.c) -LINTSRCS = $(SRCS) ../common/lintsup.c -CLEANFILES += $(OBJS) $(LINTOUTS) +CLEANFILES += $(OBJS) diff --git a/usr/src/cmd/sgs/mcs/Makefile.targ b/usr/src/cmd/sgs/mcs/Makefile.targ index 7890e5f22e..e35d939011 100644 --- a/usr/src/cmd/sgs/mcs/Makefile.targ +++ b/usr/src/cmd/sgs/mcs/Makefile.targ @@ -23,6 +23,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# ROOTSTRIPFILEPROG= $(STRIPFILE:%=$(ROOTCCSBIN)/%) ROOTSTRIPFILEPROG64= $(STRIPFILE:%=$(ROOTCCSBIN64)/%) @@ -43,8 +45,6 @@ clean: delete: $(RM) $(PROG) -lint: $(LINTOUT32) $(SGSLINTOUT) - $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) diff --git a/usr/src/cmd/sgs/mcs/amd64/Makefile b/usr/src/cmd/sgs/mcs/amd64/Makefile index 5b40ec0893..9b126f24b4 100644 --- a/usr/src/cmd/sgs/mcs/amd64/Makefile +++ b/usr/src/cmd/sgs/mcs/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -34,8 +34,6 @@ LLDFLAGS= $(LLDFLAGS64) CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - ROOTLINKS= $(VAR_SGSBIN64)/$(STRIPFILE) VAR_SGSBINPROG= $(VAR_SGSBINPROG64) diff --git a/usr/src/cmd/sgs/mcs/common/lintsup.c b/usr/src/cmd/sgs/mcs/common/lintsup.c deleted file mode 100644 index 9b3ee2ee3a..0000000000 --- a/usr/src/cmd/sgs/mcs/common/lintsup.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Supplimental Pseudo-code to get lint to consider these symbols used. - */ - -#include "alist.h" - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -foo() -{ - (void) alist_append(NULL, NULL, 0, 0); - alist_delete_by_offset(NULL, NULL); - (void) alist_insert_by_offset(NULL, NULL, 0, 0, 0); - alist_reset(NULL); - - (void) aplist_delete_value(NULL, NULL); - aplist_reset(NULL); - (void) aplist_test(NULL, NULL, 0); -} diff --git a/usr/src/cmd/sgs/mcs/sparcv9/Makefile b/usr/src/cmd/sgs/mcs/sparcv9/Makefile index 29d44b58f0..da83cb1b5a 100644 --- a/usr/src/cmd/sgs/mcs/sparcv9/Makefile +++ b/usr/src/cmd/sgs/mcs/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -34,8 +34,6 @@ LLDFLAGS= $(LLDFLAGS64) CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) - ROOTLINKS= $(VAR_SGSBIN64)/$(STRIPFILE) VAR_SGSBINPROG= $(VAR_SGSBINPROG64) diff --git a/usr/src/cmd/sgs/messages/Makefile.targ b/usr/src/cmd/sgs/messages/Makefile.targ index 766888669b..a2633771ba 100644 --- a/usr/src/cmd/sgs/messages/Makefile.targ +++ b/usr/src/cmd/sgs/messages/Makefile.targ @@ -22,7 +22,8 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/messages/Makefile.targ +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# all: $(POFILE) @@ -36,7 +37,7 @@ $(MSGDOMAIN)/$(POFILE): \ $(RM) $(MSGDOMAIN)/$(POFILE) cp $(POFILE) $(MSGDOMAIN) -delete lint: +delete: clean: $(RM) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/moe/Makefile.com b/usr/src/cmd/sgs/moe/Makefile.com index db2c0c4f0c..a752ef2b90 100644 --- a/usr/src/cmd/sgs/moe/Makefile.com +++ b/usr/src/cmd/sgs/moe/Makefile.com @@ -23,6 +23,8 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= moe @@ -40,9 +42,6 @@ MAPOPT= $(MAPFILE:%=-M%) LDFLAGS += -Wl,$(VERSREF) $(CC_USE_PROTO) $(MAPOPT) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -LINTFLAGS += -x -LINTFLAGS64 += -x - BLTDEFS= msg.h BLTDATA= msg.c BLTMESG= $(SGSMSGDIR)/moe @@ -55,6 +54,5 @@ SGSMSGALL= $(SGSMSGCOM) SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n moe_msg SRCS= $(COMOBJ:%.o=../common/%.c) $(BLTDATA) -LINTSRCS= $(SRCS) ../common/lintsup.c -CLEANFILES += $(LINTOUTS) $(BLTFILES) +CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/moe/Makefile.targ b/usr/src/cmd/sgs/moe/Makefile.targ index 8b535f8063..8bb3f79da5 100644 --- a/usr/src/cmd/sgs/moe/Makefile.targ +++ b/usr/src/cmd/sgs/moe/Makefile.targ @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # %.o: ../common/%.c @@ -48,8 +48,6 @@ delete: install \ package: all $(ROOTPROG) -lint: $(LINTOUT32) $(SGSLINTOUT) - include $(SRC)/cmd/Makefile.targ include $(SRC)/cmd/sgs/Makefile.targ diff --git a/usr/src/cmd/sgs/moe/amd64/Makefile b/usr/src/cmd/sgs/moe/amd64/Makefile index a81a9f0dbe..e82f40a747 100644 --- a/usr/src/cmd/sgs/moe/amd64/Makefile +++ b/usr/src/cmd/sgs/moe/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -32,7 +32,6 @@ include ../Makefile.com LLDFLAGS = $(LLDFLAGS64) CONVLIBDIR = $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG= $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/moe/common/lintsup.c b/usr/src/cmd/sgs/moe/common/lintsup.c deleted file mode 100644 index e342139042..0000000000 --- a/usr/src/cmd/sgs/moe/common/lintsup.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Supplimental Pseudo-code to get lint to consider these symbols used. - */ - -#include "msg.h" - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -foo() -{ - (void) _moe_msg((Msg)&__moe_msg[0]); -} diff --git a/usr/src/cmd/sgs/moe/sparcv9/Makefile b/usr/src/cmd/sgs/moe/sparcv9/Makefile index a81a9f0dbe..e82f40a747 100644 --- a/usr/src/cmd/sgs/moe/sparcv9/Makefile +++ b/usr/src/cmd/sgs/moe/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -32,7 +32,6 @@ include ../Makefile.com LLDFLAGS = $(LLDFLAGS64) CONVLIBDIR = $(CONVLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG= $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/nm/Makefile b/usr/src/cmd/sgs/nm/Makefile index 4a608fba94..2421e3cb80 100644 --- a/usr/src/cmd/sgs/nm/Makefile +++ b/usr/src/cmd/sgs/nm/Makefile @@ -19,13 +19,10 @@ # # CDDL HEADER END # -# -#pragma ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1995-1999 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/nm/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../../Makefile.master @@ -38,7 +35,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint package := TARGET= package # for messaging catalog @@ -47,7 +43,7 @@ POFILE= nm.po .KEEP_STATE: -all clean clobber install lint package: $(SUBDIRS) +all clean clobber install package: $(SUBDIRS) catalog: $(POFILE) diff --git a/usr/src/cmd/sgs/nm/amd64/Makefile b/usr/src/cmd/sgs/nm/amd64/Makefile index d5957d006d..0b9d1b6992 100644 --- a/usr/src/cmd/sgs/nm/amd64/Makefile +++ b/usr/src/cmd/sgs/nm/amd64/Makefile @@ -23,13 +23,15 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= nm ARFORMAT= PORTAR -include ../../../Makefile.cmd -include ../../Makefile.com +include ../../../Makefile.cmd +include ../../Makefile.com COMOBJS= nm.o @@ -47,10 +49,6 @@ CERRWARN += -_gcc=-Wno-uninitialized SMOFF += precedence,indenting LDLIBS += $(CONVLIBDIR64) $(CONV_LIB) $(ELFLIBDIR) -lelf -LINTFLAGS64 += -x $(LDLIBS) -m64 -LINTSRCS= $(SRCS) -CLEANFILES += $(LINTOUTS) - %.o: ../common/%.c $(COMPILE.c) $< @@ -72,9 +70,6 @@ install: all $(VAR_SGSBINPROG64) $(VAR_SGSCCSLINK64) clean: $(RM) $(OBJS) $(CLEANFILES) -lint: $(LINTOUT64) $(SGSLINTOUT) - - include ../../Makefile.targ include ../../../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/nm/i386/Makefile b/usr/src/cmd/sgs/nm/i386/Makefile index 52920c1515..c7d5bf8b0b 100644 --- a/usr/src/cmd/sgs/nm/i386/Makefile +++ b/usr/src/cmd/sgs/nm/i386/Makefile @@ -22,14 +22,16 @@ # Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= nm XPG4PROG= nm ARFORMAT= PORTAR -include ../../../Makefile.cmd -include ../../Makefile.com +include ../../../Makefile.cmd +include ../../Makefile.com COMOBJS= nm.o @@ -49,9 +51,6 @@ CERRWARN += -_gcc=-Wno-uninitialized SMOFF += precedence,indenting LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -LINTFLAGS += -x $(LDLIBS) -LINTSRCS= $(SRCS) -CLEANFILES += $(LINTOUTS) objs.xpg4/%.o := CPPFLAGS += -DXPG4 $(DEMOBJS):= DEFLIST = -DELF_OBJ @@ -85,7 +84,5 @@ install: all $(VAR_SGSBINPROG) $(ROOTXPG4PROG) $(VAR_SGSCCSLINK) clean: $(RM) $(OBJS) $(XPG4OBJS) $(CLEANFILES) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/cmd/sgs/nm/sparc/Makefile b/usr/src/cmd/sgs/nm/sparc/Makefile index 056fa29160..0fa774a310 100644 --- a/usr/src/cmd/sgs/nm/sparc/Makefile +++ b/usr/src/cmd/sgs/nm/sparc/Makefile @@ -22,7 +22,7 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/nm/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PROG= nm @@ -30,8 +30,8 @@ XPG4PROG= nm ARFORMAT= PORTAR -include ../../../Makefile.cmd -include ../../Makefile.com +include ../../../Makefile.cmd +include ../../Makefile.com COMOBJS= nm.o @@ -47,9 +47,6 @@ DEFLIST= -DTARGET=SPARC -DSPARC=1 -D$(ARFORMAT) -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) CERRWARN += -_gcc=-Wno-uninitialized LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -LINTFLAGS= -x $(LDLIBS) -LINTSRCS= $(SRCS) -CLEANFILES += $(LINTOUTS) objs.xpg4/%.o := CPPFLAGS += -DXPG4 @@ -89,7 +86,5 @@ install: all $(VAR_SGSBINPROG) $(ROOTXPG4PROG) $(VAR_SGSCCSLINK) clean: $(RM) $(OBJS) $(XPG4OBJS) $(CLEANFILES) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../../../Makefile.targ include ../../Makefile.targ diff --git a/usr/src/cmd/sgs/nm/sparcv9/Makefile b/usr/src/cmd/sgs/nm/sparcv9/Makefile index 55fb1cd328..58bc8a5aff 100644 --- a/usr/src/cmd/sgs/nm/sparcv9/Makefile +++ b/usr/src/cmd/sgs/nm/sparcv9/Makefile @@ -22,15 +22,15 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/nm/sparcv9/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PROG= nm ARFORMAT= PORTAR -include ../../../Makefile.cmd -include ../../Makefile.com +include ../../../Makefile.cmd +include ../../Makefile.com COMOBJS= nm.o @@ -45,9 +45,6 @@ DEFLIST= -DTARGET=SPARC -DSPARC=1 -D$(ARFORMAT) -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) CERRWARN += -_gcc=-Wno-uninitialized LDLIBS += $(CONVLIBDIR64) $(CONV_LIB) $(ELFLIBDIR) -lelf -LINTFLAGS64= -x $(LDLIBS) -m64 -LINTSRCS= $(SRCS) -CLEANFILES += $(LINTOUTS) %.o: ../common/%.c @@ -70,8 +67,6 @@ install: all $(VAR_SGSBINPROG64) $(VAR_SGSCCSLINK64) clean: $(RM) $(OBJS) $(CLEANFILES) -lint: $(LINTOUT64) $(SGSLINTOUT) - include ../../Makefile.targ include ../../../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/packages/Makefile b/usr/src/cmd/sgs/packages/Makefile index c66828ad85..cfc6424a61 100644 --- a/usr/src/cmd/sgs/packages/Makefile +++ b/usr/src/cmd/sgs/packages/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/Makefile.master @@ -40,7 +41,7 @@ LDMAKEDIRS= $(MACHS:%=../libldmake/%) SUBDIRS1= ../libconv \ .WAIT \ - ../libdl \ + ../libdl \ .WAIT \ ../libelf \ .WAIT \ @@ -98,11 +99,11 @@ $(PKGDIRS) := TARGET = package all clean clobber install: FRC @ cd $(MACH); pwd; $(MAKE) $@ -# -# invoke `package' to build this package from scratch. It will -# perform make install in the directories that contains components -# that this package is dependent upon -# +# +# invoke `package' to build this package from scratch. It will +# perform make install in the directories that contains components +# that this package is dependent upon +# package: FRC @/bin/time $(MAKE) package_build 2>&1 | tee $(BUILDLOG) @ echo "===BUILD COMPLETED checking for warnings...===" @@ -150,7 +151,4 @@ package_dep_: FRC @ cd ../link_audit; pwd; $(MAKE) package @ cd ../messages/$(MACH); pwd; $(MAKE) test -lint: FRC - $(MAKE) -f Makefile.lint lint - FRC: diff --git a/usr/src/cmd/sgs/packages/Makefile.com b/usr/src/cmd/sgs/packages/Makefile.com index 0dbf8d540d..376264ef1b 100644 --- a/usr/src/cmd/sgs/packages/Makefile.com +++ b/usr/src/cmd/sgs/packages/Makefile.com @@ -20,23 +20,22 @@ # # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/Makefile.master -LINTLOG= ../lint.$(MACH).log - PKGARCHIVE= . DATAFILES= copyright prototype_com prototype_$(MACH) postinstall \ preremove depend checkinstall README= SUNWonld-README FILES= $(DATAFILES) pkginfo -PACKAGE= SUNWonld +PACKAGE= SUNWonld ROOTONLD= $(ROOT)/opt/SUNWonld ROOTREADME= $(README:%=$(ROOTONLD)/%) -CLEANFILES= $(FILES) awk_pkginfo ../bld_awk_pkginfo $(LINTLOG) -CLOBBERFILES= $(PACKAGE) $(LINTLOG).bak +CLEANFILES= $(FILES) awk_pkginfo ../bld_awk_pkginfo +CLOBBERFILES= $(PACKAGE) ../%: ../common/%.ksh $(RM) $@ diff --git a/usr/src/cmd/sgs/packages/Makefile.lint b/usr/src/cmd/sgs/packages/Makefile.lint deleted file mode 100644 index 09db2eb0ed..0000000000 --- a/usr/src/cmd/sgs/packages/Makefile.lint +++ /dev/null @@ -1,84 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. -# -# cmd/sgs/packages/Makefile.lint - -include $(SRC)/Makefile.master - -MACHS:sh= if [ "$MACH" = "sparc" ]; \ - then echo "sparc sparcv9"; \ - elif [ "$MACH" = "i386" ]; \ - then echo "i386 amd64"; \ - else echo "unknown"; \ - fi - -LSUBDIRS1= ../libconv \ - .WAIT \ - ../libdl \ - .WAIT \ - ../libelf \ - .WAIT \ - ../liblddbg \ - ../librtld_db \ - .WAIT \ - ../librtld \ - ../libcrle - -LSUBDIRS2 = ../rtld \ - ../libldstab \ - ../ldprof \ - ../link_audit \ - ../libldmake \ - ../rtld/mdbmod - -LINTLDIRS= ../libld \ - ../elfdump \ - ../elfedit \ - ../elfedit/modules \ - ../elfwrap \ - ../ar \ - ../crle \ - ../dump \ - ../ld \ - ../ldd \ - ../nm \ - ../mcs \ - ../moe \ - ../pvs - -$(LSUBDIRS1) $(LSUBDIRS2) := TARGET = lint -$(LINTLDIRS) := TARGET = lint - - -../%: FRC - @ cd $@; pwd; $(MAKE) $(TARGET) - -.KEEP_STATE_FILE: .make.state.$(MACH) -.KEEP_STATE: -.PARALLEL: $(LSUBDIRS1) $(LINTLDIRS) $(LSUBDIRS2) - -lint: $(LSUBDIRS1) .WAIT $(LINTLDIRS) .WAIT $(LSUBDIRS2) - @ sh ../tools/bld_lint.sh $(LSUBDIRS1) $(LINTLDIRS) $(LSUBDIRS2) - -FRC: diff --git a/usr/src/cmd/sgs/prof/Makefile b/usr/src/cmd/sgs/prof/Makefile index 73cbdcc45e..fe417a9149 100644 --- a/usr/src/cmd/sgs/prof/Makefile +++ b/usr/src/cmd/sgs/prof/Makefile @@ -19,12 +19,8 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1993 by Sun Microsystems, Inc. -# -# cmd/sgs/prof/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../../Makefile.master @@ -35,11 +31,10 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/prof/Makefile.com b/usr/src/cmd/sgs/prof/Makefile.com index d4d97ed062..8b5a907718 100644 --- a/usr/src/cmd/sgs/prof/Makefile.com +++ b/usr/src/cmd/sgs/prof/Makefile.com @@ -23,11 +23,13 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= prof -include $(SRC)/cmd/Makefile.cmd -include $(SRC)/cmd/sgs/Makefile.com +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/sgs/Makefile.com COMOBJS= prof.o profv.o lookup.o rdelf.o \ symintOpen.o symintClose.o symintUtil.o symintErr.o symintLoad.o @@ -47,9 +49,6 @@ CERRWARN += -_gcc=-Wno-uninitialized SMATCH=off LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -LINTSRCS = $(SRCS) -LINTFLAGS += -x -CLEANFILES += $(LINTOUTS) %.o: ../common/%.c $(COMPILE.c) $< diff --git a/usr/src/cmd/sgs/prof/i386/Makefile b/usr/src/cmd/sgs/prof/i386/Makefile index ff45d0d4a5..1dcf373655 100644 --- a/usr/src/cmd/sgs/prof/i386/Makefile +++ b/usr/src/cmd/sgs/prof/i386/Makefile @@ -18,16 +18,13 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/prof/i386/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -include ../Makefile.com +include ../Makefile.com DEFLIST= -DI386 -DELF @@ -37,6 +34,4 @@ all: $(PROG) install: all $(ROOTPROG) $(ROOTCCSBINLINK) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/prof/sparc/Makefile b/usr/src/cmd/sgs/prof/sparc/Makefile index 66d729b45f..de574a247e 100644 --- a/usr/src/cmd/sgs/prof/sparc/Makefile +++ b/usr/src/cmd/sgs/prof/sparc/Makefile @@ -18,16 +18,13 @@ # # CDDL HEADER END # -# -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/prof/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -include ../Makefile.com +include ../Makefile.com DEFLIST= -DSPARC -DELF @@ -37,6 +34,4 @@ all: $(PROG) install: all $(ROOTPROG) $(ROOTCCSBINLINK) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/pvs/Makefile.com b/usr/src/cmd/sgs/pvs/Makefile.com index 34755fbc99..31239a7d0d 100644 --- a/usr/src/cmd/sgs/pvs/Makefile.com +++ b/usr/src/cmd/sgs/pvs/Makefile.com @@ -24,6 +24,8 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= pvs @@ -46,8 +48,6 @@ LLDFLAGS64 = '-R$$ORIGIN/../../lib/$(MACH64)' LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS) LDLIBS += $(LDDBGLIBDIR) $(LDDBG_LIB) $(ELFLIBDIR) -lelf \ $(CONVLIBDIR) $(CONV_LIB) -LINTFLAGS += -x -LINTFLAGS64 += -x # not linted SMATCH=off @@ -66,6 +66,5 @@ SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n pvs_msg SRCS= $(COMOBJ:%.o=../common/%.c) $(BLTDATA) \ $(TOOLOBJS:%.o=$(SGSTOOLS)/common/%.c) -LINTSRCS= $(SRCS) ../common/lintsup.c -CLEANFILES += $(LINTOUTS) $(BLTFILES) +CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/pvs/Makefile.targ b/usr/src/cmd/sgs/pvs/Makefile.targ index e7a49190c9..444f1e4bc9 100644 --- a/usr/src/cmd/sgs/pvs/Makefile.targ +++ b/usr/src/cmd/sgs/pvs/Makefile.targ @@ -21,7 +21,9 @@ # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. - +# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# %.o: ../common/%.c $(COMPILE.c) $< @@ -42,8 +44,6 @@ delete: install \ package: all $(ROOTPROG) -lint: $(LINTOUT32) $(SGSLINTOUT) - $(PROG): $(OBJS) $(MAPFILE) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) @@ -52,7 +52,7 @@ include $(SRC)/cmd/Makefile.targ include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). - + catalog: $(BLTMESG) chkmsg: $(SRCS) diff --git a/usr/src/cmd/sgs/pvs/amd64/Makefile b/usr/src/cmd/sgs/pvs/amd64/Makefile index a0f7624ef0..16e97878bc 100644 --- a/usr/src/cmd/sgs/pvs/amd64/Makefile +++ b/usr/src/cmd/sgs/pvs/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -34,7 +34,6 @@ LLDFLAGS = $(LLDFLAGS64) CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/pvs/common/lintsup.c b/usr/src/cmd/sgs/pvs/common/lintsup.c deleted file mode 100644 index be660649ea..0000000000 --- a/usr/src/cmd/sgs/pvs/common/lintsup.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Supplimental Pseudo-code to get lint to consider - * these symbols used. - */ - -#include <debug.h> -#include "msg.h" - -#pragma error_messages(off, E_STATIC_UNUSED) - -static void -foo() -{ - dbg_print(0, _pvs_msg((Msg)&__pvs_msg[0])); - - alist_delete_by_offset(NULL, NULL); - (void) alist_insert_by_offset(NULL, NULL, 0, 0, 0); - alist_reset(NULL); - - (void) aplist_delete_value(NULL, NULL); - aplist_reset(NULL); - (void) aplist_test(NULL, NULL, 0); -} diff --git a/usr/src/cmd/sgs/pvs/sparcv9/Makefile b/usr/src/cmd/sgs/pvs/sparcv9/Makefile index e00e753054..0d2163fefd 100644 --- a/usr/src/cmd/sgs/pvs/sparcv9/Makefile +++ b/usr/src/cmd/sgs/pvs/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -33,7 +33,6 @@ LLDFLAGS = $(LLDFLAGS64) CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) -LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/ranlib/Makefile b/usr/src/cmd/sgs/ranlib/Makefile index fbc5a469fd..8dc52dec44 100644 --- a/usr/src/cmd/sgs/ranlib/Makefile +++ b/usr/src/cmd/sgs/ranlib/Makefile @@ -22,13 +22,14 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= ranlib SRCS= $(PROG:%=%.sh) -include ../../Makefile.cmd +include ../../Makefile.cmd .KEEP_STATE: @@ -38,6 +39,4 @@ install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: -lint: - include ../../Makefile.targ diff --git a/usr/src/cmd/sgs/rtld.4.x/Makefile b/usr/src/cmd/sgs/rtld.4.x/Makefile index d096d92329..660f5d2697 100644 --- a/usr/src/cmd/sgs/rtld.4.x/Makefile +++ b/usr/src/cmd/sgs/rtld.4.x/Makefile @@ -19,14 +19,9 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1990 by Sun Microsystems, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -# lib/rtld.4.x/Makefile -# -# only installs an already-built a.out ld.so file #include library definitions include ../../../lib/Makefile.lib @@ -48,5 +43,3 @@ install: $(ROOTFILE) clean: clobber: clean - -lint: diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com index 22faa8f960..1bfd593cee 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.com +++ b/usr/src/cmd/sgs/rtld/Makefile.com @@ -21,8 +21,9 @@ # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. -# # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# RTLD= ld.so.1 @@ -142,12 +143,6 @@ SRCS= $(AVLOBJ:%.o=$(VAR_AVLDIR)/%.c) \ $(G_MACHOBJS:%.o=$(SRCBASE)/uts/$(PLAT)/krtld/%.c) \ $(CP_MACHOBJS:%.o=../$(MACH)/%.c) \ $(ASOBJS:%.o=%.s) -LINTSRCS= $(SRCS) ../common/lintsup.c - -LINTFLAGS += -u -Dsun -D_REENTRANT -erroff=E_EMPTY_TRANSLATION_UNIT \ - -erroff=E_NAME_DECL_NOT_USED_DEF2 -LINTFLAGS64 += -u -D_REENTRANT -erroff=E_CAST_INT_TO_SMALL_INT \ - -erroff=E_NAME_DECL_NOT_USED_DEF2 -CLEANFILES += $(LINTOUTS) $(CRTS) $(BLTFILES) +CLEANFILES += $(CRTS) $(BLTFILES) CLOBBERFILES += $(RTLD) diff --git a/usr/src/cmd/sgs/rtld/Makefile.targ b/usr/src/cmd/sgs/rtld/Makefile.targ index 3a104abe03..b028b33add 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.targ +++ b/usr/src/cmd/sgs/rtld/Makefile.targ @@ -23,6 +23,8 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# # Don't generate separate sections for this module pics/debugdata.o := XFFLAG= @@ -74,11 +76,6 @@ $(RTLD): pics $(PICS) $(CRTS) delete: -$(RM) $(RTLD) -lint: $(SGSLINTOUT) - -lint := CPICLIB= -lint := CLIB=-lc - $(ROOTFS_LIBDIR)/%: % $(INS.file) diff --git a/usr/src/cmd/sgs/rtld/amd64/Makefile b/usr/src/cmd/sgs/rtld/amd64/Makefile index b6db892ba6..f01898ec08 100644 --- a/usr/src/cmd/sgs/rtld/amd64/Makefile +++ b/usr/src/cmd/sgs/rtld/amd64/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # BASEPLAT = amd64 @@ -30,7 +31,7 @@ BASEPLAT = amd64 P_COMOBJS= debugdata.o \ analyze.o elf.o external.o globals.o \ - malloc.o paths.o setup.o util.o \ + malloc.o paths.o setup.o util.o \ dlfcns.o config_elf.o locale.o tsort.o \ remove.o move.o tls.o cap.o @@ -42,11 +43,11 @@ P_MACHOBJS= amd64_elf.o _setup.o dlamd64getunwind.o CP_MACHOBJS= -S_MACHOBJS= +S_MACHOBJS= P_ASOBJS= boot.o boot_elf.o caller.o -S_ASOBJS= +S_ASOBJS= CRTSRCS= ../../../../lib/crt/amd64 CRTI= pics/crti.o @@ -68,7 +69,6 @@ ADBGENFLAGS += -mlp64 ADBGENCFLAGS += -erroff=%all ADBSUB= $(ADBSUB64) CPPFLAGS += -D_ELF64 -LINTFLAGS64 += $(VAR_LINTFLAGS64) SONAME= /lib/amd64/ld.so.1 SGSMSGTARG += $(SGSMSGINTEL) $(SGSMSGINTEL64) $(SGSMSG64) @@ -86,8 +86,6 @@ all: $(RTLD) install: all $(ROOTDYNLIB64) -lint: $(LINTOUT64) - adbmacros: adb .WAIT $(ADBSCRIPTS) adbinstall: adbmacros .WAIT $(ROOTADB64) diff --git a/usr/src/cmd/sgs/rtld/common/lintsup.c b/usr/src/cmd/sgs/rtld/common/lintsup.c deleted file mode 100644 index d122c93dcc..0000000000 --- a/usr/src/cmd/sgs/rtld/common/lintsup.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * Supplimental definitions for lint that help us avoid - * options like `-x' that filter out things we want to - * know about as well as things we don't. - */ -#include <thread.h> -#include <sys/syscall.h> - -int profile_rtld; -uintptr_t (* p_cg_interp)(int, caddr_t, caddr_t); diff --git a/usr/src/cmd/sgs/rtld/i386/Makefile b/usr/src/cmd/sgs/rtld/i386/Makefile index 40ec3f44af..224faac481 100644 --- a/usr/src/cmd/sgs/rtld/i386/Makefile +++ b/usr/src/cmd/sgs/rtld/i386/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # BASEPLAT = i386 @@ -76,8 +77,6 @@ all: $(RTLD) install: all $(ROOTDYNLIB) -lint: $(LINTOUT32) - adbmacros: adb .WAIT $(ADBSCRIPTS) adbinstall: adbmacros .WAIT $(ROOTADB) diff --git a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com index 740a33d3d0..795b627bd7 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com +++ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com @@ -20,6 +20,7 @@ # # # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # LIBRARY= rtld.a @@ -28,10 +29,10 @@ VERS= .1 COMOBJS= rtld.o BLTOBJ= msg.o -OBJECTS= $(BLTOBJ) $(COMOBJS) +OBJECTS= $(BLTOBJ) $(COMOBJS) # include library definitions -include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.lib include $(SRC)/cmd/sgs/Makefile.com SGSMSGALL= rtld.msg @@ -47,20 +48,15 @@ SGSMSGTARG= ../common/rtld.msg SGSMSGALL= ../common/rtld.msg SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -LINTFLAGS += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 -LINTFLAGS64 += -u -erroff=E_NAME_DECL_NOT_USED_DEF2 - CERRWARN += -_gcc=-Wno-uninitialized -LINTSRCS= $(COMOBJS:%.o=../common/%.c) $(BLTDATA) +MSGSRCS= $(COMOBJS:%.o=../common/%.c) $(BLTDATA) FILEMODE= 555 DYNLIB= ld.so -LIBS = $(DYNLIB) $(LINTLIB) - -# definitions for lint +LIBS = $(DYNLIB) CPPFLAGS += -I. -I../common -I../../common -I../../../include \ -I../../../include/$(MACH) \ @@ -76,4 +72,4 @@ ROOTMDBLIB= $(ROOT)/usr/lib/mdb/proc ROOTMDBLIB64= $(ROOTMDBLIB)/$(MACH64) ROOTMDBLIBS= $(ROOTMDBLIB)/$(MTARG)$(DYNLIB) -CLEANFILES += $(LINTOUTS) $(BLTFILES) +CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ index dbe4afe5ad..70eed23464 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ +++ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # catalog: @@ -34,8 +34,8 @@ pics/%.o: ../common/%.c include $(SRC)/lib/Makefile.targ include $(SRC)/cmd/sgs/Makefile.targ -chkmsg: $(LINTSRCS) - sh $(CHKMSG) $(CHKMSGFLAGS) $(LINTSRCS) +chkmsg: $(MSGSRCS) + sh $(CHKMSG) $(CHKMSGFLAGS) $(MSGSRCS) $(BLTDEFS) + \ $(BLTDATA) + \ diff --git a/usr/src/cmd/sgs/rtld/mdbmod/amd64/Makefile b/usr/src/cmd/sgs/rtld/mdbmod/amd64/Makefile index 7600730d46..6672d516b6 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/amd64/Makefile +++ b/usr/src/cmd/sgs/rtld/mdbmod/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -38,7 +38,5 @@ all: $(BLTDEFS) .WAIT $(DYNLIB) install: all .WAIT $(ROOTMDBLIBS) -lint: $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/rtld/mdbmod/i386/Makefile b/usr/src/cmd/sgs/rtld/mdbmod/i386/Makefile index be30206afe..615651a194 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/i386/Makefile +++ b/usr/src/cmd/sgs/rtld/mdbmod/i386/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -36,6 +36,4 @@ all: $(BLTDEFS) .WAIT $(DYNLIB) install: all .WAIT $(ROOTMDBLIBS) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/rtld/mdbmod/sparc/Makefile b/usr/src/cmd/sgs/rtld/mdbmod/sparc/Makefile index be30206afe..615651a194 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/sparc/Makefile +++ b/usr/src/cmd/sgs/rtld/mdbmod/sparc/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -36,6 +36,4 @@ all: $(BLTDEFS) .WAIT $(DYNLIB) install: all .WAIT $(ROOTMDBLIBS) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/rtld/mdbmod/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/mdbmod/sparcv9/Makefile index 43f9c51aa0..e5e9248e88 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/mdbmod/sparcv9/Makefile @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -38,7 +38,5 @@ all: $(BLTDEFS) .WAIT $(DYNLIB) install: all .WAIT $(ROOTMDBLIBS) -lint: $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/rtld/sparc/Makefile b/usr/src/cmd/sgs/rtld/sparc/Makefile index d3af26fc0b..4c60c5c8d6 100644 --- a/usr/src/cmd/sgs/rtld/sparc/Makefile +++ b/usr/src/cmd/sgs/rtld/sparc/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # Object lists are organized into primary (most frequently used code) and @@ -69,7 +70,6 @@ include $(SRC)/cmd/sgs/rtld/Makefile.com CPPFLAGS += -I../../../../uts/sparc/krtld -DA_OUT CFLAGS += -xregs=no%appl ASFLAGS += $(AS_PICFLAGS) -LINTFLAGS += -DA_OUT ADBGENCFLAGS += -erroff=%all ADBGENFLAGS += -milp32 ADBSUB= $(ADBSUB32) @@ -83,8 +83,6 @@ all: $(RTLD) install: all $(ROOTDYNLIB) -lint: $(LINTOUT32) - adbmacros: adb .WAIT $(ADBSCRIPTS) adbinstall: adbmacros .WAIT $(ROOTADB) diff --git a/usr/src/cmd/sgs/rtld/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/sparcv9/Makefile index d9863462a7..d351ee66da 100644 --- a/usr/src/cmd/sgs/rtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/sparcv9/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # Object lists are organized into primary (most frequently used code) and @@ -73,7 +74,6 @@ ADBGENFLAGS += -mlp64 ADBGENCFLAGS += -erroff=%all ADBSUB= $(ADBSUB64) CPPFLAGS += -D_ELF64 -LINTFLAGS64 += $(VAR_LINTFLAGS64) SONAME= /lib/sparcv9/ld.so.1 SGSMSGTARG += $(SGSMSGSPARC) $(SGSMSGSPARC64) $(SGSMSG64) @@ -92,8 +92,6 @@ all: $(RTLD) install: all $(ROOTDYNLIB64) -lint: $(LINTOUT64) - adbmacros: adb .WAIT $(ADBSCRIPTS) adbinstall: adbmacros .WAIT $(ROOTADB64) diff --git a/usr/src/cmd/sgs/size/Makefile b/usr/src/cmd/sgs/size/Makefile index b96250d153..b376fcb68c 100644 --- a/usr/src/cmd/sgs/size/Makefile +++ b/usr/src/cmd/sgs/size/Makefile @@ -19,13 +19,10 @@ # # CDDL HEADER END # -# -#pragma ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1998-1999 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/size/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../../Makefile.master @@ -36,12 +33,11 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint package:= TARGET= package .KEEP_STATE: -all clean clobber install lint package: $(SUBDIRS) +all clean clobber install package: $(SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/size/Makefile.com b/usr/src/cmd/sgs/size/Makefile.com index c84525db97..bba1a33384 100644 --- a/usr/src/cmd/sgs/size/Makefile.com +++ b/usr/src/cmd/sgs/size/Makefile.com @@ -23,11 +23,13 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= size -include $(SRC)/cmd/Makefile.cmd -include $(SRC)/cmd/sgs/Makefile.com +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/sgs/Makefile.com COMOBJS= main.o process.o fcns.o @@ -44,6 +46,4 @@ LDFLAGS += $(LLDFLAGS) LDLIBS += $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -LINTSRCS = $(SRCS) - -CLEANFILES += $(OBJS) $(LINTOUTS) +CLEANFILES += $(OBJS) diff --git a/usr/src/cmd/sgs/size/amd64/Makefile b/usr/src/cmd/sgs/size/amd64/Makefile index f3bc731fb9..7452446d28 100644 --- a/usr/src/cmd/sgs/size/amd64/Makefile +++ b/usr/src/cmd/sgs/size/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -42,7 +42,5 @@ VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) -lint: $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/size/i386/Makefile b/usr/src/cmd/sgs/size/i386/Makefile index 7ec19dfd55..dbf6d06985 100644 --- a/usr/src/cmd/sgs/size/i386/Makefile +++ b/usr/src/cmd/sgs/size/i386/Makefile @@ -4,7 +4,7 @@ # The contents of this file are subject to the terms of the # Common Development and Distribution License (the "License"). # You may not use this file except in compliance with the License. -# +# # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. # See the License for the specific language governing permissions @@ -18,13 +18,10 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/size/i386/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.com @@ -36,6 +33,4 @@ DEFLIST= -DI386 -DELF package \ install: all $(ROOTPROG) $(ROOTCCSBINLINK) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/size/sparc/Makefile b/usr/src/cmd/sgs/size/sparc/Makefile index 633e2a4978..9972514380 100644 --- a/usr/src/cmd/sgs/size/sparc/Makefile +++ b/usr/src/cmd/sgs/size/sparc/Makefile @@ -18,16 +18,13 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/size/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -include ../Makefile.com +include ../Makefile.com DEFLIST= -DSPARC -DELF @@ -36,6 +33,4 @@ DEFLIST= -DSPARC -DELF package \ install: all $(ROOTPROG) $(ROOTCCSBINLINK) -lint: $(LINTOUT32) $(SGSLINTOUT) - include ../Makefile.targ diff --git a/usr/src/cmd/sgs/size/sparcv9/Makefile b/usr/src/cmd/sgs/size/sparcv9/Makefile index 2232f6c414..acd8b8a55f 100644 --- a/usr/src/cmd/sgs/size/sparcv9/Makefile +++ b/usr/src/cmd/sgs/size/sparcv9/Makefile @@ -22,12 +22,10 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/sgs/size/sparcv9/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -include ../Makefile.com +include ../Makefile.com DEFLIST= -DSPARC -DELF @@ -43,7 +41,5 @@ VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) -lint: $(LINTOUT64) $(SGSLINTOUT) - include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/symorder/Makefile b/usr/src/cmd/sgs/symorder/Makefile index a076b7507d..84bcbefbc1 100644 --- a/usr/src/cmd/sgs/symorder/Makefile +++ b/usr/src/cmd/sgs/symorder/Makefile @@ -18,13 +18,11 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Use is subject to license terms. +# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -# cmd/sgs/symorder/Makefile PROG= symorder @@ -38,8 +36,6 @@ all: $(PROG) install: all $(ROOTPROG) $(ROOTCCSBINLINK) -clean \ -clobber \ -lint: +clean clobber: include ../../Makefile.targ diff --git a/usr/src/cmd/sgs/tools/Makefile b/usr/src/cmd/sgs/tools/Makefile index 044839c959..eacc1f10a8 100644 --- a/usr/src/cmd/sgs/tools/Makefile +++ b/usr/src/cmd/sgs/tools/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # Makefile to support tools used for linker development. GEXECS are those # tools that the installed for distribution in the SUNWonld package. # @@ -33,8 +31,10 @@ # # o proto: creates a proto directory structure suitable for sgs make # installs (basically a subset of Targetdirs). + +# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -# cmd/sgs/tools/Makefile include $(SRC)/Makefile.master @@ -57,7 +57,6 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint .KEEP_STATE: @@ -71,8 +70,6 @@ clean clobber: $(SUBDIRS) delete: -lint: $(SUBDIRS) - %: %.ksh $(RM) $@ cat $< > $@ diff --git a/usr/src/cmd/sgs/tools/Makefile.com b/usr/src/cmd/sgs/tools/Makefile.com index b3180c50d2..91e4cfa27f 100644 --- a/usr/src/cmd/sgs/tools/Makefile.com +++ b/usr/src/cmd/sgs/tools/Makefile.com @@ -19,6 +19,7 @@ # CDDL HEADER END # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # Copyright 2010 Sun Microsystems, Inc. All rights reserved. @@ -60,8 +61,7 @@ SRCS= $(COMOBJS:%.o=../common/%.c) $(NATOBJS:%.o=../common/%.c) CPPFLAGS += $(VAR_TOOLS_CPPFLAGS) LDFLAGS += $(CC_USE_PROTO) -CLEANFILES += $(LINTOUT) $(SGSMSG_OBJS) -LINTFLAGS= -ax +CLEANFILES += $(SGSMSG_OBJS) ROOTDIR= $(ROOT)/opt/SUNWonld ROOTPROGS= $(PROGS:%=$(ROOTDIR)/bin/%) diff --git a/usr/src/cmd/sgs/tools/Makefile.targ b/usr/src/cmd/sgs/tools/Makefile.targ index 5ae70de358..2bde89ba1b 100644 --- a/usr/src/cmd/sgs/tools/Makefile.targ +++ b/usr/src/cmd/sgs/tools/Makefile.targ @@ -24,7 +24,8 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # - +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# $(ROOTDIR)/bin/%: % $(INS.file) @@ -65,9 +66,3 @@ clobber: clean clean: $(RM) $(OBJECTS) $(CLEANFILES) - -lint: - @ echo "piglatin.c:" >> $(LINTOUT) - $(LINT.c) ../common/piglatin.c -lc >> $(LINTOUT) 2>&1 - @ echo "sgsmsg" >> $(LINTOUT) - $(LINT.c) $(SGSMSG_SRCS) -lc >> $(LINTOUT) 2>&1 diff --git a/usr/src/cmd/sgs/tools/lint_hdr.pl b/usr/src/cmd/sgs/tools/lint_hdr.pl deleted file mode 100644 index f08b65af66..0000000000 --- a/usr/src/cmd/sgs/tools/lint_hdr.pl +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/perl - -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -#ident "%Z%%M% %I% %E% SMI" - - -# -# Generate a header for lint output for subdirectories of -# usr/src/cmd/sgs, of the form: -# -# lint_hdr [-s] target_file [elfclass] -# -# where: -# target - Name of main target (library or program name) -# elfclass - If present, 32 or 64, giving the ELFCLASS of -# the code being linted. -# -# The resulting header looks like the following: -# -# [elfclass - ]target [sgssubdir] -# ---------------------------------------------------- -# -# If the elfclass is omitted, then the header does not include -# it. If the target matches 'dirname sgssubdir', then sgssubdir -# is displayed without the target and without the square brackets. -# -# The -s option specifies that this is a sub-header, used when -# multiple lints are done within a single target. If -s is specified, -# the sgssubdir is not shown (presumably it was already shown in an earlier -# call to link_hdr), and a shorter dashed line is used: -# -# [elfclass - ]target -# ======================== -# - -use warnings; -use strict; -use Cwd; - -use vars qw($script $usage $dir $argc $target $elfclass); -use vars qw($sub); - -$script = 'lint_hdr'; -$usage = "usage: $script target [elfclass]\n"; - -$sub = 0; -die $usage if (scalar(@ARGV) == 0); -while ($_ = $ARGV[0],/^-/) { - ARG: { - if (/^-s$/) { - $sub = 1; - last ARG; - } - - # If it gets here, it's an unknown option - die $usage; - } - shift; -} - -$argc = scalar(@ARGV); -die $usage if (($argc < 1) || ($argc > 2)); -$target = $ARGV[0]; -$elfclass = ($argc == 2) ? "Elf$ARGV[1] - " : ''; - -if ($sub) { - print "\n$elfclass$target\n========================\n"; - exit 0; -} - -# Clip the path up through ..sgs/, leaving the path from sgs to current dir -$dir = getcwd(); -$dir = "$1" if $dir =~ /\/sgs\/(.*)$/; - -# Normally, we format the target and directory like this: -# target [dir] -# However, if this is the special case where $dir is equal to -# prog/mach -# and prog matches our target name, then just show dir without brackets. -if (($dir =~ /^([^\/]+)\/[^\/]+$/) && ($1 eq $target)) { - $target = ''; -} else { - $dir = " [$dir]"; -} - -print "\n$elfclass$target$dir\n"; -print "------------------------------------------------------------\n"; - -exit 0; diff --git a/usr/src/cmd/sgs/tools/man/Makefile b/usr/src/cmd/sgs/tools/man/Makefile index bba2832027..3aca0b0af4 100644 --- a/usr/src/cmd/sgs/tools/man/Makefile +++ b/usr/src/cmd/sgs/tools/man/Makefile @@ -19,20 +19,18 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Note, these man pages are not part of the product. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# MAN1l= chkmsg.1l \ sgsmsg.1l MANS= $(MAN1l) -include ../../../../Makefile.master +include ../../../../Makefile.master ROOTDIR= $(ROOT)/opt/SUNWonld/man ROOT1lMAN= $(MAN1l:%=$(ROOTDIR)/man1l/%) @@ -49,4 +47,4 @@ install: all $(ROOTMANS) $(ROOTDIR)/man1l/%: % $(INS.file) -clobber clean lint: +clobber clean: diff --git a/usr/src/cmd/sgs/tsort/Makefile b/usr/src/cmd/sgs/tsort/Makefile index 21c7e9dc01..d596257947 100644 --- a/usr/src/cmd/sgs/tsort/Makefile +++ b/usr/src/cmd/sgs/tsort/Makefile @@ -19,13 +19,10 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1995 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/tsort/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../../Makefile.master @@ -38,7 +35,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint # for messaging catalog # @@ -46,11 +42,11 @@ POFILE= tsort.po .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) catalog: $(POFILE) -$(POFILE): +$(POFILE): $(RM) $@ $(XGETTEXT) $(XGETFLAGS) $(CSRC) sed "/^domain/d" < messages.po > $@ diff --git a/usr/src/cmd/sgs/tsort/i386/Makefile b/usr/src/cmd/sgs/tsort/i386/Makefile index 0df033fb0e..4db8b66615 100644 --- a/usr/src/cmd/sgs/tsort/i386/Makefile +++ b/usr/src/cmd/sgs/tsort/i386/Makefile @@ -22,10 +22,12 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= tsort -include ../../../Makefile.cmd +include ../../../Makefile.cmd OBJS= Err.o erraction.o errafter.o errbefore.o errexit.o \ errprefix.o errsource.o errstrtok.o errtag.o errtext.o \ @@ -40,8 +42,6 @@ CSTD= $(CSTD_GNU99) CERRWARN += -_gcc=-Wno-parentheses -CLEANFILES += $(LINTOUT) - %.o: ../common/%.c $(COMPILE.c) $< @@ -58,10 +58,4 @@ install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(OBJS) $(CLEANFILES) -lint: $(LINTOUT) - -$(LINTOUT): $(SRCS) - perl ../../tools/lint_hdr.pl $(PROG) > $(LINTOUT) - $(LINT.c) $(SRCS) 2>&1 | tee -a $(LINTOUT) - include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/tsort/sparc/Makefile b/usr/src/cmd/sgs/tsort/sparc/Makefile index 6a5e794bda..1f6cbe9ab1 100644 --- a/usr/src/cmd/sgs/tsort/sparc/Makefile +++ b/usr/src/cmd/sgs/tsort/sparc/Makefile @@ -22,12 +22,12 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/tsort/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PROG= tsort -include ../../../Makefile.cmd +include ../../../Makefile.cmd OBJS= Err.o erraction.o errafter.o errbefore.o errexit.o \ errprefix.o errsource.o errstrtok.o errtag.o errtext.o \ @@ -41,8 +41,6 @@ CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CSTD= $(CSTD_GNU99) -CLEANFILES += $(LINTOUT) - %.o: ../common/%.c $(COMPILE.c) $< @@ -59,10 +57,4 @@ install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(OBJS) $(CLEANFILES) -lint: $(LINTOUT) - -$(LINTOUT): $(SRCS) - perl ../../tools/lint_hdr.pl $(PROG) > $(LINTOUT) - $(LINT.c) $(SRCS) 2>&1 | tee -a $(LINTOUT) - include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/unifdef/Makefile b/usr/src/cmd/sgs/unifdef/Makefile index 29e07d4f76..fe417a9149 100644 --- a/usr/src/cmd/sgs/unifdef/Makefile +++ b/usr/src/cmd/sgs/unifdef/Makefile @@ -19,12 +19,8 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1993 by Sun Microsystems, Inc. -# -# cmd/sgs/unifdef/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../../../Makefile.master @@ -35,11 +31,10 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -lint:= TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/unifdef/i386/Makefile b/usr/src/cmd/sgs/unifdef/i386/Makefile index 45fd3c3bea..1194f8124c 100644 --- a/usr/src/cmd/sgs/unifdef/i386/Makefile +++ b/usr/src/cmd/sgs/unifdef/i386/Makefile @@ -20,12 +20,14 @@ # # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Use is subject to license terms. +# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # PROG= unifdef -include ../../../Makefile.cmd +include ../../../Makefile.cmd OBJS= unifdef.o @@ -35,9 +37,6 @@ DEFLIST= -DELF_OBJ -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) CFLAGS += $(CCVERBOSE) CSTD= $(CSTD_GNU99) -LINTFLAGS += $(LDLIBS) - -CLEANFILES += $(LINTOUT) CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-parentheses @@ -58,10 +57,4 @@ install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(OBJS) $(CLEANFILES) -lint: $(LINTOUT) - -$(LINTOUT): $(SRCS) - perl ../../tools/lint_hdr.pl $(PROG) > $(LINTOUT) - $(LINT.c) $(SRCS) 2>&1 | tee -a $(LINTOUT) - include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/unifdef/sparc/Makefile b/usr/src/cmd/sgs/unifdef/sparc/Makefile index 297bfe27a5..a527083e8e 100644 --- a/usr/src/cmd/sgs/unifdef/sparc/Makefile +++ b/usr/src/cmd/sgs/unifdef/sparc/Makefile @@ -22,10 +22,12 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= unifdef -include ../../../Makefile.cmd +include ../../../Makefile.cmd OBJS= unifdef.o @@ -37,9 +39,6 @@ CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-parentheses CSTD= $(CSTD_GNU99) -LINTFLAGS += $(LDLIBS) - -CLEANFILES += $(LINTOUT) %.o: ../common/%.c $(COMPILE.c) $< @@ -57,10 +56,4 @@ install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(OBJS) $(CLEANFILES) -lint: $(LINTOUT) - -$(LINTOUT): $(SRCS) - perl ../../tools/lint_hdr.pl $(PROG) > $(LINTOUT) - $(LINT.c) $(SRCS) 2>&1 | tee -a $(LINTOUT) - include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/yacc/Makefile b/usr/src/cmd/sgs/yacc/Makefile index d1e67e732e..348fedbf5e 100644 --- a/usr/src/cmd/sgs/yacc/Makefile +++ b/usr/src/cmd/sgs/yacc/Makefile @@ -19,14 +19,10 @@ # # CDDL HEADER END # -# -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1995,1997 by Sun Microsystems, Inc. # All Rights Reserved. # -# cmd/sgs/yacc/Makefile -# +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. include ../../../Makefile.master @@ -41,7 +37,6 @@ install := TARGET= install install_lib := TARGET= install_lib clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint # for messaging catalog # @@ -50,11 +45,11 @@ POFILE= yacc.po .KEEP_STATE: -all clean clobber install install_lib lint: $(SUBDIRS) +all clean clobber install install_lib: $(SUBDIRS) catalog: $(POFILE) -$(POFILE): +$(POFILE): $(RM) $@ $(XGETTEXT) $(XGETFLAGS) $(CSRC) sed "/^domain/d" < messages.po > $@ diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com index dca8fa416d..a68a388a87 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.com +++ b/usr/src/cmd/sgs/yacc/Makefile.com @@ -24,6 +24,8 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# PROG= yacc @@ -48,27 +50,19 @@ COMSRCS= $(COMOBJS:%.o=../common/%.c) LIBSRCS= $(OBJECTS:%.o=../common/%.c) SRCS= $(COMSRCS) $(LIBSRCS) -LIBS = $(DYNLIB) $(LINTLIB) - -# Append to LINTFLAGS and LINTFLAGS64 from lib/Makefile.lib -LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2 -LINTFLAGS64 += -erroff=E_NAME_MULTIPLY_DEF2 +LIBS = $(DYNLIB) # Tune ZDEFS to ignore undefined symbols for building the yacc shared library # since these symbols (mainly yyparse) are to be resolved elsewhere. # $(DYNLIB):= ZDEFS = $(ZNODEFS) $(DYNLIBCCC):= ZDEFS = $(ZNODEFS) -LINTSRCS= ../common/llib-l$(LIBNAME) -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) INCLIST= -I../../include -I../../include/$(MACH) CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) $(PROG):= LDLIBS = $(LDLIBS.cmd) BUILD.AR= $(AR) $(ARFLAGS) $@ `$(LORDER) $(OBJS) | $(TSORT)` -LINTPOUT= lint.out - CSTD= $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) @@ -82,15 +76,9 @@ $(ROOTPROG):= FILEMODE = 0555 ROOTYACCPAR= $(YACCPAR:%=$(ROOTSHLIBCCS)/%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINT= $(LINTSRCS:../common/%=$(ROOTLINTDIR)/%) - DYNLINKLIBDIR= $(ROOTLIBDIR) DYNLINKLIB= $(LIBLINKS:%=$(DYNLINKLIBDIR)/%) LDLIBS += -lc -CLEANFILES += $(LINTPOUT) CLOBBERFILES += $(LIBS) $(LIBRARY) - -lint: lintcheck diff --git a/usr/src/cmd/sgs/yacc/Makefile.targ b/usr/src/cmd/sgs/yacc/Makefile.targ index 9cbf1c440f..baa615514c 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.targ +++ b/usr/src/cmd/sgs/yacc/Makefile.targ @@ -23,6 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # $(PROG): objs .WAIT $(POBJS) @@ -75,19 +76,8 @@ objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) - $(DYNLINKLIBDIR)/%: %$(VERS) $(INS.liblink) clean: $(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES) - -$(LINTLIB): $$(SRCS) - $(LINT.c) -o $(LIBNAME) $(SRCS) > $(LINTOUT) 2>&1 - -lintcheck: $$(SRCS) - $(LINT.c) $(LINTCHECKFLAGS) $(SRCS) $(LDLIBS) - diff --git a/usr/src/cmd/sgs/yacc/common/llib-ly b/usr/src/cmd/sgs/yacc/common/llib-ly deleted file mode 100644 index 3c4ad1fdc9..0000000000 --- a/usr/src/cmd/sgs/yacc/common/llib-ly +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* Copyright (c) 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -extern int yyerror(char *); diff --git a/usr/src/cmd/sgs/yacc/i386/Makefile b/usr/src/cmd/sgs/yacc/i386/Makefile index dde531bc69..5ca3d8bd7d 100644 --- a/usr/src/cmd/sgs/yacc/i386/Makefile +++ b/usr/src/cmd/sgs/yacc/i386/Makefile @@ -22,13 +22,12 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -# cmd/sgs/yacc/i386/Makefile DEFLIST= -DELF -include ../../../Makefile.cmd +include ../../../Makefile.cmd include ../Makefile.com .KEEP_STATE: @@ -41,7 +40,7 @@ install: all $(ROOTPROG) $(ROOTYACCPAR) $(ROOTCCSBINLINK) $(RM) $(ROOTCCSBIN)/yaccpar $(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/yacc/sparc/Makefile b/usr/src/cmd/sgs/yacc/sparc/Makefile index 86713f6617..65d76b6f21 100644 --- a/usr/src/cmd/sgs/yacc/sparc/Makefile +++ b/usr/src/cmd/sgs/yacc/sparc/Makefile @@ -22,14 +22,12 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# cmd/sgs/yacc/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # DEFLIST= -DELF -include ../../../Makefile.cmd +include ../../../Makefile.cmd include ../Makefile.com .KEEP_STATE: @@ -40,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTYACCPAR) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(RM) $(ROOTCCSBIN)/yaccpar $(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar diff --git a/usr/src/pkg/manifests/developer-library-lint.mf b/usr/src/pkg/manifests/developer-library-lint.mf index 8a2480ee39..2e28c20008 100644 --- a/usr/src/pkg/manifests/developer-library-lint.mf +++ b/usr/src/pkg/manifests/developer-library-lint.mf @@ -23,6 +23,7 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2014 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/developer/library/lint@$(PKGVERS) @@ -56,12 +57,10 @@ file path=lib/$(ARCH64)/llib-lcurses.ln file path=lib/$(ARCH64)/llib-ldevice.ln file path=lib/$(ARCH64)/llib-ldevid.ln file path=lib/$(ARCH64)/llib-ldevinfo.ln -file path=lib/$(ARCH64)/llib-ldl.ln file path=lib/$(ARCH64)/llib-ldladm.ln file path=lib/$(ARCH64)/llib-ldlpi.ln file path=lib/$(ARCH64)/llib-ldoor.ln file path=lib/$(ARCH64)/llib-lefi.ln -file path=lib/$(ARCH64)/llib-lelf.ln $(i386_ONLY)file path=lib/$(ARCH64)/llib-lfdisk.ln file path=lib/$(ARCH64)/llib-lgen.ln file path=lib/$(ARCH64)/llib-lintl.ln @@ -80,7 +79,6 @@ file path=lib/$(ARCH64)/llib-lrcm.ln file path=lib/$(ARCH64)/llib-lresolv.ln file path=lib/$(ARCH64)/llib-lrpcsvc.ln file path=lib/$(ARCH64)/llib-lrt.ln -file path=lib/$(ARCH64)/llib-lrtld_db.ln file path=lib/$(ARCH64)/llib-lscf.ln file path=lib/$(ARCH64)/llib-lsec.ln file path=lib/$(ARCH64)/llib-lsecdb.ln @@ -121,8 +119,6 @@ file path=lib/llib-ldevid file path=lib/llib-ldevid.ln file path=lib/llib-ldevinfo file path=lib/llib-ldevinfo.ln -file path=lib/llib-ldl -file path=lib/llib-ldl.ln file path=lib/llib-ldladm file path=lib/llib-ldladm.ln file path=lib/llib-ldlpi @@ -131,8 +127,6 @@ file path=lib/llib-ldoor file path=lib/llib-ldoor.ln file path=lib/llib-lefi file path=lib/llib-lefi.ln -file path=lib/llib-lelf -file path=lib/llib-lelf.ln $(i386_ONLY)file path=lib/llib-lfdisk $(i386_ONLY)file path=lib/llib-lfdisk.ln file path=lib/llib-lgen @@ -171,8 +165,6 @@ file path=lib/llib-lrpcsvc file path=lib/llib-lrpcsvc.ln file path=lib/llib-lrt file path=lib/llib-lrt.ln -file path=lib/llib-lrtld_db -file path=lib/llib-lrtld_db.ln file path=lib/llib-lscf file path=lib/llib-lscf.ln file path=lib/llib-lsec @@ -346,8 +338,6 @@ link path=usr/ccs/lib/$(ARCH64)/llib-lform.ln \ target=../../../lib/$(ARCH64)/llib-lform.ln link path=usr/ccs/lib/$(ARCH64)/llib-lgen.ln \ target=../../../../lib/$(ARCH64)/llib-lgen.ln -link path=usr/ccs/lib/$(ARCH64)/llib-ll.ln \ - target=../../../lib/$(ARCH64)/llib-ll.ln link path=usr/ccs/lib/$(ARCH64)/llib-lmenu.ln \ target=../../../lib/$(ARCH64)/llib-lmenu.ln link path=usr/ccs/lib/$(ARCH64)/llib-lpanel.ln \ @@ -356,8 +346,6 @@ link path=usr/ccs/lib/$(ARCH64)/llib-ltermcap.ln \ target=../../../../lib/$(ARCH64)/llib-ltermcap.ln link path=usr/ccs/lib/$(ARCH64)/llib-ltermlib.ln \ target=../../../../lib/$(ARCH64)/llib-lcurses.ln -link path=usr/ccs/lib/$(ARCH64)/llib-ly.ln \ - target=../../../lib/$(ARCH64)/llib-ly.ln link path=usr/ccs/lib/llib-lcurses target=../../../lib/llib-lcurses link path=usr/ccs/lib/llib-lcurses.ln target=../../../lib/llib-lcurses.ln link path=usr/ccs/lib/llib-lform target=../../lib/llib-lform @@ -394,14 +382,10 @@ link path=usr/lib/$(ARCH64)/llib-ldevid.ln \ target=../../../lib/$(ARCH64)/llib-ldevid.ln link path=usr/lib/$(ARCH64)/llib-ldevinfo.ln \ target=../../../lib/$(ARCH64)/llib-ldevinfo.ln -link path=usr/lib/$(ARCH64)/llib-ldl.ln \ - target=../../../lib/$(ARCH64)/llib-ldl.ln link path=usr/lib/$(ARCH64)/llib-ldoor.ln \ target=../../../lib/$(ARCH64)/llib-ldoor.ln link path=usr/lib/$(ARCH64)/llib-lefi.ln \ target=../../../lib/$(ARCH64)/llib-lefi.ln -link path=usr/lib/$(ARCH64)/llib-lelf.ln \ - target=../../../lib/$(ARCH64)/llib-lelf.ln $(i386_ONLY)link path=usr/lib/$(ARCH64)/llib-lfdisk.ln \ target=../../../lib/$(ARCH64)/llib-lfdisk.ln link path=usr/lib/$(ARCH64)/llib-lgen.ln \ @@ -428,8 +412,6 @@ link path=usr/lib/$(ARCH64)/llib-lrpcsvc.ln \ target=../../../lib/$(ARCH64)/llib-lrpcsvc.ln link path=usr/lib/$(ARCH64)/llib-lrt.ln \ target=../../../lib/$(ARCH64)/llib-lrt.ln -link path=usr/lib/$(ARCH64)/llib-lrtld_db.ln \ - target=../../../lib/$(ARCH64)/llib-lrtld_db.ln link path=usr/lib/$(ARCH64)/llib-lscf.ln \ target=../../../lib/$(ARCH64)/llib-lscf.ln link path=usr/lib/$(ARCH64)/llib-lsec.ln \ @@ -482,14 +464,10 @@ link path=usr/lib/llib-ldevid target=../../lib/llib-ldevid link path=usr/lib/llib-ldevid.ln target=../../lib/llib-ldevid.ln link path=usr/lib/llib-ldevinfo target=../../lib/llib-ldevinfo link path=usr/lib/llib-ldevinfo.ln target=../../lib/llib-ldevinfo.ln -link path=usr/lib/llib-ldl target=../../lib/llib-ldl -link path=usr/lib/llib-ldl.ln target=../../lib/llib-ldl.ln link path=usr/lib/llib-ldoor target=../../lib/llib-ldoor link path=usr/lib/llib-ldoor.ln target=../../lib/llib-ldoor.ln link path=usr/lib/llib-lefi target=../../lib/llib-lefi link path=usr/lib/llib-lefi.ln target=../../lib/llib-lefi.ln -link path=usr/lib/llib-lelf target=../../lib/llib-lelf -link path=usr/lib/llib-lelf.ln target=../../lib/llib-lelf.ln $(i386_ONLY)link path=usr/lib/llib-lfdisk target=../../lib/llib-lfdisk $(i386_ONLY)link path=usr/lib/llib-lfdisk.ln target=../../lib/llib-lfdisk.ln link path=usr/lib/llib-lgen target=../../lib/llib-lgen @@ -516,8 +494,6 @@ link path=usr/lib/llib-lrpcsvc target=../../lib/llib-lrpcsvc link path=usr/lib/llib-lrpcsvc.ln target=../../lib/llib-lrpcsvc.ln link path=usr/lib/llib-lrt target=../../lib/llib-lrt link path=usr/lib/llib-lrt.ln target=../../lib/llib-lrt.ln -link path=usr/lib/llib-lrtld_db target=../../lib/llib-lrtld_db -link path=usr/lib/llib-lrtld_db.ln target=../../lib/llib-lrtld_db.ln link path=usr/lib/llib-lscf target=../../lib/llib-lscf link path=usr/lib/llib-lscf.ln target=../../lib/llib-lscf.ln link path=usr/lib/llib-lsec target=../../lib/llib-lsec diff --git a/usr/src/pkg/manifests/developer-object-file.mf b/usr/src/pkg/manifests/developer-object-file.mf index cfd7e34fa0..5519e67d93 100644 --- a/usr/src/pkg/manifests/developer-object-file.mf +++ b/usr/src/pkg/manifests/developer-object-file.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/developer/object-file@$(PKGVERS) @@ -71,8 +72,6 @@ file path=usr/bin/symorder mode=0555 file path=usr/bin/tsort mode=0555 file path=usr/bin/unifdef mode=0555 file path=usr/bin/yacc mode=0555 -file path=usr/lib/$(ARCH64)/llib-ll.ln -file path=usr/lib/$(ARCH64)/llib-ly.ln file path=usr/lib/elfedit/$(ARCH64)/cap.so file path=usr/lib/elfedit/$(ARCH64)/dyn.so file path=usr/lib/elfedit/$(ARCH64)/ehdr.so @@ -89,10 +88,6 @@ file path=usr/lib/elfedit/shdr.so file path=usr/lib/elfedit/str.so file path=usr/lib/elfedit/sym.so file path=usr/lib/elfedit/syminfo.so -file path=usr/lib/llib-ll -file path=usr/lib/llib-ll.ln -file path=usr/lib/llib-ly -file path=usr/lib/llib-ly.ln file path=usr/share/lib/ccs/gprof.callg.blurb mode=0444 file path=usr/share/lib/ccs/gprof.flat.blurb mode=0444 file path=usr/share/lib/ccs/nceucform @@ -155,8 +150,6 @@ link path=usr/ccs/bin/tsort target=../../bin/tsort link path=usr/ccs/bin/unifdef target=../../bin/unifdef link path=usr/ccs/bin/yacc target=../../bin/yacc link path=usr/ccs/bin/yaccpar target=../../share/lib/ccs/yaccpar -link path=usr/ccs/lib/llib-ll.ln target=../../lib/llib-ll.ln -link path=usr/ccs/lib/llib-ly.ln target=../../lib/llib-ly.ln link path=usr/lib/elfedit/32 target=. link path=usr/lib/elfedit/64 target=$(ARCH64) depend fmri=developer/macro/cpp type=require |