diff options
| author | akolb <none@none> | 2008-02-27 15:35:58 -0800 |
|---|---|---|
| committer | akolb <none@none> | 2008-02-27 15:35:58 -0800 |
| commit | 98157a7002f4f2cf7978f3084ca5577f0a1d72b2 (patch) | |
| tree | b9197a5e5d68f4b223ca5d89fbd61cac7f7ca582 /usr | |
| parent | 5c69b57a7f8e939d5a14dace8725c53fae6e12d8 (diff) | |
| download | illumos-joyent-98157a7002f4f2cf7978f3084ca5577f0a1d72b2.tar.gz | |
6591892 ipf/netinet/Makefile incorrectly tries to install ip_icmp.h
6591900 Various sun4u platforms try to install sys symlink in usr/share/src/uts in parallel
6592974 Kernel can compile in parallel with libraries
6592975 Sparc platforms can be compiled in parallel
6592976 Intel platforms can be compiled in parallel
6592977 sun4u sub-platforms can be compiled in parallel
6621861 src/tools can be built in parallel
Diffstat (limited to 'usr')
35 files changed, 377 insertions, 292 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index 4183c65613..8802c07c61 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -51,6 +51,16 @@ HDRSUBDIRS= uts head lib cmd ucbhead # CHKHDRSUBDIRS= head uts lib +# +# Headers that can be built in parallel +# +PARALLEL_HEADERS = sysheaders userheaders libheaders ucbheaders cmdheaders + +# +# Directories that can be built in parallel +# +PARALLEL_DIRS = uts lib + # The check target also causes smf(5) service manifests to be validated. CHKMFSTSUBDIRS= cmd @@ -134,11 +144,17 @@ closedbins: FRC $(ROOTDIRS) (cd $(ROOT); tar xBpf -); \ fi +# +# Declare what parts can be build in parallel +# DUMMY at the end is used in case macro expansion produces an empty string to +# prevent everything going in parallel +# +.PARALLEL: $(PARALLEL_HEADERS) DUMMY +.PARALLEL: $(PARALLEL_DIRS) DUMMY + $(SUBDIRS) head ucbhead pkgdefs: FRC @cd $@; pwd; $(MAKE) $(TARGET) -.PARALLEL: sysheaders userheaders libheaders ucbheaders cmdheaders - # librpcsvc has a dependency on headers installed by # userheaders, hence the .WAIT before libheaders. sgs: rootdirs .WAIT sysheaders userheaders .WAIT \ diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile index d8f29e6f6a..ab25ebcb5b 100644 --- a/usr/src/tools/Makefile +++ b/usr/src/tools/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -120,7 +120,7 @@ _msg := TARGET= _msg .KEEP_STATE: -all install: $(ROOTDIRS) .WAIT $(SUBDIRS) +all install: $(SUBDIRS) clean: $(SUBDIRS) @@ -133,7 +133,9 @@ lint: $(LINTSUBDIRS) _msg: $(MSGSUBDIRS) -$(SUBDIRS): FRC +.PARALLEL: $(SUBDIRS) $(PKG_SUBDIRS) $(CLOSED_SUBDIRS) + +$(SUBDIRS): $(ROOTDIRS) FRC @cd $@; pwd; $(MAKE) $(TARGET) $(PKG_SUBDIRS): FRC diff --git a/usr/src/uts/Makefile b/usr/src/uts/Makefile index 82b011f368..6c6eb8850f 100644 --- a/usr/src/uts/Makefile +++ b/usr/src/uts/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -30,14 +30,46 @@ include ../Makefile.master # # List of architectures to build as part of the standard build. # -# Note that sparc must trail the individual platforms so that sparc -# lint targets will have the unix lint libraries to compare against. +# Some of these architectures are built in parallel (see i386_PARALLEL and +# sparc_PARALLEL). This requires building some parts first before parallel build +# can start. Platform make files know what should be built as a prerequisite for +# the parallel build to work. The i386_PREREQ and sparc_PREREQ variables tell +# which platform directory to enter to start making prerequisite dependencies. # sparc_ARCHITECTURES = sun4v sun4u sparc -i386_ARCHITECTURES = i86pc -i386_ARCHITECTURES += i86xpv -i386_ARCHITECTURES += intel +i386_ARCHITECTURES = i86pc i86xpv intel + +# +# For i386 all architectures can be compiled in parallel. +# +# intel/Makefile knows how to build prerequisites needed for parallel build. +# +i386_PREREQ = intel +i386_PARALLEL = $(i386_ARCHITECTURES) + +# +# For sparc all architectures can be compiled in parallel. +# +# sun4/Makefile knows how to build prerequisites needed for parallel build. +# can start. +# +sparc_PREREQ = sun4 +sparc_PARALLEL = $(sparc_ARCHITECTURES) + +# +# Platforms defined in $(MACH)_PARALLEL are built in parallel. DUMMY is placed +# at the end in case $(MACH)_PARALLEL is empty to prevent everything going in +# parallel. +# +.PARALLEL: $($(MACH)_PARALLEL) DUMMY + +# +# For build prerequisites we use a special target which is constructed by adding +# '.prereq' suffix to the $(MACH)_PREREQ. +# +PREREQ_TARGET = $($(MACH)_PREREQ:%=%.prereq) + def := TARGET= def all := TARGET= all @@ -69,7 +101,23 @@ install_dirs: @cd ..; pwd; $(MAKE) rootdirs @pwd -$($(MACH)_ARCHITECTURES): FRC +# +# Rule to build prerequisites. The left part of the pattern will match +# PREREQ_TARGET. +# +# The location of the Makefile is determined by strippinng '.prereq' suffix from +# the target name. We add '.prereq' suffix to the target passed to the child +# Makefile so that it can distinguish prerequisite build from the regular one. +# +# +%.prereq: + @cd $(@:%.prereq=%); pwd; $(MAKE) $(NO_STATE) $(TARGET).prereq + +# +# Rule to build architecture files. Build all required prerequisites and then +# build the rest (potentially in parallel). +# +$($(MACH)_ARCHITECTURES): $(PREREQ_TARGET) FRC @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) $(PMTMO_FILE) pmtmo_file: $(PATCH_MAKEUP_TABLE) diff --git a/usr/src/uts/common/Makefile.rules b/usr/src/uts/common/Makefile.rules index 3297c20d93..60a66be792 100644 --- a/usr/src/uts/common/Makefile.rules +++ b/usr/src/uts/common/Makefile.rules @@ -1087,15 +1087,6 @@ $(MD_XDR_CSRC)/metamed_xdr.c: $(MD_XDR_XSRC)/metamed.x nawk '{sub(/metamed.h/, "mdmed.h"); print $$0}' >$@ # -# Privilege constants -# - -PRIVS_C = $(UTSBASE)/common/os/priv_const.c - -$(PRIVS_C): $(PRIVS_AWK) $(PRIVS_DEF) - $(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@ - -# # Section 1b: Lint `objects' # $(LINTS_DIR)/%.ln: $(COMMONBASE)/crypto/aes/%.c diff --git a/usr/src/uts/common/inet/ipf/netinet/Makefile b/usr/src/uts/common/inet/ipf/netinet/Makefile index 6e66a1c892..cca3b48ac4 100644 --- a/usr/src/uts/common/inet/ipf/netinet/Makefile +++ b/usr/src/uts/common/inet/ipf/netinet/Makefile @@ -1,7 +1,7 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # uts/common/inet/ipf/netinet/Makefile @@ -9,7 +9,7 @@ # include global definitions include ../../../../../Makefile.master -HDRS= ipl.h ip_compat.h ip_fil.h ip_icmp.h ip_nat.h ip_proxy.h ip_state.h \ +HDRS= ipl.h ip_compat.h ip_fil.h ip_nat.h ip_proxy.h ip_state.h \ ip_frag.h ip_auth.h ip_lookup.h ip_pool.h ip_htable.h ipf_stack.h ROOTDIRS= $(ROOT)/usr/include/netinet diff --git a/usr/src/uts/i86pc/unix/Makefile b/usr/src/uts/i86pc/unix/Makefile index 911791194c..7e46ed70d5 100644 --- a/usr/src/uts/i86pc/unix/Makefile +++ b/usr/src/uts/i86pc/unix/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -195,10 +195,6 @@ $(MULTIBOOT): $(DBOOT_O) $(DSF_DIR)/$(OBJS_DIR)/assym.h $(DSF_DIR)/$(OBJS_DIR)/kdi_assym.h: FRC @cd $(DSF_DIR); $(MAKE) all.targ -$(GENLIB): FRC - @(cd $(GENLIB_DIR); pwd; $(MAKE) all.targ) - @pwd - # # The global lint target builds the kernel lint library (llib-lunix.ln) # which is equivalent to a lint of /unix.o. Then all kernel modules for @@ -210,11 +206,13 @@ $(GENLIB): FRC # $(LINT_LIB): $(LINT_LIB_DIR) $(LINTS) + @pwd @-$(ECHO) "\n$(UNIX): (library construction):" @$(LINT) -o$(UNIX) $(LINTFLAGS) $(LINTS) @$(MV) $(@F) $@ $(DBOOT_LINT_LIB): $(LINT_LIB_DIR) $(DBOOT_LINTS) + @pwd @-$(ECHO) "\n$(DBOOT): (library construction):" @$(LINT) -o$(DBOOT) $(DBOOT_LINTFLAGS) $(DBOOT_LINTS) @$(MV) $(@F) $@ diff --git a/usr/src/uts/i86xpv/unix/Makefile b/usr/src/uts/i86xpv/unix/Makefile index 6af4f9401d..86dde00794 100644 --- a/usr/src/uts/i86xpv/unix/Makefile +++ b/usr/src/uts/i86xpv/unix/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -180,10 +180,6 @@ $(DBOOT_OBJS_DIR): $(DSF_DIR)/$(OBJS_DIR)/assym.h $(DSF_DIR)/$(OBJS_DIR)/kdi_assym.h: FRC @cd $(DSF_DIR); $(MAKE) all.targ -$(GENLIB): FRC - @(cd $(GENLIB_DIR); pwd; $(MAKE) all.targ) - @pwd - # # The global lint target builds the kernel lint library (llib-lunix.ln) # which is equivalent to a lint of /unix.o. Then all kernel modules for @@ -195,11 +191,13 @@ $(GENLIB): FRC # $(LINT_LIB): $(LINT_LIB_DIR) $(LINTS) + @pwd @-$(ECHO) "\n$(UNIX): (library construction):" @$(LINT) -o$(UNIX) $(LINTFLAGS) $(LINTS) @$(MV) $(@F) $@ $(DBOOT_LINT_LIB): $(LINT_LIB_DIR) $(DBOOT_LINTS) + @pwd @-$(ECHO) "\n$(DBOOT): (library construction):" @$(LINT) -o$(DBOOT) $(DBOOT_LINTFLAGS) $(DBOOT_LINTS) @$(MV) $(@F) $@ diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile index dbebc6fd66..f646565c24 100644 --- a/usr/src/uts/intel/Makefile +++ b/usr/src/uts/intel/Makefile @@ -71,17 +71,22 @@ $(CLOSED_BUILD)CRYPTO_EK_KMODS += blowfish448 # # def := TARGET= def +def.prereq := TARGET= def all := TARGET= all +all.prereq := TARGET= all install := TARGET= install +install.prereq := TARGET= all clean := TARGET= clean clobber := TARGET= clobber lint := TARGET= lint +lint.prereq := TARGET= lint modlintlib := TARGET= modlintlib modlist := TARGET= modlist modlist := NO_STATE= -K $$MODSTATE$$$$ clean.lint := TARGET= clean.lint check := TARGET= check install_h := TARGET= install_h +install_h.prereq := TARGET= install_h .KEEP_STATE: @@ -91,6 +96,59 @@ install_h := TARGET= install_h def all install clean clobber modlist: genassym $(KMODS) $(CLOSED_KMODS) \ $(SVVS) $(XMODS) $(CLOSED_XMODS) config + +# +# Privilege constants +# +# NOTE: The rules for generating priv_const.c file are shared between all +# processor architectures and and should be kept in sync. If they are changed in +# this file make sure that sparc rules are updated as well. +# +PRIVS_C = $(SRC)/uts/common/os/priv_const.c + +$(PRIVS_C): $(PRIVS_AWK) $(PRIVS_DEF) + $(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@ + +# +# Prerequisites +# +# The uts/Makefile defines build parallelism for x86 platforms such that i86pc, +# i86xpv and intel are all built in parallel. This requires building certain +# parts before the parallel build can start. The uts/Makefile appends the +# '.prereq' string to the original target and executes this Makefile to build +# any prerequisites needed before the full parallel build can start. After that +# make continues with normal targets. +# +# Any build prerequisites for x86 builds should be described here. +# +# genassym is used to build intel/dtrace and genunix, so it should be built +# first. +# +# priv_const.c is required to build genunix. +# +# genunix is used by everyone to ctf-merge with. Genunix is CTF-merged with +# intel/ip so as a side effect this dependency builds intel/ip as part of the +# prerequisites. +# +# intel/dtrace depends on i86pc/genassym, so we need to build both +# i86pc/genassym and intel/genassym. +# +all.prereq install.prereq def.prereq: genassym genunix FRC + @cd ../i86pc/genassym; pwd; $(MAKE) $(@:%.prereq=%) + +# +# i86pc lint libraries should be built first +# +lint.prereq: FRC + @cd ../i86pc; pwd; $(MAKE) $(NO_STATE) lint + +# +# Nothing to do for any other prerequisite targets. +# +%.prereq: + +genunix: $(PRIVS_C) + modlintlib clean.lint: $(LINT_KMODS) $(CLOSED_LINT_KMODS) $(SVVS) \ $(XMODS) $(CLOSED_XMODS) @@ -135,6 +193,7 @@ LINT_TARGET = globallint globallint := LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2 globallint: + @pwd @-$(ECHO) "\nFULL KERNEL: global crosschecks:" @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.intel) | $(LGREP.2) diff --git a/usr/src/uts/intel/dtrace/Makefile b/usr/src/uts/intel/dtrace/Makefile index d8863ba62c..5cd153e387 100644 --- a/usr/src/uts/intel/dtrace/Makefile +++ b/usr/src/uts/intel/dtrace/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -73,10 +73,4 @@ install: $(INSTALL_DEPS) $(BINARY): $(ASSYM_H) -# -# Rule to generate assym.h -# -$(ASSYM_H): FRC - @cd $(DSF_DIR); $(MAKE) all.targ - include $(UTSBASE)/intel/Makefile.targ diff --git a/usr/src/uts/sparc/dtrace/Makefile b/usr/src/uts/sparc/dtrace/Makefile index 2d489d744a..bd500cd36c 100644 --- a/usr/src/uts/sparc/dtrace/Makefile +++ b/usr/src/uts/sparc/dtrace/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -91,10 +91,4 @@ install: $(INSTALL_DEPS) $(BINARY): $(ASSYM_H) -# -# Rule to generate assym.h -# -$(ASSYM_H): FRC - @cd $(DSF_DIR); $(MAKE) all.targ - include $(UTSBASE)/sparc/Makefile.targ diff --git a/usr/src/uts/sun4/Makefile b/usr/src/uts/sun4/Makefile new file mode 100644 index 0000000000..7dc007b2df --- /dev/null +++ b/usr/src/uts/sun4/Makefile @@ -0,0 +1,43 @@ +# +# 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. +# +# ident "%Z%%M% %I% %E% SMI" +# +# This makefile drives the production of all sparc-specific dependencies that +# should be built before sun4v/sun4u/sparc platforms can be built in parallel. +# + +# +# Include platform-specific Makefile definitions. +# +UTSBASE = .. +include $(UTSBASE)/$(MACH)/Makefile.$(MACH) + +SPARC_PREREQ = $(UTSBASE)/sun4u + +# +# So far all the prerequisite information is in sun4u Makefile +# +%.prereq: + @cd $(SPARC_PREREQ); pwd; $(MAKE) $(NO_STATE) $@ diff --git a/usr/src/uts/sun4u/Makefile b/usr/src/uts/sun4u/Makefile index df4e9677cd..c11eb0a099 100644 --- a/usr/src/uts/sun4u/Makefile +++ b/usr/src/uts/sun4u/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -67,12 +67,17 @@ $(CLOSED_BUILD)CRYPTO_EK_KMODS += arcfour2048 def := TARGET= def +def.prereq := TARGET= def all := TARGET= all +all.prereq := TARGET= all install := TARGET= install +install.prereq := TARGET= all install_h := TARGET= install_h +install_h.prere := TARGET= install_h clean := TARGET= clean clobber := TARGET= clobber lint := TARGET= lint +lint.prereq := TARGET= lint lintlib := TARGET= lintlib modlintlib := TARGET= modlintlib modlist := TARGET= modlist @@ -114,6 +119,92 @@ modlintlib: $(LINT_KMODS) $(CLOSED_LINT_KMODS) genassym unix $(KMODS): FRC @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) +# +# Privilege constants +# +# NOTE: The rules for generating priv_const.c file are shared between all +# processor architectures and should be kept in sync. If they are changed in +# this file make sure that x86 rules are updated as well. +# +PRIVS_C = $(UTSBASE)/common/os/priv_const.c + +$(PRIVS_C): $(PRIVS_AWK) $(PRIVS_DEF) + $(NAWK) -f $(PRIVS_AWK) < $(PRIVS_DEF) cfile=$@ + + +# +# Prerequisites +# +# The uts/Makefile defines build parallelism for sun4 platforms such that sparc, +# sun4u and sun4v are all built in parallel. Also this Makefile specifies that +# all IMPLEMENTATIONS sun4u sub-platforms are built in parallel. This requires +# building certain parts before the parallel build can start. The uts/Makefile +# appends the '.prereq' string to the original target and executes this Makefile +# to build any prerequisites needed before the full parallel build can start. +# After that make continues with normal targets. +# +# Any build prerequisites for sun4 and IMPLEMENTATIONS builds should be +# described here. +# +# genassym is used to build dtrace and genunix, so it should be built first. +# +# priv_const.c is required to build genunix. +# +# genunix is used by everyone to ctfmerge with. Genunix is merged with sparc/ip +# so as a side effect this dependency builds sparc/ip as part of the +# prerequisites. +# +# unix is not required by itself but several sun4u platforms require +# sun4u/platmod to be present. The easiest way to achieve this is to build +# sun4u/unix first since sun4u/unix Makefile builds sun4u/platform correctly. +# This causes full sun4u/unix to be built before all sun4u platforms and +# before uts/sun4v and uts/sparc, but it acceptable since it is not spending +# too much time building sun4u/unix. +# +all.prereq def.prereq install.prereq: genassym genunix unix + +# +# Various sun4u platforms expect proto/root_sparc/platform/sun4u/include to be +# present. This is handled by running make install_h in sun4u/unix directory +# first. +# +install_h.prereq: FRC + @cd sys; pwd; $(MAKE) $(TARGET) + +# +# sun4u/unix and sun4u/genunix should be linted first since sparc does global +# cross-check with these lint libraries. The sun4u/unix and sun4u/genunix can be +# linted in parallel. +# +LINT_PREREQ = unix.lint genunix.lint +lint.prereq: $(LINT_PREREQ) + +.PARALLEL: $(LINT_PREREQ) + +$(LINT_PREREQ): + @cd $(@:%.lint=%); pwd; $(MAKE) $(TARGET) + +# +# Nothing to do with any other prerequisites +# +%.prereq: + +# +# Platform inter-dependencies +# +lw8: serengeti + +quasar: darwin + +# +# The genunix requires priv_const.c file to be generated first. +# +genunix: $(PRIVS_C) + +# +# Rules +# + $(IMPLEMENTATIONS): FRC @cd $@; pwd; THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET) @@ -204,6 +295,7 @@ $(USR_DESKTOP_LIB_DIR): $(USR_DESKTOP_DIR) LINT_TARGET = globallint globallint: + @pwd @-$(ECHO) "\nSUN4U KERNEL: global crosschecks:" @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) diff --git a/usr/src/uts/sun4u/Makefile.sun4u.shared b/usr/src/uts/sun4u/Makefile.sun4u.shared index e5885e6c26..4da18f2298 100644 --- a/usr/src/uts/sun4u/Makefile.sun4u.shared +++ b/usr/src/uts/sun4u/Makefile.sun4u.shared @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -158,38 +158,38 @@ include $(UTSTREE)/common/Makefile.files include $(UTSBASE)/Makefile.uts # These come after Makefile.uts (for CLOSED_BUILD). -IMPLEMENTATIONS = tazmo .WAIT -IMPLEMENTATIONS += starfire .WAIT -IMPLEMENTATIONS += javelin .WAIT -IMPLEMENTATIONS += darwin .WAIT -IMPLEMENTATIONS += quasar .WAIT -IMPLEMENTATIONS += grover .WAIT -IMPLEMENTATIONS += enchilada .WAIT -IMPLEMENTATIONS += taco .WAIT -IMPLEMENTATIONS += mpxu .WAIT -IMPLEMENTATIONS += excalibur .WAIT -IMPLEMENTATIONS += montecarlo .WAIT -IMPLEMENTATIONS += serengeti .WAIT -IMPLEMENTATIONS += littleneck .WAIT -IMPLEMENTATIONS += starcat .WAIT -IMPLEMENTATIONS += daktari .WAIT -IMPLEMENTATIONS += cherrystone .WAIT -IMPLEMENTATIONS += fjlite .WAIT -IMPLEMENTATIONS += snowbird .WAIT -IMPLEMENTATIONS += schumacher .WAIT -IMPLEMENTATIONS += blade .WAIT -IMPLEMENTATIONS += boston .WAIT -IMPLEMENTATIONS += seattle .WAIT -IMPLEMENTATIONS += chicago .WAIT -IMPLEMENTATIONS += sunfire .WAIT -IMPLEMENTATIONS += lw8 .WAIT -IMPLEMENTATIONS += makaha .WAIT -IMPLEMENTATIONS += opl .WAIT -IMPLEMENTATIONS += lw2plus .WAIT -IMPLEMENTATIONS += douglas .WAIT - -$(CLOSED_BUILD)CLOSED_IMPLEMENTATIONS = chalupa .WAIT -$(CLOSED_BUILD)CLOSED_IMPLEMENTATIONS += ents .WAIT +IMPLEMENTATIONS = tazmo +IMPLEMENTATIONS += starfire +IMPLEMENTATIONS += javelin +IMPLEMENTATIONS += darwin +IMPLEMENTATIONS += quasar +IMPLEMENTATIONS += grover +IMPLEMENTATIONS += enchilada +IMPLEMENTATIONS += taco +IMPLEMENTATIONS += mpxu +IMPLEMENTATIONS += excalibur +IMPLEMENTATIONS += montecarlo +IMPLEMENTATIONS += serengeti +IMPLEMENTATIONS += littleneck +IMPLEMENTATIONS += starcat +IMPLEMENTATIONS += daktari +IMPLEMENTATIONS += cherrystone +IMPLEMENTATIONS += fjlite +IMPLEMENTATIONS += snowbird +IMPLEMENTATIONS += schumacher +IMPLEMENTATIONS += blade +IMPLEMENTATIONS += boston +IMPLEMENTATIONS += seattle +IMPLEMENTATIONS += chicago +IMPLEMENTATIONS += sunfire +IMPLEMENTATIONS += lw8 +IMPLEMENTATIONS += makaha +IMPLEMENTATIONS += opl +IMPLEMENTATIONS += lw2plus +IMPLEMENTATIONS += douglas + +$(CLOSED_BUILD)CLOSED_IMPLEMENTATIONS = chalupa +$(CLOSED_BUILD)CLOSED_IMPLEMENTATIONS += ents # # machine specific optimization, override default in Makefile.master diff --git a/usr/src/uts/sun4u/cherrystone/sys/Makefile b/usr/src/uts/sun4u/cherrystone/sys/Makefile index 51ec61b537..3f99aa18ec 100644 --- a/usr/src/uts/sun4u/cherrystone/sys/Makefile +++ b/usr/src/uts/sun4u/cherrystone/sys/Makefile @@ -2,9 +2,8 @@ # 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. +# 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. @@ -20,8 +19,8 @@ # CDDL HEADER END # # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" # @@ -48,9 +47,6 @@ ROOTHDRS= $(HDRS:%=$(USR_CHERRYSTONE_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: @@ -70,10 +66,6 @@ $(USR_CHERRYSTONE_ISYS_DIR)/%: % $(USR_CHERRYSTONE_ISYS_DIR) $(ROOTDIRS): $(INS.dir.root.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/daktari/sys/Makefile b/usr/src/uts/sun4u/daktari/sys/Makefile index 14324be41e..7fb3b00f04 100644 --- a/usr/src/uts/sun4u/daktari/sys/Makefile +++ b/usr/src/uts/sun4u/daktari/sys/Makefile @@ -2,9 +2,8 @@ # 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. +# 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. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2000, 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -48,9 +47,6 @@ ROOTHDRS= $(HDRS:%=$(USR_DAKTARI_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: @@ -70,10 +66,6 @@ $(USR_DAKTARI_ISYS_DIR)/%: % $(USR_DAKTARI_ISYS_DIR) $(ROOTDIRS): $(INS.dir.root.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/excalibur/sys/Makefile b/usr/src/uts/sun4u/excalibur/sys/Makefile index 58fb35ec53..f12655fd28 100644 --- a/usr/src/uts/sun4u/excalibur/sys/Makefile +++ b/usr/src/uts/sun4u/excalibur/sys/Makefile @@ -2,9 +2,8 @@ # 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. +# 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. @@ -22,8 +21,8 @@ # # ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 1999-2000 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # UTSBASE = ../../.. @@ -46,9 +45,6 @@ ROOTHDRS= $(HDRS:%=$(USR_EXCALIBUR_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: @@ -68,10 +64,6 @@ $(USR_EXCALIBUR_ISYS_DIR)/%: % $(USR_EXCALIBUR_ISYS_DIR) $(ROOTDIRS): $(INS.dir.bin.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/genassym/Makefile b/usr/src/uts/sun4u/genassym/Makefile index 593f0bd17a..2c03dc6f9c 100644 --- a/usr/src/uts/sun4u/genassym/Makefile +++ b/usr/src/uts/sun4u/genassym/Makefile @@ -2,9 +2,8 @@ # 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. +# 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. @@ -20,7 +19,8 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -82,6 +82,8 @@ clean.lint: install: def +install_h: + # # create assym.h # diff --git a/usr/src/uts/sun4u/genunix/Makefile b/usr/src/uts/sun4u/genunix/Makefile index 76bf63c762..d3968bb247 100644 --- a/usr/src/uts/sun4u/genunix/Makefile +++ b/usr/src/uts/sun4u/genunix/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -132,6 +132,9 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) +install_h: + + $(LIBGEN): $(GENUNIX) $(LIBSTUBS) $(BUILD.SO) $(GENUNIX) $(LIBSTUBS) diff --git a/usr/src/uts/sun4u/lw8/sys/Makefile b/usr/src/uts/sun4u/lw8/sys/Makefile index 86d57a3370..66e38d8935 100644 --- a/usr/src/uts/sun4u/lw8/sys/Makefile +++ b/usr/src/uts/sun4u/lw8/sys/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -48,9 +48,6 @@ ROOTHDRS= $(HDRS:%=$(USR_LW8_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: @@ -70,10 +67,6 @@ $(USR_LW8_ISYS_DIR)/%: % $(USR_LW8_ISYS_DIR) $(ROOTDIRS): $(INS.dir.root.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/montecarlo/sys/Makefile b/usr/src/uts/sun4u/montecarlo/sys/Makefile index 5be53298d5..f9da9b007b 100644 --- a/usr/src/uts/sun4u/montecarlo/sys/Makefile +++ b/usr/src/uts/sun4u/montecarlo/sys/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -44,9 +44,6 @@ ROOTHDRS= $(HDRS:%=$(USR_PSM_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: @@ -66,10 +63,6 @@ $(USR_PSM_ISYS_DIR)/%: % $(USR_PSM_ISYS_DIR) $(ROOTDIRS): $(INS.dir.root.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/mpxu/sys/Makefile b/usr/src/uts/sun4u/mpxu/sys/Makefile index b77f60fe5a..9cc338fa27 100644 --- a/usr/src/uts/sun4u/mpxu/sys/Makefile +++ b/usr/src/uts/sun4u/mpxu/sys/Makefile @@ -2,9 +2,8 @@ # 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. +# 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. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -48,9 +47,6 @@ ROOTHDRS= $(HDRS:%=$(USR_PSM_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: @@ -73,10 +69,6 @@ $(USR_MPXU_ISYS_DIR)/%: % $(USR_MPXU_ISYS_DIR) $(ROOTDIRS): $(INS.dir.root.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/ngdr/sys/Makefile b/usr/src/uts/sun4u/ngdr/sys/Makefile index ccf8d0d4dc..ae2334819e 100644 --- a/usr/src/uts/sun4u/ngdr/sys/Makefile +++ b/usr/src/uts/sun4u/ngdr/sys/Makefile @@ -2,9 +2,8 @@ # 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. +# 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. @@ -22,8 +21,8 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # uts/sun4u/ngdr/sys/Makefile # @@ -45,9 +44,6 @@ ROOTHDRS= $(HDRS:%=$(USR_PSM_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHKHDRS= dr.h \ dr_util.h @@ -71,10 +67,6 @@ $(USR_PSM_ISYS_DIR)/%: % $(USR_PSM_ISYS_DIR) $(ROOTDIRS): $(INS.dir.root.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../../Makefile.targ diff --git a/usr/src/uts/sun4u/opl/sys/Makefile b/usr/src/uts/sun4u/opl/sys/Makefile index ef8f297eeb..ab589b442f 100644 --- a/usr/src/uts/sun4u/opl/sys/Makefile +++ b/usr/src/uts/sun4u/opl/sys/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -76,9 +76,6 @@ ROOTHDRS= $(HDRS:%=$(USR_OPL_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) \ $(CHKHDRS:%.h=%.check) \ $(OPLMSUHDRS:%.h=oplmsu/%.check) \ @@ -103,10 +100,6 @@ $(USR_OPL_ISYS_DIR)/%: % $(USR_OPL_ISYS_DIR) $(ROOTDIRS): $(INS.dir.bin.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/opl/unix/Makefile b/usr/src/uts/sun4u/opl/unix/Makefile index b8b938ca51..f5285d1bd2 100644 --- a/usr/src/uts/sun4u/opl/unix/Makefile +++ b/usr/src/uts/sun4u/opl/unix/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -153,20 +153,6 @@ $(KRTLD_O): $(KRTLD_OBJECTS) $(LD) -r -o $@ -M$(KRTLD_MAPFILE) $(KRTLD_OBJECTS) # -# Special rules for generating assym.h for inclusion in assembly files. -# -$(DSF_DIR)/$(OBJS_DIR)/assym.h: FRC - @cd $(DSF_DIR); pwd; $(MAKE) all.targ - -$(GENLIB): FRC - @(cd $(GENLIB_DIR); pwd; $(MAKE) all.targ) - @pwd - -$(PLATLIB): - ?@(cd $(PLAT_DIR); pwd; $(MAKE) all.targ) - ?@pwd - -# # CPU_OBJ now comprises of 2 object files which come from sun4 common # and from architecture dependent code. OBJS_DIR is prepended where # CPU_OBJ is defined to allow for building multiple CPU_OBJ's diff --git a/usr/src/uts/sun4u/platmod/Makefile b/usr/src/uts/sun4u/platmod/Makefile index 9337b42ff2..c94753c310 100644 --- a/usr/src/uts/sun4u/platmod/Makefile +++ b/usr/src/uts/sun4u/platmod/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -91,6 +91,8 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) +install_h: + $(PLATLIB): $(BINARY) $(BUILD.SO) $(BINARY) diff --git a/usr/src/uts/sun4u/serengeti/sys/Makefile b/usr/src/uts/sun4u/serengeti/sys/Makefile index 589524679d..5c557c88e0 100644 --- a/usr/src/uts/sun4u/serengeti/sys/Makefile +++ b/usr/src/uts/sun4u/serengeti/sys/Makefile @@ -2,9 +2,8 @@ # 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. +# 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. @@ -20,8 +19,8 @@ # CDDL HEADER END # # -# Copyright (c) 2000 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" # @@ -48,9 +47,6 @@ ROOTHDRS= $(HDRS:%=$(USR_SERENGETI_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: @@ -70,10 +66,6 @@ $(USR_SERENGETI_ISYS_DIR)/%: % $(USR_SERENGETI_ISYS_DIR) $(ROOTDIRS): $(INS.dir.root.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/serengeti/unix/Makefile b/usr/src/uts/sun4u/serengeti/unix/Makefile index 5e01356937..e57033ffeb 100644 --- a/usr/src/uts/sun4u/serengeti/unix/Makefile +++ b/usr/src/uts/sun4u/serengeti/unix/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -154,19 +154,6 @@ $(KRTLD_O): $(KRTLD_OBJECTS) $(LD) -r -o $@ -M $(KRTLD_MAPFILE) $(KRTLD_OBJECTS) # -# Special rules for generating assym.h for inclusion in assembly files. -# -$(DSF_DIR)/$(OBJS_DIR)/assym.h: FRC - @cd $(DSF_DIR); $(MAKE) all.targ - -$(GENLIB): FRC - @(cd $(GENLIB_DIR); pwd; $(MAKE) all.targ) - @pwd - -$(PLATLIB): - ?@(cd $(PLAT_DIR); pwd; $(MAKE) all.targ) - ?@pwd -# # CPU_OBJ now comprises of 2 object files which come from sun4 common # and from architecture dependent code. OBJS_DIR is prepended where # CPU_OBJ is defined to allow for building multiple CPU_OBJ's diff --git a/usr/src/uts/sun4u/starcat/sys/Makefile b/usr/src/uts/sun4u/starcat/sys/Makefile index 41a9849f44..2755674d52 100644 --- a/usr/src/uts/sun4u/starcat/sys/Makefile +++ b/usr/src/uts/sun4u/starcat/sys/Makefile @@ -19,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" +#ident "%Z%%M% %I% %E% SMI" # UTSBASE = ../../.. @@ -54,9 +54,6 @@ ROOTHDRS= $(HDRS:%=$(USR_STARCAT_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) \ $(CHKHDRS:%.h=%.check) \ $(STARHDRS:%.h=%.check) @@ -78,10 +75,6 @@ $(USR_STARCAT_ISYS_DIR)/%: % $(USR_STARCAT_ISYS_DIR) $(ROOTDIRS): $(INS.dir.bin.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/starcat/unix/Makefile b/usr/src/uts/sun4u/starcat/unix/Makefile index 0920829465..09b359ff32 100644 --- a/usr/src/uts/sun4u/starcat/unix/Makefile +++ b/usr/src/uts/sun4u/starcat/unix/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -154,19 +154,6 @@ $(KRTLD_O): $(KRTLD_OBJECTS) $(LD) -r -o $@ -M$(KRTLD_MAPFILE) $(KRTLD_OBJECTS) # -# Special rules for generating assym.h for inclusion in assembly files. -# -$(DSF_DIR)/$(OBJS_DIR)/assym.h: FRC - @cd $(DSF_DIR); $(MAKE) all.targ - -$(GENLIB): FRC - @(cd $(GENLIB_DIR); pwd; $(MAKE) all.targ) - @pwd - -$(PLATLIB): - ?@(cd $(PLAT_DIR); pwd; $(MAKE) all.targ) - ?@pwd -# # CPU_OBJ now comprises of 2 object files which come from sun4 common # and from architecture dependent code. OBJS_DIR is prepended where # CPU_DIR is defined to allow for building multiple CPU_OBJ's diff --git a/usr/src/uts/sun4u/starfire/sys/Makefile b/usr/src/uts/sun4u/starfire/sys/Makefile index e89c585837..1904790b17 100644 --- a/usr/src/uts/sun4u/starfire/sys/Makefile +++ b/usr/src/uts/sun4u/starfire/sys/Makefile @@ -2,9 +2,8 @@ # 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. +# 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. @@ -22,8 +21,8 @@ # # ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 1997-1999, 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # UTSBASE = ../../.. @@ -48,9 +47,6 @@ ROOTHDRS= $(HDRS:%=$(USR_STARFIRE_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) \ $(STARHDRS:%.h=%.check) @@ -71,10 +67,6 @@ $(USR_STARFIRE_ISYS_DIR)/%: % $(USR_STARFIRE_ISYS_DIR) $(ROOTDIRS): $(INS.dir.root.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/starfire/unix/Makefile b/usr/src/uts/sun4u/starfire/unix/Makefile index e856bc1f2f..fafb68c098 100644 --- a/usr/src/uts/sun4u/starfire/unix/Makefile +++ b/usr/src/uts/sun4u/starfire/unix/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -148,20 +148,6 @@ $(KRTLD_O): $(KRTLD_OBJECTS) $(LD) -r -o $@ -M$(KRTLD_MAPFILE) $(KRTLD_OBJECTS) # -# Special rules for generating assym.h for inclusion in assembly files. -# -$(DSF_DIR)/$(OBJS_DIR)/assym.h: FRC - @cd $(DSF_DIR); $(MAKE) all.targ - -$(GENLIB): FRC - @(cd $(GENLIB_DIR); pwd; $(MAKE) all.targ) - @pwd - -$(PLATLIB): - ?@(cd $(PLAT_DIR); pwd; $(MAKE) all.targ) - ?@pwd - -# # CPU_OBJ now comprises of 2 object files which come from sun4 common # and from architecture dependent code. OBJS_DIR is prepended where # CPU_OBJ is defined to allow for building multiple CPU_OBJ's diff --git a/usr/src/uts/sun4u/sunfire/sys/Makefile b/usr/src/uts/sun4u/sunfire/sys/Makefile index 4c63e7b9c6..cca53f629a 100644 --- a/usr/src/uts/sun4u/sunfire/sys/Makefile +++ b/usr/src/uts/sun4u/sunfire/sys/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -46,9 +46,6 @@ ROOTHDRS= $(HDRS:%=$(USR_SUNFIRE_ISYS_DIR)/%) ROOTDIR= $(ROOT)/usr/share/src ROOTDIRS= $(ROOTDIR)/uts $(ROOTDIR)/uts/$(PLATFORM) -ROOTLINK= $(ROOTDIR)/uts/$(PLATFORM)/sys -LINKDEST= ../../../../platform/$(PLATFORM)/include/sys - CHECKHDRS= $(HDRS:%.h=%.check) .KEEP_STATE: @@ -68,10 +65,6 @@ $(USR_SUNFIRE_ISYS_DIR)/%: % $(USR_SUNFIRE_ISYS_DIR) $(ROOTDIRS): $(INS.dir.root.bin) -# -r because this used to be a directory and is now a link. -$(ROOTLINK): $(ROOTDIRS) - -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK) - FRC: include ../Makefile.targ diff --git a/usr/src/uts/sun4u/unix/Makefile b/usr/src/uts/sun4u/unix/Makefile index d41a0a9f07..e198bbdad2 100644 --- a/usr/src/uts/sun4u/unix/Makefile +++ b/usr/src/uts/sun4u/unix/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -163,20 +163,6 @@ $(KRTLD_O): $(KRTLD_OBJECTS) $(LD) -r -o $@ -M$(KRTLD_MAPFILE) $(KRTLD_OBJECTS) # -# Special rules for generating assym.h for inclusion in assembly files. -# -$(DSF_DIR)/$(OBJS_DIR)/assym.h: FRC - @cd $(DSF_DIR); $(MAKE) all.targ - -$(GENLIB): FRC - @(cd $(GENLIB_DIR); pwd; $(MAKE) all.targ) - @pwd - -$(PLATLIB): - ?@(cd $(PLAT_DIR); pwd; $(MAKE) all.targ) - ?@pwd - -# # CPU_OBJ now comprises of 2 object files which come from sun4 common # and from architecture dependent code. OBJS_DIR is prepended where # CPU_OBJ is defined to allow for building multiple CPU_OBJ's @@ -184,6 +170,10 @@ $(PLATLIB): $(CPULIB): $(CPU_OBJ) $(BUILD.SO) $(CPU_OBJ) +$(PLATLIB): + ?@(cd $(PLAT_DIR); pwd; $(MAKE) all.targ) + ?@pwd + # # The global lint target builds the kernel lint library (llib-lunix.ln) # which is equivalent to a lint of /unix.o. Then all kernel modules for @@ -195,6 +185,7 @@ $(CPULIB): $(CPU_OBJ) # $(LINT_LIB): $(LINT_LIB_DIR) $(LINTS) + @pwd @-$(ECHO) "\n$(UNIX): (library construction):" @$(LINT) -o $(UNIX) $(LINTFLAGS) $(LINTS) @$(MV) $(@F) $@ diff --git a/usr/src/uts/sun4v/genunix/Makefile b/usr/src/uts/sun4v/genunix/Makefile index b7a6742138..dccdd6dcbb 100644 --- a/usr/src/uts/sun4v/genunix/Makefile +++ b/usr/src/uts/sun4v/genunix/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -135,11 +135,8 @@ install: $(INSTALL_DEPS) $(LIBGEN): $(GENUNIX) $(LIBSTUBS) $(BUILD.SO) $(GENUNIX) $(LIBSTUBS) -$(IPCTF_TARGET) ipctf_target: FRC - @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR) - @pwd - $(GENUNIX): $(IPCTF_TARGET) $(OBJECTS) + @pwd $(LD) -r $(LDFLAGS) -o $@ $(OBJECTS) $(CTFMERGE_GENUNIX_MERGE) $(POST_PROCESS) diff --git a/usr/src/uts/sun4v/unix/Makefile b/usr/src/uts/sun4v/unix/Makefile index 411bd5ef04..6b3c685636 100644 --- a/usr/src/uts/sun4v/unix/Makefile +++ b/usr/src/uts/sun4v/unix/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -168,12 +168,12 @@ $(DSF_DIR)/$(OBJS_DIR)/assym.h: FRC @cd $(DSF_DIR); $(MAKE) all.targ $(GENLIB): FRC - @(cd $(GENLIB_DIR); pwd; $(MAKE) all.targ) @pwd + @(cd $(GENLIB_DIR); pwd; $(MAKE) all.targ) $(PLATLIB): - ?@(cd $(PLAT_DIR); pwd; $(MAKE) all.targ) ?@pwd + ?@(cd $(PLAT_DIR); pwd; $(MAKE) all.targ) # # CPU_OBJ now comprises of 2 object files which come from sun4 common |