diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/lib/libumem | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/lib/libumem')
| -rw-r--r-- | usr/src/lib/libumem/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libumem/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/lib/libumem/Makefile.targ | 9 | ||||
| -rw-r--r-- | usr/src/lib/libumem/amd64/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libumem/sparcv9/Makefile | 5 |
5 files changed, 6 insertions, 20 deletions
diff --git a/usr/src/lib/libumem/Makefile b/usr/src/lib/libumem/Makefile index ed59c686ef..f5010815cf 100644 --- a/usr/src/lib/libumem/Makefile +++ b/usr/src/lib/libumem/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -36,11 +34,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libumem/Makefile.com b/usr/src/lib/libumem/Makefile.com index 504a8beb38..21ddb07c76 100644 --- a/usr/src/lib/libumem/Makefile.com +++ b/usr/src/lib/libumem/Makefile.com @@ -159,7 +159,7 @@ CFLAGS64 += $(CCVERBOSE) $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common) pics/umem.o := SMOFF += index_overflow objs/umem.o := SMOFF += index_overflow -INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) +INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS) $(ROOTCOMPATLINKS) DYNFLAGS += $(ZINTERPOSE) diff --git a/usr/src/lib/libumem/Makefile.targ b/usr/src/lib/libumem/Makefile.targ index 621b935002..9665914f7b 100644 --- a/usr/src/lib/libumem/Makefile.targ +++ b/usr/src/lib/libumem/Makefile.targ @@ -45,11 +45,6 @@ $(TYPES:%=all.%): all.library.targ: $(LIBS) all.standalone.targ: $(STANDLIBRARY) -lint: $(TYPES:%=lint.%) - -$(TYPES:%=lint.%): - @$(MAKE) lintcheck CURTYPE=$(@:lint.%=%) - $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ) $(LD) $(BREDUCE) $(ZDEFS) $(LDFLAGS) -o $@.linktest $(OBJS) $(LINKTEST_OBJ) rm $@.linktest @@ -80,7 +75,3 @@ objs/%.o pics/%.o: $(ISASRCDIR)/%.s objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ../common/% - $(INS.file) diff --git a/usr/src/lib/libumem/amd64/Makefile b/usr/src/lib/libumem/amd64/Makefile index b32dff53b1..66257765d3 100644 --- a/usr/src/lib/libumem/amd64/Makefile +++ b/usr/src/lib/libumem/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# ISASRCDIR=../$(MACH)/ @@ -33,6 +31,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) \ + $(ROOTCOMPATLINKS64) include ../Makefile.targ diff --git a/usr/src/lib/libumem/sparcv9/Makefile b/usr/src/lib/libumem/sparcv9/Makefile index c7fd416349..27258f0fc7 100644 --- a/usr/src/lib/libumem/sparcv9/Makefile +++ b/usr/src/lib/libumem/sparcv9/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# ISASRCDIR=../sparc @@ -33,6 +31,7 @@ include ../../Makefile.lib.64 TYPES=library standalone -INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) +INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLIBS64) \ + $(ROOTCOMPATLINKS64) include ../Makefile.targ |