2933 compiler warning gags need better granularity Reviewed by: Eric Schrock <eric.schrock@delphix.com> Approved by: Garrett D'Amore <garrett@damore.org>

6927649 merge common code from solaris10 and sn1 brands 6916737 s10_indir function in s10_brand library invokes incorrect argument --HG-- rename : usr/src/lib/brand/sn1/Makefile => usr/src/lib/brand/shared/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/Makefile => usr/src/lib/brand/shared/brand/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/Makefile.com => usr/src/lib/brand/shared/brand/Makefile.com rename : usr/src/lib/brand/sn1/sn1_brand/amd64/Makefile => usr/src/lib/brand/shared/brand/amd64/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/amd64/sn1_crt.s => usr/src/lib/brand/shared/brand/amd64/crt.s rename : usr/src/lib/brand/sn1/sn1_brand/amd64/sn1_handler.s => usr/src/lib/brand/shared/brand/amd64/handler.s rename : usr/src/lib/brand/sn1/sn1_brand/amd64/sn1_runexe.s => usr/src/lib/brand/shared/brand/amd64/runexe.s rename : usr/src/lib/brand/sn1/sn1_brand/common/sn1_brand.c => usr/src/lib/brand/shared/brand/common/brand_util.c rename : usr/src/lib/brand/sn1/sn1_brand/common/offsets.in => usr/src/lib/brand/shared/brand/common/offsets.in rename : usr/src/lib/brand/sn1/sn1_brand/i386/Makefile => usr/src/lib/brand/shared/brand/i386/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/i386/sn1_crt.s => usr/src/lib/brand/shared/brand/i386/crt.s rename : usr/src/lib/brand/sn1/sn1_brand/i386/sn1_handler.s => usr/src/lib/brand/shared/brand/i386/handler.s rename : usr/src/lib/brand/sn1/sn1_brand/i386/sn1_runexe.s => usr/src/lib/brand/shared/brand/i386/runexe.s rename : usr/src/lib/brand/sn1/sn1_brand/sparc/Makefile => usr/src/lib/brand/shared/brand/sparc/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/sparc/sn1_crt.s => usr/src/lib/brand/shared/brand/sparc/crt.s rename : usr/src/lib/brand/sn1/sn1_brand/sparc/sn1_handler.s => usr/src/lib/brand/shared/brand/sparc/handler.s rename : usr/src/lib/brand/sn1/sn1_brand/sparc/sn1_runexe.s => usr/src/lib/brand/shared/brand/sparc/runexe.s rename : usr/src/lib/brand/sn1/sn1_brand/sparcv9/Makefile => usr/src/lib/brand/shared/brand/sparcv9/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/sys/sn1_misc.h => usr/src/lib/brand/shared/brand/sys/brand_misc.h rename : usr/src/lib/brand/sn1/librtld_db/Makefile.com => usr/src/lib/brand/shared/librtld_db/Makefile.com rename : usr/src/lib/brand/sn1/librtld_db/common/sn1_librtld_db.c => usr/src/lib/brand/shared/librtld_db/common/brand_librtld_db.c rename : usr/src/lib/brand/sn1/librtld_db/common/mapfile-vers => usr/src/lib/brand/shared/librtld_db/common/mapfile-vers rename : usr/src/lib/brand/sn1/librtld_db/common/mapfile-vers.64 => usr/src/lib/brand/shared/librtld_db/common/mapfile-vers.64 rename : usr/src/lib/brand/sn1/Makefile => usr/src/lib/brand/shared/zone/Makefile rename : usr/src/lib/brand/shared/common.ksh => usr/src/lib/brand/shared/zone/common.ksh rename : usr/src/lib/brand/shared/query.ksh => usr/src/lib/brand/shared/zone/query.ksh rename : usr/src/lib/brand/shared/uninstall.ksh => usr/src/lib/brand/shared/zone/uninstall.ksh rename : usr/src/uts/intel/brand/common/brand_asm.h => usr/src/uts/intel/brand/common/brand_solaris.s rename : usr/src/uts/sun4/brand/sn1/sn1_brand_asm.s => usr/src/uts/sun4/brand/common/brand_solaris.s

PSARC 2010/062 increase number of realtime signals 6820737 Solaris needs to increase the number of realtime signals for platform parity

PSARC 2009/657 delete obsolete system call traps 6906485 delete obsolete system call traps --HG-- rename : usr/src/cmd/truss/xstat.c => usr/src/cmd/truss/stat.c rename : usr/src/lib/libc/port/gen/dup2.c => usr/src/lib/libc/port/gen/dup.c rename : usr/src/lib/libc/port/sys/libc_fcntl.c => usr/src/lib/libc/port/sys/fcntl.c rename : usr/src/lib/libc/port/sys/libc_open.c => usr/src/lib/libc/port/sys/open.c

