From ab65fd2a6cf8b63577d26411f2ea4b628591d56d Mon Sep 17 00:00:00 2001 From: Richard Lowe Date: Sun, 24 Mar 2019 00:27:57 +0000 Subject: 10593 illumos build should not use kernel modules as link-editor input Reviewed by: Toomas Soome Reviewed by: Hans Rosenfeld Reviewed by: Robert Mustacchi Approved by: Dan McDonald --- usr/src/uts/sun4v/generic/Makefile | 4 ++-- usr/src/uts/sun4v/genunix/Makefile | 12 ++++++------ usr/src/uts/sun4v/kt/Makefile | 4 ++-- usr/src/uts/sun4v/montoya/platmod/Makefile | 10 ++++------ usr/src/uts/sun4v/niagara/Makefile | 4 ++-- usr/src/uts/sun4v/niagara2/Makefile | 7 +++---- usr/src/uts/sun4v/ontario/platmod/Makefile | 8 +++----- usr/src/uts/sun4v/platmod/Makefile | 6 ++---- usr/src/uts/sun4v/vfalls/Makefile | 7 +++---- 9 files changed, 27 insertions(+), 35 deletions(-) (limited to 'usr/src/uts/sun4v') diff --git a/usr/src/uts/sun4v/generic/Makefile b/usr/src/uts/sun4v/generic/Makefile index 53b1f453d9..f1b348c336 100644 --- a/usr/src/uts/sun4v/generic/Makefile +++ b/usr/src/uts/sun4v/generic/Makefile @@ -113,8 +113,8 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) -$(CPULIB): $(BINARY) - $(BUILD.SO) $(BINARY) +$(CPULIB): $(OBJECTS) + $(BUILD.SO) $(OBJECTS) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4v/genunix/Makefile b/usr/src/uts/sun4v/genunix/Makefile index 905d426dcc..3efad8b2e4 100644 --- a/usr/src/uts/sun4v/genunix/Makefile +++ b/usr/src/uts/sun4v/genunix/Makefile @@ -97,9 +97,9 @@ CLOBBERFILES += $(GENUNIX) IPCTF_TARGET = $(IPCTF) $(PATCH_BUILD)IPCTF_TARGET = -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(SRC)/common CPPFLAGS += -I$(SRC)/uts/common/fs/zfs @@ -156,10 +156,10 @@ modlintlib: $(MODLINTLIB_DEPS) clean.lint: $(CLEAN_LINT_DEPS) -install: $(INSTALL_DEPS) +install: $(INSTALL_DEPS) -$(LIBGEN): $(GENUNIX) $(LIBSTUBS) - $(BUILD.SO) $(GENUNIX) $(LIBSTUBS) +$(LIBGEN): $(OBJECTS) $(LIBSTUBS) + $(BUILD.SO) $(OBJECTS) $(LIBSTUBS) $(GENUNIX): $(IPCTF_TARGET) $(OBJECTS) @pwd diff --git a/usr/src/uts/sun4v/kt/Makefile b/usr/src/uts/sun4v/kt/Makefile index 2ad3e409b0..f4721ae345 100644 --- a/usr/src/uts/sun4v/kt/Makefile +++ b/usr/src/uts/sun4v/kt/Makefile @@ -103,8 +103,8 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) -$(CPULIB): $(BINARY) - $(BUILD.SO) $(BINARY) +$(CPULIB): $(OBJECTS) + $(BUILD.SO) $(OBJECTS) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4v/montoya/platmod/Makefile b/usr/src/uts/sun4v/montoya/platmod/Makefile index 71a36dae5b..cb92f7feda 100644 --- a/usr/src/uts/sun4v/montoya/platmod/Makefile +++ b/usr/src/uts/sun4v/montoya/platmod/Makefile @@ -23,11 +23,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # -# This makefile drives the production of the sun4v montoya default +# This makefile drives the production of the sun4v montoya default # platform module. # # sun4v implementation architecture dependent @@ -101,10 +99,10 @@ install: $(INSTALL_DEPS) check: -LINT_LIB_DIR =$(MONTOYA_LINT_LIB_DIR) +LINT_LIB_DIR = $(MONTOYA_LINT_LIB_DIR) -$(PLATLIB): $(BINARY) - $(BUILD.SO) $(BINARY) +$(PLATLIB): $(OBJECTS) + $(BUILD.SO) $(OBJECTS) $(SYM_MOD): $(UNIX_O) $(PLATLIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4v/niagara/Makefile b/usr/src/uts/sun4v/niagara/Makefile index d802e9bf64..713198a991 100644 --- a/usr/src/uts/sun4v/niagara/Makefile +++ b/usr/src/uts/sun4v/niagara/Makefile @@ -96,8 +96,8 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) -$(CPULIB): $(BINARY) - $(BUILD.SO) $(BINARY) +$(CPULIB): $(OBJECTS) + $(BUILD.SO) $(OBJECTS) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4v/niagara2/Makefile b/usr/src/uts/sun4v/niagara2/Makefile index 2be0bcbcfd..39a01ef025 100644 --- a/usr/src/uts/sun4v/niagara2/Makefile +++ b/usr/src/uts/sun4v/niagara2/Makefile @@ -19,11 +19,10 @@ # CDDL HEADER END # # -# uts/sun4v/niagara2/Makefile # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of the UltraSPARC-T2 cpu module. # @@ -106,8 +105,8 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) -$(CPULIB): $(BINARY) - $(BUILD.SO) $(BINARY) +$(CPULIB): $(OBJECTS) + $(BUILD.SO) $(OBJECTS) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4v/ontario/platmod/Makefile b/usr/src/uts/sun4v/ontario/platmod/Makefile index cbdf058686..e4c2f30b46 100644 --- a/usr/src/uts/sun4v/ontario/platmod/Makefile +++ b/usr/src/uts/sun4v/ontario/platmod/Makefile @@ -23,11 +23,9 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # -# This makefile drives the production of the sun4v ontario default +# This makefile drives the production of the sun4v ontario default # platform module. # # sun4v implementation architecture dependent @@ -103,8 +101,8 @@ check: LINT_LIB_DIR =$(ONTARIO_LINT_LIB_DIR) -$(PLATLIB): $(BINARY) - $(BUILD.SO) $(BINARY) +$(PLATLIB): $(OBJECTS) + $(BUILD.SO) $(OBJECTS) $(SYM_MOD): $(UNIX_O) $(PLATLIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4v/platmod/Makefile b/usr/src/uts/sun4v/platmod/Makefile index 98f274aaa0..149000cfb0 100644 --- a/usr/src/uts/sun4v/platmod/Makefile +++ b/usr/src/uts/sun4v/platmod/Makefile @@ -23,8 +23,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # This makefile drives the production of the sun4v default platform module. @@ -90,8 +88,8 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) -$(PLATLIB): $(BINARY) - $(BUILD.SO) $(BINARY) +$(PLATLIB): $(OBJECTS) + $(BUILD.SO) $(OBJECTS) # # Include common targets. diff --git a/usr/src/uts/sun4v/vfalls/Makefile b/usr/src/uts/sun4v/vfalls/Makefile index f2305550fd..001654791b 100644 --- a/usr/src/uts/sun4v/vfalls/Makefile +++ b/usr/src/uts/sun4v/vfalls/Makefile @@ -19,11 +19,10 @@ # CDDL HEADER END # # -# uts/sun4v/vfalls/Makefile # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. + # -#ident "%Z%%M% %I% %E% SMI" # # This makefile drives the production of the UltraSPARC-T2+ cpu module. # @@ -106,8 +105,8 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) -$(CPULIB): $(BINARY) - $(BUILD.SO) $(BINARY) +$(CPULIB): $(OBJECTS) + $(BUILD.SO) $(OBJECTS) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" -- cgit v1.2.3