diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2019-03-24 00:27:57 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2019-04-24 16:59:38 +0000 |
| commit | ab65fd2a6cf8b63577d26411f2ea4b628591d56d (patch) | |
| tree | 419f5d778eec9084aaa8ec0683cf375fba9c1f8e /usr | |
| parent | c524b4fe42d7c586615aacae917f985e3379a108 (diff) | |
| download | illumos-joyent-ab65fd2a6cf8b63577d26411f2ea4b628591d56d.tar.gz | |
10593 illumos build should not use kernel modules as link-editor input
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr')
42 files changed, 120 insertions, 145 deletions
diff --git a/usr/src/uts/intel/genunix/Makefile b/usr/src/uts/intel/genunix/Makefile index 3603bce20a..04a0279b01 100644 --- a/usr/src/uts/intel/genunix/Makefile +++ b/usr/src/uts/intel/genunix/Makefile @@ -156,8 +156,19 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) -$(LIBGEN): $(GENUNIX) $(LIBSTUBS) - $(BUILD.SO) $(GENUNIX) $(LIBSTUBS) +# Due to what seems to be an issue in GCC 4 generated DWARF containing +# symbolic relocations against non-allocatable .debug sections, libgenunix.so +# must be built from a stripped object, thus we create an intermediary +# libgenunix.o we can safely strip. +LIBGENUNIX_O = $(OBJS_DIR)/libgenunix.o +CLEANFILES += $(LIBGENUNIX_O) + +$(LIBGENUNIX_O): $(OBJECTS) + $(LD) -r -o $(OBJS_DIR)/libgenunix.o $(OBJECTS) + $(STRIP) -x $(OBJS_DIR)/libgenunix.o + +$(LIBGEN): $(LIBGENUNIX_O) $(LIBSTUBS) + $(BUILD.SO) $(LIBGENUNIX_O) $(LIBSTUBS) $(IPCTF_TARGET) ipctf_target: FRC @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR) diff --git a/usr/src/uts/sun4u/blade/platmod/Makefile b/usr/src/uts/sun4u/blade/platmod/Makefile index 0b88f628b6..623d5d1da6 100644 --- a/usr/src/uts/sun4u/blade/platmod/Makefile +++ b/usr/src/uts/sun4u/blade/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 sun4u blade platform module. @@ -95,8 +93,8 @@ check: LINT_LIB_DIR = $(BLADE_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/sun4u/boston/platmod/Makefile b/usr/src/uts/sun4u/boston/platmod/Makefile index ac2ae7f5ea..df85dff684 100644 --- a/usr/src/uts/sun4u/boston/platmod/Makefile +++ b/usr/src/uts/sun4u/boston/platmod/Makefile @@ -23,9 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# uts/sun4u/boston/platmod/Makefile + # # This makefile drives the production of the sun4u boston platform module. # @@ -95,8 +93,8 @@ check: LINT_LIB_DIR = $(BOSTON_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/sun4u/cheetah/Makefile b/usr/src/uts/sun4u/cheetah/Makefile index 974ea75d75..09e23457b4 100644 --- a/usr/src/uts/sun4u/cheetah/Makefile +++ b/usr/src/uts/sun4u/cheetah/Makefile @@ -97,8 +97,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/sun4u/cheetahplus/Makefile b/usr/src/uts/sun4u/cheetahplus/Makefile index 7d68335ee4..0e92f69cb6 100644 --- a/usr/src/uts/sun4u/cheetahplus/Makefile +++ b/usr/src/uts/sun4u/cheetahplus/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/sun4u/cherrystone/platmod/Makefile b/usr/src/uts/sun4u/cherrystone/platmod/Makefile index 0ed52a75dd..68ff3e184a 100644 --- a/usr/src/uts/sun4u/cherrystone/platmod/Makefile +++ b/usr/src/uts/sun4u/cherrystone/platmod/Makefile @@ -98,8 +98,8 @@ check: LINT_LIB_DIR = $(CHERRYSTONE_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/sun4u/chicago/platmod/Makefile b/usr/src/uts/sun4u/chicago/platmod/Makefile index 4d151c7075..854c8d087b 100644 --- a/usr/src/uts/sun4u/chicago/platmod/Makefile +++ b/usr/src/uts/sun4u/chicago/platmod/Makefile @@ -94,8 +94,8 @@ check: LINT_LIB_DIR = $(CHICAGO_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/sun4u/daktari/platmod/Makefile b/usr/src/uts/sun4u/daktari/platmod/Makefile index 32a7654012..4bff868623 100644 --- a/usr/src/uts/sun4u/daktari/platmod/Makefile +++ b/usr/src/uts/sun4u/daktari/platmod/Makefile @@ -97,10 +97,10 @@ install: $(INSTALL_DEPS) check: -LINT_LIB_DIR =$(DAKTARI_LINT_LIB_DIR) +LINT_LIB_DIR = $(DAKTARI_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/sun4u/darwin/platmod/Makefile b/usr/src/uts/sun4u/darwin/platmod/Makefile index d6fd83d432..aaacda5c3e 100644 --- a/usr/src/uts/sun4u/darwin/platmod/Makefile +++ b/usr/src/uts/sun4u/darwin/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 sun4u darwin platform module. @@ -95,8 +93,8 @@ check: LINT_LIB_DIR = $(DARWIN_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/sun4u/enchilada/platmod/Makefile b/usr/src/uts/sun4u/enchilada/platmod/Makefile index f309441857..37a38a2ca3 100644 --- a/usr/src/uts/sun4u/enchilada/platmod/Makefile +++ b/usr/src/uts/sun4u/enchilada/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 sun4u enchilada platform module. @@ -95,8 +93,8 @@ check: LINT_LIB_DIR = $(ENCHILADA_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/sun4u/excalibur/platmod/Makefile b/usr/src/uts/sun4u/excalibur/platmod/Makefile index 0c3530c15a..dca804a517 100644 --- a/usr/src/uts/sun4u/excalibur/platmod/Makefile +++ b/usr/src/uts/sun4u/excalibur/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 sun4u excalibur platform @@ -96,8 +94,8 @@ check: LINT_LIB_DIR = $(EXCALIBUR_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/sun4u/fjlite/platmod/Makefile b/usr/src/uts/sun4u/fjlite/platmod/Makefile index 1013ac69d3..60b29fe7ee 100644 --- a/usr/src/uts/sun4u/fjlite/platmod/Makefile +++ b/usr/src/uts/sun4u/fjlite/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 sun4u fjlite platform module. @@ -95,8 +93,8 @@ check: LINT_LIB_DIR = $(FJLITE_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/sun4u/genunix/Makefile b/usr/src/uts/sun4u/genunix/Makefile index dd72737d12..f617c121c7 100644 --- a/usr/src/uts/sun4u/genunix/Makefile +++ b/usr/src/uts/sun4u/genunix/Makefile @@ -89,9 +89,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 @@ -147,13 +147,13 @@ modlintlib: $(MODLINTLIB_DEPS) clean.lint: $(CLEAN_LINT_DEPS) -install: $(INSTALL_DEPS) +install: $(INSTALL_DEPS) install_h: -$(LIBGEN): $(GENUNIX) $(LIBSTUBS) - $(BUILD.SO) $(GENUNIX) $(LIBSTUBS) +$(LIBGEN): $(OBJECTS) $(LIBSTUBS) + $(BUILD.SO) $(OBJECTS) $(LIBSTUBS) $(IPCTF_TARGET) ipctf_target: FRC @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR) diff --git a/usr/src/uts/sun4u/grover/platmod/Makefile b/usr/src/uts/sun4u/grover/platmod/Makefile index 480a9bff20..c217de09a7 100644 --- a/usr/src/uts/sun4u/grover/platmod/Makefile +++ b/usr/src/uts/sun4u/grover/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 sun4u grover platform module. @@ -95,8 +93,8 @@ check: LINT_LIB_DIR = $(GROVER_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/sun4u/hummingbird/Makefile b/usr/src/uts/sun4u/hummingbird/Makefile index d6eca49e54..ce2dcf25f8 100644 --- a/usr/src/uts/sun4u/hummingbird/Makefile +++ b/usr/src/uts/sun4u/hummingbird/Makefile @@ -97,8 +97,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/sun4u/jalapeno/Makefile b/usr/src/uts/sun4u/jalapeno/Makefile index a3c45ab0c6..83eccaaffd 100644 --- a/usr/src/uts/sun4u/jalapeno/Makefile +++ b/usr/src/uts/sun4u/jalapeno/Makefile @@ -102,8 +102,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" @@ -128,7 +128,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -CERRWARN += -_gcc=-Wno-parentheses -CERRWARN += -_gcc=-Wno-uninitialized -CERRWARN += -_gcc=-Wno-type-limits -CERRWARN += -_gcc=-Wno-clobbered +CERRWARN += -_gcc=-Wno-parentheses +CERRWARN += -_gcc=-Wno-uninitialized +CERRWARN += -_gcc=-Wno-type-limits +CERRWARN += -_gcc=-Wno-clobbered diff --git a/usr/src/uts/sun4u/javelin/platmod/Makefile b/usr/src/uts/sun4u/javelin/platmod/Makefile index d83d9464cb..7c0cec4937 100644 --- a/usr/src/uts/sun4u/javelin/platmod/Makefile +++ b/usr/src/uts/sun4u/javelin/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 sun4u javelin platmod module @@ -93,8 +91,8 @@ check: LINT_LIB_DIR =$(JAVELIN_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/sun4u/littleneck/platmod/Makefile b/usr/src/uts/sun4u/littleneck/platmod/Makefile index 1837fff861..f867e8a660 100644 --- a/usr/src/uts/sun4u/littleneck/platmod/Makefile +++ b/usr/src/uts/sun4u/littleneck/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 sun4u lneck platform module. @@ -99,8 +97,8 @@ check: LINT_LIB_DIR = $(LITTLENECK_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/sun4u/lw8/platmod/Makefile b/usr/src/uts/sun4u/lw8/platmod/Makefile index 3fd0e01760..3c2c2e27b3 100644 --- a/usr/src/uts/sun4u/lw8/platmod/Makefile +++ b/usr/src/uts/sun4u/lw8/platmod/Makefile @@ -102,8 +102,8 @@ check: LINT_LIB_DIR =$(LW8_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/sun4u/opl/olympus_c/Makefile b/usr/src/uts/sun4u/opl/olympus_c/Makefile index 764bad7594..b79f790cee 100644 --- a/usr/src/uts/sun4u/opl/olympus_c/Makefile +++ b/usr/src/uts/sun4u/opl/olympus_c/Makefile @@ -101,8 +101,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/sun4u/platmod/Makefile b/usr/src/uts/sun4u/platmod/Makefile index c94753c310..8b624bb35e 100644 --- a/usr/src/uts/sun4u/platmod/Makefile +++ b/usr/src/uts/sun4u/platmod/Makefile @@ -23,8 +23,6 @@ # 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 sun4u default platform @@ -93,8 +91,8 @@ install: $(INSTALL_DEPS) install_h: -$(PLATLIB): $(BINARY) - $(BUILD.SO) $(BINARY) +$(PLATLIB): $(OBJECTS) + $(BUILD.SO) $(OBJECTS) # # Include common targets. diff --git a/usr/src/uts/sun4u/seattle/platmod/Makefile b/usr/src/uts/sun4u/seattle/platmod/Makefile index e2fd8674c7..7dec4b8dc0 100644 --- a/usr/src/uts/sun4u/seattle/platmod/Makefile +++ b/usr/src/uts/sun4u/seattle/platmod/Makefile @@ -23,9 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# uts/sun4u/seattle/platmod/Makefile + # # This makefile drives the production of the sun4u seattle platform module. # @@ -95,8 +93,8 @@ check: LINT_LIB_DIR = $(SEATTLE_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/sun4u/serengeti/cheetah/Makefile b/usr/src/uts/sun4u/serengeti/cheetah/Makefile index 48e8935947..e28743a9f7 100644 --- a/usr/src/uts/sun4u/serengeti/cheetah/Makefile +++ b/usr/src/uts/sun4u/serengeti/cheetah/Makefile @@ -110,8 +110,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/sun4u/serengeti/cheetahplus/Makefile b/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile index aa9be6d905..e95048de85 100644 --- a/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile +++ b/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile @@ -116,8 +116,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/sun4u/serengeti/platmod/Makefile b/usr/src/uts/sun4u/serengeti/platmod/Makefile index d4187406bb..eeb965a2a8 100644 --- a/usr/src/uts/sun4u/serengeti/platmod/Makefile +++ b/usr/src/uts/sun4u/serengeti/platmod/Makefile @@ -101,10 +101,10 @@ install: $(INSTALL_DEPS) check: -LINT_LIB_DIR =$(SERENGETI_LINT_LIB_DIR) +LINT_LIB_DIR = $(SERENGETI_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/sun4u/serrano/Makefile b/usr/src/uts/sun4u/serrano/Makefile index 89be816d89..e5327b5a74 100644 --- a/usr/src/uts/sun4u/serrano/Makefile +++ b/usr/src/uts/sun4u/serrano/Makefile @@ -102,8 +102,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" @@ -128,7 +128,7 @@ LINTTAGS += -erroff=E_STATIC_UNUSED LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -CERRWARN += -_gcc=-Wno-parentheses -CERRWARN += -_gcc=-Wno-uninitialized -CERRWARN += -_gcc=-Wno-type-limits -CERRWARN += -_gcc=-Wno-clobbered +CERRWARN += -_gcc=-Wno-parentheses +CERRWARN += -_gcc=-Wno-uninitialized +CERRWARN += -_gcc=-Wno-type-limits +CERRWARN += -_gcc=-Wno-clobbered diff --git a/usr/src/uts/sun4u/snowbird/platmod/Makefile b/usr/src/uts/sun4u/snowbird/platmod/Makefile index f5b97a1ffd..60340b2180 100644 --- a/usr/src/uts/sun4u/snowbird/platmod/Makefile +++ b/usr/src/uts/sun4u/snowbird/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 sun4u snowbird platform @@ -96,8 +94,8 @@ check: LINT_LIB_DIR = $(SNOWBIRD_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/sun4u/spitfire/Makefile b/usr/src/uts/sun4u/spitfire/Makefile index b586ea1002..0b2df11653 100644 --- a/usr/src/uts/sun4u/spitfire/Makefile +++ b/usr/src/uts/sun4u/spitfire/Makefile @@ -109,8 +109,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/sun4u/starcat/cheetah/Makefile b/usr/src/uts/sun4u/starcat/cheetah/Makefile index 1cc9fbd598..a5df75acd3 100644 --- a/usr/src/uts/sun4u/starcat/cheetah/Makefile +++ b/usr/src/uts/sun4u/starcat/cheetah/Makefile @@ -107,8 +107,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/sun4u/starcat/cheetahplus/Makefile b/usr/src/uts/sun4u/starcat/cheetahplus/Makefile index 4137226115..37d8deb62b 100644 --- a/usr/src/uts/sun4u/starcat/cheetahplus/Makefile +++ b/usr/src/uts/sun4u/starcat/cheetahplus/Makefile @@ -114,8 +114,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/sun4u/starcat/platmod/Makefile b/usr/src/uts/sun4u/starcat/platmod/Makefile index 39272993dd..b451e7e09a 100644 --- a/usr/src/uts/sun4u/starcat/platmod/Makefile +++ b/usr/src/uts/sun4u/starcat/platmod/Makefile @@ -89,8 +89,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/sun4u/taco/platmod/Makefile b/usr/src/uts/sun4u/taco/platmod/Makefile index 06837433a8..328ee26896 100644 --- a/usr/src/uts/sun4u/taco/platmod/Makefile +++ b/usr/src/uts/sun4u/taco/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 sun4u taco platform module. @@ -95,8 +93,8 @@ check: LINT_LIB_DIR = $(TACO_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/sun4u/tazmo/platmod/Makefile b/usr/src/uts/sun4u/tazmo/platmod/Makefile index 09a084a363..02d5ab522c 100644 --- a/usr/src/uts/sun4u/tazmo/platmod/Makefile +++ b/usr/src/uts/sun4u/tazmo/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 sun4u tazmo platform module. @@ -95,8 +93,8 @@ check: LINT_LIB_DIR = $(TAZMO_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/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" |