PSARC 2009/253 S10C 6666646 Solaris 10 zones on OpenSolaris binary (supported) distributions --HG-- rename : usr/src/lib/brand/sn1/Makefile => usr/src/lib/brand/solaris10/Makefile rename : usr/src/lib/brand/sn1/Makefile.sn1 => usr/src/lib/brand/solaris10/Makefile.s10 rename : usr/src/lib/brand/lx/cmd/Makefile => usr/src/lib/brand/solaris10/cmd/Makefile rename : usr/src/lib/brand/lx/cmd/lx_native.sh => usr/src/lib/brand/solaris10/cmd/s10_native.sh rename : usr/src/lib/brand/sn1/librtld_db/Makefile => usr/src/lib/brand/solaris10/librtld_db/Makefile rename : usr/src/lib/brand/sn1/librtld_db/Makefile.com => usr/src/lib/brand/solaris10/librtld_db/Makefile.com rename : usr/src/lib/brand/sn1/librtld_db/amd64/Makefile => usr/src/lib/brand/solaris10/librtld_db/amd64/Makefile rename : usr/src/lib/brand/sn1/librtld_db/common/mapfile-vers => usr/src/lib/brand/solaris10/librtld_db/common/mapfile-vers rename : usr/src/lib/brand/sn1/librtld_db/common/mapfile-vers.64 => usr/src/lib/brand/solaris10/librtld_db/common/mapfile-vers.64 rename : usr/src/lib/brand/sn1/librtld_db/common/sn1_librtld_db.c => usr/src/lib/brand/solaris10/librtld_db/common/solaris10_librtld_db.c rename : usr/src/lib/brand/sn1/librtld_db/i386/Makefile => usr/src/lib/brand/solaris10/librtld_db/i386/Makefile rename : usr/src/lib/brand/sn1/librtld_db/sparc/Makefile => usr/src/lib/brand/solaris10/librtld_db/sparc/Makefile rename : usr/src/lib/brand/sn1/librtld_db/sparcv9/Makefile => usr/src/lib/brand/solaris10/librtld_db/sparcv9/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/Makefile => usr/src/lib/brand/solaris10/s10_brand/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/Makefile.com => usr/src/lib/brand/solaris10/s10_brand/Makefile.com rename : usr/src/lib/brand/sn1/sn1_brand/amd64/Makefile => usr/src/lib/brand/solaris10/s10_brand/amd64/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/amd64/sn1_crt.s => usr/src/lib/brand/solaris10/s10_brand/amd64/s10_crt.s rename : usr/src/lib/brand/sn1/sn1_brand/amd64/sn1_handler.s => usr/src/lib/brand/solaris10/s10_brand/amd64/s10_handler.s rename : usr/src/lib/brand/sn1/sn1_brand/amd64/sn1_runexe.s => usr/src/lib/brand/solaris10/s10_brand/amd64/s10_runexe.s rename : usr/src/lib/brand/sn1/sn1_brand/common/mapfile-vers => usr/src/lib/brand/solaris10/s10_brand/common/mapfile-vers rename : usr/src/lib/brand/sn1/sn1_brand/common/offsets.in => usr/src/lib/brand/solaris10/s10_brand/common/offsets.in rename : usr/src/lib/brand/sn1/sn1_brand/common/sn1_brand.c => usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c rename : usr/src/lib/brand/sn1/sn1_brand/i386/Makefile => usr/src/lib/brand/solaris10/s10_brand/i386/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/i386/sn1_crt.s => usr/src/lib/brand/solaris10/s10_brand/i386/s10_crt.s rename : usr/src/lib/brand/sn1/sn1_brand/i386/sn1_handler.s => usr/src/lib/brand/solaris10/s10_brand/i386/s10_handler.s rename : usr/src/lib/brand/sn1/sn1_brand/i386/sn1_runexe.s => usr/src/lib/brand/solaris10/s10_brand/i386/s10_runexe.s rename : usr/src/lib/brand/sn1/sn1_brand/sparc/Makefile => usr/src/lib/brand/solaris10/s10_brand/sparc/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/sparc/sn1_crt.s => usr/src/lib/brand/solaris10/s10_brand/sparc/s10_crt.s rename : usr/src/lib/brand/sn1/sn1_brand/sparc/sn1_handler.s => usr/src/lib/brand/solaris10/s10_brand/sparc/s10_handler.s rename : usr/src/lib/brand/sn1/sn1_brand/sparc/sn1_runexe.s => usr/src/lib/brand/solaris10/s10_brand/sparc/s10_runexe.s rename : usr/src/lib/brand/sn1/sn1_brand/sparcv9/Makefile => usr/src/lib/brand/solaris10/s10_brand/sparcv9/Makefile rename : usr/src/lib/brand/sn1/sn1_brand/sys/sn1_misc.h => usr/src/lib/brand/solaris10/s10_brand/sys/s10_misc.h rename : usr/src/lib/brand/sn1/sn1_brand/Makefile => usr/src/lib/brand/solaris10/s10_npreload/Makefile rename : usr/src/lib/brand/lx/lx_support/Makefile => usr/src/lib/brand/solaris10/s10_support/Makefile rename : usr/src/lib/brand/sn1/zone/Makefile => usr/src/lib/brand/solaris10/zone/Makefile rename : usr/src/lib/brand/sn1/zone/SUNWsn1.xml => usr/src/lib/brand/solaris10/zone/SUNWsolaris10.xml rename : usr/src/lib/brand/sn1/zone/config.xml => usr/src/lib/brand/solaris10/zone/config.xml rename : usr/src/lib/brand/native/zone/p2v.ksh => usr/src/lib/brand/solaris10/zone/p2v.ksh rename : usr/src/lib/brand/native/zone/pkgrm.conf => usr/src/lib/brand/solaris10/zone/pkgrm.conf rename : usr/src/lib/brand/native/zone/pkgrm.lst => usr/src/lib/brand/solaris10/zone/pkgrm.lst rename : usr/src/lib/brand/sn1/zone/platform.xml => usr/src/lib/brand/solaris10/zone/platform.xml rename : usr/src/lib/brand/sn1/zone/sn1_boot.sh => usr/src/lib/brand/solaris10/zone/s10_boot.ksh rename : usr/src/lib/brand/native/zone/smf_disable.conf => usr/src/lib/brand/solaris10/zone/smf_disable.conf rename : usr/src/lib/brand/native/zone/smf_disable.lst => usr/src/lib/brand/solaris10/zone/smf_disable.lst rename : usr/src/pkgdefs/SUNWsn1rint/Makefile => usr/src/pkgdefs/SUNWs10brandr/Makefile rename : usr/src/pkgdefs/SUNWsn1rint/depend => usr/src/pkgdefs/SUNWs10brandr/depend rename : usr/src/pkgdefs/SUNWsn1rint/pkginfo.tmpl => usr/src/pkgdefs/SUNWs10brandr/pkginfo.tmpl rename : usr/src/pkgdefs/SUNWsn1rint/prototype_com => usr/src/pkgdefs/SUNWs10brandr/prototype_com rename : usr/src/pkgdefs/SUNWsn1rint/prototype_i386 => usr/src/pkgdefs/SUNWs10brandr/prototype_i386 rename : usr/src/pkgdefs/SUNWsn1rint/prototype_sparc => usr/src/pkgdefs/SUNWs10brandr/prototype_sparc rename : usr/src/pkgdefs/SUNWsn1uint/Makefile => usr/src/pkgdefs/SUNWs10brandu/Makefile rename : usr/src/pkgdefs/SUNWsn1uint/depend => usr/src/pkgdefs/SUNWs10brandu/depend rename : usr/src/pkgdefs/SUNWsn1uint/pkginfo.tmpl => usr/src/pkgdefs/SUNWs10brandu/pkginfo.tmpl rename : usr/src/pkgdefs/SUNWsn1uint/prototype_com => usr/src/pkgdefs/SUNWs10brandu/prototype_com rename : usr/src/pkgdefs/SUNWsn1uint/prototype_i386 => usr/src/pkgdefs/SUNWs10brandu/prototype_i386 rename : usr/src/pkgdefs/SUNWsn1uint/prototype_sparc => usr/src/pkgdefs/SUNWs10brandu/prototype_sparc rename : usr/src/uts/common/brand/sn1/sn1_brand.c => usr/src/uts/common/brand/solaris10/s10_brand.c rename : usr/src/uts/common/brand/sn1/sn1_brand.h => usr/src/uts/common/brand/solaris10/s10_brand.h rename : usr/src/uts/common/brand/sn1/sn1_offsets.in => usr/src/uts/common/brand/solaris10/s10_offsets.in rename : usr/src/uts/intel/brand/sn1/sn1_brand_asm.s => usr/src/uts/intel/brand/solaris10/s10_brand_asm.s rename : usr/src/uts/intel/sn1_brand/Makefile => usr/src/uts/intel/s10_brand/Makefile rename : usr/src/uts/sun4/brand/sn1/sn1_brand_asm.s => usr/src/uts/sun4/brand/solaris10/s10_brand_asm.s rename : usr/src/uts/sun4u/sn1_brand/Makefile => usr/src/uts/sun4u/s10_brand/Makefile rename : usr/src/uts/sun4v/sn1_brand/Makefile => usr/src/uts/sun4v/s10_brand/Makefile