diff options
58 files changed, 473 insertions, 420 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 0514eb6424..138c03e677 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -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. @@ -19,12 +18,15 @@ # # CDDL HEADER END # + # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # + +# # Makefile.master, global definitions for system source # ROOT= /proto @@ -295,13 +297,12 @@ amd64_AS_XARCH= -xarch=amd64 -P -Ui386 -U__i386 # # XX64 future versions of gcc will make -mcmodel=kernel imply -mno-red-zone # -sparc_STAND_FLAGS= -sparcv9_STAND_FLAGS= +sparc_STAND_FLAGS= -_gcc=-ffreestanding +sparcv9_STAND_FLAGS= -_gcc=-ffreestanding i386_STAND_FLAGS= -_gcc=-ffreestanding amd64_STAND_FLAGS= -Wu,-xmodel=kernel SAVEARGS= -Wu,-save_args -$(__GNUC64)SAVEARGS= amd64_STAND_FLAGS += $(SAVEARGS) STAND_FLAGS_32 = $($(MACH)_STAND_FLAGS) @@ -357,20 +358,28 @@ COPTFLAG64= $($(MACH64)_COPTFLAG) # (gives them a unique prefix). Disable that. CNOGLOBAL= -W0,-noglobal +# Normally, gcc uses indirect DWARF strings to save space. However, +# this causes relocations that ctfconvert cannot handle. Disable this. +CDWARFSTR= -_gcc=-fno-dwarf2-indirect-strings + +# Sometimes we want all symbols and types in debugging information even +# if they aren't used. +CALLSYMS= -W0,-xdbggen=no%usedonly + # # Flags used to build in debug mode for ctf generation. Bugs in the Devpro # compilers currently prevent us from building with cc-emitted DWARF. # -CTF_FLAGS_sparc = -g -Wc,-Qiselect-T1 $(C99MODE) $(CNOGLOBAL) -CTF_FLAGS_i386 = -g $(C99MODE) $(CNOGLOBAL) +CTF_FLAGS_sparc = -g -Wc,-Qiselect-T1 $(C99MODE) $(CNOGLOBAL) $(CDWARFSTR) +CTF_FLAGS_i386 = -g $(C99MODE) $(CNOGLOBAL) $(CDWARFSTR) CTF_FLAGS = $(CTF_FLAGS_$(MACH)) # # Flags used with genoffsets # GOFLAGS = -_noecho \ - -_gcc=-fno-eliminate-unused-debug-symbols \ - -_gcc=-fno-eliminate-unused-debug-types + $(CALLSYMS) \ + $(CDWARFSTR) OFFSETS_CREATE = $(GENOFFSETS) -s $(CTFSTABS) -r $(CTFCONVERT) \ $(CC) $(GOFLAGS) $(CFLAGS) $(CPPFLAGS) @@ -611,6 +620,12 @@ AS= $(NATIVEAS) LD= $(NATIVELD) LINT= $(NATIVELINT) +# The real compilers used for this build +CW_CC_CMD= $(CC) -_compiler +CW_CCC_CMD= $(CCC) -_compiler +REAL_CC= $(CW_CC_CMD:sh) +REAL_CCC= $(CW_CCC_CMD:sh) + # Pass -Y flag to cpp (method of which is release-dependent) CCYFLAG= -Y I, @@ -635,6 +650,7 @@ ZNODELETE= -znodelete ZNODLOPEN= -znodlopen ZNODUMP= -znodump ZNOLAZYLOAD= -znolazyload +ZNORELOC= -znoreloc ZNOVERSION= -znoversion ZREDLOCSYM= -zredlocsym ZTEXT= -ztext diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64 index f875031217..53c8cba50d 100644 --- a/usr/src/Makefile.master.64 +++ b/usr/src/Makefile.master.64 @@ -71,6 +71,9 @@ AS= $($(MACH64)_AS) LD= $($(MACH64)_LD) LINT= $($(MACH64)_LINT) +REAL_CC= $(CW_CC_CMD:sh) +REAL_CCC= $(CW_CCC_CMD:sh) + BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ $(PICS) -L $(ROOTLIBDIR64) $(LDLIBS) diff --git a/usr/src/cmd/mdb/sparc/Makefile.sparcv7 b/usr/src/cmd/mdb/sparc/Makefile.sparcv7 index feed395395..b30c089efe 100644 --- a/usr/src/cmd/mdb/sparc/Makefile.sparcv7 +++ b/usr/src/cmd/mdb/sparc/Makefile.sparcv7 @@ -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. @@ -34,7 +33,7 @@ $$(ROOTMOD)/%: dmod/% $(INS.file) CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) -xstrconst -CTFSTABSCFLAGS = $(CFLAGS) +CTFSTABSCFLAGS = $(CFLAGS) $(CALLSYMS) LINTFLAGS += -u -erroff=E_BAD_FORMAT_STR2,E_BAD_FORMAT_ARG_TYPE2 LFLAGS = -t -v diff --git a/usr/src/cmd/mdb/sparc/Makefile.sparcv9 b/usr/src/cmd/mdb/sparc/Makefile.sparcv9 index 638bab0862..1b46a7e8ec 100644 --- a/usr/src/cmd/mdb/sparc/Makefile.sparcv9 +++ b/usr/src/cmd/mdb/sparc/Makefile.sparcv9 @@ -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. @@ -36,7 +35,7 @@ ROOTKMOD = $(ROOT)/kernel/kmdb$(MACHMODDIR) CFLAGS = $(CTF_FLAGS) $(XSTRCONST) CFLAGS64 += $(CTF_FLAGS) $(XSTRCONST) CPPFLAGS += -D_ELF64 -CTFSTABSCFLAGS = $(CFLAGS64) +CTFSTABSCFLAGS = $(CFLAGS64) $(CALLSYMS) LINTTAGS1 = E_BAD_FORMAT_STR2,E_INCONS_ARG_DECL2,E_INCONS_VAL_TYPE_DECL2 LINTTAGS2 = E_BAD_FORMAT_ARG_TYPE2 diff --git a/usr/src/cmd/perl/5.6.1/Makefile b/usr/src/cmd/perl/5.6.1/Makefile index dfe8083638..c384b77fb3 100644 --- a/usr/src/cmd/perl/5.6.1/Makefile +++ b/usr/src/cmd/perl/5.6.1/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. @@ -19,8 +18,9 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -54,6 +54,10 @@ clobber := TARGET = clobber clean := TARGET = clean test := TARGET = test +# Compiler replacement rules +SED_CC = -e "s!'cc'!'$(CC)'!" +SED_CC_E = -e "s!'cc -E'!'$(REAL_CC) -E'!" + # distrib holds the perl source, contrib holds the SMI modules. all clean test: configure FRC @ cd distrib; pwd; $(KEEP_STATE_OFF); $(MAKE) $(TARGET) @@ -67,7 +71,7 @@ configure: $(DISTRIB_CONFIG_FILES) $(GEN_MAKEFILES) # Modify config.sh to refer to the compiler used for the build. distrib/config.sh: $(MACH)/config.sh - $(SED) -e "s!'cc!'$(SPRO_VROOT)/bin/cc!" $(MACH)/config.sh > $@ + $(SED) $(SED_CC) $(SED_CC_E) $(MACH)/config.sh > $@ Makefile.perlcfg: extract_config $(MACH)/config.sh ./extract_config $(MACH)/config.sh > Makefile.perlcfg diff --git a/usr/src/cmd/perl/5.6.1/distrib/Makefile b/usr/src/cmd/perl/5.6.1/distrib/Makefile index cb66769876..5208905c51 100644 --- a/usr/src/cmd/perl/5.6.1/distrib/Makefile +++ b/usr/src/cmd/perl/5.6.1/distrib/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # The perl5 installation for Solaris differs from that generated by the # Perl Configure procedure. The configuration appropriate for the current @@ -62,6 +64,10 @@ CPPFLAGS += $(PERL_COREFLAGS) $(PERL_LFFLAGS) # Add in the libraries perl needs to be linked against. LDLIBS += $(PERL_LDLIBS) +# Compiler replacement rules +SED_UN_CC = -e "s!'$(CC)!'cc!" +SED_UN_CC_E = -e "s!'$(REAL_CC)!'cc!" + all := TARGET = all install := TARGET = install clobber := TARGET = clobber @@ -167,7 +173,7 @@ ext/DynaLoader/Makefile: ext/DynaLoader/Makefile.PL $(PERL_CONFIGDEP) cflags $(DYNALOADER): ext/DynaLoader/Makefile $(PERL_CONFIGDEP) cflags FRC @ cd ext/DynaLoader; pwd; $(PERL_MM_ENV); \ - $(MAKE) LINKTYPE=static CCCDLFLAGS=all + $(MAKE) LINKTYPE=static CCCDLFLAGS= # # Create the perl executable. @@ -214,13 +220,13 @@ install_files: umask 022; $(MKDIR) -p $(PERL_VENDOR_DIR) $(RM) $(PERL_ARCHLIB_DIR)/Config.pm - $(SED) -e "s!'$(CC)!'cc!" $(PERL_CONFIG_PM) \ + $(SED) $(SED_UN_CC) $(SED_UN_CC_E) $(PERL_CONFIG_PM) \ > $(PERL_ARCHLIB_DIR)/Config.pm $(CHMOD) 444 $(PERL_ARCHLIB_DIR)/Config.pm @ $(CHOWN) -R $(OWNER):$(GROUP) $(PERL_ROOT_STEM) -install: all install_files +install: all .WAIT install_files # # Perl test suite target. diff --git a/usr/src/cmd/perl/5.6.1/extract_config.sh b/usr/src/cmd/perl/5.6.1/extract_config.sh index 88bd4ce805..9f78432203 100644 --- a/usr/src/cmd/perl/5.6.1/extract_config.sh +++ b/usr/src/cmd/perl/5.6.1/extract_config.sh @@ -1,10 +1,12 @@ #!/bin/ksh -p # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This script extracts values from the passed config.sh file and prints them to # stdout in a form that is suitable for including in a Makefile. This removes @@ -29,9 +31,8 @@ printf '# This file was automatically generated from %s by %s\n\n' \ # # ON Makefile macro adjustments. Perl needs to build/ship with a consistent -# set of flags, and needs to build with the Forte compilers. +# set of flags, and needs to build with the selected compilers. # -printf 'CC = $(SPRO_VROOT)/bin/cc\n' printf 'C99MODE = $(C99_DISABLE)\n' printf 'COPTFLAG = %s\n' "$optimize" printf 'SPACEFLAG =\n' diff --git a/usr/src/cmd/perl/5.8.4/Makefile b/usr/src/cmd/perl/5.8.4/Makefile index 02f6689218..88a3092352 100644 --- a/usr/src/cmd/perl/5.8.4/Makefile +++ b/usr/src/cmd/perl/5.8.4/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. @@ -19,11 +18,12 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # # @@ -54,6 +54,10 @@ clobber := TARGET = clobber clean := TARGET = clean test := TARGET = test +# Compiler replacement rules +SED_CC = -e "s!'cc'!'$(CC)'!" +SED_CC_E = -e "s!'cc -E'!'$(REAL_CC) -E'!" + # distrib holds the perl source, contrib holds the SMI modules. all clean test: configure FRC @ cd distrib; pwd; $(KEEP_STATE_OFF); $(MAKE) $(TARGET) @@ -67,7 +71,7 @@ configure: $(DISTRIB_CONFIG_FILES) $(GEN_MAKEFILES) get_no_keywords # Modify config.sh to refer to the compiler used for the build. distrib/config.sh: $(MACH)/config.sh - $(SED) -e "s!'cc!'$(SPRO_VROOT)/bin/cc!" $(MACH)/config.sh > $@ + $(SED) $(SED_CC) $(SED_CC_E) $(MACH)/config.sh > $@ Makefile.perlcfg: extract_config $(MACH)/config.sh ./extract_config $(MACH)/config.sh > Makefile.perlcfg diff --git a/usr/src/cmd/perl/5.8.4/distrib/Makefile b/usr/src/cmd/perl/5.8.4/distrib/Makefile index 7d7eb2ffbf..1775f48491 100644 --- a/usr/src/cmd/perl/5.8.4/distrib/Makefile +++ b/usr/src/cmd/perl/5.8.4/distrib/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # The perl5 installation for Solaris differs from that generated by the # Perl Configure procedure. The configuration appropriate for the current @@ -68,6 +70,10 @@ CPPFLAGS += $(PERL_COREFLAGS) $(PERL_LFFLAGS) # Add in the libraries perl needs to be linked against. LDLIBS += $(PERL_LDLIBS) +# Compiler replacement rules +SED_UN_CC = -e "s!'$(CC)!'cc!" +SED_UN_CC_E = -e "s!'$(REAL_CC)!'cc!" + all := TARGET = all install := TARGET = install clobber := TARGET = clobber @@ -189,7 +195,7 @@ ext/DynaLoader/Makefile: ext/DynaLoader/Makefile.PL $(PERL_CONFIGDEP) cflags $(DYNALOADER): ext/DynaLoader/Makefile $(PERL_CONFIGDEP) cflags FRC @ cd ext/DynaLoader; pwd; $(PERL_MM_ENV); \ - $(MAKE) LINKTYPE=static CCCDLFLAGS=all + $(MAKE) LINKTYPE=static CCCDLFLAGS= # # Create the perl executable. @@ -251,13 +257,13 @@ install_files: @ $(CHOWN) $(OWNER):$(GROUP) $(ROOTPROG) $(RM) $(PERL_ARCHLIB_DIR)/Config.pm - $(SED) -e "s!'$(CC)!'cc!" $(PERL_CONFIG_PM) \ + $(SED) $(SED_UN_CC) $(SED_UN_CC_E) $(PERL_CONFIG_PM) \ > $(PERL_ARCHLIB_DIR)/Config.pm $(CHMOD) 444 $(PERL_ARCHLIB_DIR)/Config.pm @ $(CHOWN) -R $(OWNER):$(GROUP) $(PERL_ROOT_STEM) -install: all install_files +install: all .WAIT install_files # # Perl test suite target. diff --git a/usr/src/cmd/perl/5.8.4/extract_config.sh b/usr/src/cmd/perl/5.8.4/extract_config.sh index 8898abd838..75c1771446 100644 --- a/usr/src/cmd/perl/5.8.4/extract_config.sh +++ b/usr/src/cmd/perl/5.8.4/extract_config.sh @@ -1,9 +1,12 @@ #!/bin/ksh -p + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This script extracts values from the passed config.sh file and prints them to # stdout in a form that is suitable for including in a Makefile. This removes @@ -28,9 +31,8 @@ printf '# This file was automatically generated from %s by %s\n\n' \ # # ON Makefile flag macro adjustments. Perl needs to build/ship with a -# consistent set of flags, and needs to build with the Forte compilers. +# consistent set of flags, and needs to build with the selected compilers. # -printf 'CC = $(SPRO_VROOT)/bin/cc\n' printf 'C99MODE = $(C99_ENABLE)\n' printf 'COPTFLAG = %s\n' "$optimize" printf 'SPACEFLAG =\n' diff --git a/usr/src/tools/cw/cw.c b/usr/src/tools/cw/cw.c index 8d5f5e536a..218d2f9b9b 100644 --- a/usr/src/tools/cw/cw.c +++ b/usr/src/tools/cw/cw.c @@ -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. @@ -19,6 +18,7 @@ * * CDDL HEADER END */ + /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -234,7 +234,7 @@ * -x386 -march=i386 (x86 only) * -x486 -march=i486 (x86 only) * -xarch=<a> table - * -xbuiltin[=<b>] error + * -xbuiltin[=<b>] -fbuiltin (-fno-builtin otherwise) * -xCC ignore * -xchar_byte_order=<o> error * -xchip=<c> table @@ -520,6 +520,17 @@ do_gcc(const char *dir, const char *cmd, int argc, char **argv, newae(h, "-fno-asm"); newae(h, "-nodefaultlibs"); +#if defined(__sparc) + /* + * The SPARC ldd and std instructions require 8-byte alignment of + * their address operand. gcc correctly uses them only when the + * ABI requires 8-byte alignment; unfortunately we have a number of + * pieces of buggy code that doesn't conform to the ABI. This + * flag makes gcc work more like Studio with -xmemalign=4. + */ + newae(h, "-mno-integer-ldd-std"); +#endif + /* * This is needed because 'u' is defined * under a conditional on 'sun'. Should @@ -929,11 +940,8 @@ do_gcc(const char *dir, const char *cmd, int argc, char **argv, } #if defined(__x86) if (strcmp(arg, "-Wu,-no_got_reloc") == 0) { - /* - * Don't create any GOT relocations? - * Well, gcc doesn't have this degree - * of control over its pic code ... - */ + newae(h, "-fno-jump-tables"); + newae(h, "-fno-constant-pools"); break; } if (strcmp(arg, "-Wu,-xmodel=kernel") == 0) { @@ -993,6 +1001,14 @@ do_gcc(const char *dir, const char *cmd, int argc, char **argv, } error(arg); break; + case 'b': + if (strncmp(arg, "-xbuiltin=", 10) == 0) { + if (strcmp(arg + 10, "%all")) + newae(h, "-fbuiltin"); + break; + } + error(arg); + break; case 'C': /* Accept C++ style comments -- ignore */ if (strcmp(arg, "-xCC") == 0) @@ -1141,7 +1157,6 @@ do_gcc(const char *dir, const char *cmd, int argc, char **argv, } error(arg); break; - case 'b': case 'e': case 'h': case 'l': diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts index 14378071a2..ee2d3bbfb5 100644 --- a/usr/src/uts/Makefile.uts +++ b/usr/src/uts/Makefile.uts @@ -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. @@ -19,12 +18,15 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # + +# # This Makefile contains the common targets and definitions for # all kernels. It is to be included in the Makefiles for specific # implementation architectures and processor architecture dependent @@ -443,6 +445,22 @@ CTFMERGE_COPY_CTF_DATA = \ IPCTF = $(IPDRV_DIR)/$(OBJS_DIR)/ipctf.a # +# Rule for building fake shared libraries used for symbol resolution +# when building other modules. -znoreloc is needed here to avoid +# tripping over code that isn't really suitable for shared libraries. +# +BUILD.SO = \ + $(LD) -o $@ $(GSHARED) $(ZNORELOC) -h $(SONAME) + +# +# SONAME defaults for common fake shared libraries. +# +$(LIBGEN) := SONAME = $(MODULE) +$(PLATLIB) := SONAME = misc/platmod +$(CPULIB) := SONAME = 'cpu/$$CPU' +$(DTRACESTUBS) := SONAME = dtracestubs + +# # Installation directories # diff --git a/usr/src/uts/i86pc/Makefile.rules b/usr/src/uts/i86pc/Makefile.rules index c0a5394419..b16bc137e3 100644 --- a/usr/src/uts/i86pc/Makefile.rules +++ b/usr/src/uts/i86pc/Makefile.rules @@ -191,7 +191,7 @@ $(OBJS_DIR)/dtracestubs.s: $(UNIX_O) $(LIBS) $$1, $$1, $$1); }' > $(OBJS_DIR)/dtracestubs.s $(DTRACESTUBS): $(DTRACESTUBS_O) - $(LD) -o $@ -G -h dtracestubs $(DTRACESTUBS_O) + $(BUILD.SO) $(DTRACESTUBS_O) # # Section 1b: Lint `object' build rules diff --git a/usr/src/uts/intel/amd64/krtld/kobj_boot.c b/usr/src/uts/intel/amd64/krtld/kobj_boot.c index 7994ad2057..fb97b0b126 100644 --- a/usr/src/uts/intel/amd64/krtld/kobj_boot.c +++ b/usr/src/uts/intel/amd64/krtld/kobj_boot.c @@ -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 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -104,20 +103,6 @@ _kobj_boot( */ for (; ebp->eb_tag != EB_NULL; ebp++) { switch (ebp->eb_tag) { -#if defined(__GNUC__) - /* - * gcc 2.95, 3.1 cannot be told to not generate GOT references, - * which krtld cannot handle. yet switch statements which - * can be mapped to jump tables are a frequent generator - * of such references. - */ - case 0x12345678: - /* - * deliberately mess up the compilers - * temptation to create a jump table - */ - break; -#endif case EB_AUXV: auxv = (auxv_t *)ebp->eb_un.eb_ptr; break; @@ -137,14 +122,6 @@ _kobj_boot( */ for (; auxv->a_type != AT_NULL; auxv++) { switch (auxv->a_type) { -#if defined(__GNUC__) - case 0x12345678: - /* - * deliberately mess up the compilers - * temptation to create a jump table - */ - break; -#endif case AT_PHDR: bootaux[BA_PHDR].ba_ptr = auxv->a_un.a_ptr; break; @@ -410,14 +387,6 @@ _kobj_boot( * order unaligned. */ switch (rtype) { -#if defined(__GNUC__) - case 0x12345678: - /* - * deliberately mess up the compilers - * temptation to create a jump table - */ - break; -#endif case R_AMD64_64: *(unsigned long *)offptr = value + addend; break; diff --git a/usr/src/uts/intel/genunix/Makefile b/usr/src/uts/intel/genunix/Makefile index e870718194..6fe8333943 100644 --- a/usr/src/uts/intel/genunix/Makefile +++ b/usr/src/uts/intel/genunix/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the generic # unix kernel module. @@ -52,7 +54,6 @@ ROOTMODULE = $(ROOT_KERN_DIR)/$(MODULE) LIBGEN = $(OBJS_DIR)/libgenunix.so LIBSTUBS = $(GENSTUBS_OBJS:%=$(OBJS_DIR)/%) -SONAME = $(MODULE) # # Include common rules. @@ -108,7 +109,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(LIBGEN): $(GENUNIX) $(LIBSTUBS) - $(LD) -o $@ -G -h $(SONAME) $(GENUNIX) $(LIBSTUBS) + $(BUILD.SO) $(GENUNIX) $(LIBSTUBS) $(IPCTF_TARGET) ipctf_target: FRC @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR) diff --git a/usr/src/uts/intel/ia32/krtld/kobj_boot.c b/usr/src/uts/intel/ia32/krtld/kobj_boot.c index 3be37e21fd..b9952c8b25 100644 --- a/usr/src/uts/intel/ia32/krtld/kobj_boot.c +++ b/usr/src/uts/intel/ia32/krtld/kobj_boot.c @@ -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 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -102,20 +101,6 @@ _kobj_boot( */ for (; ebp->eb_tag != EB_NULL; ebp++) { switch (ebp->eb_tag) { -#if defined(__GNUC__) - /* - * gcc 2.95, 3.1 cannot be told to not generate GOT references, - * which krtld cannot handle. yet switch statements which - * can be mapped to jump tables are a frequent generator - * of such references. - */ - case 0x12345678: - /* - * deliberately mess up the compilers - * temptation to create a jump table - */ - break; -#endif case EB_AUXV: auxv = (auxv_t *)ebp->eb_un.eb_ptr; break; @@ -135,14 +120,6 @@ _kobj_boot( */ for (; auxv->a_type != AT_NULL; auxv++) { switch (auxv->a_type) { -#if defined(__GNUC__) - case 0x12345678: - /* - * deliberately mess up the compilers - * temptation to create a jump table - */ - break; -#endif case AT_PHDR: bootaux[BA_PHDR].ba_ptr = auxv->a_un.a_ptr; break; @@ -382,14 +359,6 @@ _kobj_boot( * order unaligned. */ switch (rtype) { -#if defined(__GNUC__) - case 0x12345678: - /* - * deliberately mess up the compilers - * temptation to create a jump table - */ - break; -#endif case R_386_PC32: case R_386_32: case R_386_PLT32: diff --git a/usr/src/uts/sparc/krtld/Makefile b/usr/src/uts/sparc/krtld/Makefile index 8a381fc6c5..bf3ce7498c 100644 --- a/usr/src/uts/sparc/krtld/Makefile +++ b/usr/src/uts/sparc/krtld/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. @@ -83,7 +82,8 @@ LDFLAGS = -e _kobj_boot -M$(MAPFILE) \ # the changed symbols) unless we tell it to use fuzzy matching. CTFMRGFLAGS = -f -$(PICS) := CFLAGS += -K pic +$(PICS) := CFLAGS += -K pic -_gcc=-fno-constant-pools \ + -_gcc=-fno-jump-tables # # krtld has its own private copies of these functions and objects diff --git a/usr/src/uts/sun4/io/rootnex.c b/usr/src/uts/sun4/io/rootnex.c index ff34c51012..7199c853e1 100644 --- a/usr/src/uts/sun4/io/rootnex.c +++ b/usr/src/uts/sun4/io/rootnex.c @@ -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. @@ -19,6 +18,7 @@ * * CDDL HEADER END */ + /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -386,7 +386,7 @@ rootnex_map_regspec(ddi_map_req_t *mp, caddr_t *vaddrp, uint_t mapping_attr) } } - DPRINTF(ROOTNEX_MAP_DEBUG, ("at virtual 0x%x\n", *vaddrp)); + DPRINTF(ROOTNEX_MAP_DEBUG, ("at virtual 0x%p\n", *vaddrp)); return (0); } @@ -725,8 +725,8 @@ rootnex_map_fault(dev_info_t *dip, dev_info_t *rdip, { extern struct seg_ops segdev_ops; - DPRINTF(ROOTNEX_MAP_DEBUG, ("rootnex_map_fault: address <%x> " - "pfn <%x>", addr, pfn)); + DPRINTF(ROOTNEX_MAP_DEBUG, ("rootnex_map_fault: address <%p> " + "pfn <%lx>", addr, pfn)); DPRINTF(ROOTNEX_MAP_DEBUG, (" Seg <%s>\n", seg->s_ops == &segdev_ops ? "segdev" : seg == &kvseg ? "segkmem" : "NONE!")); diff --git a/usr/src/uts/sun4u/Makefile.rules b/usr/src/uts/sun4u/Makefile.rules index 6098e295d9..35a6c912ac 100644 --- a/usr/src/uts/sun4u/Makefile.rules +++ b/usr/src/uts/sun4u/Makefile.rules @@ -188,7 +188,7 @@ $(OBJS_DIR)/dtracestubs.s: $(UNIX_O) $(LIBS) $$1, $$1, $$1); }' > $(OBJS_DIR)/dtracestubs.s $(DTRACESTUBS): $(DTRACESTUBS_O) - $(LD) -o $@ -G -h dtracestubs $(DTRACESTUBS_O) + $(BUILD.SO) $(DTRACESTUBS_O) # # Section 1b: Lint `object' build rules diff --git a/usr/src/uts/sun4u/blade/platmod/Makefile b/usr/src/uts/sun4u/blade/platmod/Makefile index c75abdd3ef..0b88f628b6 100644 --- a/usr/src/uts/sun4u/blade/platmod/Makefile +++ b/usr/src/uts/sun4u/blade/platmod/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. @@ -19,13 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/blade/platmod/Makefile -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # # This makefile drives the production of the sun4u blade platform module. # @@ -96,7 +96,7 @@ check: LINT_LIB_DIR = $(BLADE_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 b6529e8a7a..7a3414fa8e 100644 --- a/usr/src/uts/sun4u/cheetah/Makefile +++ b/usr/src/uts/sun4u/cheetah/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. @@ -19,15 +18,17 @@ # # CDDL HEADER END # + # -# uts/sun4u/cheetah/Makefile -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # -# This makefile drives the production of the sun4u UltraSPARC driver module. +# This makefile drives the production of the sun4u UltraSPARC driver +# module. # # sun4u implementation architecture dependent # @@ -99,7 +100,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 77859d1370..d4c5b24492 100644 --- a/usr/src/uts/sun4u/cheetahplus/Makefile +++ b/usr/src/uts/sun4u/cheetahplus/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. @@ -19,15 +18,17 @@ # # CDDL HEADER END # + # -# uts/sun4u/cheetahplus/Makefile -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # -# This makefile drives the production of the sun4u UltraSPARC driver module. +# This makefile drives the production of the sun4u UltraSPARC driver +# module. # # sun4u implementation architecture dependent # @@ -105,7 +106,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 60cecd953a..6f84821528 100644 --- a/usr/src/uts/sun4u/cherrystone/platmod/Makefile +++ b/usr/src/uts/sun4u/cherrystone/platmod/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/cherrystone/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # # This makefile drives the production of the sun4u lneck platform module. # @@ -99,7 +100,7 @@ check: LINT_LIB_DIR = $(CHERRYSTONE_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) -h misc/platmod + $(BUILD.SO) $(BINARY) $(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 02a9811253..c4188efaf8 100644 --- a/usr/src/uts/sun4u/chicago/platmod/Makefile +++ b/usr/src/uts/sun4u/chicago/platmod/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. @@ -19,13 +18,14 @@ # # CDDL HEADER END # + # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# uts/sun4u/chicago/platmod/Makefile + # # This makefile drives the production of the sun4u chicago platform module. # @@ -96,7 +96,7 @@ check: LINT_LIB_DIR = $(CHICAGO_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 9d0845200e..626913aa0a 100644 --- a/usr/src/uts/sun4u/daktari/platmod/Makefile +++ b/usr/src/uts/sun4u/daktari/platmod/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. @@ -19,15 +18,16 @@ # # CDDL HEADER END # + # -# uts/sun4u/daktari/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # -# This makefile drives the production of the sun4u daktari platmod module + # +# This makefile drives the production of the sun4u daktari platmod module # # @@ -101,7 +101,7 @@ check: LINT_LIB_DIR =$(DAKTARI_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - $(LD) -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 8cc59807ff..d6fd83d432 100644 --- a/usr/src/uts/sun4u/darwin/platmod/Makefile +++ b/usr/src/uts/sun4u/darwin/platmod/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/darwin/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the sun4u darwin platform module. # @@ -95,7 +96,7 @@ check: LINT_LIB_DIR = $(DARWIN_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 74cf82e965..f309441857 100644 --- a/usr/src/uts/sun4u/enchilada/platmod/Makefile +++ b/usr/src/uts/sun4u/enchilada/platmod/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. @@ -19,13 +18,14 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# uts/sun4u/enchilada/platmod/Makefile + # # This makefile drives the production of the sun4u enchilada platform module. # @@ -96,7 +96,7 @@ check: LINT_LIB_DIR = $(ENCHILADA_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 1b02b6fd1f..0c3530c15a 100644 --- a/usr/src/uts/sun4u/excalibur/platmod/Makefile +++ b/usr/src/uts/sun4u/excalibur/platmod/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. @@ -19,14 +18,17 @@ # # CDDL HEADER END # + # -# uts/sun4u/excalibur/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # -# This makefile drives the production of the sun4u excalibur platform module. +# This makefile drives the production of the sun4u excalibur platform +# module. # # sun4u implementation architecture dependent # @@ -95,7 +97,7 @@ check: LINT_LIB_DIR = $(EXCALIBUR_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 9fe44e0c39..1013ac69d3 100644 --- a/usr/src/uts/sun4u/fjlite/platmod/Makefile +++ b/usr/src/uts/sun4u/fjlite/platmod/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/fjlite/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # # This makefile drives the production of the sun4u fjlite platform module. # @@ -95,7 +96,7 @@ check: LINT_LIB_DIR = $(FJLITE_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 c7aa0fe4a1..257f4278dc 100644 --- a/usr/src/uts/sun4u/genunix/Makefile +++ b/usr/src/uts/sun4u/genunix/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the generic # unix kernel module. @@ -53,7 +55,6 @@ ROOTMODULE = $(ROOT_PSM_KERN_DIR)/$(MODULE) PLATFORM = sun4u LIBGEN = $(OBJS_DIR)/libgenunix.so LIBSTUBS = $(GENSTUBS_OBJS:%=$(OBJS_DIR)/%) -SONAME = $(MODULE) # # Include common rules. @@ -120,7 +121,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(LIBGEN): $(GENUNIX) $(LIBSTUBS) - $(LD) -o $@ -G -h $(SONAME) $(GENUNIX) $(LIBSTUBS) + $(BUILD.SO) $(GENUNIX) $(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 77e3ea363c..480a9bff20 100644 --- a/usr/src/uts/sun4u/grover/platmod/Makefile +++ b/usr/src/uts/sun4u/grover/platmod/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/grover/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # # This makefile drives the production of the sun4u grover platform module. # @@ -95,7 +96,7 @@ check: LINT_LIB_DIR = $(GROVER_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 edad7af82f..3d3fcab510 100644 --- a/usr/src/uts/sun4u/hummingbird/Makefile +++ b/usr/src/uts/sun4u/hummingbird/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/hummingbird/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the sun4u UltraSPARC-IIe # driver module. @@ -99,7 +100,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 0ef327d1aa..931cdd0031 100644 --- a/usr/src/uts/sun4u/jalapeno/Makefile +++ b/usr/src/uts/sun4u/jalapeno/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. @@ -19,15 +18,17 @@ # # CDDL HEADER END # + # -# uts/sun4u/jalapeno/Makefile -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # -# This makefile drives the production of the sun4u UltraSPARC driver module. +# This makefile drives the production of the sun4u UltraSPARC driver +# module. # # sun4u implementation architecture dependent # @@ -104,7 +105,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4u/javelin/platmod/Makefile b/usr/src/uts/sun4u/javelin/platmod/Makefile index f0a00c8073..d83d9464cb 100644 --- a/usr/src/uts/sun4u/javelin/platmod/Makefile +++ b/usr/src/uts/sun4u/javelin/platmod/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. @@ -19,15 +18,16 @@ # # CDDL HEADER END # + # -# uts/sun4u/javelin/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # -# This makefile drives the production of the sun4u javelin platmod module + # +# This makefile drives the production of the sun4u javelin platmod module # # @@ -94,7 +94,7 @@ check: LINT_LIB_DIR =$(JAVELIN_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) -h misc/platmod + $(BUILD.SO) $(BINARY) $(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 6659072207..1837fff861 100644 --- a/usr/src/uts/sun4u/littleneck/platmod/Makefile +++ b/usr/src/uts/sun4u/littleneck/platmod/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/littleneck/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # # This makefile drives the production of the sun4u lneck platform module. # @@ -99,7 +100,7 @@ check: LINT_LIB_DIR = $(LITTLENECK_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) -h misc/platmod + $(BUILD.SO) $(BINARY) $(SYM_MOD): $(UNIX_O) $(PLATLIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4u/platmod/Makefile b/usr/src/uts/sun4u/platmod/Makefile index b281e131f7..9337b42ff2 100644 --- a/usr/src/uts/sun4u/platmod/Makefile +++ b/usr/src/uts/sun4u/platmod/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. @@ -19,14 +18,17 @@ # # CDDL HEADER END # + # -# uts/sun4u/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # -# This makefile drives the production of the sun4u default platform module. +# This makefile drives the production of the sun4u default platform +# module. # # sun4u implementation architecture dependent # @@ -90,7 +92,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(PLATLIB): $(BINARY) - $(LD) -o $(PLATLIB) -G $(BINARY) -h misc/platmod + $(BUILD.SO) $(BINARY) # # Include common targets. diff --git a/usr/src/uts/sun4u/serengeti/cheetah/Makefile b/usr/src/uts/sun4u/serengeti/cheetah/Makefile index 4be257da2a..c37d9a860a 100644 --- a/usr/src/uts/sun4u/serengeti/cheetah/Makefile +++ b/usr/src/uts/sun4u/serengeti/cheetah/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. @@ -19,17 +18,18 @@ # # CDDL HEADER END # + # -# uts/sun4u/serengeti/cheetah/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # # This makefile drives the production of the Serengeti # UltraSPARC driver module. # -# # # Path to the base of the uts directory tree (usually /usr/src/uts). @@ -108,7 +108,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 97ccd7552f..a23dbd50f1 100644 --- a/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile +++ b/usr/src/uts/sun4u/serengeti/cheetahplus/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. @@ -19,17 +18,18 @@ # # CDDL HEADER END # + # -# uts/sun4u/serengeti/cheetahplus/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # # This makefile drives the production of the Serengeti # UltraSPARC driver module. # -# # # Path to the base of the uts directory tree (usually /usr/src/uts). @@ -113,7 +113,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4u/serengeti/unix/Makefile b/usr/src/uts/sun4u/serengeti/unix/Makefile index 55855c57f4..c67619c513 100644 --- a/usr/src/uts/sun4u/serengeti/unix/Makefile +++ b/usr/src/uts/sun4u/serengeti/unix/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of unix (and unix.o). # @@ -169,7 +171,7 @@ $(PLATLIB): # CPU_OBJ is defined to allow for building multiple CPU_OBJ's # $(CPULIB): $(CPU_OBJ) - $(LD) -o $@ -G -h 'cpu/$$CPU' $(CPU_OBJ) + $(BUILD.SO) $(CPU_OBJ) # # The global lint target builds the kernel lint library (llib-lunix.ln) diff --git a/usr/src/uts/sun4u/serrano/Makefile b/usr/src/uts/sun4u/serrano/Makefile index 24f0385714..4f84a40439 100644 --- a/usr/src/uts/sun4u/serrano/Makefile +++ b/usr/src/uts/sun4u/serrano/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. @@ -19,13 +18,14 @@ # # CDDL HEADER END # -# -# uts/sun4u/serrano/Makefile + # # Copyright 2005 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" +# + # # This makefile drives the production of the SUNW,UltraSPARC-IIIi+ cpu # module. This module uses the same source files as the Jalapeno module @@ -105,7 +105,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4u/snowbird/platmod/Makefile b/usr/src/uts/sun4u/snowbird/platmod/Makefile index c040b5809f..f5b97a1ffd 100644 --- a/usr/src/uts/sun4u/snowbird/platmod/Makefile +++ b/usr/src/uts/sun4u/snowbird/platmod/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. @@ -19,14 +18,17 @@ # # CDDL HEADER END # + # -# uts/sun4u/snowbird/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # -# This makefile drives the production of the sun4u snowbird platform module. +# This makefile drives the production of the sun4u snowbird platform +# module. # # sun4u implementation architecture dependent # @@ -95,7 +97,7 @@ check: LINT_LIB_DIR = $(SNOWBIRD_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 96ea911db9..1f830866e2 100644 --- a/usr/src/uts/sun4u/spitfire/Makefile +++ b/usr/src/uts/sun4u/spitfire/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. @@ -19,14 +18,17 @@ # # CDDL HEADER END # + # -# uts/sun4u/spitfire/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # -# This makefile drives the production of the sun4u UltraSPARC driver module. +# This makefile drives the production of the sun4u UltraSPARC driver +# module. # # sun4u implementation architecture dependent # @@ -99,7 +101,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 6de27a9703..61836db92c 100644 --- a/usr/src/uts/sun4u/starcat/cheetah/Makefile +++ b/usr/src/uts/sun4u/starcat/cheetah/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/starcat/cheetah/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # # This makefile drives the production of the Starcat specific # UltraSPARC-III driver module. @@ -104,7 +105,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 52686bafd0..c67d7f2eaa 100644 --- a/usr/src/uts/sun4u/starcat/cheetahplus/Makefile +++ b/usr/src/uts/sun4u/starcat/cheetahplus/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/starcat/cheetahplus/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 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" +# + # # This makefile drives the production of the Starcat specific # UltraSPARC-III+ driver module. @@ -110,7 +111,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4u/starcat/unix/Makefile b/usr/src/uts/sun4u/starcat/unix/Makefile index d24e13c63f..5ff22b4727 100644 --- a/usr/src/uts/sun4u/starcat/unix/Makefile +++ b/usr/src/uts/sun4u/starcat/unix/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of unix (and unix.o). # @@ -169,7 +171,7 @@ $(PLATLIB): # CPU_DIR is defined to allow for building multiple CPU_OBJ's # $(CPULIB): $(CPU_OBJ) - $(LD) -o $@ -G -h 'cpu/$$CPU' $(CPU_OBJ) + $(BUILD.SO) $(CPU_OBJ) # # The global lint target builds the kernel lint library (llib-lunix.ln) diff --git a/usr/src/uts/sun4u/starfire/platmod/Makefile b/usr/src/uts/sun4u/starfire/platmod/Makefile index 3f8e4b1b7f..026493c4fb 100644 --- a/usr/src/uts/sun4u/starfire/platmod/Makefile +++ b/usr/src/uts/sun4u/starfire/platmod/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. + # # This makefile drives the production of the sun4u starfire platform # module. @@ -88,7 +90,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(PLATLIB): $(BINARY) - $(LD) -o $(PLATLIB) -G $(BINARY) -h misc/platmod + $(BUILD.SO) $(BINARY) # # Include common targets. diff --git a/usr/src/uts/sun4u/starfire/spitfire/Makefile b/usr/src/uts/sun4u/starfire/spitfire/Makefile index 5dd576778f..c53dbb58b7 100644 --- a/usr/src/uts/sun4u/starfire/spitfire/Makefile +++ b/usr/src/uts/sun4u/starfire/spitfire/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/starfire/spitfire/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the sun4u UltraSPARC driver module. # @@ -94,7 +95,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(SYM_MOD): $(UNIX_O) $(CPULIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4u/starfire/unix/Makefile b/usr/src/uts/sun4u/starfire/unix/Makefile index 99d1f07607..6c2ef99417 100644 --- a/usr/src/uts/sun4u/starfire/unix/Makefile +++ b/usr/src/uts/sun4u/starfire/unix/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of unix (and unix.o). # @@ -164,7 +166,7 @@ $(PLATLIB): # CPU_OBJ is defined to allow for building multiple CPU_OBJ's # $(CPULIB): $(CPU_OBJ) - $(LD) -o $@ -G -h 'cpu/$$CPU' $(CPU_OBJ) + $(BUILD.SO) $(CPU_OBJ) # # The global lint target builds the kernel lint library (llib-lunix.ln) diff --git a/usr/src/uts/sun4u/taco/platmod/Makefile b/usr/src/uts/sun4u/taco/platmod/Makefile index b4d6b105be..06837433a8 100644 --- a/usr/src/uts/sun4u/taco/platmod/Makefile +++ b/usr/src/uts/sun4u/taco/platmod/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. @@ -19,13 +18,14 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# uts/sun4u/taco/platmod/Makefile +# ident "%Z%%M% %I% %E% SMI" # -#ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of the sun4u taco platform module. # @@ -96,7 +96,7 @@ check: LINT_LIB_DIR = $(TACO_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 2a6bb4e92a..09a084a363 100644 --- a/usr/src/uts/sun4u/tazmo/platmod/Makefile +++ b/usr/src/uts/sun4u/tazmo/platmod/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4u/tazmo/platmod/Makefile -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the sun4u tazmo platform module. # @@ -95,7 +96,7 @@ check: LINT_LIB_DIR = $(TAZMO_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - ${LD} -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(SYM_MOD): $(UNIX_O) $(PLATLIB) @echo "resolving symbols against unix.o" diff --git a/usr/src/uts/sun4u/unix/Makefile b/usr/src/uts/sun4u/unix/Makefile index 12d7fca10d..8a17abfaa2 100644 --- a/usr/src/uts/sun4u/unix/Makefile +++ b/usr/src/uts/sun4u/unix/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of /unix (and unix.o). # @@ -165,7 +167,7 @@ $(PLATLIB): # CPU_OBJ is defined to allow for building multiple CPU_OBJ's # $(CPULIB): $(CPU_OBJ) - $(LD) -o $@ -G -h 'cpu/$$CPU' $(CPU_OBJ) + $(BUILD.SO) $(CPU_OBJ) # # The global lint target builds the kernel lint library (llib-lunix.ln) diff --git a/usr/src/uts/sun4v/Makefile.rules b/usr/src/uts/sun4v/Makefile.rules index c0607acccb..bfe6cf6bdd 100644 --- a/usr/src/uts/sun4v/Makefile.rules +++ b/usr/src/uts/sun4v/Makefile.rules @@ -123,7 +123,7 @@ $(OBJS_DIR)/dtracestubs.s: $(UNIX_O) $(LIBS) $$1, $$1, $$1); }' > $(OBJS_DIR)/dtracestubs.s $(DTRACESTUBS): $(DTRACESTUBS_O) - $(LD) -o $@ -G -h dtracestubs $(DTRACESTUBS_O) + $(BUILD.SO) $(DTRACESTUBS_O) # # Section 1b: Lint `object' build rules diff --git a/usr/src/uts/sun4v/generic/Makefile b/usr/src/uts/sun4v/generic/Makefile index e8fe8766a8..0acc03e527 100644 --- a/usr/src/uts/sun4v/generic/Makefile +++ b/usr/src/uts/sun4v/generic/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4v/generic/Makefile # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the Generic sun4v cpu module. # @@ -99,7 +100,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 053298c582..949b809295 100644 --- a/usr/src/uts/sun4v/genunix/Makefile +++ b/usr/src/uts/sun4v/genunix/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the generic # unix kernel module. @@ -53,7 +55,6 @@ ROOTMODULE = $(ROOT_PSM_KERN_DIR)/$(MODULE) PLATFORM = sun4v LIBGEN = $(OBJS_DIR)/libgenunix.so LIBSTUBS = $(GENSTUBS_OBJS:%=$(OBJS_DIR)/%) -SONAME = $(MODULE) # # Include common rules. @@ -120,7 +121,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(LIBGEN): $(GENUNIX) $(LIBSTUBS) - $(LD) -o $@ -G -h $(SONAME) $(GENUNIX) $(LIBSTUBS) + $(BUILD.SO) $(GENUNIX) $(LIBSTUBS) $(IPCTF_TARGET) ipctf_target: FRC @cd $(IPDRV_DIR); pwd; $(MAKE) ipctf.$(OBJS_DIR) diff --git a/usr/src/uts/sun4v/niagara/Makefile b/usr/src/uts/sun4v/niagara/Makefile index d4baed651c..4a6037e4a9 100644 --- a/usr/src/uts/sun4v/niagara/Makefile +++ b/usr/src/uts/sun4v/niagara/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4v/niagara/Makefile # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the UltraSPARC-H20 cpu module. # @@ -97,7 +98,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(CPULIB): $(BINARY) - $(LD) -o $(CPULIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 1225cad5ad..cbdf058686 100644 --- a/usr/src/uts/sun4v/ontario/platmod/Makefile +++ b/usr/src/uts/sun4v/ontario/platmod/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. @@ -18,11 +17,15 @@ # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END -# uts/sun4v/ontario/platmod/Makefile +# + +# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the sun4v ontario default # platform module. @@ -101,7 +104,7 @@ check: LINT_LIB_DIR =$(ONTARIO_LINT_LIB_DIR) $(PLATLIB): $(BINARY) - $(LD) -o $(PLATLIB) -G $(BINARY) + $(BUILD.SO) $(BINARY) $(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 8f8da1d835..98f274aaa0 100644 --- a/usr/src/uts/sun4v/platmod/Makefile +++ b/usr/src/uts/sun4v/platmod/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. @@ -19,12 +18,14 @@ # # CDDL HEADER END # + # -# uts/sun4v/platmod/Makefile # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of the sun4v default platform module. # @@ -90,7 +91,7 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) $(PLATLIB): $(BINARY) - $(LD) -o $(PLATLIB) -G $(BINARY) -h misc/platmod + $(BUILD.SO) $(BINARY) # # Include common targets. diff --git a/usr/src/uts/sun4v/unix/Makefile b/usr/src/uts/sun4v/unix/Makefile index 83261ac023..c86e1671df 100644 --- a/usr/src/uts/sun4v/unix/Makefile +++ b/usr/src/uts/sun4v/unix/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. @@ -19,11 +18,14 @@ # # CDDL HEADER END # + # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" +# + # # This makefile drives the production of /unix (and unix.o). # @@ -165,7 +167,7 @@ $(PLATLIB): # CPU_OBJ is defined to allow for building multiple CPU_OBJ's # $(CPULIB): $(CPU_OBJ) - $(LD) -o $@ -G -h 'cpu/$$CPU' $(CPU_OBJ) + $(BUILD.SO) $(CPU_OBJ) # # The global lint target builds the kernel lint library (llib-lunix.ln) |