changeset 12692:4341b447c069

6916796 OSnet mapfiles should use version 2 link-editor syntax
author Ali Bahrami <Ali.Bahrami@Oracle.COM>
date Thu, 24 Jun 2010 18:16:42 -0600
parents 6abdbfd8b490
children 53d043199571
files exception_lists/mapfilechk usr/src/Makefile.master usr/src/cmd/agents/snmp/agent/agent-mapfile-vers usr/src/cmd/agents/snmp/snmplib/snmp-mapfile-vers usr/src/cmd/agents/snmp/snmprelayd/mapfile-intf usr/src/cmd/captoinfo/mapfile-intf usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/mapfile-minconn usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/mapfile-passprompt usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/mapfile-pppoe usr/src/cmd/csh/mapfile-intf usr/src/cmd/devfsadm/mapfile-vers usr/src/cmd/expr/mapfile-intf usr/src/cmd/fm/fmd/common/fmd_api.map usr/src/cmd/fm/fmd/common/fmd_fmri.map usr/src/cmd/fmli/xx/mapfile-intf usr/src/cmd/fs.d/udfs/fsdb/mapfile-intf usr/src/cmd/fwflash/plugins/transport/common/mapfile-vers usr/src/cmd/fwflash/plugins/transport/common/mapfile-vers-hermon usr/src/cmd/fwflash/plugins/transport/common/mapfile-vers-plus usr/src/cmd/fwflash/plugins/vendor/mapfile-vers usr/src/cmd/geniconvtbl/mapfile usr/src/cmd/gss/gssd/mapfile-intf usr/src/cmd/idmap/idmapd/mapfile-intf usr/src/cmd/infocmp/mapfile-intf usr/src/cmd/krb5/kadmin/gui/native/mapfile-vers usr/src/cmd/krb5/kwarn/mapfile-intf usr/src/cmd/lp/lib/papi/mapfile usr/src/cmd/mdb/common/kmdb/mapfile_skel usr/src/cmd/mdb/common/libstandctf/mapfile usr/src/cmd/mdb/common/modules/conf/mapfile usr/src/cmd/mdb/common/modules/conf/mapfile-extern usr/src/cmd/picl/plugins/lib/picld_pluginutil/mapfile-vers usr/src/cmd/pools/poold/libjkstat/mapfile-vers usr/src/cmd/pools/poold/libjlgrp/mapfile-vers usr/src/cmd/pools/poold/libjpool/mapfile-vers usr/src/cmd/pools/poold/libjsyslog/mapfile-vers usr/src/cmd/rcm_daemon/common/mapfile-intf usr/src/cmd/sendmail/src/mapfile-intf usr/src/cmd/sgs/elfedit/common/mapfile-vers usr/src/cmd/sgs/elfedit/modules/common/mapfile-vers usr/src/cmd/sgs/ld/common/mapfile-intf usr/src/cmd/sgs/ldprof/Makefile.com usr/src/cmd/sgs/ldprof/amd64/mapfile-vers usr/src/cmd/sgs/ldprof/common/mapfile-vers usr/src/cmd/sgs/ldprof/i386/mapfile-vers usr/src/cmd/sgs/ldprof/sparc/mapfile-vers usr/src/cmd/sgs/ldprof/sparcv9/mapfile-vers usr/src/cmd/sgs/lex/common/mapfile-vers usr/src/cmd/sgs/libcrle/common/mapfile-vers usr/src/cmd/sgs/libdl/Makefile.com usr/src/cmd/sgs/libdl/amd64/mapfile-vers usr/src/cmd/sgs/libdl/common/mapfile-vers usr/src/cmd/sgs/libdl/i386/mapfile-vers usr/src/cmd/sgs/libdl/sparc/mapfile-vers usr/src/cmd/sgs/libdl/sparcv9/mapfile-vers usr/src/cmd/sgs/libelf/Makefile.com usr/src/cmd/sgs/libelf/common/mapfile-32 usr/src/cmd/sgs/libelf/common/mapfile-common usr/src/cmd/sgs/libelf/common/mapfile-vers usr/src/cmd/sgs/libelf/i386/Makefile usr/src/cmd/sgs/libelf/sparc/Makefile usr/src/cmd/sgs/libld/common/mapfile-vers usr/src/cmd/sgs/liblddbg/common/mapfile-vers usr/src/cmd/sgs/libldmake/common/mapfile-vers usr/src/cmd/sgs/libldstab/amd64/Makefile usr/src/cmd/sgs/libldstab/common/mapfile-64 usr/src/cmd/sgs/libldstab/common/mapfile-vers usr/src/cmd/sgs/libldstab/i386/Makefile usr/src/cmd/sgs/libldstab/sparc/Makefile usr/src/cmd/sgs/libldstab/sparcv9/Makefile usr/src/cmd/sgs/librtld/amd64/Makefile usr/src/cmd/sgs/librtld/common/mapfile-32-vers usr/src/cmd/sgs/librtld/common/mapfile-64-vers usr/src/cmd/sgs/librtld/common/mapfile-vers usr/src/cmd/sgs/librtld/i386/Makefile usr/src/cmd/sgs/librtld/sparc/Makefile usr/src/cmd/sgs/librtld/sparcv9/Makefile usr/src/cmd/sgs/librtld_db/amd64/Makefile usr/src/cmd/sgs/librtld_db/common/mapfile-vers usr/src/cmd/sgs/librtld_db/common/mapfile-vers.64 usr/src/cmd/sgs/librtld_db/sparcv9/Makefile usr/src/cmd/sgs/link_audit/Makefile.com usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-bindings usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-perfcnt usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-symbindrep usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-truss usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-who usr/src/cmd/sgs/link_audit/common/mapfile-vers-bindings usr/src/cmd/sgs/link_audit/common/mapfile-vers-perfcnt usr/src/cmd/sgs/link_audit/common/mapfile-vers-symbindrep usr/src/cmd/sgs/link_audit/common/mapfile-vers-truss usr/src/cmd/sgs/link_audit/common/mapfile-vers-who usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-bindings usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-perfcnt usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-symbindrep usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-truss usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-who usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-bindings usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-perfcnt usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-symbindrep usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-truss usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-who usr/src/cmd/sgs/packages/common/SUNWonld-README usr/src/cmd/sgs/rtld/Makefile usr/src/cmd/sgs/rtld/Makefile.com usr/src/cmd/sgs/rtld/amd64/Makefile usr/src/cmd/sgs/rtld/common/mapfile-32-vers usr/src/cmd/sgs/rtld/common/mapfile-64-vers usr/src/cmd/sgs/rtld/common/mapfile-order-devpro usr/src/cmd/sgs/rtld/common/mapfile-order-gcc usr/src/cmd/sgs/rtld/common/mapfile-vers usr/src/cmd/sgs/rtld/i386/Makefile usr/src/cmd/sgs/rtld/mdbmod/common/mapfile usr/src/cmd/sgs/rtld/sparc/Makefile usr/src/cmd/sgs/rtld/sparcv9/Makefile usr/src/cmd/sgs/yacc/common/mapfile-vers usr/src/cmd/sh/mapfile-intf usr/src/cmd/ssh/sshd/mapfile-intf usr/src/cmd/syseventd/modules/mapfile-extern usr/src/cmd/tcpd/mapfile-intf-tcpdchk usr/src/cmd/tcpd/mapfile-intf-tcpdmatch usr/src/cmd/tcpd/mapfile-intf-tryfrom usr/src/cmd/tic/mapfile-intf usr/src/cmd/tplot/mapfile-intf usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/mapfile usr/src/cmd/wbem/provider/c/wbem_disk/lib/mapfile usr/src/cmd/ypcmd/mapfile-intf usr/src/cmd/ypcmd/yppasswd/mapfile-intf usr/src/common/bignum/i386/cap_mapfile usr/src/common/mapfiles/amd64/Makefile usr/src/common/mapfiles/amd64/map.above4G usr/src/common/mapfiles/amd64/map.below4G usr/src/common/mapfiles/common/Makefile usr/src/common/mapfiles/common/map.above4G usr/src/common/mapfiles/common/map.below4G usr/src/common/mapfiles/common/map.bssalign usr/src/common/mapfiles/common/map.default usr/src/common/mapfiles/common/map.execdata usr/src/common/mapfiles/common/map.filter usr/src/common/mapfiles/common/map.lex.yy usr/src/common/mapfiles/common/map.noexbss usr/src/common/mapfiles/common/map.noexdata usr/src/common/mapfiles/common/map.noexstk usr/src/common/mapfiles/common/map.pagealign usr/src/common/mapfiles/gen/map.noexeglobs.1.template usr/src/common/mapfiles/gen/map.noexeglobs.2.template usr/src/common/mapfiles/i386/Makefile usr/src/common/mapfiles/i386/map.default usr/src/common/mapfiles/i386/map.noexdata usr/src/common/mapfiles/i386/map.pagealign usr/src/common/mapfiles/sparc/Makefile usr/src/common/mapfiles/sparc/map.default usr/src/common/mapfiles/sparc/map.pagealign usr/src/common/mapfiles/sparcv9/Makefile usr/src/common/mapfiles/sparcv9/map.above4G usr/src/common/mapfiles/sparcv9/map.below4G usr/src/grub/grub-0.97/grub/mapfile-intf usr/src/lib/README.mapfiles usr/src/lib/auditd_plugins/binfile/mapfile-vers usr/src/lib/auditd_plugins/remote/mapfile-vers usr/src/lib/auditd_plugins/syslog/mapfile-vers usr/src/lib/brand/shared/librtld_db/common/mapfile-vers usr/src/lib/brand/sn1/librtld_db/amd64/Makefile usr/src/lib/brand/sn1/librtld_db/sparcv9/Makefile usr/src/lib/brand/sn1/sn1_brand/common/mapfile-vers usr/src/lib/brand/solaris10/librtld_db/amd64/Makefile usr/src/lib/brand/solaris10/librtld_db/sparcv9/Makefile usr/src/lib/brand/solaris10/s10_brand/common/mapfile-vers usr/src/lib/brand/solaris10/s10_npreload/common/mapfile-vers usr/src/lib/c_synonyms/Makefile.com usr/src/lib/cfgadm_plugins/ac/common/mapfile-vers usr/src/lib/cfgadm_plugins/fp/common/mapfile-vers usr/src/lib/cfgadm_plugins/ib/common/mapfile-vers usr/src/lib/cfgadm_plugins/pci/common/mapfile-vers usr/src/lib/cfgadm_plugins/sata/common/mapfile-vers usr/src/lib/cfgadm_plugins/sbd/common/mapfile-vers usr/src/lib/cfgadm_plugins/scsi/common/mapfile-vers usr/src/lib/cfgadm_plugins/shp/common/mapfile-vers usr/src/lib/cfgadm_plugins/sysctrl/common/mapfile-vers usr/src/lib/cfgadm_plugins/usb/common/mapfile-vers usr/src/lib/crypt_modules/bsdbf/mapfile-vers usr/src/lib/crypt_modules/bsdmd5/mapfile-vers usr/src/lib/crypt_modules/sha256/mapfile-vers usr/src/lib/crypt_modules/sunmd5/mapfile-vers usr/src/lib/efcode/extend/sparcv9/mapfile-extern usr/src/lib/efcode/interpreter/mapfile64 usr/src/lib/efcode/packages/mapfile-extern usr/src/lib/extendedFILE/common/mapfile-vers usr/src/lib/fm/libdiagcode/common/mapfile-vers usr/src/lib/fm/libdiskstatus/common/mapfile-vers usr/src/lib/fm/libfmd_adm/common/mapfile-vers usr/src/lib/fm/libfmd_agent/amd64/Makefile usr/src/lib/fm/libfmd_agent/amd64/mapfile-vers usr/src/lib/fm/libfmd_agent/common/mapfile-vers usr/src/lib/fm/libfmd_agent/i386/Makefile usr/src/lib/fm/libfmd_agent/i386/mapfile-vers usr/src/lib/fm/libfmd_agent/sparc/Makefile usr/src/lib/fm/libfmd_agent/sparc/mapfile-vers usr/src/lib/fm/libfmd_agent/sparcv9/Makefile usr/src/lib/fm/libfmd_agent/sparcv9/mapfile-vers usr/src/lib/fm/libfmd_log/common/mapfile-vers usr/src/lib/fm/libfmd_msg/common/mapfile-vers usr/src/lib/fm/libfmd_snmp/common/mapfile-vers usr/src/lib/fm/libfmevent/common/mapfile-vers usr/src/lib/fm/libldom/sparc/mapfile-vers usr/src/lib/fm/libmdesc/common/mapfile-vers usr/src/lib/fm/topo/libtopo/common/mapfile-vers usr/src/lib/fm/topo/libtopo/common/topo_mod.map usr/src/lib/gss_mechs/mech_dh/backend/mapfile-vers usr/src/lib/gss_mechs/mech_dh/dh1024/mapfile-vers usr/src/lib/gss_mechs/mech_dh/dh192/mapfile-vers usr/src/lib/gss_mechs/mech_dh/dh640/mapfile-vers usr/src/lib/gss_mechs/mech_krb5/mapfile-vers usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean usr/src/lib/gss_mechs/mech_spnego/mapfile-vers usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean usr/src/lib/hal/libhal-storage/common/mapfile-vers usr/src/lib/hal/libhal/common/mapfile-vers usr/src/lib/hbaapi/common/mapfile-vers usr/src/lib/krb5/dyn/mapfile-vers usr/src/lib/krb5/kadm5/clnt/mapfile-vers usr/src/lib/krb5/kadm5/srv/mapfile-vers usr/src/lib/krb5/kdb/mapfile-vers usr/src/lib/krb5/plugins/kdb/db2/libdb2/mapfile-vers usr/src/lib/krb5/plugins/kdb/db2/mapfile-vers usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/mapfile-vers usr/src/lib/krb5/plugins/kdb/ldap/mapfile-vers usr/src/lib/krb5/plugins/preauth/pkinit/mapfile-vers usr/src/lib/krb5/ss/mapfile-vers usr/src/lib/libadm/Makefile.com usr/src/lib/libadm/amd64/mapfile-vers usr/src/lib/libadm/common/mapfile-vers usr/src/lib/libadm/i386/mapfile-vers usr/src/lib/libadm/sparc/mapfile-vers usr/src/lib/libadm/sparcv9/mapfile-vers usr/src/lib/libadt_jni/auditxml_jni usr/src/lib/libadutils/common/mapfile-vers usr/src/lib/libaio/Makefile.com usr/src/lib/libaio/amd64/mapfile-vers usr/src/lib/libaio/common/mapfile-vers usr/src/lib/libaio/i386/mapfile-vers usr/src/lib/libaio/sparc/mapfile-vers usr/src/lib/libaio/sparcv9/mapfile-vers usr/src/lib/libast/mapfile-vers usr/src/lib/libavl/mapfile-vers usr/src/lib/libbrand/common/mapfile-vers usr/src/lib/libbsdmalloc/common/mapfile-vers usr/src/lib/libbsm/common/mapfile-vers usr/src/lib/libc/amd64/Makefile usr/src/lib/libc/amd64/mapfile-vers usr/src/lib/libc/i386/Makefile.com usr/src/lib/libc/i386/mapfile-vers usr/src/lib/libc/i386_hwcap1/mapfile usr/src/lib/libc/i386_hwcap2/mapfile usr/src/lib/libc/i386_hwcap3/mapfile usr/src/lib/libc/port/mapfile-vers usr/src/lib/libc/sparc/Makefile.com usr/src/lib/libc/sparc/mapfile-vers usr/src/lib/libc/sparc/mapfile-vers-aux usr/src/lib/libc/sparc_hwcap1/sparc/mapfile usr/src/lib/libc/sparc_hwcap1/sparc/mapfile-vers-aux usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile-vers-aux usr/src/lib/libc/sparcv9/Makefile.com usr/src/lib/libc/sparcv9/mapfile-vers usr/src/lib/libc/sparcv9/mapfile-vers-aux usr/src/lib/libc_db/common/mapfile-vers usr/src/lib/libc_psr/sun4u/mapfile-memcpy usr/src/lib/libc_psr/sun4u/mapfile-vers usr/src/lib/libc_psr/sun4u_hwcap2/mapfile usr/src/lib/libc_psr/sun4v/mapfile-vers usr/src/lib/libc_psr/sun4v_hwcap1/mapfile usr/src/lib/libc_psr/sun4v_hwcap2/mapfile usr/src/lib/libcfgadm/common/mapfile-vers usr/src/lib/libcmd/mapfile-vers usr/src/lib/libcmdutils/common/mapfile-vers usr/src/lib/libcommputil/common/mapfile-vers usr/src/lib/libcontract/common/mapfile-vers usr/src/lib/libcpc/Makefile.com usr/src/lib/libcpc/amd64/mapfile-vers usr/src/lib/libcpc/common/mapfile-vers usr/src/lib/libcpc/i386/mapfile-vers usr/src/lib/libcpc/sparc/mapfile-vers usr/src/lib/libcpc/sparcv9/mapfile-vers usr/src/lib/libcrypt/common/mapfile-vers usr/src/lib/libcryptoutil/common/mapfile-vers usr/src/lib/libctf/common/mapfile-vers usr/src/lib/libcurses/screen/mapfile-vers usr/src/lib/libdevice/mapfile-vers usr/src/lib/libdevid/mapfile-vers usr/src/lib/libdevinfo/mapfile-vers usr/src/lib/libdhcpagent/common/mapfile-vers usr/src/lib/libdhcpdu/common/mapfile usr/src/lib/libdhcpsvc/modules/binfiles/mapfile-vers usr/src/lib/libdhcpsvc/modules/files/mapfile-vers usr/src/lib/libdhcpsvc/modules/files0/mapfile-vers usr/src/lib/libdhcpsvc/private/mapfile-vers usr/src/lib/libdhcputil/common/mapfile-vers usr/src/lib/libdisasm/common/mapfile-vers usr/src/lib/libdiskmgt/common/mapfile-vers usr/src/lib/libdladm/common/mapfile-vers usr/src/lib/libdll/mapfile-vers usr/src/lib/libdlpi/common/mapfile-vers usr/src/lib/libdns_sd/common/mapfile-vers usr/src/lib/libdns_sd/java/common/mapfile-vers usr/src/lib/libdoor/common/mapfile-vers usr/src/lib/libds/common/mapfile-vers usr/src/lib/libdscfg/common/mapfile-vers usr/src/lib/libdscp/mapfile-vers usr/src/lib/libdtrace/common/mapfile-vers usr/src/lib/libdtrace_jni/common/mapfile-vers usr/src/lib/libefi/common/mapfile-vers usr/src/lib/libelfsign/Makefile.com usr/src/lib/libelfsign/common/mapfile-vers usr/src/lib/libelfsign/common/mapfile.map usr/src/lib/libeti/form/amd64/Makefile usr/src/lib/libeti/form/common/mapfile-vers usr/src/lib/libeti/form/common/mapfile32-vers usr/src/lib/libeti/form/common/mapfile64-vers usr/src/lib/libeti/form/i386/Makefile usr/src/lib/libeti/form/sparc/Makefile usr/src/lib/libeti/form/sparcv9/Makefile usr/src/lib/libeti/menu/common/mapfile-vers usr/src/lib/libeti/panel/common/mapfile-vers usr/src/lib/libexacct/common/mapfile-vers usr/src/lib/libfcoe/common/mapfile-vers usr/src/lib/libfdisk/common/mapfile-vers usr/src/lib/libfru/libnvfru/mapfile-vers usr/src/lib/libfsmgt/common/mapfile-vers usr/src/lib/libfstyp/common/mapfile-vers usr/src/lib/libgen/Makefile.com usr/src/lib/libgen/amd64/Makefile usr/src/lib/libgen/common/mapfile-vers usr/src/lib/libgen/common/mapfile32-vers usr/src/lib/libgen/i386/Makefile usr/src/lib/libgen/sparc/Makefile usr/src/lib/libgen/sparcv9/Makefile usr/src/lib/libgrubmgmt/common/mapfile-vers usr/src/lib/libgss/mapfile-vers usr/src/lib/libhotplug/common/mapfile-vers usr/src/lib/libidmap/common/mapfile-vers usr/src/lib/libilb/common/mapfile-vers usr/src/lib/libima/common/mapfile-vers usr/src/lib/libinetsvc/common/mapfile-vers usr/src/lib/libinetutil/common/mapfile-vers usr/src/lib/libinstzones/common/mapfile-vers usr/src/lib/libintl/common/mapfile-vers usr/src/lib/libipmi/common/mapfile-vers usr/src/lib/libipmp/common/mapfile-vers usr/src/lib/libipp/mapfile-vers usr/src/lib/libipsecutil/common/mapfile-vers usr/src/lib/libiscsit/common/mapfile-vers usr/src/lib/libkmf/ber_der/common/mapfile-vers usr/src/lib/libkmf/libkmf/common/mapfile-vers usr/src/lib/libkmf/plugins/kmf_nss/common/mapfile-vers usr/src/lib/libkmf/plugins/kmf_openssl/common/mapfile-vers usr/src/lib/libkmf/plugins/kmf_pkcs11/common/mapfile-vers usr/src/lib/libkrb5/common/mapfile-vers usr/src/lib/libkstat/common/mapfile-vers usr/src/lib/libkvm/common/mapfile-vers usr/src/lib/libldap4/common/mapfile-vers usr/src/lib/libldap5/mapfile-vers usr/src/lib/liblgrp/common/mapfile-vers usr/src/lib/liblm/common/mapfile-vers usr/src/lib/libmail/amd64/Makefile usr/src/lib/libmail/common/mapfile-vers usr/src/lib/libmail/common/mapfile32-vers usr/src/lib/libmail/i386/Makefile usr/src/lib/libmail/sparc/Makefile usr/src/lib/libmail/sparcv9/Makefile usr/src/lib/libmalloc/common/mapfile-vers usr/src/lib/libmapid/common/mapfile-vers usr/src/lib/libmapmalloc/common/mapfile-vers usr/src/lib/libmd/common/mapfile-vers usr/src/lib/libmd/sun4u/sparc/mapfile usr/src/lib/libmd/sun4u/sparcv9/mapfile usr/src/lib/libmd/sun4v/sparc/mapfile usr/src/lib/libmd/sun4v/sparcv9/mapfile usr/src/lib/libmd5/common/mapfile-vers usr/src/lib/libmp/common/mapfile-vers usr/src/lib/libmp/common/mapfile_1-vers usr/src/lib/libmtmalloc/common/mapfile-vers usr/src/lib/libndmp/common/mapfile-vers usr/src/lib/libnisdb/mapfile-vers usr/src/lib/libnls/common/mapfile-vers usr/src/lib/libnsctl/common/mapfile-vers usr/src/lib/libnsl/Makefile.com usr/src/lib/libnsl/amd64/mapfile-vers usr/src/lib/libnsl/common/mapfile-vers usr/src/lib/libnsl/i386/mapfile-vers usr/src/lib/libnsl/sparc/mapfile-vers usr/src/lib/libnsl/sparcv9/mapfile-vers usr/src/lib/libntfs/common/mapfile-vers usr/src/lib/libnvpair/mapfile-vers usr/src/lib/libnwam/common/mapfile-vers usr/src/lib/libpam/mapfile-vers usr/src/lib/libparted/common/mapfile-vers usr/src/lib/libpcp/common/mapfile-vers usr/src/lib/libpctx/common/mapfile-vers usr/src/lib/libpicl/mapfile-vers usr/src/lib/libpicltree/mapfile-vers usr/src/lib/libpkg/common/mapfile-vers usr/src/lib/libplot/plot/common/mapfile-vers usr/src/lib/libplot/t300/common/mapfile-vers usr/src/lib/libplot/t300s/common/mapfile-vers usr/src/lib/libplot/t4014/common/mapfile-vers usr/src/lib/libplot/t450/common/mapfile-vers usr/src/lib/libplot/vt0/common/mapfile-vers usr/src/lib/libpool/common/mapfile-vers usr/src/lib/libpp/mapfile-vers usr/src/lib/libpri/common/mapfile-vers usr/src/lib/libproc/Makefile.com usr/src/lib/libproc/amd64/mapfile-vers usr/src/lib/libproc/common/mapfile-vers usr/src/lib/libproc/i386/mapfile-vers usr/src/lib/libproc/sparc/mapfile-vers usr/src/lib/libproc/sparcv9/mapfile-vers usr/src/lib/libproject/common/mapfile-vers usr/src/lib/libpthread/Makefile.com usr/src/lib/libpthread/amd64/mapfile-vers usr/src/lib/libpthread/common/mapfile-vers usr/src/lib/libpthread/i386/mapfile-vers usr/src/lib/libpthread/sparc/mapfile-vers usr/src/lib/libpthread/sparcv9/mapfile-vers usr/src/lib/libraidcfg/common/mapfile-vers usr/src/lib/librcm/mapfile-vers usr/src/lib/librdc/common/mapfile-vers usr/src/lib/libreparse/common/mapfile-vers usr/src/lib/libresolv/mapfile-vers usr/src/lib/libresolv2/common/mapfile-vers usr/src/lib/librestart/common/mapfile-vers usr/src/lib/librpcsvc/common/mapfile-vers usr/src/lib/librsm/common/mapfile-vers usr/src/lib/librstp/common/mapfile-vers usr/src/lib/librt/Makefile.com usr/src/lib/librt/amd64/mapfile-vers usr/src/lib/librt/common/mapfile-vers usr/src/lib/librt/i386/mapfile-vers usr/src/lib/librt/sparc/mapfile-vers usr/src/lib/librt/sparcv9/mapfile-vers usr/src/lib/libsasl/lib/mapfile-vers usr/src/lib/libscf/common/mapfile-vers usr/src/lib/libsched/common/mapfile-vers usr/src/lib/libsctp/common/mapfile-vers usr/src/lib/libsec/common/mapfile-vers usr/src/lib/libsecdb/common/mapfile-vers usr/src/lib/libsendfile/Makefile.com usr/src/lib/libsendfile/common/mapfile-vers usr/src/lib/libsendfile/common/mapfile32-vers usr/src/lib/libsendfile/i386/Makefile usr/src/lib/libsendfile/sparc/Makefile usr/src/lib/libshare/common/mapfile-vers usr/src/lib/libshare/nfs/mapfile-vers usr/src/lib/libshare/smb/mapfile-vers usr/src/lib/libshare/smbfs/mapfile-vers usr/src/lib/libshell/mapfile-vers usr/src/lib/libsip/common/mapfile-vers usr/src/lib/libsldap/common/mapfile-vers usr/src/lib/libslp/clib/mapfile-vers usr/src/lib/libsmbfs/smb/mapfile-vers usr/src/lib/libsmbios/common/mapfile-vers usr/src/lib/libsmedia/library/common/mapfile-vers usr/src/lib/libsmedia/plugins/floppy/common/mapfile-vers usr/src/lib/libsmedia/plugins/pcata/common/mapfile-vers usr/src/lib/libsmedia/plugins/scsi/common/mapfile-vers usr/src/lib/libsocket/Makefile.com usr/src/lib/libsocket/amd64/mapfile-vers usr/src/lib/libsocket/common/mapfile-vers usr/src/lib/libsocket/i386/mapfile-vers usr/src/lib/libsocket/sparc/mapfile-vers usr/src/lib/libsocket/sparcv9/mapfile-vers usr/src/lib/libsqlite/mapfile-sqlite usr/src/lib/libstmf/common/mapfile-vers usr/src/lib/libstmfproxy/common/mapfile-vers usr/src/lib/libsum/mapfile-vers usr/src/lib/libsun_ima/common/mapfile-vers usr/src/lib/libsys/Makefile.com usr/src/lib/libsys/common/mapfile-vers usr/src/lib/libsys/i386/mapfile-vers usr/src/lib/libsys/sparc/mapfile-vers usr/src/lib/libsysevent/mapfile-vers usr/src/lib/libtecla/common/mapfile-vers usr/src/lib/libthread/Makefile.com usr/src/lib/libthread/amd64/mapfile-vers usr/src/lib/libthread/common/mapfile-vers usr/src/lib/libthread/i386/mapfile-vers usr/src/lib/libthread/sparc/mapfile-vers usr/src/lib/libthread/sparcv9/mapfile-vers usr/src/lib/libtnf/mapfile-vers usr/src/lib/libtnfctl/mapfile-vers usr/src/lib/libtnfprobe/Makefile.com usr/src/lib/libtnfprobe/amd64/mapfile-vers usr/src/lib/libtnfprobe/i386/mapfile-vers usr/src/lib/libtnfprobe/mapfile-vers usr/src/lib/libtnfprobe/sparc/mapfile-vers usr/src/lib/libtnfprobe/sparcv9/mapfile-vers usr/src/lib/libtsalarm/common/mapfile-vers usr/src/lib/libtsnet/common/mapfile-vers usr/src/lib/libtsol/common/mapfile-vers usr/src/lib/libumem/common/mapfile-vers usr/src/lib/libumem/common/stand_mapfile usr/src/lib/libunistat/common/mapfile-vers usr/src/lib/libuuid/common/mapfile-vers usr/src/lib/libuutil/common/mapfile-vers usr/src/lib/libvolmgt/common/mapfile-vers usr/src/lib/libvrrpadm/common/mapfile-vers usr/src/lib/libvscan/common/mapfile-vers usr/src/lib/libw/common/mapfile-vers usr/src/lib/libwanboot/common/mapfile-vers usr/src/lib/libwanbootutil/common/mapfile-vers usr/src/lib/libwrap/mapfile usr/src/lib/libxcurses/src/mapfile-vers usr/src/lib/libxcurses2/src/mapfile-vers usr/src/lib/libxnet/common/mapfile-vers usr/src/lib/libzfs/common/mapfile-vers usr/src/lib/libzfs_jni/common/mapfile-vers usr/src/lib/libzonecfg/common/mapfile-vers usr/src/lib/libzoneinfo/common/mapfile-vers usr/src/lib/lvm/libmeta/common/mapfile-vers usr/src/lib/lvm/libpreen/common/mapfile-vers usr/src/lib/lvm/libsvm/common/mapfile-vers usr/src/lib/mpapi/libmpapi/common/mapfile-vers usr/src/lib/mpapi/libmpscsi_vhci/common/mapfile-vers usr/src/lib/nametoaddr/straddr/common/mapfile-vers usr/src/lib/ncad_addr/Makefile.com usr/src/lib/ncad_addr/amd64/mapfile-vers usr/src/lib/ncad_addr/common/mapfile-vers usr/src/lib/ncad_addr/i386/mapfile-vers usr/src/lib/ncad_addr/sparc/mapfile-vers usr/src/lib/ncad_addr/sparcv9/mapfile-vers usr/src/lib/nsswitch/ad/common/mapfile-vers usr/src/lib/nsswitch/compat/common/mapfile-vers usr/src/lib/nsswitch/dns/common/mapfile-vers usr/src/lib/nsswitch/files/common/mapfile-vers usr/src/lib/nsswitch/ldap/common/mapfile-vers usr/src/lib/nsswitch/mdns/common/mapfile-vers usr/src/lib/nsswitch/nis/common/mapfile-vers usr/src/lib/nsswitch/user/common/mapfile-vers usr/src/lib/pam_modules/allow/mapfile-vers usr/src/lib/pam_modules/authtok_check/mapfile-vers usr/src/lib/pam_modules/authtok_get/mapfile-vers usr/src/lib/pam_modules/authtok_store/mapfile-vers usr/src/lib/pam_modules/deny/mapfile-vers usr/src/lib/pam_modules/dhkeys/mapfile-vers usr/src/lib/pam_modules/dial_auth/mapfile-vers usr/src/lib/pam_modules/krb5/mapfile-vers usr/src/lib/pam_modules/krb5_migrate/mapfile-vers usr/src/lib/pam_modules/ldap/mapfile-vers usr/src/lib/pam_modules/list/mapfile-vers usr/src/lib/pam_modules/passwd_auth/mapfile-vers usr/src/lib/pam_modules/rhosts_auth/mapfile-vers usr/src/lib/pam_modules/roles/mapfile-vers usr/src/lib/pam_modules/sample/mapfile-vers usr/src/lib/pam_modules/smb/mapfile-vers usr/src/lib/pam_modules/smbfs/mapfile-vers usr/src/lib/pam_modules/tsol_acct/mapfile-vers usr/src/lib/pam_modules/unix_account/mapfile-vers usr/src/lib/pam_modules/unix_auth/mapfile-vers usr/src/lib/pam_modules/unix_cred/mapfile-vers usr/src/lib/pam_modules/unix_session/mapfile-vers usr/src/lib/passwdutil/mapfile-vers usr/src/lib/pkcs11/libkcfd/common/mapfile-vers usr/src/lib/pkcs11/libpkcs11/common/mapfile-vers usr/src/lib/pkcs11/libsoftcrypto/common/mapfile-vers usr/src/lib/pkcs11/libsoftcrypto/sun4u/mapfile-vers usr/src/lib/pkcs11/libsoftcrypto/sun4v/mapfile-vers usr/src/lib/pkcs11/pkcs11_kernel/common/mapfile-vers usr/src/lib/pkcs11/pkcs11_softtoken/common/mapfile-vers usr/src/lib/pkcs11/pkcs11_tpm/common/mapfile-vers usr/src/lib/policykit/libpolkit/common/mapfile-vers usr/src/lib/print/libhttp-core/common/mapfile usr/src/lib/print/libipp-core/common/mapfile usr/src/lib/print/libipp-listener/common/mapfile usr/src/lib/print/libpapi-common/common/mapfile usr/src/lib/print/libpapi-dynamic/common/mapfile usr/src/lib/print/libpapi-ipp/common/mapfile usr/src/lib/print/libpapi-lpd/common/mapfile usr/src/lib/print/libprint/common/mapfile-vers usr/src/lib/print/mod_ipp/mapfile usr/src/lib/pyzfs/common/mapfile-vers usr/src/lib/rpcsec_gss/mapfile-vers usr/src/lib/sasl_plugins/mapfile-vers usr/src/lib/scsi/libscsi/libscsi_api.map usr/src/lib/scsi/libscsi/mapfile-vers usr/src/lib/scsi/libses/libses_api.map usr/src/lib/scsi/libses/mapfile-vers usr/src/lib/smbsrv/libmlrpc/common/mapfile-vers usr/src/lib/smbsrv/libmlsvc/common/mapfile-vers usr/src/lib/smbsrv/libsmb/common/mapfile-vers usr/src/lib/smbsrv/libsmbns/common/mapfile-vers usr/src/lib/smbsrv/libsmbrdr/common/mapfile-vers usr/src/lib/smhba/common/mapfile-vers usr/src/lib/storage/liba5k/common/mapfile-vers usr/src/lib/storage/libg_fc/common/mapfile-vers usr/src/lib/sun_fc/common/mapfile-vers usr/src/lib/sun_sas/common/mapfile-vers usr/src/lib/udapl/libdat/common/mapfile-vers usr/src/lib/udapl/udapl_tavor/common/mapfile-vers usr/src/lib/watchmalloc/common/mapfile-vers usr/src/pkg/manifests/developer-linker.mf usr/src/prototypes/prototype.mapfile-vers usr/src/psm/stand/boot/sparc/common/mapfile usr/src/psm/stand/bootlst/sparc/mapfile usr/src/psm/stand/cpr/sparcv9/sun4u/mapfile usr/src/tools/onbld/Checks/Mapfile.py usr/src/tools/onbld/hgext/cdm.py usr/src/ucblib/libcurses/mapfile-vers usr/src/ucblib/libdbm/mapfile-vers usr/src/ucblib/librpcsoc/mapfile-vers usr/src/ucblib/libtermcap/mapfile-vers usr/src/ucblib/libucb/Makefile.com usr/src/ucblib/libucb/amd64/mapfile-vers usr/src/ucblib/libucb/i386/mapfile-vers usr/src/ucblib/libucb/port/mapfile-vers usr/src/ucblib/libucb/sparc/mapfile-vers usr/src/ucblib/libucb/sparcv9/mapfile-vers usr/src/uts/common/ctf/mapfile usr/src/uts/common/io/sdcard/impl/mapfile usr/src/uts/common/zmod/mapfile usr/src/uts/i86pc/conf/Mapfile usr/src/uts/i86pc/conf/Mapfile.amd64 usr/src/uts/i86pc/conf/Mapfile.bios usr/src/uts/i86pc/conf/Mapfile.fb_swtch usr/src/uts/i86pc/unix/dboot/Mapfile.dboot usr/src/uts/i86xpv/conf/Mapfile usr/src/uts/i86xpv/conf/Mapfile.amd64 usr/src/uts/i86xpv/unix/dboot/Mapfile.dboot usr/src/uts/sparc/krtld/mapfile usr/src/uts/sun4/conf/Mapfile
diffstat 634 files changed, 9372 insertions(+), 16554 deletions(-) [+]
line wrap: on
line diff
--- a/exception_lists/mapfilechk	Thu Jun 24 17:12:23 2010 -0700
+++ b/exception_lists/mapfilechk	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 # By default, mapfilechk operates on any file in the
@@ -33,15 +32,6 @@
 syntax: glob
 exception_lists/mapfilechk
 usr/src/cmd/mdb/common/kmdb/mapfile_skel
-usr/src/cmd/sgs/rtld/common/mapfile-order-*
-usr/src/common/bignum/*/cap_mapfile
-usr/src/common/mapfiles/*
-usr/src/common/mapfiles/*/*
 usr/src/lib/README.mapfiles
-usr/src/lib/libc/*_hwcap*/mapfile
-usr/src/lib/libc/sparc_hwcap1/sparc*/mapfile
-usr/src/lib/libc_psr/*_hwcap*/mapfile
-usr/src/psm/stand/boot/sparc/common/mapfile
-usr/src/psm/stand/bootlst/sparc/mapfile
-usr/src/psm/stand/cpr/sparcv9/sun4u/mapfile
+usr/src/tools/onbld/Checks/Mapfile*
 usr/src/tools/scripts/*
--- a/usr/src/Makefile.master	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/Makefile.master	Thu Jun 24 18:16:42 2010 -0600
@@ -571,10 +571,10 @@
 # Various mapfiles that are used throughout the build, and delivered to
 # /usr/lib/ld.
 #
-MAPFILE.NED_i386 =	$(SRC)/common/mapfiles/i386/map.noexdata
+MAPFILE.NED_i386 =	$(SRC)/common/mapfiles/common/map.noexdata
 MAPFILE.NED_sparc =
 MAPFILE.NED =		$(MAPFILE.NED_$(MACH))
-MAPFILE.PGA =		$(SRC)/common/mapfiles/$(MACH)/map.pagealign
+MAPFILE.PGA =		$(SRC)/common/mapfiles/common/map.pagealign
 MAPFILE.NES =		$(SRC)/common/mapfiles/common/map.noexstk
 MAPFILE.FLT =		$(SRC)/common/mapfiles/common/map.filter
 MAPFILE.LEX =		$(SRC)/common/mapfiles/common/map.lex.yy
--- a/usr/src/cmd/agents/snmp/agent/agent-mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/agents/snmp/agent/agent-mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		SSAMain; 
 		SSARegSubagent; 
@@ -58,7 +59,7 @@
 		*;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global: 
 		load_enterprise_oid; 
 		delete_manager_list; 
--- a/usr/src/cmd/agents/snmp/snmplib/snmp-mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/agents/snmp/snmplib/snmp-mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		SSAStringZero;
 		SSAStringInit;
@@ -55,7 +56,7 @@
 		*;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 	address_string; 
 	delete_trap_destinator_list; 
--- a/usr/src/cmd/agents/snmp/snmprelayd/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/agents/snmp/snmprelayd/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # snmpdx provides a couple of libssagent.so.1 functions.
-{
+SYMBOL_SCOPE {
 	global:
 		default_config_file;
 		default_error_file;
--- a/usr/src/cmd/captoinfo/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/captoinfo/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,9 +37,11 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # captoinfo interposes on cpr() and progname[].
-{
+SYMBOL_SCOPE {
 	global:
-		cpr = INTERPOSE;
-		progname = INTERPOSE;
+		cpr		{ FLAGS = INTERPOSE };
+		progname	{ FLAGS = INTERPOSE };
 };
--- a/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/mapfile-minconn	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/mapfile-minconn	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # External declarations - used to suppress -zdefs errors.
 
@@ -18,9 +17,11 @@
 # MAPFILE HEADER END
 #
 
-{
-	add_options	= FUNCTION extern;	# Provided by pppd.
-	idle_time_hook	= DATA extern;		#    "     "
-	idle_time_limit	= DATA extern;		#    "     "
-	info		= FUNCTION extern;	#    "     "
+$mapfile_version 2
+
+SYMBOL_SCOPE {
+	add_options	{ TYPE = FUNCTION; FLAGS = extern };	# From pppd
+	idle_time_hook	{ TYPE = DATA; FLAGS = extern };	#    "     "
+	idle_time_limit	{ TYPE = DATA; FLAGS = extern };	#    "     "
+	info		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
 };
--- a/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/mapfile-passprompt	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/mapfile-passprompt	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # External declarations - used to suppress -zdefs errors.
 
@@ -18,13 +17,15 @@
 # MAPFILE HEADER END
 #
 
-{
-	add_options	= FUNCTION extern;	# Provided by pppd.
-	detached	= DATA extern;		#    "     "
-	error		= FUNCTION extern;	#    "     "
-	pap_passwd_hook = DATA extern;		#    "     "
-	remote_name	= DATA extern;		#    "     "
-	slprintf	= FUNCTION extern;	#    "     "
-	sys_close	= FUNCTION extern;	#    "     "
-	warn		= FUNCTION extern;	#    "     "
+$mapfile_version 2
+
+SYMBOL_SCOPE {
+	add_options	{ TYPE = FUNCTION; FLAGS = extern };	#  From  pppd
+	detached	{ TYPE = DATA; FLAGS = extern };	#    "     "
+	error		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	pap_passwd_hook { TYPE = DATA; FLAGS = extern };	#    "     "
+	remote_name	{ TYPE = DATA; FLAGS = extern };	#    "     "
+	slprintf	{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	sys_close	{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	warn		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
 };
--- a/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/mapfile-pppoe	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/mapfile-pppoe	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -40,44 +39,46 @@
 
 # External declarations - used to suppress -zdefs errors.
 
-{
-	script_setenv	= FUNCTION extern;	# Provided by pppd.
-	script_getenv	= FUNCTION extern;	#    "     "
-	slprintf	= FUNCTION extern;	#    "     "
-	option_error	= FUNCTION extern;	#    "     "
-	warn		= FUNCTION extern;	#    "     "
-	fatal		= FUNCTION extern;	#    "     "
-	dbglog		= FUNCTION extern;	#    "     "
-	absmax_mtu	= DATA extern;		#    "     "
-	absmax_mru	= DATA extern;		#    "     "
-	updown_script_hook = DATA extern;	#    "     "
-	devnam_info	= DATA extern;		#    "     "
-	check_options_hook = DATA extern;	#    "     "
-	device_pipe_hook = DATA extern;		#    "     "
-	already_ppp	= DATA extern;		#    "     "
-	devnam		= DATA extern;		#    "     "
-	sys_read_packet_hook = DATA extern;	#    "     "
-	ifname		= DATA extern;		#    "     "
-	fclose		= FUNCTION extern;	#    "     "
-	ioctl		= FUNCTION extern;	#    "     "
-	fdopen		= FUNCTION extern;	#    "     "
-	close		= FUNCTION extern;	#    "     "
-	open		= FUNCTION extern;	#    "     "
-	strcmp		= FUNCTION extern;	#    "     "
-	fgets		= FUNCTION extern;	#    "     "
-	strlen		= FUNCTION extern;	#    "     "
-	seteuid		= FUNCTION extern;	#    "     "
-	ether_ntoa	= FUNCTION extern;	#    "     "
-	___errno	= FUNCTION extern;	#    "     "
-	strdup		= FUNCTION extern;	#    "     "
-	run_program	= FUNCTION extern;	#    "     "
-	malloc		= FUNCTION extern;	#    "     "
-	strrchr		= FUNCTION extern;	#    "     "
-	strchr		= FUNCTION extern;	#    "     "
-	error		= FUNCTION extern;	#    "     "
-	free		= FUNCTION extern;	#    "     "
-	strcpy		= FUNCTION extern;	#    "     "
-	memcpy		= FUNCTION extern;	#    "     "
-	script_unsetenv	= FUNCTION extern;	#    "     "
-	ntohs		= FUNCTION extern;	#    "     "
+$mapfile_version 2
+
+SYMBOL_SCOPE {
+	script_setenv	{ TYPE = FUNCTION; FLAGS = extern };	# From pppd
+	script_getenv	{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	slprintf	{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	option_error	{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	warn		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	fatal		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	dbglog		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	absmax_mtu	{ TYPE = DATA; FLAGS = extern };	#    "     "
+	absmax_mru	{ TYPE = DATA; FLAGS = extern };	#    "     "
+	updown_script_hook { TYPE = DATA; FLAGS = extern };	#    "     "
+	devnam_info	{ TYPE = DATA; FLAGS = extern };	#    "     "
+	check_options_hook { TYPE = DATA; FLAGS = extern };	#    "     "
+	device_pipe_hook { TYPE = DATA; FLAGS = extern };	#    "     "
+	already_ppp	{ TYPE = DATA; FLAGS = extern };	#    "     "
+	devnam		{ TYPE = DATA; FLAGS = extern };	#    "     "
+	sys_read_packet_hook { TYPE = DATA; FLAGS = extern };	#    "     "
+	ifname		{ TYPE = DATA; FLAGS = extern };	#    "     "
+	fclose		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	ioctl		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	fdopen		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	close		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	open		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	strcmp		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	fgets		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	strlen		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	seteuid		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	ether_ntoa	{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	___errno	{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	strdup		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	run_program	{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	malloc		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	strrchr		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	strchr		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	error		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	free		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	strcpy		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	memcpy		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	script_unsetenv	{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
+	ntohs		{ TYPE = FUNCTION; FLAGS = extern };	#    "     "
 };
--- a/usr/src/cmd/csh/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/csh/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,9 +37,11 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # csh interposes on a couple of libc functions (printf and signal).
-{
+SYMBOL_SCOPE {
 	global:
-		printf = INTERPOSE;
-		signal = INTERPOSE;
+		printf	{ FLAGS = INTERPOSE };
+		signal	{ FLAGS = INTERPOSE };
 };
--- a/usr/src/cmd/devfsadm/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/devfsadm/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -35,30 +34,31 @@
 #
 # MAPFILE HEADER END
 #
+$mapfile_version 2
 
 # External interface requirements
-{
+SYMBOL_SCOPE {
 	global:
-		devfsadm_devlink_cache =	EXTERN;
-		devfsadm_enumerate_char_start =	EXTERN;
-		devfsadm_enumerate_int =	EXTERN;
-		devfsadm_errprint =		EXTERN;
-		devfsadm_free_dev_names =	EXTERN;
-		devfsadm_have_reserved =	EXTERN;
-		devfsadm_is_reserved =		EXTERN;
-		devfsadm_link_valid =		EXTERN;
-		devfsadm_lookup_dev_names =	EXTERN;
-		devfsadm_mklink =		EXTERN;
-		devfsadm_noupdate =		EXTERN;
-		devfsadm_print =		EXTERN;
-		devfsadm_read_link =		EXTERN;
-		devfsadm_reserve_id_cache =	EXTERN;
-		devfsadm_rm_all =		EXTERN;
-		devfsadm_rm_link =		EXTERN;
-		devfsadm_rm_stale_links =	EXTERN;
-		devfsadm_root_path =		EXTERN;
-		devfsadm_secondary_link =	EXTERN;
-		disk_enumerate_int =		EXTERN;
-		s_strdup =			EXTERN;
-		system_labeled =		EXTERN;
+		devfsadm_devlink_cache		{ FLAGS = EXTERN };
+		devfsadm_enumerate_char_start	{ FLAGS = EXTERN };
+		devfsadm_enumerate_int		{ FLAGS = EXTERN };
+		devfsadm_errprint		{ FLAGS = EXTERN };
+		devfsadm_free_dev_names		{ FLAGS = EXTERN };
+		devfsadm_have_reserved		{ FLAGS = EXTERN };
+		devfsadm_is_reserved		{ FLAGS = EXTERN };
+		devfsadm_link_valid		{ FLAGS = EXTERN };
+		devfsadm_lookup_dev_names	{ FLAGS = EXTERN };
+		devfsadm_mklink			{ FLAGS = EXTERN };
+		devfsadm_noupdate		{ FLAGS = EXTERN };
+		devfsadm_print			{ FLAGS = EXTERN };
+		devfsadm_read_link		{ FLAGS = EXTERN };
+		devfsadm_reserve_id_cache	{ FLAGS = EXTERN };
+		devfsadm_rm_all			{ FLAGS = EXTERN };
+		devfsadm_rm_link		{ FLAGS = EXTERN };
+		devfsadm_rm_stale_links		{ FLAGS = EXTERN };
+		devfsadm_root_path		{ FLAGS = EXTERN };
+		devfsadm_secondary_link		{ FLAGS = EXTERN };
+		disk_enumerate_int		{ FLAGS = EXTERN };
+		s_strdup			{ FLAGS = EXTERN };
+		system_labeled			{ FLAGS = EXTERN };
 };
--- a/usr/src/cmd/expr/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/expr/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,11 +37,13 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # expr provides its own versions of advance, compile, and step - define
 # these explicitly as interposers.
-{
+SYMBOL_SCOPE {
 	global:
-		advance = INTERPOSE;
-		compile = INTERPOSE;
-		step = INTERPOSE;
+		advance		{ FLAGS = INTERPOSE };
+		compile		{ FLAGS = INTERPOSE };
+		step		{ FLAGS = INTERPOSE };
 };
--- a/usr/src/cmd/fm/fmd/common/fmd_api.map	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/fm/fmd/common/fmd_api.map	Thu Jun 24 18:16:42 2010 -0600
@@ -18,114 +18,115 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-{
-	fmd_buf_create = FUNCTION extern;
-	fmd_buf_destroy = FUNCTION extern;
-	fmd_buf_read = FUNCTION extern;
-	fmd_buf_size = FUNCTION extern;
-	fmd_buf_write = FUNCTION extern;
+$mapfile_version 2
+
+SYMBOL_SCOPE {
+	fmd_buf_create			{ TYPE = function; FLAGS = extern };
+	fmd_buf_destroy			{ TYPE = function; FLAGS = extern };
+	fmd_buf_read			{ TYPE = function; FLAGS = extern };
+	fmd_buf_size			{ TYPE = function; FLAGS = extern };
+	fmd_buf_write			{ TYPE = function; FLAGS = extern };
 
-	fmd_case_add_ereport = FUNCTION extern;
-	fmd_case_add_serd = FUNCTION extern;
-	fmd_case_add_suspect = FUNCTION extern;
-	fmd_case_close = FUNCTION extern;
-	fmd_case_closed = FUNCTION extern;
-	fmd_case_getprincipal = FUNCTION extern;
-	fmd_case_getspecific = FUNCTION extern;
-	fmd_case_next = FUNCTION extern;
-	fmd_case_open = FUNCTION extern;
-	fmd_case_prev = FUNCTION extern;
-	fmd_case_reset = FUNCTION extern;
-	fmd_case_setprincipal = FUNCTION extern;
-	fmd_case_setspecific = FUNCTION extern;
-	fmd_case_solve = FUNCTION extern;
-	fmd_case_solved = FUNCTION extern;
-	fmd_case_uuclose = FUNCTION extern;
-	fmd_case_uuclosed = FUNCTION extern;
-	fmd_case_uuid = FUNCTION extern;
-	fmd_case_uulookup = FUNCTION extern;
-	fmd_case_uuresolved = FUNCTION extern;
+	fmd_case_add_ereport		{ TYPE = function; FLAGS = extern };
+	fmd_case_add_serd		{ TYPE = function; FLAGS = extern };
+	fmd_case_add_suspect		{ TYPE = function; FLAGS = extern };
+	fmd_case_close			{ TYPE = function; FLAGS = extern };
+	fmd_case_closed			{ TYPE = function; FLAGS = extern };
+	fmd_case_getprincipal		{ TYPE = function; FLAGS = extern };
+	fmd_case_getspecific		{ TYPE = function; FLAGS = extern };
+	fmd_case_next			{ TYPE = function; FLAGS = extern };
+	fmd_case_open			{ TYPE = function; FLAGS = extern };
+	fmd_case_prev			{ TYPE = function; FLAGS = extern };
+	fmd_case_reset			{ TYPE = function; FLAGS = extern };
+	fmd_case_setprincipal		{ TYPE = function; FLAGS = extern };
+	fmd_case_setspecific		{ TYPE = function; FLAGS = extern };
+	fmd_case_solve			{ TYPE = function; FLAGS = extern };
+	fmd_case_solved			{ TYPE = function; FLAGS = extern };
+	fmd_case_uuclose		{ TYPE = function; FLAGS = extern };
+	fmd_case_uuclosed		{ TYPE = function; FLAGS = extern };
+	fmd_case_uuid			{ TYPE = function; FLAGS = extern };
+	fmd_case_uulookup		{ TYPE = function; FLAGS = extern };
+	fmd_case_uuresolved		{ TYPE = function; FLAGS = extern };
 
-	fmd_event_local = FUNCTION extern;
-	fmd_event_ena_create = FUNCTION extern;
+	fmd_event_local			{ TYPE = function; FLAGS = extern };
+	fmd_event_ena_create		{ TYPE = function; FLAGS = extern };
 
-	fmd_hdl_abort = FUNCTION extern;
-	fmd_hdl_alloc = FUNCTION extern;
-	fmd_hdl_debug = FUNCTION extern;
-	fmd_hdl_error = FUNCTION extern;
-	fmd_hdl_free = FUNCTION extern;
-	fmd_hdl_getspecific = FUNCTION extern;
-	fmd_hdl_opendict = FUNCTION extern;
-	fmd_hdl_register = FUNCTION extern;
-	fmd_hdl_setspecific = FUNCTION extern;
-	fmd_hdl_strdup = FUNCTION extern;
-	fmd_hdl_strfree = FUNCTION extern;
-	fmd_hdl_subscribe = FUNCTION extern;
-	fmd_hdl_topo_hold = FUNCTION extern;
-	fmd_hdl_topo_rele = FUNCTION extern;
-	fmd_hdl_unregister = FUNCTION extern;
-	fmd_hdl_unsubscribe = FUNCTION extern;
-	fmd_hdl_vabort = FUNCTION extern;
-	fmd_hdl_vdebug = FUNCTION extern;
-	fmd_hdl_verror = FUNCTION extern;
-	fmd_hdl_zalloc = FUNCTION extern;
+	fmd_hdl_abort			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_alloc			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_debug			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_error			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_free			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_getspecific		{ TYPE = function; FLAGS = extern };
+	fmd_hdl_opendict		{ TYPE = function; FLAGS = extern };
+	fmd_hdl_register		{ TYPE = function; FLAGS = extern };
+	fmd_hdl_setspecific		{ TYPE = function; FLAGS = extern };
+	fmd_hdl_strdup			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_strfree			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_subscribe		{ TYPE = function; FLAGS = extern };
+	fmd_hdl_topo_hold		{ TYPE = function; FLAGS = extern };
+	fmd_hdl_topo_rele		{ TYPE = function; FLAGS = extern };
+	fmd_hdl_unregister		{ TYPE = function; FLAGS = extern };
+	fmd_hdl_unsubscribe		{ TYPE = function; FLAGS = extern };
+	fmd_hdl_vabort			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_vdebug			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_verror			{ TYPE = function; FLAGS = extern };
+	fmd_hdl_zalloc			{ TYPE = function; FLAGS = extern };
 
-	fmd_nvl_alloc = FUNCTION extern;
-	fmd_nvl_class_match = FUNCTION extern;
-	fmd_nvl_create_fault = FUNCTION extern;
-	fmd_nvl_dup = FUNCTION extern;
-	fmd_nvl_fmri_expand = FUNCTION extern;
-	fmd_nvl_fmri_present = FUNCTION extern;
-	fmd_nvl_fmri_replaced = FUNCTION extern;
-	fmd_nvl_fmri_unusable = FUNCTION extern;
-	fmd_nvl_fmri_retire = FUNCTION extern;
-	fmd_nvl_fmri_unretire = FUNCTION extern;
-	fmd_nvl_fmri_service_state = FUNCTION extern;
-	fmd_nvl_fmri_has_fault = FUNCTION extern;
-	fmd_nvl_fmri_contains = FUNCTION extern;
-	fmd_nvl_fmri_translate = FUNCTION extern;
+	fmd_nvl_alloc			{ TYPE = function; FLAGS = extern };
+	fmd_nvl_class_match		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_create_fault		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_dup			{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_expand		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_present		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_replaced		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_unusable		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_retire		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_unretire		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_service_state	{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_has_fault		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_contains		{ TYPE = function; FLAGS = extern };
+	fmd_nvl_fmri_translate		{ TYPE = function; FLAGS = extern };
 
-	fmd_prop_free_string = FUNCTION extern;
-	fmd_prop_get_int32 = FUNCTION extern;
-	fmd_prop_get_int64 = FUNCTION extern;
-	fmd_prop_get_string = FUNCTION extern;
+	fmd_prop_free_string		{ TYPE = function; FLAGS = extern };
+	fmd_prop_get_int32		{ TYPE = function; FLAGS = extern };
+	fmd_prop_get_int64		{ TYPE = function; FLAGS = extern };
+	fmd_prop_get_string		{ TYPE = function; FLAGS = extern };
 
-	fmd_repair_fru = FUNCTION extern;
-	fmd_repair_asru = FUNCTION extern;
+	fmd_repair_fru			{ TYPE = function; FLAGS = extern };
+	fmd_repair_asru			{ TYPE = function; FLAGS = extern };
 
-	fmd_serd_create = FUNCTION extern;
-	fmd_serd_destroy = FUNCTION extern;
-	fmd_serd_exists = FUNCTION extern;
-	fmd_serd_fired = FUNCTION extern;
-	fmd_serd_reset = FUNCTION extern;
-	fmd_serd_record = FUNCTION extern;
-	fmd_serd_empty = FUNCTION extern;
+	fmd_serd_create			{ TYPE = function; FLAGS = extern };
+	fmd_serd_destroy		{ TYPE = function; FLAGS = extern };
+	fmd_serd_exists			{ TYPE = function; FLAGS = extern };
+	fmd_serd_fired			{ TYPE = function; FLAGS = extern };
+	fmd_serd_reset			{ TYPE = function; FLAGS = extern };
+	fmd_serd_record			{ TYPE = function; FLAGS = extern };
+	fmd_serd_empty			{ TYPE = function; FLAGS = extern };
 
-	fmd_stat_create = FUNCTION extern;
-	fmd_stat_destroy = FUNCTION extern;
-	fmd_stat_setstr = FUNCTION extern;
+	fmd_stat_create			{ TYPE = function; FLAGS = extern };
+	fmd_stat_destroy		{ TYPE = function; FLAGS = extern };
+	fmd_stat_setstr			{ TYPE = function; FLAGS = extern };
 
-	fmd_thr_create = FUNCTION extern;
-	fmd_thr_destroy = FUNCTION extern;
-	fmd_thr_signal = FUNCTION extern;
-	fmd_thr_checkpoint = FUNCTION extern;
+	fmd_thr_create			{ TYPE = function; FLAGS = extern };
+	fmd_thr_destroy			{ TYPE = function; FLAGS = extern };
+	fmd_thr_signal			{ TYPE = function; FLAGS = extern };
+	fmd_thr_checkpoint		{ TYPE = function; FLAGS = extern };
 
-	fmd_timer_install = FUNCTION extern;
-	fmd_timer_remove = FUNCTION extern;
+	fmd_timer_install		{ TYPE = function; FLAGS = extern };
+	fmd_timer_remove		{ TYPE = function; FLAGS = extern };
 
-	fmd_xprt_close = FUNCTION extern;
-	fmd_xprt_error = FUNCTION extern;
-	fmd_xprt_getspecific = FUNCTION extern;
-	fmd_xprt_log = FUNCTION extern;
-	fmd_xprt_open = FUNCTION extern;
-	fmd_xprt_post = FUNCTION extern;
-	fmd_xprt_resume = FUNCTION extern;
-	fmd_xprt_setspecific = FUNCTION extern;
-	fmd_xprt_suspend = FUNCTION extern;
-	fmd_xprt_translate = FUNCTION extern;
-	fmd_xprt_add_domain = FUNCTION extern;
+	fmd_xprt_close			{ TYPE = function; FLAGS = extern };
+	fmd_xprt_error			{ TYPE = function; FLAGS = extern };
+	fmd_xprt_getspecific		{ TYPE = function; FLAGS = extern };
+	fmd_xprt_log			{ TYPE = function; FLAGS = extern };
+	fmd_xprt_open			{ TYPE = function; FLAGS = extern };
+	fmd_xprt_post			{ TYPE = function; FLAGS = extern };
+	fmd_xprt_resume			{ TYPE = function; FLAGS = extern };
+	fmd_xprt_setspecific		{ TYPE = function; FLAGS = extern };
+	fmd_xprt_suspend		{ TYPE = function; FLAGS = extern };
+	fmd_xprt_translate		{ TYPE = function; FLAGS = extern };
+	fmd_xprt_add_domain		{ TYPE = function; FLAGS = extern };
 };
--- a/usr/src/cmd/fm/fmd/common/fmd_fmri.map	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/fm/fmd/common/fmd_fmri.map	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -21,21 +20,22 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+$mapfile_version 2
 
-{
-	fmd_fmri_alloc = FUNCTION extern;
-	fmd_fmri_zalloc = FUNCTION extern;
-	fmd_fmri_free = FUNCTION extern;
-	fmd_fmri_set_errno = FUNCTION extern;
-	fmd_fmri_warn = FUNCTION extern;
-	fmd_fmri_auth2str = FUNCTION extern;
-	fmd_fmri_strescape = FUNCTION extern;
-	fmd_fmri_strdup = FUNCTION extern;
-	fmd_fmri_strfree = FUNCTION extern;
-	fmd_fmri_get_rootdir = FUNCTION extern;
-	fmd_fmri_get_platform = FUNCTION extern;
-	fmd_fmri_get_drgen = FUNCTION extern;
-	fmd_fmri_topo_hold = FUNCTION extern;
-	fmd_fmri_topo_rele = FUNCTION extern;
+SYMBOL_SCOPE {
+	fmd_fmri_alloc		{ TYPE = function; FLAGS = extern };
+	fmd_fmri_zalloc		{ TYPE = function; FLAGS = extern };
+	fmd_fmri_free		{ TYPE = function; FLAGS = extern };
+	fmd_fmri_set_errno	{ TYPE = function; FLAGS = extern };
+	fmd_fmri_warn		{ TYPE = function; FLAGS = extern };
+	fmd_fmri_auth2str	{ TYPE = function; FLAGS = extern };
+	fmd_fmri_strescape	{ TYPE = function; FLAGS = extern };
+	fmd_fmri_strdup		{ TYPE = function; FLAGS = extern };
+	fmd_fmri_strfree	{ TYPE = function; FLAGS = extern };
+	fmd_fmri_get_rootdir	{ TYPE = function; FLAGS = extern };
+	fmd_fmri_get_platform	{ TYPE = function; FLAGS = extern };
+	fmd_fmri_get_drgen	{ TYPE = function; FLAGS = extern };
+	fmd_fmri_topo_hold	{ TYPE = function; FLAGS = extern };
+	fmd_fmri_topo_rele	{ TYPE = function; FLAGS = extern };
 };
--- a/usr/src/cmd/fmli/xx/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/fmli/xx/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # fmli interposes on exit() so identify this as an interposer.
-{
+SYMBOL_SCOPE {
 	global:
-		exit = INTERPOSE;
+		exit	{ FLAGS = INTERPOSE };
 };
--- a/usr/src/cmd/fs.d/udfs/fsdb/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/fs.d/udfs/fsdb/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,10 +37,12 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # fsdb uses the -e option of lex, which generates additional lex interfaces
 # that are not defined in the generic $(MAPFILE.LEX).  These additional lex
 # interfaces are exported here.
-{
+SYMBOL_SCOPE {
 	global:
 		yywinput;
 		yywleng;
--- a/usr/src/cmd/fwflash/plugins/transport/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/fwflash/plugins/transport/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,15 +36,17 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate { 
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate { 
     global:
-	fw_devices = PARENT;
-	fw_pluginlist = PARENT;
-	fwflash_debug = PARENT;
-	rootnode = PARENT;
-	self = PARENT;
-	verifier = PARENT;
-	logmsg = PARENT;
+	fw_devices		{ FLAGS = PARENT };
+	fw_pluginlist		{ FLAGS = PARENT };
+	fwflash_debug		{ FLAGS = PARENT };
+	rootnode		{ FLAGS = PARENT };
+	self			{ FLAGS = PARENT };
+	verifier		{ FLAGS = PARENT };
+	logmsg			{ FLAGS = PARENT };
 	drivername;
 	fw_devinfo;
 	fw_identify;
--- a/usr/src/cmd/fwflash/plugins/transport/common/mapfile-vers-hermon	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/fwflash/plugins/transport/common/mapfile-vers-hermon	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate { 
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate { 
     global:
 	cnx_crc16;
 	cnx_is_magic_pattern_present;
--- a/usr/src/cmd/fwflash/plugins/transport/common/mapfile-vers-plus	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/fwflash/plugins/transport/common/mapfile-vers-plus	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate { 
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate { 
     global:
 	fw_cleanup;
 };
--- a/usr/src/cmd/fwflash/plugins/vendor/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/fwflash/plugins/vendor/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,15 +36,17 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate { 
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate { 
     global:
-	fw_devices = PARENT;
-	fw_pluginlist = PARENT;
-	fwflash_debug = PARENT;
-	rootnode = PARENT;
-	self = PARENT;
-	verifier = PARENT;
-	logmsg = PARENT;
+	fw_devices		{ FLAGS = PARENT };
+	fw_pluginlist		{ FLAGS = PARENT };
+	fwflash_debug		{ FLAGS = PARENT };
+	rootnode		{ FLAGS = PARENT };
+	self			{ FLAGS = PARENT };
+	verifier		{ FLAGS = PARENT };
+	logmsg			{ FLAGS = PARENT };
 	vendorvrfy;
 	vendor;
     local:
--- a/usr/src/cmd/geniconvtbl/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/geniconvtbl/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,5 +1,4 @@
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -35,8 +34,9 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
 
-{
+SYMBOL_SCOPE {
 	global:
 		_icv_open;
 		_icv_close;
--- a/usr/src/cmd/gss/gssd/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/gss/gssd/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # gssd exports app_krb5_user_uid() - required by mech_krb5.
-{
+SYMBOL_SCOPE {
 	global:
 		app_krb5_user_uid;
 };
--- a/usr/src/cmd/idmap/idmapd/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/idmap/idmapd/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # idmapd exports app_krb5_user_uid() - required by mech_krb5.
-{
+SYMBOL_SCOPE {
 	global:
 		app_krb5_user_uid;
 };
--- a/usr/src/cmd/infocmp/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/infocmp/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,8 +37,11 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # infocmp interposes on progname[], so identify this as an interposer.
-{
+
+SYMBOL_SCOPE {
 	global:
-		progname = INTERPOSE;
+		progname	{ FLAGS = INTERPOSE };
 };
--- a/usr/src/cmd/krb5/kadmin/gui/native/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/krb5/kadmin/gui/native/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		Java_Kadmin_sessionInit;
 		Java_Kadmin_sessionExit;
--- a/usr/src/cmd/krb5/kwarn/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/krb5/kwarn/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # ktkt_warnd exports app_krb5_user_uid() - required by mech_krb5.
-{
+SYMBOL_SCOPE {
 	global:
 		app_krb5_user_uid;
 };
--- a/usr/src/cmd/lp/lib/papi/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/lp/lib/papi/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Generic interface definition for usr/src/cmd/lp/lib/papi
 #
@@ -38,34 +37,108 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.0 {
     global:
         # PAPI Attribute Calls
         papiAttributeListAdd;
-        papiAttributeListAddValue = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListAddBoolean = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListAddCollection = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListAddDatetime = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListAddInteger = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListAddMetadata = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListAddRange = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListAddResolution = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListAddString = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListDelete = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetValue = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetNext = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListFind = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetBoolean = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetCollection = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetDatetime = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetInteger = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetMetadata = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetRange = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetResolution = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListGetString = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListFromString = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListToString = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListFree = FUNCTION FILTER libpapi-common.so ;
+        papiAttributeListAddValue {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListAddBoolean {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListAddCollection {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListAddDatetime {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListAddInteger {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListAddMetadata {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListAddRange {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListAddResolution {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListAddString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListDelete {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetValue {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetNext {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListFind {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetBoolean {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetCollection {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetDatetime {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetInteger {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetMetadata {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetRange {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetResolution {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListGetString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListFromString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListToString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListFree {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
 
         # PAPI Service Calls
         papiServiceCreate;
@@ -112,22 +185,31 @@
         papiJobCancel;
         papiJobHold;
         papiJobRelease;
-        papiJobRestart = FUNCTION FILTER libpapi-common.so ;
+        papiJobRestart {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
         papiJobPromote;
         papiJobGetAttributeList;
         papiJobGetPrinterName;
         papiJobGetId;
-        papiJobGetJobTicket = FUNCTION FILTER libpapi-common.so ;
+        papiJobGetJobTicket {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
         papiJobFree;
         papiJobListFree;
 
         # Misc. PAPI Calls
-        papiStatusString = FUNCTION FILTER libpapi-common.so ;
+        papiStatusString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
         papiLibrarySupportedCall;
         papiLibrarySupportedCalls;
 };
 
-SUNWprivate_1.0 {
+SYMBOL_VERSION SUNWprivate_1.0 {
     global:
 	papiServiceSetPeer;	# used by to pass peer connection
         papiJobCreate;
@@ -136,22 +218,55 @@
 
         # Misc. supporting calls
         #     URI
-        uri_from_string = FUNCTION FILTER libpapi-common.so ;
-        uri_to_string = FUNCTION FILTER libpapi-common.so ;
-        uri_free = FUNCTION FILTER libpapi-common.so ;
+        uri_from_string {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        uri_to_string {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        uri_free {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
         #    list
-        list_remove = FUNCTION FILTER libpapi-common.so ;
-        list_append = FUNCTION FILTER libpapi-common.so ;
-        list_concatenate = FUNCTION FILTER libpapi-common.so ;
+        list_remove {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        list_append {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        list_concatenate {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
 
 	#	NS
-        getprinterbyname = FUNCTION FILTER libpapi-common.so ;
-	is_localhost = FUNCTION FILTER libpapi-common.so ;
+        getprinterbyname {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+	is_localhost {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
 
         #    extra Attribute Calls
-        copy_attributes = FUNCTION FILTER libpapi-common.so ;
-        split_and_copy_attributes = FUNCTION FILTER libpapi-common.so ;
-        papiAttributeListPrint = FUNCTION FILTER libpapi-common.so ;
+        copy_attributes {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        split_and_copy_attributes {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
+        papiAttributeListPrint {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	};
 
     local:
         *;
--- a/usr/src/cmd/mdb/common/kmdb/mapfile_skel	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/mdb/common/kmdb/mapfile_skel	Thu Jun 24 18:16:42 2010 -0600
@@ -20,12 +20,9 @@
  */
 /* BEGIN PROLOGUE */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This file is used to limit the symbols that are to be exported from the
  * debugger.  This ensures that dmods follow the module API.
@@ -36,7 +33,9 @@
  * entries for __ctype and errno below.
  */
 
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
 
 /* END PROLOGUE */
--- a/usr/src/cmd/mdb/common/libstandctf/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/mdb/common/libstandctf/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
 		ctf_add_array;
 		ctf_add_member;
--- a/usr/src/cmd/mdb/common/modules/conf/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/mdb/common/modules/conf/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,13 +35,15 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Module mapfile
 #
 # Modules aren't allowed to export any symbols
 #
 
-{
+SYMBOL_SCOPE {
 	local:
 		*;
 };
--- a/usr/src/cmd/mdb/common/modules/conf/mapfile-extern	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/mdb/common/modules/conf/mapfile-extern	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,127 +35,129 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # External interface requirements
-{
+SYMBOL_SCOPE {
 	global:
-#		Plwp_iter =			EXTERN;
-#		Pmapping_iter =			EXTERN;
+#		Plwp_iter			{ FLAGS = EXTERN };
+#		Pmapping_iter			{ FLAGS = EXTERN };
 
-		_mdb_ks_ncpu =			EXTERN;
-		_mdb_ks_pageshift =		EXTERN;
-		_mdb_ks_pagesize =		EXTERN;
+		_mdb_ks_ncpu			{ FLAGS = EXTERN };
+		_mdb_ks_pageshift		{ FLAGS = EXTERN };
+		_mdb_ks_pagesize		{ FLAGS = EXTERN };
 
-		mdb =				EXTERN;
-		mdb_add_walker =		EXTERN;
-		mdb_alloc =			EXTERN;
-		mdb_call_dcmd =			EXTERN;
-		mdb_callback_add =		EXTERN;
-		mdb_callback_remove =		EXTERN;
-		mdb_cpuset_find =		EXTERN;
-		mdb_ctf_array_info =		EXTERN;
-		mdb_ctf_enum_name =		EXTERN;
-		mdb_ctf_lookup_by_addr =	EXTERN;
-		mdb_ctf_lookup_by_name =	EXTERN;
-		mdb_ctf_member_iter =		EXTERN;
-		mdb_ctf_offsetof =		EXTERN;
-		mdb_ctf_type_cmp =		EXTERN;
-		mdb_ctf_type_invalidate =	EXTERN;
-		mdb_ctf_type_kind =		EXTERN;
-		mdb_ctf_type_name =		EXTERN;
-		mdb_ctf_type_reference =	EXTERN;
-		mdb_ctf_type_resolve =		EXTERN;
-		mdb_ctf_type_size =		EXTERN;
-		mdb_ctf_type_valid =		EXTERN;
-		mdb_ctf_vread =			EXTERN;
-		mdb_ddi_pathname =		EXTERN;
-		mdb_dec_indent =		EXTERN;
-		mdb_devinfo2driver =		EXTERN;
-		mdb_devinfo2statep =		EXTERN;
-		mdb_dlpi_prim =			EXTERN;
-		mdb_dump64 =			EXTERN;
-		mdb_dumpptr =			EXTERN;
-		mdb_eval =			EXTERN;
-		mdb_fdio_create_path =		EXTERN;
-		mdb_fdio_fileno =		EXTERN;
-		mdb_ffs =			EXTERN;
-		mdb_flush =			EXTERN;
-		mdb_fread =			EXTERN;
-		mdb_free =			EXTERN;
-		mdb_fwrite =			EXTERN;
-		mdb_gelf_create =		EXTERN;
-		mdb_gelf_destroy =		EXTERN;
-		mdb_gelf_sect_by_name =		EXTERN;
-		mdb_gelf_sect_load =		EXTERN;
-		mdb_get_dot =			EXTERN;
-		mdb_get_lbolt =			EXTERN;
-		mdb_get_pipe =			EXTERN;
-		mdb_get_soft_state_byaddr =	EXTERN;
-		mdb_get_state =			EXTERN;
-		mdb_get_xdata =			EXTERN;
-		mdb_gethrtime =			EXTERN;
-		mdb_getopts =			EXTERN;
-		mdb_inc_indent =		EXTERN;
-		mdb_inval_bits =		EXTERN;
-		mdb_io_destroy =		EXTERN;
-		mdb_iob_clrflags =		EXTERN;
-		mdb_iob_getflags =		EXTERN;
-		mdb_iob_resize =		EXTERN;
-		mdb_iob_setflags =		EXTERN;
-		mdb_layered_walk =		EXTERN;
-		mdb_lookup_by_addr =		EXTERN;
-		mdb_lookup_by_name =		EXTERN;
-		mdb_lookup_by_obj =		EXTERN;
-		mdb_mac_addr =			EXTERN;
-		mdb_major_to_name =		EXTERN;
-		mdb_mblk_count =		EXTERN;
-		mdb_memio_create =		EXTERN;
-		mdb_name_to_major =		EXTERN;
-		mdb_nhconvert =			EXTERN;
-		mdb_one_bit =			EXTERN;
-		mdb_page2pfn =			EXTERN;
-		mdb_page_lookup =		EXTERN;
-		mdb_pfn2page =			EXTERN;
-		mdb_pid2proc =			EXTERN;
-		mdb_pread =			EXTERN;
-		mdb_printf =			EXTERN;
-		mdb_prop_kernel =		EXTERN;
-		mdb_prop_postmortem =		EXTERN;
-		mdb_pwalk =			EXTERN;
-		mdb_pwalk_dcmd =		EXTERN;
-		mdb_pwrite =			EXTERN;
-		mdb_qinfo = 			EXTERN;
-		mdb_qname =			EXTERN;
-		mdb_qops_install =		EXTERN;
-		mdb_qops_remove =		EXTERN;
-		mdb_qrnext_default =		EXTERN;
-		mdb_qwnext =			EXTERN;
-		mdb_qwnext_default =		EXTERN;
-		mdb_read_refstr =		EXTERN;
-		mdb_readstr =			EXTERN;
-		mdb_readsym =			EXTERN;
-		mdb_readvar =			EXTERN;
-		mdb_remove_walker =		EXTERN;
-		mdb_set_dot =			EXTERN;
-		mdb_set_pipe =			EXTERN;
-		mdb_snprintf =			EXTERN;
-		mdb_strtoull =			EXTERN;
-		mdb_tgt_notsup =		EXTERN;
-		mdb_vnode2path =		EXTERN;
-		mdb_vread =			EXTERN;
-		mdb_vtype2chr =			EXTERN;
-		mdb_vwrite =			EXTERN;
-		mdb_walk =			EXTERN;
-		mdb_walk_dcmd =			EXTERN;
-		mdb_warn =			EXTERN;
-		mdb_whatis_done =		EXTERN;
-		mdb_whatis_flags =		EXTERN;
-		mdb_whatis_match =		EXTERN;
-		mdb_whatis_overlaps =		EXTERN;
-		mdb_whatis_register =		EXTERN;
-		mdb_whatis_report_address =	EXTERN;
-		mdb_whatis_report_object =	EXTERN;
-		mdb_writestr =			EXTERN;
-		mdb_writesym =			EXTERN;
-		mdb_writevar =			EXTERN;
-		mdb_zalloc =			EXTERN;
+		mdb				{ FLAGS = EXTERN };
+		mdb_add_walker			{ FLAGS = EXTERN };
+		mdb_alloc			{ FLAGS = EXTERN };
+		mdb_call_dcmd			{ FLAGS = EXTERN };
+		mdb_callback_add		{ FLAGS = EXTERN };
+		mdb_callback_remove		{ FLAGS = EXTERN };
+		mdb_cpuset_find			{ FLAGS = EXTERN };
+		mdb_ctf_array_info		{ FLAGS = EXTERN };
+		mdb_ctf_enum_name		{ FLAGS = EXTERN };
+		mdb_ctf_lookup_by_addr		{ FLAGS = EXTERN };
+		mdb_ctf_lookup_by_name		{ FLAGS = EXTERN };
+		mdb_ctf_member_iter		{ FLAGS = EXTERN };
+		mdb_ctf_offsetof		{ FLAGS = EXTERN };
+		mdb_ctf_type_cmp		{ FLAGS = EXTERN };
+		mdb_ctf_type_invalidate		{ FLAGS = EXTERN };
+		mdb_ctf_type_kind		{ FLAGS = EXTERN };
+		mdb_ctf_type_name		{ FLAGS = EXTERN };
+		mdb_ctf_type_reference		{ FLAGS = EXTERN };
+		mdb_ctf_type_resolve		{ FLAGS = EXTERN };
+		mdb_ctf_type_size		{ FLAGS = EXTERN };
+		mdb_ctf_type_valid		{ FLAGS = EXTERN };
+		mdb_ctf_vread			{ FLAGS = EXTERN };
+		mdb_ddi_pathname		{ FLAGS = EXTERN };
+		mdb_dec_indent			{ FLAGS = EXTERN };
+		mdb_devinfo2driver		{ FLAGS = EXTERN };
+		mdb_devinfo2statep		{ FLAGS = EXTERN };
+		mdb_dlpi_prim			{ FLAGS = EXTERN };
+		mdb_dump64			{ FLAGS = EXTERN };
+		mdb_dumpptr			{ FLAGS = EXTERN };
+		mdb_eval			{ FLAGS = EXTERN };
+		mdb_fdio_create_path		{ FLAGS = EXTERN };
+		mdb_fdio_fileno			{ FLAGS = EXTERN };
+		mdb_ffs				{ FLAGS = EXTERN };
+		mdb_flush			{ FLAGS = EXTERN };
+		mdb_fread			{ FLAGS = EXTERN };
+		mdb_free			{ FLAGS = EXTERN };
+		mdb_fwrite			{ FLAGS = EXTERN };
+		mdb_gelf_create			{ FLAGS = EXTERN };
+		mdb_gelf_destroy		{ FLAGS = EXTERN };
+		mdb_gelf_sect_by_name		{ FLAGS = EXTERN };
+		mdb_gelf_sect_load		{ FLAGS = EXTERN };
+		mdb_get_dot			{ FLAGS = EXTERN };
+		mdb_get_lbolt			{ FLAGS = EXTERN };
+		mdb_get_pipe			{ FLAGS = EXTERN };
+		mdb_get_soft_state_byaddr	{ FLAGS = EXTERN };
+		mdb_get_state			{ FLAGS = EXTERN };
+		mdb_get_xdata			{ FLAGS = EXTERN };
+		mdb_gethrtime			{ FLAGS = EXTERN };
+		mdb_getopts			{ FLAGS = EXTERN };
+		mdb_inc_indent			{ FLAGS = EXTERN };
+		mdb_inval_bits			{ FLAGS = EXTERN };
+		mdb_io_destroy			{ FLAGS = EXTERN };
+		mdb_iob_clrflags		{ FLAGS = EXTERN };
+		mdb_iob_getflags		{ FLAGS = EXTERN };
+		mdb_iob_resize			{ FLAGS = EXTERN };
+		mdb_iob_setflags		{ FLAGS = EXTERN };
+		mdb_layered_walk		{ FLAGS = EXTERN };
+		mdb_lookup_by_addr		{ FLAGS = EXTERN };
+		mdb_lookup_by_name		{ FLAGS = EXTERN };
+		mdb_lookup_by_obj		{ FLAGS = EXTERN };
+		mdb_mac_addr			{ FLAGS = EXTERN };
+		mdb_major_to_name		{ FLAGS = EXTERN };
+		mdb_mblk_count			{ FLAGS = EXTERN };
+		mdb_memio_create		{ FLAGS = EXTERN };
+		mdb_name_to_major		{ FLAGS = EXTERN };
+		mdb_nhconvert			{ FLAGS = EXTERN };
+		mdb_one_bit			{ FLAGS = EXTERN };
+		mdb_page2pfn			{ FLAGS = EXTERN };
+		mdb_page_lookup			{ FLAGS = EXTERN };
+		mdb_pfn2page			{ FLAGS = EXTERN };
+		mdb_pid2proc			{ FLAGS = EXTERN };
+		mdb_pread			{ FLAGS = EXTERN };
+		mdb_printf			{ FLAGS = EXTERN };
+		mdb_prop_kernel			{ FLAGS = EXTERN };
+		mdb_prop_postmortem		{ FLAGS = EXTERN };
+		mdb_pwalk			{ FLAGS = EXTERN };
+		mdb_pwalk_dcmd			{ FLAGS = EXTERN };
+		mdb_pwrite			{ FLAGS = EXTERN };
+		mdb_qinfo			{ FLAGS = EXTERN };
+		mdb_qname			{ FLAGS = EXTERN };
+		mdb_qops_install		{ FLAGS = EXTERN };
+		mdb_qops_remove			{ FLAGS = EXTERN };
+		mdb_qrnext_default		{ FLAGS = EXTERN };
+		mdb_qwnext			{ FLAGS = EXTERN };
+		mdb_qwnext_default		{ FLAGS = EXTERN };
+		mdb_read_refstr			{ FLAGS = EXTERN };
+		mdb_readstr			{ FLAGS = EXTERN };
+		mdb_readsym			{ FLAGS = EXTERN };
+		mdb_readvar			{ FLAGS = EXTERN };
+		mdb_remove_walker		{ FLAGS = EXTERN };
+		mdb_set_dot			{ FLAGS = EXTERN };
+		mdb_set_pipe			{ FLAGS = EXTERN };
+		mdb_snprintf			{ FLAGS = EXTERN };
+		mdb_strtoull			{ FLAGS = EXTERN };
+		mdb_tgt_notsup			{ FLAGS = EXTERN };
+		mdb_vnode2path			{ FLAGS = EXTERN };
+		mdb_vread			{ FLAGS = EXTERN };
+		mdb_vtype2chr			{ FLAGS = EXTERN };
+		mdb_vwrite			{ FLAGS = EXTERN };
+		mdb_walk			{ FLAGS = EXTERN };
+		mdb_walk_dcmd			{ FLAGS = EXTERN };
+		mdb_warn			{ FLAGS = EXTERN };
+		mdb_whatis_done			{ FLAGS = EXTERN };
+		mdb_whatis_flags		{ FLAGS = EXTERN };
+		mdb_whatis_match		{ FLAGS = EXTERN };
+		mdb_whatis_overlaps		{ FLAGS = EXTERN };
+		mdb_whatis_register		{ FLAGS = EXTERN };
+		mdb_whatis_report_address	{ FLAGS = EXTERN };
+		mdb_whatis_report_object	{ FLAGS = EXTERN };
+		mdb_writestr			{ FLAGS = EXTERN };
+		mdb_writesym			{ FLAGS = EXTERN };
+		mdb_writevar			{ FLAGS = EXTERN };
+		mdb_zalloc			{ FLAGS = EXTERN };
 };
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	picld_pluginutil_parse_config_file;
     local:
--- a/usr/src/cmd/pools/poold/libjkstat/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/pools/poold/libjkstat/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	Java_com_sun_solaris_service_kstat_KstatCtl_chainUpdate;
 	Java_com_sun_solaris_service_kstat_KstatCtl_close;
--- a/usr/src/cmd/pools/poold/libjlgrp/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/pools/poold/libjlgrp/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	Java_com_sun_solaris_service_locality_LocalityDomain_jl_1fini;
 	Java_com_sun_solaris_service_locality_LocalityDomain_jl_1init;
--- a/usr/src/cmd/pools/poold/libjpool/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/pools/poold/libjpool/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	Java_com_sun_solaris_service_pools_Element_walkProps;
 	Java_com_sun_solaris_service_pools_HRTime_timestamp;
--- a/usr/src/cmd/pools/poold/libjsyslog/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/pools/poold/libjsyslog/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	Java_com_sun_solaris_service_logging_SyslogHandler_closelog;
 	Java_com_sun_solaris_service_logging_SyslogHandler_openlog;
--- a/usr/src/cmd/rcm_daemon/common/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/rcm_daemon/common/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,9 +37,11 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # rcm_daemon interposes on rcm_log_message() - a stub implementation
 # existing in librcm.so.1.
-{
+SYMBOL_SCOPE {
 	global:
-		rcm_log_message = INTERPOSE;
+		rcm_log_message		{ FLAGS = INTERPOSE };
 };
--- a/usr/src/cmd/sendmail/src/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sendmail/src/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,11 +37,13 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # sendmail defines its own sleep() which pre-dates libc's sleep(), but is
 # essentially the same.  To maintain source compatibility, define only those
 # symbols that must remain global, and therefore remove the sleep name-space
 # clash.
-{
+SYMBOL_SCOPE {
 	global:
 		allow_severity;		# required by libwrap
 		deny_severity;		# required by libwrap
--- a/usr/src/cmd/sgs/elfedit/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/elfedit/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,14 +37,16 @@
 # MAPFILE HEADER END
 #
 
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
 		main;			# debuggers seem to like this.
 
 
 
 		# liblddbg dbg_print() function
-		dbg_print =		NODIRECT;
+		dbg_print		{ FLAGS = NODIRECT };
 
 
 
--- a/usr/src/cmd/sgs/elfedit/modules/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/elfedit/modules/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -46,7 +45,9 @@
 # The routines exported by elfedit for use by the modules
 # are also defined here, using the PARENT mapfile keyword.
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		# Standard init routines exported by every module
 		elfedit32_init;
@@ -54,158 +55,158 @@
 
 
 		# liblddbg dbg_print() function
-		dbg_print =			PARENT NODIRECT;
+		dbg_print			{ FLAGS = PARENT NODIRECT };
 
 
 		# Core API
-		elfedit_command_usage =		PARENT;
-		elfedit_cpl_match =		PARENT;
-		elfedit_cpl_ndx =		PARENT;
-		elfedit_elferr =		PARENT;
-		elfedit_flags =			PARENT;
-		elfedit_malloc =		PARENT;
-		elfedit_msg =			PARENT;
-		elfedit_outstyle =		PARENT;
-		elfedit_pager_init =		PARENT;
-		elfedit_printf =		PARENT;
-		elfedit_realloc =		PARENT;
-		elfedit_str_to_c_literal =	PARENT;
-		elfedit_write =			PARENT;
+		elfedit_command_usage		{ FLAGS = PARENT };
+		elfedit_cpl_match		{ FLAGS = PARENT };
+		elfedit_cpl_ndx			{ FLAGS = PARENT };
+		elfedit_elferr			{ FLAGS = PARENT };
+		elfedit_flags			{ FLAGS = PARENT };
+		elfedit_malloc			{ FLAGS = PARENT };
+		elfedit_msg			{ FLAGS = PARENT };
+		elfedit_outstyle		{ FLAGS = PARENT };
+		elfedit_pager_init		{ FLAGS = PARENT };
+		elfedit_printf			{ FLAGS = PARENT };
+		elfedit_realloc			{ FLAGS = PARENT };
+		elfedit_str_to_c_literal	{ FLAGS = PARENT };
+		elfedit_write			{ FLAGS = PARENT };
 
 
 
 		# ato[u]i routines
-		elfedit_const_to_atoui =	PARENT;
+		elfedit_const_to_atoui		{ FLAGS = PARENT };
 
-		elfedit_atoi =			PARENT;
-		elfedit_atoui =			PARENT;
-		elfedit_atoconst =		PARENT;
+		elfedit_atoi			{ FLAGS = PARENT };
+		elfedit_atoui			{ FLAGS = PARENT };
+		elfedit_atoconst		{ FLAGS = PARENT };
 
-		elfedit_atoi2 =			PARENT;
-		elfedit_atoui2 =		PARENT;
-		elfedit_atoconst2 =		PARENT;
+		elfedit_atoi2			{ FLAGS = PARENT };
+		elfedit_atoui2			{ FLAGS = PARENT };
+		elfedit_atoconst2		{ FLAGS = PARENT };
 
-		elfedit_atoi_range =		PARENT;
-		elfedit_atoui_range =		PARENT;
-		elfedit_atoconst_range =	PARENT;
+		elfedit_atoi_range		{ FLAGS = PARENT };
+		elfedit_atoui_range		{ FLAGS = PARENT };
+		elfedit_atoconst_range		{ FLAGS = PARENT };
 
-		elfedit_atoi_range2 =		PARENT;
-		elfedit_atoui_range2 =		PARENT;
-		elfedit_atoconst_range2 =	PARENT;
+		elfedit_atoi_range2		{ FLAGS = PARENT };
+		elfedit_atoui_range2		{ FLAGS = PARENT };
+		elfedit_atoconst_range2		{ FLAGS = PARENT };
 
-		elfedit_atoi_value_to_str =	PARENT;
-		elfedit_atoui_value_to_str =	PARENT;
-		elfedit_atoconst_value_to_str =	PARENT;
+		elfedit_atoi_value_to_str	{ FLAGS = PARENT };
+		elfedit_atoui_value_to_str	{ FLAGS = PARENT };
+		elfedit_atoconst_value_to_str	{ FLAGS = PARENT };
 
-		elfedit_cpl_atoi =		PARENT;
-		elfedit_cpl_atoui =		PARENT;
-		elfedit_cpl_atoconst =		PARENT;
+		elfedit_cpl_atoi		{ FLAGS = PARENT };
+		elfedit_cpl_atoui		{ FLAGS = PARENT };
+		elfedit_cpl_atoconst		{ FLAGS = PARENT };
 
 
 
 		# Convenience functions built on top of the ato[u]i routines
-		elfedit_atobool =		PARENT;
-		elfedit_atoshndx =		PARENT;
+		elfedit_atobool			{ FLAGS = PARENT };
+		elfedit_atoshndx		{ FLAGS = PARENT };
 
 
 
 		# Getopt
-		elfedit_getopt_init =		PARENT;
-		elfedit_getopt =		PARENT;
+		elfedit_getopt_init		{ FLAGS = PARENT };
+		elfedit_getopt			{ FLAGS = PARENT };
 
 
 
 		# Utilities
-		elfedit_array_elts_delete =	PARENT;
+		elfedit_array_elts_delete	{ FLAGS = PARENT };
 
-		elfedit_array_elts_move =	PARENT;
+		elfedit_array_elts_move		{ FLAGS = PARENT };
 
-		elfedit_bits_set =		PARENT;
+		elfedit_bits_set		{ FLAGS = PARENT };
 
-		elfedit32_dyn_elt_init =	PARENT;
-		elfedit64_dyn_elt_init =	PARENT;
+		elfedit32_dyn_elt_init		{ FLAGS = PARENT };
+		elfedit64_dyn_elt_init		{ FLAGS = PARENT };
 
-		elfedit32_dyn_elt_save =	PARENT;
-		elfedit64_dyn_elt_save =	PARENT;
+		elfedit32_dyn_elt_save		{ FLAGS = PARENT };
+		elfedit64_dyn_elt_save		{ FLAGS = PARENT };
 
-		elfedit32_dyn_offset_to_str =	PARENT;
-		elfedit64_dyn_offset_to_str =	PARENT;
+		elfedit32_dyn_offset_to_str	{ FLAGS = PARENT };
+		elfedit64_dyn_offset_to_str	{ FLAGS = PARENT };
 
-		elfedit32_dynstr_getpad =	PARENT;
-		elfedit64_dynstr_getpad =	PARENT;
+		elfedit32_dynstr_getpad		{ FLAGS = PARENT };
+		elfedit64_dynstr_getpad		{ FLAGS = PARENT };
 
-		elfedit32_dynstr_insert =	PARENT;
-		elfedit64_dynstr_insert =	PARENT;
+		elfedit32_dynstr_insert		{ FLAGS = PARENT };
+		elfedit64_dynstr_insert		{ FLAGS = PARENT };
 
-		elfedit32_modified_data =	PARENT;
-		elfedit64_modified_data =	PARENT;
+		elfedit32_modified_data		{ FLAGS = PARENT };
+		elfedit64_modified_data		{ FLAGS = PARENT };
 
-		elfedit32_modified_ehdr =	PARENT;
-		elfedit64_modified_ehdr =	PARENT;
+		elfedit32_modified_ehdr		{ FLAGS = PARENT };
+		elfedit64_modified_ehdr		{ FLAGS = PARENT };
 
-		elfedit32_modified_phdr =	PARENT;
-		elfedit64_modified_phdr =	PARENT;
+		elfedit32_modified_phdr		{ FLAGS = PARENT };
+		elfedit64_modified_phdr		{ FLAGS = PARENT };
 
-		elfedit32_modified_shdr =	PARENT;
-		elfedit64_modified_shdr =	PARENT;
+		elfedit32_modified_shdr		{ FLAGS = PARENT };
+		elfedit64_modified_shdr		{ FLAGS = PARENT };
 
-		elfedit32_name_to_shndx =	PARENT;
-		elfedit64_name_to_shndx =	PARENT;
+		elfedit32_name_to_shndx		{ FLAGS = PARENT };
+		elfedit64_name_to_shndx		{ FLAGS = PARENT };
 
-		elfedit32_name_to_symndx =	PARENT;
-		elfedit64_name_to_symndx =	PARENT;
+		elfedit32_name_to_symndx	{ FLAGS = PARENT };
+		elfedit64_name_to_symndx	{ FLAGS = PARENT };
 
-		elfedit32_offset_to_str =	PARENT;
-		elfedit64_offset_to_str =	PARENT;
+		elfedit32_offset_to_str		{ FLAGS = PARENT };
+		elfedit64_offset_to_str		{ FLAGS = PARENT };
 
-		elfedit32_sec_findstr =		PARENT;
-		elfedit64_sec_findstr =		PARENT;
+		elfedit32_sec_findstr		{ FLAGS = PARENT };
+		elfedit64_sec_findstr		{ FLAGS = PARENT };
 
-		elfedit32_sec_get =		PARENT;
-		elfedit64_sec_get =		PARENT;
+		elfedit32_sec_get		{ FLAGS = PARENT };
+		elfedit64_sec_get		{ FLAGS = PARENT };
 
-		elfedit32_sec_getcap =		PARENT;
-		elfedit64_sec_getcap =		PARENT;
+		elfedit32_sec_getcap		{ FLAGS = PARENT };
+		elfedit64_sec_getcap		{ FLAGS = PARENT };
 
-		elfedit32_sec_getdyn =		PARENT;
-		elfedit64_sec_getdyn =		PARENT;
+		elfedit32_sec_getdyn		{ FLAGS = PARENT };
+		elfedit64_sec_getdyn		{ FLAGS = PARENT };
 
-		elfedit32_sec_getstr =		PARENT;
-		elfedit64_sec_getstr =		PARENT;
+		elfedit32_sec_getstr		{ FLAGS = PARENT };
+		elfedit64_sec_getstr		{ FLAGS = PARENT };
 
-		elfedit32_sec_getsyminfo =	PARENT;
-		elfedit64_sec_getsyminfo =	PARENT;
+		elfedit32_sec_getsyminfo	{ FLAGS = PARENT };
+		elfedit64_sec_getsyminfo	{ FLAGS = PARENT };
 
-		elfedit32_sec_getsymtab =	PARENT;
-		elfedit64_sec_getsymtab =	PARENT;
+		elfedit32_sec_getsymtab		{ FLAGS = PARENT };
+		elfedit64_sec_getsymtab		{ FLAGS = PARENT };
 
-		elfedit32_sec_getversym =	PARENT;
-		elfedit64_sec_getversym =	PARENT;
+		elfedit32_sec_getversym		{ FLAGS = PARENT };
+		elfedit64_sec_getversym		{ FLAGS = PARENT };
 
-		elfedit32_sec_getxshndx =	PARENT;
-		elfedit64_sec_getxshndx =	PARENT;
+		elfedit32_sec_getxshndx		{ FLAGS = PARENT };
+		elfedit64_sec_getxshndx		{ FLAGS = PARENT };
 
-		elfedit32_sec_issymtab =	PARENT;
-		elfedit64_sec_issymtab =	PARENT;
+		elfedit32_sec_issymtab		{ FLAGS = PARENT };
+		elfedit64_sec_issymtab		{ FLAGS = PARENT };
 
-		elfedit32_shndx_to_name =	PARENT;
-		elfedit64_shndx_to_name =	PARENT;
+		elfedit32_shndx_to_name		{ FLAGS = PARENT };
+		elfedit64_shndx_to_name		{ FLAGS = PARENT };
 
-		elfedit32_sec_msgprefix =	PARENT;
-		elfedit64_sec_msgprefix =	PARENT;
+		elfedit32_sec_msgprefix		{ FLAGS = PARENT };
+		elfedit64_sec_msgprefix		{ FLAGS = PARENT };
 
-		elfedit32_strtab_insert =	PARENT;
-		elfedit64_strtab_insert =	PARENT;
+		elfedit32_strtab_insert		{ FLAGS = PARENT };
+		elfedit64_strtab_insert		{ FLAGS = PARENT };
 
-		elfedit32_strtab_insert_test =	PARENT;
-		elfedit64_strtab_insert_test =	PARENT;
+		elfedit32_strtab_insert_test	{ FLAGS = PARENT };
+		elfedit64_strtab_insert_test	{ FLAGS = PARENT };
 
-		elfedit32_test_osabi =		PARENT;
-		elfedit64_test_osabi =		PARENT;
+		elfedit32_test_osabi		{ FLAGS = PARENT };
+		elfedit64_test_osabi		{ FLAGS = PARENT };
 
-		elfedit32_type_to_shndx =	PARENT;
-		elfedit64_type_to_shndx =	PARENT;
+		elfedit32_type_to_shndx		{ FLAGS = PARENT };
+		elfedit64_type_to_shndx		{ FLAGS = PARENT };
 
-local:
+	local:
 		*;
 };
--- a/usr/src/cmd/sgs/ld/common/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/ld/common/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Export eprintf for dependencies.
 
@@ -38,7 +37,10 @@
 #
 # MAPFILE HEADER END
 #
-{
+
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
 		eprintf;
 };
--- a/usr/src/cmd/sgs/ldprof/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/ldprof/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY=	ldprof.a
@@ -37,7 +36,7 @@
 
 SGSPROTO=	../../proto/$(MACH)
 
-MAPFILES =	mapfile-vers
+MAPFILES =	../common/mapfile-vers
 
 DYNFLAGS +=	$(CC_USE_PROTO)
 CPPFLAGS=	-I. -I../common -I../../include \
--- a/usr/src/cmd/sgs/ldprof/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objclose;
-		la_objopen;
-		la_amd64_pltenter;
-	local:
-		*;
-};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/ldprof/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,73 @@
+#
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objclose;
+		la_objopen;
+
+		# There is a different pltenter function for every platform
+$if _sparc
+
+$if _ELF32
+		la_sparcv8_pltenter;
+$elif _ELF64
+		la_sparcv9_pltenter;
+$else
+$error unknown sparc ELFCLASS
+$endif
+
+$elif _x86
+
+$if _ELF32
+		la_i86_pltenter;
+$elif _ELF64
+		la_amd64_pltenter;
+$else
+$error unknown x86 ELFCLASS
+$endif
+
+$else
+$error unknown platform
+$endif
+
+	local:
+		*;
+};
--- a/usr/src/cmd/sgs/ldprof/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objclose;
-		la_objopen;
-		la_i86_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/ldprof/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objclose;
-		la_objopen;
-		la_sparcv8_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/ldprof/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objclose;
-		la_objopen;
-		la_sparcv9_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/lex/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/lex/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		allprint;
 		allprint_w;
--- a/usr/src/cmd/sgs/libcrle/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libcrle/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.3 {
 	global:
 		la_version;		# Audit interfaces
 		la_objopen;
--- a/usr/src/cmd/sgs/libdl/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libdl/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	libdl.a
@@ -29,4 +28,3 @@
 include		$(SRC)/lib/Makefile.rootfs
 
 LIBS +=		$(LINTLIB)
-MAPFILES +=	mapfile-vers
--- a/usr/src/cmd/sgs/libdl/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.6 {
-    global:
-	dl_iterate_phdr = FUNCTION;
-} SUNW_1.5;
-
-SUNW_1.5 {
-	global:
-	dlamd64getunwind = FUNCTION;
-} SUNW_1.4;
-
-SUNWprivate_1.1 {
-	global:
-	_dlamd64getunwind = FUNCTION;
-};
-
-SUNW_0.8 {
-    global:
-	dladdr = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	dlclose = FUNCTION;
-	dlerror = FUNCTION;
-	dlopen = FUNCTION;
-	dlsym = FUNCTION;
-};
--- a/usr/src/cmd/sgs/libdl/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libdl/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,40 +37,96 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.4 {
-    global:
-	dladdr1 = FUNCTION;
-    local:
-	*;
+$mapfile_version 2
+
+$if _x86 && _ELF64
+$add amd64
+$endif
+
+# Starting with SUNW_1.5 and dlamd64getunwind(), the amd64
+# platform is one version ahead of the other platforms.
+$if amd64
+SYMBOL_VERSION SUNW_1.6 {
+$else
+SYMBOL_VERSION SUNW_1.5 {
+$endif
+	global:
+		dl_iterate_phdr		{ TYPE = FUNCTION };
+$if amd64
+} SUNW_1.5;
+
+SYMBOL_VERSION SUNW_1.5 {
+	global:
+		dlamd64getunwind	{ TYPE = FUNCTION };
+$endif
+} SUNW_1.4;
+
+SYMBOL_VERSION SUNW_1.4 {
+	global:
+		dladdr1			{ TYPE = FUNCTION };
 } SUNW_1.3;
 
-SUNW_1.3 {
-    global:
-	SUNW_1.3;
+SYMBOL_VERSION SUNW_1.3 {
+	global:
+		SUNW_1.3;
 } SUNW_1.2;
 
-SUNW_1.2 {
-    global:
-	SUNW_1.2;
+SYMBOL_VERSION SUNW_1.2 {
+	global:
+		SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
-    global:
-	dldump = FUNCTION;
-	dlinfo = FUNCTION;
-	dlmopen = FUNCTION;
+SYMBOL_VERSION SUNW_1.1 {
+	global:
+		dldump			{ TYPE = FUNCTION };
+		dlinfo			{ TYPE = FUNCTION };
+		dlmopen			{ TYPE = FUNCTION };
 } SUNW_0.8;
 
-SUNWprivate_1.1 {
-    global:
-	_ld_libc = FUNCTION;
-	_dlinfo = FUNCTION;
-	_dldump = FUNCTION;
-	_dlmopen = FUNCTION;
-	_dlopen = FUNCTION;
-	_dlerror = FUNCTION;
-	_dlsym = FUNCTION;
-	_dlclose = FUNCTION;
-	_dladdr = FUNCTION;
-	_dladdr1 = FUNCTION;
+SYMBOL_VERSION SUNW_0.8 {
+	global:
+		dladdr			{ TYPE = FUNCTION };
+} SUNW_0.7;
+
+
+#
+# For most platforms, SUNW_0.7 contains dlclose, dlerror, dlopen, and dlsym.
+# For ABI reasons, 32-bit sparc puts them in SISCD_2.3 instead, and SUNW_0.7
+# exists solely so that SUNW_0.8 can inherit from it on all platforms.
+#
+SYMBOL_VERSION SUNW_0.7 {
+	global:
+$if _sparc && _ELF32
+		SUNW_0.7;
+} SISCD_2.3;
+
+SYMBOL_VERSION SISCD_2.3 {
+	global:
+$endif
+		dlclose			{ TYPE = FUNCTION };
+		dlerror			{ TYPE = FUNCTION };
+		dlopen			{ TYPE = FUNCTION };
+		dlsym			{ TYPE = FUNCTION };
 };
+
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+	global:
+		_ld_libc		{ TYPE = FUNCTION };
+		_dlinfo			{ TYPE = FUNCTION };
+		_dldump			{ TYPE = FUNCTION };
+		_dlmopen		{ TYPE = FUNCTION };
+		_dlopen			{ TYPE = FUNCTION };
+		_dlerror		{ TYPE = FUNCTION };
+		_dlsym			{ TYPE = FUNCTION };
+		_dlclose		{ TYPE = FUNCTION };
+		_dladdr			{ TYPE = FUNCTION };
+		_dladdr1		{ TYPE = FUNCTION };
+
+$if amd64
+		_dlamd64getunwind	{ TYPE = FUNCTION };
+$endif
+
+	local:
+		*;
+};
--- a/usr/src/cmd/sgs/libdl/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.5 {
-    global:
-	dl_iterate_phdr = FUNCTION;
-} SUNW_1.4;
-
-SUNW_0.8 {
-    global:
-	dladdr = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	dlclose = FUNCTION;
-	dlerror = FUNCTION;
-	dlopen = FUNCTION;
-	dlsym = FUNCTION;
-};
--- a/usr/src/cmd/sgs/libdl/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.5 {
-    global:
-	dl_iterate_phdr = FUNCTION;
-} SUNW_1.4;
-
-SUNW_0.8 {
-    global:
-	dladdr = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	SUNW_0.7;
-} SISCD_2.3;
-
-SISCD_2.3 {
-    global:
-	dlclose = FUNCTION;
-	dlerror = FUNCTION;
-	dlopen = FUNCTION;
-	dlsym = FUNCTION;
-};
--- a/usr/src/cmd/sgs/libdl/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.5 {
-    global:
-	dl_iterate_phdr = FUNCTION;
-} SUNW_1.4;
-
-SUNW_0.8 {
-    global:
-	dladdr = FUNCTION ;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	dlclose = FUNCTION ;
-	dlerror = FUNCTION ;
-	dlopen = FUNCTION ;
-	dlsym = FUNCTION ;
-};
--- a/usr/src/cmd/sgs/libelf/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libelf/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY=	libelf.a
@@ -61,7 +60,7 @@
 
 WARLOCKFILES=	$(OBJECTS:%.o=wlocks/%.ll)
 
-MAPFILES =	../common/mapfile-common
+MAPFILES =	../common/mapfile-vers
 
 CLOBBERFILES +=
 
--- a/usr/src/cmd/sgs/libelf/common/mapfile-32	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-	elf_demangle;
-};
--- a/usr/src/cmd/sgs/libelf/common/mapfile-common	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-#
-# 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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.7 {
-    global:
-	elf_getphdrnum;
-	elf_getshdrnum;
-	elf_getshdrstrndx;
-} SUNW_1.6;
-
-SUNW_1.6 {
-    global:
-	elf_getphnum;
-} SUNW_1.5;
-
-SUNW_1.5 {
-    global:
-	gelf_getcap;
-	gelf_update_cap;
-} SUNW_1.4;
-
-SUNW_1.4 {
-    global:
-	elf_getshnum;
-	elf_getshstrndx;
-	gelf_getsymshndx;
-	gelf_update_symshndx;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	elf32_checksum;
-	elf64_checksum;
-	gelf_checksum;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	elf64_fsize;
-	elf64_getehdr;
-	elf64_getphdr;
-	elf64_getshdr;
-	elf64_newehdr;
-	elf64_newphdr;
-	elf64_xlatetof;
-	elf64_xlatetom;
-	gelf_getclass;
-	gelf_fsize;
-	gelf_getehdr;
-	gelf_update_ehdr;
-	gelf_newehdr;
-	gelf_getphdr;
-	gelf_update_phdr;
-	gelf_newphdr;
-	gelf_getshdr;
-	gelf_update_shdr;
-	gelf_xlatetof;
-	gelf_xlatetom;
-	gelf_getsym;
-	gelf_update_sym;
-	gelf_getsyminfo;
-	gelf_getmove;
-	gelf_update_move;
-	gelf_update_syminfo;
-	gelf_getdyn;
-	gelf_update_dyn;
-	gelf_getrela;
-	gelf_update_rela;
-	gelf_getrel;
-	gelf_update_rel;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	SUNW_1.1;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	elf_begin;
-	elf_end;
-	elf_memory;
-	elf_next;
-	elf_rand;
-	elf_cntl;
-	elf_errmsg;
-	elf_errno;
-	elf_fill;
-	elf_flagdata;
-	elf_flagehdr;
-	elf_flagelf;
-	elf_flagphdr;
-	elf_flagscn;
-	elf_flagshdr;
-	elf_getarhdr;
-	elf_getarsym;
-	elf_getbase;
-	elf_getdata;
-	elf_newdata;
-	elf_rawdata;
-	elf_getident;
-	elf_getscn;
-	elf_ndxscn;
-	elf_newscn;
-	elf_nextscn;
-	elf_hash;
-	elf_kind;
-	elf_rawfile;
-	elf_strptr;
-	elf_update;
-	elf_version;
-	nlist;
-	elf32_fsize;
-	elf32_getphdr;
-	elf32_newphdr;
-	elf32_getshdr;
-	elf32_getehdr;
-	elf32_newehdr;
-	elf32_xlatetof;
-	elf32_xlatetom;
-    local:
-	*;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_elf_execfill;
-	_elf_getarhdrbase;
-	_elf_getnextoff;
-	_elf_getxoff;
-	_elf_outsync;
-	_elf_sys_encoding;
-	_elf_swap_wrimage;
-	_gelf_getdyndtflags_1;
-};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/libelf/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,176 @@
+#
+# 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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.7 {
+    global:
+	elf_getphdrnum;
+	elf_getshdrnum;
+	elf_getshdrstrndx;
+} SUNW_1.6;
+
+SYMBOL_VERSION SUNW_1.6 {
+    global:
+	elf_getphnum;
+} SUNW_1.5;
+
+SYMBOL_VERSION SUNW_1.5 {
+    global:
+	gelf_getcap;
+	gelf_update_cap;
+} SUNW_1.4;
+
+SYMBOL_VERSION SUNW_1.4 {
+    global:
+	elf_getshnum;
+	elf_getshstrndx;
+	gelf_getsymshndx;
+	gelf_update_symshndx;
+} SUNW_1.3;
+
+SYMBOL_VERSION SUNW_1.3 {
+    global:
+	elf32_checksum;
+	elf64_checksum;
+	gelf_checksum;
+} SUNW_1.2;
+
+SYMBOL_VERSION SUNW_1.2 {
+    global:
+	elf64_fsize;
+	elf64_getehdr;
+	elf64_getphdr;
+	elf64_getshdr;
+	elf64_newehdr;
+	elf64_newphdr;
+	elf64_xlatetof;
+	elf64_xlatetom;
+	gelf_getclass;
+	gelf_fsize;
+	gelf_getehdr;
+	gelf_update_ehdr;
+	gelf_newehdr;
+	gelf_getphdr;
+	gelf_update_phdr;
+	gelf_newphdr;
+	gelf_getshdr;
+	gelf_update_shdr;
+	gelf_xlatetof;
+	gelf_xlatetom;
+	gelf_getsym;
+	gelf_update_sym;
+	gelf_getsyminfo;
+	gelf_getmove;
+	gelf_update_move;
+	gelf_update_syminfo;
+	gelf_getdyn;
+	gelf_update_dyn;
+	gelf_getrela;
+	gelf_update_rela;
+	gelf_getrel;
+	gelf_update_rel;
+} SUNW_1.1;
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.7;
+
+SYMBOL_VERSION SUNW_0.7 {
+    global:
+	elf_begin;
+	elf_end;
+	elf_memory;
+	elf_next;
+	elf_rand;
+	elf_cntl;
+	elf_errmsg;
+	elf_errno;
+	elf_fill;
+	elf_flagdata;
+	elf_flagehdr;
+	elf_flagelf;
+	elf_flagphdr;
+	elf_flagscn;
+	elf_flagshdr;
+	elf_getarhdr;
+	elf_getarsym;
+	elf_getbase;
+	elf_getdata;
+	elf_newdata;
+	elf_rawdata;
+	elf_getident;
+	elf_getscn;
+	elf_ndxscn;
+	elf_newscn;
+	elf_nextscn;
+	elf_hash;
+	elf_kind;
+	elf_rawfile;
+	elf_strptr;
+	elf_update;
+	elf_version;
+	nlist;
+	elf32_fsize;
+	elf32_getphdr;
+	elf32_newphdr;
+	elf32_getshdr;
+	elf32_getehdr;
+	elf32_newehdr;
+	elf32_xlatetof;
+	elf32_xlatetom;
+    local:
+	*;
+};
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+    global:
+	_elf_execfill;
+	_elf_getarhdrbase;
+	_elf_getnextoff;
+	_elf_getxoff;
+	_elf_outsync;
+	_elf_sys_encoding;
+	_elf_swap_wrimage;
+	_gelf_getdyndtflags_1;
+
+$if _ELF32
+	elf_demangle;
+$endif
+};
--- a/usr/src/cmd/sgs/libelf/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libelf/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,15 +20,11 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 include		../Makefile.com
 
-MAPFILES +=	../common/mapfile-32
-
 SGSMSGTARG +=	$(SGSMSG32)
 
 .KEEP_STATE:
--- a/usr/src/cmd/sgs/libelf/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libelf/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,15 +20,11 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 include		../Makefile.com
 
-MAPFILES +=	../common/mapfile-32
-
 SGSMSGTARG +=	$(SGSMSG32)
 
 .KEEP_STATE:
--- a/usr/src/cmd/sgs/libld/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libld/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -39,9 +39,13 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_4.6 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_4.6 {
 	global:
-		dbg_print  = NODIRECT;	# interposed - ld(1) and ld.so.1(1)
+		dbg_print {	# interposed - ld(1) and ld.so.1(1)
+			FLAGS = NODIRECT;
+		};
 
 		ld_getopt;
 
@@ -77,7 +81,10 @@
 # The following functions must be provided by our caller, or one of the
 # callers dependencies.
 
-{
+SYMBOL_SCOPE {
 	global:
-		eprintf =	FUNCTION extern;
+		eprintf {
+			TYPE = FUNCTION;
+			FLAGS = extern;
+		};
 };
--- a/usr/src/cmd/sgs/liblddbg/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/liblddbg/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -40,10 +40,16 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_4.81 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_4.81 {
 	global:
-		dbg_desc = NODIRECT;	# interposed - ld.so.1(1)
-		dbg_print = NODIRECT;	# interposed - ld(1) and ld.so.1(1)
+		dbg_desc {	# interposed - ld.so.1(1)
+			FLAGS = NODIRECT;
+		};
+		dbg_print {	# interposed - ld(1) and ld.so.1(1)
+			FLAGS = NODIRECT;
+		};
 
 		Dbg_args_file;
 		Dbg_args_option;
@@ -524,7 +530,7 @@
 # this interface, and thus by separating in from the ever changing Dbg_*
 # interfaces we can provide a stable versioning environment for this utility.
 
-SUNWprivate_3.23 {
+SYMBOL_VERSION SUNWprivate_3.23 {
 	global:
 		Elf_syminfo_entry;
 		Elf_syminfo_title;
--- a/usr/src/cmd/sgs/libldmake/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libldmake/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		ld_file;
 		ld_atexit;
--- a/usr/src/cmd/sgs/libldstab/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libldstab/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -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,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 DUPOBJS=	stab64.o
@@ -38,8 +34,6 @@
 CONVLIBDIR=	$(CONVLIBDIR64)
 ELFLIBDIR=	$(ELFLIBDIR64)
 
-MAPFILES +=	../common/mapfile-64
-
 LINTFLAGS64 += $(VAR_LINTFLAGS64)
 
 all:		$(DYNLIB)
--- a/usr/src/cmd/sgs/libldstab/common/mapfile-64	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-# ELF64 interface definition for usr/src/cmd/sgs/libldstab/sparc
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		ld_version64;
-};
--- a/usr/src/cmd/sgs/libldstab/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libldstab/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -37,12 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		ld_version;
+		ld_version64;
 };
 
-{
+SYMBOL_SCOPE {
 	local:
 		*;
 };
--- a/usr/src/cmd/sgs/libldstab/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libldstab/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -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,18 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 DUPOBJS=    stab64.o
 
 include ../Makefile.com
 
-MAPFILES += ../common/mapfile-64
-
 .KEEP_STATE:
 
 all:		$(DYNLIB)
--- a/usr/src/cmd/sgs/libldstab/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libldstab/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -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,18 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 DUPOBJS=	stab64.o
 
 include ../Makefile.com
 
-MAPFILES += ../common/mapfile-64
-
 .KEEP_STATE:
 
 all:		$(DYNLIB)
--- a/usr/src/cmd/sgs/libldstab/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/libldstab/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -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,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 DUPOBJS=	stab64.o
@@ -38,8 +34,6 @@
 CONVLIBDIR=	$(CONVLIBDIR64)
 ELFLIBDIR=	$(ELFLIBDIR64)
 
-MAPFILES += ../common/mapfile-64
-
 LINTFLAGS64 += $(VAR_LINTFLAGS64)
 
 all:		$(DYNLIB)
--- a/usr/src/cmd/sgs/librtld/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/librtld/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,16 +20,12 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.com
 
 CPPFLAGS +=	-I../../../../uts/intel/amd64/krtld
-MAPFILES +=	../common/mapfile-64-vers
 
 .KEEP_STATE:
 
--- a/usr/src/cmd/sgs/librtld/common/mapfile-32-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-{
-	global:
-		do32_reloc_rtld =	FUNCTION parent;
-		reloc32_table =		DATA parent;
-};
--- a/usr/src/cmd/sgs/librtld/common/mapfile-64-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-{
-	global:
-		do64_reloc_rtld =	FUNCTION parent;
-		reloc64_table =		DATA parent;
-};
--- a/usr/src/cmd/sgs/librtld/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/librtld/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,21 +37,36 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.3 {
 	global:
 		rt_dldump;
 };
 
-{
+SYMBOL_SCOPE {
 	global:
-		alist_append =	FUNCTION parent;
-		elf_plt_write =	FUNCTION parent;
-		eprintf =	FUNCTION parent;
-		is_so_loaded =	FUNCTION parent;
-		lookup_sym =	FUNCTION parent;
+		alist_append	{ TYPE = FUNCTION; FLAGS = PARENT };
+		elf_plt_write	{ TYPE = FUNCTION; FLAGS = PARENT };
+		eprintf		{ TYPE = FUNCTION; FLAGS = PARENT };
+		is_so_loaded	{ TYPE = FUNCTION; FLAGS = PARENT };
+		lookup_sym	{ TYPE = FUNCTION; FLAGS = PARENT };
+
+		ld_entry_cnt	{ TYPE = DATA; FLAGS = PARENT };
+		lml_main	{ TYPE = DATA; FLAGS = PARENT };
+
 
-		ld_entry_cnt =	DATA parent;
-		lml_main =	DATA parent;
+$if _ELF32
+		do32_reloc_rtld	{ TYPE = FUNCTION; FLAGS = PARENT };
+		reloc32_table	{ TYPE = DATA; FLAGS = PARENT };
+$elif _ELF64
+		do64_reloc_rtld	{ TYPE = FUNCTION; FLAGS = PARENT };
+		reloc64_table	{ TYPE = DATA; FLAGS = PARENT };
+$else
+$error unknown ELFCLASS
+$endif
+
+
 	local:
 		*;
 };
--- a/usr/src/cmd/sgs/librtld/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/librtld/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,16 +20,12 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.com
 
 CPPFLAGS +=	-I../../../../uts/intel/ia32/krtld
-MAPFILES +=	../common/mapfile-32-vers
 
 .KEEP_STATE:
 
--- a/usr/src/cmd/sgs/librtld/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/librtld/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,16 +20,12 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.com
 
 CPPFLAGS +=	-I../../../../uts/sparc/krtld
-MAPFILES +=	../common/mapfile-32-vers
 
 .KEEP_STATE:
 
--- a/usr/src/cmd/sgs/librtld/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/librtld/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,16 +20,12 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.com
 
 CPPFLAGS +=	-I../../../../uts/sparc/krtld
-MAPFILES +=	../common/mapfile-64-vers
 
 .KEEP_STATE:
 
--- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,10 +20,7 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 COMOBJS64 =	rd_elf64.o
@@ -37,7 +34,6 @@
 LINTFLAGS64 +=	$(VAR_LINTFLAGS64)
 CPPFLAGS +=	-D_SYSCALL32
 CONVLIBDIR =	$(CONVLIBDIR64)
-DYNFLAGS +=	-M../common/mapfile-vers.64
 
 .KEEP_STATE:
 
--- a/usr/src/cmd/sgs/librtld_db/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/librtld_db/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	rd_delete;
 	rd_errstr;
@@ -57,23 +58,30 @@
 	*;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_rd_get_dyns32;
 	_rd_get_ehdr32;
 	_rd_loadobj_iter32;
 	rd_get_dyns;
 	validate_rdebug32;
+
+$if _ELF64
+	_rd_get_dyns64;
+	_rd_get_ehdr64;
+	_rd_loadobj_iter64;
+	validate_rdebug64;
+$endif
 };
 
 #Externally defined symbols
-{
+SYMBOL_SCOPE {
     global:
-	ps_pauxv =		NODIRECT PARENT;
-	ps_pdmodel =		NODIRECT PARENT;
-	ps_pglobal_lookup =	NODIRECT PARENT;
-	ps_pglobal_sym =	NODIRECT PARENT;
-	ps_plog =		NODIRECT PARENT;
-	ps_pread =		NODIRECT PARENT;
-	ps_pwrite =		NODIRECT PARENT;
+	ps_pauxv		{ FLAGS = NODIRECT PARENT };
+	ps_pdmodel		{ FLAGS = NODIRECT PARENT };
+	ps_pglobal_lookup	{ FLAGS = NODIRECT PARENT };
+	ps_pglobal_sym		{ FLAGS = NODIRECT PARENT };
+	ps_plog			{ FLAGS = NODIRECT PARENT };
+	ps_pread		{ FLAGS = NODIRECT PARENT };
+	ps_pwrite		{ FLAGS = NODIRECT PARENT };
 };
--- a/usr/src/cmd/sgs/librtld_db/common/mapfile-vers.64	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-	_rd_get_dyns64;
-	_rd_get_ehdr64;
-	_rd_loadobj_iter64;
-	validate_rdebug64;
-};
--- a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,10 +20,7 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 COMOBJS64 =	rd_elf64.o
@@ -37,7 +34,6 @@
 LINTFLAGS64 +=	$(VAR_LINTFLAGS64)
 CPPFLAGS +=	-D_SYSCALL32
 CONVLIBDIR =	$(CONVLIBDIR64)
-DYNFLAGS +=	-M../common/mapfile-vers.64
 
 .KEEP_STATE:
 
--- a/usr/src/cmd/sgs/link_audit/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/link_audit/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		../../../../lib/Makefile.lib
@@ -84,11 +83,11 @@
 $(SYMBINDREP):=	SONAME = $(SYMBINDREP)
 $(BINDLIB):=	SONAME = $(BINDLIB)
 
-$(TRUSSLIB):=	MAPFILES = mapfile-vers-truss
-$(PERFLIB):=	MAPFILES = mapfile-vers-perfcnt
-$(WHOLIB):=	MAPFILES = mapfile-vers-who
-$(SYMBINDREP):=	MAPFILES = mapfile-vers-symbindrep
-$(BINDLIB):=	MAPFILES = mapfile-vers-bindings
+$(TRUSSLIB):=	MAPFILES = ../common/mapfile-vers-truss
+$(PERFLIB):=	MAPFILES = ../common/mapfile-vers-perfcnt
+$(WHOLIB):=	MAPFILES = ../common/mapfile-vers-who
+$(SYMBINDREP):=	MAPFILES = ../common/mapfile-vers-symbindrep
+$(BINDLIB):=	MAPFILES = ../common/mapfile-vers-bindings
 
 $(ROOTCCSLIB) :=	DIRMODE =	755
 
--- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-bindings	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_amd64_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-perfcnt	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_amd64_pltenter;
-		la_pltexit64;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-symbindrep	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_preinit;
-		la_symbind64;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-truss	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_pltexit64;
-		la_amd64_pltenter;
-		la_symbind64;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/amd64/mapfile-vers-who	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_objclose;
-		la_amd64_pltenter;
-	local:
-		*;
-};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-bindings	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,70 @@
+#
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+$if _sparc
+
+$if _ELF32
+		la_sparcv8_pltenter;
+$elif _ELF64
+		la_sparcv9_pltenter;
+$else
+$error unknown sparc ELFCLASS
+$endif
+
+$elif _x86
+
+$if _ELF32
+		la_i86_pltenter;
+$elif _ELF64
+		la_amd64_pltenter;
+$else
+$error unknown x86 ELFCLASS
+$endif
+
+$else
+$error unknown platform
+$endif
+
+	local:
+		*;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-perfcnt	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+
+
+$if _ELF32
+		la_pltexit;
+$elif _ELF64
+		la_pltexit64;
+$else
+$error unknown ELFCLASS
+$endif
+
+
+$if _sparc
+
+$if _ELF32
+		la_sparcv8_pltenter;
+$elif _ELF64
+		la_sparcv9_pltenter;
+$else
+$error unknown sparc ELFCLASS
+$endif
+
+$elif _x86
+
+$if _ELF32
+		la_i86_pltenter;
+$elif _ELF64
+		la_amd64_pltenter;
+$else
+$error unknown x86 ELFCLASS
+$endif
+
+$else
+$error unknown platform
+$endif
+
+
+	local:
+		*;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-symbindrep	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+		la_preinit;
+
+
+$if _ELF32
+		la_symbind32;
+$elif _ELF64
+		la_symbind64;
+$else
+$error unknown ELFCLASS
+$endif
+
+
+	local:
+		*;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-truss	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,84 @@
+#
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+
+
+$if _ELF32
+		la_pltexit;
+		la_symbind32;
+$elif _ELF64
+		la_pltexit64;
+		la_symbind64;
+$else
+$error unknown ELFCLASS
+$endif
+
+
+$if _sparc
+
+$if _ELF32
+		la_sparcv8_pltenter;
+$elif _ELF64
+		la_sparcv9_pltenter;
+$else
+$error unknown sparc ELFCLASS
+$endif
+
+$elif _x86
+
+$if _ELF32
+		la_i86_pltenter;
+$elif _ELF64
+		la_amd64_pltenter;
+$else
+$error unknown x86 ELFCLASS
+$endif
+
+$else
+$error unknown platform
+$endif
+
+
+	local:
+		*;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/common/mapfile-vers-who	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,74 @@
+#
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+		la_objclose;
+
+
+$if _sparc
+
+$if _ELF32
+		la_sparcv8_pltenter;
+$elif _ELF64
+		la_sparcv9_pltenter;
+$else
+$error unknown sparc ELFCLASS
+$endif
+
+$elif _x86
+
+$if _ELF32
+		la_i86_pltenter;
+$elif _ELF64
+		la_amd64_pltenter;
+$else
+$error unknown x86 ELFCLASS
+$endif
+
+$else
+$error unknown platform
+$endif
+
+
+	local:
+		*;
+};
--- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_i86_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_pltexit;
-		la_i86_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_preinit;
-		la_symbind32;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_pltexit;
-		la_i86_pltenter;
-		la_symbind32;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_objclose;
-		la_i86_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-bindings	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_sparcv8_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-perfcnt	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_pltexit;
-		la_sparcv8_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-symbindrep	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_preinit;
-		la_symbind32;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-truss	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_pltexit;
-		la_sparcv8_pltenter;
-		la_symbind32;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparc/mapfile-vers-who	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_objclose;
-		la_sparcv8_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-bindings	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_sparcv9_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-perfcnt	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_sparcv9_pltenter;
-		la_pltexit64;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-symbindrep	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_preinit;
-		la_symbind64;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-truss	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_pltexit64;
-		la_sparcv9_pltenter;
-		la_symbind64;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/link_audit/sparcv9/mapfile-vers-who	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-	global:
-		la_version;		# Audit interfaces
-		la_objopen;
-		la_objclose;
-		la_sparcv9_pltenter;
-	local:
-		*;
-};
--- a/usr/src/cmd/sgs/packages/common/SUNWonld-README	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/packages/common/SUNWonld-README	Thu Jun 24 18:16:42 2010 -0600
@@ -1595,3 +1595,4 @@
 6961755 ld.so.1's -e arguments should take precedence over environment
 	variables. (D)
 6748925 moe returns wrong hwcap library in some circumstances
+6916796 OSnet mapfiles should use version 2 link-editor syntax
--- a/usr/src/cmd/sgs/rtld/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -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,9 @@
 #
 # CDDL HEADER END
 #
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
-# Copyright 2001-2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/cmd/sgs/Makefile.com
--- a/usr/src/cmd/sgs/rtld/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 RTLD=		ld.so.1
@@ -54,7 +53,7 @@
 # DTrace needs an executable data segment.
 MAPFILE.NED=
 
-MAPFILES +=	$(MAPFILE-ORDER) $(MAPFILE-PLAT)
+MAPFILES +=	$(MAPFILE-ORDER)
 
 # For the libc/libthread unified world:
 # This library needs to be placed in /lib to allow
--- a/usr/src/cmd/sgs/rtld/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 BASEPLAT =	amd64
@@ -61,8 +60,6 @@
 MAPFILE-ORDER =			../common/mapfile-order-devpro
 $(__GNUC64)MAPFILE-ORDER =	../common/mapfile-order-gcc
 
-MAPFILE-PLAT =	 mapfile-amd64-vers
-
 # Add any machine specific flags.
 
 CFLAGS +=	-xregs=no%appl
@@ -83,8 +80,6 @@
 LDDBGLIBDIR =	$(LDDBGLIBDIR64)
 CONVLIBDIR =	$(CONVLIBDIR64)
 
-MAPFILES +=	../common/mapfile-64-vers
-
 .KEEP_STATE:
 
 all:		$(RTLD)
--- a/usr/src/cmd/sgs/rtld/common/mapfile-32-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.3 {
-	protected:
-		do32_reloc_rtld;	# Required to support librtld.so
-		reloc32_table;
-};
--- a/usr/src/cmd/sgs/rtld/common/mapfile-64-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.3 {
-	protected:
-		do64_reloc_rtld;	# Required to support librtld.so
-		reloc64_table;
-};
--- a/usr/src/cmd/sgs/rtld/common/mapfile-order-devpro	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/common/mapfile-order-devpro	Thu Jun 24 18:16:42 2010 -0600
@@ -20,10 +20,7 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Note: This mapfile is used to place r_debug as the
 # very first data item inside of the run-time linker.
@@ -41,6 +38,21 @@
 #	devpro mapfile: rtld/common/mapfile-order-devpro
 #
 
-data = LOAD ?RWXO;
-data : .data : pics/debugdata.o;
-data | .data;
+$mapfile_version 2
+
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+
+	# .data sections from pics/debugdata.o go to data segment
+	ASSIGN_SECTION dbg_data {
+		IS_NAME = .data;
+		FILE_PATH = pics/debugdata.o;
+	};
+
+	# Put .data sections from pics/debugdata.o ahead of any other
+	# .data input sections in the .data output section.
+	IS_ORDER = dbg_data;
+
+	# Put .data output section at top of data segment
+	OS_ORDER = .data;
+};
--- a/usr/src/cmd/sgs/rtld/common/mapfile-order-gcc	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/common/mapfile-order-gcc	Thu Jun 24 18:16:42 2010 -0600
@@ -20,10 +20,7 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Note: This mapfile is used to place r_debug as the
 # very first data item inside of the run-time linker.
@@ -41,6 +38,21 @@
 #	devpro mapfile: rtld/common/mapfile-order-devpro
 #
 
-data = LOAD ?RWXO;
-data : .data.rel : pics/debugdata.o;
-data | .data.rel;
+$mapfile_version 2
+
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+
+	# .data.rel sections from pics/debugdata.o go to data segment
+	ASSIGN_SECTION dbg_data {
+		IS_NAME = .data.rel;
+		FILE_PATH = pics/debugdata.o;
+	};
+
+	# Put .data.rel sections from pics/debugdata.o ahead of any other
+	# .data.rel input sections in the .data.rel output section.
+	IS_ORDER = dbg_data;
+
+	# Put .data.rel output section at top of data segment
+	OS_ORDER = .data.rel;
+};
--- a/usr/src/cmd/sgs/rtld/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Generic interface definition for usr/src/cmd/sgs/rtld.
 #
@@ -40,10 +39,12 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # All symbols in ld.so.1 are private as no-one should bind to these directly.
 #
-SUNWprivate_1.3 {
+SYMBOL_VERSION SUNWprivate_1.3 {
 	protected:
 		 dladdr;		# Standard dlopen(3x) family
 		 dladdr1;
@@ -110,6 +111,24 @@
 	      ___errno;
 		 qsort;
 		dl_iterate_phdr;
+
+$if _x86 && _ELF64
+		# amd64 ABI exception unwinding
+		_dlamd64getunwind;
+		dlamd64getunwind;
+$endif
+
+		# doXX_reloc_rtld and relocXX_table are required to
+		# support librtld.so.
+$if _ELF32
+		do32_reloc_rtld;
+		reloc32_table;
+$elif _ELF64
+		do64_reloc_rtld;
+		reloc64_table;
+$else
+$error unknown ELFCLASS
+$endif
 	local:
 		*;
 };
--- a/usr/src/cmd/sgs/rtld/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 BASEPLAT =	i386
@@ -71,8 +70,6 @@
 
 SGSMSGTARG +=	$(SGSMSGINTEL) $(SGSMSGINTEL32) $(SGSMSG32)
 
-MAPFILES +=	../common/mapfile-32-vers
-
 .KEEP_STATE:
 
 all:		$(RTLD)
--- a/usr/src/cmd/sgs/rtld/mdbmod/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/mdbmod/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 #
 # Exported Interface
@@ -46,20 +47,20 @@
 		*;
 };
 
-{
+SYMBOL_SCOPE {
 #
 # Imported Interface
 #
-		mdb_alloc = EXTERN;
-		mdb_call_dcmd = EXTERN;
-		mdb_dec_indent = EXTERN;
-		mdb_getopts = EXTERN;
-		mdb_inc_indent = EXTERN;
-		mdb_lookup_by_obj = EXTERN;
-		mdb_printf = EXTERN;
-		mdb_pwalk = EXTERN;
-		mdb_readstr = EXTERN;
-		mdb_set_dot = EXTERN;
-		mdb_vread = EXTERN;
-		mdb_warn = EXTERN;
+		mdb_alloc		{ FLAGS = EXTERN };
+		mdb_call_dcmd		{ FLAGS = EXTERN };
+		mdb_dec_indent		{ FLAGS = EXTERN };
+		mdb_getopts		{ FLAGS = EXTERN };
+		mdb_inc_indent		{ FLAGS = EXTERN };
+		mdb_lookup_by_obj	{ FLAGS = EXTERN };
+		mdb_printf		{ FLAGS = EXTERN };
+		mdb_pwalk		{ FLAGS = EXTERN };
+		mdb_readstr		{ FLAGS = EXTERN };
+		mdb_set_dot		{ FLAGS = EXTERN };
+		mdb_vread		{ FLAGS = EXTERN };
+		mdb_warn		{ FLAGS = EXTERN };
 };
--- a/usr/src/cmd/sgs/rtld/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Object lists are organized into primary (most frequently used code) and
@@ -76,8 +75,6 @@
 ADBSUB=		$(ADBSUB32)
 SONAME=		$(VAR_RTLD_SONAME)
 
-MAPFILES +=	../common/mapfile-32-vers
-
 SGSMSGTARG +=	$(SGSMSGSPARC) $(SGSMSGSPARC32) $(SGSMSG32)
 
 .KEEP_STATE:
--- a/usr/src/cmd/sgs/rtld/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/rtld/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Object lists are organized into primary (most frequently used code) and
@@ -77,8 +76,6 @@
 LINTFLAGS64 +=	$(VAR_LINTFLAGS64)
 SONAME=		$(VAR_RTLD_V9_SONAME)
 
-MAPFILES +=	../common/mapfile-64-vers
-
 SGSMSGTARG +=	$(SGSMSGSPARC) $(SGSMSGSPARC64) $(SGSMSG64)
 
 LDLIB =		-L ../../libld/$(MACH64)
--- a/usr/src/cmd/sgs/yacc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sgs/yacc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		main;
 		yyerror;
--- a/usr/src/cmd/sh/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/sh/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,9 +37,11 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # The shell has a name clash (exp, hcreate).  Demote everything to local
 # besides the malloc family that must be exported.
-{
+SYMBOL_SCOPE {
 	global:
 		free;
 		malloc;
--- a/usr/src/cmd/ssh/sshd/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/ssh/sshd/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # sshd defines its own log(), as do various other ssh utilities, thus their
 # symbols are reduced to locals via MAPFILE.NGB in Makefile-ssh.common.  sshd
@@ -40,7 +39,10 @@
 #
 # MAPFILE HEADER END
 #
-{
+
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
 		allow_severity;		# required by libwrap
 		deny_severity;		# required by libwrap
--- a/usr/src/cmd/syseventd/modules/mapfile-extern	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/syseventd/modules/mapfile-extern	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,11 +35,13 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # External interface requirements
-{
+SYMBOL_SCOPE {
 	global:
-		debug_level =		EXTERN;
-		root_dir =		EXTERN;
-		syseventd_err_print =	EXTERN;
-		syseventd_print =	EXTERN;
+		debug_level		{ FLAGS = EXTERN };
+		root_dir		{ FLAGS = EXTERN };
+		syseventd_err_print	{ FLAGS = EXTERN };
+		syseventd_print		{ FLAGS = EXTERN };
 };
--- a/usr/src/cmd/tcpd/mapfile-intf-tcpdchk	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/tcpd/mapfile-intf-tcpdchk	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,22 +37,24 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # tcpdchk interposes on numerous routines, and must export other data
 # structures to satisfy external dependency requirements.
-{
+SYMBOL_SCOPE {
 	global:
-		clean_exit = INTERPOSE;
-		closelog = INTERPOSE;
-		hosts_access_verbose = INTERPOSE;
-		hosts_allow_table = INTERPOSE;
-		hosts_deny_table = INTERPOSE;
-		openlog = INTERPOSE;
-		resident = INTERPOSE;
-		rfc931 = INTERPOSE;
-		rfc931_timeout = INTERPOSE;
-		shell_cmd = INTERPOSE;
-		syslog = INTERPOSE;
-		vsyslog = INTERPOSE;
+		clean_exit		{ FLAGS = INTERPOSE };
+		closelog		{ FLAGS = INTERPOSE };
+		hosts_access_verbose	{ FLAGS = INTERPOSE };
+		hosts_allow_table	{ FLAGS = INTERPOSE };
+		hosts_deny_table	{ FLAGS = INTERPOSE };
+		openlog			{ FLAGS = INTERPOSE };
+		resident		{ FLAGS = INTERPOSE };
+		rfc931			{ FLAGS = INTERPOSE };
+		rfc931_timeout		{ FLAGS = INTERPOSE };
+		shell_cmd		{ FLAGS = INTERPOSE };
+		syslog			{ FLAGS = INTERPOSE };
+		vsyslog			{ FLAGS = INTERPOSE };
 
 		allow_severity;		# required by libwrap
 		deny_severity;		# required by libwrap
--- a/usr/src/cmd/tcpd/mapfile-intf-tcpdmatch	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/tcpd/mapfile-intf-tcpdmatch	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,18 +37,20 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # tcpdmatch interposes on numerous routines, and must export other data
 # structures to satisfy external dependency requirements.
-{
+SYMBOL_SCOPE {
 	global:
-		clean_exit = INTERPOSE;
-		closelog = INTERPOSE;
-		openlog = INTERPOSE;
-		rfc931 = INTERPOSE;
-		rfc931_timeout = INTERPOSE;
-		shell_cmd = INTERPOSE;
-		syslog = INTERPOSE;
-		vsyslog = INTERPOSE;
+		clean_exit		{ FLAGS = INTERPOSE };
+		closelog		{ FLAGS = INTERPOSE };
+		openlog			{ FLAGS = INTERPOSE };
+		rfc931			{ FLAGS = INTERPOSE };
+		rfc931_timeout		{ FLAGS = INTERPOSE };
+		shell_cmd		{ FLAGS = INTERPOSE };
+		syslog			{ FLAGS = INTERPOSE };
+		vsyslog			{ FLAGS = INTERPOSE };
 
 		allow_severity;		# required by libwrap
 		deny_severity;		# required by libwrap
--- a/usr/src/cmd/tcpd/mapfile-intf-tryfrom	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/tcpd/mapfile-intf-tryfrom	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # try-from interposes on numerous routines, and must export other data
 # structures to satisfy external dependency requirements.
@@ -39,12 +38,15 @@
 #
 # MAPFILE HEADER END
 #
-{
+
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
-		closelog = INTERPOSE;
-		openlog = INTERPOSE;
-		syslog = INTERPOSE;
-		vsyslog = INTERPOSE;
+		closelog		{ FLAGS = INTERPOSE };
+		openlog			{ FLAGS = INTERPOSE };
+		syslog			{ FLAGS = INTERPOSE };
+		vsyslog			{ FLAGS = INTERPOSE };
 
 		allow_severity;		# required by libwrap
 		deny_severity;		# required by libwrap
--- a/usr/src/cmd/tic/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/tic/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # tic interposes on progname[], so identify this as an interposer.
-{
+SYMBOL_SCOPE {
 	global:
-		progname = INTERPOSE;
+		progname	{ FLAGS = INTERPOSE };
 };
--- a/usr/src/cmd/tplot/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/tplot/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,10 +37,12 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # t* utilities interpose on a couple of libm and libt* items.
-{
+SYMBOL_SCOPE {
 	global:
-		matherr = INTERPOSE;
-		deltx = INTERPOSE;
-		delty = INTERPOSE;
+		matherr		{ FLAGS = INTERPOSE };
+		deltx		{ FLAGS = INTERPOSE };
+		delty		{ FLAGS = INTERPOSE };
 };
--- a/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/wbem/provider/c/filesystems/wbem_nfs/lib/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -35,7 +34,10 @@
 #
 # MAPFILE HEADER END
 #
-SUNWprivate_1.1 {
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cp_associatorNames ;
 	cp_associators ;
--- a/usr/src/cmd/wbem/provider/c/wbem_disk/lib/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/wbem/provider/c/wbem_disk/lib/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -35,7 +34,10 @@
 #
 # MAPFILE HEADER END
 #
-SUNWprivate_1.1 {
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cp_associatorNames ;
 	cp_associators ;
--- a/usr/src/cmd/ypcmd/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/ypcmd/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # makedbm interposes on _close.
-{
+SYMBOL_SCOPE {
 	global:
-		_close = INTERPOSE;
+		_close	{ FLAGS = INTERPOSE };
 };
--- a/usr/src/cmd/ypcmd/yppasswd/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/cmd/ypcmd/yppasswd/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,25 +37,27 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # rpc.yppasswdd interposes on a number of routines from libnisdb and libnsl, so
 # define these as interposers.  Note, libnisdb is itself an interposer, so
 # these rpc.yppasswdd definitions are required to override libnisdb.
-{
+SYMBOL_SCOPE {
 	global:
-		delete_map = INTERPOSE;
-		hash = INTERPOSE;
-		init_lock_map = INTERPOSE;
-		lock_core = INTERPOSE;
-		lock_map = INTERPOSE;
-		mflag = INTERPOSE;
-		nogecos = INTERPOSE;
-		nopw = INTERPOSE;
-		noshell = INTERPOSE;
-		rename_map = INTERPOSE;
-		single = INTERPOSE;
-		unlock_core = INTERPOSE;
-		unlock_map = INTERPOSE;
-		validloginshell = INTERPOSE;
-		validstr = INTERPOSE;
-		xdr_yppasswd = INTERPOSE;
+		delete_map		{ FLAGS = INTERPOSE };
+		hash			{ FLAGS = INTERPOSE };
+		init_lock_map		{ FLAGS = INTERPOSE };
+		lock_core		{ FLAGS = INTERPOSE };
+		lock_map		{ FLAGS = INTERPOSE };
+		mflag			{ FLAGS = INTERPOSE };
+		nogecos			{ FLAGS = INTERPOSE };
+		nopw			{ FLAGS = INTERPOSE };
+		noshell			{ FLAGS = INTERPOSE };
+		rename_map		{ FLAGS = INTERPOSE };
+		single			{ FLAGS = INTERPOSE };
+		unlock_core		{ FLAGS = INTERPOSE };
+		unlock_map		{ FLAGS = INTERPOSE };
+		validloginshell		{ FLAGS = INTERPOSE };
+		validstr		{ FLAGS = INTERPOSE };
+		xdr_yppasswd		{ FLAGS = INTERPOSE };
 };
--- a/usr/src/common/bignum/i386/cap_mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/bignum/i386/cap_mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -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
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
+$mapfile_version 2
 
 # Override the insertion of SSE2/MMX tags into .SUNWcap since we do a
 # runtime check for this and don't need the loaders help.
 # Note that this overrides all HWCAP tags not just SSE2/MMX.
-hwcap_1 = V0x0 OVERRIDE;
+CAPABILITY {
+	hw_1 = 0x0;
+};
--- a/usr/src/common/mapfiles/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/Makefile.master
@@ -30,7 +29,7 @@
 ROOTDIR64=	$(ROOT)/usr/lib/ld/$(MACH64)
 
 DIRS=		$(ROOTDIR) $(ROOTDIR64)
-FILES=		$(ROOTDIR64)/map.above4G $(ROOTDIR64)/map.below4G
+FILES=
 
 install: $(DIRS) $(FILES) map.link
 
@@ -39,8 +38,11 @@
 $(DIRS):=	DIRMODE=755
 
 map.link:
-	$(RM) $(ROOTDIR64)/map.default
-	$(SYMLINK) ./map.below4G $(ROOTDIR64)/map.default
+	$(RM) $(ROOTDIR64)/map.default \
+		$(ROOTDIR64)/map.above4G $(ROOTDIR64)/map.below4G
+	$(SYMLINK) ../map.default $(ROOTDIR64)/map.default
+	$(SYMLINK) ../map.above4G $(ROOTDIR64)/map.above4G
+	$(SYMLINK) ../map.below4G $(ROOTDIR64)/map.below4G
 
 $(DIRS):
 	$(INS.dir)
--- a/usr/src/common/mapfiles/amd64/map.above4G	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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.
-#
-# 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
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Linker mapfile for loading 64-bit programs above 4 gigabytes.
-# The linker does not use this file automatically, so one must
-# use the -M option to cc or ld:
-#
-#	cc -xarch=generic64 -M /usr/lib/ld/amd64/map.above4G myprogram.c
-#
-text = V0x100000000;
--- a/usr/src/common/mapfiles/amd64/map.below4G	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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.
-#
-# 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
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Linker mapfile for loading 64-bit programs below 4 gigabytes.
-# The linker does not use this file automatically, so one must
-# use the -M option to cc or ld:
-#
-#	cc -xarch=generic64 -M /usr/lib/ld/amd64/map.below4G myprogram.c
-#
-text = V0x400000;
--- a/usr/src/common/mapfiles/common/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/common/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/Makefile.master
@@ -30,11 +29,16 @@
 
 DIRS=		$(ROOTDIR)
 FILES=	\
-		$(ROOTDIR)/map.execdata \
-		$(ROOTDIR)/map.filter \
+		$(ROOTDIR)/map.above4G \
+		$(ROOTDIR)/map.below4G \
 		$(ROOTDIR)/map.bssalign \
+		$(ROOTDIR)/map.execdata \
+		$(ROOTDIR)/map.default \
+		$(ROOTDIR)/map.filter \
 		$(ROOTDIR)/map.noexbss \
-		$(ROOTDIR)/map.noexstk
+		$(ROOTDIR)/map.noexdata \
+		$(ROOTDIR)/map.noexstk \
+		$(ROOTDIR)/map.pagealign
 
 install:	$(DIRS) $(FILES)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/common/mapfiles/common/map.above4G	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,44 @@
+#
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+# Linker mapfile for loading 64-bit programs above 4 gigabytes.
+# The linker does not use this file automatically, so one must
+# use the -M option to cc or ld:
+#
+#	cc -m64 -M /usr/lib/ld/map.above4G myprogram.c
+#
+
+$mapfile_version 2
+
+$if !_ELF64
+$error mapfile is only applicable to 64-bit objects
+$endif
+
+# sparcv9 and amd64 use the same address
+$if _sparc || _x86
+
+# On sparc (but not amd64), this is equivalent to map.default.
+LOAD_SEGMENT text { VADDR = 0x100000000 };
+
+$else
+$error unknown platform
+$endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/common/mapfiles/common/map.below4G	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,48 @@
+#
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+# Linker mapfile for loading 64-bit SPARC programs below 4 gigabytes
+# The linker does not use this file automatically, so one must use the -M 
+# option to cc or ld:
+#
+#	cc -m64 -M /usr/lib/ld/map.below4G myprogram.c
+#
+
+$mapfile_version 2
+
+$if !_ELF64
+$error mapfile is only applicable to 64-bit objects
+$endif
+
+# sparcv9 and amd64 use the same address
+$if _sparc
+
+LOAD_SEGMENT text { VADDR = 0x80000000 };
+
+$elif _x86
+
+# This is equivalent to map.default.
+LOAD_SEGMENT text { VADDR = 0x400000 };
+
+$else
+$error unknown platform
+$endif
--- a/usr/src/common/mapfiles/common/map.bssalign	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/common/map.bssalign	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -34,4 +33,9 @@
 #
 #       cc -M /usr/lib/ld/map.bssalign myprogram.c
 #
-bss = A0x400000;
+
+$mapfile_version 2
+
+LOAD_SEGMENT bss {
+	ALIGN = 0x400000;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/common/mapfiles/common/map.default	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,57 @@
+#
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+# Linker mapfile that shows how programs are loaded by default.
+# The linker does not use this file automatically, so one must use the -M 
+# option to cc or ld:
+#
+#	cc -M /usr/lib/ld/map.default myprogram.c
+#
+
+$mapfile_version 2
+
+$if _sparc
+
+$if _ELF32
+LOAD_SEGMENT text { VADDR = 0x10000 };
+$elif _ELF64
+# This is equivalent to map.above4G.
+LOAD_SEGMENT text { VADDR = 0x100000000 };
+$else
+$error unknown sparc ELFCLASS
+$endif
+
+	
+$else _x86
+
+$if _ELF32
+LOAD_SEGMENT text { VADDR = 0x08048000 };
+$elif _ELF64
+# This is equivalent to map.below4G.
+LOAD_SEGMENT text { VADDR = 0x400000 };
+$else
+$error unknown x86 ELFCLASS
+$endif
+
+$else
+$error unknown platform
+$endif
--- a/usr/src/common/mapfiles/common/map.execdata	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/common/map.execdata	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -31,12 +30,17 @@
 #
 #       cc -M /usr/lib/ld/map.execdata myprogram.c
 #
-data = ?RWX;
+
+$mapfile_version 2
+
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+};
 
 #
 # Executables can also create a separate executable bss segment.  Adding
 # the following line creates a bss segment.
 #
-# bss = ?RWX;
+# LOAD_SEGMENT bss { FLAGS = READ WRITE EXECUTE };
 #
 # See also /usr/lib/ld/map.noexdata.
--- a/usr/src/common/mapfiles/common/map.filter	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/common/map.filter	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -48,5 +47,12 @@
 # Override the default alignment so that this single paged object can be mapped
 # more flexibly.
 
-filter = LOAD ?RX A0x1000;
-filter : ?A;
+$mapfile_version 2
+
+LOAD_SEGMENT filter {
+	FLAGS = READ EXECUTE;
+	ALIGN = 0x1000;
+	ASSIGN_SECTION {
+		FLAGS = ALLOC;
+	};
+};
--- a/usr/src/common/mapfiles/common/map.lex.yy	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/common/map.lex.yy	Thu Jun 24 18:16:42 2010 -0600
@@ -20,16 +20,15 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+
+$mapfile_version 2
 
 # lex generates a lex.yy.c for use in building applications.  A number of
 # interfaces within this file are intended for libl.so to bind to, and thus
 # should remain exported from any application using lex.yy.c.
-{
+SYMBOL_SCOPE {
 	global:
 		yyback;
 		yyextra;
@@ -49,7 +48,7 @@
 # Some applications use the -e option of lex, which generates additional lex
 # interfaces that are not defined in the generic $(MAPFILE.LEX).  Export the
 # following interfaces to satisfy -e use.
-#{
+#SYMBOL_SCOPE {
 #	global:
 #		yywinput;
 #		yywleng;
--- a/usr/src/common/mapfiles/common/map.noexbss	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/common/map.noexbss	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -35,6 +34,11 @@
 #
 #       cc -M /usr/lib/ld/map.noexbss myprogram.c
 #
-bss = ?RW;
+
+$mapfile_version 2
+
+LOAD_SEGMENT bss {
+	FLAGS = READ WRITE;
+};
 
 # See also /usr/lib/ld/map.noexdata.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/common/mapfiles/common/map.noexdata	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,56 @@
+#
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+# Link-editor mapfile to create a non-executable data segment definition
+# within an executable.  Note that this only functions properly on the
+# x86 architecture.  On SPARC, the data segment contains a Procedure Linkage
+# Table (PLT) that must remain executable.
+#
+# As the data segment is extended by sbrk(2) to enlarge the heap, a
+# non-executable data segment also results in a non-exutable heap.
+#
+# The link-editor does not use this file automatically, so one must use the
+# -M option to cc or ld:
+#
+#       cc -M /usr/lib/ld/map.noexdata myprogram.c
+#
+
+#
+# Executables can also create a separate non-executable bss segment.
+# This segment may use additional memory, but also results in a
+# non-executable heap.  See /usr/lib/ld/map.noexbss.
+#
+# See also /usr/lib/ld/map.execdata.
+
+$mapfile_version 2
+
+$if _sparc
+
+$error SPARC Procedure Linkage Table (PLT) must remain executable
+
+$elif _x86
+
+LOAD_SEGMENT data { FLAGS = READ WRITE };
+
+$else
+$error unknown platform
+$endif
--- a/usr/src/common/mapfiles/common/map.noexstk	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/common/map.noexstk	Thu Jun 24 18:16:42 2010 -0600
@@ -1,15 +1,11 @@
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # 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.
@@ -31,4 +27,9 @@
 #
 #       cc -M /usr/lib/ld/map.noexstk myprogram.c
 #
-stack = STACK ?RW;
+
+$mapfile_version 2
+
+STACK {
+	FLAGS = READ WRITE;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/common/mapfiles/common/map.pagealign	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+# Linker mapfile to create page-aligned data within an executable.
+# The linker does not use this file automatically, so one must use the -M
+# option to cc or ld:
+#
+#	cc -M /usr/lib/ld/map.pagealign myprogram.c
+#
+
+$mapfile_version 2
+
+$if _sparc
+
+LOAD_SEGMENT data { ROUND = 0x2000 };
+
+$elif _x86
+
+LOAD_SEGMENT data { ROUND = 0x1000 };
+
+$else
+$error unknown platform
+$endif
+
--- a/usr/src/common/mapfiles/gen/map.noexeglobs.1.template	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/gen/map.noexeglobs.1.template	Thu Jun 24 18:16:42 2010 -0600
@@ -20,15 +20,15 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Template mapfile for generating a final mapfile to demote all user global
 # symbols to local within a dynamic executable.
 #
-{
+
+$mapfile_version 2
+
+SYMBOL_SCOPE {
     local:
         _fini;
         _init;
--- a/usr/src/common/mapfiles/gen/map.noexeglobs.2.template	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/gen/map.noexeglobs.2.template	Thu Jun 24 18:16:42 2010 -0600
@@ -20,16 +20,16 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Template mapfile for generating a final mapfile to demote all user global
 # symbols to local within a dynamic executable.  This mapfile also provides
 # the "MAP-" commented entries to select lines for the final mapfile.
 #
-{				# MAP-HEAD
+
+$mapfile_version 2		# MAP-HEAD
+				# MAP-HEAD
+SYMBOL_SCOPE {			# MAP-HEAD
     global:			# MAP-HEAD
         _lib_version;		# MAP-HEAD
     local:			# MAP-TAIL
--- a/usr/src/common/mapfiles/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/Makefile.master
@@ -29,10 +28,7 @@
 ROOTDIR=	$(ROOT)/usr/lib/ld
 
 DIRS=		$(ROOTDIR)
-FILES= \
-		$(ROOTDIR)/map.default \
-		$(ROOTDIR)/map.pagealign \
-		$(ROOTDIR)/map.noexdata
+FILES=
 
 install: $(DIRS) $(FILES)
 
--- a/usr/src/common/mapfiles/i386/map.default	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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.
-#
-# 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
-#
-# Linker mapfile that shows how 32-bit Intel x86 programs are loaded by 
-# default.  The linker does not use this file automatically, so one must use
-# the -M  option to cc or ld:
-#
-#	cc -M /usr/lib/ld/map.default myprogram.c
-#
-text = V0x08048000;
--- a/usr/src/common/mapfiles/i386/map.noexdata	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-# Link-editor mapfile to create a non-executable data segment definition
-# within an executable.  Note that this only functions properly on the
-# x86 architecture.  On SPARC, the data segment contains a Procedure Linkage
-# Table (PLT) that must remain executable.
-#
-# As the data segment is extended by sbrk(2) to enlarge the heap, a
-# non-executable data segment also results in a non-exutable heap.
-#
-# The link-editor does not use this file automatically, so one must use the
-# -M option to cc or ld:
-#
-#       cc -M /usr/lib/ld/map.noexdata myprogram.c
-#
-data = ?RW;
-
-#
-# Executables can also create a separate non-executable bss segment.
-# This segment may use additional memory, but also results in a
-# non-executable heap.  See /usr/lib/ld/map.noexbss.
-#
-# See also /usr/lib/ld/map.execdata.
--- a/usr/src/common/mapfiles/i386/map.pagealign	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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.
-#
-# 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
-#
-# Linker mapfile to create page-aligned data within an Intel executable.
-# The linker does not use this file automatically, so one must use the -M
-# option to cc or ld:
-#
-#	cc -M /usr/lib/ld/map.pagealign myprogram.c
-#
-data = R0x1000;
--- a/usr/src/common/mapfiles/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/Makefile.master
@@ -29,9 +28,7 @@
 ROOTDIR=	$(ROOT)/usr/lib/ld
 
 DIRS=		$(ROOTDIR)
-FILES= \
-		$(ROOTDIR)/map.default \
-		$(ROOTDIR)/map.pagealign
+FILES=
 
 install: $(DIRS) $(FILES)
 
--- a/usr/src/common/mapfiles/sparc/map.default	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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.
-#
-# 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
-#
-# Linker mapfile that shows how 32-bit SPARC programs are loaded by default.
-# The linker does not use this file automatically, so one must use the -M 
-# option to cc or ld:
-#
-#	cc -M /usr/lib/ld/map.default myprogram.c
-#
-text = V0x10000;
--- a/usr/src/common/mapfiles/sparc/map.pagealign	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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.
-#
-# 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
-#
-# Linker mapfile to create page aligned data within a SPARC executable.
-# The linker does not use this file automatically, so one must use the -M
-# option to cc or ld:
-#
-#	cc -M /usr/lib/ld/map.pagealign myprogram.c
-#
-data = R0x2000;
--- a/usr/src/common/mapfiles/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/common/mapfiles/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include		$(SRC)/Makefile.master
@@ -30,7 +29,7 @@
 ROOTDIR64=	$(ROOT)/usr/lib/ld/$(MACH64)
 
 DIRS=		$(ROOTDIR) $(ROOTDIR64)
-FILES=		$(ROOTDIR64)/map.above4G $(ROOTDIR64)/map.below4G
+FILES=
 
 install: $(DIRS) $(FILES) map.link
 
@@ -39,8 +38,11 @@
 $(DIRS):=	DIRMODE=755
 
 map.link:
-	$(RM) $(ROOTDIR64)/map.default
-	$(SYMLINK) ./map.above4G $(ROOTDIR64)/map.default
+	$(RM) $(ROOTDIR64)/map.default \
+		$(ROOTDIR64)/map.above4G $(ROOTDIR64)/map.below4G
+	$(SYMLINK) ../map.default $(ROOTDIR64)/map.default
+	$(SYMLINK) ../map.above4G $(ROOTDIR64)/map.above4G
+	$(SYMLINK) ../map.below4G $(ROOTDIR64)/map.below4G
 
 $(DIRS):
 	$(INS.dir)
--- a/usr/src/common/mapfiles/sparcv9/map.above4G	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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.
-#
-# 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
-#
-# Linker mapfile for loading 64-bit programs above 4 gigabytes 
-# The linker does not use this file automatically, so one must use the -M 
-# option to cc or ld:
-#
-#	cc -xarch=v9 -M /usr/lib/ld/sparcv9/map.above4G myprogram.c
-#
-text = V0x100000000;
--- a/usr/src/common/mapfiles/sparcv9/map.below4G	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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.
-#
-# 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
-#
-# Linker mapfile for loading 64-bit SPARC programs below 4 gigabytes
-# The linker does not use this file automatically, so one must use the -M 
-# option to cc or ld:
-#
-#	cc -xarch=v9 -M /usr/lib/ld/map.default myprogram.c
-#
-text = V0x80000000;
--- a/usr/src/grub/grub-0.97/grub/mapfile-intf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/grub/grub-0.97/grub/mapfile-intf	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,18 +37,20 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # The grub shell interposes on the getopt() family - this reimplementation is
 # required for the real grub loader which can't depend on libc.  The grub shell
 # is built from the same source as the grub loader.
-{
+SYMBOL_SCOPE {
 	global:
-		getopt = INTERPOSE;
-		getopt_long = INTERPOSE;
-		getopt_long_only = INTERPOSE;
-		optarg = INTERPOSE;
-		opterr = INTERPOSE;
-		optind = INTERPOSE;
-		optopt = INTERPOSE;
+		getopt			{ FLAGS = INTERPOSE };
+		getopt_long		{ FLAGS = INTERPOSE };
+		getopt_long_only	{ FLAGS = INTERPOSE };
+		optarg			{ FLAGS = INTERPOSE };
+		opterr			{ FLAGS = INTERPOSE };
+		optind			{ FLAGS = INTERPOSE };
+		optopt			{ FLAGS = INTERPOSE };
 	local:
 		*;
 };
--- a/usr/src/lib/README.mapfiles	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/README.mapfiles	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 Mapfiles and versioning in ON
@@ -55,16 +54,24 @@
 
 2.0 What's a mapfile?
 
-Mapfiles are used to tell the link editor ("ld") all sorts of things about
+Mapfiles are used to tell the link-editor ("ld") all sorts of things about
 how to generate an executable file or a shared object from a collection of
 relocatable objects, such as generated by a compiler.  For all the gory
 details, see the Solaris Linker and Libraries Guide, which can be found
 under http://docs.sun.com.
 
+There are two versions of the mapfile language accepted by the link-editor.
+Version 1 derives from AT&T System V Release 4 Unix. Version 2 is a newer
+syntax specific to Solaris. All mapfiles in the OSnet (ON consolidation) are
+required to use version 2 syntax. Note that every mapfile using version 2
+syntax must start with the line:
+
+        $mapfile_version 2
+
 Here, we are only concerned with specifying externally-visible interfaces
 for shared libraries (shared objects) and with specifying their versions
 for ABI (Application Binary Interface) purposes.  For these purposes, we
-only need to deal with a subset of the mapfile interfaces.
+only need to deal with a subset of the mapfile language.
 
 There should be a "mapfile-vers" file associated with every shared library
 and it should reside in the common source directory for that library, most
@@ -91,20 +98,22 @@
 (the license notification and copyright notice is omitted here
 for brevity):
 
-SUNW_1.2 {	# update to libwombat, Solaris 10
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {	# update to libwombat, Solaris 10
     global:
 	wb_readv;
 	wb_stat;
 	wb_writev;
 } SUNW_1.1;
 
-SUNW_1.1 {	# first release of libwombat, Solaris 9
+SYMBOL_VERSION SUNW_1.1 {	# first release of libwombat, Solaris 9
     global:
 	wb_read;
 	wb_write;
 };
 
-SUNWprivate {	# private libwombat symbols
+SYMBOL_VERSION SUNWprivate {	# private libwombat symbols
     global:
 	wb_add;
 	wb_delete;
@@ -126,7 +135,7 @@
 So, for example, if an update to libwombat is made in Solaris 11,
 you would add "SUNW_1.3" at the start of the mapfile:
 
-SUNW_1.3 {	# update to libwombat, Solaris 11
+SYMBOL_VERSION SUNW_1.3 {	# update to libwombat, Solaris 11
     global:
 	wb_lseek;
 } SUNW_1.2;
@@ -145,18 +154,36 @@
 For maintainability, the list of names in each version block should
 be sorted in dictionary order (sort -d).  Please comply.
 
-In addition to the common mapfile:
+The version 2 mapfile language supports a simple mechanism for conditional
+input, in which lines in the mapfile apply only to a specific platform or
+ELFCLASS (32/64-bit). This mechanism works very much like the #if/#endif
+feature of the C preprocessor. For instance, the following mapfile declares
+a version SUNW_1.1 that always exports a symbol foo, and also exports
+the symbol bar on 32-bit sparc platforms:
+
+$mapfile_version
+SYMBOL_VERSION SUNW_1.1 {
+        foo;
+$if _sparc && _ELF32
+	bar;
+$endif
+};
+
+Conditional input can be used if there are ISA-specific library interfaces
+not common to all instances of the library. It is the preferred method for
+expressing platform specific items, as long as the differences are simple
+(which is almost always the case).  For example, see libproc, or, if you
+are masochistic, libc or libnsl.
+
+In addition to conditional input, there is a second heavier weight mechanism
+for expressing ISA-specific differences. In addition to the common mapfile:
 	common/mapfile-vers
-some libraries require ISA-specific supplemental mapfiles, one in each
+some libraries may have ISA-specific supplemental mapfiles, one in each
 of the ISA directories:
 	amd64/mapfile-vers
 	i386/mapfile-vers
 	sparc/mapfile-vers
 	sparcv9/mapfile-vers
-This is necessary only if there are ISA-specific library interfaces not
-common to all instances of the library.  For example, see libproc, or,
-if you are masochistic, libc or libnsl.
-
 The ISA-specific mapfiles look like the common mapfile, except that only
 the ISA-specific names appear.  The version names are the same as those
 in the common mapfile, but only non-empty version instances are present
@@ -164,6 +191,11 @@
 information from the common and ISA-specific mapfiles and merges them
 in memory into a single description used to create the resulting object.
 
+ISA-specific mapfiles were used with the version 1 mapfile language, which
+lacked conditional input. Their use is rare now, as conditional input is
+generally preferred. However, it is important to use conditional input
+carefully, or the resulting mapfile can be extremly difficult to read.
+
 -------------------------------------------------------------------------------
 
 4.0 Making interface additions to an existing library
@@ -233,37 +265,39 @@
 minor release "N+1" to reflect its inclusion of micro releases will
 look like the following:
 
-SUNW_1.4 {		# release N+1
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.4 {	# release N+1
     global:
 	...
 } SUNW_1.3.2;
 
-SUNW_1.3.2 {		# micro release 2 (e.g., release NU3)
+SYMBOL_VERSION SUNW_1.3.2 {	# micro release 2 (e.g., release NU3)
     global:
 	...
 } SUNW_1.3.1;
 
-SUNW_1.3.1 {		# micro release 1 (e.g., release NU2)
+SYMBOL_VERSION SUNW_1.3.1 {	# micro release 1 (e.g., release NU2)
     global:
 	...
 } SUNW_1.3;
 
-SUNW_1.3 {		# release N
+SYMBOL_VERSION SUNW_1.3 {	# release N
     global:
 	...
 } SUNW_1.2;
 
-SUNW_1.2 {		# release N-1
+SYMBOL_VERSION SUNW_1.2 {	# release N-1
     global:
 	...
 } SUNW_1.1;
 
-SUNW_1.1 {		# first release
+SYMBOL_VERSION SUNW_1.1 {	# first release
     global:
 	...
 };
 
-SUNW_private {		# same in all releases
+SYMBOL_VERSION SUNW_private {	# same in all releases
     global:
 	...
     local:
@@ -298,7 +332,7 @@
 library has to have the interface's entry changed from:
 	getfoobar;
 to:
-	getfoobar = FUNCTION FILTER libc.so.1;
+	getfoobar       { TYPE = FUNCTION; FILTER = libc.so.1 };
 See, for example, libnsl's common/mapfile-vers file.
 
 Follow the rules for adding a new interface for the necessary changes
@@ -384,12 +418,14 @@
 
 The new common/mapfile-vers file would contain:
 
-SUNW_1.1 {	# first release of libfoo
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {	# first release of libfoo
     global:
 	...
 };
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
     global:
 	...
     local:
@@ -425,12 +461,14 @@
 This becomes a tag by which the obsolescence of the library can be recognized.
 There is no numbering of this version name.
 
-SUNWobsolete {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWobsolete {
     global:
 	SUNWobsolete;	# This is the only way to do it.
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
 ...
 
 -------------------------------------------------------------------------------
--- a/usr/src/lib/auditd_plugins/binfile/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/auditd_plugins/binfile/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	auditd_plugin;
 	auditd_plugin_close;
--- a/usr/src/lib/auditd_plugins/remote/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/auditd_plugins/remote/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	auditd_plugin;
 	auditd_plugin_close;
--- a/usr/src/lib/auditd_plugins/syslog/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/auditd_plugins/syslog/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	auditd_plugin;
 	auditd_plugin_close;
--- a/usr/src/lib/brand/shared/librtld_db/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/brand/shared/librtld_db/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,21 +36,29 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		rtld_db_brand_ops32;
+
+$if _ELF64
+		rtld_db_brand_ops64;
+$endif
+
 	local:
 		*;
 };
 
 #Externally defined symbols
-{
+SYMBOL_SCOPE {
     global:
-	ps_pauxv =		NODIRECT PARENT;
-	ps_pdmodel =		NODIRECT PARENT;
-	ps_pglobal_lookup =	NODIRECT PARENT;
-	ps_pglobal_sym =	NODIRECT PARENT;
-	ps_plog =		NODIRECT PARENT;
-	ps_pread =		NODIRECT PARENT;
-	ps_pwrite =		NODIRECT PARENT;
+	ps_pauxv		{ FLAGS = NODIRECT PARENT };
+	ps_pdmodel		{ FLAGS = NODIRECT PARENT };
+	ps_pglobal_lookup	{ FLAGS = NODIRECT PARENT };
+	ps_pglobal_sym		{ FLAGS = NODIRECT PARENT };
+	ps_plog			{ FLAGS = NODIRECT PARENT };
+	ps_pread		{ FLAGS = NODIRECT PARENT };
+	ps_pwrite		{ FLAGS = NODIRECT PARENT };
 };
+
--- a/usr/src/lib/brand/sn1/librtld_db/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/brand/sn1/librtld_db/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -28,6 +28,5 @@
 include $(SRC)/lib/Makefile.lib.64
 
 CLOBBERFILES =	$(ROOTLIBDIR64)/$(DYNLIB)
-DYNFLAGS +=	-M$(BRAND_SHARED)/librtld_db/common/mapfile-vers.64
 
 install: all $(ROOTLIBS64)
--- a/usr/src/lib/brand/sn1/librtld_db/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/brand/sn1/librtld_db/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -28,6 +28,5 @@
 include $(SRC)/lib/Makefile.lib.64
 
 CLOBBERFILES =	$(ROOTLIBDIR64)/$(DYNLIB)
-DYNFLAGS +=	-M$(BRAND_SHARED)/librtld_db/common/mapfile-vers.64
 
 install: all $(ROOTLIBS64)
--- a/usr/src/lib/brand/sn1/sn1_brand/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/brand/sn1/sn1_brand/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,10 +37,12 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Scope everything local -- our .init section is our only public interface.
 #
-{
+SYMBOL_SCOPE {
 	local:
 		*;
 };
--- a/usr/src/lib/brand/solaris10/librtld_db/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/brand/solaris10/librtld_db/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 COBJS64 =	brand_librtld_db64.o
@@ -28,6 +28,5 @@
 include $(SRC)/lib/Makefile.lib.64
 
 CLOBBERFILES =	$(ROOTLIBDIR64)/$(DYNLIB)
-DYNFLAGS +=	-M$(BRAND_SHARED)/librtld_db/common/mapfile-vers.64
 
 install: all $(ROOTLIBS64)
--- a/usr/src/lib/brand/solaris10/librtld_db/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/brand/solaris10/librtld_db/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 COBJS64 =	brand_librtld_db64.o
@@ -28,6 +28,5 @@
 include $(SRC)/lib/Makefile.lib.64
 
 CLOBBERFILES =	$(ROOTLIBDIR64)/$(DYNLIB)
-DYNFLAGS +=	-M$(BRAND_SHARED)/librtld_db/common/mapfile-vers.64
 
 install: all $(ROOTLIBS64)
--- a/usr/src/lib/brand/solaris10/s10_brand/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/brand/solaris10/s10_brand/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,10 +37,12 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Scope everything local -- our .init section is our only public interface.
 #
-{
+SYMBOL_SCOPE {
 	local:
 		*;
 };
--- a/usr/src/lib/brand/solaris10/s10_npreload/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/brand/solaris10/s10_npreload/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.0 {
     local:
 	*;
 };
--- a/usr/src/lib/c_synonyms/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/c_synonyms/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY = c_synonyms.a
@@ -55,7 +52,9 @@
 $(DYNLIB):	mapfile-vers $(PICS)
 
 mapfile-vers:	../syn_common ../syn2_common syn_isa
-	echo "SUNWprivate_1.1 {\n    global:" >mapfile-vers
+	echo "\$$mapfile_version 2\n\nSYMBOL_VERSION SUNWprivate_1.1 {\n" \
+		>mapfile-vers
+	echo "    global:" >>mapfile-vers
 	$(CAT) ../syn_common syn_isa | \
 		$(SED) -e '/^#/d' -e '/^$$/d' -e 's/.*/	_&;/' >>mapfile-vers
 	$(CAT) ../syn2_common | \
--- a/usr/src/lib/cfgadm_plugins/ac/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/ac/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		cfga_change_state;
 		cfga_private_func;
--- a/usr/src/lib/cfgadm_plugins/fp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/fp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cfga_ap_id_cmp;
 	cfga_change_state;
--- a/usr/src/lib/cfgadm_plugins/ib/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/ib/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cfga_change_state;
 	cfga_help;
--- a/usr/src/lib/cfgadm_plugins/pci/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/pci/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cfga_change_state;
 	cfga_help;
--- a/usr/src/lib/cfgadm_plugins/sata/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/sata/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cfga_change_state;
 	cfga_help;
--- a/usr/src/lib/cfgadm_plugins/sbd/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/sbd/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		cfga_version;
 		cfga_change_state;
--- a/usr/src/lib/cfgadm_plugins/scsi/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/scsi/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cfga_change_state;
 	cfga_help;
--- a/usr/src/lib/cfgadm_plugins/shp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/shp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cfga_change_state;
 	cfga_help;
--- a/usr/src/lib/cfgadm_plugins/sysctrl/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		cfga_change_state;
 		cfga_private_func;
--- a/usr/src/lib/cfgadm_plugins/usb/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/cfgadm_plugins/usb/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cfga_change_state;
 	cfga_help;
--- a/usr/src/lib/crypt_modules/bsdbf/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/crypt_modules/bsdbf/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.0 {
     global:
 	crypt_genhash_impl;
 	crypt_gensalt_impl;
--- a/usr/src/lib/crypt_modules/bsdmd5/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/crypt_modules/bsdmd5/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.0 {
     global:
 	crypt_genhash_impl;
 	crypt_gensalt_impl;
--- a/usr/src/lib/crypt_modules/sha256/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/crypt_modules/sha256/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.0 {
     global:
 	crypt_genhash_impl;
 	crypt_gensalt_impl;
--- a/usr/src/lib/crypt_modules/sunmd5/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/crypt_modules/sunmd5/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.0 {
     global:
 	crypt_genhash_impl;
 	crypt_gensalt_impl;
--- a/usr/src/lib/efcode/extend/sparcv9/mapfile-extern	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/efcode/extend/sparcv9/mapfile-extern	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,8 +35,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # External interface requirements
-{
+SYMBOL_SCOPE {
 	global:
-		env =	EXTERN;
+		env	{ FLAGS = EXTERN };
 };
--- a/usr/src/lib/efcode/interpreter/mapfile64	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/efcode/interpreter/mapfile64	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -42,4 +41,7 @@
 #
 # MAPFILE HEADER END
 #
-text = V0x80000000;
+
+$mapfile_version 2
+
+LOAD_SEGMENT text { VADDR = 0x80000000 };
--- a/usr/src/lib/efcode/packages/mapfile-extern	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/efcode/packages/mapfile-extern	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,9 +35,11 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # External interface requirements
-{
+SYMBOL_SCOPE {
 	global:
-		fc_run_priv =		EXTERN;
-		search_for_fcode_file =	EXTERN;
+		fc_run_priv		{ FLAGS = EXTERN };
+		search_for_fcode_file	{ FLAGS = EXTERN };
 };
--- a/usr/src/lib/extendedFILE/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/extendedFILE/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,10 @@
 #
 # MAPFILE HEADER END
 #
-{
+
+$mapfile_version 2
+
+SYMBOL_SCOPE {
     local:
 	*;
 };
--- a/usr/src/lib/fm/libdiagcode/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libdiagcode/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	fm_dc_closedict;
 	fm_dc_code2key;
--- a/usr/src/lib/fm/libdiskstatus/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libdiskstatus/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	disk_status_close;
 	disk_status_errmsg;
--- a/usr/src/lib/fm/libfmd_adm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmd_adm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	fmd_adm_case_iter;
 	fmd_adm_case_repair;
--- a/usr/src/lib/fm/libfmd_agent/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmd_agent/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
-MAPFILES += mapfile-vers
-
 install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
--- a/usr/src/lib/fm/libfmd_agent/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate {
-    global:
-	fmd_agent_physcpu_info;
-
-    local:
-	*;
-};
--- a/usr/src/lib/fm/libfmd_agent/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmd_agent/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	fmd_agent_open;
 	fmd_agent_close;
@@ -48,6 +49,15 @@
 	fmd_agent_page_unretire;
 	fmd_agent_page_isretired;
 
+$if _x86
+	fmd_agent_physcpu_info;
+$if _ELF32
+	fmd_agent_cpu_retire;
+	fmd_agent_cpu_isretired;
+	fmd_agent_cpu_unretire;
+$endif
+$endif
+
     local:
 	*;
 };
--- a/usr/src/lib/fm/libfmd_agent/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmd_agent/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,12 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.com
 
-MAPFILES += mapfile-vers
-
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/fm/libfmd_agent/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate {
-    global:
-	fmd_agent_physcpu_info;
-	fmd_agent_cpu_retire;
-	fmd_agent_cpu_isretired;
-	fmd_agent_cpu_unretire;
-
-    local:
-	*;
-};
--- a/usr/src/lib/fm/libfmd_agent/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmd_agent/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,12 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.com
 
-MAPFILES += mapfile-vers
-
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/fm/libfmd_agent/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate {
-    global:
-
-    local:
-	*;
-};
--- a/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmd_agent/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
-MAPFILES += mapfile-vers
-
 install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
--- a/usr/src/lib/fm/libfmd_agent/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate {
-    global:
-
-    local:
-	*;
-};
--- a/usr/src/lib/fm/libfmd_log/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmd_log/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	fmd_log_close;
 	fmd_log_errmsg;
--- a/usr/src/lib/fm/libfmd_msg/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmd_msg/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # MAPFILE HEADER START
 #
@@ -35,7 +34,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	fmd_msg_fini;
 	fmd_msg_getitem_id;
--- a/usr/src/lib/fm/libfmd_snmp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmd_snmp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	fmd_fmri_alloc;
 	fmd_fmri_error;
--- a/usr/src/lib/fm/libfmevent/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libfmevent/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	fmev_attr_list;
 	fmev_class;
@@ -65,7 +66,7 @@
 	*;
 };
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
     global:
 	__fmev_errno;
     local:
--- a/usr/src/lib/fm/libldom/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libldom/sparc/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	ldom_fini;
 	ldom_find_id;
--- a/usr/src/lib/fm/libmdesc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/libmdesc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	md_find_name;
 	md_find_node_prop;
--- a/usr/src/lib/fm/topo/libtopo/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/topo/libtopo/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	topo_close;
 	topo_debug_set;
--- a/usr/src/lib/fm/topo/libtopo/common/topo_mod.map	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/fm/topo/libtopo/common/topo_mod.map	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -22,73 +21,74 @@
 # CDDL HEADER END
 #
 
-{
-	topo_node_range_create = FUNCTION extern;
-	topo_node_range_destroy = FUNCTION extern;
-	topo_node_bind = FUNCTION extern;
-	topo_node_unbind = FUNCTION extern;
-	topo_node_name = FUNCTION extern;
-	topo_node_setspecific = FUNCTION extern;
-	topo_node_getspecific = FUNCTION extern;
-	topo_node_instance = FUNCTION extern;
+$mapfile_version 2
+
+SYMBOL_SCOPE {
+	topo_node_range_create		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_node_range_destroy		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_node_bind			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_node_unbind		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_node_name			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_node_setspecific		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_node_getspecific		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_node_instance		{ TYPE = FUNCTION; FLAGS = extern };
 
-	topo_mod_alloc = FUNCTION extern;
-	topo_mod_zalloc = FUNCTION extern;
-	topo_mod_free = FUNCTION extern;
-	topo_mod_nvalloc = FUNCTION extern;
-	topo_mod_nvdup = FUNCTION extern;
-	topo_mod_strfree = FUNCTION extern;
-	topo_mod_strdup = FUNCTION extern;
+	topo_mod_alloc			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_zalloc			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_free			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_nvalloc		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_nvdup			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_strfree		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_strdup			{ TYPE = FUNCTION; FLAGS = extern };
 
-	topo_mod_clrdebug = FUNCTION extern;
-	topo_mod_setdebug = FUNCTION extern;
-	topo_mod_dprintf = FUNCTION extern;
-	topo_mod_errmsg = FUNCTION extern;
-	topo_mod_errno = FUNCTION extern;
+	topo_mod_clrdebug		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_setdebug		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_dprintf		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_errmsg			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_errno			{ TYPE = FUNCTION; FLAGS = extern };
 
-	topo_mod_load = FUNCTION extern;
-	topo_mod_unload = FUNCTION extern;
-	topo_mod_register = FUNCTION extern;
-	topo_mod_unregister = FUNCTION extern;
-	topo_mod_enumerate = FUNCTION extern;
-	topo_mod_enummap = FUNCTION extern;
-	topo_mod_release = FUNCTION extern;
-	topo_mod_getspecific = FUNCTION extern;
-	topo_mod_setspecific = FUNCTION extern;
-	topo_mod_hcfmri = FUNCTION extern;
-	topo_mod_devfmri = FUNCTION extern;
-	topo_mod_cpufmri = FUNCTION extern;
-	topo_mod_pkgfmri = FUNCTION extern;
-	topo_mod_modfmri = FUNCTION extern;
-	topo_mod_nvl2str = FUNCTION extern;
-	topo_mod_str2nvl = FUNCTION extern;
-	topo_mod_auth = FUNCTION extern;
+	topo_mod_load			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_unload			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_register		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_unregister		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_enumerate		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_enummap		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_release		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_getspecific		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_setspecific		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_hcfmri			{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_devfmri		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_cpufmri		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_pkgfmri		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_modfmri		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_nvl2str		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_str2nvl		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_mod_auth			{ TYPE = FUNCTION; FLAGS = extern };
 
-	topo_mod_walk_init = FUNCTION extern;
+	topo_mod_walk_init		{ TYPE = FUNCTION; FLAGS = extern };
 
-	topo_mod_smbios = FUNCTION extern;
+	topo_mod_smbios			{ TYPE = FUNCTION; FLAGS = extern };
 
-	topo_method_register = FUNCTION extern;
-	topo_method_unregister = FUNCTION extern;
-	topo_method_unregister_all = FUNCTION extern;
-	topo_method_invoke = FUNCTION extern;
-	topo_method_sensor_failure = FUNCTION extern;
+	topo_method_register		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_method_unregister		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_method_unregister_all	{ TYPE = FUNCTION; FLAGS = extern };
+	topo_method_invoke		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_method_sensor_failure	{ TYPE = FUNCTION; FLAGS = extern };
 
-	topo_prop_method_register = FUNCTION extern;
-	topo_prop_method_unregister = FUNCTION extern;
-	topo_prop_set_int32 = FUNCTION extern;
-	topo_prop_set_uint32 = FUNCTION extern;
-	topo_prop_set_int64 = FUNCTION extern;
-	topo_prop_set_uint64 = FUNCTION extern;
-	topo_prop_set_string = FUNCTION extern;
-	topo_prop_set_fmri = FUNCTION extern;
-	topo_prop_set_int32_array = FUNCTION extern;
-	topo_prop_set_uint32_array = FUNCTION extern;
-	topo_prop_set_int64_array = FUNCTION extern;
-	topo_prop_set_uint64_array = FUNCTION extern;
-	topo_prop_set_string_array = FUNCTION extern;
-	topo_prop_set_fmri_array = FUNCTION extern;
-	topo_prop_inherit = FUNCTION extern;
-	topo_pgroup_create = FUNCTION extern;
-
+	topo_prop_method_register	{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_method_unregister	{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_int32		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_uint32		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_int64		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_uint64		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_string		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_fmri		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_int32_array	{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_uint32_array	{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_int64_array	{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_uint64_array	{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_string_array	{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_set_fmri_array	{ TYPE = FUNCTION; FLAGS = extern };
+	topo_prop_inherit		{ TYPE = FUNCTION; FLAGS = extern };
+	topo_pgroup_create		{ TYPE = FUNCTION; FLAGS = extern };
 };
--- a/usr/src/lib/gss_mechs/mech_dh/backend/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -39,7 +38,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		__dh_gss_initialize;
 		__DH_GSS_C_NT_NETNAME;
--- a/usr/src/lib/gss_mechs/mech_dh/dh1024/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -39,7 +38,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		gss_mech_initialize;  # Entry point for libgss
 
--- a/usr/src/lib/gss_mechs/mech_dh/dh192/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/gss_mechs/mech_dh/dh192/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -39,7 +38,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		gss_mech_initialize;  # Entry point for libgss
 
--- a/usr/src/lib/gss_mechs/mech_dh/dh640/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/gss_mechs/mech_dh/dh640/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -39,7 +38,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		gss_mech_initialize;  # Entry point for libgss
 
--- a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,6 +20,8 @@
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+
+#
 # MAPFILE HEADER START
 #
 # WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
@@ -37,12 +39,14 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	adb_error_table;
 	add_com_err_hook;
--- a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	gss_mech_initialize;
 	mit_afs_string_to_key;
--- a/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	spnego_gss_accept_sec_context;
 	spnego_gss_acquire_cred;
--- a/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	gss_mech_initialize;
 };
--- a/usr/src/lib/hal/libhal-storage/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/hal/libhal-storage/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	libhal_storage_policy_new;
 	libhal_storage_policy_free;
@@ -124,7 +125,7 @@
 	libhal_volume_policy_get_mount_fs;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/hal/libhal/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/hal/libhal/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	libhal_ctx_new;
 	libhal_ctx_set_cache;
@@ -130,7 +131,7 @@
 	libhal_device_addon_is_ready;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/hbaapi/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/hbaapi/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	HBA_GetVersion;
 	HBA_GetWrapperLibraryAttributes;
@@ -69,7 +70,7 @@
 	*;
 };
 
-SUNW_2.0 {
+SYMBOL_VERSION SUNW_2.0 {
     global:
 	HBA_GetVendorLibraryAttributes;
 	HBA_OpenAdapterByWWN;
--- a/usr/src/lib/krb5/dyn/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/dyn/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -41,12 +40,14 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	DynAdd;
 	DynAppend;
--- a/usr/src/lib/krb5/kadm5/clnt/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/kadm5/clnt/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_kadm5_get_kpasswd_protocol;
 	chpass_principal3_2;
--- a/usr/src/lib/krb5/kadm5/srv/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/kadm5/srv/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -39,12 +39,14 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	__kadm5_get_priv;
 	_kadm5_get_kpasswd_protocol;
--- a/usr/src/lib/krb5/kdb/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/kdb/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -41,12 +40,14 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 	SUNW_1.1;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 	krb5_db_alloc;
 	krb5_db_create;
--- a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -41,12 +40,14 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	kdb2_bt_rseq;
 	kdb2_dbm_clearerr;
--- a/usr/src/lib/krb5/plugins/kdb/db2/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/plugins/kdb/db2/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -41,7 +40,9 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
         kdb_function_table;
     local:
--- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
         krb5_ldap_free;
         krb5_ldap_open;
--- a/usr/src/lib/krb5/plugins/kdb/ldap/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/plugins/kdb/ldap/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
         kdb_function_table;
     local:
--- a/usr/src/lib/krb5/plugins/preauth/pkinit/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/plugins/preauth/pkinit/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -42,7 +41,9 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	preauthentication_client_1;
 	preauthentication_server_1;
--- a/usr/src/lib/krb5/ss/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/krb5/ss/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	ss_abort_subsystem;
 	ss_add_info_dir;
--- a/usr/src/lib/libadm/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libadm/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY=	libadm.a
@@ -44,8 +41,6 @@
 LIBS=		$(DYNLIB) $(LINTLIB)
 SRCDIR=		../common
 
-MAPFILES +=	mapfile-vers
-
 CPPFLAGS +=	-I ../inc
 
 $(LINTLIB) :=	SRCS=$(SRCDIR)/$(LINTSRC)
--- a/usr/src/lib/libadm/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-# This mapfile is empty, on purpose.
-# Look at the mapfiles under i386, sparc and sparcv9 for content.
--- a/usr/src/lib/libadm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libadm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	read_extvtoc;
 	write_extvtoc;
@@ -47,19 +48,19 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
 	pkgdir;
 	read_vtoc;
 	write_vtoc;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_adddevtabrec;
 	_adddgrptabrec;
@@ -163,3 +164,38 @@
     local:
 	*;
 };
+
+
+$if _sparc || (_x86 && _ELF32)
+# The following applies to sparc (32/64-bit), and 32-bit x86:
+#
+# It was a mistake ever to have exported these symbols from libadm.
+# They are now being redirected to libgen where they really belong,
+# except for 'circf' and 'sed', which do not exist in libgen and
+# are being retained as dummy variables in libadm.
+
+SYMBOL_VERSION SUNW_0.7 {
+    global:
+	circf;
+	sed;
+	nbra		{ TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 };
+$if _ELF32
+	loc1		{ TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 };
+	loc2		{ TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 };
+	locs		{ TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x4 };
+$elif _ELF64
+	loc1		{ TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x8 };
+	loc2		{ TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x8 };
+	locs		{ TYPE = DATA; FILTER = libgen.so.1; SIZE = 0x8 };
+$else
+$error unknown ELFCLASS
+$endif
+};
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+    global:
+	advance		{ TYPE = FUNCTION; FILTER = libgen.so.1 };
+	compile		{ TYPE = FUNCTION; FILTER = libgen.so.1 };
+	step		{ TYPE = FUNCTION; FILTER = libgen.so.1 };
+};
+$endif
--- a/usr/src/lib/libadm/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-# It was a mistake ever to have exported these symbols from libadm.
-# They are now being redirected to libgen where they really belong,
-# except for 'circf' and 'sed', which do not exist in libgen and
-# are being retained as dummy variables in libadm.
-
-SUNW_0.7 {
-    global:
-	circf;
-	loc1 = DATA FILTER libgen.so.1 S0x4;
-	loc2 = DATA FILTER libgen.so.1 S0x4;
-	locs = DATA FILTER libgen.so.1 S0x4;
-	nbra = DATA FILTER libgen.so.1 S0x4;
-	sed;
-};
-
-SUNWprivate_1.1 {
-    global:
-	advance = FUNCTION FILTER libgen.so.1;
-	compile = FUNCTION FILTER libgen.so.1;
-	step = FUNCTION FILTER libgen.so.1;
-};
--- a/usr/src/lib/libadm/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-# It was a mistake ever to have exported these symbols from libadm.
-# They are now being redirected to libgen where they really belong,
-# except for 'circf' and 'sed', which do not exist in libgen and
-# are being retained as dummy variables in libadm.
-
-SUNW_0.7 {
-    global:
-	circf;
-	loc1 = DATA FILTER libgen.so.1 S0x4;
-	loc2 = DATA FILTER libgen.so.1 S0x4;
-	locs = DATA FILTER libgen.so.1 S0x4;
-	nbra = DATA FILTER libgen.so.1 S0x4;
-	sed;
-};
-
-SUNWprivate_1.1 {
-    global:
-	advance = FUNCTION FILTER libgen.so.1;
-	compile = FUNCTION FILTER libgen.so.1;
-	step = FUNCTION FILTER libgen.so.1;
-};
--- a/usr/src/lib/libadm/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-# It was a mistake ever to have exported these symbols from libadm.
-# They are now being redirected to libgen where they really belong,
-# except for 'circf' and 'sed', which do not exist in libgen and
-# are being retained as dummy variables in libadm.
-
-SUNW_0.7 {
-    global:
-	circf;
-	loc1 = DATA FILTER libgen.so.1 S0x8;
-	loc2 = DATA FILTER libgen.so.1 S0x8;
-	locs = DATA FILTER libgen.so.1 S0x8;
-	nbra = DATA FILTER libgen.so.1 S0x4;
-	sed;
-};
-
-SUNWprivate_1.1 {
-    global:
-	advance = FUNCTION FILTER libgen.so.1;
-	compile = FUNCTION FILTER libgen.so.1;
-	step = FUNCTION FILTER libgen.so.1;
-};
--- a/usr/src/lib/libadt_jni/auditxml_jni	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libadt_jni/auditxml_jni	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 # auditxml_jni [-d] <xml input file>
@@ -220,7 +219,9 @@
 # $notice_map
 #
 
-SUNWprivate_1.1 {
+\$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	c2j_pointer;
 	j2c_pointer;
--- a/usr/src/lib/libadutils/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libadutils/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	adutils_txtsid2hexbinsid;
 	adutils_bv_uint;
--- a/usr/src/lib/libaio/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libaio/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	libaio.a
@@ -30,4 +29,3 @@
 
 LIBS +=		$(LINTLIB)
 DYNFLAGS +=	-F libc.so.1
-MAPFILEDIR =	.				# redirect mapfile-vers
--- a/usr/src/lib/libaio/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.1 {
-    global:
-	assfail = FUNCTION;
-    local:
-	*;
-} SUNW_1.0;
-
-SUNW_1.0 {
-    global:
-	SUNW_1.0;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	aiocancel = FUNCTION;
-	aioread = FUNCTION;
-	aiowait = FUNCTION;
-	aiowrite = FUNCTION;
-	close = NODIRECT FUNCTION;
-	fork = NODIRECT FUNCTION;
-	sigaction = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_sigaction = FUNCTION;
-};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libaio/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,92 @@
+#
+# 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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+#
+# DO NOT TOUCH THIS FILE.
+# This file declares interfaces that are cast in stone.
+# They offer interfaces that will never change.
+# DO NOT TOUCH THIS FILE.
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+	assfail			{ TYPE = FUNCTION };
+    local:
+	*;
+} SUNW_1.0;
+
+SYMBOL_VERSION SUNW_1.0 {
+    global:
+$if _ELF32
+	aioread64		{ TYPE = FUNCTION };
+	aiowrite64		{ TYPE = FUNCTION };
+$elif _ELF64
+	SUNW_1.0;
+$else
+$error unknown ELFCLASS
+$endif
+} SUNW_0.7;
+
+#
+# For most platforms, SUNW_0.7 contains aiocancel, aioread, aiowait, and
+# aiowrite. For ABI reasons, 32-bit sparc puts them in SISCD_2.3, and
+# SUNW_0.7 inherits it.
+#
+SYMBOL_VERSION SUNW_0.7 {
+    global:
+	close			{ TYPE = FUNCTION; FLAGS = NODIRECT };
+	fork			{ TYPE = FUNCTION; FLAGS = NODIRECT };
+	sigaction		{ TYPE = FUNCTION };
+$if _sparc && _ELF32
+} SISCD_2.3;
+
+SYMBOL_VERSION SISCD_2.3 {
+    global:
+$endif
+	aiocancel		{ TYPE = FUNCTION };
+	aioread			{ TYPE = FUNCTION };
+	aiowait			{ TYPE = FUNCTION };
+	aiowrite		{ TYPE = FUNCTION };
+};
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+    global:
+	_sigaction		{ TYPE = FUNCTION };
+};
--- a/usr/src/lib/libaio/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.1 {
-    global:
-	assfail = FUNCTION;
-    local:
-	*;
-} SUNW_1.0;
-
-SUNW_1.0 {
-    global:
-	aioread64 = FUNCTION;
-	aiowrite64 = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	aiocancel = FUNCTION;
-	aioread = FUNCTION;
-	aiowait = FUNCTION;
-	aiowrite = FUNCTION;
-	close = NODIRECT FUNCTION;
-	fork = NODIRECT FUNCTION;
-	sigaction = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_sigaction = FUNCTION;
-};
--- a/usr/src/lib/libaio/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.1 {
-    global:
-	assfail = FUNCTION;
-    local:
-	*;
-} SUNW_1.0;
-
-SUNW_1.0 {
-    global:
-	aioread64 = FUNCTION;
-	aiowrite64 = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	close = NODIRECT FUNCTION;
-	fork = NODIRECT FUNCTION;
-	sigaction = FUNCTION;
-} SISCD_2.3;
-
-SISCD_2.3 {
-    global:
-	aiocancel = FUNCTION;
-	aioread = FUNCTION;
-	aiowait = FUNCTION;
-	aiowrite = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_sigaction = FUNCTION;
-};
--- a/usr/src/lib/libaio/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.1 {
-    global:
-	assfail = FUNCTION;
-    local:
-	*;
-} SUNW_1.0;
-
-SUNW_1.0 {
-    global:
-	SUNW_1.0;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	aiocancel = FUNCTION;
-	aioread = FUNCTION;
-	aiowait = FUNCTION;
-	aiowrite = FUNCTION;
-	close = NODIRECT FUNCTION;
-	fork = NODIRECT FUNCTION;
-	sigaction = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_sigaction = FUNCTION;
-};
--- a/usr/src/lib/libast/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libast/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -37,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # functions
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_Sfextern;
 	_Sfi;
@@ -688,7 +690,7 @@
 };
 
 # data
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	Dtbag;
 	Dthash;
--- a/usr/src/lib/libavl/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libavl/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	avl_add;
 	avl_create;
--- a/usr/src/lib/libbrand/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libbrand/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	brand_allow_exclusive_ip;
 	brand_close;
--- a/usr/src/lib/libbsdmalloc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libbsdmalloc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,11 +36,13 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
-	free = NODIRECT;
-	malloc = NODIRECT;
-	realloc = NODIRECT;
+	free		{ FLAGS = NODIRECT };
+	malloc		{ FLAGS = NODIRECT };
+	realloc		{ FLAGS = NODIRECT };
     local:
 	*;
 };
--- a/usr/src/lib/libbsm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libbsm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	au_to_arg32;
 	au_to_arg64;
@@ -52,12 +54,12 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.8;
 
-SUNW_0.8 {
+SYMBOL_VERSION SUNW_0.8 {
     global:
 	au_to_newgroups;
 	getauclassent_r;
@@ -69,7 +71,7 @@
 	getauusernam_r;
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
 	au_close;
 	audit;
@@ -123,7 +125,7 @@
 	setauuser;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	adr_char;
 	adr_count;
@@ -336,11 +338,11 @@
     local:
 	# These functions are aliased to "int" versions. Let those
 	# go into .SUNW_dynsymsort, and keep these out.
-	adrm_long =	NODYNSORT;
-	adrm_u_long =	NODYNSORT;
-	adrf_long =	NODYNSORT;
-	adrf_u_long =	NODYNSORT;
-	adrm_putlong =	NODYNSORT;
+	adrm_long		{ FLAGS = NODYNSORT };
+	adrm_u_long		{ FLAGS = NODYNSORT };
+	adrf_long		{ FLAGS = NODYNSORT };
+	adrf_u_long		{ FLAGS = NODYNSORT };
+	adrm_putlong		{ FLAGS = NODYNSORT };
 
 	# Reduce all remaining global symbols to local scope
 	*;
--- a/usr/src/lib/libc/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBCBASE=.
@@ -912,7 +911,7 @@
 $(DYNLIB) := PICS += $(ROOTFS_LIBDIR64)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS)
 
-MAPFILES =	../port/mapfile-vers mapfile-vers
+MAPFILES =	../port/mapfile-vers
 
 CPPFLAGS=	-D_REENTRANT -D$(MACH64) -D__$(MACH64) $(THREAD_DEBUG) \
 		-I. -I$(LIBCBASE)/inc -I../inc $(CPPFLAGS.master) -I/usr/include
--- a/usr/src/lib/libc/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,788 +0,0 @@
-#
-# 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 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.23 {
-    global:
-	dl_iterate_phdr = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-};
-
-SUNW_1.22 {
-    global:
-	dladdr = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	dladdr1 = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	dlamd64getunwind = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	dlclose = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	dldump = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	dlerror = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	dlinfo = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	dlmopen = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	dlopen = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	dlsym = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-    protected:
-	_SUNW_Unwind_DeleteException;
-	_SUNW_Unwind_ForcedUnwind;
-	_SUNW_Unwind_GetCFA;
-	_SUNW_Unwind_GetGR;
-	_SUNW_Unwind_GetIP;
-	_SUNW_Unwind_GetLanguageSpecificData;
-	_SUNW_Unwind_GetRegionStart;
-	_SUNW_Unwind_RaiseException;
-	_SUNW_Unwind_Resume;
-	_SUNW_Unwind_SetGR;
-	_SUNW_Unwind_SetIP;
-	_UA_CLEANUP_PHASE;
-	_UA_FORCE_UNWIND;
-	_UA_HANDLER_FRAME;
-	_UA_SEARCH_PHASE;
-	_Unwind_DeleteException;
-	_Unwind_ForcedUnwind;
-	_Unwind_GetCFA;
-	_Unwind_GetGR;
-	_Unwind_GetIP;
-	_Unwind_GetLanguageSpecificData;
-	_Unwind_GetRegionStart;
-	_Unwind_RaiseException;
-	_Unwind_Resume;
-	_Unwind_SetGR;
-	_Unwind_SetIP;
-	walkcontext;
-};
-
-SUNW_0.7 {
-    global:
-	_altzone;
-	calloc = NODIRECT;
-	_ctype;
-	__ctype;
-	daylight;
-	_daylight;
-	environ = NODIRECT;
-	_environ = NODIRECT;
-	errno = NODIRECT;
-	free = NODIRECT;
-	frexp = FUNCTION FILTER libm.so.2;
-	getdate_err;
-	_getdate_err;
-	getenv;
-	__huge_val;
-	_iob;
-	__iob;
-	isnan = FUNCTION FILTER libm.so.2;
-	_isnan = FUNCTION FILTER libm.so.2;
-	isnand = FUNCTION FILTER libm.so.2;
-	_isnand = FUNCTION FILTER libm.so.2;
-	ldexp = FUNCTION FILTER libm.so.2;
-	logb = FUNCTION FILTER libm.so.2;
-	malloc = NODIRECT;
-	modf = FUNCTION FILTER libm.so.2;
-	_modf = FUNCTION FILTER libm.so.2;
-	memcmp;
-	memcpy;
-	memmove;
-	memset;
-	nextafter = FUNCTION FILTER libm.so.2;
-	_nextafter = FUNCTION FILTER libm.so.2;
-	_numeric;
-	optarg;
-	opterr;
-	optind;
-	optopt;
-	realloc = NODIRECT;
-	scalb = FUNCTION FILTER libm.so.2;
-	_scalb = FUNCTION FILTER libm.so.2;
-	_sibuf;
-	_sobuf;
-	_sys_buslist;
-	_sys_cldlist;
-	_sys_fpelist;
-	_sys_segvlist;
-	_sys_siginfolistp;
-	_sys_siglist;
-	_sys_siglistn;
-	_sys_siglistp;
-	_sys_traplist;
-	timezone;
-	_timezone;
-	tzname;
-	_tzname;
-    protected:
-	abort;
-	abs;
-	access;
-	_access;
-	acct;
-	_acct;
-	addseverity;
-	_addseverity;
-	alarm;
-	_alarm;
-	asctime;
-	asctime_r;
-	_assert;
-	__assert;
-	atexit;
-	atof;
-	atoi;
-	atol;
-	bsearch;
-	__builtin_alloca;
-	catclose;
-	_catclose;
-	catgets;
-	_catgets;
-	catopen;
-	_catopen;
-	cfgetispeed;
-	_cfgetispeed;
-	cfgetospeed;
-	_cfgetospeed;
-	cfsetispeed;
-	_cfsetispeed;
-	cfsetospeed;
-	_cfsetospeed;
-	chdir;
-	_chdir;
-	chmod;
-	_chmod;
-	chown;
-	_chown;
-	chroot;
-	_chroot;
-	_cleanup;
-	clearerr;
-	clock;
-	_close;
-	close;
-	closedir;
-	_closedir;
-	creat;
-	_creat;
-	crypt;
-	_crypt;
-	ctermid;
-	ctime;
-	ctime_r;
-	cuserid;
-	_cuserid;
-	difftime;
-	div;
-	dup;
-	_dup;
-	dup2;
-	_dup2;
-	encrypt;
-	_encrypt;
-	endgrent;
-	endpwent;
-	___errno;
-	execl;
-	_execl;
-	execle;
-	_execle;
-	execlp;
-	_execlp;
-	execv;
-	_execv;
-	execve;
-	_execve;
-	execvp;
-	_execvp;
-	exit;
-	_exit;
-	fattach;
-	_fattach;
-	fchdir;
-	_fchdir;
-	fchmod;
-	_fchmod;
-	fchown;
-	_fchown;
-	fclose;
-	fcntl;
-	_fcntl;
-	fdetach;
-	_fdetach;
-	fdopen;
-	_fdopen;
-	feof;
-	ferror;
-	fflush;
-	fgetc;
-	fgetgrent;
-	fgetgrent_r;
-	fgetpos;
-	fgetpwent;
-	fgetpwent_r;
-	fgets;
-	__filbuf;
-	fileno;
-	_fileno;
-	file_to_decimal;
-	flockfile;
-	_flsbuf;
-	__flsbuf;
-	fmtmsg;
-	_fmtmsg;
-	fopen;
-	_fork;
-	fork;
-	fpathconf;
-	_fpathconf;
-	fprintf;
-	fputc;
-	fputs;
-	fread;
-	freopen;
-	fscanf;
-	fseek;
-	fsetpos;
-	fstat;
-	_fstat;
-	fstatvfs;
-	_fstatvfs;
-	fsync;
-	_fsync;
-	ftell;
-	ftok;
-	_ftok;
-	funlockfile;
-	fwrite;
-	getc;
-	getchar;
-	getchar_unlocked;
-	getcontext;
-	_getcontext;
-	getc_unlocked;
-	getcwd;
-	_getcwd;
-	getdate;
-	_getdate;
-	getegid;
-	_getegid;
-	geteuid;
-	_geteuid;
-	getgid;
-	_getgid;
-	getgrent;
-	getgrent_r;
-	getgrgid;
-	getgrgid_r;
-	getgrnam;
-	getgrnam_r;
-	getgroups;
-	_getgroups;
-	getitimer;
-	_getitimer;
-	getlogin;
-	getlogin_r;
-	getmsg;
-	_getmsg;
-	getopt;
-	_getopt;
-	getpass;
-	_getpass;
-	getpgid;
-	_getpgid;
-	getpgrp;
-	_getpgrp;
-	getpid;
-	_getpid;
-	getpmsg;
-	_getpmsg;
-	getppid;
-	_getppid;
-	getpwent;
-	getpwent_r;
-	getpwnam;
-	getpwnam_r;
-	getpwuid;
-	getpwuid_r;
-	getrlimit;
-	_getrlimit;
-	gets;
-	getsid;
-	_getsid;
-	getsubopt;
-	_getsubopt;
-	gettimeofday;
-	_gettimeofday;
-	gettxt;
-	_gettxt;
-	getuid;
-	_getuid;
-	getw;
-	_getw;
-	gmtime;
-	gmtime_r;
-	grantpt;
-	_grantpt;
-	hcreate;
-	_hcreate;
-	hdestroy;
-	_hdestroy;
-	hsearch;
-	_hsearch;
-	initgroups;
-	_initgroups;
-	ioctl;
-	_ioctl;
-	isalnum;
-	isalpha;
-	isascii;
-	_isascii;
-	isastream;
-	_isastream;
-	isatty;
-	_isatty;
-	iscntrl;
-	isdigit;
-	isgraph;
-	islower;
-	isprint;
-	ispunct;
-	isspace;
-	isupper;
-	isxdigit;
-	kill;
-	_kill;
-	labs;
-	lchown;
-	_lchown;
-	ldiv;
-	lfind;
-	_lfind;
-	link;
-	_link;
-	localeconv;
-	localtime;
-	localtime_r;
-	lockf;
-	_lockf;
-	longjmp;
-	lsearch;
-	_lsearch;
-	lseek;
-	_lseek;
-	lstat;
-	_lstat;
-	makecontext;
-	_makecontext;
-	mblen;
-	mbstowcs;
-	mbtowc;
-	memccpy;
-	_memccpy;
-	memchr;
-	memcntl;
-	_memcntl;
-	mkdir;
-	_mkdir;
-	mkfifo;
-	_mkfifo;
-	mknod;
-	_mknod;
-	mktemp;
-	_mktemp;
-	mktime;
-	mlock;
-	_mlock;
-	mmap;
-	_mmap;
-	monitor;
-	_monitor;
-	mount;
-	_mount;
-	mprotect;
-	_mprotect;
-	msgctl;
-	_msgctl;
-	msgget;
-	_msgget;
-	msgrcv;
-	_msgrcv;
-	msgsnd;
-	_msgsnd;
-	msync;
-	_msync;
-	munlock;
-	_munlock;
-	munmap;
-	_munmap;
-	_mutex_held = NODYNSORT;
-	_mutex_lock = NODYNSORT;
-	nftw;
-	_nftw;
-	nice;
-	_nice;
-	nl_langinfo;
-	_nl_langinfo;
-	open;
-	_open;
-	opendir;
-	_opendir;
-	pathconf;
-	_pathconf;
-	pause;
-	_pause;
-	pclose;
-	_pclose;
-	perror;
-	pipe;
-	_pipe;
-	poll;
-	_poll;
-	p_online;
-	popen;
-	_popen;
-	printf;
-	profil;
-	_profil;
-	ptsname;
-	_ptsname;
-	putc;
-	putchar;
-	putchar_unlocked;
-	putc_unlocked;
-	putenv;
-	_putenv;
-	putmsg;
-	_putmsg;
-	putpmsg;
-	_putpmsg;
-	puts;
-	putw;
-	_putw;
-	qsort;
-	raise;
-	rand;
-	rand_r;
-	read;
-	_read;
-	readdir;
-	_readdir;
-	readdir_r;
-	readlink;
-	_readlink;
-	readv;
-	_readv;
-	remove;
-	rename;
-	_rename;
-	rewind;
-	rewinddir;
-	_rewinddir;
-	rmdir;
-	_rmdir;
-	_rw_read_held;
-	_rw_write_held;
-	sbrk;
-	scanf;
-	seekdir;
-	_seekdir;
-	semctl;
-	_semctl;
-	semget;
-	_semget;
-	semop;
-	_semop;
-	setbuf;
-	setcontext;
-	_setcontext = NODYNSORT;
-	setgid;
-	_setgid;
-	setgrent;
-	setgroups;
-	_setgroups;
-	setitimer;
-	_setitimer;
-	setjmp;
-	setkey;
-	_setkey;
-	setlabel;
-	setlocale;
-	setpgid;
-	_setpgid;
-	setpgrp;
-	_setpgrp;
-	setpwent;
-	setrlimit;
-	_setrlimit;
-	setsid;
-	_setsid;
-	setuid;
-	_setuid;
-	setvbuf;
-	shmat;
-	_shmat;
-	shmctl;
-	_shmctl;
-	shmdt;
-	_shmdt;
-	shmget;
-	_shmget;
-	sigaction;
-	_sigaction = NODYNSORT;
-	sigaddset;
-	_sigaddset;
-	sigaltstack;
-	_sigaltstack;
-	sigdelset;
-	_sigdelset;
-	sigemptyset;
-	_sigemptyset;
-	sigfillset;
-	_sigfillset;
-	sighold;
-	_sighold;
-	sigignore;
-	_sigignore;
-	sigismember;
-	_sigismember;
-	siglongjmp;
-	_siglongjmp;
-	signal;
-	sigpause;
-	_sigpause;
-	sigpending;
-	_sigpending;
-	sigprocmask;
-	_sigprocmask;
-	sigrelse;
-	_sigrelse;
-	sigsend;
-	_sigsend;
-	sigsendset;
-	_sigsendset;
-	sigset;
-	_sigset;
-	sigsetjmp;
-	_sigsetjmp = NODYNSORT;
-	sigsuspend;
-	_sigsuspend;
-	sleep;
-	_sleep;
-	sprintf;
-	srand;
-	srand48;
-	sscanf;
-	stat;
-	_stat;
-	statvfs;
-	_statvfs;
-	stime;
-	_stime;
-	strcat;
-	strchr;
-	strcmp;
-	strcoll;
-	strcpy;
-	strcspn;
-	strdup;
-	_strdup;
-	strerror;
-	strftime;
-	strlen;
-	strncat;
-	strncmp;
-	strncpy;
-	strpbrk;
-	strrchr;
-	strspn;
-	strstr;
-	strtod;
-	strtok;
-	strtok_r;
-	strtol;
-	strtoul;
-	strxfrm;
-	swab;
-	_swab;
-	swapcontext;
-	_swapcontext;
-	symlink;
-	_symlink;
-	sync;
-	_sync;
-	_syscall;
-	sysconf;
-	_sysconf;
-	sysinfo;
-	_sysinfo;
-	system;
-	tcdrain;
-	_tcdrain;
-	tcflow;
-	_tcflow;
-	tcflush;
-	_tcflush;
-	tcgetattr;
-	_tcgetattr;
-	tcgetpgrp;
-	_tcgetpgrp;
-	tcgetsid;
-	_tcgetsid;
-	tcsendbreak;
-	_tcsendbreak;
-	tcsetattr;
-	_tcsetattr;
-	tcsetpgrp;
-	_tcsetpgrp;
-	tdelete;
-	_tdelete;
-	tell;
-	_tell;
-	telldir;
-	_telldir;
-	tempnam;
-	_tempnam;
-	tfind;
-	_tfind;
-	time;
-	_time;
-	times;
-	_times;
-	tmpfile;
-	tmpnam;
-	toascii;
-	_toascii;
-	tolower;
-	_tolower;
-	toupper;
-	_toupper;
-	tsearch;
-	_tsearch;
-	ttyname;
-	ttyname_r;
-	twalk;
-	_twalk;
-	tzset;
-	_tzset;
-	ulimit;
-	_ulimit;
-	umask;
-	_umask;
-	umount;
-	_umount;
-	uname;
-	_uname;
-	ungetc;
-	unlink;
-	_unlink;
-	unlockpt;
-	_unlockpt;
-	utime;
-	_utime;
-	vfprintf;
-	vprintf;
-	vsprintf;
-	wait;
-	_wait;
-	waitid;
-	_waitid;
-	waitpid;
-	_waitpid;
-	wcstombs;
-	wctomb;
-	write;
-	_write;
-	writev;
-	_writev;
-	_xftw;
-} SYSVABI_1.3;
-
-SYSVABI_1.3 {
-    global:
-	__flt_rounds;
-    protected:
-	_ctermid;
-	_fpstart;
-	__fpstart;
-	_getgrgid;
-	_getgrnam;
-	_getlogin;
-	_getpwnam;
-	_getpwuid;
-	_sbrk;
-	_ttyname;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_dladdr = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_dladdr1 = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_dlamd64getunwind = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_dlclose = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_dldump = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_dlerror = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_dlinfo = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_dlmopen = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_dlopen = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_dlsym = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_ld_libc = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
-	_memcmp;
-	_memcpy;
-	_memmove;
-	_memset;
-    protected:
-	_D_cplx_lr_div;
-	_D_cplx_lr_div_ix;
-	_D_cplx_lr_div_rx;
-	_F_cplx_lr_div;
-	_F_cplx_lr_div_ix;
-	_F_cplx_lr_div_rx;
-	__fltrounds;
-	__fseterror_u;
-	sysi86;
-	_sysi86;
-	_X_cplx_div;
-	_X_cplx_div_ix;
-	_X_cplx_div_rx;
-	_X_cplx_lr_div;
-	_X_cplx_lr_div_ix;
-	_X_cplx_lr_div_rx;
-	_X_cplx_mul;
-	__xgetRD;
-	__xtol;
-	__xtoll;
-	__xtoul;
-	__xtoull;
-
-    local:
-	___tls_get_addr = NODYNSORT;
-};
--- a/usr/src/lib/libc/i386/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/i386/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIB_PIC= libc_pic.a
@@ -954,7 +953,7 @@
 $(DYNLIB) := PICS += $(ROOTFS_LIBDIR)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(LDLIBS)
 
-MAPFILES =	../port/mapfile-vers ../i386/mapfile-vers
+MAPFILES =	../port/mapfile-vers
 
 #
 # EXTN_CPPFLAGS and EXTN_CFLAGS set in enclosing Makefile
--- a/usr/src/lib/libc/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,947 +0,0 @@
-#
-# 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 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.23 {
-    global:
-	dl_iterate_phdr = FUNCTION FILTER /usr/lib/ld.so.1;
-
-    protected:
-	aio_cancel64;
-	aio_error64;
-	aio_fsync64;
-	aio_read64;
-	aioread64;
-	aio_return64;
-	aio_suspend64;
-	aio_waitn64;
-	aio_write64;
-	aiowrite64;
-	lio_listio64;
-	mkstemps64;
-	posix_fadvise64;
-	posix_fallocate64;
-};
-
-SUNW_1.22.1 {
-    protected:
-	# Note: atomic_[and,dec,inc,or]_64_nv are also defined
-	# by the common mapfile. Here, we add the NODYNSORT attribute
-	# to them. On this platform, they are aliases for the non-_nv
-	# versions. If that is changed, these lines should be removed.
-	atomic_and_64_nv =		NODYNSORT;
-	atomic_dec_64_nv =		NODYNSORT;
-	atomic_inc_64_nv =		NODYNSORT;
-	atomic_or_64_nv =		NODYNSORT;
-
-	enable_extended_FILE_stdio;
-} SUNW_1.22;
-
-SUNW_1.22 {
-    global:
-	dladdr = FUNCTION FILTER /usr/lib/ld.so.1;
-	dladdr1 = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlclose = FUNCTION FILTER /usr/lib/ld.so.1;
-	dldump = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlerror = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlinfo = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlmopen = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlopen = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlsym = FUNCTION FILTER /usr/lib/ld.so.1;
-    protected:
-	alphasort64;
-	_alphasort64;
-
-	# Note: atomic_add_64_nv is also defined by the common mapfile.
-	# Here, we add the NODYNSORT attribute to it. On this platform,
-	# it is an aliases for atomic_add_64. If that is changed, this
-	# line should be removed.
-	atomic_add_64_nv = 		NODYNSORT;
-
-	pselect_large_fdset;
-	scandir64;
-	_scandir64;
-};
-
-SUNW_1.21 {
-    protected:
-	attropen64;
-	_attropen64;
-	fstatat64;
-	_fstatat64;
-	openat64;
-	_openat64;
-	walkcontext;
-};
-
-SUNW_1.18 {
-    protected:
-	select_large_fdset;
-};
-
-SUNW_1.1 {
-    protected:
-	creat64;
-	_creat64;
-	fgetpos64;
-	fopen64;
-	freopen64;
-	fseeko64;
-	fsetpos64;
-	fstat64;
-	_fstat64;
-	fstatvfs64;
-	_fstatvfs64;
-	ftello64;
-	ftruncate64;
-	_ftruncate64;
-	ftw64;
-	_ftw64;
-	getdents64;
-	_getdents64;
-	getrlimit64;
-	_getrlimit64;
-	lockf64;
-	_lockf64;
-	lseek64;
-	_lseek64;
-	lstat64;
-	_lstat64;
-	mkstemp64;
-	_mkstemp64;
-	mmap64;
-	_mmap64;
-	nftw64;
-	_nftw64;
-	open64;
-	_open64;
-	__posix_readdir_r;
-	pread64;
-	_pread64;
-	pwrite64;
-	_pwrite64;
-	readdir64;
-	_readdir64;
-	readdir64_r;
-	_readdir64_r;
-	setrlimit64;
-	_setrlimit64;
-	s_fcntl;
-	_s_fcntl = NODYNSORT;
-	s_ioctl;
-	stat64;
-	_stat64;
-	statvfs64;
-	_statvfs64;
-	tell64;
-	_tell64;
-	tmpfile64;
-	truncate64;
-	_truncate64;
-	_xftw64;
-};
-
-SUNW_0.7 {
-    global:
-	_bufendtab;
-	_ctype;
-	errno = NODIRECT;
-	_iob;
-	_lastbuf;
-	_sibuf;
-	_sobuf;
-	_sys_buslist;
-	_sys_cldlist;
-	sys_errlist;
-	_sys_fpelist;
-	sys_nerr;
-	_sys_nsig;
-	_sys_segvlist;
-	_sys_siginfolistp;
-	_sys_siglist;
-	_sys_siglistn;
-	_sys_siglistp;
-	_sys_traplist;
-    protected:
-	addseverity;
-	_addseverity;
-	asctime_r;
-	_assert;
-	__builtin_alloca;
-	crypt;
-	_crypt;
-	ctime_r;
-	__div64;
-	encrypt;
-	_encrypt;
-	endgrent;
-	endpwent;
-	___errno;
-	fgetgrent;
-	fgetgrent_r;
-	fgetpwent;
-	fgetpwent_r;
-	file_to_decimal;
-	flockfile;
-	_flsbuf;
-	funlockfile;
-	getchar_unlocked;
-	getc_unlocked;
-	getgrent;
-	getgrent_r;
-	getgrgid_r;
-	getgrnam_r;
-	getitimer;
-	_getitimer;
-	getlogin_r;
-	getpwent;
-	getpwent_r;
-	getpwnam_r;
-	getpwuid_r;
-	gettimeofday;
-	_gettimeofday;
-	gmtime_r;
-	localtime_r;
-	__mul64;
-	_mutex_held = NODYNSORT;
-	_mutex_lock = NODYNSORT;
-	p_online;
-	putchar_unlocked;
-	putc_unlocked;
-	rand_r;
-	readdir_r;
-	__rem64;
-	_rw_read_held;
-	_rw_write_held;
-	setgrent;
-	setitimer;
-	_setitimer;
-	setkey;
-	_setkey;
-	setpwent;
-	srand48;
-	strtok_r;
-	_syscall = NODYNSORT;
-	sysinfo;
-	_sysinfo;
-	ttyname_r;
-	__udiv64;
-	__urem64;
-} SYSVABI_1.3;
-
-SYSVABI_1.3 {
-    global:
-	_altzone;
-	calloc = NODIRECT;
-	__ctype;
-	daylight;
-	_daylight;
-	environ = NODIRECT;
-	_environ = NODIRECT;
-	__flt_rounds;
-	_fp_hw;
-	free = NODIRECT;
-	frexp = FUNCTION FILTER libm.so.2;
-	getdate_err;
-	_getdate_err;
-	getenv;
-	__huge_val;
-	__iob;
-	isnan = FUNCTION FILTER libm.so.2;
-	_isnan = FUNCTION FILTER libm.so.2;
-	isnand = FUNCTION FILTER libm.so.2;
-	_isnand = FUNCTION FILTER libm.so.2;
-	ldexp = FUNCTION FILTER libm.so.2;
-	logb = FUNCTION FILTER libm.so.2;
-	malloc = NODIRECT;
-	memcmp;
-	memcpy;
-	memmove;
-	memset;
-	modf = FUNCTION FILTER libm.so.2;
-	_modf = FUNCTION FILTER libm.so.2;
-	nextafter = FUNCTION FILTER libm.so.2;
-	_nextafter = FUNCTION FILTER libm.so.2;
-	_numeric;
-	optarg;
-	opterr;
-	optind;
-	optopt;
-	realloc = NODIRECT;
-	scalb = FUNCTION FILTER libm.so.2;
-	_scalb = FUNCTION FILTER libm.so.2;
-	timezone;
-	_timezone;
-	tzname;
-	_tzname;
-    protected:
-	abort;
-	abs;
-	access;
-	_access;
-	acct;
-	_acct;
-	alarm;
-	_alarm;
-	asctime;
-	__assert;
-	atexit;
-	atof;
-	atoi;
-	atol;
-	bsearch;
-	catclose;
-	_catclose;
-	catgets;
-	_catgets;
-	catopen;
-	_catopen;
-	cfgetispeed;
-	_cfgetispeed;
-	cfgetospeed;
-	_cfgetospeed;
-	cfsetispeed;
-	_cfsetispeed;
-	cfsetospeed;
-	_cfsetospeed;
-	chdir;
-	_chdir;
-	chmod;
-	_chmod;
-	chown;
-	_chown;
-	chroot;
-	_chroot;
-	_cleanup;
-	clearerr;
-	clock;
-	_close;
-	close;
-	closedir;
-	_closedir;
-	creat;
-	_creat;
-	ctermid;
-	_ctermid;
-	ctime;
-	cuserid;
-	_cuserid;
-	difftime;
-	div;
-	dup;
-	_dup;
-	dup2;
-	_dup2;
-	execl;
-	_execl;
-	execle;
-	_execle;
-	execlp;
-	_execlp;
-	execv;
-	_execv;
-	execve;
-	_execve;
-	execvp;
-	_execvp;
-	exit;
-	_exit;
-	fattach;
-	_fattach;
-	fchdir;
-	_fchdir;
-	fchmod;
-	_fchmod;
-	fchown;
-	_fchown;
-	fclose;
-	fcntl;
-	_fcntl;
-	fdetach;
-	_fdetach;
-	fdopen;
-	_fdopen;
-	feof;
-	ferror;
-	fflush;
-	fgetc;
-	fgetpos;
-	fgets;
-	__filbuf;
-	fileno;
-	_fileno;
-	__flsbuf;
-	fmtmsg;
-	_fmtmsg;
-	fopen;
-	_fork;
-	fork;
-	fpathconf;
-	_fpathconf;
-	fprintf;
-	_fpstart;
-	__fpstart;
-	fputc;
-	fputs;
-	fread;
-	freopen;
-	fscanf;
-	fseek;
-	fsetpos;
-	fstat;
-	_fstat;
-	fstatvfs;
-	_fstatvfs;
-	fsync;
-	_fsync;
-	ftell;
-	ftok;
-	_ftok;
-	fwrite;
-	_fxstat;
-	getc;
-	getchar;
-	getcontext;
-	_getcontext;
-	getcwd;
-	_getcwd;
-	getdate;
-	_getdate;
-	getegid;
-	_getegid;
-	geteuid;
-	_geteuid;
-	getgid;
-	_getgid;
-	getgrgid;
-	_getgrgid;
-	getgrnam;
-	_getgrnam;
-	getgroups;
-	_getgroups;
-	getlogin;
-	_getlogin;
-	getmsg;
-	_getmsg;
-	getopt;
-	_getopt;
-	getpass;
-	_getpass;
-	getpgid;
-	_getpgid;
-	getpgrp;
-	_getpgrp;
-	getpid;
-	_getpid;
-	getpmsg;
-	_getpmsg;
-	getppid;
-	_getppid;
-	getpwnam;
-	_getpwnam;
-	getpwuid;
-	_getpwuid;
-	getrlimit;
-	_getrlimit;
-	gets;
-	getsid;
-	_getsid;
-	getsubopt;
-	_getsubopt;
-	gettxt;
-	_gettxt;
-	getuid;
-	_getuid;
-	getw;
-	_getw;
-	gmtime;
-	grantpt;
-	_grantpt;
-	hcreate;
-	_hcreate;
-	hdestroy;
-	_hdestroy;
-	hsearch;
-	_hsearch;
-	initgroups;
-	_initgroups;
-	ioctl;
-	_ioctl;
-	isalnum;
-	isalpha;
-	isascii;
-	_isascii;
-	isastream;
-	_isastream;
-	isatty;
-	_isatty;
-	iscntrl;
-	isdigit;
-	isgraph;
-	islower;
-	isprint;
-	ispunct;
-	isspace;
-	isupper;
-	isxdigit;
-	kill;
-	_kill;
-	labs;
-	lchown;
-	_lchown;
-	ldiv;
-	lfind;
-	_lfind;
-	link;
-	_link;
-	localeconv;
-	localtime;
-	lockf;
-	_lockf;
-	longjmp;
-	lsearch;
-	_lsearch;
-	lseek;
-	_lseek;
-	lstat;
-	_lstat;
-	_lxstat;
-	makecontext;
-	_makecontext;
-	mblen;
-	mbstowcs;
-	mbtowc;
-	memccpy;
-	_memccpy;
-	memchr;
-	memcntl;
-	_memcntl;
-	mkdir;
-	_mkdir;
-	mkfifo;
-	_mkfifo;
-	mknod;
-	_mknod;
-	mktemp;
-	_mktemp;
-	mktime;
-	mlock;
-	_mlock;
-	mmap;
-	_mmap;
-	monitor;
-	_monitor;
-	mount;
-	_mount;
-	mprotect;
-	_mprotect;
-	msgctl;
-	_msgctl;
-	msgget;
-	_msgget;
-	msgrcv;
-	_msgrcv;
-	msgsnd;
-	_msgsnd;
-	msync;
-	_msync;
-	munlock;
-	_munlock;
-	munmap;
-	_munmap;
-	nftw;
-	_nftw;
-	nice;
-	_nice;
-	nl_langinfo;
-	_nl_langinfo;
-	nuname;
-	_nuname;
-	open;
-	_open;
-	opendir;
-	_opendir;
-	pathconf;
-	_pathconf;
-	pause;
-	_pause;
-	pclose;
-	_pclose;
-	perror;
-	pipe;
-	_pipe;
-	poll;
-	_poll;
-	popen;
-	_popen;
-	printf;
-	profil;
-	_profil;
-	ptrace;
-	_ptrace;
-	ptsname;
-	_ptsname;
-	putc;
-	putchar;
-	putenv;
-	_putenv;
-	putmsg;
-	_putmsg;
-	putpmsg;
-	_putpmsg;
-	puts;
-	putw;
-	_putw;
-	qsort;
-	raise;
-	rand;
-	read;
-	_read;
-	readdir;
-	_readdir;
-	readlink;
-	_readlink;
-	readv;
-	_readv;
-	remove;
-	rename;
-	_rename;
-	rewind;
-	rewinddir;
-	_rewinddir;
-	rmdir;
-	_rmdir;
-	sbrk;
-	_sbrk;
-	scanf;
-	seekdir;
-	_seekdir;
-	semctl;
-	_semctl;
-	semget;
-	_semget;
-	semop;
-	_semop;
-	setbuf;
-	setcontext;
-	_setcontext = NODYNSORT;
-	setgid;
-	_setgid;
-	setgroups;
-	_setgroups;
-	setjmp;
-	setlabel;
-	setlocale;
-	setpgid;
-	_setpgid;
-	setpgrp;
-	_setpgrp;
-	setrlimit;
-	_setrlimit;
-	setsid;
-	_setsid;
-	setuid;
-	_setuid;
-	setvbuf;
-	shmat;
-	_shmat;
-	shmctl;
-	_shmctl;
-	shmdt;
-	_shmdt;
-	shmget;
-	_shmget;
-	sigaction;
-	_sigaction = NODYNSORT;
-	sigaddset;
-	_sigaddset;
-	sigaltstack;
-	_sigaltstack;
-	sigdelset;
-	_sigdelset;
-	sigemptyset;
-	_sigemptyset;
-	sigfillset;
-	_sigfillset;
-	sighold;
-	_sighold;
-	sigignore;
-	_sigignore;
-	sigismember;
-	_sigismember;
-	siglongjmp;
-	_siglongjmp;
-	signal;
-	sigpause;
-	_sigpause;
-	sigpending;
-	_sigpending;
-	sigprocmask;
-	_sigprocmask;
-	sigrelse;
-	_sigrelse;
-	sigsend;
-	_sigsend;
-	sigsendset;
-	_sigsendset;
-	sigset;
-	_sigset;
-	sigsetjmp;
-	_sigsetjmp = NODYNSORT;
-	sigsuspend;
-	_sigsuspend;
-	sleep;
-	_sleep;
-	sprintf;
-	srand;
-	sscanf;
-	stat;
-	_stat;
-	statvfs;
-	_statvfs;
-	stime;
-	_stime;
-	strcat;
-	strchr;
-	strcmp;
-	strcoll;
-	strcpy;
-	strcspn;
-	strdup;
-	_strdup;
-	strerror;
-	strftime;
-	strlen;
-	strncat;
-	strncmp;
-	strncpy;
-	strpbrk;
-	strrchr;
-	strspn;
-	strstr;
-	strtod;
-	strtok;
-	strtol;
-	strtoul;
-	strxfrm;
-	swab;
-	_swab;
-	swapcontext;
-	_swapcontext;
-	symlink;
-	_symlink;
-	sync;
-	_sync;
-	sysconf;
-	_sysconf;
-	system;
-	tcdrain;
-	_tcdrain;
-	tcflow;
-	_tcflow;
-	tcflush;
-	_tcflush;
-	tcgetattr;
-	_tcgetattr;
-	tcgetpgrp;
-	_tcgetpgrp;
-	tcgetsid;
-	_tcgetsid;
-	tcsendbreak;
-	_tcsendbreak;
-	tcsetattr;
-	_tcsetattr;
-	tcsetpgrp;
-	_tcsetpgrp;
-	tdelete;
-	_tdelete;
-	tell;
-	_tell;
-	telldir;
-	_telldir;
-	tempnam;
-	_tempnam;
-	tfind;
-	_tfind;
-	time;
-	_time;
-	times;
-	_times;
-	tmpfile;
-	tmpnam;
-	toascii;
-	_toascii;
-	tolower;
-	_tolower;
-	toupper;
-	_toupper;
-	tsearch;
-	_tsearch;
-	ttyname;
-	_ttyname;
-	twalk;
-	_twalk;
-	tzset;
-	_tzset;
-	ulimit;
-	_ulimit;
-	umask;
-	_umask;
-	umount;
-	_umount;
-	uname;
-	_uname;
-	ungetc;
-	unlink;
-	_unlink;
-	unlockpt;
-	_unlockpt;
-	utime;
-	_utime;
-	vfprintf;
-	vprintf;
-	vsprintf;
-	wait;
-	_wait;
-	waitid;
-	_waitid;
-	waitpid;
-	_waitpid;
-	wcstombs;
-	wctomb;
-	write;
-	_write;
-	writev;
-	_writev;
-	_xftw;
-	_xmknod;
-	_xstat;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_dladdr = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dladdr1 = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlclose = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dldump = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlerror = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlinfo = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlmopen = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlopen = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlsym = FUNCTION FILTER /usr/lib/ld.so.1;
-	_ld_libc = FUNCTION FILTER /usr/lib/ld.so.1;
-	_memcmp;
-	_memcpy;
-	_memmove;
-	_memset;
-	_sse_hw;
-	_sys_errlist;
-	_sys_errs;
-	_sys_index;
-	_sys_nerr = NODYNSORT;
-	_sys_num_err;
-    protected:
-	_D_cplx_lr_div;
-	_D_cplx_lr_div_ix;
-	_D_cplx_lr_div_rx;
-	__divdi3;
-	__divrem64;
-	_F_cplx_lr_div;
-	_F_cplx_lr_div_ix;
-	_F_cplx_lr_div_rx;
-	_file_set;
-	__fltrounds;
-	_fprintf_c89;
-	_fscanf_c89;
-	__fseterror_u;
-	_fwprintf_c89;
-	_fwscanf_c89;
-	_imaxabs_c89;
-	_imaxdiv_c89;
-	__moddi3;
-	_printf_c89;
-	_scanf_c89;
-	_snprintf_c89;
-	_sprintf_c89;
-	_sscanf_c89;
-	_strtoimax_c89;
-	_strtoumax_c89;
-	_swprintf_c89;
-	_swscanf_c89;
-	sysi86;
-	_sysi86;
-	___tls_get_addr;
-	__udivdi3;
-	__udivrem64;
-	__umoddi3;
-	_vfprintf_c89;
-	_vfscanf_c89;
-	_vfwprintf_c89;
-	_vfwscanf_c89;
-	_vprintf_c89;
-	_vscanf_c89;
-	_vsnprintf_c89;
-	_vsprintf_c89;
-	_vsscanf_c89;
-	_vswprintf_c89;
-	_vswscanf_c89;
-	_vwprintf_c89;
-	_vwscanf_c89;
-	_wcstoimax_c89;
-	_wcstoumax_c89;
-	_wprintf_c89;
-	_wscanf_c89;
-	_X_cplx_div;
-	_X_cplx_div_ix;
-	_X_cplx_div_rx;
-	_X_cplx_lr_div;
-	_X_cplx_lr_div_ix;
-	_X_cplx_lr_div_rx;
-	_X_cplx_mul;
-	__xgetRD;
-	__xtol;
-	__xtoll;
-	__xtoul;
-	__xtoull;
-
-    local:
-	_syscall6 =		NODYNSORT;
-	__systemcall6 =		NODYNSORT;
-	_seekdir64 =		NODYNSORT;
-	_telldir64 =		NODYNSORT;
-};
--- a/usr/src/lib/libc/i386_hwcap1/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/i386_hwcap1/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,13 +1,11 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # 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,6 +20,9 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-hwcap_1 = fpu cmov sep mmx sse;
+
+$mapfile_version 2
+
+CAPABILITY {
+	hw += fpu cmov sep mmx sse;
+};
--- a/usr/src/lib/libc/i386_hwcap2/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/i386_hwcap2/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,13 +1,11 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # 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,6 +20,9 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-hwcap_1 = fpu cmov amd_sysc mmx sse sse2;
+
+$mapfile_version 2
+
+CAPABILITY {
+	hw += fpu cmov amd_sysc mmx sse sse2;
+};
--- a/usr/src/lib/libc/i386_hwcap3/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/i386_hwcap3/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -21,6 +20,9 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-hwcap_1 = fpu cmov mmx sse;
+
+$mapfile_version 2
+
+CAPABILITY {
+	hw += fpu cmov mmx sse;
+};
--- a/usr/src/lib/libc/port/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/port/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,6 +36,8 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # All function names added to this or any other libc mapfile
 # must be placed under the 'protected:' designation.
@@ -59,10 +60,46 @@
 #
 
 
-SUNW_1.23 {		# SunOS 5.11 (Solaris 11)
+# Mnemonic conditional input identifiers:
+#
+# - amd64, i386, sparc32, sparcv9: Correspond to ISA subdirectories used to
+#	hold per-platform code. Note however that we use 'sparc32' instead of
+#	'sparc'. Since '_sparc' is predefined to apply to, all sparc platforms,
+#	naming the 32-bit version 'sparc' would be too likely to cause errors.
+#
+# -	lf64: Defined on platforms that offer the 32-bit largefile APIs
+#
+$if _ELF32
+$add lf64
+$endif
+$if _sparc && _ELF32
+$add sparc32
+$endif
+$if _sparc && _ELF64
+$add sparcv9
+$endif
+$if _x86 && _ELF32
+$add i386
+$endif
+$if _x86 && _ELF64
+$add amd64
+$endif
+
+SYMBOL_VERSION SUNW_1.23 {	# SunOS 5.11 (Solaris 11)
     global:
 	_nl_domain_bindings;
 	_nl_msg_cat_cntr;
+
+$if _ELF32
+	dl_iterate_phdr	{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+$elif sparcv9
+	dl_iterate_phdr	{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+$elif amd64
+	dl_iterate_phdr	{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+$else
+$error unknown platform
+$endif
+
     protected:
 	addrtosymstr;
 	aio_cancel;
@@ -195,24 +232,42 @@
 	vwarnx;
 	warn;
 	warnx;
+
+$if lf64
+	aio_cancel64;
+	aio_error64;
+	aio_fsync64;
+	aio_read64;
+	aioread64;
+	aio_return64;
+	aio_suspend64;
+	aio_waitn64;
+	aio_write64;
+	aiowrite64;
+	lio_listio64;
+	mkstemps64;
+	posix_fadvise64;
+	posix_fallocate64;
+$endif
 } SUNW_1.22.6;
 
-SUNW_1.22.6 {		# s10u9 - SunOS 5.10 (Solaris 10) patch additions
+SYMBOL_VERSION SUNW_1.22.6 {	# s10u9 - SunOS 5.10 (Solaris 10) patch additions
+    protected:
 	futimens;
 	utimensat;
 } SUNW_1.22.5;
 
-SUNW_1.22.5 {		# s10u8 - SunOS 5.10 (Solaris 10) patch additions
+SYMBOL_VERSION SUNW_1.22.5 {	# s10u8 - SunOS 5.10 (Solaris 10) patch additions
     protected:
 	getpagesizes2;
 } SUNW_1.22.4;
 
-SUNW_1.22.4 {		# s10u7 - SunOS 5.10 (Solaris 10) patch additions
+SYMBOL_VERSION SUNW_1.22.4 {	# s10u7 - SunOS 5.10 (Solaris 10) patch additions
     protected:
 	SUNW_1.22.4;
 } SUNW_1.22.3;
 
-SUNW_1.22.3 {		# SunOS 5.10 (Solaris 10) patch additions
+SYMBOL_VERSION SUNW_1.22.3 {	# SunOS 5.10 (Solaris 10) patch additions
     protected:
 	mutex_consistent;
 	u8_textprep_str;
@@ -220,25 +275,25 @@
 	uucopystr;
 } SUNW_1.22.2;
 
-SUNW_1.22.2 {		# SunOS 5.10 (Solaris 10) patch additions
+SYMBOL_VERSION SUNW_1.22.2 {	# SunOS 5.10 (Solaris 10) patch additions
     protected:
 	is_system_labeled;
 	ucred_getlabel;
 	_ucred_getlabel;
 } SUNW_1.22.1;
 
-SUNW_1.22.1 {		# SunOS 5.10 (Solaris 10) patch additions
+SYMBOL_VERSION SUNW_1.22.1 {	# SunOS 5.10 (Solaris 10) patch additions
     protected:
 	atomic_add_8;
 	atomic_add_8_nv;
-	atomic_add_char =		NODYNSORT;
-	atomic_add_char_nv =		NODYNSORT;
-	atomic_add_int =		NODYNSORT;
-	atomic_add_int_nv =		NODYNSORT;
-	atomic_add_ptr =		NODYNSORT;
-	atomic_add_ptr_nv =		NODYNSORT;
-	atomic_add_short =		NODYNSORT;
-	atomic_add_short_nv =		NODYNSORT;
+	atomic_add_char		{ FLAGS = NODYNSORT };
+	atomic_add_char_nv	{ FLAGS = NODYNSORT };
+	atomic_add_int		{ FLAGS = NODYNSORT };
+	atomic_add_int_nv	{ FLAGS = NODYNSORT };
+	atomic_add_ptr		{ FLAGS = NODYNSORT };
+	atomic_add_ptr_nv	{ FLAGS = NODYNSORT };
+	atomic_add_short	{ FLAGS = NODYNSORT };
+	atomic_add_short_nv	{ FLAGS = NODYNSORT };
 	atomic_and_16;
 	atomic_and_16_nv;
 	atomic_and_32_nv;
@@ -246,23 +301,23 @@
 	atomic_and_64_nv;
 	atomic_and_8;
 	atomic_and_8_nv;
-	atomic_and_uchar =		NODYNSORT;
-	atomic_and_uchar_nv =		NODYNSORT;
-	atomic_and_uint_nv =		NODYNSORT;
-	atomic_and_ulong =		NODYNSORT;
-	atomic_and_ulong_nv =		NODYNSORT;
-	atomic_and_ushort =		NODYNSORT;
-	atomic_and_ushort_nv =		NODYNSORT;
+	atomic_and_uchar	{ FLAGS = NODYNSORT };
+	atomic_and_uchar_nv	{ FLAGS = NODYNSORT };
+	atomic_and_uint_nv	{ FLAGS = NODYNSORT };
+	atomic_and_ulong	{ FLAGS = NODYNSORT };
+	atomic_and_ulong_nv	{ FLAGS = NODYNSORT };
+	atomic_and_ushort	{ FLAGS = NODYNSORT };
+	atomic_and_ushort_nv	{ FLAGS = NODYNSORT };
 	atomic_cas_16;
 	atomic_cas_32;
 	atomic_cas_64;
 	atomic_cas_8;
-	atomic_cas_ptr =		NODYNSORT;
-	atomic_cas_uchar =		NODYNSORT;
-	atomic_cas_uint =		NODYNSORT;
-	atomic_cas_ulong =		NODYNSORT;
-	atomic_cas_ushort =		NODYNSORT;
-	atomic_clear_long_excl =	NODYNSORT;
+	atomic_cas_ptr		{ FLAGS = NODYNSORT };
+	atomic_cas_uchar	{ FLAGS = NODYNSORT };
+	atomic_cas_uint		{ FLAGS = NODYNSORT };
+	atomic_cas_ulong	{ FLAGS = NODYNSORT };
+	atomic_cas_ushort	{ FLAGS = NODYNSORT };
+	atomic_clear_long_excl	{ FLAGS = NODYNSORT };
 	atomic_dec_16;
 	atomic_dec_16_nv;
 	atomic_dec_32;
@@ -271,14 +326,14 @@
 	atomic_dec_64_nv;
 	atomic_dec_8;
 	atomic_dec_8_nv;
-	atomic_dec_uchar =		NODYNSORT;
-	atomic_dec_uchar_nv =		NODYNSORT;
-	atomic_dec_uint =		NODYNSORT;
-	atomic_dec_uint_nv =		NODYNSORT;
-	atomic_dec_ulong =		NODYNSORT;
-	atomic_dec_ulong_nv =		NODYNSORT;
-	atomic_dec_ushort =		NODYNSORT;
-	atomic_dec_ushort_nv =		NODYNSORT;
+	atomic_dec_uchar	{ FLAGS = NODYNSORT };
+	atomic_dec_uchar_nv	{ FLAGS = NODYNSORT };
+	atomic_dec_uint		{ FLAGS = NODYNSORT };
+	atomic_dec_uint_nv	{ FLAGS = NODYNSORT };
+	atomic_dec_ulong	{ FLAGS = NODYNSORT };
+	atomic_dec_ulong_nv	{ FLAGS = NODYNSORT };
+	atomic_dec_ushort	{ FLAGS = NODYNSORT };
+	atomic_dec_ushort_nv	{ FLAGS = NODYNSORT };
 	atomic_inc_16;
 	atomic_inc_16_nv;
 	atomic_inc_32;
@@ -287,14 +342,14 @@
 	atomic_inc_64_nv;
 	atomic_inc_8;
 	atomic_inc_8_nv;
-	atomic_inc_uchar =		NODYNSORT;
-	atomic_inc_uchar_nv =		NODYNSORT;
-	atomic_inc_uint =		NODYNSORT;
-	atomic_inc_uint_nv =		NODYNSORT;
-	atomic_inc_ulong =		NODYNSORT;
-	atomic_inc_ulong_nv =		NODYNSORT;
-	atomic_inc_ushort =		NODYNSORT;
-	atomic_inc_ushort_nv =		NODYNSORT;
+	atomic_inc_uchar	{ FLAGS = NODYNSORT };
+	atomic_inc_uchar_nv	{ FLAGS = NODYNSORT };
+	atomic_inc_uint		{ FLAGS = NODYNSORT };
+	atomic_inc_uint_nv	{ FLAGS = NODYNSORT };
+	atomic_inc_ulong	{ FLAGS = NODYNSORT };
+	atomic_inc_ulong_nv	{ FLAGS = NODYNSORT };
+	atomic_inc_ushort	{ FLAGS = NODYNSORT };
+	atomic_inc_ushort_nv	{ FLAGS = NODYNSORT };
 	atomic_or_16;
 	atomic_or_16_nv;
 	atomic_or_32_nv;
@@ -302,30 +357,104 @@
 	atomic_or_64_nv;
 	atomic_or_8;
 	atomic_or_8_nv;
-	atomic_or_uchar =		NODYNSORT;
-	atomic_or_uchar_nv =		NODYNSORT;
-	atomic_or_uint_nv =		NODYNSORT;
-	atomic_or_ulong =		NODYNSORT;
-	atomic_or_ulong_nv =		NODYNSORT;
-	atomic_or_ushort =		NODYNSORT;
-	atomic_or_ushort_nv =		NODYNSORT;
-	atomic_set_long_excl =		NODYNSORT;
+	atomic_or_uchar		{ FLAGS = NODYNSORT };
+	atomic_or_uchar_nv	{ FLAGS = NODYNSORT };
+	atomic_or_uint_nv	{ FLAGS = NODYNSORT };
+	atomic_or_ulong		{ FLAGS = NODYNSORT };
+	atomic_or_ulong_nv	{ FLAGS = NODYNSORT };
+	atomic_or_ushort	{ FLAGS = NODYNSORT };
+	atomic_or_ushort_nv	{ FLAGS = NODYNSORT };
+	atomic_set_long_excl	{ FLAGS = NODYNSORT };
 	atomic_swap_16;
 	atomic_swap_32;
 	atomic_swap_64;
 	atomic_swap_8;
-	atomic_swap_ptr =		NODYNSORT;
-	atomic_swap_uchar =		NODYNSORT;
-	atomic_swap_uint =		NODYNSORT;
-	atomic_swap_ulong =		NODYNSORT;
-	atomic_swap_ushort =		NODYNSORT;
+	atomic_swap_ptr		{ FLAGS = NODYNSORT };
+	atomic_swap_uchar	{ FLAGS = NODYNSORT };
+	atomic_swap_uint	{ FLAGS = NODYNSORT };
+	atomic_swap_ulong	{ FLAGS = NODYNSORT };
+	atomic_swap_ushort	{ FLAGS = NODYNSORT };
 	membar_consumer;
 	membar_enter;
 	membar_exit;
 	membar_producer;
+
+$if _ELF32
+	enable_extended_FILE_stdio;
+$endif
+
+$if i386
+	# Note: atomic_[and,dec,inc,or]_64_nv are also defined above. Here,
+	# we add the NODYNSORT attribute to them. On this platform, they are
+	# aliases for the non-_nv versions. If that is changed, these lines
+	# should be removed.
+	atomic_and_64_nv	{ FLAGS = NODYNSORT };
+	atomic_dec_64_nv	{ FLAGS = NODYNSORT };
+	atomic_inc_64_nv	{ FLAGS = NODYNSORT };
+	atomic_or_64_nv		{ FLAGS = NODYNSORT };
+$endif
+$if _sparc
+	# Note: atomic_OP_WIDTH_nv symbols are also defined above. Here,
+	# we add the NODYNSORT attribute to them. On this platform, they are
+	# aliases for the non-_nv versions. If that is changed, these lines
+	# should be removed.
+	atomic_add_8_nv		{ FLAGS = NODYNSORT };
+	atomic_and_8_nv		{ FLAGS = NODYNSORT };
+	atomic_and_16_nv	{ FLAGS = NODYNSORT };
+	atomic_and_32_nv	{ FLAGS = NODYNSORT };
+	atomic_and_64_nv	{ FLAGS = NODYNSORT };
+	atomic_dec_8_nv		{ FLAGS = NODYNSORT };
+	atomic_dec_16_nv	{ FLAGS = NODYNSORT };
+	atomic_dec_32_nv	{ FLAGS = NODYNSORT };
+	atomic_dec_64_nv	{ FLAGS = NODYNSORT };
+	atomic_inc_8_nv		{ FLAGS = NODYNSORT };
+	atomic_inc_16_nv	{ FLAGS = NODYNSORT };
+	atomic_inc_32_nv	{ FLAGS = NODYNSORT };
+	atomic_inc_64_nv	{ FLAGS = NODYNSORT };
+	atomic_or_8_nv		{ FLAGS = NODYNSORT };
+	atomic_or_16_nv		{ FLAGS = NODYNSORT };
+	atomic_or_32_nv		{ FLAGS = NODYNSORT };
+	atomic_or_64_nv		{ FLAGS = NODYNSORT };
+$endif
 } SUNW_1.22;
 
-SUNW_1.22 {		# SunOS 5.10 (Solaris 10)
+SYMBOL_VERSION SUNW_1.22 {	# SunOS 5.10 (Solaris 10)
+    global:
+$if _ELF32
+	dladdr		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	dladdr1		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	dlclose		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	dldump		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	dlerror		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	dlinfo		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	dlmopen		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	dlopen		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	dlsym		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+$elif sparcv9
+	dladdr		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	dladdr1		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	dlclose		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	dldump		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	dlerror		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	dlinfo		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	dlmopen		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	dlopen		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	dlsym		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+$elif amd64
+	dladdr		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	dladdr1		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	dlamd64getunwind { TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	dlclose		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	dldump		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	dlerror		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	dlinfo		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	dlmopen		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	dlopen		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	dlsym		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+$else
+$error unknown platform
+$endif
+
     protected:
 	alphasort;
 	_alphasort;
@@ -335,12 +464,12 @@
 	atomic_add_32_nv;
 	atomic_add_64;
 	atomic_add_64_nv;
-	atomic_add_long =		NODYNSORT;
-	atomic_add_long_nv =		NODYNSORT;
+	atomic_add_long		{ FLAGS = NODYNSORT };
+	atomic_add_long_nv	{ FLAGS = NODYNSORT };
 	atomic_and_32;
-	atomic_and_uint =		NODYNSORT;
+	atomic_and_uint		{ FLAGS = NODYNSORT };
 	atomic_or_32;
-	atomic_or_uint =		NODYNSORT;
+	atomic_or_uint		{ FLAGS = NODYNSORT };
 	_Exit;
 	getisax;
 	_getisax;
@@ -463,9 +592,9 @@
 	pthread_barrier_wait;
 	pthread_condattr_getclock;
 	pthread_condattr_setclock;
-	pthread_mutexattr_getrobust_np =	NODYNSORT;
-	pthread_mutexattr_setrobust_np =	NODYNSORT;
-	pthread_mutex_consistent_np =		NODYNSORT;
+	pthread_mutexattr_getrobust_np	{ FLAGS = NODYNSORT };
+	pthread_mutexattr_setrobust_np	{ FLAGS = NODYNSORT };
+	pthread_mutex_consistent_np	{ FLAGS = NODYNSORT };
 	pthread_mutex_reltimedlock_np;
 	pthread_mutex_timedlock;
 	pthread_rwlock_reltimedrdlock_np;
@@ -533,14 +662,73 @@
 	wcstoll;
 	wcstoull;
 	wcstoumax;
+
+$if lf64
+	alphasort64;
+	_alphasort64;
+	pselect_large_fdset;
+	scandir64;
+	_scandir64;
+$endif
+
+$if _ELF64
+	walkcontext;
+$endif
+
+$if _sparc
+	# Note: atomic_add_[16,32,64]_nv are also defined above. Here, we add
+	# the NODYNSORT attribute to them. On this platform, they are aliases
+	# for the non-_nv versions. If that is changed, these lines should be
+	# removed.
+	atomic_add_16_nv	{ FLAGS = NODYNSORT };
+	atomic_add_32_nv	{ FLAGS = NODYNSORT };
+	atomic_add_64_nv	{ FLAGS = NODYNSORT };
+$endif
+
+$if i386
+	# Note: atomic_add_64_nv is also defined above. Here, we add the
+	# NODYNSORT attribute to it. On this platform, it is an aliases for
+	# atomic_add_64. If that is changed, this line should be removed.
+	atomic_add_64_nv 	{ FLAGS = NODYNSORT };
+$endif
+
+$if amd64
+	# Exception unwind APIs required by the amd64 ABI
+	_SUNW_Unwind_DeleteException;
+	_SUNW_Unwind_ForcedUnwind;
+	_SUNW_Unwind_GetCFA;
+	_SUNW_Unwind_GetGR;
+	_SUNW_Unwind_GetIP;
+	_SUNW_Unwind_GetLanguageSpecificData;
+	_SUNW_Unwind_GetRegionStart;
+	_SUNW_Unwind_RaiseException;
+	_SUNW_Unwind_Resume;
+	_SUNW_Unwind_SetGR;
+	_SUNW_Unwind_SetIP;
+	_UA_CLEANUP_PHASE;
+	_UA_FORCE_UNWIND;
+	_UA_HANDLER_FRAME;
+	_UA_SEARCH_PHASE;
+	_Unwind_DeleteException;
+	_Unwind_ForcedUnwind;
+	_Unwind_GetCFA;
+	_Unwind_GetGR;
+	_Unwind_GetIP;
+	_Unwind_GetLanguageSpecificData;
+	_Unwind_GetRegionStart;
+	_Unwind_RaiseException;
+	_Unwind_Resume;
+	_Unwind_SetGR;
+	_Unwind_SetIP;
+$endif
 } SUNW_1.21.3;
 
-SUNW_1.21.3 {		# SunOS 5.9 (Solaris 9) patch additions
+SYMBOL_VERSION SUNW_1.21.3 {	# SunOS 5.9 (Solaris 9) patch additions
     protected:
 	forkall;
 } SUNW_1.21.2;
 
-SUNW_1.21.2 {		# SunOS 5.9 (Solaris 9) patch additions
+SYMBOL_VERSION SUNW_1.21.2 {	# SunOS 5.9 (Solaris 9) patch additions
     protected:
 	getustack;
 	_getustack;
@@ -555,14 +743,19 @@
 	_stack_setbounds;
 	stack_violation;
 	_stack_violation;
+
+$if _sparc
+	__makecontext_v2;
+	___makecontext_v2;
+$endif
 } SUNW_1.21.1;
 
-SUNW_1.21.1 {		# SunOS 5.9 (Solaris 9) patch additions
+SYMBOL_VERSION SUNW_1.21.1 {	# SunOS 5.9 (Solaris 9) patch additions
     protected:
 	crypt_gensalt;
 } SUNW_1.21;
 
-SUNW_1.21 {		# SunOS 5.9 (Solaris 9)
+SYMBOL_VERSION SUNW_1.21 {	# SunOS 5.9 (Solaris 9)
     protected:
 	attropen;
 	_attropen;
@@ -585,7 +778,7 @@
 	getcpuid;
 	_getcpuid;
 	gethomelgroup;
-	_gethomelgroup =		NODYNSORT;
+	_gethomelgroup		{ FLAGS = NODYNSORT };
 	getpagesizes;
 	getrctl;
 	_getrctl;
@@ -634,15 +827,28 @@
 	_vsscanf;
 	vswscanf;
 	vwscanf;
+
+$if _ELF32
+	walkcontext;
+$endif
+
+$if lf64
+	attropen64;
+	_attropen64;
+	fstatat64;
+	_fstatat64;
+	openat64;
+	_openat64;
+$endif
 } SUNW_1.20.4;
 
-SUNW_1.20.4 {		# SunOS 5.8 (Solaris 8) patch additions
+SYMBOL_VERSION SUNW_1.20.4 {	# SunOS 5.8 (Solaris 8) patch additions
     protected:
 	semtimedop;
 	_semtimedop;
 } SUNW_1.20.1;
 
-SUNW_1.20.1 {		# SunOS 5.8 (Solaris 8) patch additions
+SYMBOL_VERSION SUNW_1.20.1 {	# SunOS 5.8 (Solaris 8) patch additions
     protected:
 	getacct;
 	_getacct;
@@ -666,13 +872,13 @@
 	_wracct;
 } SUNW_1.20;
 
-SUNW_1.20 {		# SunOS 5.8 (Solaris 8)
+SYMBOL_VERSION SUNW_1.20 {	# SunOS 5.8 (Solaris 8)
     protected:
 	getextmntent;
 	resetmnttab;
 } SUNW_1.19;
 
-SUNW_1.19 {
+SYMBOL_VERSION SUNW_1.19 {
     protected:
 	strlcat;
 	strlcpy;
@@ -680,12 +886,12 @@
 	_umount2;
 } SUNW_1.18.1;
 
-SUNW_1.18.1 {
+SYMBOL_VERSION SUNW_1.18.1 {
     protected:
 	__fsetlocking;
 } SUNW_1.18;
 
-SUNW_1.18 {		# SunOS 5.7 (Solaris 7)
+SYMBOL_VERSION SUNW_1.18 {	# SunOS 5.7 (Solaris 7)
     protected:
 	btowc;
 	__fbufsize;
@@ -741,93 +947,97 @@
 	wmemset;
 	wprintf;
 	wscanf;
+
+$if _ELF32
+	select_large_fdset;
+$endif
 } SUNW_1.17;
 
 # The empty versions SUNW_1.2 through SUNW_1.17 must be preserved because
 # applications built on Solaris 2.6 Beta (when they did contain symbols)
 # may depend on them.  All symbol content for SunOS 5.6 is now in SUNW_1.1
 
-SUNW_1.17 {
+SYMBOL_VERSION SUNW_1.17 {
     protected:
 	SUNW_1.17;
 } SUNW_1.16;
 
-SUNW_1.16 {
+SYMBOL_VERSION SUNW_1.16 {
     protected:
 	SUNW_1.16;
 } SUNW_1.15;
 
-SUNW_1.15 {
+SYMBOL_VERSION SUNW_1.15 {
     protected:
 	SUNW_1.15;
 } SUNW_1.14;
 
-SUNW_1.14 {
+SYMBOL_VERSION SUNW_1.14 {
     protected:
 	SUNW_1.14;
 } SUNW_1.13;
 
-SUNW_1.13 {
+SYMBOL_VERSION SUNW_1.13 {
     protected:
 	SUNW_1.13;
 } SUNW_1.12;
 
-SUNW_1.12 {
+SYMBOL_VERSION SUNW_1.12 {
     protected:
 	SUNW_1.12;
 } SUNW_1.11;
 
-SUNW_1.11 {
+SYMBOL_VERSION SUNW_1.11 {
     protected:
 	SUNW_1.11;
 } SUNW_1.10;
 
-SUNW_1.10 {
+SYMBOL_VERSION SUNW_1.10 {
     protected:
 	SUNW_1.10;
 } SUNW_1.9;
 
-SUNW_1.9 {
+SYMBOL_VERSION SUNW_1.9 {
     protected:
 	SUNW_1.9;
 } SUNW_1.8;
 
-SUNW_1.8 {
+SYMBOL_VERSION SUNW_1.8 {
     protected:
 	SUNW_1.8;
 } SUNW_1.7;
 
-SUNW_1.7 {
+SYMBOL_VERSION SUNW_1.7 {
     protected:
 	SUNW_1.7;
 } SUNW_1.6;
 
-SUNW_1.6 {
+SYMBOL_VERSION SUNW_1.6 {
     protected:
 	SUNW_1.6;
 } SUNW_1.5;
 
-SUNW_1.5 {
+SYMBOL_VERSION SUNW_1.5 {
     protected:
 	SUNW_1.5;
 } SUNW_1.4;
 
-SUNW_1.4 {
+SYMBOL_VERSION SUNW_1.4 {
     protected:
 	SUNW_1.4;
 } SUNW_1.3;
 
-SUNW_1.3 {
+SYMBOL_VERSION SUNW_1.3 {
     protected:
 	SUNW_1.3;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     protected:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {		# SunOS 5.6 (Solaris 2.6)
+SYMBOL_VERSION SUNW_1.1 {	# SunOS 5.6 (Solaris 2.6)
     global:
 	__loc1;
     protected:
@@ -942,8 +1152,8 @@
 	regex;
 	resolvepath;
 	_resolvepath;
-	rwlock_destroy =		NODYNSORT;
-	_rwlock_destroy =		NODYNSORT;
+	rwlock_destroy		{ FLAGS = NODYNSORT };
+	_rwlock_destroy		{ FLAGS = NODYNSORT };
 	sema_destroy;
 	_sema_destroy;
 	_setjmp;
@@ -1012,9 +1222,74 @@
 	wsxfrm;
 	__xpg4_putmsg;
 	__xpg4_putpmsg;
+
+$if lf64
+	creat64;
+	_creat64;
+	fgetpos64;
+	fopen64;
+	freopen64;
+	fseeko64;
+	fsetpos64;
+	fstat64;
+	_fstat64;
+	fstatvfs64;
+	_fstatvfs64;
+	ftello64;
+	ftruncate64;
+	_ftruncate64;
+	ftw64;
+	_ftw64;
+	getdents64;
+	_getdents64;
+	getrlimit64;
+	_getrlimit64;
+	lockf64;
+	_lockf64;
+	lseek64;
+	_lseek64;
+	lstat64;
+	_lstat64;
+	mkstemp64;
+	_mkstemp64;
+	mmap64;
+	_mmap64;
+	nftw64;
+	_nftw64;
+	open64;
+	_open64;
+	__posix_readdir_r;
+	pread64;
+	_pread64;
+	pwrite64;
+	_pwrite64;
+	readdir64;
+	_readdir64;
+	readdir64_r;
+	_readdir64_r;
+	setrlimit64;
+	_setrlimit64;
+	s_fcntl;
+	_s_fcntl		{ FLAGS = NODYNSORT };
+	s_ioctl;
+	stat64;
+	_stat64;
+	statvfs64;
+	_statvfs64;
+	tell64;
+	_tell64;
+	tmpfile64;
+	truncate64;
+	_truncate64;
+	_xftw64;
+$endif
+
+$if _sparc
+	__flt_rounds;
+$endif
 } SUNW_0.9;
 
-SUNW_0.9 {		# SunOS 5.5 (Solaris 2.5)
+SYMBOL_VERSION SUNW_0.9 {	# SunOS 5.5 (Solaris 2.5)
     protected:
 	acl;
 	bcmp;
@@ -1079,15 +1354,15 @@
 	wait4;
 } SUNW_0.8;
 
-SUNW_0.8 {		# SunOS 5.4 (Solaris 2.4)
+SYMBOL_VERSION SUNW_0.8 {	# SunOS 5.4 (Solaris 2.4)
     global:
-	__xpg4 = NODIRECT;
+	__xpg4			{ FLAGS = NODIRECT };
     protected:
 	addsev;
-	cond_broadcast =		NODYNSORT;
-	cond_destroy =			NODYNSORT;
+	cond_broadcast		{ FLAGS = NODYNSORT };
+	cond_destroy		{ FLAGS = NODYNSORT };
 	cond_init;
-	cond_signal =			NODYNSORT;
+	cond_signal		{ FLAGS = NODYNSORT };
 	cond_timedwait;
 	cond_wait;
 	confstr;
@@ -1099,24 +1374,24 @@
 	iconv_close;
 	iconv_open;
 	lfmt;
-	mutex_destroy =			NODYNSORT;
+	mutex_destroy		{ FLAGS = NODYNSORT };
 	mutex_init;
-	mutex_lock =			NODYNSORT;
-	mutex_trylock =			NODYNSORT;
-	mutex_unlock =			NODYNSORT;
+	mutex_lock		{ FLAGS = NODYNSORT };
+	mutex_trylock		{ FLAGS = NODYNSORT };
+	mutex_unlock		{ FLAGS = NODYNSORT };
 	pfmt;
 	regcomp;
 	regerror;
 	regexec;
 	regfree;
 	rwlock_init;
-	rw_rdlock =			NODYNSORT;
+	rw_rdlock		{ FLAGS = NODYNSORT };
 	rw_read_held;
-	rw_tryrdlock =			NODYNSORT;
-	rw_trywrlock =			NODYNSORT;
-	rw_unlock =			NODYNSORT;
+	rw_tryrdlock		{ FLAGS = NODYNSORT };
+	rw_trywrlock		{ FLAGS = NODYNSORT };
+	rw_unlock		{ FLAGS = NODYNSORT };
 	rw_write_held;
-	rw_wrlock =			NODYNSORT;
+	rw_wrlock		{ FLAGS = NODYNSORT };
 	sema_held;
 	sema_init;
 	sema_post;
@@ -1135,7 +1410,7 @@
 	thr_join;
 	thr_keycreate;
 	thr_kill;
-	thr_self =			NODYNSORT;
+	thr_self		{ FLAGS = NODYNSORT };
 	thr_setconcurrency;
 	thr_setprio;
 	thr_setspecific;
@@ -1148,24 +1423,47 @@
 	wordfree;
 } SUNW_0.7;
 
-SUNW_0.7 {		# SunOS 5.3 (Solaris 2.3)
+SYMBOL_VERSION SUNW_0.7 {	# SunOS 5.3 (Solaris 2.3)
     global:
 	altzone;
-	isnanf = FUNCTION FILTER libm.so.2;
+	_ctype;
+	isnanf			{ TYPE = FUNCTION; FILTER = libm.so.2 };
 	lone;
 	lten;
 	lzero;
-	memalign = NODIRECT;
-	modff = FUNCTION FILTER libm.so.2;
+	memalign		{ FLAGS = NODIRECT };
+	modff			{ TYPE = FUNCTION; FILTER = libm.so.2 };
 	nss_default_finders;
+	_sibuf;
+	_sobuf;
+	_sys_buslist;
+	_sys_cldlist;
+	_sys_fpelist;
 	_sys_illlist;
-	valloc = NODIRECT;
+	_sys_segvlist;
+	_sys_siginfolistp;
+	_sys_siglist;
+	_sys_siglistn;
+	_sys_siglistp;
+	_sys_traplist;
+	valloc			{ FLAGS = NODIRECT };
+
+$if _ELF32
+	_bufendtab;
+	_lastbuf;
+	sys_errlist;
+	sys_nerr;
+	_sys_nsig;
+$endif
+
     protected:
 	a64l;
 	adjtime;
 	ascftime;
+	_assert;
 	atoll;
 	brk;
+	__builtin_alloca;
 	cftime;
 	closelog;
 	csetcol;
@@ -1202,8 +1500,10 @@
 	fgetspent;
 	fgetspent_r;
 	_filbuf;
+	file_to_decimal;
 	finite;
-	fork1 =				NODYNSORT;
+	_flsbuf;
+	fork1			{ FLAGS = NODYNSORT };
 	fpclass;
 	fpgetmask;
 	fpgetsticky;
@@ -1286,6 +1586,8 @@
 	mlockall;
 	mrand48;
 	munlockall;
+	_mutex_held		{ FLAGS = NODYNSORT };
+	_mutex_lock		{ FLAGS = NODYNSORT };
 	nrand48;
 	_nss_netdb_aliases;
 	_nss_XbyY_buf_alloc;
@@ -1295,6 +1597,7 @@
 	__nsw_getconfig;
 	openlog;
 	plock;
+	p_online;
 	pread;
 	__priocntl;
 	__priocntlset;
@@ -1317,6 +1620,8 @@
 	realpath;
 	remque;
 	_remque;
+	_rw_read_held;
+	_rw_write_held;
 	seconvert;
 	seed48;
 	select;
@@ -1334,6 +1639,7 @@
 	sig2str;
 	sigwait;
 	single_to_decimal;
+	srand48;
 	ssignal;
 	statfs;
 	str2sig;
@@ -1344,6 +1650,7 @@
 	strtoll;
 	strtoull;
 	swapctl;
+	_syscall;
 	sysfs;
 	syslog;
 	_syslog;
@@ -1364,22 +1671,827 @@
 	vhangup;
 	vsyslog;
 	yield;
+
+$if i386
+	# Note: _syscall is also defined above. Here, we add the NODYNSORT
+	# attribute to it. On this platform, it is an alias to syscall.
+	# If that is changed, this lines should be removed.
+	_syscall		{ FLAGS = NODYNSORT };
+$endif
+
+# The 32-bit sparc ABI requires SISCD_2.3. On other platforms, those symbols
+# go directly into SUNW_0.7.
+$if sparc32
+} SISCD_2.3;
+
+SYMBOL_VERSION SISCD_2.3 {
+$endif
+
+    global:
+	errno			{ FLAGS = NODIRECT };
+	_iob;
+
+    protected:
+	addseverity;
+	_addseverity;
+	asctime_r;
+	crypt;
+	_crypt;
+	ctime_r;
+	encrypt;
+	_encrypt;
+	endgrent;
+	endpwent;
+	___errno;
+	fgetgrent;
+	fgetgrent_r;
+	fgetpwent;
+	fgetpwent_r;
+	flockfile;
+	funlockfile;
+	getchar_unlocked;
+	getc_unlocked;
+	getgrent;
+	getgrent_r;
+	getgrgid_r;
+	getgrnam_r;
+	getitimer;
+	_getitimer;
+	getlogin_r;
+	getpwent;
+	getpwent_r;
+	getpwnam_r;
+	getpwuid_r;
+	gettimeofday;
+	_gettimeofday;
+	gmtime_r;
+	localtime_r;
+	putchar_unlocked;
+	putc_unlocked;
+	rand_r;
+	readdir_r;
+	setgrent;
+	setitimer;
+	_setitimer;
+	setkey;
+	_setkey;
+	setpwent;
+	strtok_r;
+	sysinfo;
+	_sysinfo;
+	ttyname_r;
+
+$if _ELF32
+	__div64;
+	__mul64;
+	__rem64;
+	__udiv64;
+	__urem64;
+$endif
+
+$if sparc32
+	__dtoll;
+	__dtoull;
+	__ftoll;
+	__ftoull;
+	_Q_lltoq;
+	_Q_qtoll;
+	_Q_qtoull;
+	_Q_ulltoq;
+	sbrk;
+	_sbrk;
+	__umul64		{ FLAGS = NODYNSORT };	# Same address as __mul64
+$endif
+
+# On 32-bit platforms, the following symbols go into SYSVABI_1.3, but on
+# other platforms they go directly into the current version (which will be
+# either SUNW_0.7, or SISCD_2.3, depending on the similar issue described above.
+$if _ELF32
+} SYSVABI_1.3;
+
+SYMBOL_VERSION SYSVABI_1.3 {
+$endif
+
+    global:
+	_altzone;
+	calloc			{ FLAGS = NODIRECT };
+	__ctype;
+	daylight;
+	_daylight;
+	environ			{ FLAGS = NODIRECT };
+	_environ		{ FLAGS = NODIRECT };
+	free			{ FLAGS = NODIRECT };
+	frexp			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	getdate_err;
+	_getdate_err;
+	getenv;
+	__huge_val;
+	__iob;
+	isnan			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	_isnan			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	isnand			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	_isnand			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	ldexp			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	logb			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	malloc			{ FLAGS = NODIRECT };
+	modf			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	_modf			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	nextafter		{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	_nextafter		{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	_numeric;
+	optarg;
+	opterr;
+	optind;
+	optopt;
+	realloc			{ FLAGS = NODIRECT };
+	scalb			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	_scalb			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	timezone;
+	_timezone;
+	tzname;
+	_tzname;
+
+$if _x86
+	memcmp;
+	memcpy;
+	memmove;
+	memset;
+$endif
+
+$if i386
+	_fp_hw;
+$endif
+
+    protected:
+	abort;
+	abs;
+	access;
+	_access;
+	acct;
+	_acct;
+	alarm;
+	_alarm;
+	asctime;
+	__assert;
+	atexit;
+	atof;
+	atoi;
+	atol;
+	bsearch;
+	catclose;
+	_catclose;
+	catgets;
+	_catgets;
+	catopen;
+	_catopen;
+	cfgetispeed;
+	_cfgetispeed;
+	cfgetospeed;
+	_cfgetospeed;
+	cfsetispeed;
+	_cfsetispeed;
+	cfsetospeed;
+	_cfsetospeed;
+	chdir;
+	_chdir;
+	chmod;
+	_chmod;
+	chown;
+	_chown;
+	chroot;
+	_chroot;
+	_cleanup;
+	clearerr;
+	clock;
+	_close;
+	close;
+	closedir;
+	_closedir;
+	creat;
+	_creat;
+	ctermid;
+	ctime;
+	cuserid;
+	_cuserid;
+	difftime;
+	div;
+	dup;
+	_dup;
+	dup2;
+	_dup2;
+	execl;
+	_execl;
+	execle;
+	_execle;
+	execlp;
+	_execlp;
+	execv;
+	_execv;
+	execve;
+	_execve;
+	execvp;
+	_execvp;
+	exit;
+	_exit;
+	fattach;
+	_fattach;
+	fchdir;
+	_fchdir;
+	fchmod;
+	_fchmod;
+	fchown;
+	_fchown;
+	fclose;
+	fcntl;
+	_fcntl;
+	fdetach;
+	_fdetach;
+	fdopen;
+	_fdopen;
+	feof;
+	ferror;
+	fflush;
+	fgetc;
+	fgetpos;
+	fgets;
+	__filbuf;
+	fileno;
+	_fileno;
+	__flsbuf;
+	fmtmsg;
+	_fmtmsg;
+	fopen;
+	_fork;
+	fork;
+	fpathconf;
+	_fpathconf;
+	fprintf;
+	fputc;
+	fputs;
+	fread;
+	freopen;
+	fscanf;
+	fseek;
+	fsetpos;
+	fstat;
+	_fstat;
+	fstatvfs;
+	_fstatvfs;
+	fsync;
+	_fsync;
+	ftell;
+	ftok;
+	_ftok;
+	fwrite;
+	getc;
+	getchar;
+	getcontext;
+	_getcontext;
+	getcwd;
+	_getcwd;
+	getdate;
+	_getdate;
+	getegid;
+	_getegid;
+	geteuid;
+	_geteuid;
+	getgid;
+	_getgid;
+	getgrgid;
+	getgrnam;
+	getgroups;
+	_getgroups;
+	getlogin;
+	getmsg;
+	_getmsg;
+	getopt;
+	_getopt;
+	getpass;
+	_getpass;
+	getpgid;
+	_getpgid;
+	getpgrp;
+	_getpgrp;
+	getpid;
+	_getpid;
+	getpmsg;
+	_getpmsg;
+	getppid;
+	_getppid;
+	getpwnam;
+	getpwuid;
+	getrlimit;
+	_getrlimit;
+	gets;
+	getsid;
+	_getsid;
+	getsubopt;
+	_getsubopt;
+	gettxt;
+	_gettxt;
+	getuid;
+	_getuid;
+	getw;
+	_getw;
+	gmtime;
+	grantpt;
+	_grantpt;
+	hcreate;
+	_hcreate;
+	hdestroy;
+	_hdestroy;
+	hsearch;
+	_hsearch;
+	initgroups;
+	_initgroups;
+	ioctl;
+	_ioctl;
+	isalnum;
+	isalpha;
+	isascii;
+	_isascii;
+	isastream;
+	_isastream;
+	isatty;
+	_isatty;
+	iscntrl;
+	isdigit;
+	isgraph;
+	islower;
+	isprint;
+	ispunct;
+	isspace;
+	isupper;
+	isxdigit;
+	kill;
+	_kill;
+	labs;
+	lchown;
+	_lchown;
+	ldiv;
+	lfind;
+	_lfind;
+	link;
+	_link;
+	localeconv;
+	localtime;
+	lockf;
+	_lockf;
+	longjmp;
+	lsearch;
+	_lsearch;
+	lseek;
+	_lseek;
+	lstat;
+	_lstat;
+	makecontext;
+	_makecontext;
+	mblen;
+	mbstowcs;
+	mbtowc;
+	memccpy;
+	_memccpy;
+	memchr;
+	memcntl;
+	_memcntl;
+	mkdir;
+	_mkdir;
+	mkfifo;
+	_mkfifo;
+	mknod;
+	_mknod;
+	mktemp;
+	_mktemp;
+	mktime;
+	mlock;
+	_mlock;
+	mmap;
+	_mmap;
+	monitor;
+	_monitor;
+	mount;
+	_mount;
+	mprotect;
+	_mprotect;
+	msgctl;
+	_msgctl;
+	msgget;
+	_msgget;
+	msgrcv;
+	_msgrcv;
+	msgsnd;
+	_msgsnd;
+	msync;
+	_msync;
+	munlock;
+	_munlock;
+	munmap;
+	_munmap;
+	nftw;
+	_nftw;
+	nice;
+	_nice;
+	nl_langinfo;
+	_nl_langinfo;
+	open;
+	_open;
+	opendir;
+	_opendir;
+	pathconf;
+	_pathconf;
+	pause;
+	_pause;
+	pclose;
+	_pclose;
+	perror;
+	pipe;
+	_pipe;
+	poll;
+	_poll;
+	popen;
+	_popen;
+	printf;
+	profil;
+	_profil;
+	ptsname;
+	_ptsname;
+	putc;
+	putchar;
+	putenv;
+	_putenv;
+	putmsg;
+	_putmsg;
+	putpmsg;
+	_putpmsg;
+	puts;
+	putw;
+	_putw;
+	qsort;
+	raise;
+	rand;
+	read;
+	_read;
+	readdir;
+	_readdir;
+	readlink;
+	_readlink;
+	readv;
+	_readv;
+	remove;
+	rename;
+	_rename;
+	rewind;
+	rewinddir;
+	_rewinddir;
+	rmdir;
+	_rmdir;
+	scanf;
+	seekdir;
+	_seekdir;
+	semctl;
+	_semctl;
+	semget;
+	_semget;
+	semop;
+	_semop;
+	setbuf;
+	setcontext;
+	_setcontext		{ FLAGS = NODYNSORT };
+	setgid;
+	_setgid;
+	setgroups;
+	_setgroups;
+	setjmp;
+	setlabel;
+	setlocale;
+	setpgid;
+	_setpgid;
+	setpgrp;
+	_setpgrp;
+	setrlimit;
+	_setrlimit;
+	setsid;
+	_setsid;
+	setuid;
+	_setuid;
+	setvbuf;
+	shmat;
+	_shmat;
+	shmctl;
+	_shmctl;
+	shmdt;
+	_shmdt;
+	shmget;
+	_shmget;
+	sigaction;
+	_sigaction		{ FLAGS = NODYNSORT };
+	sigaddset;
+	_sigaddset;
+	sigaltstack;
+	_sigaltstack;
+	sigdelset;
+	_sigdelset;
+	sigemptyset;
+	_sigemptyset;
+	sigfillset;
+	_sigfillset;
+	sighold;
+	_sighold;
+	sigignore;
+	_sigignore;
+	sigismember;
+	_sigismember;
+	siglongjmp;
+	_siglongjmp;
+	signal;
+	sigpause;
+	_sigpause;
+	sigpending;
+	_sigpending;
+	sigprocmask;
+	_sigprocmask;
+	sigrelse;
+	_sigrelse;
+	sigsend;
+	_sigsend;
+	sigsendset;
+	_sigsendset;
+	sigset;
+	_sigset;
+	sigsetjmp;
+	_sigsetjmp		{ FLAGS = NODYNSORT };
+	sigsuspend;
+	_sigsuspend;
+	sleep;
+	_sleep;
+	sprintf;
+	srand;
+	sscanf;
+	stat;
+	_stat;
+	statvfs;
+	_statvfs;
+	stime;
+	_stime;
+	strcat;
+	strchr;
+	strcmp;
+	strcoll;
+	strcpy;
+	strcspn;
+	strdup;
+	_strdup;
+	strerror;
+	strftime;
+	strlen;
+	strncat;
+	strncmp;
+	strncpy;
+	strpbrk;
+	strrchr;
+	strspn;
+	strstr;
+	strtod;
+	strtok;
+	strtol;
+	strtoul;
+	strxfrm;
+	swab;
+	_swab;
+	swapcontext;
+	_swapcontext;
+	symlink;
+	_symlink;
+	sync;
+	_sync;
+	sysconf;
+	_sysconf;
+	system;
+	tcdrain;
+	_tcdrain;
+	tcflow;
+	_tcflow;
+	tcflush;
+	_tcflush;
+	tcgetattr;
+	_tcgetattr;
+	tcgetpgrp;
+	_tcgetpgrp;
+	tcgetsid;
+	_tcgetsid;
+	tcsendbreak;
+	_tcsendbreak;
+	tcsetattr;
+	_tcsetattr;
+	tcsetpgrp;
+	_tcsetpgrp;
+	tdelete;
+	_tdelete;
+	tell;
+	_tell;
+	telldir;
+	_telldir;
+	tempnam;
+	_tempnam;
+	tfind;
+	_tfind;
+	time;
+	_time;
+	times;
+	_times;
+	tmpfile;
+	tmpnam;
+	toascii;
+	_toascii;
+	tolower;
+	_tolower;
+	toupper;
+	_toupper;
+	tsearch;
+	_tsearch;
+	ttyname;
+	twalk;
+	_twalk;
+	tzset;
+	_tzset;
+	ulimit;
+	_ulimit;
+	umask;
+	_umask;
+	umount;
+	_umount;
+	uname;
+	_uname;
+	ungetc;
+	unlink;
+	_unlink;
+	unlockpt;
+	_unlockpt;
+	utime;
+	_utime;
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait;
+	_wait;
+	waitid;
+	_waitid;
+	waitpid;
+	_waitpid;
+	wcstombs;
+	wctomb;
+	write;
+	_write;
+	writev;
+	_writev;
+	_xftw;
+
+$if _ELF32
+	ptrace;
+	_ptrace;
+$endif
+
+$if i386
+	_fxstat;
+	_lxstat;
+	nuname;
+	_nuname;
+	_xmknod;
+	_xstat;
+$endif
+
+$if !sparc32
+	sbrk;
+$endif
+
+$if _sparc
+	__dtou;
+	__ftou;
+$endif
+
+$if sparc32
+	.div;
+	.mul;
+	.rem;
+	.stret1;
+	.stret2;
+	.stret4;
+	# .stret4 and .stret8 are the same thing
+	.stret8			{ FLAGS = NODYNSORT };
+	.udiv;
+	.umul;
+	.urem;
+	_Q_add;
+	_Q_cmp;
+	_Q_cmpe;
+	_Q_div;
+	_Q_dtoq;
+	_Q_feq;
+	_Q_fge;
+	_Q_fgt;
+	_Q_fle;
+	_Q_flt;
+	_Q_fne;
+	_Q_itoq;
+	_Q_mul;
+	_Q_neg;
+	_Q_qtod;
+	_Q_qtoi;
+	_Q_qtos;
+	_Q_qtou;
+	_Q_sqrt;
+	_Q_stoq;
+	_Q_sub;
+	_Q_utoq;
+$endif
+
+$if sparcv9
+	# __align_cpy_1 is an alias for memcpy. Filter it out of
+	# the .SUNW_dynsymsort section
+	__align_cpy_1		{ FLAGS = NODYNSORT };
+	__align_cpy_16;
+	__align_cpy_2;
+	__align_cpy_4;
+	# __align_cpy_8 is same as __align_cpy_16
+	__align_cpy_8		{ FLAGS = NODYNSORT };
+	__dtoul;
+	__ftoul;
+	_Qp_add;
+	_Qp_cmp;
+	_Qp_cmpe;
+	_Qp_div;
+	_Qp_dtoq;
+	_Qp_feq;
+	_Qp_fge;
+	_Qp_fgt;
+	_Qp_fle;
+	_Qp_flt;
+	_Qp_fne;
+	_Qp_itoq;
+	_Qp_mul;
+	_Qp_neg;
+	_Qp_qtod;
+	_Qp_qtoi;
+	_Qp_qtos;
+	_Qp_qtoui;
+	_Qp_qtoux;
+	_Qp_qtox;
+	_Qp_sqrt;
+	_Qp_stoq;
+	_Qp_sub;
+	_Qp_uitoq;
+	_Qp_uxtoq;
+	_Qp_xtoq;
+	__sparc_utrap_install;
+$endif
+
+# On amd64, we also have SYSVABI_1.3, but it contains a small subset of
+# the symbols put in that version on other platforms.
+$if amd64
+} SYSVABI_1.3;
+
+SYMBOL_VERSION SYSVABI_1.3 { 
+$endif
+    global:
+$if !_sparc
+	__flt_rounds;
+$endif
+
+    protected:
+	_ctermid;
+	_getgrgid;
+	_getgrnam;
+	_getlogin;
+	_getpwnam;
+	_getpwuid;
+	_ttyname;
+
+$if !sparc32
+	_sbrk;
+$endif
+
+$if _x86
+	_fpstart;
+	__fpstart;
+$endif
 };
 
+
+
 # There should never be more than one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.1
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-	___Argv = NODIRECT;
-	cfree = NODIRECT;
+	___Argv			{ FLAGS = NODIRECT };
+	cfree			{ FLAGS = NODIRECT };
 	_cswidth;
 	__ctype_mask;
-	__environ_lock = NODIRECT;
+	__environ_lock		{ FLAGS = NODIRECT };
 	__inf_read;
 	__inf_written;
 	__i_size;
-	_isnanf = FUNCTION FILTER libm.so.2;
+	_isnanf			{ TYPE = FUNCTION; FILTER = libm.so.2 };
 	__lc_charmap;
 	__lc_collate;
 	__lc_ctype;
@@ -1389,13 +2501,13 @@
 	__lc_numeric;
 	__lc_time;
 	__libc_threaded;
-	_lib_version = NODIRECT;
-	_logb = FUNCTION FILTER libm.so.2;
-	_lone =	NODYNSORT;
-	_lten = NODYNSORT;
-	_lzero = NODYNSORT;
+	_lib_version		{ FLAGS = NODIRECT };
+	_logb			{ TYPE = FUNCTION; FILTER = libm.so.2 };
+	_lone			{ FLAGS = NODYNSORT };
+	_lten			{ FLAGS = NODYNSORT };
+	_lzero			{ FLAGS = NODYNSORT };
 	__malloc_lock;
-	_modff = FUNCTION FILTER libm.so.2;
+	_modff			{ TYPE = FUNCTION; FILTER = libm.so.2 };
 	__nan_read;
 	__nan_written;
 	__nis_debug_bind;
@@ -1414,7 +2526,68 @@
 	__trans_lower;
 	__trans_upper;
 	_uberdata;
-	__xpg6 = NODIRECT;
+	__xpg6			{ FLAGS = NODIRECT };
+
+$if _ELF32
+	_dladdr			{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_dladdr1		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_dlclose		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_dldump			{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_dlerror		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_dlinfo			{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_dlmopen		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_dlopen			{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_dlsym			{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_ld_libc		{ TYPE = FUNCTION; FILTER = /usr/lib/ld.so.1 };
+	_sys_errlist;
+	_sys_errs;
+	_sys_index;
+	_sys_nerr		{ FLAGS = NODYNSORT };
+	_sys_num_err;
+$elif sparcv9
+	_dladdr		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	_dladdr1	{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	_dlclose	{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	_dldump		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	_dlerror	{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	_dlinfo		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	_dlmopen	{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	_dlopen		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	_dlsym		{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+	_ld_libc	{ TYPE = FUNCTION; FILTER = /usr/lib/sparcv9/ld.so.1 };
+$elif amd64
+	_dladdr		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_dladdr1	{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_dlamd64getunwind { TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_dlclose	{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_dldump		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_dlerror	{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_dlinfo		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_dlmopen	{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_dlopen		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_dlsym		{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+	_ld_libc	{ TYPE = FUNCTION; FILTER = /usr/lib/amd64/ld.so.1 };
+$else
+$error unknown platform
+$endif
+
+$if _sparc
+	__lyday_to_month;
+	__mon_lengths;
+	__yday_to_month;
+$endif
+
+$if _x86
+	_memcmp;
+	_memcpy;
+	_memmove;
+	_memset;
+$endif
+
+$if i386
+	_sse_hw;
+$endif
+
     protected:
 	acctctl;
 	allocids;
@@ -1488,8 +2661,8 @@
 	__fnmatch_C;
 	__fnmatch_sb;
 	__fnmatch_std;
-	_fork1 =		NODYNSORT;
-	_forkall =		NODYNSORT;
+	_fork1			{ FLAGS = NODYNSORT };
+	_forkall		{ FLAGS = NODYNSORT };
 	_fpclass;
 	_fpgetmask;
 	_fpgetround;
@@ -1500,6 +2673,7 @@
 	_fpsetsticky;
 	__fputwc_xpg5;
 	__fputws_xpg5;
+	__fseterror_u;
 	_ftw;
 	_gcvt;
 	_getarg;
@@ -1537,7 +2711,7 @@
 	klpd_register_id;
 	klpd_unregister;
 	klpd_unregister_id;
-	_lgrp_home_fast =		NODYNSORT;
+	_lgrp_home_fast		{ FLAGS = NODYNSORT };
 	_lgrpsys;
 	_lltostr;
 	__localeconv_std;
@@ -1583,10 +2757,10 @@
 	__monetary_init;
 	msgctl64;
 	__multi_innetgr;
-	_mutex_destroy =		NODYNSORT;
+	_mutex_destroy		{ FLAGS = NODYNSORT };
 	mutex_held;
-	_mutex_init =			NODYNSORT;
-	_mutex_unlock =			NODYNSORT;
+	_mutex_init		{ FLAGS = NODYNSORT };
+	_mutex_unlock		{ FLAGS = NODYNSORT };
 	name_to_attr;
 	nfs_getfh;
 	nfssvc;
@@ -1812,69 +2986,196 @@
 	zone_setattr;
 	zone_shutdown;
 	zone_version;
+
+$if _ELF32
+	__divdi3;
+	_file_set;
+	_fprintf_c89;
+	_fscanf_c89;
+	_fwprintf_c89;
+	_fwscanf_c89;
+	_imaxabs_c89;
+	_imaxdiv_c89;
+	__moddi3;
+	_printf_c89;
+	_scanf_c89;
+	_snprintf_c89;
+	_sprintf_c89;
+	_sscanf_c89;
+	_strtoimax_c89;
+	_strtoumax_c89;
+	_swprintf_c89;
+	_swscanf_c89;
+	__udivdi3;
+	__umoddi3;
+	_vfprintf_c89;
+	_vfscanf_c89;
+	_vfwprintf_c89;
+	_vfwscanf_c89;
+	_vprintf_c89;
+	_vscanf_c89;
+	_vsnprintf_c89;
+	_vsprintf_c89;
+	_vsscanf_c89;
+	_vswprintf_c89;
+	_vswscanf_c89;
+	_vwprintf_c89;
+	_vwscanf_c89;
+	_wcstoimax_c89;
+	_wcstoumax_c89;
+	_wprintf_c89;
+	_wscanf_c89;
+$endif
+
+$if _sparc
+	_cerror;
+	install_utrap;
+	_install_utrap;
+	nop;
+	_Q_cplx_div;
+	_Q_cplx_div_ix;
+	_Q_cplx_div_rx;
+	_Q_cplx_lr_div;
+	_Q_cplx_lr_div_ix;
+	_Q_cplx_lr_div_rx;
+	_Q_cplx_lr_mul;
+	_Q_cplx_mul;
+	_QgetRD;
+	_xregs_clrptr;
+$endif
+
+$if sparc32
+	__ashldi3;
+	__ashrdi3;
+	_cerror64;
+	__cmpdi2;
+	__floatdidf;
+	__floatdisf;
+	__lshrdi3;
+	__muldi3;
+	__ucmpdi2;
+$endif
+
+$if _x86
+	_D_cplx_lr_div;
+	_D_cplx_lr_div_ix;
+	_D_cplx_lr_div_rx;
+	_F_cplx_lr_div;
+	_F_cplx_lr_div_ix;
+	_F_cplx_lr_div_rx;
+	__fltrounds;
+	sysi86;
+	_sysi86;
+	_X_cplx_div;
+	_X_cplx_div_ix;
+	_X_cplx_div_rx;
+	_X_cplx_lr_div;
+	_X_cplx_lr_div_ix;
+	_X_cplx_lr_div_rx;
+	_X_cplx_mul;
+	__xgetRD;
+	__xtol;
+	__xtoll;
+	__xtoul;
+	__xtoull;
+$endif
+
+$if i386
+	__divrem64;
+	___tls_get_addr;
+	__udivrem64;
+$endif
+
 # The following functions should not be exported from libc,
 # but /lib/libm.so.2, some older versions of the Studio
 # compiler/debugger components, and some ancient programs
 # found in /usr/dist reference them.  When we no longer
 # care about these old and broken binary objects, these
 # symbols should be deleted.
-	_brk =				NODYNSORT;
-	_cond_broadcast =		NODYNSORT;
-	_cond_init =			NODYNSORT;
-	_cond_signal =			NODYNSORT;
-	_cond_wait =			NODYNSORT;
-	_ecvt =				NODYNSORT;
-	_fcvt =				NODYNSORT;
-	_getc_unlocked =		NODYNSORT;
-	_llseek =			NODYNSORT;
-	_pthread_attr_getdetachstate =	NODYNSORT;
-	_pthread_attr_getinheritsched =	NODYNSORT;
-	_pthread_attr_getschedparam =	NODYNSORT;
-	_pthread_attr_getschedpolicy =	NODYNSORT;
-	_pthread_attr_getscope =	NODYNSORT;
-	_pthread_attr_getstackaddr =	NODYNSORT;
-	_pthread_attr_getstacksize =	NODYNSORT;
-	_pthread_attr_init =		NODYNSORT;
-	_pthread_condattr_getpshared =	NODYNSORT;
-	_pthread_condattr_init =	NODYNSORT;
-	_pthread_cond_init =		NODYNSORT;
-	_pthread_create =		NODYNSORT;
-	_pthread_getschedparam =	NODYNSORT;
-	_pthread_join =			NODYNSORT;
-	_pthread_key_create =		NODYNSORT;
-	_pthread_mutexattr_getprioceiling =	NODYNSORT;
-	_pthread_mutexattr_getprotocol =	NODYNSORT;
-	_pthread_mutexattr_getpshared =	NODYNSORT;
-	_pthread_mutexattr_init =	NODYNSORT;
-	_pthread_mutex_getprioceiling =	NODYNSORT;
-	_pthread_mutex_init =		NODYNSORT;
-	_pthread_sigmask =		NODYNSORT;
-	_rwlock_init =			NODYNSORT;
-	_rw_rdlock =			NODYNSORT;
-	_rw_unlock =			NODYNSORT;
-	_rw_wrlock =			NODYNSORT;
-	_sbrk_unlocked =		NODYNSORT;
-	_select =			NODYNSORT;
-	_sema_init =			NODYNSORT;
-	_sema_post =			NODYNSORT;
-	_sema_trywait =			NODYNSORT;
-	_sema_wait =			NODYNSORT;
-	_sysfs =			NODYNSORT;
-	_thr_create =			NODYNSORT;
-	_thr_exit =			NODYNSORT;
-	_thr_getprio =			NODYNSORT;
-	_thr_getspecific =		NODYNSORT;
-	_thr_join =			NODYNSORT;
-	_thr_keycreate =		NODYNSORT;
-	_thr_kill =			NODYNSORT;
-	_thr_main =			NODYNSORT;
-	_thr_self =			NODYNSORT;
-	_thr_setspecific =		NODYNSORT;
-	_thr_sigsetmask =		NODYNSORT;
-	_thr_stksegment =		NODYNSORT;
-	_ungetc_unlocked =		NODYNSORT;
+	_brk					{ FLAGS = NODYNSORT };
+	_cond_broadcast				{ FLAGS = NODYNSORT };
+	_cond_init				{ FLAGS = NODYNSORT };
+	_cond_signal				{ FLAGS = NODYNSORT };
+	_cond_wait				{ FLAGS = NODYNSORT };
+	_ecvt					{ FLAGS = NODYNSORT };
+	_fcvt					{ FLAGS = NODYNSORT };
+	_getc_unlocked				{ FLAGS = NODYNSORT };
+	_llseek					{ FLAGS = NODYNSORT };
+	_pthread_attr_getdetachstate		{ FLAGS = NODYNSORT };
+	_pthread_attr_getinheritsched		{ FLAGS = NODYNSORT };
+	_pthread_attr_getschedparam		{ FLAGS = NODYNSORT };
+	_pthread_attr_getschedpolicy		{ FLAGS = NODYNSORT };
+	_pthread_attr_getscope			{ FLAGS = NODYNSORT };
+	_pthread_attr_getstackaddr		{ FLAGS = NODYNSORT };
+	_pthread_attr_getstacksize		{ FLAGS = NODYNSORT };
+	_pthread_attr_init			{ FLAGS = NODYNSORT };
+	_pthread_condattr_getpshared		{ FLAGS = NODYNSORT };
+	_pthread_condattr_init			{ FLAGS = NODYNSORT };
+	_pthread_cond_init			{ FLAGS = NODYNSORT };
+	_pthread_create				{ FLAGS = NODYNSORT };
+	_pthread_getschedparam			{ FLAGS = NODYNSORT };
+	_pthread_join				{ FLAGS = NODYNSORT };
+	_pthread_key_create			{ FLAGS = NODYNSORT };
+	_pthread_mutexattr_getprioceiling	{ FLAGS = NODYNSORT };
+	_pthread_mutexattr_getprotocol		{ FLAGS = NODYNSORT };
+	_pthread_mutexattr_getpshared		{ FLAGS = NODYNSORT };
+	_pthread_mutexattr_init			{ FLAGS = NODYNSORT };
+	_pthread_mutex_getprioceiling		{ FLAGS = NODYNSORT };
+	_pthread_mutex_init			{ FLAGS = NODYNSORT };
+	_pthread_sigmask			{ FLAGS = NODYNSORT };
+	_rwlock_init				{ FLAGS = NODYNSORT };
+	_rw_rdlock				{ FLAGS = NODYNSORT };
+	_rw_unlock				{ FLAGS = NODYNSORT };
+	_rw_wrlock				{ FLAGS = NODYNSORT };
+	_sbrk_unlocked				{ FLAGS = NODYNSORT };
+	_select					{ FLAGS = NODYNSORT };
+	_sema_init				{ FLAGS = NODYNSORT };
+	_sema_post				{ FLAGS = NODYNSORT };
+	_sema_trywait				{ FLAGS = NODYNSORT };
+	_sema_wait				{ FLAGS = NODYNSORT };
+	_sysfs					{ FLAGS = NODYNSORT };
+	_thr_create				{ FLAGS = NODYNSORT };
+	_thr_exit				{ FLAGS = NODYNSORT };
+	_thr_getprio				{ FLAGS = NODYNSORT };
+	_thr_getspecific			{ FLAGS = NODYNSORT };
+	_thr_join				{ FLAGS = NODYNSORT };
+	_thr_keycreate				{ FLAGS = NODYNSORT };
+	_thr_kill				{ FLAGS = NODYNSORT };
+	_thr_main				{ FLAGS = NODYNSORT };
+	_thr_self				{ FLAGS = NODYNSORT };
+	_thr_setspecific			{ FLAGS = NODYNSORT };
+	_thr_sigsetmask				{ FLAGS = NODYNSORT };
+	_thr_stksegment				{ FLAGS = NODYNSORT };
+	_ungetc_unlocked			{ FLAGS = NODYNSORT };
+
     local:
-	__imax_lldiv =			NODYNSORT;
-	_ti_thr_self  =			NODYNSORT;
+	__imax_lldiv				{ FLAGS = NODYNSORT };
+	_ti_thr_self				{ FLAGS = NODYNSORT };
 	*;
+
+$if lf64
+	_seekdir64		{ FLAGS = NODYNSORT };
+	_telldir64		{ FLAGS = NODYNSORT };
+$endif
+
+$if _sparc
+	__cerror		{ FLAGS = NODYNSORT };
+$endif
+
+$if sparc32
+	__cerror64		{ FLAGS = NODYNSORT };
+$endif
+
+$if sparcv9
+	__cleanup		{ FLAGS = NODYNSORT };
+$endif
+
+$if i386
+	_syscall6		{ FLAGS = NODYNSORT };
+	__systemcall6		{ FLAGS = NODYNSORT };
+$endif
+
+$if amd64
+	___tls_get_addr		{ FLAGS = NODYNSORT };
+$endif
 };
--- a/usr/src/lib/libc/sparc/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/sparc/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBCDIR=	$(SRC)/lib/libc
@@ -976,8 +975,7 @@
 $(DYNLIB) := PICS += $(ROOTFS_LIBDIR)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS)
 
-MAPFILES =	$(LIBCDIR)/port/mapfile-vers $(LIBCDIR)/sparc/mapfile-vers \
-		$(MAPFILE_AUX)
+MAPFILES =	$(LIBCDIR)/port/mapfile-vers $(MAPFILE_AUX)
 
 CFLAGS +=	$(EXTN_CFLAGS)
 CPPFLAGS=	-D_REENTRANT -Dsparc $(EXTN_CPPFLAGS) $(THREAD_DEBUG) \
--- a/usr/src/lib/libc/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1002 +0,0 @@
-#
-# 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 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.23 {
-    global:
-	dl_iterate_phdr = FUNCTION FILTER /usr/lib/ld.so.1;
-
-    protected:
-	aio_cancel64;
-	aio_error64;
-	aio_fsync64;
-	aio_read64;
-	aioread64;
-	aio_return64;
-	aio_suspend64;
-	aio_waitn64;
-	aio_write64;
-	aiowrite64;
-	lio_listio64;
-	mkstemps64;
-	posix_fadvise64;
-	posix_fallocate64;
-};
-
-SUNW_1.22.1 {
-    protected:
-	# Note: The atomic_OP_WIDTH_nv symbols defined here are also defined
-	# by the common mapfile. Here, we add the NODYNSORT attribute
-	# to them. On this platform, they are aliases for the non-_nv
-	# versions. If that is changed, these lines should be removed.
-	atomic_add_8_nv =		NODYNSORT;
-	atomic_and_8_nv =		NODYNSORT;
-	atomic_and_16_nv =		NODYNSORT;
-	atomic_and_32_nv =		NODYNSORT;
-	atomic_and_64_nv =		NODYNSORT;
-	atomic_dec_8_nv =		NODYNSORT;
-	atomic_dec_16_nv =		NODYNSORT;
-	atomic_dec_32_nv =		NODYNSORT;
-	atomic_dec_64_nv =		NODYNSORT;
-	atomic_inc_8_nv =		NODYNSORT;
-	atomic_inc_16_nv =		NODYNSORT;
-	atomic_inc_32_nv =		NODYNSORT;
-	atomic_inc_64_nv =		NODYNSORT;
-	atomic_or_8_nv =		NODYNSORT;
-	atomic_or_16_nv =		NODYNSORT;
-	atomic_or_32_nv =		NODYNSORT;
-	atomic_or_64_nv =		NODYNSORT;
-
-	enable_extended_FILE_stdio;
-} SUNW_1.22;
-
-
-SUNW_1.22 {
-    global:
-	dladdr = FUNCTION FILTER /usr/lib/ld.so.1;
-	dladdr1 = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlclose = FUNCTION FILTER /usr/lib/ld.so.1;
-	dldump = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlerror = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlinfo = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlmopen = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlopen = FUNCTION FILTER /usr/lib/ld.so.1;
-	dlsym = FUNCTION FILTER /usr/lib/ld.so.1;
-    protected:
-	alphasort64;
-	_alphasort64;
-
-	# Note: atomic_add_[16,32,64]_nv are also defined by the common
-	# mapfile. Here, we add the NODYNSORT attribute to them. On this
-	# platform, they are aliases for the non-_nv versions. If that is
-	# changed, these lines should be removed.
-	atomic_add_16_nv =		NODYNSORT;
-	atomic_add_32_nv =		NODYNSORT;
-	atomic_add_64_nv =		NODYNSORT;
-
-	pselect_large_fdset;
-	scandir64;
-	_scandir64;
-};
-
-SUNW_1.21.2 {
-    protected:
-	__makecontext_v2;
-	___makecontext_v2;
-};
-
-SUNW_1.21 {
-    protected:
-	attropen64;
-	_attropen64;
-	fstatat64;
-	_fstatat64;
-	openat64;
-	_openat64;
-	walkcontext;
-};
-
-SUNW_1.18 {
-    protected:
-	select_large_fdset;
-};
-
-SUNW_1.1 {
-    protected:
-	creat64;
-	_creat64;
-	fgetpos64;
-	__flt_rounds;
-	fopen64;
-	freopen64;
-	fseeko64;
-	fsetpos64;
-	fstat64;
-	_fstat64;
-	fstatvfs64;
-	_fstatvfs64;
-	ftello64;
-	ftruncate64;
-	_ftruncate64;
-	ftw64;
-	_ftw64;
-	getdents64;
-	_getdents64;
-	getrlimit64;
-	_getrlimit64;
-	lockf64;
-	_lockf64;
-	lseek64;
-	_lseek64;
-	lstat64;
-	_lstat64;
-	mkstemp64;
-	_mkstemp64;
-	mmap64;
-	_mmap64;
-	nftw64;
-	_nftw64;
-	open64;
-	_open64;
-	__posix_readdir_r;
-	pread64;
-	_pread64;
-	pwrite64;
-	_pwrite64;
-	readdir64;
-	_readdir64;
-	readdir64_r;
-	_readdir64_r;
-	setrlimit64;
-	_setrlimit64;
-	s_fcntl;
-	_s_fcntl = NODYNSORT;
-	s_ioctl;
-	stat64;
-	_stat64;
-	statvfs64;
-	_statvfs64;
-	tell64;
-	_tell64;
-	tmpfile64;
-	truncate64;
-	_truncate64;
-	_xftw64;
-};
-
-SUNW_0.7 {
-    global:
-	_bufendtab;
-	_ctype;
-	_lastbuf;
-	_sibuf;
-	_sobuf;
-	_sys_buslist;
-	_sys_cldlist;
-	sys_errlist;
-	_sys_fpelist;
-	sys_nerr;
-	_sys_nsig;
-	_sys_segvlist;
-	_sys_siginfolistp;
-	_sys_siglist;
-	_sys_siglistn;
-	_sys_siglistp;
-	_sys_traplist;
-    protected:
-	_assert;
-	__builtin_alloca;
-	file_to_decimal;
-	_flsbuf;
-	_mutex_held = NODYNSORT;
-	_mutex_lock = NODYNSORT;
-	p_online;
-	_rw_read_held;
-	_rw_write_held;
-	srand48;
-	_syscall;
-} SISCD_2.3;
-
-SISCD_2.3 {
-    global:
-	errno = NODIRECT;
-	_iob;
-    protected:
-	addseverity;
-	_addseverity;
-	asctime_r;
-	crypt;
-	_crypt;
-	ctime_r;
-	__div64;
-	__dtoll;
-	__dtoull;
-	encrypt;
-	_encrypt;
-	endgrent;
-	endpwent;
-	___errno;
-	fgetgrent;
-	fgetgrent_r;
-	fgetpwent;
-	fgetpwent_r;
-	flockfile;
-	__ftoll;
-	__ftoull;
-	funlockfile;
-	getchar_unlocked;
-	getc_unlocked;
-	getgrent;
-	getgrent_r;
-	getgrgid_r;
-	getgrnam_r;
-	getitimer;
-	_getitimer;
-	getlogin_r;
-	getpwent;
-	getpwent_r;
-	getpwnam_r;
-	getpwuid_r;
-	gettimeofday;
-	_gettimeofday;
-	gmtime_r;
-	localtime_r;
-	__mul64;
-	putchar_unlocked;
-	putc_unlocked;
-	_Q_lltoq;
-	_Q_qtoll;
-	_Q_qtoull;
-	_Q_ulltoq;
-	rand_r;
-	readdir_r;
-	__rem64;
-	sbrk;
-	_sbrk;
-	setgrent;
-	setitimer;
-	_setitimer;
-	setkey;
-	_setkey;
-	setpwent;
-	strtok_r;
-	sysinfo;
-	_sysinfo;
-	ttyname_r;
-	__udiv64;
-	__umul64 = NODYNSORT;		# Same address as __mul64
-	__urem64;
-} SYSVABI_1.3;
-
-SYSVABI_1.3 {
-    global:
-	_altzone;
-	calloc = NODIRECT;
-	__ctype;
-	daylight;
-	_daylight;
-	environ = NODIRECT;
-	_environ = NODIRECT;
-	free = NODIRECT;
-	frexp = FUNCTION FILTER libm.so.2;
-	getdate_err;
-	_getdate_err;
-	getenv;
-	__huge_val;
-	__iob;
-	isnan = FUNCTION FILTER libm.so.2;
-	_isnan = FUNCTION FILTER libm.so.2;
-	isnand = FUNCTION FILTER libm.so.2;
-	_isnand = FUNCTION FILTER libm.so.2;
-	ldexp = FUNCTION FILTER libm.so.2;
-	logb = FUNCTION FILTER libm.so.2;
-	malloc = NODIRECT;
-	modf = FUNCTION FILTER libm.so.2;
-	_modf = FUNCTION FILTER libm.so.2;
-	nextafter = FUNCTION FILTER libm.so.2;
-	_nextafter = FUNCTION FILTER libm.so.2;
-	_numeric;
-	optarg;
-	opterr;
-	optind;
-	optopt;
-	realloc = NODIRECT;
-	scalb = FUNCTION FILTER libm.so.2;
-	_scalb = FUNCTION FILTER libm.so.2;
-	timezone;
-	_timezone;
-	tzname;
-	_tzname;
-    protected:
-	.div;
-	.mul;
-	.rem;
-	.stret1;
-	.stret2;
-	.stret4;
-	# .stret4 and .stret8 are the same thing
-	.stret8 = NODYNSORT;
-	.udiv;
-	.umul;
-	.urem;
-	abort;
-	abs;
-	access;
-	_access;
-	acct;
-	_acct;
-	alarm;
-	_alarm;
-	asctime;
-	__assert;
-	atexit;
-	atof;
-	atoi;
-	atol;
-	bsearch;
-	catclose;
-	_catclose;
-	catgets;
-	_catgets;
-	catopen;
-	_catopen;
-	cfgetispeed;
-	_cfgetispeed;
-	cfgetospeed;
-	_cfgetospeed;
-	cfsetispeed;
-	_cfsetispeed;
-	cfsetospeed;
-	_cfsetospeed;
-	chdir;
-	_chdir;
-	chmod;
-	_chmod;
-	chown;
-	_chown;
-	chroot;
-	_chroot;
-	_cleanup;
-	clearerr;
-	clock;
-	_close;
-	close;
-	closedir;
-	_closedir;
-	creat;
-	_creat;
-	ctermid;
-	_ctermid;
-	ctime;
-	cuserid;
-	_cuserid;
-	difftime;
-	div;
-	__dtou;
-	dup;
-	_dup;
-	dup2;
-	_dup2;
-	execl;
-	_execl;
-	execle;
-	_execle;
-	execlp;
-	_execlp;
-	execv;
-	_execv;
-	execve;
-	_execve;
-	execvp;
-	_execvp;
-	exit;
-	_exit;
-	fattach;
-	_fattach;
-	fchdir;
-	_fchdir;
-	fchmod;
-	_fchmod;
-	fchown;
-	_fchown;
-	fclose;
-	fcntl;
-	_fcntl;
-	fdetach;
-	_fdetach;
-	fdopen;
-	_fdopen;
-	feof;
-	ferror;
-	fflush;
-	fgetc;
-	fgetpos;
-	fgets;
-	__filbuf;
-	fileno;
-	_fileno;
-	__flsbuf;
-	fmtmsg;
-	_fmtmsg;
-	fopen;
-	_fork;
-	fork;
-	fpathconf;
-	_fpathconf;
-	fprintf;
-	fputc;
-	fputs;
-	fread;
-	freopen;
-	fscanf;
-	fseek;
-	fsetpos;
-	fstat;
-	_fstat;
-	fstatvfs;
-	_fstatvfs;
-	fsync;
-	_fsync;
-	ftell;
-	ftok;
-	_ftok;
-	__ftou;
-	fwrite;
-	getc;
-	getchar;
-	getcontext;
-	_getcontext;
-	getcwd;
-	_getcwd;
-	getdate;
-	_getdate;
-	getegid;
-	_getegid;
-	geteuid;
-	_geteuid;
-	getgid;
-	_getgid;
-	getgrgid;
-	_getgrgid;
-	getgrnam;
-	_getgrnam;
-	getgroups;
-	_getgroups;
-	getlogin;
-	_getlogin;
-	getmsg;
-	_getmsg;
-	getopt;
-	_getopt;
-	getpass;
-	_getpass;
-	getpgid;
-	_getpgid;
-	getpgrp;
-	_getpgrp;
-	getpid;
-	_getpid;
-	getpmsg;
-	_getpmsg;
-	getppid;
-	_getppid;
-	getpwnam;
-	_getpwnam;
-	getpwuid;
-	_getpwuid;
-	getrlimit;
-	_getrlimit;
-	gets;
-	getsid;
-	_getsid;
-	getsubopt;
-	_getsubopt;
-	gettxt;
-	_gettxt;
-	getuid;
-	_getuid;
-	getw;
-	_getw;
-	gmtime;
-	grantpt;
-	_grantpt;
-	hcreate;
-	_hcreate;
-	hdestroy;
-	_hdestroy;
-	hsearch;
-	_hsearch;
-	initgroups;
-	_initgroups;
-	ioctl;
-	_ioctl;
-	isalnum;
-	isalpha;
-	isascii;
-	_isascii;
-	isastream;
-	_isastream;
-	isatty;
-	_isatty;
-	iscntrl;
-	isdigit;
-	isgraph;
-	islower;
-	isprint;
-	ispunct;
-	isspace;
-	isupper;
-	isxdigit;
-	kill;
-	_kill;
-	labs;
-	lchown;
-	_lchown;
-	ldiv;
-	lfind;
-	_lfind;
-	link;
-	_link;
-	localeconv;
-	localtime;
-	lockf;
-	_lockf;
-	longjmp;
-	lsearch;
-	_lsearch;
-	lseek;
-	_lseek;
-	lstat;
-	_lstat;
-	makecontext;
-	_makecontext;
-	mblen;
-	mbstowcs;
-	mbtowc;
-	memccpy;
-	_memccpy;
-	memchr;
-	memcntl;
-	_memcntl;
-	mkdir;
-	_mkdir;
-	mkfifo;
-	_mkfifo;
-	mknod;
-	_mknod;
-	mktemp;
-	_mktemp;
-	mktime;
-	mlock;
-	_mlock;
-	mmap;
-	_mmap;
-	monitor;
-	_monitor;
-	mount;
-	_mount;
-	mprotect;
-	_mprotect;
-	msgctl;
-	_msgctl;
-	msgget;
-	_msgget;
-	msgrcv;
-	_msgrcv;
-	msgsnd;
-	_msgsnd;
-	msync;
-	_msync;
-	munlock;
-	_munlock;
-	munmap;
-	_munmap;
-	nftw;
-	_nftw;
-	nice;
-	_nice;
-	nl_langinfo;
-	_nl_langinfo;
-	open;
-	_open;
-	opendir;
-	_opendir;
-	pathconf;
-	_pathconf;
-	pause;
-	_pause;
-	pclose;
-	_pclose;
-	perror;
-	pipe;
-	_pipe;
-	poll;
-	_poll;
-	popen;
-	_popen;
-	printf;
-	profil;
-	_profil;
-	ptrace;
-	_ptrace;
-	ptsname;
-	_ptsname;
-	putc;
-	putchar;
-	putenv;
-	_putenv;
-	putmsg;
-	_putmsg;
-	putpmsg;
-	_putpmsg;
-	puts;
-	putw;
-	_putw;
-	_Q_add;
-	_Q_cmp;
-	_Q_cmpe;
-	_Q_div;
-	_Q_dtoq;
-	_Q_feq;
-	_Q_fge;
-	_Q_fgt;
-	_Q_fle;
-	_Q_flt;
-	_Q_fne;
-	_Q_itoq;
-	_Q_mul;
-	_Q_neg;
-	_Q_qtod;
-	_Q_qtoi;
-	_Q_qtos;
-	_Q_qtou;
-	qsort;
-	_Q_sqrt;
-	_Q_stoq;
-	_Q_sub;
-	_Q_utoq;
-	raise;
-	rand;
-	read;
-	_read;
-	readdir;
-	_readdir;
-	readlink;
-	_readlink;
-	readv;
-	_readv;
-	remove;
-	rename;
-	_rename;
-	rewind;
-	rewinddir;
-	_rewinddir;
-	rmdir;
-	_rmdir;
-	scanf;
-	seekdir;
-	_seekdir;
-	semctl;
-	_semctl;
-	semget;
-	_semget;
-	semop;
-	_semop;
-	setbuf;
-	setcontext;
-	_setcontext = NODYNSORT;
-	setgid;
-	_setgid;
-	setgroups;
-	_setgroups;
-	setjmp;
-	setlabel;
-	setlocale;
-	setpgid;
-	_setpgid;
-	setpgrp;
-	_setpgrp;
-	setrlimit;
-	_setrlimit;
-	setsid;
-	_setsid;
-	setuid;
-	_setuid;
-	setvbuf;
-	shmat;
-	_shmat;
-	shmctl;
-	_shmctl;
-	shmdt;
-	_shmdt;
-	shmget;
-	_shmget;
-	sigaction;
-	_sigaction = NODYNSORT;
-	sigaddset;
-	_sigaddset;
-	sigaltstack;
-	_sigaltstack;
-	sigdelset;
-	_sigdelset;
-	sigemptyset;
-	_sigemptyset;
-	sigfillset;
-	_sigfillset;
-	sighold;
-	_sighold;
-	sigignore;
-	_sigignore;
-	sigismember;
-	_sigismember;
-	siglongjmp;
-	_siglongjmp;
-	signal;
-	sigpause;
-	_sigpause;
-	sigpending;
-	_sigpending;
-	sigprocmask;
-	_sigprocmask;
-	sigrelse;
-	_sigrelse;
-	sigsend;
-	_sigsend;
-	sigsendset;
-	_sigsendset;
-	sigset;
-	_sigset;
-	sigsetjmp;
-	_sigsetjmp = NODYNSORT;
-	sigsuspend;
-	_sigsuspend;
-	sleep;
-	_sleep;
-	sprintf;
-	srand;
-	sscanf;
-	stat;
-	_stat;
-	statvfs;
-	_statvfs;
-	stime;
-	_stime;
-	strcat;
-	strchr;
-	strcmp;
-	strcoll;
-	strcpy;
-	strcspn;
-	strdup;
-	_strdup;
-	strerror;
-	strftime;
-	strlen;
-	strncat;
-	strncmp;
-	strncpy;
-	strpbrk;
-	strrchr;
-	strspn;
-	strstr;
-	strtod;
-	strtok;
-	strtol;
-	strtoul;
-	strxfrm;
-	swab;
-	_swab;
-	swapcontext;
-	_swapcontext;
-	symlink;
-	_symlink;
-	sync;
-	_sync;
-	sysconf;
-	_sysconf;
-	system;
-	tcdrain;
-	_tcdrain;
-	tcflow;
-	_tcflow;
-	tcflush;
-	_tcflush;
-	tcgetattr;
-	_tcgetattr;
-	tcgetpgrp;
-	_tcgetpgrp;
-	tcgetsid;
-	_tcgetsid;
-	tcsendbreak;
-	_tcsendbreak;
-	tcsetattr;
-	_tcsetattr;
-	tcsetpgrp;
-	_tcsetpgrp;
-	tdelete;
-	_tdelete;
-	tell;
-	_tell;
-	telldir;
-	_telldir;
-	tempnam;
-	_tempnam;
-	tfind;
-	_tfind;
-	time;
-	_time;
-	times;
-	_times;
-	tmpfile;
-	tmpnam;
-	toascii;
-	_toascii;
-	tolower;
-	_tolower;
-	toupper;
-	_toupper;
-	tsearch;
-	_tsearch;
-	ttyname;
-	_ttyname;
-	twalk;
-	_twalk;
-	tzset;
-	_tzset;
-	ulimit;
-	_ulimit;
-	umask;
-	_umask;
-	umount;
-	_umount;
-	uname;
-	_uname;
-	ungetc;
-	unlink;
-	_unlink;
-	unlockpt;
-	_unlockpt;
-	utime;
-	_utime;
-	vfprintf;
-	vprintf;
-	vsprintf;
-	wait;
-	_wait;
-	waitid;
-	_waitid;
-	waitpid;
-	_waitpid;
-	wcstombs;
-	wctomb;
-	write;
-	_write;
-	writev;
-	_writev;
-	_xftw;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_dladdr = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dladdr1 = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlclose = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dldump = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlerror = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlinfo = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlmopen = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlopen = FUNCTION FILTER /usr/lib/ld.so.1;
-	_dlsym = FUNCTION FILTER /usr/lib/ld.so.1;
-	_ld_libc = FUNCTION FILTER /usr/lib/ld.so.1;
-	__lyday_to_month;
-	__mon_lengths;
-	_sys_errlist;
-	_sys_errs;
-	_sys_index;
-	_sys_nerr = NODYNSORT;
-	_sys_num_err;
-	__yday_to_month;
-    protected:
-	__ashldi3;
-	__ashrdi3;
-	_cerror;
-	_cerror64;
-	__cmpdi2;
-	__divdi3;
-	_file_set;
-	__floatdidf;
-	__floatdisf;
-	_fprintf_c89;
-	_fscanf_c89;
-	__fseterror_u;
-	_fwprintf_c89;
-	_fwscanf_c89;
-	_imaxabs_c89;
-	_imaxdiv_c89;
-	install_utrap;
-	_install_utrap;
-	__lshrdi3;
-	__moddi3;
-	__muldi3;
-	nop;
-	_printf_c89;
-	_Q_cplx_div;
-	_Q_cplx_div_ix;
-	_Q_cplx_div_rx;
-	_Q_cplx_lr_div;
-	_Q_cplx_lr_div_ix;
-	_Q_cplx_lr_div_rx;
-	_Q_cplx_lr_mul;
-	_Q_cplx_mul;
-	_QgetRD;
-	_scanf_c89;
-	_snprintf_c89;
-	_sprintf_c89;
-	_sscanf_c89;
-	_strtoimax_c89;
-	_strtoumax_c89;
-	_swprintf_c89;
-	_swscanf_c89;
-	__ucmpdi2;
-	__udivdi3;
-	__umoddi3;
-	_vfprintf_c89;
-	_vfscanf_c89;
-	_vfwprintf_c89;
-	_vfwscanf_c89;
-	_vprintf_c89;
-	_vscanf_c89;
-	_vsnprintf_c89;
-	_vsprintf_c89;
-	_vsscanf_c89;
-	_vswprintf_c89;
-	_vswscanf_c89;
-	_vwprintf_c89;
-	_vwscanf_c89;
-	_wcstoimax_c89;
-	_wcstoumax_c89;
-	_wprintf_c89;
-	_wscanf_c89;
-	_xregs_clrptr;
-
-    local:
-	__cerror =		NODYNSORT;
-	__cerror64 =		NODYNSORT;
-	_seekdir64 =		NODYNSORT;
-	_telldir64 =		NODYNSORT;
-};
--- a/usr/src/lib/libc/sparc/mapfile-vers-aux	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/sparc/mapfile-vers-aux	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,19 +36,23 @@
 # MAPFILE HEADER END
 #
 
-SYSVABI_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SYSVABI_1.3 {
     global:
-	memcmp = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
-	memcpy = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
-	memmove = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
-	memset = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	memcmp		{ AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 };
+	memcpy		{ AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 };
+	memmove		{ AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 };
+	memset		{ AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-	_memcmp = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
-	_memcpy = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
-	_memcpy = NODYNSORT;
-	_memmove = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
-	_memset = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	_memcmp		{ AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 };
+	_memcpy	{
+		AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1;
+		FLAGS = NODYNSORT;
+	};
+	_memmove	{ AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 };
+	_memset		{ AUXILIARY = /platform/$PLATFORM/lib/libc_psr.so.1 };
 };
--- a/usr/src/lib/libc/sparc_hwcap1/sparc/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/sparc_hwcap1/sparc/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-hwcap_1 = V0x10000;
+$mapfile_version 2
+
+CAPABILITY {
+	hw_1 += 0x10000;
+};
--- a/usr/src/lib/libc/sparc_hwcap1/sparc/mapfile-vers-aux	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/sparc_hwcap1/sparc/mapfile-vers-aux	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SYSVABI_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SYSVABI_1.3 {
     global:
 	memcmp;
 	memcpy;
@@ -45,10 +46,10 @@
 	memset;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_memcmp;
-	_memcpy = NODYNSORT;
+	_memcpy			{ FLAGS = NODYNSORT };
 	_memmove;
 	_memset;
 };
--- a/usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-hwcap_1 = V0x10000;
+$mapfile_version 2
+
+CAPABILITY {
+	hw_1 += 0x10000;
+};
--- a/usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile-vers-aux	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/sparc_hwcap1/sparcv9/mapfile-vers-aux	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_0.7 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_0.7 {	# SunOS 5.3 (Solaris 2.3)
     global:
 	memcmp;
 	memcpy;
@@ -45,10 +46,10 @@
 	memset;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_memcmp;
-	_memcpy = NODYNSORT;
+	_memcpy			{ FLAGS = NODYNSORT };
 	_memmove;
 	_memset;
 };
--- a/usr/src/lib/libc/sparcv9/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/sparcv9/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBCDIR=	$(SRC)/lib/libc
@@ -925,8 +924,7 @@
 $(DYNLIB) := PICS += $(ROOTFS_LIBDIR64)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS)
 
-MAPFILES =	$(LIBCDIR)/port/mapfile-vers $(LIBCDIR)/sparcv9/mapfile-vers \
-		$(MAPFILE_AUX)
+MAPFILES =	$(LIBCDIR)/port/mapfile-vers $(MAPFILE_AUX)
 
 sparcv9_C_PICFLAGS= -K PIC
 CFLAGS64 +=	$(EXTN_CFLAGS)
--- a/usr/src/lib/libc/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,825 +0,0 @@
-#
-# 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 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.23 {
-    global:
-	dl_iterate_phdr = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-};
-
-SUNW_1.22.1 {
-    protected:
-	# Note: The atomic_OP_WIDTH_nv symbols defined here are also defined
-	# by the common mapfile. Here, we add the NODYNSORT attribute
-	# to them. On this platform, they are aliases for the non-_nv
-	# versions. If that is changed, these lines should be removed.
-	atomic_add_8_nv =		NODYNSORT;
-	atomic_and_8_nv =		NODYNSORT;
-	atomic_and_16_nv =		NODYNSORT;
-	atomic_and_32_nv =		NODYNSORT;
-	atomic_and_64_nv =		NODYNSORT;
-	atomic_dec_8_nv =		NODYNSORT;
-	atomic_dec_16_nv =		NODYNSORT;
-	atomic_dec_32_nv =		NODYNSORT;
-	atomic_dec_64_nv =		NODYNSORT;
-	atomic_inc_8_nv =		NODYNSORT;
-	atomic_inc_16_nv =		NODYNSORT;
-	atomic_inc_32_nv =		NODYNSORT;
-	atomic_inc_64_nv =		NODYNSORT;
-	atomic_or_8_nv =		NODYNSORT;
-	atomic_or_16_nv =		NODYNSORT;
-	atomic_or_32_nv =		NODYNSORT;
-	atomic_or_64_nv =		NODYNSORT;
-} SUNW_1.22;
-
-
-SUNW_1.22 {
-    global:
-	dladdr = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	dladdr1 = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	dlclose = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	dldump = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	dlerror = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	dlinfo = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	dlmopen = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	dlopen = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	dlsym = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-    protected:
-	# Note: atomic_add_[16,32,64]_nv are also defined by the common
-	# mapfile. Here, we add the NODYNSORT attribute to them. On this
-	# platform, they are aliases for the non-_nv versions. If that is
-	# changed, these lines should be removed.
-	atomic_add_16_nv =		NODYNSORT;
-	atomic_add_32_nv =		NODYNSORT;
-	atomic_add_64_nv =		NODYNSORT;
-
-	walkcontext;
-};
-
-SUNW_1.21.2 {
-    protected:
-	__makecontext_v2;
-	___makecontext_v2;
-};
-
-SUNW_1.1 {
-    protected:
-	__flt_rounds;
-};
-
-SUNW_0.7 {
-    global:
-	_altzone;
-	calloc = NODIRECT;
-	_ctype;
-	__ctype;
-	daylight;
-	_daylight;
-	environ = NODIRECT;
-	_environ = NODIRECT;
-	errno = NODIRECT;
-	free = NODIRECT;
-	frexp = FUNCTION FILTER libm.so.2;
-	getdate_err;
-	_getdate_err;
-	getenv;
-	__huge_val;
-	_iob;
-	__iob;
-	isnan = FUNCTION FILTER libm.so.2;
-	_isnan = FUNCTION FILTER libm.so.2;
-	isnand = FUNCTION FILTER libm.so.2;
-	_isnand = FUNCTION FILTER libm.so.2;
-	ldexp = FUNCTION FILTER libm.so.2;
-	logb = FUNCTION FILTER libm.so.2;
-	malloc = NODIRECT;
-	modf = FUNCTION FILTER libm.so.2;
-	_modf = FUNCTION FILTER libm.so.2;
-	nextafter = FUNCTION FILTER libm.so.2;
-	_nextafter = FUNCTION FILTER libm.so.2;
-	_numeric;
-	optarg;
-	opterr;
-	optind;
-	optopt;
-	realloc = NODIRECT;
-	scalb = FUNCTION FILTER libm.so.2;
-	_scalb = FUNCTION FILTER libm.so.2;
-	_sibuf;
-	_sobuf;
-	_sys_buslist;
-	_sys_cldlist;
-	_sys_fpelist;
-	_sys_segvlist;
-	_sys_siginfolistp;
-	_sys_siglist;
-	_sys_siglistn;
-	_sys_siglistp;
-	_sys_traplist;
-	timezone;
-	_timezone;
-	tzname;
-	_tzname;
-    protected:
-	abort;
-	abs;
-	access;
-	_access;
-	acct;
-	_acct;
-	addseverity;
-	_addseverity;
-	alarm;
-	_alarm;
-	# __align_cpy_1 is an alias for memcpy. Filter it out of
-	# the .SUNW_dynsymsort section
-	__align_cpy_1 = NODYNSORT;
-	__align_cpy_16;
-	__align_cpy_2;
-	__align_cpy_4;
-	# __align_cpy_8 is same as __align_cpy_16
-	__align_cpy_8 = NODYNSORT;
-	asctime;
-	asctime_r;
-	_assert;
-	__assert;
-	atexit;
-	atof;
-	atoi;
-	atol;
-	bsearch;
-	__builtin_alloca;
-	catclose;
-	_catclose;
-	catgets;
-	_catgets;
-	catopen;
-	_catopen;
-	cfgetispeed;
-	_cfgetispeed;
-	cfgetospeed;
-	_cfgetospeed;
-	cfsetispeed;
-	_cfsetispeed;
-	cfsetospeed;
-	_cfsetospeed;
-	chdir;
-	_chdir;
-	chmod;
-	_chmod;
-	chown;
-	_chown;
-	chroot;
-	_chroot;
-	_cleanup;
-	clearerr;
-	clock;
-	_close;
-	close;
-	closedir;
-	_closedir;
-	creat;
-	_creat;
-	crypt;
-	_crypt;
-	ctermid;
-	_ctermid;
-	ctime;
-	ctime_r;
-	cuserid;
-	_cuserid;
-	difftime;
-	div;
-	__dtou;
-	__dtoul;
-	dup;
-	_dup;
-	dup2;
-	_dup2;
-	encrypt;
-	_encrypt;
-	endgrent;
-	endpwent;
-	___errno;
-	execl;
-	_execl;
-	execle;
-	_execle;
-	execlp;
-	_execlp;
-	execv;
-	_execv;
-	execve;
-	_execve;
-	execvp;
-	_execvp;
-	exit;
-	_exit;
-	fattach;
-	_fattach;
-	fchdir;
-	_fchdir;
-	fchmod;
-	_fchmod;
-	fchown;
-	_fchown;
-	fclose;
-	fcntl;
-	_fcntl;
-	fdetach;
-	_fdetach;
-	fdopen;
-	_fdopen;
-	feof;
-	ferror;
-	fflush;
-	fgetc;
-	fgetgrent;
-	fgetgrent_r;
-	fgetpos;
-	fgetpwent;
-	fgetpwent_r;
-	fgets;
-	__filbuf;
-	fileno;
-	_fileno;
-	file_to_decimal;
-	flockfile;
-	_flsbuf;
-	__flsbuf;
-	fmtmsg;
-	_fmtmsg;
-	fopen;
-	_fork;
-	fork;
-	fpathconf;
-	_fpathconf;
-	fprintf;
-	fputc;
-	fputs;
-	fread;
-	freopen;
-	fscanf;
-	fseek;
-	fsetpos;
-	fstat;
-	_fstat;
-	fstatvfs;
-	_fstatvfs;
-	fsync;
-	_fsync;
-	ftell;
-	ftok;
-	_ftok;
-	__ftou;
-	__ftoul;
-	funlockfile;
-	fwrite;
-	getc;
-	getchar;
-	getchar_unlocked;
-	getcontext;
-	_getcontext;
-	getc_unlocked;
-	getcwd;
-	_getcwd;
-	getdate;
-	_getdate;
-	getegid;
-	_getegid;
-	geteuid;
-	_geteuid;
-	getgid;
-	_getgid;
-	getgrent;
-	getgrent_r;
-	getgrgid;
-	_getgrgid;
-	getgrgid_r;
-	getgrnam;
-	_getgrnam;
-	getgrnam_r;
-	getgroups;
-	_getgroups;
-	getitimer;
-	_getitimer;
-	getlogin;
-	_getlogin;
-	getlogin_r;
-	getmsg;
-	_getmsg;
-	getopt;
-	_getopt;
-	getpass;
-	_getpass;
-	getpgid;
-	_getpgid;
-	getpgrp;
-	_getpgrp;
-	getpid;
-	_getpid;
-	getpmsg;
-	_getpmsg;
-	getppid;
-	_getppid;
-	getpwent;
-	getpwent_r;
-	getpwnam;
-	_getpwnam;
-	getpwnam_r;
-	getpwuid;
-	_getpwuid;
-	getpwuid_r;
-	getrlimit;
-	_getrlimit;
-	gets;
-	getsid;
-	_getsid;
-	getsubopt;
-	_getsubopt;
-	gettimeofday;
-	_gettimeofday;
-	gettxt;
-	_gettxt;
-	getuid;
-	_getuid;
-	getw;
-	_getw;
-	gmtime;
-	gmtime_r;
-	grantpt;
-	_grantpt;
-	hcreate;
-	_hcreate;
-	hdestroy;
-	_hdestroy;
-	hsearch;
-	_hsearch;
-	initgroups;
-	_initgroups;
-	ioctl;
-	_ioctl;
-	isalnum;
-	isalpha;
-	isascii;
-	_isascii;
-	isastream;
-	_isastream;
-	isatty;
-	_isatty;
-	iscntrl;
-	isdigit;
-	isgraph;
-	islower;
-	isprint;
-	ispunct;
-	isspace;
-	isupper;
-	isxdigit;
-	kill;
-	_kill;
-	labs;
-	lchown;
-	_lchown;
-	ldiv;
-	lfind;
-	_lfind;
-	link;
-	_link;
-	localeconv;
-	localtime;
-	localtime_r;
-	lockf;
-	_lockf;
-	longjmp;
-	lsearch;
-	_lsearch;
-	lseek;
-	_lseek;
-	lstat;
-	_lstat;
-	makecontext;
-	_makecontext;
-	mblen;
-	mbstowcs;
-	mbtowc;
-	memccpy;
-	_memccpy;
-	memchr;
-	memcntl;
-	_memcntl;
-	mkdir;
-	_mkdir;
-	mkfifo;
-	_mkfifo;
-	mknod;
-	_mknod;
-	mktemp;
-	_mktemp;
-	mktime;
-	mlock;
-	_mlock;
-	mmap;
-	_mmap;
-	monitor;
-	_monitor;
-	mount;
-	_mount;
-	mprotect;
-	_mprotect;
-	msgctl;
-	_msgctl;
-	msgget;
-	_msgget;
-	msgrcv;
-	_msgrcv;
-	msgsnd;
-	_msgsnd;
-	msync;
-	_msync;
-	munlock;
-	_munlock;
-	munmap;
-	_munmap;
-	_mutex_held = NODYNSORT;
-	_mutex_lock = NODYNSORT;
-	nftw;
-	_nftw;
-	nice;
-	_nice;
-	nl_langinfo;
-	_nl_langinfo;
-	open;
-	_open;
-	opendir;
-	_opendir;
-	pathconf;
-	_pathconf;
-	pause;
-	_pause;
-	pclose;
-	_pclose;
-	perror;
-	pipe;
-	_pipe;
-	poll;
-	_poll;
-	p_online;
-	popen;
-	_popen;
-	printf;
-	profil;
-	_profil;
-	ptsname;
-	_ptsname;
-	putc;
-	putchar;
-	putchar_unlocked;
-	putc_unlocked;
-	putenv;
-	_putenv;
-	putmsg;
-	_putmsg;
-	putpmsg;
-	_putpmsg;
-	puts;
-	putw;
-	_putw;
-	_Qp_add;
-	_Qp_cmp;
-	_Qp_cmpe;
-	_Qp_div;
-	_Qp_dtoq;
-	_Qp_feq;
-	_Qp_fge;
-	_Qp_fgt;
-	_Qp_fle;
-	_Qp_flt;
-	_Qp_fne;
-	_Qp_itoq;
-	_Qp_mul;
-	_Qp_neg;
-	_Qp_qtod;
-	_Qp_qtoi;
-	_Qp_qtos;
-	_Qp_qtoui;
-	_Qp_qtoux;
-	_Qp_qtox;
-	_Qp_sqrt;
-	_Qp_stoq;
-	_Qp_sub;
-	_Qp_uitoq;
-	_Qp_uxtoq;
-	_Qp_xtoq;
-	qsort;
-	raise;
-	rand;
-	rand_r;
-	read;
-	_read;
-	readdir;
-	_readdir;
-	readdir_r;
-	readlink;
-	_readlink;
-	readv;
-	_readv;
-	remove;
-	rename;
-	_rename;
-	rewind;
-	rewinddir;
-	_rewinddir;
-	rmdir;
-	_rmdir;
-	_rw_read_held;
-	_rw_write_held;
-	sbrk;
-	_sbrk;
-	scanf;
-	seekdir;
-	_seekdir;
-	semctl;
-	_semctl;
-	semget;
-	_semget;
-	semop;
-	_semop;
-	setbuf;
-	setcontext;
-	_setcontext = NODYNSORT;
-	setgid;
-	_setgid;
-	setgrent;
-	setgroups;
-	_setgroups;
-	setitimer;
-	_setitimer;
-	setjmp;
-	setkey;
-	_setkey;
-	setlabel;
-	setlocale;
-	setpgid;
-	_setpgid;
-	setpgrp;
-	_setpgrp;
-	setpwent;
-	setrlimit;
-	_setrlimit;
-	setsid;
-	_setsid;
-	setuid;
-	_setuid;
-	setvbuf;
-	shmat;
-	_shmat;
-	shmctl;
-	_shmctl;
-	shmdt;
-	_shmdt;
-	shmget;
-	_shmget;
-	sigaction;
-	_sigaction = NODYNSORT;
-	sigaddset;
-	_sigaddset;
-	sigaltstack;
-	_sigaltstack;
-	sigdelset;
-	_sigdelset;
-	sigemptyset;
-	_sigemptyset;
-	sigfillset;
-	_sigfillset;
-	sighold;
-	_sighold;
-	sigignore;
-	_sigignore;
-	sigismember;
-	_sigismember;
-	siglongjmp;
-	_siglongjmp;
-	signal;
-	sigpause;
-	_sigpause;
-	sigpending;
-	_sigpending;
-	sigprocmask;
-	_sigprocmask;
-	sigrelse;
-	_sigrelse;
-	sigsend;
-	_sigsend;
-	sigsendset;
-	_sigsendset;
-	sigset;
-	_sigset;
-	sigsetjmp;
-	_sigsetjmp = NODYNSORT;
-	sigsuspend;
-	_sigsuspend;
-	sleep;
-	_sleep;
-	__sparc_utrap_install;
-	sprintf;
-	srand;
-	srand48;
-	sscanf;
-	stat;
-	_stat;
-	statvfs;
-	_statvfs;
-	stime;
-	_stime;
-	strcat;
-	strchr;
-	strcmp;
-	strcoll;
-	strcpy;
-	strcspn;
-	strdup;
-	_strdup;
-	strerror;
-	strftime;
-	strlen;
-	strncat;
-	strncmp;
-	strncpy;
-	strpbrk;
-	strrchr;
-	strspn;
-	strstr;
-	strtod;
-	strtok;
-	strtok_r;
-	strtol;
-	strtoul;
-	strxfrm;
-	swab;
-	_swab;
-	swapcontext;
-	_swapcontext;
-	symlink;
-	_symlink;
-	sync;
-	_sync;
-	_syscall;
-	sysconf;
-	_sysconf;
-	sysinfo;
-	_sysinfo;
-	system;
-	tcdrain;
-	_tcdrain;
-	tcflow;
-	_tcflow;
-	tcflush;
-	_tcflush;
-	tcgetattr;
-	_tcgetattr;
-	tcgetpgrp;
-	_tcgetpgrp;
-	tcgetsid;
-	_tcgetsid;
-	tcsendbreak;
-	_tcsendbreak;
-	tcsetattr;
-	_tcsetattr;
-	tcsetpgrp;
-	_tcsetpgrp;
-	tdelete;
-	_tdelete;
-	tell;
-	_tell;
-	telldir;
-	_telldir;
-	tempnam;
-	_tempnam;
-	tfind;
-	_tfind;
-	time;
-	_time;
-	times;
-	_times;
-	tmpfile;
-	tmpnam;
-	toascii;
-	_toascii;
-	tolower;
-	_tolower;
-	toupper;
-	_toupper;
-	tsearch;
-	_tsearch;
-	ttyname;
-	_ttyname;
-	ttyname_r;
-	twalk;
-	_twalk;
-	tzset;
-	_tzset;
-	ulimit;
-	_ulimit;
-	umask;
-	_umask;
-	umount;
-	_umount;
-	uname;
-	_uname;
-	ungetc;
-	unlink;
-	_unlink;
-	unlockpt;
-	_unlockpt;
-	utime;
-	_utime;
-	vfprintf;
-	vprintf;
-	vsprintf;
-	wait;
-	_wait;
-	waitid;
-	_waitid;
-	waitpid;
-	_waitpid;
-	wcstombs;
-	wctomb;
-	write;
-	_write;
-	writev;
-	_writev;
-	_xftw;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_dladdr = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	_dladdr1 = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	_dlclose = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	_dldump = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	_dlerror = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	_dlinfo = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	_dlmopen = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	_dlopen = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	_dlsym = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	_ld_libc = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
-	__lyday_to_month;
-	__mon_lengths;
-	__yday_to_month;
-    protected:
-	_cerror;
-	__fseterror_u;
-	install_utrap;
-	_install_utrap;
-	nop;
-	_Q_cplx_div;
-	_Q_cplx_div_ix;
-	_Q_cplx_div_rx;
-	_Q_cplx_lr_div;
-	_Q_cplx_lr_div_ix;
-	_Q_cplx_lr_div_rx;
-	_Q_cplx_lr_mul;
-	_Q_cplx_mul;
-	_QgetRD;
-	_xregs_clrptr;
-
-    local:
-	__cerror =		NODYNSORT;
-	__cleanup =		NODYNSORT;
-};
--- a/usr/src/lib/libc/sparcv9/mapfile-vers-aux	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc/sparcv9/mapfile-vers-aux	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,19 +36,23 @@
 # MAPFILE HEADER END
 #
 
-SUNW_0.7 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_0.7 {	# SunOS 5.3 (Solaris 2.3)
     global:
-	memcmp = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
-	memcpy = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
-	memmove = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
-	memset = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	memcmp	{ AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 };
+	memcpy	{ AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 };
+	memmove	{ AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 };
+	memset	{ AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-	_memcmp = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
-	_memcpy = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
-	_memcpy = NODYNSORT;
-	_memmove = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
-	_memset = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	_memcmp	{ AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 };
+	_memcpy	{
+		AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+		FLAGS = NODYNSORT;
+	};
+	_memmove { AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 };
+	_memset	{ AUXILIARY = /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1 };
 };
--- a/usr/src/lib/libc_db/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc_db/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	td_thr_tlsbase;
 } SUNW_1.2;
@@ -46,12 +47,12 @@
 # no SUNW_1.2 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	td_sync_get_info;
 	td_sync_setstate;
@@ -76,7 +77,7 @@
 	td_thr_sleepinfo;
 } SUNW_0.9;
 
-SUNW_0.9 {
+SYMBOL_VERSION SUNW_0.9 {
     global:
 	td_init;
 	td_log;
@@ -103,7 +104,7 @@
 	td_thr_validate;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	td_sync_get_stats;
 	td_ta_sync_tracking_enable;
@@ -113,20 +114,20 @@
 
 # External interface requirements
 
-{
+SYMBOL_SCOPE {
     global:
-	ps_lcontinue =		EXTERN;
-	ps_lgetfpregs =		EXTERN;
-	ps_lgetregs =		EXTERN;
-	ps_lgetxregs =		EXTERN;
-	ps_lgetxregsize =	EXTERN;
-	ps_lsetfpregs =		EXTERN;
-	ps_lsetregs =		EXTERN;
-	ps_lsetxregs =		EXTERN;
-	ps_lstop =		EXTERN;
-	ps_pcontinue =		EXTERN;
-	ps_pdread =		EXTERN;
-	ps_pdwrite =		EXTERN;
-	ps_pglobal_lookup =	EXTERN;
-	ps_pstop =		EXTERN;
+	ps_lcontinue		{ FLAGS = EXTERN };
+	ps_lgetfpregs		{ FLAGS = EXTERN };
+	ps_lgetregs		{ FLAGS = EXTERN };
+	ps_lgetxregs		{ FLAGS = EXTERN };
+	ps_lgetxregsize		{ FLAGS = EXTERN };
+	ps_lsetfpregs		{ FLAGS = EXTERN };
+	ps_lsetregs		{ FLAGS = EXTERN };
+	ps_lsetxregs		{ FLAGS = EXTERN };
+	ps_lstop		{ FLAGS = EXTERN };
+	ps_pcontinue		{ FLAGS = EXTERN };
+	ps_pdread		{ FLAGS = EXTERN };
+	ps_pdwrite		{ FLAGS = EXTERN };
+	ps_pglobal_lookup	{ FLAGS = EXTERN };
+	ps_pstop		{ FLAGS = EXTERN };
 };
--- a/usr/src/lib/libc_psr/sun4u/mapfile-memcpy	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc_psr/sun4u/mapfile-memcpy	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # This mapfile is used along with mapfile-vers for the sun4u
 # libc_psr. Some of the other versions of sun4u libc_psr also use
 # mapfile-vers, but the contents of this file do not apply to them.
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     local:
 	# __align_cpy_1 is an alias for memcpy. Filter it out of
 	# the .SUNW_dynsymsort section.
-	__align_cpy_1 = NODYNSORT;
+	__align_cpy_1	{ FLAGS = NODYNSORT };
 };
--- a/usr/src/lib/libc_psr/sun4u/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc_psr/sun4u/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	memcmp;
 	_memcmp;
--- a/usr/src/lib/libc_psr/sun4u_hwcap2/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc_psr/sun4u_hwcap2/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,13 +1,11 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # 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,6 +20,9 @@
 #
 # CDDL HEADER END
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-hwcap_1 = popc;
+
+$mapfile_version 2
+
+CAPABILITY {
+	hw += popc;
+};
--- a/usr/src/lib/libc_psr/sun4v/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc_psr/sun4v/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	memcpy;
 	_memcpy;
@@ -46,6 +47,6 @@
 	memset;
 	_memset;
     local:
-	__align_cpy_1 =			NODYNSORT;
+	__align_cpy_1			{ FLAGS = NODYNSORT };
 	*;
 };
--- a/usr/src/lib/libc_psr/sun4v_hwcap1/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc_psr/sun4v_hwcap1/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,13 +1,11 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # 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,6 +20,9 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-hwcap_1 = asi_blk_init;
+
+$mapfile_version 2
+
+CAPABILITY {
+	hw += asi_blk_init;
+};
--- a/usr/src/lib/libc_psr/sun4v_hwcap2/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libc_psr/sun4v_hwcap2/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,9 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-hwcap_1 = vis asi_blk_init;
+
+$mapfile_version 2
+
+CAPABILITY {
+	hw += vis asi_blk_init;
+};
--- a/usr/src/lib/libcfgadm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcfgadm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,12 +36,14 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	config_list_ext;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	config_ap_id_cmp;
 	config_change_state;
@@ -55,7 +56,7 @@
 	config_unload_libs;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/libcmd/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcmd/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -37,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # functions by AST/ksh93's version of libcmd
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
     	_cmd_init;
 	
@@ -97,11 +99,11 @@
 
 # functions exported by the old Solaris version of libcmd
 # (the code has been moved to libc starting with Solaris 11/B51)
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-	defcntl = FUNCTION FILTER libc.so.1;
-	defopen = FUNCTION FILTER libc.so.1;
-	defread = FUNCTION FILTER libc.so.1;
+	defcntl		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	defopen		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	defread		{ TYPE = FUNCTION; FILTER = libc.so.1 };
     local:
 	*;
 };
--- a/usr/src/lib/libcmdutils/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcmdutils/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	add_tnode;
 	destroy_tree;
--- a/usr/src/lib/libcommputil/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcommputil/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	sdp_parse;
 	sdp_find_media;
--- a/usr/src/lib/libcontract/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcontract/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	ct_ctl_nack;
 	ct_dev_status_get_aset;
@@ -61,7 +62,7 @@
 	ct_pr_tmpl_set_svc_fmri;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	ct_ctl_abandon;
 	ct_ctl_ack;
@@ -123,7 +124,7 @@
 	ct_tmpl_set_informative;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	contract_abandon_id;
 	contract_event_dump;
--- a/usr/src/lib/libcpc/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcpc/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY = libcpc.a
@@ -44,8 +41,6 @@
 
 SRCDIR =	../common
 
-MAPFILES +=	mapfile-vers
-
 ASFLAGS +=	-P -D_ASM -I../common
 CPPFLAGS +=	-D_REENTRANT -I../common
 CFLAGS +=	$(CCVERBOSE)
--- a/usr/src/lib/libcpc/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.2 {
-    global:
-};
--- a/usr/src/lib/libcpc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcpc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	cpc_walk_generic_events_pic;
 	cpc_walk_generic_events_all;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	cpc_bind_cpu;
 	cpc_bind_curlwp;
@@ -78,9 +79,45 @@
 	cpc_walk_events_all;
 	cpc_walk_events_pic;
 	cpc_walk_requests;
+
+	# On all platforms other than amd64, SUNW_1.2 inherts SUNW_1.1,
+	# which supplies additional functions. On amd64, there is no SUNW_1.1.
+$if !(_x86 && _ELF64)
+} SUNW_1.1 ;
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+	cpc_access;
+	cpc_bind_event;
+	cpc_count_sys_events;
+	cpc_count_usr_events;
+	cpc_event_accum;
+	cpc_event_diff;
+	cpc_eventtostr;
+	cpc_getcciname;
+	cpc_getcpuref;
+	cpc_getcpuver;
+	cpc_getnpic;
+	cpc_getusage;
+	cpc_pctx_bind_event;
+	cpc_pctx_invalidate;
+	cpc_pctx_rele;
+	cpc_pctx_take_sample;
+	cpc_rele;
+	cpc_seterrfn;
+	cpc_shared_bind_event;
+	cpc_shared_close;
+	cpc_shared_open;
+	cpc_shared_rele;
+	cpc_shared_take_sample;
+	cpc_strtoevent;
+	cpc_take_sample;
+	cpc_version;
+	cpc_walk_names;
+$endif
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
 	cpc_terminate;
--- a/usr/src/lib/libcpc/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.2 {
-    global:
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	cpc_access;
-	cpc_bind_event;
-	cpc_count_sys_events;
-	cpc_count_usr_events;
-	cpc_event_accum;
-	cpc_event_diff;
-	cpc_eventtostr;
-	cpc_getcciname;
-	cpc_getcpuref;
-	cpc_getcpuver;
-	cpc_getnpic;
-	cpc_getusage;
-	cpc_pctx_bind_event;
-	cpc_pctx_invalidate;
-	cpc_pctx_rele;
-	cpc_pctx_take_sample;
-	cpc_rele;
-	cpc_seterrfn;
-	cpc_shared_bind_event;
-	cpc_shared_close;
-	cpc_shared_open;
-	cpc_shared_rele;
-	cpc_shared_take_sample;
-	cpc_strtoevent;
-	cpc_take_sample;
-	cpc_version;
-	cpc_walk_names;
-};
--- a/usr/src/lib/libcpc/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.2 {
-    global:
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	cpc_access;
-	cpc_bind_event;
-	cpc_count_sys_events;
-	cpc_count_usr_events;
-	cpc_event_accum;
-	cpc_event_diff;
-	cpc_eventtostr;
-	cpc_getcciname;
-	cpc_getcpuref;
-	cpc_getcpuver;
-	cpc_getnpic;
-	cpc_getusage;
-	cpc_pctx_bind_event;
-	cpc_pctx_invalidate;
-	cpc_pctx_rele;
-	cpc_pctx_take_sample;
-	cpc_rele;
-	cpc_seterrfn;
-	cpc_shared_bind_event;
-	cpc_shared_close;
-	cpc_shared_open;
-	cpc_shared_rele;
-	cpc_shared_take_sample;
-	cpc_strtoevent;
-	cpc_take_sample;
-	cpc_version;
-	cpc_walk_names;
-};
--- a/usr/src/lib/libcpc/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.2 {
-    global:
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	cpc_access;
-	cpc_bind_event;
-	cpc_count_sys_events;
-	cpc_count_usr_events;
-	cpc_event_accum;
-	cpc_event_diff;
-	cpc_eventtostr;
-	cpc_getcciname;
-	cpc_getcpuref;
-	cpc_getcpuver;
-	cpc_getnpic;
-	cpc_getusage;
-	cpc_pctx_bind_event;
-	cpc_pctx_invalidate;
-	cpc_pctx_rele;
-	cpc_pctx_take_sample;
-	cpc_rele;
-	cpc_seterrfn;
-	cpc_shared_bind_event;
-	cpc_shared_close;
-	cpc_shared_open;
-	cpc_shared_rele;
-	cpc_shared_take_sample;
-	cpc_strtoevent;
-	cpc_take_sample;
-	cpc_version;
-	cpc_walk_names;
-};
--- a/usr/src/lib/libcrypt/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcrypt/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,17 +36,19 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
-	crypt = FUNCTION FILTER libc.so.1;
-	encrypt = FUNCTION FILTER libc.so.1;
-	setkey = FUNCTION FILTER libc.so.1;
+	crypt		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	encrypt		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	setkey		{ TYPE = FUNCTION; FILTER = libc.so.1 };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cbc_crypt;
-	_crypt = FUNCTION FILTER libc.so.1;
+	_crypt		{ TYPE = FUNCTION; FILTER = libc.so.1 };
 	crypt_close;
 	_crypt_close;
 	crypt_close_nolock;
@@ -63,7 +64,7 @@
 	_des_setkey;
 	des_setparity;
 	ecb_crypt;
-	_encrypt = FUNCTION FILTER libc.so.1;
+	_encrypt	{ TYPE = FUNCTION; FILTER = libc.so.1 };
 	_lib_version;
 	makekey;
 	_makekey;
@@ -71,7 +72,7 @@
 	_run_crypt;
 	run_setkey;
 	_run_setkey;
-	_setkey = FUNCTION FILTER libc.so.1;
+	_setkey		{ TYPE = FUNCTION; FILTER = libc.so.1 };
     local:
 	*;
 };
--- a/usr/src/lib/libcryptoutil/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcryptoutil/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -35,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	create_umech;
 	cryptodebug;
--- a/usr/src/lib/libctf/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libctf/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,10 +36,12 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.2
 
-SUNWprivate_1.2 {
+SYMBOL_VERSION SUNWprivate_1.2 {
     global:
 	ctf_add_array;
 	ctf_add_const;
@@ -76,7 +77,7 @@
 	ctf_write;
 } SUNWprivate_1.1;
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	ctf_array_info;
 	ctf_bufopen;
--- a/usr/src/lib/libcurses/screen/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libcurses/screen/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	addch;
 	addchnstr;
@@ -367,7 +368,7 @@
 	wvline;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	acs32map;
 	acs_map;
@@ -507,7 +508,7 @@
 	pr_nheading;
 	pr_number;
 	prog_istermios;
-	progname = NODIRECT;
+	progname		{ FLAGS = NODIRECT };
 	pr_onecolumn;
 	pr_sfooting;
 	pr_sheading;
--- a/usr/src/lib/libdevice/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdevice/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	devctl_ap_acquire;
 	devctl_ap_configure;
--- a/usr/src/lib/libdevid/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdevid/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	devid_str_decode;
 	devid_str_encode;
@@ -45,7 +46,7 @@
 	devid_valid;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	devid_compare;
 	devid_deviceid_to_nmlist;
@@ -56,7 +57,7 @@
 	devid_sizeof;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	devid_free_guid;
 	devid_scsi_encode;
--- a/usr/src/lib/libdevinfo/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdevinfo/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.4 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.4 {
     global:
 	di_alias2curr;
 	di_path_bus_addr;
@@ -65,7 +67,7 @@
 	di_path_state;
 } SUNW_1.3;
 
-SUNW_1.3 {
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	di_devfs_minor_path;
 	di_driver_major;
@@ -93,12 +95,12 @@
 # no SUNW_1.2 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	di_binding_name;
 	di_bus_addr;
@@ -149,7 +151,7 @@
 	di_walk_node;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	devfs_add_minor_perm;
 	devfs_resolve_link;
--- a/usr/src/lib/libdhcpagent/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdhcpagent/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dhcp_ipc_accept;
 	dhcp_ipc_alloc_reply;
--- a/usr/src/lib/libdhcpdu/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdhcpdu/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dns_puthostent;
     local:
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdhcpsvc/modules/binfiles/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	add_dn;
 	add_dt;
--- a/usr/src/lib/libdhcpsvc/modules/files/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdhcpsvc/modules/files/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	add_dn;
 	add_dt;
--- a/usr/src/lib/libdhcpsvc/modules/files0/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdhcpsvc/modules/files0/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	add_dn;
 	add_dt;
--- a/usr/src/lib/libdhcpsvc/private/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdhcpsvc/private/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	add_dd_entry;
 	add_dnrec_to_list;
--- a/usr/src/lib/libdhcputil/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdhcputil/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -40,14 +39,16 @@
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.2
 
-SUNWprivate_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.2 {
     global:
 	dhcp_options_scan;
 	dhcpv6_find_option;
 	dhcpv6_pkt_option;
 } SUNWprivate_1.1;
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dhcpmsg;
 	dhcpmsg_fini;
--- a/usr/src/lib/libdisasm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdisasm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dis_disassemble;
 	dis_errno;
--- a/usr/src/lib/libdiskmgt/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdiskmgt/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dm_free_descriptor;
 	dm_free_descriptors;
--- a/usr/src/lib/libdladm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdladm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dladm_open;
 	dladm_close;
--- a/usr/src/lib/libdll/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdll/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,8 +37,10 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # information generated from usr/src/lib/libdll/i386/src/lib/libdll/dlldefs.h
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dllinfo;
 	dllplug;
--- a/usr/src/lib/libdlpi/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdlpi/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {	# first release of libdlpi, Solaris 11 
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {	# first release of libdlpi, Solaris 11 
     global:
 	dlpi_arptype;
         dlpi_bind;
@@ -63,7 +64,8 @@
         dlpi_unbind;
 	dlpi_walk;
 };
-SUNWprivate {
+
+SYMBOL_VERSION SUNWprivate {
     global:
         dlpi_parselink;
 	dlpi_makelink;
--- a/usr/src/lib/libdns_sd/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdns_sd/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	DNSServiceAddRecord;
 	DNSServiceBrowse;
--- a/usr/src/lib/libdns_sd/java/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdns_sd/java/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	Java_com_apple_dnssd_AppleBrowser_CreateBrowser;
 	Java_com_apple_dnssd_AppleDNSRecord_Remove;
--- a/usr/src/lib/libdoor/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdoor/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,19 +35,21 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-	door_bind = FUNCTION;
-	door_call = FUNCTION;
-	door_create = FUNCTION;
-	door_cred = FUNCTION;
-	door_info = FUNCTION;
-	door_return = FUNCTION;
-	door_revoke = FUNCTION;
-	door_server_create = FUNCTION;
-	door_ucred = FUNCTION;
-	door_unbind = FUNCTION;
-	door_xcreate = FUNCTION;
+	door_bind		{ TYPE = FUNCTION };
+	door_call		{ TYPE = FUNCTION };
+	door_create		{ TYPE = FUNCTION };
+	door_cred		{ TYPE = FUNCTION };
+	door_info		{ TYPE = FUNCTION };
+	door_return		{ TYPE = FUNCTION };
+	door_revoke		{ TYPE = FUNCTION };
+	door_server_create	{ TYPE = FUNCTION };
+	door_ucred		{ TYPE = FUNCTION };
+	door_unbind		{ TYPE = FUNCTION };
+	door_xcreate		{ TYPE = FUNCTION };
     local:
 	*;
 };
--- a/usr/src/lib/libds/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libds/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	ds_init;
 	ds_svc_reg;
--- a/usr/src/lib/libdscfg/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdscfg/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 # CDDL HEADER END
 #
 # 
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -42,7 +41,9 @@
 #
 
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		cfg_get_cstring;
 		cfg_put_cstring;
--- a/usr/src/lib/libdscp/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdscp/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dscpAddr;
 	dscpAuth;
--- a/usr/src/lib/libdtrace/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdtrace/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dtrace_addr2str;
 	dtrace_aggregate_clear;
--- a/usr/src/lib/libdtrace_jni/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libdtrace_jni/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	Java_org_opensolaris_os_dtrace_LocalConsumer__1checkProgramEnabling;
 	Java_org_opensolaris_os_dtrace_LocalConsumer__1checkVersion;
--- a/usr/src/lib/libefi/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libefi/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,12 +36,14 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	efi_use_whole_disk;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	efi_alloc_and_init;
 	efi_alloc_and_read;
@@ -50,7 +51,7 @@
 	efi_write;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	efi_auto_sense;
 	efi_err_check;
--- a/usr/src/lib/libelfsign/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libelfsign/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY = libelfsign.a
@@ -39,9 +38,6 @@
 
 LDLIBS +=	-lmd -lelf -lkmf -lcryptoutil -lc
 
-MAPFILE =	mapfile
-MAPFILES =	$(MAPFILE)
-
 CFLAGS +=	$(CCMT) $(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 
@@ -51,10 +47,4 @@
 
 lint:		lintcheck
 
-$(MAPFILE):	$(SRCDIR)/$(MAPFILE).map
-		$(RM) $@
-		$(CPP) $(SRCDIR)/$(MAPFILE).map > $@
-
-CLEANFILES +=	$(MAPFILE)
-
 include $(SRC)/lib/Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libelfsign/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,73 @@
+#
+# 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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+	elfsign_begin;
+	elfsign_buffer_len;
+	elfsign_end;
+	elfsign_extract_sig;
+	elfsign_hash;
+	elfsign_hash_mem_resident;
+	elfsign_insert_dso;
+	elfsign_setcallbackctx;
+	elfsign_setsigvercallback;
+	elfsign_setcertpath;
+	elfsign_sig_info;
+	elfsign_sig_info_free;
+	elfsign_signatures;
+	elfsign_strerror;
+	elfsign_verify_signature;
+	elfcertlib_getcert;
+	elfcertlib_getdn;
+	elfcertlib_getissuer;
+	elfcertlib_init;
+	elfcertlib_loadprivatekey;
+	elfcertlib_loadtokenkey;
+	elfcertlib_releasecert;
+	elfcertlib_setcertCAcallback;
+	elfcertlib_setcertvercallback;
+	elfcertlib_settoken;
+	elfcertlib_sign;
+	elfcertlib_verifycert;
+	elfcertlib_verifysig;
+    local:
+	*;
+};
--- a/usr/src/lib/libelfsign/common/mapfile.map	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * 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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
- */
-
-
-/*
- * MAPFILE HEADER START
- *
- * WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
- * Object versioning must comply with the rules detailed in
- *
- *	usr/src/lib/README.mapfiles
- *
- * You should not be making modifications here until you've read the most current
- * copy of that file. If you need help, contact a gatekeeper for guidance.
- *
- * MAPFILE HEADER END
- */
-
-SUNW_1.1 {
-    global:
-	elfsign_begin;
-	elfsign_buffer_len;
-	elfsign_end;
-	elfsign_extract_sig;
-	elfsign_hash;
-	elfsign_hash_mem_resident;
-	elfsign_insert_dso;
-	elfsign_setcallbackctx;
-	elfsign_setsigvercallback;
-	elfsign_setcertpath;
-	elfsign_sig_info;
-	elfsign_sig_info_free;
-	elfsign_signatures;
-	elfsign_strerror;
-	elfsign_verify_signature;
-	elfcertlib_getcert;
-	elfcertlib_getdn;
-	elfcertlib_getissuer;
-	elfcertlib_init;
-	elfcertlib_loadprivatekey;
-	elfcertlib_loadtokenkey;
-	elfcertlib_releasecert;
-	elfcertlib_setcertCAcallback;
-	elfcertlib_setcertvercallback;
-	elfcertlib_settoken;
-	elfcertlib_sign;
-	elfcertlib_verifycert;
-	elfcertlib_verifysig;
-    local:
-	*;
-};
--- a/usr/src/lib/libeti/form/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libeti/form/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.com
@@ -30,8 +27,6 @@
 
 DYNFLAGS += $(DYNFLAGS64)
 
-MAPFILES += $(SRCDIR)/mapfile64-vers
-
 .KEEP_STATE:
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- a/usr/src/lib/libeti/form/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libeti/form/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	current_field;
 	data_ahead;
@@ -112,7 +113,7 @@
 	unpost_form;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_adjust_cursor;
 	__advance;
@@ -158,7 +159,7 @@
 	_ins_char;
 	_ins_line;
 	_ins_mode;
-	__i_size = DATA FILTER libc.so.1 S0x4;
+	__i_size	{ TYPE = DATA; FILTER = libc.so.1; SIZE = 0x4 };
 	_last_field;
 	_last_page;
 	_left_char;
@@ -232,6 +233,19 @@
 	_win_to_buf;
 	__xpop;
 	__xpush;
+
+	__loc1	{
+		TYPE = DATA;
+		FILTER = libc.so.1;
+$if _ELF32
+		SIZE = 0x4;
+$elif _ELF64
+		SIZE = 0x8;
+$else
+$error unknown ELFCLASS
+$endif
+	};
+
     local:
 	*;
 };
--- a/usr/src/lib/libeti/form/common/mapfile32-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-	__loc1 = DATA FILTER libc.so.1 S0x4;
-};
--- a/usr/src/lib/libeti/form/common/mapfile64-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-	__loc1 = DATA FILTER libc.so.1 S0x8;
-};
--- a/usr/src/lib/libeti/form/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libeti/form/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,16 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-MAPFILES += $(SRCDIR)/mapfile32-vers
-
 install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
--- a/usr/src/lib/libeti/form/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libeti/form/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,16 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-MAPFILES += $(SRCDIR)/mapfile32-vers
-
 install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
--- a/usr/src/lib/libeti/form/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libeti/form/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.com
@@ -30,8 +27,6 @@
 
 DYNFLAGS += $(DYNFLAGS64)
 
-MAPFILES += $(SRCDIR)/mapfile64-vers
-
 .KEEP_STATE:
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- a/usr/src/lib/libeti/menu/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libeti/menu/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	current_item;
 	free_item;
@@ -101,7 +102,7 @@
 	unpost_menu;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_affect_change;
 	_chk_current;
--- a/usr/src/lib/libeti/panel/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libeti/panel/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	bottom_panel;
 	del_panel;
@@ -56,7 +57,7 @@
 	update_panels;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_alloc_overlap;
 	_Bottom_panel;
--- a/usr/src/lib/libexacct/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libexacct/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	ea_clear;
 	ea_fdopen;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	ea_alloc;
 	ea_attach_to_group;
@@ -57,7 +58,7 @@
 	ea_strfree;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	ea_close;
 	ea_error;
@@ -76,7 +77,7 @@
 	ea_write_object;
 };
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
     global:
 	exacct_order16;
 	exacct_order32;
--- a/usr/src/lib/libfcoe/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libfcoe/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	FCOE_CreatePort;
 	FCOE_DeletePort;
--- a/usr/src/lib/libfdisk/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libfdisk/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
         fdisk_ext_validate_part_start;
         fdisk_commit_ext_part;
--- a/usr/src/lib/libfru/libnvfru/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libfru/libnvfru/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	rawfru_to_nvlist;
 
--- a/usr/src/lib/libfsmgt/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libfsmgt/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cmd_execute_command;
 	cmd_execute_command_and_retrieve_string;
--- a/usr/src/lib/libfstyp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libfstyp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	fstyp_dump;
 	fstyp_fini;
@@ -47,7 +48,7 @@
 	fstyp_strerror;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/libgen/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libgen/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	libgen.a
@@ -42,8 +39,6 @@
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-MAPFILES +=	$(MAPFILE32)
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_LARGEFILE64_SOURCE -I../inc -I../../common/inc
 
--- a/usr/src/lib/libgen/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libgen/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 =
 
 include ../Makefile.com
 include ../../Makefile.lib.64
--- a/usr/src/lib/libgen/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libgen/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	advance;
 	bgets;
@@ -76,9 +77,13 @@
 	strfind;
 	strrspn;
 	strtrns;
+
+$if _ELF32
+	copylist64;	# largefiles interfaces for 32-bit applications
+$endif
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_compile;	# just for vi
 	__p2close;	# just for libcrypt
--- a/usr/src/lib/libgen/common/mapfile32-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.1 {	# largefiles interfaces for 32-bit applications
-    global:
-	copylist64;
-};
--- a/usr/src/lib/libgen/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libgen/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 = ../common/mapfile32-vers
 
 include ../Makefile.com
 
--- a/usr/src/lib/libgen/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libgen/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 = ../common/mapfile32-vers
 
 include ../Makefile.com
 
--- a/usr/src/lib/libgen/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libgen/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 =
 
 include ../Makefile.com
 include ../../Makefile.lib.64
--- a/usr/src/lib/libgrubmgmt/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libgrubmgmt/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,12 +19,27 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
-SUNWprivate_1.1 {
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	grub_get_boot_args;
 	grub_cleanup_boot_args;
--- a/usr/src/lib/libgss/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libgss/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,7 +35,10 @@
 #
 # MAPFILE HEADER END
 #
-SUNW_1.3 {
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	gss_add_buffer_set_member;
 	gss_create_empty_buffer_set;
@@ -45,7 +47,7 @@
 	gss_release_buffer_set;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	gss_accept_sec_context;
 	gss_acquire_cred;
@@ -101,12 +103,12 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	der_length_size;
 	generic_gss_copy_oid;
--- a/usr/src/lib/libhotplug/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libhotplug/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	hp_init;
 	hp_fini;
--- a/usr/src/lib/libidmap/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libidmap/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -37,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	directory_canon_from_group_name;
 	directory_canon_from_name;
--- a/usr/src/lib/libilb/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libilb/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,8 +36,9 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	ilb_add_server_to_group;
 	ilb_address_to_srvID;
@@ -68,7 +68,7 @@
 	ilb_walk_servers;
 };
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
     global:
 	ilb_cmp_in6_addr;
 	ilb_cmp_ipaddr;
--- a/usr/src/lib/libima/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libima/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -37,13 +36,16 @@
 #
 # MAPFILE HEADER END
 #
-SUNW_1.1 {		# update to libima, Solaris 11
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {		# update to libima, Solaris 11
     global:
 	SUN_IMA_SetTunableProperties;
 	SUN_IMA_GetTunableProperties;
 } SUNW_1.0;
 	
-SUNW_1.0 {		# first release of libima in S10u2_02
+SYMBOL_VERSION SUNW_1.0 {		# first release of libima in S10u2_02
     global:
 	IMA_GetErrorRecoveryLevelProperties;
 	IMA_GetNetworkPortalProperties;
--- a/usr/src/lib/libinetsvc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libinetsvc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	calculate_hash;
 	connect_to_inetd;
--- a/usr/src/lib/libinetutil/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libinetutil/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	get_netmask4;
 	hexascii_to_octet;
--- a/usr/src/lib/libinstzones/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libinstzones/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	UmountAllZones;
 	z_add_inherited_file_system;
--- a/usr/src/lib/libintl/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libintl/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,5 +1,4 @@
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -35,27 +34,29 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
     local:
 	*;
 } SUNW_0.8;
 
-SUNW_0.8 {
+SYMBOL_VERSION SUNW_0.8 {
     global:
-	dcgettext = FUNCTION;
+	dcgettext		{ TYPE = FUNCTION };
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
-	gettext = FUNCTION;
-	dgettext = FUNCTION;
-	textdomain = FUNCTION;
-	bindtextdomain = FUNCTION;
+	gettext			{ TYPE = FUNCTION };
+	dgettext		{ TYPE = FUNCTION };
+	textdomain		{ TYPE = FUNCTION };
+	bindtextdomain		{ TYPE = FUNCTION };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
 };
--- a/usr/src/lib/libipmi/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libipmi/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	ipmi_chassis_identify;
 	ipmi_close;
--- a/usr/src/lib/libipmp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libipmp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	ipmp_addrinfo_create;
 	ipmp_close;
--- a/usr/src/lib/libipp/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libipp/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	ipp_action_create;
 	ipp_action_destroy;
--- a/usr/src/lib/libipsecutil/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libipsecutil/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	addipsecalg;
 	addipsecproto;
@@ -56,8 +57,8 @@
 	dump_sadb_idtype;
 	dump_sockaddr;
 	env;
-	_errfp = FUNCTION FILTER libc.so.1;
-	_errxfp = FUNCTION FILTER libc.so.1;
+	_errfp			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	_errxfp			{ TYPE = FUNCTION; FILTER = libc.so.1 };
 	getipsecalgs;
 	getipsecprotos;
 	in_masktoprefix;
@@ -115,12 +116,12 @@
 	secs2str;
 	spdsock_diag;
 	spdsock_get_ext;
-	_verrfp = FUNCTION FILTER libc.so.1;
-	_verrxfp = FUNCTION FILTER libc.so.1;
-	_vwarnfp = FUNCTION FILTER libc.so.1;
-	_vwarnxfp = FUNCTION FILTER libc.so.1;
-	_warnfp = FUNCTION FILTER libc.so.1;
-	_warnxfp = FUNCTION FILTER libc.so.1;
+	_verrfp			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	_verrxfp		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	_vwarnfp		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	_vwarnxfp		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	_warnfp			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	_warnxfp		{ TYPE = FUNCTION; FILTER = libc.so.1 };
     local:
 	*;
 };
--- a/usr/src/lib/libiscsit/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libiscsit/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,7 +35,10 @@
 #
 # MAPFILE HEADER END
 #
-SUNW_1.1 {
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		it_config_load;
 		it_config_commit;
@@ -59,7 +61,7 @@
 		it_portal_create;
 };
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
 	global:
 		it_config_to_nv;
 		it_nv_to_config;
--- a/usr/src/lib/libkmf/ber_der/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libkmf/ber_der/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	AddRDN;
 	CopyRDN;
--- a/usr/src/lib/libkmf/libkmf/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libkmf/libkmf/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -34,7 +34,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	KMFOID_AliasedEntryName;
 	KMFOID_AuthorityInfoAccess;
@@ -387,7 +389,7 @@
 };
 
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	copy_extension_data;
 	dup_entry;
--- a/usr/src/lib/libkmf/plugins/kmf_nss/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libkmf/plugins/kmf_nss/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	KMF_Plugin_Initialize;
         NSS_CreateKeypair;
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	KMF_Plugin_Initialize;
 	OpenSSL_CertGetPrintable;
--- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	KMF_Plugin_Initialize;
         KMFPK11_CreateKeypair;
--- a/usr/src/lib/libkrb5/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libkrb5/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,6 +36,8 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # This is a mapfile that defines a filter for mech_krb5 so that
 # a new public library can be made to access certain functions in
@@ -45,254 +46,338 @@
 # New functions can be added as needed.
 #
 
-{
+SYMBOL_SCOPE {
     global:
 
 # com_err.h
-        com_err =		FUNCTION FILTER mech_krb5.so.1;
-        com_err_va =		FUNCTION FILTER mech_krb5.so.1;
-        error_message = 	FUNCTION FILTER mech_krb5.so.1;
+        com_err			{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        com_err_va		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        error_message		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
 
 # krb5.h (non-private and non-deprecated)
-        krb5_c_encrypt =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_decrypt =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_encrypt_length =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_block_size =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_init_state =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_free_state =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_make_random_key =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_random_make_octets =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_string_to_key =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_string_to_key_with_params =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_enctype_compare =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_make_checksum =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_verify_checksum =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_checksum_length =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_keyed_checksum_types =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_valid_enctype =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_valid_cksumtype =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_is_coll_proof_cksum =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_c_is_keyed_cksum =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_gen_new =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_initialize =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_destroy =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_close =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_store_cred =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_retrieve_cred =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_get_name =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_get_principal =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_start_seq_get =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_next_cred =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_end_seq_get =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_remove_cred =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_set_flags =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_get_type =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_get_type =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_get_name =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_close =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_get_entry =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_start_seq_get =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_next_entry =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_end_seq_get =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_init_context =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_init_secure_context =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_free_context =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_set_default_tgs_enctypes =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_permitted_enctypes =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_is_thread_safe =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_tgt_creds =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_credentials =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_credentials_validate =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_credentials_renew =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_mk_req =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_mk_req_extended =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_mk_rep =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_rd_rep =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_mk_error =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_rd_error =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_rd_safe =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_rd_priv =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_parse_name =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_unparse_name =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_unparse_name_ext =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_set_principal_realm =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_address_search =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_address_compare =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_address_order =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_realm_compare =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_principal_compare =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_init_keyblock =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_keyblock =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_keyblock_contents =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_creds =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_data =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_principal =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_addresses =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_ticket =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_authdata =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_authenticator =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_copy_checksum =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_server_rcache =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_build_principal_ext =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_build_principal =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_resolve =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_default_name =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_default =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_keytab_entry_contents =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_remove_entry =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_add_entry =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_principal2salt =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_resolve =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_default_name =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_set_default_name =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_default =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cc_copy_creds =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_principal =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_authenticator =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_addresses =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_authdata =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_ticket =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_error =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_creds =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_cred_contents =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_checksum =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_checksum_contents =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_keyblock =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_keyblock_contents =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_ap_rep_enc_part =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_data =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_data_contents =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_unparsed_name =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_cksumtypes =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_us_timeofday =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_timeofday =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_os_localaddr =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_default_realm =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_set_default_realm =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_default_realm =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_sname_to_principal =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_change_password =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_set_password =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_set_password_using_ccache =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_profile =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_rd_req =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kt_read_service_key =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_mk_safe =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_mk_priv =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_sendauth =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_recvauth =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_recvauth_version =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_mk_ncred =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_mk_1cred =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_rd_cred =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_fwd_tgt_creds =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_init =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_free =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_setflags =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_getflags =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_set_checksum_func =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_get_checksum_func =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_setaddrs =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_getaddrs =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_setports =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_setuseruserkey =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_getkey =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_getsendsubkey =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_getrecvsubkey =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_setsendsubkey =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_setrecvsubkey =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_getlocalseqnumber =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_getremoteseqnumber =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_setrcache =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_getrcache =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_getauthenticator =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_read_password =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_aname_to_localname =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_host_realm =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_host_realm =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_kuserok =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_auth_con_genaddrs =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_set_real_time =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_string_to_enctype =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_string_to_salttype =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_string_to_cksumtype =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_string_to_timestamp =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_string_to_deltat =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_enctype_to_string =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_salttype_to_string =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_cksumtype_to_string =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_timestamp_to_string =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_timestamp_to_sfstring =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_deltat_to_string =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_xfree_wrap =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_xfree =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_prompter_posix =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_opt_init =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_opt_set_tkt_life =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_opt_set_renew_life =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_opt_set_forwardable =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_opt_set_proxiable =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_opt_set_etype_list =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_opt_set_address_list =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_opt_set_preauth_list =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_opt_set_salt =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_password =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_init_creds_keytab =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_verify_init_creds_opt_init =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_verify_init_creds_opt_set_ap_req_nofail =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_verify_init_creds =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_validated_creds =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_renewed_creds =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_decode_ticket =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_appdefault_string =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_appdefault_boolean =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_realm_iterator_create =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_realm_iterator =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_realm_iterator_free =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_free_realm_string =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_prompt_types =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_string_to_key =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_use_enctype =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_init_allocated_keyblock =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_key_enctype =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_key_length =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_get_key_data =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_set_key_enctype =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_set_key_data =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_set_key_length =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_pac_add_buffer =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_pac_free =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_pac_get_buffer =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_pac_get_types =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_pac_init =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_pac_parse =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_pac_verify =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_decode_authdata_container  =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_encode_authdata_container  =	FUNCTION FILTER mech_krb5.so.1;
+        krb5_c_encrypt		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_decrypt		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_encrypt_length	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_block_size	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_init_state	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_free_state	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_make_random_key	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_random_make_octets { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_string_to_key	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_string_to_key_with_params {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_c_enctype_compare	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_make_checksum	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_verify_checksum	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_checksum_length	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_keyed_checksum_types { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_valid_enctype	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_valid_cksumtype	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_is_coll_proof_cksum { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_c_is_keyed_cksum	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_gen_new		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_initialize	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_destroy		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_close		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_store_cred	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_retrieve_cred	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_get_name	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_get_principal	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_start_seq_get	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_next_cred	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_end_seq_get	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_remove_cred	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_set_flags	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_get_type	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_get_type	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_get_name	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_close		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_get_entry	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_start_seq_get	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_next_entry	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_end_seq_get	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_init_context	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_init_secure_context { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_free_context	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_set_default_tgs_enctypes {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_permitted_enctypes { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_is_thread_safe	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_tgt_creds	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_credentials	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_credentials_validate {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_credentials_renew { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_mk_req		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_mk_req_extended	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_mk_rep		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_rd_rep		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_mk_error		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_rd_error		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_rd_safe		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_rd_priv		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_parse_name		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_unparse_name	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_unparse_name_ext	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_set_principal_realm { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_address_search	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_address_compare	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_address_order	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_realm_compare	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_principal_compare	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_init_keyblock	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_keyblock	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_keyblock_contents { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_creds		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_data		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_principal	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_addresses	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_ticket	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_authdata	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_authenticator	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_copy_checksum	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_server_rcache	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_build_principal_ext { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_build_principal	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_resolve		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_default_name	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_default		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_keytab_entry_contents	{
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_kt_remove_entry	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_add_entry	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_principal2salt	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_resolve		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_default_name	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_set_default_name { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_default		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cc_copy_creds	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_principal	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_authenticator	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_addresses	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_authdata	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_ticket	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_error		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_creds		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_cred_contents	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_checksum	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_checksum_contents { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_keyblock	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_keyblock_contents { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_ap_rep_enc_part { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_data		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_data_contents	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_unparsed_name	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_cksumtypes	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_us_timeofday	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_timeofday		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_os_localaddr	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_default_realm	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_set_default_realm	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_default_realm	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_sname_to_principal	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_change_password	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_set_password	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_set_password_using_ccache {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_profile	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_rd_req		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kt_read_service_key { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_mk_safe		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_mk_priv		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_sendauth		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_recvauth		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_recvauth_version	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_mk_ncred		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_mk_1cred		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_rd_cred		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_fwd_tgt_creds	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_init	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_free	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_setflags	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_getflags	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_set_checksum_func	{
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_auth_con_get_checksum_func	{
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	 };
+        krb5_auth_con_setaddrs	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_getaddrs	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_setports	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_setuseruserkey {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_auth_con_getkey	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_getsendsubkey { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_getrecvsubkey { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_setsendsubkey { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_setrecvsubkey { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_getlocalseqnumber	{
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_auth_con_getremoteseqnumber {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_auth_con_setrcache	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_getrcache	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_getauthenticator {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_read_password	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_aname_to_localname	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_host_realm	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_host_realm	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_kuserok		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_auth_con_genaddrs	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_set_real_time	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_string_to_enctype	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_string_to_salttype	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_string_to_cksumtype { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_string_to_timestamp { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_string_to_deltat	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_enctype_to_string	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_salttype_to_string	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_cksumtype_to_string { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_timestamp_to_string { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_timestamp_to_sfstring { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_deltat_to_string	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_xfree_wrap		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_xfree		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_prompter_posix	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_init_creds_opt_init {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_init_creds_opt_set_tkt_life {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_init_creds_opt_set_renew_life {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_init_creds_opt_set_forwardable {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_init_creds_opt_set_proxiable {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_init_creds_opt_set_etype_list {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_init_creds_opt_set_address_list { 
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1
+	};
+        krb5_get_init_creds_opt_set_preauth_list {
+		TYPE = FUNCTION; 
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_init_creds_opt_set_salt {
+		TYPE = FUNCTION;
+		 FILTER = mech_krb5.so.1;
+	};
+        krb5_get_init_creds_password { 
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_init_creds_keytab { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_verify_init_creds_opt_init	{
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_verify_init_creds_opt_set_ap_req_nofail {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_verify_init_creds	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_validated_creds { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_renewed_creds	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_decode_ticket	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_appdefault_string	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_appdefault_boolean	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_realm_iterator_create { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_realm_iterator	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_realm_iterator_free { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_free_realm_string	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_prompt_types	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_string_to_key	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_use_enctype	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_init_allocated_keyblock {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+        krb5_get_key_enctype	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_key_length	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_get_key_data	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_set_key_enctype	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_set_key_data	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_set_key_length	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_pac_add_buffer	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_pac_free		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_pac_get_buffer	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_pac_get_types	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_pac_init		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_pac_parse		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_pac_verify		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_decode_authdata_container {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+	krb5_encode_authdata_container {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
 
 # krb5.h - priv/deprecated
-        krb5_string_to_key =	FUNCTION FILTER mech_krb5.so.1;
-        krb5_use_enctype =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_checksum_size =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_kt_free_entry  =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_auth_con_getlocalsubkey =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_auth_con_getremotesubkey =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_set_default_tgs_ktypes =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_free_ktypes =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_free_ap_req =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_free_ap_rep =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_free_cred =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_decrypt_tkt_part =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_get_error_message = 	FUNCTION FILTER mech_krb5.so.1;
-	krb5_free_error_message = FUNCTION FILTER mech_krb5.so.1;
-	krb5_clear_error_message =  FUNCTION FILTER mech_krb5.so.1;
-	valid_cksumtype =	FUNCTION FILTER mech_krb5.so.1;
+        krb5_string_to_key	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+        krb5_use_enctype	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_checksum_size	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_kt_free_entry 	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_auth_con_getlocalsubkey {
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+	krb5_auth_con_getremotesubkey { 
+		TYPE = FUNCTION;
+		FILTER = mech_krb5.so.1;
+	};
+	krb5_set_default_tgs_ktypes { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_free_ktypes	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_free_ap_req	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_free_ap_rep	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_free_cred		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_decrypt_tkt_part	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_get_error_message	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_free_error_message	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_clear_error_message { TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	valid_cksumtype		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
 
 # k5-int.h (needed by Samba, openssl, etc)
-	decode_krb5_ap_req =	FUNCTION FILTER mech_krb5.so.1;
-	encode_krb5_ap_req =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_rc_get_lifespan =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_rc_initialize =	FUNCTION FILTER mech_krb5.so.1;
-	krb5_rc_default	=	FUNCTION FILTER mech_krb5.so.1;
-	krb5_rc_destroy =	FUNCTION FILTER mech_krb5.so.1;
+	decode_krb5_ap_req	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	encode_krb5_ap_req	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_rc_get_lifespan	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_rc_initialize	{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_rc_default		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
+	krb5_rc_destroy		{ TYPE = FUNCTION; FILTER = mech_krb5.so.1 };
 };
--- a/usr/src/lib/libkstat/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libkstat/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,16 +36,18 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # Due to mistakes made early in the history of this library, there are
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
 	kstat_chain_update;
 	kstat_close;
--- a/usr/src/lib/libkvm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libkvm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	kvm_close;
 	kvm_getcmd;
@@ -55,7 +56,7 @@
 	kvm_write;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	kvm_aread;
 	kvm_awrite;
--- a/usr/src/lib/libldap4/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libldap4/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	ber_alloc;
 	ber_get_int;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	ber_alloc_t;
 	ber_bvdup;
@@ -212,7 +213,7 @@
 	set_ber_options;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	i18n_catopen;
 	ldap_create_page_control;
--- a/usr/src/lib/libldap5/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libldap5/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,17 +36,19 @@
 # MAPFILE HEADER END
 #
 
-SUNW_5.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_5.2 {
     global:
 	ldap_sasl_interactive_bind_s;
 } SUNW_5.1.1;
 
-SUNW_5.1.1 {
+SYMBOL_VERSION SUNW_5.1.1 {
     global:
 	ldap_url_parse_nodn;
 } SUNW_5.1;
 
-SUNW_5.1 {
+SYMBOL_VERSION SUNW_5.1 {
     global:
 	ber_alloc;
 	ber_alloc_t;
@@ -221,7 +222,7 @@
 	ldap_version;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	ldap_charray_add;
 	ldap_charray_dup;
--- a/usr/src/lib/liblgrp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/liblgrp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	lgrp_latency_cookie;
 	lgrp_resources;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	lgrp_affinity_get;
 	lgrp_affinity_set;
--- a/usr/src/lib/liblm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/liblm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	lm_shutdown;
     local:
--- a/usr/src/lib/libmail/amd64/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmail/amd64/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 =
 
 include ../Makefile.com
 include ../../Makefile.lib.64
--- a/usr/src/lib/libmail/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmail/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,14 +36,16 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	maillock;
 	mailunlock;
 	touchlock;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	casncmp;
 	copystream;
@@ -59,6 +60,27 @@
 	Xgetenv;
 	xgetenv;
 	xsetenv;
+
+$if _ELF32	# only for 32-bit applications
+	abspath;
+	notify;
+	s_append;
+	s_array;
+	s_copy;
+	setup_exec;
+	s_free;
+	s_grow;
+	s_new;
+	s_parse;
+	s_read_line;
+	s_read_to_eof;
+	s_seq_read;
+	s_skipwhite;
+	s_tok;
+	s_tolower;
+	systemvp;
+$endif
+
     local:
 	*;
 };
--- a/usr/src/lib/libmail/common/mapfile32-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {	# only for 32-bit applications
-    global:
-	abspath;
-	notify;
-	s_append;
-	s_array;
-	s_copy;
-	setup_exec;
-	s_free;
-	s_grow;
-	s_new;
-	s_parse;
-	s_read_line;
-	s_read_to_eof;
-	s_seq_read;
-	s_skipwhite;
-	s_tok;
-	s_tolower;
-	systemvp;
-};
--- a/usr/src/lib/libmail/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmail/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 = ../common/mapfile32-vers
 
 include ../Makefile.com
 
--- a/usr/src/lib/libmail/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmail/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 = ../common/mapfile32-vers
 
 include ../Makefile.com
 
--- a/usr/src/lib/libmail/sparcv9/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmail/sparcv9/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 =
 
 include ../Makefile.com
 include ../../Makefile.lib.64
--- a/usr/src/lib/libmalloc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmalloc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,24 +36,26 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1.1 {
     global:
-	memalign = NODIRECT;
-	valloc = NODIRECT;
+	memalign		{ FLAGS = NODIRECT };
+	valloc			{ FLAGS = NODIRECT };
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
-	calloc = NODIRECT;
-	cfree = NODIRECT;
-	free = NODIRECT;
-	mallinfo = NODIRECT;
-	malloc = NODIRECT;
-	mallopt = NODIRECT;
-	realloc = NODIRECT;
+	calloc			{ FLAGS = NODIRECT };
+	cfree			{ FLAGS = NODIRECT };
+	free			{ FLAGS = NODIRECT };
+	mallinfo		{ FLAGS = NODIRECT };
+	malloc			{ FLAGS = NODIRECT };
+	mallopt			{ FLAGS = NODIRECT };
+	realloc			{ FLAGS = NODIRECT };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/libmapid/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmapid/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	mapid_derive_domain;
 	mapid_get_domain;
--- a/usr/src/lib/libmapmalloc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmapmalloc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -41,23 +40,25 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
-	calloc = NODIRECT;
-	cfree = NODIRECT;
-	free = NODIRECT;
-	malloc = NODIRECT;
-	memalign = NODIRECT;
-	realloc = NODIRECT;
-	valloc = NODIRECT;
+	calloc			{ FLAGS = NODIRECT };
+	cfree			{ FLAGS = NODIRECT };
+	free			{ FLAGS = NODIRECT };
+	malloc			{ FLAGS = NODIRECT };
+	memalign		{ FLAGS = NODIRECT };
+	realloc			{ FLAGS = NODIRECT };
+	valloc			{ FLAGS = NODIRECT };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/libmd/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmd/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,6 +36,8 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # Note:
 #
 #	SHA256Update, SHA384Update, and SHA512Update are all
@@ -50,30 +51,30 @@
 #
 
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	MD4Final;
 	MD4Init;
 	MD4Update;
 	md5_calc;
-	MD5Final =	NODIRECT;	# Address interposition from testsuite
-	MD5Init =	NODIRECT;	# Address interposition from testsuite
-	MD5Update =	NODIRECT;	# Address interposition from testsuite
+	MD5Final	{ FLAGS = NODIRECT };	# Addr interpose from testsuite
+	MD5Init		{ FLAGS = NODIRECT };	# Addr interpose from testsuite
+	MD5Update	{ FLAGS = NODIRECT };	# Addr interpose from testsuite
 	SHA1Final;
 	SHA1Init;
 	SHA1Update;
-	SHA256Final =	NODYNSORT;
+	SHA256Final	{ FLAGS = NODYNSORT };
 	SHA256Init;
-	SHA256Update =	NODYNSORT;
+	SHA256Update	{ FLAGS = NODYNSORT };
 	SHA2Final;
 	SHA2Init;
 	SHA2Update;
-	SHA384Final =	NODYNSORT;
+	SHA384Final	{ FLAGS = NODYNSORT };
 	SHA384Init;
-	SHA384Update =	NODYNSORT;
-	SHA512Final =	NODYNSORT;
+	SHA384Update	{ FLAGS = NODYNSORT };
+	SHA512Final	{ FLAGS = NODYNSORT };
 	SHA512Init;
-	SHA512Update =	NODYNSORT;
+	SHA512Update	{ FLAGS = NODYNSORT };
     local:
 	*;
 };
--- a/usr/src/lib/libmd/sun4u/sparc/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmd/sun4u/sparc/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		MD5Init;
 		MD5Update;
--- a/usr/src/lib/libmd/sun4u/sparcv9/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmd/sun4u/sparcv9/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		MD5Init;
 		MD5Update;
--- a/usr/src/lib/libmd/sun4v/sparc/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmd/sun4v/sparc/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		MD5Init;
 		MD5Update;
--- a/usr/src/lib/libmd/sun4v/sparcv9/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmd/sun4v/sparcv9/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		MD5Init;
 		MD5Update;
--- a/usr/src/lib/libmd5/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmd5/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -46,10 +45,12 @@
 #
 
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
-		MD5Init = FUNCTION;
-		MD5Update = FUNCTION;
-		MD5Final = FUNCTION;
-		md5_calc = FUNCTION;
+		MD5Init		{ TYPE = FUNCTION };
+		MD5Update	{ TYPE = FUNCTION };
+		MD5Final	{ TYPE = FUNCTION };
+		md5_calc	{ TYPE = FUNCTION };
 };
--- a/usr/src/lib/libmp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	mp_gcd;
 	mp_itom;
@@ -57,7 +58,7 @@
 	mp_xtom;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_mp_move;
 	_mp_xalloc;
--- a/usr/src/lib/libmp/common/mapfile_1-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmp/common/mapfile_1-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	gcd;
 	itom;
@@ -57,7 +58,7 @@
 	xtom;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_lib_version;
 	xalloc;
--- a/usr/src/lib/libmtmalloc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libmtmalloc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,22 +36,24 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1.1 {
     global:
-	calloc = NODIRECT;
+	calloc			{ FLAGS = NODIRECT };
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
-	free = NODIRECT;
-	malloc = NODIRECT;
-	mallocctl = NODIRECT;
-	memalign = NODIRECT;
-	realloc = NODIRECT;
-	valloc = NODIRECT;
+	free			{ FLAGS = NODIRECT };
+	malloc			{ FLAGS = NODIRECT };
+	mallocctl		{ FLAGS = NODIRECT };
+	memalign		{ FLAGS = NODIRECT };
+	realloc			{ FLAGS = NODIRECT };
+	valloc			{ FLAGS = NODIRECT };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/libndmp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libndmp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -51,7 +50,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	ndmp_get_devinfo;
 	ndmp_get_devinfo_free;
--- a/usr/src/lib/libnisdb/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libnisdb/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,16 +36,18 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # Due to mistakes made early in the history of this library, there are
 # no SUNW_2.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_2.1 {
+SYMBOL_VERSION SUNW_2.1 {
     global:
 	SUNW_2.1;
 };
 
-SUNWprivate_2.1 {
+SYMBOL_VERSION SUNWprivate_2.1 {
     global:
 	abort_transaction;
 	addUpdate;
--- a/usr/src/lib/libnls/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libnls/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,14 +36,16 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	nlsgetcall;
 	nlsprovider;
 	nlsrequest;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_lib_version;
 	nlsc2addr;
--- a/usr/src/lib/libnsctl/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libnsctl/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -17,8 +17,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -35,11 +34,13 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Generic interface definition for usr/src/lib/libnsctl.
 #
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		_nsc_nocheck;
 		nsc_check_release;
--- a/usr/src/lib/libnsl/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libnsl/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -166,7 +166,6 @@
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 SRCDIR=		../common
-MAPFILES +=	mapfile-vers
 
 # Override the position-independent code generation flags.
 #
--- a/usr/src/lib/libnsl/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	authdes_getucred;
-	authdes_seccreate;
-	authnone_create;
-	authsys_create;
-	authsys_create_default;
-	clnt_create;
-	clnt_dg_create;
-	clnt_pcreateerror;
-	clnt_perrno;
-	clnt_perror;
-	clnt_raw_create;
-	clnt_spcreateerror;
-	clnt_sperrno;
-	clnt_sperror;
-	clnt_tli_create;
-	clnt_tp_create;
-	clnt_vc_create;
-	endnetconfig;
-	endnetpath;
-	freenetconfigent;
-	gethostbyaddr;
-	gethostbyname;
-	getnetconfig;
-	getnetconfigent;
-	getnetname;
-	getnetpath;
-	getpublickey;
-	getsecretkey;
-	host2netname;
-	inet_addr;
-	inet_netof;
-	inet_ntoa;
-	key_decryptsession;
-	key_encryptsession;
-	key_gendes;
-	key_setsecret;
-	nc_perror;
-	_nderror;
-	netdir_free;
-	netdir_getbyaddr;
-	netdir_getbyname;
-	netdir_options;
-	netname2host;
-	netname2user;
-	_null_auth;
-	rpcb_getaddr;
-	rpcb_getmaps;
-	rpcb_gettime;
-	rpcb_rmtcall;
-	rpc_broadcast;
-	rpc_broadcast_exp;
-	rpcb_set;
-	rpcb_unset;
-	rpc_call;
-	rpc_createerr;
-	__rpc_createerr;
-	rpc_reg;
-	setnetconfig;
-	setnetpath;
-	svc_create;
-	svc_dg_create;
-	svcerr_auth;
-	svcerr_decode;
-	svcerr_noproc;
-	svcerr_noprog;
-	svcerr_progvers;
-	svcerr_systemerr;
-	svcerr_weakauth;
-	svc_exit;
-	svc_fd_create;
-	svc_fdset;
-	svc_getreqset;
-	svc_raw_create;
-	svc_reg;
-	svc_run;
-	svc_sendreply;
-	svc_tli_create;
-	svc_tp_create;
-	svc_unreg;
-	svc_vc_create;
-	t_accept;
-	taddr2uaddr;
-	t_alloc;
-	t_bind;
-	t_close;
-	t_connect;
-	t_errno;
-	t_error;
-	t_free;
-	t_getinfo;
-	t_getstate;
-	t_listen;
-	t_look;
-	t_open;
-	t_optmgmt;
-	t_rcv;
-	t_rcvconnect;
-	t_rcvdis;
-	t_rcvrel;
-	t_rcvudata;
-	t_rcvuderr;
-	t_snd;
-	t_snddis;
-	t_sndrel;
-	t_sndudata;
-	t_sync;
-	t_unbind;
-	uaddr2taddr;
-	user2netname;
-	xdr_accepted_reply;
-	xdr_array;
-	xdr_authsys_parms;
-	xdr_bool;
-	xdr_bytes;
-	xdr_callhdr;
-	xdr_callmsg;
-	xdr_char;
-	xdr_double;
-	xdr_enum;
-	xdr_float;
-	xdr_free;
-	xdr_int;
-	xdr_long;
-	xdrmem_create;
-	xdr_opaque;
-	xdr_opaque_auth;
-	xdr_pointer;
-	xdrrec_create;
-	xdrrec_eof;
-	xdrrec_skiprecord;
-	xdr_reference;
-	xdr_rejected_reply;
-	xdr_replymsg;
-	xdr_short;
-	xdrstdio_create;
-	xdr_string;
-	xdr_u_char;
-	xdr_u_long;
-	xdr_union;
-	xdr_u_short;
-	xdr_vector;
-	xdr_void;
-	xdr_wrapstring;
-	xprt_register;
-	xprt_unregister;
-};
--- a/usr/src/lib/libnsl/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libnsl/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -37,17 +37,19 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.10 {		# SunOS 5.11 (Solaris 11)
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.10 {	# SunOS 5.11 (Solaris 11)
     global:
 	SUNW_1.10;
 } SUNW_1.9.1;
 
-SUNW_1.9.1 {		# SunOS 5.10 (Solaris 10 update 5)
+SYMBOL_VERSION SUNW_1.9.1 {	# SunOS 5.10 (Solaris 10 update 5)
     global:
 	inet_aton;
 } SUNW_1.9;
 
-SUNW_1.9 {		# SunOS 5.10 (Solaris 10)
+SYMBOL_VERSION SUNW_1.9 {	# SunOS 5.10 (Solaris 10)
     global:
 	freeipsecalgent;
 	getipsecalgbyname;
@@ -58,14 +60,14 @@
 	svc_getcallerucred;
 } SUNW_1.8;
 
-SUNW_1.8 {		# SunOS 5.9 (Solaris 9)
+SYMBOL_VERSION SUNW_1.8 {	# SunOS 5.9 (Solaris 9)
     global:
 	clnt_send;
 	svc_add_input;
 	svc_remove_input;
 } SUNW_1.7;
 
-SUNW_1.7 {		# SunOS 5.8 (Solaris 8)
+SYMBOL_VERSION SUNW_1.7 {	# SunOS 5.8 (Solaris 8)
     global:
 	freehostent;
 	getipnodebyaddr;
@@ -74,7 +76,7 @@
 	inet_pton;
 } SUNW_1.6;
 
-SUNW_1.6 {		# SunOS 5.7 (Solaris 7)
+SYMBOL_VERSION SUNW_1.6 {	# SunOS 5.7 (Solaris 7)
     global:
 	_xti_rcvreldata;
 	_xti_rcvv;
@@ -91,30 +93,33 @@
 # applications built on Solaris 2.6 Beta (when they did contain symbols)
 # may depend on them.  All symbol content for SunOS 5.6 is now in SUNW_1.1
 
-SUNW_1.5 {
+SYMBOL_VERSION SUNW_1.5 {
     global:
 	SUNW_1.5;
 } SUNW_1.4;
 
-SUNW_1.4 {
+SYMBOL_VERSION SUNW_1.4 {
     global:
 	SUNW_1.4;
 } SUNW_1.3;
 
-SUNW_1.3 {
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	SUNW_1.3;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {		# SunOS 5.6 (Solaris 2.6)
+SYMBOL_VERSION SUNW_1.1 {		# SunOS 5.6 (Solaris 2.6)
     global:
 	clnt_create_vers_timed;
 	clnt_door_create;
+$if _ELF32
+	_new_svc_fdset;
+$endif
 	rpc_gss_getcred;
 	rpc_gss_get_error;
 	rpc_gss_get_mechanisms;
@@ -162,20 +167,30 @@
 	_xti_unbind;
 } SUNW_0.9;
 
-SUNW_0.9 {		# SunOS 5.5 (Solaris 2.5)
+SYMBOL_VERSION SUNW_0.9 {	# SunOS 5.5 (Solaris 2.5)
     global:
 	clnt_create_timed;
 	clnt_tp_create_timed;
 	getrpcport;
 } SUNW_0.8;
 
-SUNW_0.8 {		# SunOS 5.4 (Solaris 2.4)
+SYMBOL_VERSION SUNW_0.8 {	# SunOS 5.4 (Solaris 2.4)
     global:
 	rpc_control;
 	svc_done;
 } SUNW_0.7;
 
-SUNW_0.7 {		# SunOS 5.3 (Solaris 2.3)
+# SUNW_0.7 is complicated by ABI issues:
+#
+# - On 32-bit sparc, SUNW_0.7 contains __rpc_createerr and svc_exit, and
+#   inherits everyting else from SISCD_2.3, which in turn inherits from
+#   SYSVABI_1.3.
+# - On 32-bit X86, there is no SISCD_2.3, the symbols it contained are
+#   instead found in SUNW_0.7, which directly inherits SYSVABI_1.3.
+# - The other platforms do not have SISCD_2.3, or SYSVABI_1.3, and everything
+#   is directly found in in SUNW_0.7, which does not inherit anything.
+#
+SYMBOL_VERSION SUNW_0.7 {	# SunOS 5.3 (Solaris 2.3)
     global:
 	authdes_create;
 	authdes_lock;
@@ -213,7 +228,7 @@
 	getrpcbynumber_r;
 	getrpcent;
 	getrpcent_r;
-	h_errno = NODIRECT;
+	h_errno			{ FLAGS = NODIRECT };
 	inet_ntoa_r;
 	key_secretkey_is_set;
 	maxbno;
@@ -237,6 +252,7 @@
 	pmap_set;
 	pmap_unset;
 	registerrpc;
+	__rpc_createerr;
 	sethostent;
 	setrpcent;
 	store;
@@ -245,6 +261,7 @@
 	svc_destroy;
 	svc_dg_enablecache;
 	svcfd_create;
+	svc_exit;
 	svc_freeargs;
 	svc_getargs;
 	svc_getreq;
@@ -287,17 +304,173 @@
 	ypprot_err;
 	yp_unbind;
 	yp_update;
+$if _sparc && _ELF32
+} SISCD_2.3;
+
+SYMBOL_VERSION SISCD_2.3 {
+    global:
+$endif
+	gethostbyaddr;
+	gethostbyname;
+	inet_addr;
+	inet_netof;
+	inet_ntoa;
+	_null_auth;
+	rpc_broadcast_exp;
+	svc_fdset;
+$if _ELF32
+} SYSVABI_1.3;
+
+SYMBOL_VERSION SYSVABI_1.3 {
+    global:
+$endif
+	authdes_getucred;
+	authdes_seccreate;
+	authnone_create;
+	authsys_create;
+	authsys_create_default;
+	clnt_create;
+	clnt_dg_create;
+	clnt_pcreateerror;
+	clnt_perrno;
+	clnt_perror;
+	clnt_raw_create;
+	clnt_spcreateerror;
+	clnt_sperrno;
+	clnt_sperror;
+	clnt_tli_create;
+	clnt_tp_create;
+	clnt_vc_create;
+	endnetconfig;
+	endnetpath;
+	freenetconfigent;
+	getnetconfig;
+	getnetconfigent;
+	getnetname;
+	getnetpath;
+	getpublickey;
+	getsecretkey;
+	host2netname;
+	key_decryptsession;
+	key_encryptsession;
+	key_gendes;
+	key_setsecret;
+	nc_perror;
+	_nderror;
+	netdir_free;
+	netdir_getbyaddr;
+	netdir_getbyname;
+	netdir_options;
+	netname2host;
+	netname2user;
+	rpcb_getaddr;
+	rpcb_getmaps;
+	rpcb_gettime;
+	rpcb_rmtcall;
+	rpc_broadcast;
+	rpcb_set;
+	rpcb_unset;
+	rpc_call;
+	rpc_createerr;
+	rpc_reg;
+	setnetconfig;
+	setnetpath;
+	svc_create;
+	svc_dg_create;
+	svcerr_auth;
+	svcerr_decode;
+	svcerr_noproc;
+	svcerr_noprog;
+	svcerr_progvers;
+	svcerr_systemerr;
+	svcerr_weakauth;
+	svc_fd_create;
+	svc_getreqset;
+	svc_raw_create;
+	svc_reg;
+	svc_run;
+	svc_sendreply;
+	svc_tli_create;
+	svc_tp_create;
+	svc_unreg;
+	svc_vc_create;
+	t_accept;
+	taddr2uaddr;
+	t_alloc;
+	t_bind;
+	t_close;
+	t_connect;
+	t_errno;
+	t_error;
+	t_free;
+	t_getinfo;
+	t_getstate;
+	t_listen;
+	t_look;
+	t_open;
+	t_optmgmt;
+	t_rcv;
+	t_rcvconnect;
+	t_rcvdis;
+	t_rcvrel;
+	t_rcvudata;
+	t_rcvuderr;
+	t_snd;
+	t_snddis;
+	t_sndrel;
+	t_sndudata;
+	t_sync;
+	t_unbind;
+	uaddr2taddr;
+	user2netname;
+	xdr_accepted_reply;
+	xdr_array;
+	xdr_authsys_parms;
+	xdr_bool;
+	xdr_bytes;
+	xdr_callhdr;
+	xdr_callmsg;
+	xdr_char;
+	xdr_double;
+	xdr_enum;
+	xdr_float;
+	xdr_free;
+	xdr_int;
+	xdr_long;
+	xdrmem_create;
+	xdr_opaque;
+	xdr_opaque_auth;
+	xdr_pointer;
+	xdrrec_create;
+	xdrrec_eof;
+	xdrrec_skiprecord;
+	xdr_reference;
+	xdr_rejected_reply;
+	xdr_replymsg;
+	xdr_short;
+	xdrstdio_create;
+	xdr_string;
+	xdr_u_char;
+	xdr_u_long;
+	xdr_union;
+	xdr_u_short;
+	xdr_vector;
+	xdr_void;
+	xdr_wrapstring;
+	xprt_register;
+	xprt_unregister;
 };
 
+
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.5
 
-SUNWprivate_1.5 {
+SYMBOL_VERSION SUNWprivate_1.5 {
     global:
 	clnt_create_service_timed;
 } SUNWprivate_1.4;
 
-SUNWprivate_1.4 {
+SYMBOL_VERSION SUNWprivate_1.4 {
     global:
 	_build_internal_algs;
 	_check_daemon_lock;
@@ -312,7 +485,7 @@
 	__yp_all_cflookup;
 } SUNWprivate_1.3;
 
-SUNWprivate_1.3 {
+SYMBOL_VERSION SUNWprivate_1.3 {
     global:
 	key_call_ruid;
 	key_removesecret_g_ruid;
@@ -321,7 +494,7 @@
 	key_setnet_ruid;
 } SUNWprivate_1.2;
 
-SUNWprivate_1.2 {
+SYMBOL_VERSION SUNWprivate_1.2 {
     global:
 	_doexeclist;
 	_dup_execstr;
@@ -371,7 +544,7 @@
 	__yp_next_cflookup;
 } SUNWprivate_1.1;
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	__authenticate;
 	bitno;
@@ -393,7 +566,7 @@
 	__gen_dhkeys;
 	__gen_dhkeys_g;
 	getdomainname;
-	gethostname = FUNCTION FILTER libc.so.1;
+	gethostname		{ TYPE = FUNCTION; FILTER = libc.so.1 };
 	_get_hostserv_inetnetdir_byaddr;
 	_get_hostserv_inetnetdir_byname;
 	__getnetnamebyuid;
--- a/usr/src/lib/libnsl/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.1 {
-    global:
-	_new_svc_fdset;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	gethostbyaddr;
-	gethostbyname;
-	inet_addr;
-	inet_netof;
-	inet_ntoa;
-	_null_auth;
-	rpc_broadcast_exp;
-	__rpc_createerr;
-	svc_exit;
-	svc_fdset;
-} SYSVABI_1.3;
-
-SYSVABI_1.3 {
-    global:
-	authdes_getucred;
-	authdes_seccreate;
-	authnone_create;
-	authsys_create;
-	authsys_create_default;
-	clnt_create;
-	clnt_dg_create;
-	clnt_pcreateerror;
-	clnt_perrno;
-	clnt_perror;
-	clnt_raw_create;
-	clnt_spcreateerror;
-	clnt_sperrno;
-	clnt_sperror;
-	clnt_tli_create;
-	clnt_tp_create;
-	clnt_vc_create;
-	endnetconfig;
-	endnetpath;
-	freenetconfigent;
-	getnetconfig;
-	getnetconfigent;
-	getnetname;
-	getnetpath;
-	getpublickey;
-	getsecretkey;
-	host2netname;
-	key_decryptsession;
-	key_encryptsession;
-	key_gendes;
-	key_setsecret;
-	nc_perror;
-	_nderror;
-	netdir_free;
-	netdir_getbyaddr;
-	netdir_getbyname;
-	netdir_options;
-	netname2host;
-	netname2user;
-	rpcb_getaddr;
-	rpcb_getmaps;
-	rpcb_gettime;
-	rpcb_rmtcall;
-	rpc_broadcast;
-	rpcb_set;
-	rpcb_unset;
-	rpc_call;
-	rpc_createerr;
-	rpc_reg;
-	setnetconfig;
-	setnetpath;
-	svc_create;
-	svc_dg_create;
-	svcerr_auth;
-	svcerr_decode;
-	svcerr_noproc;
-	svcerr_noprog;
-	svcerr_progvers;
-	svcerr_systemerr;
-	svcerr_weakauth;
-	svc_fd_create;
-	svc_getreqset;
-	svc_raw_create;
-	svc_reg;
-	svc_run;
-	svc_sendreply;
-	svc_tli_create;
-	svc_tp_create;
-	svc_unreg;
-	svc_vc_create;
-	t_accept;
-	taddr2uaddr;
-	t_alloc;
-	t_bind;
-	t_close;
-	t_connect;
-	t_errno;
-	t_error;
-	t_free;
-	t_getinfo;
-	t_getstate;
-	t_listen;
-	t_look;
-	t_open;
-	t_optmgmt;
-	t_rcv;
-	t_rcvconnect;
-	t_rcvdis;
-	t_rcvrel;
-	t_rcvudata;
-	t_rcvuderr;
-	t_snd;
-	t_snddis;
-	t_sndrel;
-	t_sndudata;
-	t_sync;
-	t_unbind;
-	uaddr2taddr;
-	user2netname;
-	xdr_accepted_reply;
-	xdr_array;
-	xdr_authsys_parms;
-	xdr_bool;
-	xdr_bytes;
-	xdr_callhdr;
-	xdr_callmsg;
-	xdr_char;
-	xdr_double;
-	xdr_enum;
-	xdr_float;
-	xdr_free;
-	xdr_int;
-	xdr_long;
-	xdrmem_create;
-	xdr_opaque;
-	xdr_opaque_auth;
-	xdr_pointer;
-	xdrrec_create;
-	xdrrec_eof;
-	xdrrec_skiprecord;
-	xdr_reference;
-	xdr_rejected_reply;
-	xdr_replymsg;
-	xdr_short;
-	xdrstdio_create;
-	xdr_string;
-	xdr_u_char;
-	xdr_u_long;
-	xdr_union;
-	xdr_u_short;
-	xdr_vector;
-	xdr_void;
-	xdr_wrapstring;
-	xprt_register;
-	xprt_unregister;
-};
--- a/usr/src/lib/libnsl/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.1 {
-    global:
-	_new_svc_fdset;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	__rpc_createerr;
-	svc_exit;
-} SISCD_2.3;
-
-SISCD_2.3 {
-    global:
-	gethostbyaddr;
-	gethostbyname;
-	inet_addr;
-	inet_netof;
-	inet_ntoa;
-	_null_auth;
-	rpc_broadcast_exp;
-	svc_fdset;
-} SYSVABI_1.3;
-
-SYSVABI_1.3 {
-    global:
-	authdes_getucred;
-	authdes_seccreate;
-	authnone_create;
-	authsys_create;
-	authsys_create_default;
-	clnt_create;
-	clnt_dg_create;
-	clnt_pcreateerror;
-	clnt_perrno;
-	clnt_perror;
-	clnt_raw_create;
-	clnt_spcreateerror;
-	clnt_sperrno;
-	clnt_sperror;
-	clnt_tli_create;
-	clnt_tp_create;
-	clnt_vc_create;
-	endnetconfig;
-	endnetpath;
-	freenetconfigent;
-	getnetconfig;
-	getnetconfigent;
-	getnetname;
-	getnetpath;
-	getpublickey;
-	getsecretkey;
-	host2netname;
-	key_decryptsession;
-	key_encryptsession;
-	key_gendes;
-	key_setsecret;
-	nc_perror;
-	_nderror;
-	netdir_free;
-	netdir_getbyaddr;
-	netdir_getbyname;
-	netdir_options;
-	netname2host;
-	netname2user;
-	rpcb_getaddr;
-	rpcb_getmaps;
-	rpcb_gettime;
-	rpcb_rmtcall;
-	rpc_broadcast;
-	rpcb_set;
-	rpcb_unset;
-	rpc_call;
-	rpc_createerr;
-	rpc_reg;
-	setnetconfig;
-	setnetpath;
-	svc_create;
-	svc_dg_create;
-	svcerr_auth;
-	svcerr_decode;
-	svcerr_noproc;
-	svcerr_noprog;
-	svcerr_progvers;
-	svcerr_systemerr;
-	svcerr_weakauth;
-	svc_fd_create;
-	svc_getreqset;
-	svc_raw_create;
-	svc_reg;
-	svc_run;
-	svc_sendreply;
-	svc_tli_create;
-	svc_tp_create;
-	svc_unreg;
-	svc_vc_create;
-	t_accept;
-	taddr2uaddr;
-	t_alloc;
-	t_bind;
-	t_close;
-	t_connect;
-	t_errno;
-	t_error;
-	t_free;
-	t_getinfo;
-	t_getstate;
-	t_listen;
-	t_look;
-	t_open;
-	t_optmgmt;
-	t_rcv;
-	t_rcvconnect;
-	t_rcvdis;
-	t_rcvrel;
-	t_rcvudata;
-	t_rcvuderr;
-	t_snd;
-	t_snddis;
-	t_sndrel;
-	t_sndudata;
-	t_sync;
-	t_unbind;
-	uaddr2taddr;
-	user2netname;
-	xdr_accepted_reply;
-	xdr_array;
-	xdr_authsys_parms;
-	xdr_bool;
-	xdr_bytes;
-	xdr_callhdr;
-	xdr_callmsg;
-	xdr_char;
-	xdr_double;
-	xdr_enum;
-	xdr_float;
-	xdr_free;
-	xdr_int;
-	xdr_long;
-	xdrmem_create;
-	xdr_opaque;
-	xdr_opaque_auth;
-	xdr_pointer;
-	xdrrec_create;
-	xdrrec_eof;
-	xdrrec_skiprecord;
-	xdr_reference;
-	xdr_rejected_reply;
-	xdr_replymsg;
-	xdr_short;
-	xdrstdio_create;
-	xdr_string;
-	xdr_u_char;
-	xdr_u_long;
-	xdr_union;
-	xdr_u_short;
-	xdr_vector;
-	xdr_void;
-	xdr_wrapstring;
-	xprt_register;
-	xprt_unregister;
-};
--- a/usr/src/lib/libnsl/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	authdes_getucred;
-	authdes_seccreate;
-	authnone_create;
-	authsys_create;
-	authsys_create_default;
-	clnt_create;
-	clnt_dg_create;
-	clnt_pcreateerror;
-	clnt_perrno;
-	clnt_perror;
-	clnt_raw_create;
-	clnt_spcreateerror;
-	clnt_sperrno;
-	clnt_sperror;
-	clnt_tli_create;
-	clnt_tp_create;
-	clnt_vc_create;
-	endnetconfig;
-	endnetpath;
-	freenetconfigent;
-	gethostbyaddr;
-	gethostbyname;
-	getnetconfig;
-	getnetconfigent;
-	getnetname;
-	getnetpath;
-	getpublickey;
-	getsecretkey;
-	host2netname;
-	inet_addr;
-	inet_netof;
-	inet_ntoa;
-	key_decryptsession;
-	key_encryptsession;
-	key_gendes;
-	key_setsecret;
-	nc_perror;
-	_nderror;
-	netdir_free;
-	netdir_getbyaddr;
-	netdir_getbyname;
-	netdir_options;
-	netname2host;
-	netname2user;
-	_null_auth;
-	rpcb_getaddr;
-	rpcb_getmaps;
-	rpcb_gettime;
-	rpcb_rmtcall;
-	rpc_broadcast;
-	rpc_broadcast_exp;
-	rpcb_set;
-	rpcb_unset;
-	rpc_call;
-	rpc_createerr;
-	__rpc_createerr;
-	rpc_reg;
-	setnetconfig;
-	setnetpath;
-	svc_create;
-	svc_dg_create;
-	svcerr_auth;
-	svcerr_decode;
-	svcerr_noproc;
-	svcerr_noprog;
-	svcerr_progvers;
-	svcerr_systemerr;
-	svcerr_weakauth;
-	svc_exit;
-	svc_fd_create;
-	svc_fdset;
-	svc_getreqset;
-	svc_raw_create;
-	svc_reg;
-	svc_run;
-	svc_sendreply;
-	svc_tli_create;
-	svc_tp_create;
-	svc_unreg;
-	svc_vc_create;
-	t_accept;
-	taddr2uaddr;
-	t_alloc;
-	t_bind;
-	t_close;
-	t_connect;
-	t_errno;
-	t_error;
-	t_free;
-	t_getinfo;
-	t_getstate;
-	t_listen;
-	t_look;
-	t_open;
-	t_optmgmt;
-	t_rcv;
-	t_rcvconnect;
-	t_rcvdis;
-	t_rcvrel;
-	t_rcvudata;
-	t_rcvuderr;
-	t_snd;
-	t_snddis;
-	t_sndrel;
-	t_sndudata;
-	t_sync;
-	t_unbind;
-	uaddr2taddr;
-	user2netname;
-	xdr_accepted_reply;
-	xdr_array;
-	xdr_authsys_parms;
-	xdr_bool;
-	xdr_bytes;
-	xdr_callhdr;
-	xdr_callmsg;
-	xdr_char;
-	xdr_double;
-	xdr_enum;
-	xdr_float;
-	xdr_free;
-	xdr_int;
-	xdr_long;
-	xdrmem_create;
-	xdr_opaque;
-	xdr_opaque_auth;
-	xdr_pointer;
-	xdrrec_create;
-	xdrrec_eof;
-	xdrrec_skiprecord;
-	xdr_reference;
-	xdr_rejected_reply;
-	xdr_replymsg;
-	xdr_short;
-	xdrstdio_create;
-	xdr_string;
-	xdr_u_char;
-	xdr_u_long;
-	xdr_union;
-	xdr_u_short;
-	xdr_vector;
-	xdr_void;
-	xdr_wrapstring;
-	xprt_register;
-	xprt_unregister;
-};
--- a/usr/src/lib/libntfs/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libntfs/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_10.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_10.1 {
     global:
 	AT_UNNAMED;
 	NTFS_INDEX_I30;
--- a/usr/src/lib/libnvpair/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libnvpair/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	nvlist_add_double;
 	nvlist_empty;
@@ -47,17 +48,17 @@
 	nvpair_value_double;
 } SUNW_1.2.2;
 
-SUNW_1.2.2 {		# s10u8 - SunOS 5.10 (Solaris 10) patch additions
+SYMBOL_VERSION SUNW_1.2.2 {	# s10u8 - SunOS 5.10 (Solaris 10) patch additions
     global:
 	nvlist_lookup_nvpair;
 } SUNW_1.2.1;
 
-SUNW_1.2.1 {		# s10u7 - SunOS 5.10 (Solaris 10) patch additions
+SYMBOL_VERSION SUNW_1.2.1 {	# s10u7 - SunOS 5.10 (Solaris 10) patch additions
     global:
 	nvlist_exists;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	nv_alloc_fini;
 	nv_alloc_init;
@@ -94,7 +95,7 @@
 	nvpair_value_uint8_array;
 } SUNW_1.1.1;
 
-SUNW_1.1.1 {
+SYMBOL_VERSION SUNW_1.1.1 {
     global:
 	nvlist_add_nvlist;
 	nvlist_add_nvlist_array;
@@ -104,7 +105,7 @@
 	nvpair_value_nvlist_array;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	nvlist_add_boolean;
 	nvlist_add_byte;
@@ -167,7 +168,7 @@
 	nvpair_value_uint64_array;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dump_nvlist;
 	nvlist_add_hrtime;
--- a/usr/src/lib/libnwam/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libnwam/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	nwam_strerror;
 	nwam_value_create_boolean;
--- a/usr/src/lib/libpam/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpam/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,16 +36,18 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # Due to mistakes made early in the history of this library, there are
 # no SUNW_1.2 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_acct_mgmt;
 	pam_authenticate;
@@ -67,7 +68,7 @@
 	pam_strerror;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	__pam_display_msg;
 	__pam_get_authtok;
--- a/usr/src/lib/libparted/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libparted/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_8.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_8.1 {
     global:
 	close_stdout;
 	error;
@@ -144,7 +145,7 @@
 	ped_unit_get_name;
 	ped_unit_parse;
 	ped_unit_set_default;
-	program_name = PARENT;
+	program_name			{ FLAGS = PARENT };
 	version_etc;
 	xalloc_die;
 	xmalloc;
--- a/usr/src/lib/libpcp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpcp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,11 +35,13 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Interface definition for usr/src/lib/libpcp
 #
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		pcp_init;
 		pcp_send_recv;
--- a/usr/src/lib/libpctx/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpctx/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pctx_capture;
 	pctx_create;
@@ -46,7 +47,7 @@
 	pctx_set_events;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	__pctx_cpc;
 	__pctx_cpc_register_callback;
--- a/usr/src/lib/libpicl/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpicl/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,20 +36,22 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	picl_find_node;
 	picl_get_frutree_parent;
 	picl_get_node_by_path;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	picl_get_propinfo_by_name;
 	picl_walk_tree_by_class;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	picl_get_first_prop;
 	picl_get_next_by_col;
--- a/usr/src/lib/libpicltree/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpicltree/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,12 +36,14 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	ptree_get_frutree_parent;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	ptree_create_and_add_node;
 	ptree_create_and_add_prop;
@@ -55,7 +56,7 @@
 	ptree_walk_tree_by_class;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	picld_plugin_register;
 	ptree_add_node;
@@ -84,14 +85,14 @@
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.2
 
-SUNWprivate_1.2 {
+SYMBOL_VERSION SUNWprivate_1.2 {
     global:
 	dbg_exec;
 	dbg_print;
 	verbose_level;
 } SUNWprivate_1.1;
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	cvt_picl2ptree;
 	cvt_ptree2picl;
--- a/usr/src/lib/libpkg/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpkg/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	add_cache;
 	attrdefault;
--- a/usr/src/lib/libplot/plot/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libplot/plot/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	arc;
 	box;
@@ -56,7 +57,7 @@
 	space;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dot;
 	_lib_version;
--- a/usr/src/lib/libplot/t300/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libplot/t300/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	arc;
 	box;
@@ -56,7 +57,7 @@
 	space;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	botx;
 	boty;
--- a/usr/src/lib/libplot/t300s/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libplot/t300s/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	arc;
 	box;
@@ -57,7 +58,7 @@
 	space;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	botx;
 	boty;
--- a/usr/src/lib/libplot/t4014/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libplot/t4014/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	arc;
 	box;
@@ -57,7 +58,7 @@
 	space;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	botx;
 	boty;
--- a/usr/src/lib/libplot/t450/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libplot/t450/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	arc;
 	box;
@@ -56,7 +57,7 @@
 	space;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	botx;
 	boty;
--- a/usr/src/lib/libplot/vt0/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libplot/vt0/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	arc;
 	box;
@@ -58,7 +59,7 @@
 	space;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	botx;
 	boty;
--- a/usr/src/lib/libpool/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpool/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -40,7 +39,9 @@
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.2
 
-SUNWprivate_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.2 {
     global:
 	pool_conf_update;
 	pool_get_status;
@@ -48,7 +49,7 @@
 	pool_set_status;
 } SUNWprivate_1.1;
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	pool_associate;
 	pool_component_info;
--- a/usr/src/lib/libpp/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpp/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	pp;
 	ppop;
--- a/usr/src/lib/libpri/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpri/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	pri_fini;
 	pri_get;
--- a/usr/src/lib/libproc/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libproc/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY = libproc.a
@@ -87,8 +86,6 @@
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-MAPFILES +=	mapfile-vers
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 
--- a/usr/src/lib/libproc/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-};
--- a/usr/src/lib/libproc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libproc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,31 +36,33 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # Due to mistakes made early in the history of this library, there are no
 # SUNW_1.1 through SUNW_1.4 symbols, but they are now kept as placeholders.
 # Don't add any symbols to these versions.
 
-SUNW_1.4 {
+SYMBOL_VERSION SUNW_1.4 {
     global:
 	SUNW_1.4;
 } SUNW_1.3;
 
-SUNW_1.3 {
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	SUNW_1.3;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	Lalt_stack;
 	Lclearfault;
@@ -257,15 +258,15 @@
 	ps_pbrandname;
 	ps_pcontinue;
 	ps_pdmodel;
-	ps_pdread = NODYNSORT;		# Alias of ps_pread
-	ps_pdwrite = NODYNSORT;		# Alias of ps_pwrite
+	ps_pdread		{ FLAGS = NODYNSORT };	# Alias of ps_pread
+	ps_pdwrite		{ FLAGS = NODYNSORT };	# Alias of ps_pwrite
 	ps_pglobal_lookup;
 	ps_pglobal_sym;
 	ps_plog;
 	ps_pread;
 	ps_pstop;
-	ps_ptread = NODYNSORT;		# Alias of ps_pread
-	ps_ptwrite = NODYNSORT;		# Alias of ps_pwrite
+	ps_ptread		{ FLAGS = NODYNSORT };	# Alias of ps_pread
+	ps_ptwrite		{ FLAGS = NODYNSORT };	# Alias of ps_pwrite
 	ps_pwrite;
 	Pstack_iter;
 	Pstate;
@@ -296,6 +297,27 @@
 	Pzonename;
 	Pzonepath;
 	Pzoneroot;
+
+$if _x86 && _ELF32
+	Pldt;
+	proc_get_ldt;
+	ps_lgetLDT;
+$endif
+
+$if _sparc
+	Plwp_getgwindows;
+	Plwp_getxregs;
+	Plwp_setxregs;
+	ps_lgetxregs;
+	ps_lgetxregsize;
+	ps_lsetxregs;
+
+$if _ELF64
+	Plwp_getasrs;
+	Plwp_setasrs;
+$endif
+$endif
+
     local:
 	*;
 };
--- a/usr/src/lib/libproc/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-	Pldt;
-	proc_get_ldt;
-	ps_lgetLDT;
-};
--- a/usr/src/lib/libproc/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-	Plwp_getgwindows;
-	Plwp_getxregs;
-	Plwp_setxregs;
-	ps_lgetxregs;
-	ps_lgetxregsize;
-	ps_lsetxregs;
-};
--- a/usr/src/lib/libproc/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-	Plwp_getasrs;
-	Plwp_getgwindows;
-	Plwp_getxregs;
-	Plwp_setasrs;
-	Plwp_setxregs;
-	ps_lgetxregs;
-	ps_lgetxregsize;
-	ps_lsetxregs;
-};
--- a/usr/src/lib/libproject/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libproject/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	project_walk;
 	setproject;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	endprojent;
 	fgetprojent;
@@ -56,7 +57,7 @@
 	setprojent;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	setproject_initpriv;
 	setproject_proc;
--- a/usr/src/lib/libpthread/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libpthread/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	libpthread.a
@@ -30,4 +29,3 @@
 
 LIBS +=		$(LINTLIB)
 DYNFLAGS +=	-F libc.so.1
-MAPFILEDIR =	.				# redirect mapfile-vers
--- a/usr/src/lib/libpthread/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,265 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	getmsg = FUNCTION;
-	getpmsg = FUNCTION;
-	lockf = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	poll = FUNCTION;
-	putmsg = FUNCTION;
-	putpmsg = FUNCTION;
-	select = FUNCTION;
-	sigpause = FUNCTION;
-	usleep = FUNCTION;
-	wait3 = FUNCTION;
-	waitid = FUNCTION;
-	pread = FUNCTION;
-	pwrite = FUNCTION;
-	readv = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	SUNW_1.1;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_destroy = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	pthread_cancel = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_create = FUNCTION;
-	pthread_detach = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_join = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_kill = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	alarm = FUNCTION;
-	close = FUNCTION;
-	cond_broadcast = FUNCTION;
-	cond_destroy = FUNCTION;
-	cond_init = FUNCTION;
-	cond_signal = FUNCTION;
-	cond_timedwait = FUNCTION;
-	cond_wait = FUNCTION;
-	creat = FUNCTION;
-	fcntl = FUNCTION;
-	fork = FUNCTION;
-	fork1 = FUNCTION;
-	fsync = FUNCTION;
-	msync = FUNCTION;
-	mutex_destroy = FUNCTION;
-	mutex_init = FUNCTION;
-	mutex_lock = FUNCTION;
-	mutex_trylock = FUNCTION;
-	mutex_unlock = FUNCTION;
-	open = FUNCTION;
-	pause = FUNCTION;
-	read = FUNCTION;
-	rw_rdlock = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	rw_unlock = FUNCTION;
-	rw_wrlock = FUNCTION;
-	rwlock_init = FUNCTION;
-	sema_destroy = FUNCTION;
-	sema_init = FUNCTION;
-	sema_post = FUNCTION;
-	sema_trywait = FUNCTION;
-	sema_wait = FUNCTION;
-	_getfp = FUNCTION;
-	setitimer = FUNCTION;
-	siglongjmp = FUNCTION;
-	sigsetjmp = FUNCTION;
-	sigaction = FUNCTION;
-	sigprocmask = FUNCTION;
-	sigsuspend = FUNCTION;
-	sigwait = FUNCTION;
-	sleep = FUNCTION;
-	tcdrain = FUNCTION;
-	thr_continue = FUNCTION;
-	thr_create = FUNCTION;
-	thr_exit = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_getprio = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_join = FUNCTION;
-	thr_keycreate = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_main = FUNCTION;
-	thr_min_stack = FUNCTION;
-	thr_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_setprio = FUNCTION;
-	thr_setspecific = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	thr_stksegment = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_yield = FUNCTION;
-	wait = FUNCTION;
-	waitpid = FUNCTION;
-	write = FUNCTION;
-	_mutex_lock = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_pthread_setcleanupinit = FUNCTION;
-	_resume = FUNCTION;
-	_resume_ret = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_fork = FUNCTION;
-	_sigaction = FUNCTION;
-	_sigprocmask = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	_siglongjmp = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_setitimer = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_mutex_init = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_thr_create = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_thr_join = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_self = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_thr_main = FUNCTION;
-};
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libpthread/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,277 @@
+#
+# 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 (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+#
+# DO NOT TOUCH THIS FILE.
+# This file declares interfaces that are cast in stone.
+# They offer interfaces that will never change.
+# DO NOT TOUCH THIS FILE.
+#
+
+SYMBOL_VERSION SUNW_1.4 {
+    global:
+	cond_reltimedwait			{ TYPE = FUNCTION };
+	pthread_cond_reltimedwait_np		{ TYPE = FUNCTION };
+    local:
+	*;
+} SUNW_1.3;
+
+SYMBOL_VERSION SUNW_1.3 {
+    global:
+	pthread_mutexattr_getrobust_np		{ TYPE = FUNCTION };
+	pthread_mutexattr_setrobust_np		{ TYPE = FUNCTION };
+	pthread_mutex_consistent_np		{ TYPE = FUNCTION };
+} SUNW_1.2;
+
+SYMBOL_VERSION SUNW_1.2 {
+    global:
+	getmsg					{ TYPE = FUNCTION };
+	getpmsg					{ TYPE = FUNCTION };
+	lockf					{ TYPE = FUNCTION };
+	msgrcv					{ TYPE = FUNCTION };
+	msgsnd					{ TYPE = FUNCTION };
+	poll					{ TYPE = FUNCTION };
+	pread					{ TYPE = FUNCTION };
+	pthread_attr_getguardsize		{ TYPE = FUNCTION };
+	pthread_attr_setguardsize		{ TYPE = FUNCTION };
+	pthread_getconcurrency			{ TYPE = FUNCTION };
+	pthread_mutexattr_gettype		{ TYPE = FUNCTION };
+	pthread_mutexattr_settype		{ TYPE = FUNCTION };
+	pthread_rwlockattr_destroy		{ TYPE = FUNCTION };
+	pthread_rwlockattr_getpshared		{ TYPE = FUNCTION };
+	pthread_rwlockattr_init			{ TYPE = FUNCTION };
+	pthread_rwlockattr_setpshared		{ TYPE = FUNCTION };
+	pthread_rwlock_destroy			{ TYPE = FUNCTION };
+	pthread_rwlock_init			{ TYPE = FUNCTION };
+	pthread_rwlock_rdlock			{ TYPE = FUNCTION };
+	pthread_rwlock_tryrdlock		{ TYPE = FUNCTION };
+	pthread_rwlock_trywrlock		{ TYPE = FUNCTION };
+	pthread_rwlock_unlock			{ TYPE = FUNCTION };
+	pthread_rwlock_wrlock			{ TYPE = FUNCTION };
+	pthread_setconcurrency			{ TYPE = FUNCTION };
+	putmsg					{ TYPE = FUNCTION };
+	putpmsg					{ TYPE = FUNCTION };
+	pwrite					{ TYPE = FUNCTION };
+	readv					{ TYPE = FUNCTION };
+	select					{ TYPE = FUNCTION };
+	sigpause				{ TYPE = FUNCTION };
+	usleep					{ TYPE = FUNCTION };
+	wait3					{ TYPE = FUNCTION };
+	waitid					{ TYPE = FUNCTION };
+	writev					{ TYPE = FUNCTION };
+	__xpg4_putmsg				{ TYPE = FUNCTION };
+	__xpg4_putpmsg				{ TYPE = FUNCTION };
+
+$if _ELF32		# largefile APIs
+	lockf64					{ TYPE = FUNCTION };
+	pread64					{ TYPE = FUNCTION };
+	pwrite64				{ TYPE = FUNCTION };
+$endif
+} SUNW_1.1;
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+$if _ELF32		# largefile APIs
+	creat64					{ TYPE = FUNCTION };
+	open64					{ TYPE = FUNCTION };
+$else
+	SUNW_1.1;
+$endif
+} SUNW_0.9;
+
+SYMBOL_VERSION SUNW_0.9 {
+    global:
+	alarm					{ TYPE = FUNCTION };
+	close					{ TYPE = FUNCTION };
+	cond_broadcast				{ TYPE = FUNCTION };
+	cond_destroy				{ TYPE = FUNCTION };
+	cond_init				{ TYPE = FUNCTION };
+	cond_signal				{ TYPE = FUNCTION };
+	cond_timedwait				{ TYPE = FUNCTION };
+	cond_wait				{ TYPE = FUNCTION };
+	creat					{ TYPE = FUNCTION };
+	fcntl					{ TYPE = FUNCTION };
+	fork					{ TYPE = FUNCTION };
+	fork1					{ TYPE = FUNCTION };
+	fsync					{ TYPE = FUNCTION };
+	_getfp					{ TYPE = FUNCTION };
+	msync					{ TYPE = FUNCTION };
+	mutex_destroy				{ TYPE = FUNCTION };
+	mutex_init				{ TYPE = FUNCTION };
+	_mutex_lock				{ TYPE = FUNCTION };
+	mutex_lock				{ TYPE = FUNCTION };
+	mutex_trylock				{ TYPE = FUNCTION };
+	mutex_unlock				{ TYPE = FUNCTION };
+	open					{ TYPE = FUNCTION };
+	pause					{ TYPE = FUNCTION };
+	pthread_attr_destroy			{ TYPE = FUNCTION };
+	pthread_attr_getdetachstate		{ TYPE = FUNCTION };
+	pthread_attr_getinheritsched		{ TYPE = FUNCTION };
+	pthread_attr_getschedparam		{ TYPE = FUNCTION };
+	pthread_attr_getschedpolicy		{ TYPE = FUNCTION };
+	pthread_attr_getscope			{ TYPE = FUNCTION };
+	pthread_attr_getstackaddr		{ TYPE = FUNCTION };
+	pthread_attr_getstacksize		{ TYPE = FUNCTION };
+	pthread_attr_init			{ TYPE = FUNCTION };
+	pthread_attr_setdetachstate		{ TYPE = FUNCTION };
+	pthread_attr_setinheritsched		{ TYPE = FUNCTION };
+	pthread_attr_setschedparam		{ TYPE = FUNCTION };
+	pthread_attr_setschedpolicy		{ TYPE = FUNCTION };
+	pthread_attr_setscope			{ TYPE = FUNCTION };
+	pthread_attr_setstackaddr		{ TYPE = FUNCTION };
+	pthread_attr_setstacksize		{ TYPE = FUNCTION };
+	pthread_cancel				{ TYPE = FUNCTION };
+	__pthread_cleanup_pop			{ TYPE = FUNCTION };
+	__pthread_cleanup_push			{ TYPE = FUNCTION };
+	pthread_condattr_destroy		{ TYPE = FUNCTION };
+	pthread_condattr_getpshared		{ TYPE = FUNCTION };
+	pthread_condattr_init			{ TYPE = FUNCTION };
+	pthread_condattr_setpshared		{ TYPE = FUNCTION };
+	pthread_cond_broadcast			{ TYPE = FUNCTION };
+	pthread_cond_destroy			{ TYPE = FUNCTION };
+	pthread_cond_init			{ TYPE = FUNCTION };
+	pthread_cond_signal			{ TYPE = FUNCTION };
+	pthread_cond_timedwait			{ TYPE = FUNCTION };
+	pthread_cond_wait			{ TYPE = FUNCTION };
+	pthread_create				{ TYPE = FUNCTION };
+	pthread_detach				{ TYPE = FUNCTION };
+	pthread_equal				{ TYPE = FUNCTION };
+	pthread_exit				{ TYPE = FUNCTION };
+	pthread_getschedparam			{ TYPE = FUNCTION };
+	pthread_getspecific			{ TYPE = FUNCTION };
+	pthread_join				{ TYPE = FUNCTION };
+	pthread_key_create			{ TYPE = FUNCTION };
+	pthread_key_delete			{ TYPE = FUNCTION };
+	pthread_kill				{ TYPE = FUNCTION };
+	pthread_mutexattr_destroy		{ TYPE = FUNCTION };
+	pthread_mutexattr_getprioceiling	{ TYPE = FUNCTION };
+	pthread_mutexattr_getprotocol		{ TYPE = FUNCTION };
+	pthread_mutexattr_getpshared		{ TYPE = FUNCTION };
+	pthread_mutexattr_init			{ TYPE = FUNCTION };
+	pthread_mutexattr_setprioceiling	{ TYPE = FUNCTION };
+	pthread_mutexattr_setprotocol		{ TYPE = FUNCTION };
+	pthread_mutexattr_setpshared		{ TYPE = FUNCTION };
+	pthread_mutex_destroy			{ TYPE = FUNCTION };
+	pthread_mutex_getprioceiling		{ TYPE = FUNCTION };
+	pthread_mutex_init			{ TYPE = FUNCTION };
+	pthread_mutex_lock			{ TYPE = FUNCTION };
+	pthread_mutex_setprioceiling		{ TYPE = FUNCTION };
+	pthread_mutex_trylock			{ TYPE = FUNCTION };
+	pthread_mutex_unlock			{ TYPE = FUNCTION };
+	pthread_once				{ TYPE = FUNCTION };
+	pthread_self				{ TYPE = FUNCTION };
+	pthread_setcancelstate			{ TYPE = FUNCTION };
+	pthread_setcanceltype			{ TYPE = FUNCTION };
+	pthread_setschedparam			{ TYPE = FUNCTION };
+	pthread_setspecific			{ TYPE = FUNCTION };
+	pthread_sigmask				{ TYPE = FUNCTION };
+	pthread_testcancel			{ TYPE = FUNCTION };
+	read					{ TYPE = FUNCTION };
+	rwlock_init				{ TYPE = FUNCTION };
+	rw_rdlock				{ TYPE = FUNCTION };
+	rw_tryrdlock				{ TYPE = FUNCTION };
+	rw_trywrlock				{ TYPE = FUNCTION };
+	rw_unlock				{ TYPE = FUNCTION };
+	rw_wrlock				{ TYPE = FUNCTION };
+	sema_destroy				{ TYPE = FUNCTION };
+	sema_init				{ TYPE = FUNCTION };
+	sema_post				{ TYPE = FUNCTION };
+	sema_trywait				{ TYPE = FUNCTION };
+	sema_wait				{ TYPE = FUNCTION };
+	setitimer				{ TYPE = FUNCTION };
+	sigaction				{ TYPE = FUNCTION };
+	siglongjmp				{ TYPE = FUNCTION };
+	sigprocmask				{ TYPE = FUNCTION };
+	sigsetjmp				{ TYPE = FUNCTION };
+	sigsuspend				{ TYPE = FUNCTION };
+	sigwait					{ TYPE = FUNCTION };
+	sleep					{ TYPE = FUNCTION };
+	tcdrain					{ TYPE = FUNCTION };
+	thr_continue				{ TYPE = FUNCTION };
+	thr_create				{ TYPE = FUNCTION };
+	thr_exit				{ TYPE = FUNCTION };
+	thr_getconcurrency			{ TYPE = FUNCTION };
+	thr_getprio				{ TYPE = FUNCTION };
+	thr_getspecific				{ TYPE = FUNCTION };
+	thr_join				{ TYPE = FUNCTION };
+	thr_keycreate				{ TYPE = FUNCTION };
+	thr_kill				{ TYPE = FUNCTION };
+	thr_main				{ TYPE = FUNCTION };
+	thr_min_stack				{ TYPE = FUNCTION };
+	thr_self				{ TYPE = FUNCTION };
+	thr_setconcurrency			{ TYPE = FUNCTION };
+	thr_setprio				{ TYPE = FUNCTION };
+	thr_setspecific				{ TYPE = FUNCTION };
+	thr_sigsetmask				{ TYPE = FUNCTION };
+	thr_stksegment				{ TYPE = FUNCTION };
+	thr_suspend				{ TYPE = FUNCTION };
+	thr_yield				{ TYPE = FUNCTION };
+	wait					{ TYPE = FUNCTION };
+	waitpid					{ TYPE = FUNCTION };
+	write					{ TYPE = FUNCTION };
+};
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+    global:
+	_alarm					{ TYPE = FUNCTION };
+	_fork					{ TYPE = FUNCTION };
+	_mutex_destroy				{ TYPE = FUNCTION };
+	_mutex_init				{ TYPE = FUNCTION };
+	_mutex_unlock				{ TYPE = FUNCTION };
+	_pthread_setcleanupinit			{ TYPE = FUNCTION };
+	_resume					{ TYPE = FUNCTION };
+	_resume_ret				{ TYPE = FUNCTION };
+	_sema_destroy				{ TYPE = FUNCTION };
+	_setitimer				{ TYPE = FUNCTION };
+	_sigaction				{ TYPE = FUNCTION };
+	_siglongjmp				{ TYPE = FUNCTION };
+	_sigprocmask				{ TYPE = FUNCTION };
+	_sigsetjmp				{ TYPE = FUNCTION };
+	_sigsuspend				{ TYPE = FUNCTION };
+	_sleep					{ TYPE = FUNCTION };
+	_thr_create				{ TYPE = FUNCTION };
+	_thr_getspecific			{ TYPE = FUNCTION };
+	_thr_join				{ TYPE = FUNCTION };
+	_thr_keycreate				{ TYPE = FUNCTION };
+	_thr_main				{ TYPE = FUNCTION };
+	thr_probe_setup				{ TYPE = FUNCTION };
+	_thr_self				{ TYPE = FUNCTION };
+	_thr_setspecific			{ TYPE = FUNCTION };
+};
+
--- a/usr/src/lib/libpthread/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pwrite64 = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	getmsg = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	putpmsg = FUNCTION;
-	lockf = FUNCTION;
-	lockf64 = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	msgrcv = FUNCTION;
-	sigpause = FUNCTION;
-	msgsnd = FUNCTION;
-	pread64 = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	poll = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	putmsg = FUNCTION;
-	pread = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	select = FUNCTION;
-	pwrite = FUNCTION;
-	usleep = FUNCTION;
-	getpmsg = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	wait3 = FUNCTION;
-	readv = FUNCTION;
-	waitid = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	creat64 = FUNCTION;
-	open64 = FUNCTION;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	thr_keycreate = FUNCTION;
-	cond_timedwait = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	fcntl = FUNCTION;
-	pthread_exit = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	sigsuspend = FUNCTION;
-	pthread_attr_destroy = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_kill = FUNCTION;
-	fork = FUNCTION;
-	cond_wait = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_join = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	fork1 = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	thr_main = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	fsync = FUNCTION;
-	pthread_kill = FUNCTION;
-	rw_unlock = FUNCTION;
-	sigwait = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	thr_min_stack = FUNCTION;
-	msync = FUNCTION;
-	mutex_destroy = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	rw_wrlock = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	thr_setspecific = FUNCTION;
-	tcdrain = FUNCTION;
-	open = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	thr_self = FUNCTION;
-	mutex_init = FUNCTION;
-	rwlock_init = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	waitpid = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	thr_setprio = FUNCTION;
-	pause = FUNCTION;
-	mutex_lock = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_once = FUNCTION;
-	sema_post = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	thr_continue = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	pthread_detach = FUNCTION;
-	mutex_trylock = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	sigprocmask = FUNCTION;
-	pthread_self = FUNCTION;
-	sema_trywait = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	thr_create = FUNCTION;
-	cond_broadcast = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	thr_stksegment = FUNCTION;
-	read = FUNCTION;
-	pthread_cancel = FUNCTION;
-	mutex_unlock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	sema_wait = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_exit = FUNCTION;
-	cond_destroy = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	thr_suspend = FUNCTION;
-	pthread_create = FUNCTION;
-	sema_destroy = FUNCTION;
-	setitimer = FUNCTION;
-	_getfp = FUNCTION;
-	sigaction = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	thr_getprio = FUNCTION;
-	cond_init = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_yield = FUNCTION;
-	alarm = FUNCTION;
-	sleep = FUNCTION;
-	sema_init = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	siglongjmp = FUNCTION;
-	thr_join = FUNCTION;
-	close = FUNCTION;
-	wait = FUNCTION;
-	cond_signal = FUNCTION;
-	pthread_equal = FUNCTION;
-	rw_rdlock = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	sigsetjmp = FUNCTION;
-	creat = FUNCTION;
-	write = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	_mutex_lock = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_mutex_unlock = FUNCTION;
-	_thr_main = FUNCTION;
-	_siglongjmp = FUNCTION;
-	_fork = FUNCTION;
-	_setitimer = FUNCTION;
-	_thr_create = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_resume = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_join = FUNCTION;
-	_sigprocmask = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_thr_self = FUNCTION;
-	_sigaction = FUNCTION;
-	_mutex_init = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_resume_ret = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_pthread_setcleanupinit = FUNCTION;
-	_sigsetjmp = FUNCTION;
-};
-
--- a/usr/src/lib/libpthread/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	getmsg = FUNCTION;
-	getpmsg = FUNCTION;
-	lockf64 = FUNCTION;
-	lockf = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	poll = FUNCTION;
-	putmsg = FUNCTION;
-	putpmsg = FUNCTION;
-	select = FUNCTION;
-	sigpause = FUNCTION;
-	usleep = FUNCTION;
-	wait3 = FUNCTION;
-	waitid = FUNCTION;
-	pread = FUNCTION;
-	pread64 = FUNCTION;
-	pwrite = FUNCTION;
-	pwrite64 = FUNCTION;
-	readv = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	creat64 = FUNCTION;
-	open64 = FUNCTION;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_destroy = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	pthread_cancel = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_create = FUNCTION;
-	pthread_detach = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_join = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_kill = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	alarm = FUNCTION;
-	close = FUNCTION;
-	cond_broadcast = FUNCTION;
-	cond_destroy = FUNCTION;
-	cond_init = FUNCTION;
-	cond_signal = FUNCTION;
-	cond_timedwait = FUNCTION;
-	cond_wait = FUNCTION;
-	creat = FUNCTION;
-	fcntl = FUNCTION;
-	fork = FUNCTION;
-	fork1 = FUNCTION;
-	fsync = FUNCTION;
-	msync = FUNCTION;
-	mutex_destroy = FUNCTION;
-	mutex_init = FUNCTION;
-	mutex_lock = FUNCTION;
-	mutex_trylock = FUNCTION;
-	mutex_unlock = FUNCTION;
-	open = FUNCTION;
-	pause = FUNCTION;
-	read = FUNCTION;
-	rw_rdlock = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	rw_unlock = FUNCTION;
-	rw_wrlock = FUNCTION;
-	rwlock_init = FUNCTION;
-	sema_destroy = FUNCTION;
-	sema_init = FUNCTION;
-	sema_post = FUNCTION;
-	sema_trywait = FUNCTION;
-	sema_wait = FUNCTION;
-	_getfp = FUNCTION;
-	setitimer = FUNCTION;
-	siglongjmp = FUNCTION;
-	sigsetjmp = FUNCTION;
-	sigaction = FUNCTION;
-	sigprocmask = FUNCTION;
-	sigsuspend = FUNCTION;
-	sigwait = FUNCTION;
-	sleep = FUNCTION;
-	tcdrain = FUNCTION;
-	thr_continue = FUNCTION;
-	thr_create = FUNCTION;
-	thr_exit = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_getprio = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_join = FUNCTION;
-	thr_keycreate = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_main = FUNCTION;
-	thr_min_stack = FUNCTION;
-	thr_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_setprio = FUNCTION;
-	thr_setspecific = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	thr_stksegment = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_yield = FUNCTION;
-	wait = FUNCTION;
-	waitpid = FUNCTION;
-	write = FUNCTION;
-	_mutex_lock = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_pthread_setcleanupinit = FUNCTION;
-	_resume = FUNCTION;
-	_resume_ret = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_fork = FUNCTION;
-	_sigaction = FUNCTION;
-	_sigprocmask = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	_siglongjmp = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_setitimer = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_mutex_init = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_thr_create = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_thr_join = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_self = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_thr_main = FUNCTION;
-};
-
--- a/usr/src/lib/libpthread/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,265 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	getmsg = FUNCTION;
-	getpmsg = FUNCTION;
-	lockf = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	poll = FUNCTION;
-	putmsg = FUNCTION;
-	putpmsg = FUNCTION;
-	select = FUNCTION;
-	sigpause = FUNCTION;
-	usleep = FUNCTION;
-	wait3 = FUNCTION;
-	waitid = FUNCTION;
-	pread = FUNCTION;
-	pwrite = FUNCTION;
-	readv = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	SUNW_1.1;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_destroy = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	pthread_cancel = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_create = FUNCTION;
-	pthread_detach = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_join = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_kill = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	alarm = FUNCTION;
-	close = FUNCTION;
-	cond_broadcast = FUNCTION;
-	cond_destroy = FUNCTION;
-	cond_init = FUNCTION;
-	cond_signal = FUNCTION;
-	cond_timedwait = FUNCTION;
-	cond_wait = FUNCTION;
-	creat = FUNCTION;
-	fcntl = FUNCTION;
-	fork = FUNCTION;
-	fork1 = FUNCTION;
-	fsync = FUNCTION;
-	msync = FUNCTION;
-	mutex_destroy = FUNCTION;
-	mutex_init = FUNCTION;
-	mutex_lock = FUNCTION;
-	mutex_trylock = FUNCTION;
-	mutex_unlock = FUNCTION;
-	open = FUNCTION;
-	pause = FUNCTION;
-	read = FUNCTION;
-	rw_rdlock = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	rw_unlock = FUNCTION;
-	rw_wrlock = FUNCTION;
-	rwlock_init = FUNCTION;
-	sema_destroy = FUNCTION;
-	sema_init = FUNCTION;
-	sema_post = FUNCTION;
-	sema_trywait = FUNCTION;
-	sema_wait = FUNCTION;
-	_getfp = FUNCTION;
-	setitimer = FUNCTION;
-	siglongjmp = FUNCTION;
-	sigsetjmp = FUNCTION;
-	sigaction = FUNCTION;
-	sigprocmask = FUNCTION;
-	sigsuspend = FUNCTION;
-	sigwait = FUNCTION;
-	sleep = FUNCTION;
-	tcdrain = FUNCTION;
-	thr_continue = FUNCTION;
-	thr_create = FUNCTION;
-	thr_exit = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_getprio = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_join = FUNCTION;
-	thr_keycreate = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_main = FUNCTION;
-	thr_min_stack = FUNCTION;
-	thr_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_setprio = FUNCTION;
-	thr_setspecific = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	thr_stksegment = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_yield = FUNCTION;
-	wait = FUNCTION;
-	waitpid = FUNCTION;
-	write = FUNCTION;
-	_mutex_lock = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_pthread_setcleanupinit = FUNCTION;
-	_resume = FUNCTION;
-	_resume_ret = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_fork = FUNCTION;
-	_sigaction = FUNCTION;
-	_sigprocmask = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	_siglongjmp = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_setitimer = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_mutex_init = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_thr_create = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_thr_join = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_self = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_thr_main = FUNCTION;
-};
-
--- a/usr/src/lib/libraidcfg/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libraidcfg/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	raidcfg_errstr;
 	raidcfg_get_controller;
--- a/usr/src/lib/librcm/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/librcm/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	create_event_service;
 	get_event_service;
--- a/usr/src/lib/librdc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/librdc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -40,7 +39,9 @@
 # Generic interface definition for usr/src/lib/librdc.
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		Is_ipv6present;
 		convert_nconf_to_knconf;
--- a/usr/src/lib/libreparse/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libreparse/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	reparse_add;
 	reparse_create;
--- a/usr/src/lib/libresolv/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libresolv/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,16 +36,18 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # Due to mistakes made early in the history of this library, there are
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
 	dn_comp;
 	dn_expand;
@@ -54,7 +55,7 @@
 	fp_query;
 	_getlong;
 	_getshort;
-	h_errno = NODIRECT FILTER libnsl.so.1;
+	h_errno			{ FLAGS = NODIRECT; FILTER = libnsl.so.1 };
 	hostalias;
 	p_cdname;
 	p_class;
@@ -70,11 +71,11 @@
 	res_querydomain;
 	res_search;
 	res_send;
-	strcasecmp = FUNCTION FILTER libc.so.1;
-	strncasecmp = FUNCTION FILTER libc.so.1;
+	strcasecmp		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	strncasecmp		{ TYPE = FUNCTION; FILTER = libc.so.1 };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	res_endhostent;
 	res_gethostbyaddr;
--- a/usr/src/lib/libresolv2/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libresolv2/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,22 +36,24 @@
 # MAPFILE HEADER END
 #
 
-SUNW_2.3 {		# SunOS 5.11 (Solaris 11)
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_2.3 {	# SunOS 5.11 (Solaris 11)
     global:
 	SUNW_2.3;	# Defined to create a non-weak version of SUNW_2.3.
 } SUNW_2.2.2;
 
-SUNW_2.2.2 {		# SunOS 5.10 (Solaris 10 Update 5)
+SYMBOL_VERSION SUNW_2.2.2 {	# SunOS 5.10 (Solaris 10 Update 5)
     global:
-	inet_aton = FUNCTION FILTER libnsl.so.1;
+	inet_aton		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
 } SUNW_2.2.1;
 
-SUNW_2.2.1 {		# SunOS 5.10 (Solaris 10 Update 4)
+SYMBOL_VERSION SUNW_2.2.1 {	# SunOS 5.10 (Solaris 10 Update 4)
     global:
 	res_ndestroy;
 } SUNW_2.2;
 
-SUNW_2.2 {		# SunOS 5.9 (Solaris 9)
+SYMBOL_VERSION SUNW_2.2 {	# SunOS 5.9 (Solaris 9)
     global:
 	fp_resstat;
 	herror;
@@ -67,7 +68,7 @@
 	res_nsendsigned;
 } SUNW_2.1;
 
-SUNW_2.1 {		# SunOS 5.6 (Solaris 2.6)
+SYMBOL_VERSION SUNW_2.1 {	# SunOS 5.6 (Solaris 2.6)
     global:
 	dn_comp;
 	dn_expand;
@@ -75,7 +76,7 @@
 	__fp_query;
 	_getlong;
 	_getshort;
-	h_errno = NODIRECT FILTER libnsl.so.1;
+	h_errno			{ FLAGS = NODIRECT; FILTER = libnsl.so.1 };
 	__hostalias;
 	hstrerror;
 	__p_cdname;
@@ -97,7 +98,7 @@
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_2.2
 
-SUNWprivate_2.2 {
+SYMBOL_VERSION SUNWprivate_2.2 {
     global:
 	isc_gethexstring;
 	isc_puthexstring;
@@ -112,7 +113,7 @@
 	res_setservers;
 } SUNWprivate_2.1;
 
-SUNWprivate_2.1 {
+SYMBOL_VERSION SUNWprivate_2.1 {
     global:
 	__assertion_failed;
 	assertion_type_to_text;
--- a/usr/src/lib/librestart/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/librestart/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	restarter_bind_handle;
 	_restarter_commit_states;
--- a/usr/src/lib/librpcsvc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/librpcsvc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -41,12 +40,14 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
 	havedisk;
 	rnusers;
@@ -58,7 +59,7 @@
 	xdr_utmpidlearr;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	__clnt_bindresvport;
 	xdr_bp_address;
--- a/usr/src/lib/librsm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/librsm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	rsm_create_localmemory_handle;
 	rsm_free_interconnect_topology;
--- a/usr/src/lib/librstp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/librstp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	STP_IN_init;
 	STP_IN_stpm_create;
--- a/usr/src/lib/librt/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/librt/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	librt.a
@@ -30,4 +29,3 @@
 
 LIBS +=		$(LINTLIB)
 DYNFLAGS +=	-F libc.so.1
-MAPFILEDIR =	.				# redirect mapfile-vers
--- a/usr/src/lib/librt/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	clock_nanosleep = FUNCTION;
-	mq_reltimedreceive_np = FUNCTION;
-	mq_reltimedsend_np = FUNCTION;
-	mq_timedreceive = FUNCTION;
-	mq_timedsend = FUNCTION;
-	sem_reltimedwait_np = FUNCTION;
-	sem_timedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	aio_waitn = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	close = NODIRECT FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	fork = NODIRECT FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	aio_cancel = FUNCTION;
-	aio_error = FUNCTION;
-	aio_fsync = FUNCTION;
-	aio_read = FUNCTION;
-	aio_return = FUNCTION;
-	aio_suspend = FUNCTION;
-	aio_write = FUNCTION;
-	clock_getres = FUNCTION;
-	clock_gettime = FUNCTION;
-	clock_settime = FUNCTION;
-	fdatasync = FUNCTION;
-	lio_listio = FUNCTION;
-	mq_close = FUNCTION;
-	mq_getattr = FUNCTION;
-	mq_notify = FUNCTION;
-	mq_open = FUNCTION;
-	mq_receive = FUNCTION;
-	mq_send = FUNCTION;
-	mq_setattr = FUNCTION;
-	mq_unlink = FUNCTION;
-	nanosleep = FUNCTION;
-	sched_getparam = FUNCTION;
-	sched_get_priority_max = FUNCTION;
-	sched_get_priority_min = FUNCTION;
-	sched_getscheduler = FUNCTION;
-	sched_rr_get_interval = FUNCTION;
-	sched_setparam = FUNCTION;
-	sched_setscheduler = FUNCTION;
-	sched_yield = FUNCTION;
-	sem_close = FUNCTION;
-	sem_destroy = FUNCTION;
-	sem_getvalue = FUNCTION;
-	sem_init = FUNCTION;
-	sem_open = FUNCTION;
-	sem_post = FUNCTION;
-	sem_trywait = FUNCTION;
-	sem_unlink = FUNCTION;
-	sem_wait = FUNCTION;
-	shm_open = FUNCTION;
-	shm_unlink = FUNCTION;
-	sigqueue = FUNCTION;
-	sigtimedwait = FUNCTION;
-	sigwaitinfo = FUNCTION;
-	timer_create = FUNCTION;
-	timer_delete = FUNCTION;
-	timer_getoverrun = FUNCTION;
-	timer_gettime = FUNCTION;
-	timer_settime = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	SUNWprivate_1.1;
-};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/librt/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,145 @@
+#
+# 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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+#
+# DO NOT TOUCH THIS FILE.
+# This file declares interfaces that are cast in stone.
+# They offer interfaces that will never change.
+# DO NOT TOUCH THIS FILE.
+#
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.4 {
+    global:
+	clock_nanosleep		{ TYPE = FUNCTION };
+	mq_reltimedreceive_np	{ TYPE = FUNCTION };
+	mq_reltimedsend_np	{ TYPE = FUNCTION };
+	mq_timedreceive		{ TYPE = FUNCTION };
+	mq_timedsend		{ TYPE = FUNCTION };
+	sem_reltimedwait_np	{ TYPE = FUNCTION };
+	sem_timedwait		{ TYPE = FUNCTION };
+    local:
+	*;
+} SUNW_1.3;
+
+SYMBOL_VERSION SUNW_1.3 {
+    global:
+	aio_waitn		{ TYPE = FUNCTION };
+$if _ELF32
+	aio_waitn64		{ TYPE = FUNCTION };
+$endif
+} SUNW_1.2;
+
+SYMBOL_VERSION SUNW_1.2 {
+    global:
+	close			{ TYPE = FUNCTION; FLAGS = NODIRECT };
+} SUNW_1.1;
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+	fork			{ TYPE = FUNCTION; FLAGS = NODIRECT };
+
+$if _ELF32
+	aio_cancel64		{ TYPE = FUNCTION };
+	aio_error64		{ TYPE = FUNCTION };
+	aio_fsync64		{ TYPE = FUNCTION };
+	aio_read64		{ TYPE = FUNCTION };
+	aio_return64		{ TYPE = FUNCTION };
+	aio_suspend64		{ TYPE = FUNCTION };
+	aio_write64		{ TYPE = FUNCTION };
+	lio_listio64		{ TYPE = FUNCTION };
+$endif
+} SUNW_0.7;
+
+SYMBOL_VERSION SUNW_0.7 {
+    global:
+	aio_cancel		{ TYPE = FUNCTION };
+	aio_error		{ TYPE = FUNCTION };
+	aio_fsync		{ TYPE = FUNCTION };
+	aio_read		{ TYPE = FUNCTION };
+	aio_return		{ TYPE = FUNCTION };
+	aio_suspend		{ TYPE = FUNCTION };
+	aio_write		{ TYPE = FUNCTION };
+	clock_getres		{ TYPE = FUNCTION };
+	clock_gettime		{ TYPE = FUNCTION };
+	clock_settime		{ TYPE = FUNCTION };
+	fdatasync		{ TYPE = FUNCTION };
+	lio_listio		{ TYPE = FUNCTION };
+	mq_close		{ TYPE = FUNCTION };
+	mq_getattr		{ TYPE = FUNCTION };
+	mq_notify		{ TYPE = FUNCTION };
+	mq_open			{ TYPE = FUNCTION };
+	mq_receive		{ TYPE = FUNCTION };
+	mq_send			{ TYPE = FUNCTION };
+	mq_setattr		{ TYPE = FUNCTION };
+	mq_unlink		{ TYPE = FUNCTION };
+	nanosleep		{ TYPE = FUNCTION };
+	sched_getparam		{ TYPE = FUNCTION };
+	sched_get_priority_max	{ TYPE = FUNCTION };
+	sched_get_priority_min	{ TYPE = FUNCTION };
+	sched_getscheduler	{ TYPE = FUNCTION };
+	sched_rr_get_interval	{ TYPE = FUNCTION };
+	sched_setparam		{ TYPE = FUNCTION };
+	sched_setscheduler	{ TYPE = FUNCTION };
+	sched_yield		{ TYPE = FUNCTION };
+	sem_close		{ TYPE = FUNCTION };
+	sem_destroy		{ TYPE = FUNCTION };
+	sem_getvalue		{ TYPE = FUNCTION };
+	sem_init		{ TYPE = FUNCTION };
+	sem_open		{ TYPE = FUNCTION };
+	sem_post		{ TYPE = FUNCTION };
+	sem_trywait		{ TYPE = FUNCTION };
+	sem_unlink		{ TYPE = FUNCTION };
+	sem_wait		{ TYPE = FUNCTION };
+	shm_open		{ TYPE = FUNCTION };
+	shm_unlink		{ TYPE = FUNCTION };
+	sigqueue		{ TYPE = FUNCTION };
+	sigtimedwait		{ TYPE = FUNCTION };
+	sigwaitinfo		{ TYPE = FUNCTION };
+	timer_create		{ TYPE = FUNCTION };
+	timer_delete		{ TYPE = FUNCTION };
+	timer_getoverrun	{ TYPE = FUNCTION };
+	timer_gettime		{ TYPE = FUNCTION };
+	timer_settime		{ TYPE = FUNCTION };
+};
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+    global:
+	SUNWprivate_1.1;
+};
--- a/usr/src/lib/librt/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	clock_nanosleep = FUNCTION;
-	mq_reltimedreceive_np = FUNCTION;
-	mq_reltimedsend_np = FUNCTION;
-	mq_timedreceive = FUNCTION;
-	mq_timedsend = FUNCTION;
-	sem_reltimedwait_np = FUNCTION;
-	sem_timedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	aio_waitn = FUNCTION;
-	aio_waitn64 = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	close = NODIRECT FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	aio_cancel64 = FUNCTION;
-	aio_error64 = FUNCTION;
-	aio_fsync64 = FUNCTION;
-	aio_read64 = FUNCTION;
-	aio_return64 = FUNCTION;
-	aio_suspend64 = FUNCTION;
-	aio_write64 = FUNCTION;
-	fork = NODIRECT FUNCTION;
-	lio_listio64 = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	aio_cancel = FUNCTION;
-	aio_error = FUNCTION;
-	aio_fsync = FUNCTION;
-	aio_read = FUNCTION;
-	aio_return = FUNCTION;
-	aio_suspend = FUNCTION;
-	aio_write = FUNCTION;
-	clock_getres = FUNCTION;
-	clock_gettime = FUNCTION;
-	clock_settime = FUNCTION;
-	fdatasync = FUNCTION;
-	lio_listio = FUNCTION;
-	mq_close = FUNCTION;
-	mq_getattr = FUNCTION;
-	mq_notify = FUNCTION;
-	mq_open = FUNCTION;
-	mq_receive = FUNCTION;
-	mq_send = FUNCTION;
-	mq_setattr = FUNCTION;
-	mq_unlink = FUNCTION;
-	nanosleep = FUNCTION;
-	sched_getparam = FUNCTION;
-	sched_get_priority_max = FUNCTION;
-	sched_get_priority_min = FUNCTION;
-	sched_getscheduler = FUNCTION;
-	sched_rr_get_interval = FUNCTION;
-	sched_setparam = FUNCTION;
-	sched_setscheduler = FUNCTION;
-	sched_yield = FUNCTION;
-	sem_close = FUNCTION;
-	sem_destroy = FUNCTION;
-	sem_getvalue = FUNCTION;
-	sem_init = FUNCTION;
-	sem_open = FUNCTION;
-	sem_post = FUNCTION;
-	sem_trywait = FUNCTION;
-	sem_unlink = FUNCTION;
-	sem_wait = FUNCTION;
-	shm_open = FUNCTION;
-	shm_unlink = FUNCTION;
-	sigqueue = FUNCTION;
-	sigtimedwait = FUNCTION;
-	sigwaitinfo = FUNCTION;
-	timer_create = FUNCTION;
-	timer_delete = FUNCTION;
-	timer_getoverrun = FUNCTION;
-	timer_gettime = FUNCTION;
-	timer_settime = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	SUNWprivate_1.1;
-};
--- a/usr/src/lib/librt/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	clock_nanosleep = FUNCTION;
-	mq_reltimedreceive_np = FUNCTION;
-	mq_reltimedsend_np = FUNCTION;
-	mq_timedreceive = FUNCTION;
-	mq_timedsend = FUNCTION;
-	sem_reltimedwait_np = FUNCTION;
-	sem_timedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	aio_waitn = FUNCTION;
-	aio_waitn64 = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	close = NODIRECT FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	aio_cancel64 = FUNCTION;
-	aio_error64 = FUNCTION;
-	aio_fsync64 = FUNCTION;
-	aio_read64 = FUNCTION;
-	aio_return64 = FUNCTION;
-	aio_suspend64 = FUNCTION;
-	aio_write64 = FUNCTION;
-	fork = NODIRECT FUNCTION;
-	lio_listio64 = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	aio_cancel = FUNCTION;
-	aio_error = FUNCTION;
-	aio_fsync = FUNCTION;
-	aio_read = FUNCTION;
-	aio_return = FUNCTION;
-	aio_suspend = FUNCTION;
-	aio_write = FUNCTION;
-	clock_getres = FUNCTION;
-	clock_gettime = FUNCTION;
-	clock_settime = FUNCTION;
-	fdatasync = FUNCTION;
-	lio_listio = FUNCTION;
-	mq_close = FUNCTION;
-	mq_getattr = FUNCTION;
-	mq_notify = FUNCTION;
-	mq_open = FUNCTION;
-	mq_receive = FUNCTION;
-	mq_send = FUNCTION;
-	mq_setattr = FUNCTION;
-	mq_unlink = FUNCTION;
-	nanosleep = FUNCTION;
-	sched_getparam = FUNCTION;
-	sched_get_priority_max = FUNCTION;
-	sched_get_priority_min = FUNCTION;
-	sched_getscheduler = FUNCTION;
-	sched_rr_get_interval = FUNCTION;
-	sched_setparam = FUNCTION;
-	sched_setscheduler = FUNCTION;
-	sched_yield = FUNCTION;
-	sem_close = FUNCTION;
-	sem_destroy = FUNCTION;
-	sem_getvalue = FUNCTION;
-	sem_init = FUNCTION;
-	sem_open = FUNCTION;
-	sem_post = FUNCTION;
-	sem_trywait = FUNCTION;
-	sem_unlink = FUNCTION;
-	sem_wait = FUNCTION;
-	shm_open = FUNCTION;
-	shm_unlink = FUNCTION;
-	sigqueue = FUNCTION;
-	sigtimedwait = FUNCTION;
-	sigwaitinfo = FUNCTION;
-	timer_create = FUNCTION;
-	timer_delete = FUNCTION;
-	timer_getoverrun = FUNCTION;
-	timer_gettime = FUNCTION;
-	timer_settime = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	SUNWprivate_1.1;
-};
--- a/usr/src/lib/librt/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.4 {
-    global:
-	clock_nanosleep = FUNCTION;
-	mq_reltimedreceive_np = FUNCTION;
-	mq_reltimedsend_np = FUNCTION;
-	mq_timedreceive = FUNCTION;
-	mq_timedsend = FUNCTION;
-	sem_reltimedwait_np = FUNCTION;
-	sem_timedwait = FUNCTION;
-    local:
-	*;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	aio_waitn = FUNCTION;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	close = NODIRECT FUNCTION;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	fork = NODIRECT FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	aio_cancel = FUNCTION;
-	aio_error = FUNCTION;
-	aio_fsync = FUNCTION;
-	aio_read = FUNCTION;
-	aio_return = FUNCTION;
-	aio_suspend = FUNCTION;
-	aio_write = FUNCTION;
-	clock_getres = FUNCTION;
-	clock_gettime = FUNCTION;
-	clock_settime = FUNCTION;
-	fdatasync = FUNCTION;
-	lio_listio = FUNCTION;
-	mq_close = FUNCTION;
-	mq_getattr = FUNCTION;
-	mq_notify = FUNCTION;
-	mq_open = FUNCTION;
-	mq_receive = FUNCTION;
-	mq_send = FUNCTION;
-	mq_setattr = FUNCTION;
-	mq_unlink = FUNCTION;
-	nanosleep = FUNCTION;
-	sched_getparam = FUNCTION;
-	sched_get_priority_max = FUNCTION;
-	sched_get_priority_min = FUNCTION;
-	sched_getscheduler = FUNCTION;
-	sched_rr_get_interval = FUNCTION;
-	sched_setparam = FUNCTION;
-	sched_setscheduler = FUNCTION;
-	sched_yield = FUNCTION;
-	sem_close = FUNCTION;
-	sem_destroy = FUNCTION;
-	sem_getvalue = FUNCTION;
-	sem_init = FUNCTION;
-	sem_open = FUNCTION;
-	sem_post = FUNCTION;
-	sem_trywait = FUNCTION;
-	sem_unlink = FUNCTION;
-	sem_wait = FUNCTION;
-	shm_open = FUNCTION;
-	shm_unlink = FUNCTION;
-	sigqueue = FUNCTION;
-	sigtimedwait = FUNCTION;
-	sigwaitinfo = FUNCTION;
-	timer_create = FUNCTION;
-	timer_delete = FUNCTION;
-	timer_getoverrun = FUNCTION;
-	timer_gettime = FUNCTION;
-	timer_settime = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	SUNWprivate_1.1;
-};
--- a/usr/src/lib/libsasl/lib/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsasl/lib/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	prop_clear;
 	prop_dispose;
@@ -90,7 +91,7 @@
 	sasl_version;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_sasl_auxprop_add_plugin;
 	_sasl_canonuser_add_plugin;
--- a/usr/src/lib/libscf/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libscf/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
         scf_count_ranges_destroy;
 	scf_int_ranges_destroy;
@@ -92,7 +94,7 @@
 	scf_values_destroy;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	scf_entry_add_value;
 	scf_entry_create;
@@ -270,7 +272,7 @@
 	smf_restore_instance;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	gen_filenms_from_fmri;
 	scf_canonify_fmri;
--- a/usr/src/lib/libsched/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsched/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,11 +35,13 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-	schedctl_exit = FUNCTION;
-	schedctl_init = FUNCTION;
-	schedctl_lookup = FUNCTION;
+	schedctl_exit		{ TYPE = FUNCTION };
+	schedctl_init		{ TYPE = FUNCTION };
+	schedctl_lookup		{ TYPE = FUNCTION };
     local:
 	*;
 };
--- a/usr/src/lib/libsctp/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsctp/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	sctp_bindx;
 	sctp_freeladdrs;
--- a/usr/src/lib/libsec/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsec/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	acl_check;
 	acl_free;
@@ -55,12 +56,12 @@
 # no SUNW_1.1 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.9;
 
-SUNW_0.9 {
+SYMBOL_VERSION SUNW_0.9 {
     global:
 	aclcheck;
 	aclfrommode;
@@ -70,7 +71,7 @@
 	acltotext;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	acl_addentries;
 	acl_alloc;
--- a/usr/src/lib/libsecdb/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsecdb/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	chkauthattr;
 	endauthattr;
@@ -68,7 +70,7 @@
 	setuserattr;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_argv_to_csl;
 	_auth_match;
--- a/usr/src/lib/libsendfile/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsendfile/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	libsendfile.a
@@ -36,8 +33,6 @@
 
 SRCDIR =	../common
 
-MAPFILES +=	$(MAPFILE32)
-
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 LIBS =		$(DYNLIB) $(LINTLIB)
--- a/usr/src/lib/libsendfile/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsendfile/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,10 +36,18 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	sendfile;
 	sendfilev;
+
+$if _ELF32	# largefile interfaces for 32-bit applications
+	sendfile64;
+	sendfilev64;
+$endif
+
     local:
 	*;
 };
--- a/usr/src/lib/libsendfile/common/mapfile32-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.1 {	# largefile interfaces for 32-bit applications
-    global:
-	sendfile64;
-	sendfilev64;
-};
--- a/usr/src/lib/libsendfile/i386/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsendfile/i386/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 = ../common/mapfile32-vers
 
 include ../Makefile.com
 
--- a/usr/src/lib/libsendfile/sparc/Makefile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsendfile/sparc/Makefile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,13 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-MAPFILE32 = ../common/mapfile32-vers
 
 include ../Makefile.com
 
--- a/usr/src/lib/libshare/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libshare/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	sa_get_optionset;
 	sa_create_property;
--- a/usr/src/lib/libshare/nfs/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libshare/nfs/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	sa_plugin_ops;
     local:
--- a/usr/src/lib/libshare/smb/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libshare/smb/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	sa_plugin_ops;
     local:
--- a/usr/src/lib/libshare/smbfs/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libshare/smbfs/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	sa_plugin_ops;
     local:
--- a/usr/src/lib/libshell/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libshell/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	sh_bltin_tree;
 	sh_subfork;
@@ -130,7 +131,7 @@
 # (see libshell/common/include/builtins.h)
 # Note: We have to export all the |b_*()| symbols that the "builtin" command
 # can load builtins which are not enabled by the default OS/Net configuration.
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	B_echo;
 	B_login;
--- a/usr/src/lib/libsip/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsip/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	sip_create_dialog_req_nocontact;
 	sip_get_dialog_local_contact_uri;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	sip_init_conn_object;
 	sip_clear_stale_data;
--- a/usr/src/lib/libsldap/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsldap/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,15 +19,30 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+#
+
+$mapfile_version 2
+
+#
+# MAPFILE HEADER START
 #
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
 #
 
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.1
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	__ns_ldap_cancelStandalone;
 	__ns_ldap_check_all_preq;
@@ -48,7 +63,7 @@
 	__s_api_ip2hostname;
 } SUNWprivate_1.0;
 
-SUNWprivate_1.0 {
+SYMBOL_VERSION SUNWprivate_1.0 {
     global:
 	__getldapaliasbyname;
 	__ns_ldap_addAttr;
--- a/usr/src/lib/libslp/clib/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libslp/clib/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SLPClose;
 	SLPDelAttrs;
@@ -58,7 +59,7 @@
 	SLPUnescape;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	Java_com_sun_slp_Syslog_syslog;
     local:
--- a/usr/src/lib/libsmbfs/smb/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsmbfs/smb/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	convert_leunicode_to_utf8;
 	convert_unicode_to_utf8;
@@ -91,7 +92,7 @@
 	smb_ctx_setuser;
 	smb_ctx_setwins;
 
-	smb_debug	= NODIRECT;	# data
+	smb_debug		{ FLAGS = NODIRECT };	# data
 	smb_error;
 #
 # Functions to support named pipes
@@ -126,7 +127,7 @@
 	smb_rap_setNparam;
 	smb_rap_setPparam;
 #
-	smb_verbose	= NODIRECT;	# data
+	smb_verbose		{ FLAGS = NODIRECT };	# data
 #
 # Functions to support Access Control Lists (ACLs)
 	smbfs_acl_free_sd;
--- a/usr/src/lib/libsmbios/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsmbios/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_smb_debug;
 	smbios_bboard_flag_desc;
--- a/usr/src/lib/libsmedia/library/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsmedia/library/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	smedia_check_format_status;
 	smedia_eject;
--- a/usr/src/lib/libsmedia/plugins/floppy/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsmedia/plugins/floppy/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_m_device_type;
 	_m_eject;
--- a/usr/src/lib/libsmedia/plugins/pcata/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsmedia/plugins/pcata/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_m_device_type;
 	_m_free_device_info;
--- a/usr/src/lib/libsmedia/plugins/scsi/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsmedia/plugins/scsi/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_m_check_format_status;
 	_m_device_type;
--- a/usr/src/lib/libsocket/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsocket/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY	=	libsocket.a
@@ -50,8 +49,6 @@
 SRCDIR =	../common
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-MAPFILES +=	mapfile-vers
-
 # Make string literals read-only to save memory.
 CFLAGS +=	$(XSTRCONST)
 CFLAGS64 +=	$(XSTRCONST)
--- a/usr/src/lib/libsocket/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	accept;
-	bind;
-	connect;
-	getpeername;
-	getprotobyname;
-	getprotobynumber;
-	getprotoent;
-	getservbyname;
-	getservbyport;
-	getsockname;
-	getsockopt;
-	inet_lnaof;
-	inet_makeaddr;
-	inet_network;
-	listen;
-	recv;
-	recvfrom;
-	recvmsg;
-	send;
-	sendmsg;
-	sendto;
-	setsockopt;
-	shutdown;
-	socket;
-};
--- a/usr/src/lib/libsocket/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsocket/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.7 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.7 {
     global:
 	freeifaddrs;
 	getifaddrs;
 } SUNW_1.6;
 
-SUNW_1.6 {
+SYMBOL_VERSION SUNW_1.6 {
     global:
 	getipv4sourcefilter;
 	getsourcefilter;
@@ -51,7 +52,7 @@
 	setsourcefilter;
 } SUNW_1.5;
 
-SUNW_1.5 {
+SYMBOL_VERSION SUNW_1.5 {
     global:
 	inet6_opt_append;
 	inet6_opt_find;
@@ -70,7 +71,7 @@
 	__xnet_getaddrinfo;
 } SUNW_1.4;
 
-SUNW_1.4 {
+SYMBOL_VERSION SUNW_1.4 {
     global:
 	freeaddrinfo;
 	gai_strerror;
@@ -91,17 +92,17 @@
 # no SUNW_1.2 or SUNW_1.3 symbols, but they are now kept as placeholders.
 # Don't add any symbols to these versions.
 
-SUNW_1.3 {
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	SUNW_1.3;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	__xnet_bind;
 	__xnet_connect;
@@ -114,7 +115,7 @@
 	__xnet_socketpair;
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
 	endnetent;
 	endprotoent;
@@ -137,10 +138,10 @@
 	getservbyport_r;
 	getservent;
 	getservent_r;
-	htonl = FUNCTION FILTER libc.so.1;
-	htons = FUNCTION FILTER libc.so.1;
-	ntohl = FUNCTION FILTER libc.so.1;
-	ntohs = FUNCTION FILTER libc.so.1;
+	htonl			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	htons			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	ntohl			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	ntohs			{ TYPE = FUNCTION; FILTER = libc.so.1 };
 	rcmd;
 	rexec;
 	rresvport;
@@ -149,12 +150,46 @@
 	setprotoent;
 	setservent;
 	socketpair;
+
+	# For ABI reasons, the following symbols are in SISCD_2.3 on 32-bit
+	# sparc, which is inherited by SUNW_0.7. On all other platforms,
+	# they are simply in SUNW_0.7
+$if _sparc && _ELF32
+} SISCD_2.3;
+
+SYMBOL_VERSION SISCD_2.3 {
+    global:
+$endif
+	accept;
+	bind;
+	connect;
+	getpeername;
+	getprotobyname;
+	getprotobynumber;
+	getprotoent;
+	getservbyname;
+	getservbyport;
+	getsockname;
+	getsockopt;
+	inet_lnaof;
+	inet_makeaddr;
+	inet_network;
+	listen;
+	recv;
+	recvfrom;
+	recvmsg;
+	send;
+	sendmsg;
+	sendto;
+	setsockopt;
+	shutdown;
+	socket;
 };
 
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.3
 
-SUNWprivate_1.3 {
+SYMBOL_VERSION SUNWprivate_1.3 {
     global:
 	_link_aton;
 	_link_ntoa;
@@ -171,13 +206,13 @@
 	str2protoent;
 } SUNWprivate_1.2;
 
-SUNWprivate_1.2 {
+SYMBOL_VERSION SUNWprivate_1.2 {
     global:
 	getnetmaskbyaddr;
 	getnetmaskbynet;
 } SUNWprivate_1.1;
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_accept;
 	_bind;
--- a/usr/src/lib/libsocket/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	accept;
-	bind;
-	connect;
-	getpeername;
-	getprotobyname;
-	getprotobynumber;
-	getprotoent;
-	getservbyname;
-	getservbyport;
-	getsockname;
-	getsockopt;
-	inet_lnaof;
-	inet_makeaddr;
-	inet_network;
-	listen;
-	recv;
-	recvfrom;
-	recvmsg;
-	send;
-	sendmsg;
-	sendto;
-	setsockopt;
-	shutdown;
-	socket;
-};
--- a/usr/src/lib/libsocket/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-} SISCD_2.3;
-
-SISCD_2.3 {
-    global:
-	accept;
-	bind;
-	connect;
-	getpeername;
-	getprotobyname;
-	getprotobynumber;
-	getprotoent;
-	getservbyname;
-	getservbyport;
-	getsockname;
-	getsockopt;
-	inet_lnaof;
-	inet_makeaddr;
-	inet_network;
-	listen;
-	recv;
-	recvfrom;
-	recvmsg;
-	send;
-	sendmsg;
-	sendto;
-	setsockopt;
-	shutdown;
-	socket;
-};
--- a/usr/src/lib/libsocket/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	accept;
-	bind;
-	connect;
-	getpeername;
-	getprotobyname;
-	getprotobynumber;
-	getprotoent;
-	getservbyname;
-	getservbyport;
-	getsockname;
-	getsockopt;
-	inet_lnaof;
-	inet_makeaddr;
-	inet_network;
-	listen;
-	recv;
-	recvfrom;
-	recvmsg;
-	send;
-	sendmsg;
-	sendto;
-	setsockopt;
-	shutdown;
-	socket;
-};
--- a/usr/src/lib/libsqlite/mapfile-sqlite	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsqlite/mapfile-sqlite	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -21,7 +20,9 @@
 # Defines the public interface to sqlite
 #
 
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
     global:
 	# exported functions
 	sqlite_open;
--- a/usr/src/lib/libstmf/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libstmf/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -34,7 +34,9 @@
 #
 # MAPFILE HEADER END
 #
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 	    stmfAddToHostGroup;
 	    stmfAddToTargetGroup;
@@ -97,7 +99,7 @@
 		*;
 };
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
 	global:
 	    stmfLoadConfig;
 	    stmfLoadStmfProps;
--- a/usr/src/lib/libstmfproxy/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libstmfproxy/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -35,14 +34,17 @@
 #
 # MAPFILE HEADER END
 #
-SUNW_1.1 {
+
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		stmf_proxy_transport_init;
 	local:
 		*;
 };
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
 	global:
 	local:
 	    *;
--- a/usr/src/lib/libsum/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsum/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	sumopen;
 	suminit;
--- a/usr/src/lib/libsun_ima/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsun_ima/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.0 {
     global:
 	IMA_GetPluginProperties;
 	IMA_GetLhbaOidList;
--- a/usr/src/lib/libsys/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsys/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	libsys.a
@@ -30,7 +29,6 @@
 # the soname.
 SONAME =	/usr/lib/ld.so.1
 DYNFLAGS +=	-F /usr/lib/libc.so.1
-MAPFILEDIR =	.				# redirect mapfile-vers
 
 COMSRC =	$(COMOBJ:%.o=%.c)
 MACHSRC =	$(MACHOBJ:%.o=%.s)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libsys/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,451 @@
+#
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# 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
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+$if !_ELF32
+$error libsys is only supported in 32-bit form
+$endif
+
+$if _sparc
+SYMBOL_VERSION SISCD_2.3 {
+    global:
+	SISCD_2.3;
+} SYSVABI_1.3;
+$endif
+
+SYMBOL_VERSION SYSVABI_1.3 {
+    global:
+	_makecontext;
+	makecontext;
+	_swapcontext;
+	swapcontext;
+    local:
+	*;
+} SYSVABI_1.2;
+
+SYMBOL_VERSION SYSVABI_1.2 {
+    global:
+	_access;
+	access;
+	_acct;
+	acct;
+	_alarm;
+	alarm;
+	_altzone;
+	atexit;
+	calloc;
+	_catclose;
+	catclose;
+	_catgets;
+	catgets;
+	_catopen;
+	catopen;
+	_chdir;
+	chdir;
+	_chmod;
+	chmod;
+	_chown;
+	chown;
+	_chroot;
+	chroot;
+	_close;
+	close;
+	_closedir;
+	closedir;
+	_creat;
+	creat;
+	__ctype;
+	_daylight;
+	daylight;
+	_dup;
+	dup;
+	_environ;
+	environ;
+	_execl;
+	execl;
+	_execle;
+	execle;
+	_execlp;
+	execlp;
+	_execv;
+	execv;
+	_execve;
+	execve;
+	_execvp;
+	execvp;
+	_exit;
+	exit;
+	_fattach;
+	fattach;
+	_fchdir;
+	fchdir;
+	_fchmod;
+	fchmod;
+	_fchown;
+	fchown;
+	_fcntl;
+	fcntl;
+	_fdetach;
+	fdetach;
+	_fork;
+	fork;
+	_fpathconf;
+	fpathconf;
+	free;
+	_fstat;
+	fstat;
+	_fstatvfs;
+	fstatvfs;
+	_fsync;
+	fsync;
+	_ftok;
+	ftok;
+	_getcontext;
+	getcontext;
+	_getcwd;
+	getcwd;
+	_getegid;
+	getegid;
+	_geteuid;
+	geteuid;
+	_getgid;
+	getgid;
+	_getgrgid;
+	getgrgid;
+	_getgrnam;
+	getgrnam;
+	_getgroups;
+	getgroups;
+	_getlogin;
+	getlogin;
+	_getmsg;
+	getmsg;
+	_getpgid;
+	getpgid;
+	_getpgrp;
+	getpgrp;
+	_getpid;
+	getpid;
+	_getpmsg;
+	getpmsg;
+	_getppid;
+	getppid;
+	_getpwnam;
+	getpwnam;
+	_getpwuid;
+	getpwuid;
+	_getrlimit;
+	getrlimit;
+	_getsid;
+	getsid;
+	_gettxt;
+	gettxt;
+	_getuid;
+	getuid;
+	_grantpt;
+	grantpt;
+	__huge_val;
+	_initgroups;
+	initgroups;
+	_ioctl;
+	ioctl;
+	_isastream;
+	isastream;
+	_kill;
+	kill;
+	_lchown;
+	lchown;
+	_link;
+	link;
+	localeconv;
+	_lseek;
+	lseek;
+	_lstat;
+	lstat;
+	malloc;
+	_memcntl;
+	memcntl;
+	_mkdir;
+	mkdir;
+	_mknod;
+	mknod;
+	_mlock;
+	mlock;
+	mmap;
+	_mount;
+	mount;
+	_mprotect;
+	mprotect;
+	_msgctl;
+	msgctl;
+	_msgget;
+	msgget;
+	_msgrcv;
+	msgrcv;
+	_msgsnd;
+	msgsnd;
+	_msync;
+	msync;
+	_munlock;
+	munlock;
+	_munmap;
+	munmap;
+	_nice;
+	nice;
+	_numeric;
+	_open;
+	open;
+	_opendir;
+	opendir;
+	_pathconf;
+	pathconf;
+	_pause;
+	pause;
+	_pipe;
+	pipe;
+	_poll;
+	poll;
+	_profil;
+	profil;
+	_ptrace;
+	ptrace;
+	_ptsname;
+	ptsname;
+	_putmsg;
+	putmsg;
+	_putpmsg;
+	putpmsg;
+	_read;
+	read;
+	_readdir;
+	readdir;
+	_readlink;
+	readlink;
+	_readv;
+	readv;
+	realloc;
+	remove;
+	_rename;
+	rename;
+	_rewinddir;
+	rewinddir;
+	_rmdir;
+	rmdir;
+	_seekdir;
+	seekdir;
+	_semctl;
+	semctl;
+	_semget;
+	semget;
+	_semop;
+	semop;
+	_setcontext;
+	setcontext;
+	_setgid;
+	setgid;
+	_setgroups;
+	setgroups;
+	setlocale;
+	_setpgid;
+	setpgid;
+	_setpgrp;
+	setpgrp;
+	_setrlimit;
+	setrlimit;
+	_setsid;
+	setsid;
+	_setuid;
+	setuid;
+	_shmat;
+	shmat;
+	_shmctl;
+	shmctl;
+	_shmdt;
+	shmdt;
+	_shmget;
+	shmget;
+	_sigaction;
+	sigaction;
+	_sigaddset;
+	sigaddset;
+	_sigaltstack;
+	sigaltstack;
+	_sigdelset;
+	sigdelset;
+	_sigemptyset;
+	sigemptyset;
+	_sigfillset;
+	sigfillset;
+	_sighold;
+	sighold;
+	_sigignore;
+	sigignore;
+	_sigismember;
+	sigismember;
+	_siglongjmp;
+	siglongjmp;
+	signal;
+	_sigpause;
+	sigpause;
+	_sigpending;
+	sigpending;
+	_sigprocmask;
+	sigprocmask;
+	_sigrelse;
+	sigrelse;
+	_sigsend;
+	sigsend;
+	_sigsendset;
+	sigsendset;
+	_sigset;
+	sigset;
+	_sigsetjmp;
+	sigsetjmp;
+	_sigsuspend;
+	sigsuspend;
+	_stat;
+	stat;
+	_statvfs;
+	statvfs;
+	_stime;
+	stime;
+	strcoll;
+	strerror;
+	strftime;
+	strxfrm;
+	_symlink;
+	symlink;
+	_sync;
+	sync;
+	_sysconf;
+	sysconf;
+	system;
+	_telldir;
+	telldir;
+	_time;
+	time;
+	_times;
+	times;
+	_timezone;
+	timezone;
+	_ttyname;
+	ttyname;
+	_tzname;
+	tzname;
+	_ulimit;
+	ulimit;
+	_umask;
+	umask;
+	_umount;
+	umount;
+	_uname;
+	uname;
+	_unlink;
+	unlink;
+	_unlockpt;
+	unlockpt;
+	_utime;
+	utime;
+	_wait;
+	wait;
+	_waitid;
+	waitid;
+	_waitpid;
+	waitpid;
+	_write;
+	write;
+	_writev;
+	writev;
+
+$if _sparc
+	# Sparc-only interfaces
+	_Q_add;
+	_Q_cmp;
+	_Q_cmpe;
+	_Q_div;
+	_Q_dtoq;
+	_Q_feq;
+	_Q_fge;
+	_Q_fgt;
+	_Q_fle;
+	_Q_flt;
+	_Q_fne;
+	_Q_itoq;
+	_Q_mul;
+	_Q_neg;
+	_Q_qtod;
+	_Q_qtoi;
+	_Q_qtos;
+	_Q_qtou;
+	_Q_sqrt;
+	_Q_stoq;
+	_Q_sub;
+	_Q_utoq;
+	.div;
+	__dtou;
+	__ftou;
+	_mmap		{ FLAGS = NODYNSORT };
+	.mul;
+	.rem;
+	.stret1;
+	.stret2;
+	.stret4;
+	.stret8;
+	.udiv;
+	.umul;
+	.urem;
+$endif
+
+$if _x86
+	# X86-only interfaces
+	__flt_rounds;
+	_fp_hw;
+	_fpstart;
+	_fxstat;
+	_lxstat;
+	_mmap;
+	_nuname;
+	nuname;
+	_sbrk;
+	sbrk;
+	_xmknod;
+	_xstat;
+$endif
+
+
+};
--- a/usr/src/lib/libsys/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,395 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SYSVABI_1.3 {
-    global:
-	_makecontext;
-	makecontext;
-	swapcontext;
-	_swapcontext;
-    local:
-	*;
-} SYSVABI_1.2;
-
-SYSVABI_1.2 {
-    global:
-	_fdetach;
-	munlock;
-	geteuid;
-	setlocale;
-	lchown;
-	_sigsendset;
-	_tzname;
-	execl;
-	fattach;
-	_getrlimit;
-	_execlp;
-	_getsid;
-	_msgget;
-	_rmdir;
-	_ptsname;
-	_waitpid;
-	pathconf;
-	sigfillset;
-	profil;
-	shmget;
-	sysconf;
-	__ctype;
-	_getgrgid;
-	_sigaddset;
-	_ulimit;
-	execle;
-	fchown;
-	fdetach;
-	getgid;
-	getgroups;
-	__huge_val;
-	_execv;
-	_gettxt;
-	_msgrcv;
-	_sbrk;
-	_grantpt;
-	_sigsend;
-	mprotect;
-	ptrace;
-	shmat;
-	system;
-	_access;
-	_putpmsg;
-	catclose;
-	_umask;
-	execlp;
-	chroot;
-	fcntl;
-	getegid;
-	fpathconf;
-	sigaddset;
-	_execve;
-	_getuid;
-	_msgsnd;
-	_semctl;
-	_getgrnam;
-	_sigismember;
-	setgroups;
-	_catclose;
-	ptsname;
-	shmdt;
-	time;
-	_acct;
-	_initgroups;
-	_umount;
-	execv;
-	close;
-	fork;
-	grantpt;
-	readlink;
-	_execvp;
-	_ioctl;
-	_msync;
-	_semget;
-	_readdir;
-	siglongjmp;
-	_sigaction;
-	sigdelset;
-	mmap;
-	putmsg;
-	signal;
-	times;
-	_getgroups;
-	_sigdelset;
-	_uname;
-	execve;
-	creat;
-	fsync;
-	ioctl;
-	getlogin;
-	_daylight;
-	_fchdir;
-	_kill;
-	_munmap;
-	_semop;
-	_memcntl;
-	_sigsetjmp;
-	sigaction;
-	mount;
-	putpmsg;
-	sigset;
-	ttyname;
-	_setcontext;
-	daylight;
-	_setuid;
-	_unlink;
-	execvp;
-	opendir;
-	ftok;
-	kill;
-	_siglongjmp;
-	sigprocmask;
-	_fchmod;
-	_lchown;
-	_nice;
-	_setgid;
-	_getlogin;
-	_sigemptyset;
-	getpwnam;
-	_catopen;
-	msgctl;
-	read;
-	sighold;
-	ulimit;
-	_numeric;
-	_timezone;
-	_shmat;
-	_utime;
-	nuname;
-	readdir;
-	getcwd;
-	link;
-	sigaltstack;
-	_fchown;
-	_link;
-	_nuname;
-	_setsid;
-	_seekdir;
-	_sigprocmask;
-	sigsendset;
-	msgget;
-	readv;
-	sigsend;
-	umask;
-	_getpmsg;
-	_sigfillset;
-	_shmctl;
-	_wait;
-	sbrk;
-	access;
-	seekdir;
-	getmsg;
-	lseek;
-	getpwuid;
-	_catgets;
-	_chdir;
-	_fp_hw;
-	_lseek;
-	_open;
-	_mprotect;
-	_statvfs;
-	sigrelse;
-	msgrcv;
-	remove;
-	stat;
-	umount;
-	_getcontext;
-	_setpgid;
-	_shmdt;
-	_waitid;
-	semctl;
-	acct;
-	telldir;
-	getpmsg;
-	malloc;
-	getcontext;
-	sigsuspend;
-	_chmod;
-	_fstat;
-	_lstat;
-	_pause;
-	_sighold;
-	getrlimit;
-	_fpstart;
-	msgsnd;
-	rename;
-	lstat;
-	uname;
-	_pathconf;
-	_ttyname;
-	_shmget;
-	_write;
-	semget;
-	alarm;
-	dup;
-	getpid;
-	calloc;
-	sigignore;
-	_chown;
-	_fsync;
-	_lxstat;
-	_pipe;
-	_fstatvfs;
-	_setpgrp;
-	timezone;
-	setcontext;
-	fstatvfs;
-	msync;
-	rmdir;
-	fstat;
-	unlink;
-	_isastream;
-	_sigpause;
-	_sigset;
-	_writev;
-	semop;
-	atexit;
-	_alarm;
-	getpgrp;
-	free;
-	setrlimit;
-	_closedir;
-	_chroot;
-	_ftok;
-	_mkdir;
-	_poll;
-	_munlock;
-	_symlink;
-	sigpause;
-	munmap;
-	setpgid;
-	statvfs;
-	utime;
-	_getpgrp;
-	_setgroups;
-	_stat;
-	_xmknod;
-	sigsetjmp;
-	chdir;
-	_fcntl;
-	getppid;
-	realloc;
-	localeconv;
-	strerror;
-	_close;
-	_fxstat;
-	_mknod;
-	_profil;
-	_getppid;
-	_sigpending;
-	initgroups;
-	_environ;
-	nice;
-	setpgrp;
-	stime;
-	wait;
-	_opendir;
-	_sysconf;
-	_stime;
-	_xstat;
-	fchdir;
-	_fork;
-	getpgid;
-	memcntl;
-	rewinddir;
-	sigismember;
-	_creat;
-	_getcwd;
-	_mlock;
-	_ptrace;
-	_getpgid;
-	_sigignore;
-	isastream;
-	strftime;
-	open;
-	setsid;
-	strcoll;
-	waitid;
-	_getpwnam;
-	_sigrelse;
-	_sync;
-	catgets;
-	chmod;
-	_rename;
-	getsid;
-	mkdir;
-	_fpathconf;
-	_dup;
-	_getgid;
-	_mmap;
-	_putmsg;
-	_readlink;
-	_telldir;
-	__flt_rounds;
-	sigpending;
-	pause;
-	setuid;
-	strxfrm;
-	waitpid;
-	_getegid;
-	_sigaltstack;
-	_time;
-	catopen;
-	fchmod;
-	exit;
-	gettxt;
-	mknod;
-	getgrnam;
-	unlockpt;
-	_execl;
-	_getmsg;
-	_mount;
-	_read;
-	_getpwuid;
-	_sigsuspend;
-	_fattach;
-	pipe;
-	setgid;
-	symlink;
-	write;
-	_rewinddir;
-	_unlockpt;
-	_times;
-	environ;
-	chown;
-	_exit;
-	getuid;
-	mlock;
-	closedir;
-	sigemptyset;
-	_execle;
-	_getpid;
-	_msgctl;
-	_readv;
-	_geteuid;
-	_setrlimit;
-	getgrgid;
-	_altzone;
-	poll;
-	shmctl;
-	sync;
-	writev;
-	tzname;
-};
-
--- a/usr/src/lib/libsys/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,423 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SISCD_2.3 {
-    global:
-	SISCD_2.3;
-    local:
-	*;
-} SYSVABI_1.3;
-
-SYSVABI_1.3 {
-    global:
-	makecontext;
-	swapcontext;
-	_makecontext;
-	_swapcontext;
-} SYSVABI_1.2;
-
-SYSVABI_1.2 {
-    global:
-	access;
-	acct;
-	alarm;
-	atexit;
-	.div;
-	.mul;
-	.rem;
-	.stret1;
-	.stret2;
-	.stret4;
-	.stret8;
-	.udiv;
-	.umul;
-	.urem;
-	_Q_add;
-	_Q_cmp;
-	_Q_cmpe;
-	_Q_div;
-	_Q_dtoq;
-	_Q_feq;
-	_Q_fge;
-	_Q_fgt;
-	_Q_fle;
-	_Q_flt;
-	_Q_fne;
-	_Q_itoq;
-	_Q_mul;
-	_Q_neg;
-	_Q_qtod;
-	_Q_qtoi;
-	_Q_qtos;
-	_Q_qtou;
-	_Q_sqrt;
-	_Q_stoq;
-	_Q_sub;
-	_Q_utoq;
-	chdir;
-	fchdir;
-	chmod;
-	fchmod;
-	chown;
-	lchown;
-	fchown;
-	chroot;
-	close;
-	creat;
-	closedir;
-	opendir;
-	readdir;
-	rewinddir;
-	seekdir;
-	telldir;
-	dup;
-	__dtou;
-	__ftou;
-	_alarm;
-	_fcntl;
-	_fork;
-	_rename;
-	_sigaction;
-	_siglongjmp;
-	_sigprocmask;
-	exit;
-	_exit;
-	fattach;
-	fdetach;
-	fcntl;
-	fork;
-	fpathconf;
-	pathconf;
-	fsync;
-	ftok;
-	getcontext;
-	setcontext;
-	getcwd;
-	getgrnam;
-	getgrgid;
-	getgroups;
-	setgroups;
-	getlogin;
-	getmsg;
-	getpmsg;
-	getpid;
-	getpgrp;
-	getppid;
-	getpgid;
-	getpwnam;
-	getpwuid;
-	getrlimit;
-	setrlimit;
-	getsid;
-	gettxt;
-	getuid;
-	geteuid;
-	getgid;
-	getegid;
-	grantpt;
-	initgroups;
-	ioctl;
-	isastream;
-	kill;
-	link;
-	localeconv;
-	lseek;
-	malloc;
-	calloc;
-	free;
-	realloc;
-	memcntl;
-	mkdir;
-	mknod;
-	mlock;
-	munlock;
-	mmap;
-	mount;
-	mprotect;
-	msgctl;
-	msgget;
-	msgrcv;
-	msgsnd;
-	msync;
-	munmap;
-	nice;
-	open;
-	pause;
-	pipe;
-	poll;
-	profil;
-	ptrace;
-	ptsname;
-	putmsg;
-	putpmsg;
-	read;
-	readv;
-	readlink;
-	remove;
-	rename;
-	rmdir;
-	setlocale;
-	setpgid;
-	setpgrp;
-	setsid;
-	setuid;
-	setgid;
-	shmctl;
-	shmget;
-	shmat;
-	shmdt;
-	sigaction;
-	sigaltstack;
-	signal;
-	sigset;
-	sighold;
-	sigrelse;
-	sigignore;
-	sigpause;
-	sigemptyset;
-	sigfillset;
-	sigaddset;
-	sigdelset;
-	sigismember;
-	sigpending;
-	sigprocmask;
-	sigsend;
-	sigsendset;
-	sigsuspend;
-	stat;
-	lstat;
-	fstat;
-	statvfs;
-	fstatvfs;
-	stime;
-	strcoll;
-	strerror;
-	strftime;
-	strxfrm;
-	symlink;
-	sync;
-	sysconf;
-	system;
-	time;
-	times;
-	ttyname;
-	ulimit;
-	umask;
-	umount;
-	uname;
-	unlink;
-	unlockpt;
-	utime;
-	wait;
-	waitid;
-	waitpid;
-	write;
-	writev;
-	__ctype;
-	__huge_val;
-	_access;
-	_acct;
-	_altzone;
-	_catclose;
-	_catgets;
-	_catopen;
-	_chdir;
-	_chmod;
-	_chown;
-	_chroot;
-	_close;
-	_closedir;
-	_creat;
-	_daylight;
-	_dup;
-	_environ;
-	_execl;
-	_execle;
-	_execlp;
-	_execv;
-	_execve;
-	_execvp;
-	_fattach;
-	_fchdir;
-	_fchmod;
-	_fchown;
-	_fdetach;
-	_fpathconf;
-	_fstat;
-	_fstatvfs;
-	_fsync;
-	_ftok;
-	_getcontext;
-	_getcwd;
-	_getegid;
-	_geteuid;
-	_getgid;
-	_getgrgid;
-	_getgrnam;
-	_getgroups;
-	_getlogin;
-	_getmsg;
-	_getpgid;
-	_getpgrp;
-	_getpid;
-	_getpmsg;
-	_getppid;
-	_getpwnam;
-	_getpwuid;
-	_getrlimit;
-	_getsid;
-	_gettxt;
-	_getuid;
-	_grantpt;
-	_initgroups;
-	_ioctl;
-	_isastream;
-	_kill;
-	_lchown;
-	_link;
-	_lseek;
-	_lstat;
-	_memcntl;
-	_mkdir;
-	_mknod;
-	_mlock;
-	_mmap = NODYNSORT;
-	_mount;
-	_mprotect;
-	_msgctl;
-	_msgget;
-	_msgrcv;
-	_msgsnd;
-	_msync;
-	_munlock;
-	_munmap;
-	_nice;
-	_numeric;
-	_open;
-	_opendir;
-	_pathconf;
-	_pause;
-	_pipe;
-	_poll;
-	_profil;
-	_ptrace;
-	_ptsname;
-	_putmsg;
-	_putpmsg;
-	_read;
-	_readdir;
-	_readlink;
-	_readv;
-	_rewinddir;
-	_rmdir;
-	_seekdir;
-	_semctl;
-	_semget;
-	_semop;
-	_setcontext;
-	_setgid;
-	_setgroups;
-	_setpgid;
-	_setpgrp;
-	_setrlimit;
-	_setsid;
-	_setuid;
-	_shmat;
-	_shmctl;
-	_shmdt;
-	_shmget;
-	_sigaddset;
-	_sigaltstack;
-	_sigdelset;
-	_sigemptyset;
-	_sigfillset;
-	_sighold;
-	_sigignore;
-	_sigismember;
-	_sigpause;
-	_sigpending;
-	_sigrelse;
-	_sigsend;
-	_sigsendset;
-	_sigset;
-	_sigsetjmp;
-	_sigsuspend;
-	_stat;
-	_statvfs;
-	_stime;
-	_symlink;
-	_sync;
-	_sysconf;
-	_telldir;
-	_time;
-	_times;
-	_timezone;
-	_ttyname;
-	_tzname;
-	_ulimit;
-	_umask;
-	_umount;
-	_uname;
-	_unlink;
-	_unlockpt;
-	_utime;
-	_wait;
-	_waitid;
-	_waitpid;
-	_write;
-	_writev;
-	catclose;
-	catgets;
-	catopen;
-	daylight;
-	environ;
-	execl;
-	execle;
-	execlp;
-	execv;
-	execve;
-	execvp;
-	semctl;
-	semget;
-	semop;
-	siglongjmp;
-	sigsetjmp;
-	timezone;
-	tzname;
-};
-
--- a/usr/src/lib/libsysevent/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libsysevent/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,16 +36,18 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # Due to mistakes made early in the history of this library, there are
 # no SUNW_1.2 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	sysevent_bind_handle;
 	sysevent_free;
@@ -65,7 +66,7 @@
 	sysevent_unsubscribe_event;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	se_print;
 	sysevent_alloc_event;
--- a/usr/src/lib/libtecla/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libtecla/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,6 +36,8 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # The instances of "tecla_l.5" below (note "l" vs "1") are by design;
 # quoting the author:
@@ -47,7 +48,7 @@
 # Thus I now have to derive tecla_1.6 from tecla_l.5, in the map file.
 #
 
-tecla_1.6 {
+SYMBOL_VERSION tecla_1.6 {
     global:
 	gl_append_history;
 	gl_automatic_history;
@@ -55,7 +56,7 @@
 	gl_read_char;
 } tecla_l.5;
 
-tecla_l.5 {
+SYMBOL_VERSION tecla_l.5 {
     global:
 	cpl_recall_matches;
 	gl_abandon_line;
@@ -78,7 +79,7 @@
 	gl_tty_signals;
 } tecla_1.4;
 
-tecla_1.4 {
+SYMBOL_VERSION tecla_1.4 {
     global:
 	gl_clear_history;
 	gl_configure_getline;
@@ -104,12 +105,12 @@
 	libtecla_version;
 } tecla_1.3;
 
-tecla_1.3 {
+SYMBOL_VERSION tecla_1.3 {
     global:
 	ef_list_expansions;
 } tecla_1.2;
 
-tecla_1.2 {
+SYMBOL_VERSION tecla_1.2 {
     global:
 	cfc_file_start;
 	cfc_literal_escapes;
--- a/usr/src/lib/libthread/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libthread/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	libthread.a
@@ -30,4 +29,3 @@
 
 LIBS +=		$(LINTLIB)
 DYNFLAGS +=	-F libc.so.1
-MAPFILEDIR =	.				# redirect mapfile-vers
--- a/usr/src/lib/libthread/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,321 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.6.1 {
-    global:
-	_stack_grow = FUNCTION;
-    local:
-	*;
-} SUNW_1.6;
-
-SUNW_1.6 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-} SUNW_1.5;
-
-SUNW_1.5 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.4;
-
-SUNW_1.4 {
-    global:
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	getmsg = FUNCTION;
-	getpmsg = FUNCTION;
-	lockf = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	poll = FUNCTION;
-	putmsg = FUNCTION;
-	putpmsg = FUNCTION;
-	select = FUNCTION;
-	sigpause = FUNCTION;
-	usleep = FUNCTION;
-	wait3 = FUNCTION;
-	waitid = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	pread = FUNCTION;
-	pwrite = FUNCTION;
-	readv = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	SUNW_1.3;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	SUNW_1.2;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	kill = FUNCTION;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_destroy = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	pthread_cancel = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_create = FUNCTION;
-	pthread_detach = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_join = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_kill = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	thr_main = FUNCTION;
-	thr_stksegment = FUNCTION;
-	alarm = FUNCTION;
-	close = FUNCTION NODIRECT;
-	creat = FUNCTION;
-	fcntl = FUNCTION;
-	fork = FUNCTION NODIRECT;
-	fsync = FUNCTION;
-	msync = FUNCTION;
-	open = FUNCTION;
-	pause = FUNCTION;
-	read = FUNCTION;
-	setitimer = FUNCTION;
-	sigsetjmp = FUNCTION;
-	sigsuspend = FUNCTION;
-	tcdrain = FUNCTION;
-	wait = FUNCTION;
-	waitpid = FUNCTION;
-	write = FUNCTION;
-	sigpending = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	thr_continue = FUNCTION;
-	thr_create = FUNCTION;
-	thr_exit = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_getprio = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_join = FUNCTION;
-	thr_keycreate = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_min_stack = FUNCTION;
-	thr_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_setprio = FUNCTION;
-	thr_setspecific = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_yield = FUNCTION;
-	lwp_self = FUNCTION;
-	cond_broadcast = FUNCTION;
-	cond_destroy = FUNCTION;
-	cond_init = FUNCTION;
-	cond_signal = FUNCTION;
-	cond_timedwait = FUNCTION;
-	cond_wait = FUNCTION;
-	fork1 = FUNCTION;
-	mutex_destroy = FUNCTION;
-	mutex_init = FUNCTION;
-	mutex_lock = FUNCTION;
-	mutex_trylock = FUNCTION;
-	mutex_unlock = FUNCTION;
-	rw_rdlock = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	rw_unlock = FUNCTION;
-	rw_wrlock = FUNCTION;
-	rwlock_destroy = FUNCTION;
-	rwlock_init = FUNCTION;
-	sema_destroy = FUNCTION;
-	sema_init = FUNCTION;
-	sema_post = FUNCTION;
-	sema_trywait = FUNCTION;
-	sema_wait = FUNCTION;
-	_getfp = FUNCTION;
-	sigaction = FUNCTION NODIRECT;
-	sigprocmask = FUNCTION;
-	sigwait = FUNCTION;
-	sleep = FUNCTION;
-	setcontext = FUNCTION;
-	_mutex_held = FUNCTION;
-	_rw_read_held = FUNCTION;
-	_rw_write_held = FUNCTION;
-	_sema_held = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_resume = FUNCTION;
-	_resume_ret = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_thr_continue_allmutators = FUNCTION;
-	_thr_continue_mutator = FUNCTION;
-	_thr_getstate = FUNCTION;
-	_thr_mutators_barrier = FUNCTION;
-	_thr_setmutator = FUNCTION;
-	_thr_setstate = FUNCTION;
-	_thr_sighndlrinfo = FUNCTION;
-	_thr_suspend_allmutators = FUNCTION;
-	_thr_suspend_mutator = FUNCTION;
-	_thr_wait_mutator = FUNCTION;
-	thr_continue_allmutators = FUNCTION;
-	thr_continue_mutator = FUNCTION;
-	thr_getstate = FUNCTION;
-	thr_mutators_barrier = FUNCTION;
-	thr_setmutator = FUNCTION;
-	thr_setstate = FUNCTION;
-	thr_sighndlrinfo = FUNCTION;
-	thr_suspend_allmutators = FUNCTION;
-	thr_suspend_mutator = FUNCTION;
-	thr_wait_mutator = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_mutex_init = FUNCTION;
-	_mutex_lock = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_thr_create = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_thr_join = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_self = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_thr_main = FUNCTION;
-	__tls_get_addr = FUNCTION;
-	_getsp = FUNCTION;
-	_rwlock_destroy = FUNCTION;
-	__gettsp = FUNCTION;
-	_assfail = FUNCTION;
-	_sigoff = FUNCTION;
-	_sigon = FUNCTION;
-	_fork = FUNCTION;
-	_setcontext = FUNCTION;
-	_sigaction = FUNCTION NODIRECT;
-	_sigprocmask = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_setitimer = FUNCTION;
-	mutex_held = FUNCTION;
-	rw_read_held = FUNCTION;
-	rw_write_held = FUNCTION;
-	sema_held = FUNCTION;
-};
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libthread/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -0,0 +1,369 @@
+#
+# 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 (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+$mapfile_version 2
+
+#
+# DO NOT TOUCH THIS FILE.
+# This file declares interfaces that are cast in stone.
+# They offer interfaces that will never change.
+# DO NOT TOUCH THIS FILE.
+#
+
+# For ABI reasons, 32-bit sparc defines and uses some ABI related versions not
+# used on the other platforms. Define sparc32 for convenience.
+$if _sparc && _ELF32
+$add sparc32
+$endif
+
+SYMBOL_VERSION SUNW_1.6.1 {
+    global:
+	_stack_grow			{ TYPE = FUNCTION };
+    local:
+	*;
+} SUNW_1.6;
+
+SYMBOL_VERSION SUNW_1.6 {
+    global:
+	cond_reltimedwait		{ TYPE = FUNCTION };
+	pthread_cond_reltimedwait_np	{ TYPE = FUNCTION };
+} SUNW_1.5;
+
+SYMBOL_VERSION SUNW_1.5 {
+    global:
+	pthread_mutex_consistent_np	{ TYPE = FUNCTION };
+	pthread_mutexattr_getrobust_np	{ TYPE = FUNCTION };
+	pthread_mutexattr_setrobust_np	{ TYPE = FUNCTION };
+} SUNW_1.4;
+
+SYMBOL_VERSION SUNW_1.4 {
+    global:
+	getmsg				{ TYPE = FUNCTION };
+	getpmsg				{ TYPE = FUNCTION };
+	lockf				{ TYPE = FUNCTION };
+	msgrcv				{ TYPE = FUNCTION };
+	msgsnd				{ TYPE = FUNCTION };
+	poll				{ TYPE = FUNCTION };
+	pread				{ TYPE = FUNCTION };
+	pthread_attr_getguardsize	{ TYPE = FUNCTION };
+	pthread_attr_setguardsize	{ TYPE = FUNCTION };
+	pthread_getconcurrency		{ TYPE = FUNCTION };
+	pthread_mutexattr_gettype	{ TYPE = FUNCTION };
+	pthread_mutexattr_settype	{ TYPE = FUNCTION };
+	pthread_rwlockattr_destroy	{ TYPE = FUNCTION };
+	pthread_rwlockattr_getpshared	{ TYPE = FUNCTION };
+	pthread_rwlockattr_init		{ TYPE = FUNCTION };
+	pthread_rwlockattr_setpshared	{ TYPE = FUNCTION };
+	pthread_rwlock_destroy		{ TYPE = FUNCTION };
+	pthread_rwlock_init		{ TYPE = FUNCTION };
+	pthread_rwlock_rdlock		{ TYPE = FUNCTION };
+	pthread_rwlock_tryrdlock	{ TYPE = FUNCTION };
+	pthread_rwlock_trywrlock	{ TYPE = FUNCTION };
+	pthread_rwlock_unlock		{ TYPE = FUNCTION };
+	pthread_rwlock_wrlock		{ TYPE = FUNCTION };
+	pthread_setconcurrency		{ TYPE = FUNCTION };
+	putmsg				{ TYPE = FUNCTION };
+	putpmsg				{ TYPE = FUNCTION };
+	pwrite				{ TYPE = FUNCTION };
+	readv				{ TYPE = FUNCTION };
+	select				{ TYPE = FUNCTION };
+	sigpause			{ TYPE = FUNCTION };
+	usleep				{ TYPE = FUNCTION };
+	wait3				{ TYPE = FUNCTION };
+	waitid				{ TYPE = FUNCTION };
+	writev				{ TYPE = FUNCTION };
+	__xpg4_putmsg			{ TYPE = FUNCTION };
+	__xpg4_putpmsg			{ TYPE = FUNCTION };
+
+$if _ELF32		# Large file interfaces
+	lockf64				{ TYPE = FUNCTION };
+	pread64				{ TYPE = FUNCTION };
+	pwrite64			{ TYPE = FUNCTION };
+$endif
+} SUNW_1.3;
+
+SYMBOL_VERSION SUNW_1.3 {
+    global:
+	SUNW_1.3;
+} SUNW_1.2;
+
+SYMBOL_VERSION SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+	kill				{ TYPE = FUNCTION };
+
+$if _ELF32		# Large file interfaces
+	creat64				{ TYPE = FUNCTION };
+	open64				{ TYPE = FUNCTION };
+$endif
+} SUNW_0.9;
+
+SYMBOL_VERSION SUNW_0.9 {
+    global:
+	alarm				{ TYPE = FUNCTION };
+	close				{ TYPE = FUNCTION; FLAGS = NODIRECT };
+	creat				{ TYPE = FUNCTION };
+	fcntl				{ TYPE = FUNCTION };
+	fork				{ TYPE = FUNCTION; FLAGS = NODIRECT };
+	fsync				{ TYPE = FUNCTION };
+	msync				{ TYPE = FUNCTION };
+	open				{ TYPE = FUNCTION };
+	pause				{ TYPE = FUNCTION };
+	pthread_attr_destroy		{ TYPE = FUNCTION };
+	pthread_attr_getdetachstate	{ TYPE = FUNCTION };
+	pthread_attr_getinheritsched	{ TYPE = FUNCTION };
+	pthread_attr_getschedparam	{ TYPE = FUNCTION };
+	pthread_attr_getschedpolicy	{ TYPE = FUNCTION };
+	pthread_attr_getscope		{ TYPE = FUNCTION };
+	pthread_attr_getstackaddr	{ TYPE = FUNCTION };
+	pthread_attr_getstacksize	{ TYPE = FUNCTION };
+	pthread_attr_init		{ TYPE = FUNCTION };
+	pthread_attr_setdetachstate	{ TYPE = FUNCTION };
+	pthread_attr_setinheritsched	{ TYPE = FUNCTION };
+	pthread_attr_setschedparam	{ TYPE = FUNCTION };
+	pthread_attr_setschedpolicy	{ TYPE = FUNCTION };
+	pthread_attr_setscope		{ TYPE = FUNCTION };
+	pthread_attr_setstackaddr	{ TYPE = FUNCTION };
+	pthread_attr_setstacksize	{ TYPE = FUNCTION };
+	pthread_cancel			{ TYPE = FUNCTION };
+	__pthread_cleanup_pop		{ TYPE = FUNCTION };
+	__pthread_cleanup_push		{ TYPE = FUNCTION };
+	pthread_condattr_destroy	{ TYPE = FUNCTION };
+	pthread_condattr_getpshared	{ TYPE = FUNCTION };
+	pthread_condattr_init		{ TYPE = FUNCTION };
+	pthread_condattr_setpshared	{ TYPE = FUNCTION };
+	pthread_cond_broadcast		{ TYPE = FUNCTION };
+	pthread_cond_destroy		{ TYPE = FUNCTION };
+	pthread_cond_init		{ TYPE = FUNCTION };
+	pthread_cond_signal		{ TYPE = FUNCTION };
+	pthread_cond_timedwait		{ TYPE = FUNCTION };
+	pthread_cond_wait		{ TYPE = FUNCTION };
+	pthread_create			{ TYPE = FUNCTION };
+	pthread_detach			{ TYPE = FUNCTION };
+	pthread_equal			{ TYPE = FUNCTION };
+	pthread_exit			{ TYPE = FUNCTION };
+	pthread_getschedparam		{ TYPE = FUNCTION };
+	pthread_getspecific		{ TYPE = FUNCTION };
+	pthread_join			{ TYPE = FUNCTION };
+	pthread_key_create		{ TYPE = FUNCTION };
+	pthread_key_delete		{ TYPE = FUNCTION };
+	pthread_kill			{ TYPE = FUNCTION };
+	pthread_mutexattr_destroy	{ TYPE = FUNCTION };
+	pthread_mutexattr_getprioceiling { TYPE = FUNCTION };
+	pthread_mutexattr_getprotocol	{ TYPE = FUNCTION };
+	pthread_mutexattr_getpshared	{ TYPE = FUNCTION };
+	pthread_mutexattr_init		{ TYPE = FUNCTION };
+	pthread_mutexattr_setprioceiling { TYPE = FUNCTION };
+	pthread_mutexattr_setprotocol	{ TYPE = FUNCTION };
+	pthread_mutexattr_setpshared	{ TYPE = FUNCTION };
+	pthread_mutex_destroy		{ TYPE = FUNCTION };
+	pthread_mutex_getprioceiling	{ TYPE = FUNCTION };
+	pthread_mutex_init		{ TYPE = FUNCTION };
+	pthread_mutex_lock		{ TYPE = FUNCTION };
+	pthread_mutex_setprioceiling	{ TYPE = FUNCTION };
+	pthread_mutex_trylock		{ TYPE = FUNCTION };
+	pthread_mutex_unlock		{ TYPE = FUNCTION };
+	pthread_once			{ TYPE = FUNCTION };
+	pthread_self			{ TYPE = FUNCTION };
+	pthread_setcancelstate		{ TYPE = FUNCTION };
+	pthread_setcanceltype		{ TYPE = FUNCTION };
+	pthread_setschedparam		{ TYPE = FUNCTION };
+	pthread_setspecific		{ TYPE = FUNCTION };
+	pthread_sigmask			{ TYPE = FUNCTION };
+	pthread_testcancel		{ TYPE = FUNCTION };
+	read				{ TYPE = FUNCTION };
+	setitimer			{ TYPE = FUNCTION };
+	sigpending			{ TYPE = FUNCTION };
+	sigsetjmp			{ TYPE = FUNCTION };
+	sigsuspend			{ TYPE = FUNCTION };
+	tcdrain				{ TYPE = FUNCTION };
+	wait				{ TYPE = FUNCTION };
+	waitpid				{ TYPE = FUNCTION };
+	write				{ TYPE = FUNCTION };
+$if sparc32
+} SUNW_0.7 SISCD_2.3b;
+
+SYMBOL_VERSION SISCD_2.3b {
+    global:
+$endif
+	thr_main			{ TYPE = FUNCTION };
+	thr_stksegment			{ TYPE = FUNCTION };
+$if sparc32
+};
+$else
+} SUNW_0.7;
+$endif
+
+SYMBOL_VERSION SUNW_0.7 {
+    global:
+	_getfp				{ TYPE = FUNCTION };
+	lwp_self			{ TYPE = FUNCTION };
+	_mutex_held			{ TYPE = FUNCTION };
+	_rw_read_held			{ TYPE = FUNCTION };
+	_rw_write_held			{ TYPE = FUNCTION };
+	_sema_held			{ TYPE = FUNCTION };
+	setcontext			{ TYPE = FUNCTION };
+	sigaction			{ TYPE = FUNCTION; FLAGS = NODIRECT };
+	sigprocmask			{ TYPE = FUNCTION };
+	sleep				{ TYPE = FUNCTION };
+$if sparc32
+} SISCD_2.3a;
+
+SYMBOL_VERSION SISCD_2.3a {
+    global:
+$endif
+	cond_broadcast			{ TYPE = FUNCTION };
+	cond_destroy			{ TYPE = FUNCTION };
+	cond_init			{ TYPE = FUNCTION };
+	cond_signal			{ TYPE = FUNCTION };
+	cond_timedwait			{ TYPE = FUNCTION };
+	cond_wait			{ TYPE = FUNCTION };
+	fork1				{ TYPE = FUNCTION };
+	mutex_destroy			{ TYPE = FUNCTION };
+	mutex_init			{ TYPE = FUNCTION };
+	mutex_lock			{ TYPE = FUNCTION };
+	mutex_trylock			{ TYPE = FUNCTION };
+	mutex_unlock			{ TYPE = FUNCTION };
+	rwlock_destroy			{ TYPE = FUNCTION };
+	rwlock_init			{ TYPE = FUNCTION };
+	rw_rdlock			{ TYPE = FUNCTION };
+	rw_tryrdlock			{ TYPE = FUNCTION };
+	rw_trywrlock			{ TYPE = FUNCTION };
+	rw_unlock			{ TYPE = FUNCTION };
+	rw_wrlock			{ TYPE = FUNCTION };
+	sema_destroy			{ TYPE = FUNCTION };
+	sema_init			{ TYPE = FUNCTION };
+	sema_post			{ TYPE = FUNCTION };
+	sema_trywait			{ TYPE = FUNCTION };
+	sema_wait			{ TYPE = FUNCTION };
+	sigwait				{ TYPE = FUNCTION };
+	thr_continue			{ TYPE = FUNCTION };
+	thr_create			{ TYPE = FUNCTION };
+	thr_exit			{ TYPE = FUNCTION };
+	thr_getconcurrency		{ TYPE = FUNCTION };
+	thr_getprio			{ TYPE = FUNCTION };
+	thr_getspecific			{ TYPE = FUNCTION };
+	thr_join			{ TYPE = FUNCTION };
+	thr_keycreate			{ TYPE = FUNCTION };
+	thr_kill			{ TYPE = FUNCTION };
+	thr_min_stack			{ TYPE = FUNCTION };
+	thr_self			{ TYPE = FUNCTION };
+	thr_setconcurrency		{ TYPE = FUNCTION };
+	thr_setprio			{ TYPE = FUNCTION };
+	thr_setspecific			{ TYPE = FUNCTION };
+	thr_sigsetmask			{ TYPE = FUNCTION };
+	thr_suspend			{ TYPE = FUNCTION };
+	thr_yield			{ TYPE = FUNCTION };
+};
+
+SYMBOL_VERSION SUNWprivate_1.1 {
+    global:
+	_alarm				{ TYPE = FUNCTION };
+	_assfail			{ TYPE = FUNCTION };
+	_fork				{ TYPE = FUNCTION };
+$if !(_x86 && _ELF32)
+	_getsp				{ TYPE = FUNCTION };
+$endif
+	__gettsp			{ TYPE = FUNCTION };
+	_mutex_destroy			{ TYPE = FUNCTION };
+	mutex_held			{ TYPE = FUNCTION };
+	_mutex_init			{ TYPE = FUNCTION };
+	_mutex_lock			{ TYPE = FUNCTION };
+	_mutex_unlock			{ TYPE = FUNCTION };
+$if _sparc || (_x86 && _ELF32)
+	_pthread_setcleanupinit		{ TYPE = FUNCTION };
+$endif
+	_resume				{ TYPE = FUNCTION };
+	_resume_ret			{ TYPE = FUNCTION };
+	_rwlock_destroy			{ TYPE = FUNCTION };
+	rw_read_held			{ TYPE = FUNCTION };
+	rw_write_held			{ TYPE = FUNCTION };
+	_sema_destroy			{ TYPE = FUNCTION };
+	sema_held			{ TYPE = FUNCTION };
+	_setcontext			{ TYPE = FUNCTION };
+	_setitimer			{ TYPE = FUNCTION };
+	_sigaction			{ TYPE = FUNCTION; FLAGS = NODIRECT };
+	_sigoff				{ TYPE = FUNCTION };
+	_sigon				{ TYPE = FUNCTION };
+	_sigprocmask			{ TYPE = FUNCTION };
+	_sigsetjmp			{ TYPE = FUNCTION };
+	_sigsuspend			{ TYPE = FUNCTION };
+	_sleep				{ TYPE = FUNCTION };
+	_thr_continue_allmutators	{ TYPE = FUNCTION };
+	thr_continue_allmutators	{ TYPE = FUNCTION };
+	_thr_continue_mutator		{ TYPE = FUNCTION };
+	thr_continue_mutator		{ TYPE = FUNCTION };
+	_thr_create			{ TYPE = FUNCTION };
+	_thr_getspecific		{ TYPE = FUNCTION };
+	_thr_getstate			{ TYPE = FUNCTION };
+	thr_getstate			{ TYPE = FUNCTION };
+	_thr_join			{ TYPE = FUNCTION };
+	_thr_keycreate			{ TYPE = FUNCTION };
+	_thr_main			{ TYPE = FUNCTION };
+	_thr_mutators_barrier		{ TYPE = FUNCTION };
+	thr_mutators_barrier		{ TYPE = FUNCTION };
+	thr_probe_setup			{ TYPE = FUNCTION };
+	_thr_self			{ TYPE = FUNCTION };
+	_thr_setmutator			{ TYPE = FUNCTION };
+	thr_setmutator			{ TYPE = FUNCTION };
+	_thr_setspecific		{ TYPE = FUNCTION };
+	_thr_setstate			{ TYPE = FUNCTION };
+	thr_setstate			{ TYPE = FUNCTION };
+	_thr_sighndlrinfo		{ TYPE = FUNCTION };
+	thr_sighndlrinfo		{ TYPE = FUNCTION };
+	thr_suspend_allmutators		{ TYPE = FUNCTION };
+	_thr_suspend_allmutators	{ TYPE = FUNCTION };
+	_thr_suspend_mutator		{ TYPE = FUNCTION };
+	thr_suspend_mutator		{ TYPE = FUNCTION };
+	_thr_wait_mutator		{ TYPE = FUNCTION };
+	thr_wait_mutator		{ TYPE = FUNCTION };
+$if _x86 && _ELF32
+	___tls_get_addr			{ TYPE = FUNCTION };
+$endif
+	__tls_get_addr			{ TYPE = FUNCTION };
+};
+
+$if sparc32
+SYMBOL_VERSION SISCD_2.3 {
+    global:
+	SISCD_2.3;
+} SISCD_2.3a SISCD_2.3b;
+$endif
--- a/usr/src/lib/libthread/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,327 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.6.1 {
-    global:
-	_stack_grow = FUNCTION;
-    local:
-	*;
-} SUNW_1.6;
-
-SUNW_1.6 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-} SUNW_1.5;
-
-SUNW_1.5 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.4;
-
-SUNW_1.4 {
-    global:
-	lockf64 = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	getmsg = FUNCTION;
-	lockf = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	poll = FUNCTION;
-	pread64 = FUNCTION;
-	putmsg = FUNCTION;
-	pread = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	select = FUNCTION;
-	pwrite = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	usleep = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	putpmsg = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	wait3 = FUNCTION;
-	readv = FUNCTION;
-	waitid = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	sigpause = FUNCTION;
-	pwrite64 = FUNCTION;
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	getpmsg = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	SUNW_1.3;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	SUNW_1.2;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	open64 = FUNCTION;
-	creat64 = FUNCTION;
-	kill = FUNCTION;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_setschedpolicy = FUNCTION;
-	fcntl = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	fork = FUNCTION NODIRECT;
-	pthread_mutex_getprioceiling = FUNCTION;
-	thr_main = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	fsync = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	msync = FUNCTION;
-	pthread_cancel = FUNCTION;
-	setitimer = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	open = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_create = FUNCTION;
-	sigsetjmp = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pause = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_detach = FUNCTION;
-	sigsuspend = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	thr_stksegment = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	read = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_join = FUNCTION;
-	tcdrain = FUNCTION;
-	pthread_attr_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	alarm = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_kill = FUNCTION;
-	waitpid = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	close = FUNCTION NODIRECT;
-	wait = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	creat = FUNCTION;
-	write = FUNCTION;
-	sigpending = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	sigaction = FUNCTION NODIRECT;
-	sema_trywait = FUNCTION;
-	cond_init = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	sema_wait = FUNCTION;
-	cond_signal = FUNCTION;
-	fork1 = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	lwp_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	cond_timedwait = FUNCTION;
-	thr_min_stack = FUNCTION;
-	rw_unlock = FUNCTION;
-	cond_wait = FUNCTION;
-	_mutex_held = FUNCTION;
-	thr_self = FUNCTION;
-	rw_wrlock = FUNCTION;
-	mutex_destroy = FUNCTION;
-	_rw_read_held = FUNCTION;
-	thr_setprio = FUNCTION;
-	rwlock_destroy = FUNCTION;
-	_rw_write_held = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	rwlock_init = FUNCTION;
-	sigwait = FUNCTION;
-	mutex_init = FUNCTION;
-	thr_create = FUNCTION;
-	sigprocmask = FUNCTION;
-	mutex_lock = FUNCTION;
-	thr_setspecific = FUNCTION;
-	mutex_unlock = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_exit = FUNCTION;
-	sema_destroy = FUNCTION;
-	mutex_trylock = FUNCTION;
-	_getfp = FUNCTION;
-	thr_yield = FUNCTION;
-	thr_getprio = FUNCTION;
-	sema_init = FUNCTION;
-	sleep = FUNCTION;
-	thr_join = FUNCTION;
-	thr_continue = FUNCTION;
-	rw_rdlock = FUNCTION;
-	cond_broadcast = FUNCTION;
-	sema_post = FUNCTION;
-	thr_getspecific = FUNCTION;
-	setcontext = FUNCTION;
-	thr_keycreate = FUNCTION;
-	cond_destroy = FUNCTION;
-	_sema_held = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_thr_suspend_allmutators = FUNCTION;
-	_thr_join = FUNCTION;
-	_sigoff = FUNCTION;
-	_pthread_setcleanupinit = FUNCTION;
-	_thr_sighndlrinfo = FUNCTION;
-	thr_suspend_mutator = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_sigaction = FUNCTION NODIRECT;
-	_thr_keycreate = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_resume = FUNCTION;
-	_sigon = FUNCTION;
-	_setcontext = FUNCTION;
-	_thr_setmutator = FUNCTION;
-	thr_wait_mutator = FUNCTION;
-	_mutex_init = FUNCTION;
-	_fork = FUNCTION;
-	_resume_ret = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_sigprocmask = FUNCTION;
-	_thr_getstate = FUNCTION;
-	_thr_self = FUNCTION;
-	_mutex_lock = FUNCTION;
-	thr_mutators_barrier = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_rwlock_destroy = FUNCTION;
-	_sleep = FUNCTION;
-	_thr_setstate = FUNCTION;
-	_alarm = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_thr_suspend_mutator = FUNCTION;
-	_sigsuspend = FUNCTION;
-	thr_getstate = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	thr_setmutator = FUNCTION;
-	_thr_wait_mutator = FUNCTION;
-	___tls_get_addr = FUNCTION;
-	thr_suspend_allmutators = FUNCTION;
-	_setitimer = FUNCTION;
-	thr_setstate = FUNCTION;
-	_thr_main = FUNCTION;
-	_thr_continue_allmutators = FUNCTION;
-	thr_continue_mutator = FUNCTION;
-	__gettsp = FUNCTION;
-	_thr_create = FUNCTION;
-	mutex_held = FUNCTION;
-	_assfail = FUNCTION;
-	_thr_continue_mutator = FUNCTION;
-	thr_sighndlrinfo = FUNCTION;
-	rw_read_held = FUNCTION;
-	__tls_get_addr = FUNCTION;
-	thr_continue_allmutators = FUNCTION;
-	rw_write_held = FUNCTION;
-	_thr_mutators_barrier = FUNCTION;
-	sema_held = FUNCTION;
-};
-
--- a/usr/src/lib/libthread/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,340 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.6.1 {
-    global:
-	_stack_grow = FUNCTION;
-    local:
-	*;
-} SUNW_1.6;
-
-SUNW_1.6 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-} SUNW_1.5;
-
-SUNW_1.5 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.4;
-
-SUNW_1.4 {
-    global:
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	getmsg = FUNCTION;
-	getpmsg = FUNCTION;
-	lockf64 = FUNCTION;
-	lockf = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	poll = FUNCTION;
-	putmsg = FUNCTION;
-	putpmsg = FUNCTION;
-	select = FUNCTION;
-	sigpause = FUNCTION;
-	usleep = FUNCTION;
-	wait3 = FUNCTION;
-	waitid = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	pread = FUNCTION;
-	pread64 = FUNCTION;
-	pwrite = FUNCTION;
-	pwrite64 = FUNCTION;
-	readv = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	SUNW_1.3;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	SUNW_1.2;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	creat64 = FUNCTION;
-	open64 = FUNCTION;
-	kill = FUNCTION;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_destroy = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	pthread_cancel = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_create = FUNCTION;
-	pthread_detach = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_join = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_kill = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	alarm = FUNCTION;
-	close = FUNCTION NODIRECT;
-	creat = FUNCTION;
-	fcntl = FUNCTION;
-	fork = FUNCTION NODIRECT;
-	fsync = FUNCTION;
-	msync = FUNCTION;
-	open = FUNCTION;
-	pause = FUNCTION;
-	read = FUNCTION;
-	setitimer = FUNCTION;
-	sigsetjmp = FUNCTION;
-	sigsuspend = FUNCTION;
-	tcdrain = FUNCTION;
-	wait = FUNCTION;
-	waitpid = FUNCTION;
-	write = FUNCTION;
-	sigpending = FUNCTION;
-} SUNW_0.7 SISCD_2.3b;
-
-SUNW_0.7 {
-    global:
-	lwp_self = FUNCTION;
-	_getfp = FUNCTION;
-	sigaction = FUNCTION NODIRECT;
-	sigprocmask = FUNCTION;
-	sleep = FUNCTION;
-	setcontext = FUNCTION;
-	_mutex_held = FUNCTION;
-	_rw_read_held = FUNCTION;
-	_rw_write_held = FUNCTION;
-	_sema_held = FUNCTION;
-} SISCD_2.3a;
-
-SISCD_2.3a {
-    global:
-	thr_continue = FUNCTION;
-	thr_create = FUNCTION;
-	thr_exit = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_getprio = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_join = FUNCTION;
-	thr_keycreate = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_min_stack = FUNCTION;
-	thr_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_setprio = FUNCTION;
-	thr_setspecific = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_yield = FUNCTION;
-	cond_broadcast = FUNCTION;
-	cond_destroy = FUNCTION;
-	cond_init = FUNCTION;
-	cond_signal = FUNCTION;
-	cond_timedwait = FUNCTION;
-	cond_wait = FUNCTION;
-	fork1 = FUNCTION;
-	mutex_destroy = FUNCTION;
-	mutex_init = FUNCTION;
-	mutex_lock = FUNCTION;
-	mutex_trylock = FUNCTION;
-	mutex_unlock = FUNCTION;
-	rw_rdlock = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	rw_unlock = FUNCTION;
-	rw_wrlock = FUNCTION;
-	rwlock_destroy = FUNCTION;
-	rwlock_init = FUNCTION;
-	sema_destroy = FUNCTION;
-	sema_init = FUNCTION;
-	sema_post = FUNCTION;
-	sema_trywait = FUNCTION;
-	sema_wait = FUNCTION;
-	sigwait = FUNCTION;
-};
-
-SISCD_2.3b {
-    global:
-	thr_main = FUNCTION;
-	thr_stksegment = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_resume = FUNCTION;
-	_resume_ret = FUNCTION;
-	_pthread_setcleanupinit = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_thr_continue_allmutators = FUNCTION;
-	_thr_continue_mutator = FUNCTION;
-	_thr_getstate = FUNCTION;
-	_thr_mutators_barrier = FUNCTION;
-	_thr_setmutator = FUNCTION;
-	_thr_setstate = FUNCTION;
-	_thr_sighndlrinfo = FUNCTION;
-	_thr_suspend_allmutators = FUNCTION;
-	_thr_suspend_mutator = FUNCTION;
-	_thr_wait_mutator = FUNCTION;
-	thr_continue_allmutators = FUNCTION;
-	thr_continue_mutator = FUNCTION;
-	thr_getstate = FUNCTION;
-	thr_mutators_barrier = FUNCTION;
-	thr_setmutator = FUNCTION;
-	thr_setstate = FUNCTION;
-	thr_sighndlrinfo = FUNCTION;
-	thr_suspend_allmutators = FUNCTION;
-	thr_suspend_mutator = FUNCTION;
-	thr_wait_mutator = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_mutex_init = FUNCTION;
-	_mutex_lock = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_thr_create = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_thr_join = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_self = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_thr_main = FUNCTION;
-	__tls_get_addr = FUNCTION;
-	_getsp = FUNCTION;
-	_rwlock_destroy = FUNCTION;
-	__gettsp = FUNCTION;
-	_assfail = FUNCTION;
-	_sigoff = FUNCTION;
-	_sigon = FUNCTION;
-	_fork = FUNCTION;
-	_setcontext = FUNCTION;
-	_sigaction = FUNCTION NODIRECT;
-	_sigprocmask = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_setitimer = FUNCTION;
-	mutex_held = FUNCTION;
-	rw_read_held = FUNCTION;
-	rw_write_held = FUNCTION;
-	sema_held = FUNCTION;
-};
-
-SISCD_2.3 {
-    global:
-	SISCD_2.3;
-} SISCD_2.3a SISCD_2.3b;
-
--- a/usr/src/lib/libthread/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,322 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-#
-# DO NOT TOUCH THIS FILE.
-# This file declares interfaces that are cast in stone.
-# They offer interfaces that will never change.
-# DO NOT TOUCH THIS FILE.
-#
-
-SUNW_1.6.1 {
-    global:
-	_stack_grow = FUNCTION;
-    local:
-	*;
-} SUNW_1.6;
-
-SUNW_1.6 {
-    global:
-	pthread_cond_reltimedwait_np = FUNCTION;
-	cond_reltimedwait = FUNCTION;
-} SUNW_1.5;
-
-SUNW_1.5 {
-    global:
-	pthread_mutexattr_setrobust_np = FUNCTION;
-	pthread_mutexattr_getrobust_np = FUNCTION;
-	pthread_mutex_consistent_np = FUNCTION;
-} SUNW_1.4;
-
-SUNW_1.4 {
-    global:
-	pthread_attr_getguardsize = FUNCTION;
-	pthread_attr_setguardsize = FUNCTION;
-	pthread_getconcurrency = FUNCTION;
-	pthread_rwlock_destroy = FUNCTION;
-	pthread_rwlock_init = FUNCTION;
-	pthread_rwlock_rdlock = FUNCTION;
-	pthread_rwlock_tryrdlock = FUNCTION;
-	pthread_rwlock_trywrlock = FUNCTION;
-	pthread_rwlock_unlock = FUNCTION;
-	pthread_rwlock_wrlock = FUNCTION;
-	pthread_rwlockattr_destroy = FUNCTION;
-	pthread_rwlockattr_getpshared = FUNCTION;
-	pthread_rwlockattr_init = FUNCTION;
-	pthread_rwlockattr_setpshared = FUNCTION;
-	pthread_setconcurrency = FUNCTION;
-	__xpg4_putmsg = FUNCTION;
-	__xpg4_putpmsg = FUNCTION;
-	getmsg = FUNCTION;
-	getpmsg = FUNCTION;
-	lockf = FUNCTION;
-	msgrcv = FUNCTION;
-	msgsnd = FUNCTION;
-	poll = FUNCTION;
-	putmsg = FUNCTION;
-	putpmsg = FUNCTION;
-	select = FUNCTION;
-	sigpause = FUNCTION;
-	usleep = FUNCTION;
-	wait3 = FUNCTION;
-	waitid = FUNCTION;
-	pthread_mutexattr_gettype = FUNCTION;
-	pthread_mutexattr_settype = FUNCTION;
-	pread = FUNCTION;
-	pwrite = FUNCTION;
-	readv = FUNCTION;
-	writev = FUNCTION;
-} SUNW_1.3;
-
-SUNW_1.3 {
-    global:
-	SUNW_1.3;
-} SUNW_1.2;
-
-SUNW_1.2 {
-    global:
-	SUNW_1.2;
-} SUNW_1.1;
-
-SUNW_1.1 {
-    global:
-	kill = FUNCTION;
-} SUNW_0.9;
-
-SUNW_0.9 {
-    global:
-	pthread_attr_destroy = FUNCTION;
-	pthread_attr_getdetachstate = FUNCTION;
-	pthread_attr_getinheritsched = FUNCTION;
-	pthread_attr_getschedparam = FUNCTION;
-	pthread_attr_getschedpolicy = FUNCTION;
-	pthread_attr_getscope = FUNCTION;
-	pthread_attr_getstackaddr = FUNCTION;
-	pthread_attr_getstacksize = FUNCTION;
-	pthread_attr_init = FUNCTION;
-	pthread_attr_setdetachstate = FUNCTION;
-	pthread_attr_setinheritsched = FUNCTION;
-	pthread_attr_setschedparam = FUNCTION;
-	pthread_attr_setschedpolicy = FUNCTION;
-	pthread_attr_setscope = FUNCTION;
-	pthread_attr_setstackaddr = FUNCTION;
-	pthread_attr_setstacksize = FUNCTION;
-	pthread_cancel = FUNCTION;
-	__pthread_cleanup_pop = FUNCTION;
-	__pthread_cleanup_push = FUNCTION;
-	pthread_cond_broadcast = FUNCTION;
-	pthread_cond_destroy = FUNCTION;
-	pthread_cond_init = FUNCTION;
-	pthread_cond_signal = FUNCTION;
-	pthread_cond_timedwait = FUNCTION;
-	pthread_cond_wait = FUNCTION;
-	pthread_condattr_destroy = FUNCTION;
-	pthread_condattr_getpshared = FUNCTION;
-	pthread_condattr_init = FUNCTION;
-	pthread_condattr_setpshared = FUNCTION;
-	pthread_create = FUNCTION;
-	pthread_detach = FUNCTION;
-	pthread_equal = FUNCTION;
-	pthread_exit = FUNCTION;
-	pthread_getschedparam = FUNCTION;
-	pthread_getspecific = FUNCTION;
-	pthread_join = FUNCTION;
-	pthread_key_create = FUNCTION;
-	pthread_key_delete = FUNCTION;
-	pthread_kill = FUNCTION;
-	pthread_mutex_destroy = FUNCTION;
-	pthread_mutex_getprioceiling = FUNCTION;
-	pthread_mutex_init = FUNCTION;
-	pthread_mutex_lock = FUNCTION;
-	pthread_mutex_setprioceiling = FUNCTION;
-	pthread_mutex_trylock = FUNCTION;
-	pthread_mutex_unlock = FUNCTION;
-	pthread_mutexattr_destroy = FUNCTION;
-	pthread_mutexattr_getprioceiling = FUNCTION;
-	pthread_mutexattr_getprotocol = FUNCTION;
-	pthread_mutexattr_getpshared = FUNCTION;
-	pthread_mutexattr_init = FUNCTION;
-	pthread_mutexattr_setprioceiling = FUNCTION;
-	pthread_mutexattr_setprotocol = FUNCTION;
-	pthread_mutexattr_setpshared = FUNCTION;
-	pthread_once = FUNCTION;
-	pthread_self = FUNCTION;
-	pthread_setcancelstate = FUNCTION;
-	pthread_setcanceltype = FUNCTION;
-	pthread_setschedparam = FUNCTION;
-	pthread_setspecific = FUNCTION;
-	pthread_sigmask = FUNCTION;
-	pthread_testcancel = FUNCTION;
-	thr_main = FUNCTION;
-	thr_stksegment = FUNCTION;
-	alarm = FUNCTION;
-	close = FUNCTION NODIRECT;
-	creat = FUNCTION;
-	fcntl = FUNCTION;
-	fork = FUNCTION NODIRECT;
-	fsync = FUNCTION;
-	msync = FUNCTION;
-	open = FUNCTION;
-	pause = FUNCTION;
-	read = FUNCTION;
-	setitimer = FUNCTION;
-	sigsetjmp = FUNCTION;
-	sigsuspend = FUNCTION;
-	tcdrain = FUNCTION;
-	wait = FUNCTION;
-	waitpid = FUNCTION;
-	write = FUNCTION;
-	sigpending = FUNCTION;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	thr_continue = FUNCTION;
-	thr_create = FUNCTION;
-	thr_exit = FUNCTION;
-	thr_getconcurrency = FUNCTION;
-	thr_getprio = FUNCTION;
-	thr_getspecific = FUNCTION;
-	thr_join = FUNCTION;
-	thr_keycreate = FUNCTION;
-	thr_kill = FUNCTION;
-	thr_min_stack = FUNCTION;
-	thr_self = FUNCTION;
-	thr_setconcurrency = FUNCTION;
-	thr_setprio = FUNCTION;
-	thr_setspecific = FUNCTION;
-	thr_sigsetmask = FUNCTION;
-	thr_suspend = FUNCTION;
-	thr_yield = FUNCTION;
-	lwp_self = FUNCTION;
-	cond_broadcast = FUNCTION;
-	cond_destroy = FUNCTION;
-	cond_init = FUNCTION;
-	cond_signal = FUNCTION;
-	cond_timedwait = FUNCTION;
-	cond_wait = FUNCTION;
-	fork1 = FUNCTION;
-	mutex_destroy = FUNCTION;
-	mutex_init = FUNCTION;
-	mutex_lock = FUNCTION;
-	mutex_trylock = FUNCTION;
-	mutex_unlock = FUNCTION;
-	rw_rdlock = FUNCTION;
-	rw_tryrdlock = FUNCTION;
-	rw_trywrlock = FUNCTION;
-	rw_unlock = FUNCTION;
-	rw_wrlock = FUNCTION;
-	rwlock_destroy = FUNCTION;
-	rwlock_init = FUNCTION;
-	sema_destroy = FUNCTION;
-	sema_init = FUNCTION;
-	sema_post = FUNCTION;
-	sema_trywait = FUNCTION;
-	sema_wait = FUNCTION;
-	_getfp = FUNCTION;
-	sigaction = FUNCTION NODIRECT;
-	sigprocmask = FUNCTION;
-	sigwait = FUNCTION;
-	sleep = FUNCTION;
-	setcontext = FUNCTION;
-	_mutex_held = FUNCTION;
-	_rw_read_held = FUNCTION;
-	_rw_write_held = FUNCTION;
-	_sema_held = FUNCTION;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_resume = FUNCTION;
-	_resume_ret = FUNCTION;
-	_pthread_setcleanupinit = FUNCTION;
-	thr_probe_setup = FUNCTION;
-	_thr_continue_allmutators = FUNCTION;
-	_thr_continue_mutator = FUNCTION;
-	_thr_getstate = FUNCTION;
-	_thr_mutators_barrier = FUNCTION;
-	_thr_setmutator = FUNCTION;
-	_thr_setstate = FUNCTION;
-	_thr_sighndlrinfo = FUNCTION;
-	_thr_suspend_allmutators = FUNCTION;
-	_thr_suspend_mutator = FUNCTION;
-	_thr_wait_mutator = FUNCTION;
-	thr_continue_allmutators = FUNCTION;
-	thr_continue_mutator = FUNCTION;
-	thr_getstate = FUNCTION;
-	thr_mutators_barrier = FUNCTION;
-	thr_setmutator = FUNCTION;
-	thr_setstate = FUNCTION;
-	thr_sighndlrinfo = FUNCTION;
-	thr_suspend_allmutators = FUNCTION;
-	thr_suspend_mutator = FUNCTION;
-	thr_wait_mutator = FUNCTION;
-	_mutex_destroy = FUNCTION;
-	_mutex_init = FUNCTION;
-	_mutex_lock = FUNCTION;
-	_mutex_unlock = FUNCTION;
-	_sema_destroy = FUNCTION;
-	_thr_create = FUNCTION;
-	_thr_getspecific = FUNCTION;
-	_thr_join = FUNCTION;
-	_thr_keycreate = FUNCTION;
-	_thr_self = FUNCTION;
-	_thr_setspecific = FUNCTION;
-	_thr_main = FUNCTION;
-	__tls_get_addr = FUNCTION;
-	_getsp = FUNCTION;
-	_rwlock_destroy = FUNCTION;
-	__gettsp = FUNCTION;
-	_assfail = FUNCTION;
-	_sigoff = FUNCTION;
-	_sigon = FUNCTION;
-	_fork = FUNCTION;
-	_setcontext = FUNCTION;
-	_sigaction = FUNCTION NODIRECT;
-	_sigprocmask = FUNCTION;
-	_sigsuspend = FUNCTION;
-	_sigsetjmp = FUNCTION;
-	_sleep = FUNCTION;
-	_alarm = FUNCTION;
-	_setitimer = FUNCTION;
-	mutex_held = FUNCTION;
-	rw_read_held = FUNCTION;
-	rw_write_held = FUNCTION;
-	sema_held = FUNCTION;
-};
-
--- a/usr/src/lib/libtnf/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libtnf/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	tnf_default_error_handler;
 	tnf_error_message;
--- a/usr/src/lib/libtnfctl/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libtnfctl/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	tnfctl_buffer_alloc;
 	tnfctl_buffer_dealloc;
@@ -68,7 +69,7 @@
 	tnfctl_trace_state_set;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_tnfctl_externally_traced_pid;
 	_tnfctl_internal_tracing_flag;
--- a/usr/src/lib/libtnfprobe/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libtnfprobe/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY=	libtnfprobe.a
@@ -50,7 +47,6 @@
 
 LIBS=		$(DYNLIB)
 
-MAPFILES +=	mapfile-vers
 DYNFLAGS +=	$(ZINTERPOSE)
 
 HDRS=		com.h writer.h probe.h
--- a/usr/src/lib/libtnfprobe/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-};
--- a/usr/src/lib/libtnfprobe/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-};
--- a/usr/src/lib/libtnfprobe/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libtnfprobe/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,9 +36,11 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-	fork = NODIRECT;
+	fork				{ FLAGS = NODIRECT };
 	fork1;
 	pthread_create;
 	pthread_exit;
@@ -100,6 +101,11 @@
 	tnf_uint8_tag_data;
 	tnf_user_struct_properties;
 	_tnfw_b_control;
+
+$if _sparc
+	thr_stksegment;
+$endif
+
     local:
 	*;
 };
--- a/usr/src/lib/libtnfprobe/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-	thr_stksegment;
-};
--- a/usr/src/lib/libtnfprobe/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNWprivate_1.1 {
-    global:
-	thr_stksegment;
-};
--- a/usr/src/lib/libtsalarm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libtsalarm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,11 +35,13 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Interface definition for usr/src/lib/libtsalarm
 #
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
 	global:
 		tsalarm_get;
 		tsalarm_set;
--- a/usr/src/lib/libtsnet/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libtsnet/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	rhstr_to_ent;
 	rtsa_keyword;
--- a/usr/src/lib/libtsol/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libtsol/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_2.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_2.1 {
     global:
 	bldominates;
 	blequal;
@@ -60,7 +61,7 @@
 	str_to_label;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	bclearcvt;
 	bclearcvtfull;
--- a/usr/src/lib/libumem/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libumem/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,13 +36,15 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
-	calloc = NODIRECT;
-	free = NODIRECT;
-	malloc = NODIRECT;
-	memalign = NODIRECT;
-	realloc = NODIRECT;
+	calloc			{ FLAGS = NODIRECT };
+	free			{ FLAGS = NODIRECT };
+	malloc			{ FLAGS = NODIRECT };
+	memalign		{ FLAGS = NODIRECT };
+	realloc			{ FLAGS = NODIRECT };
 	umem_alloc;
 	umem_cache_alloc;
 	umem_cache_create;
@@ -52,10 +53,10 @@
 	umem_free;
 	umem_nofail_callback;
 	umem_zalloc;
-	valloc = NODIRECT;
+	valloc			{ FLAGS = NODIRECT };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	umem_alloc_align;
 	umem_free_align;
--- a/usr/src/lib/libumem/common/stand_mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libumem/common/stand_mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,6 +35,8 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # This is a supplemental mapfile, used in addition to the standard one
 # produced by the spec tools.  This mapfile exposes an additional
@@ -43,7 +44,7 @@
 # of libumem.
 #
 
-SUNWprivate1.1 {
+SYMBOL_VERSION SUNWprivate1.1 {
 	global:
 		umem_startup;
 		umem_add;
--- a/usr/src/lib/libunistat/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libunistat/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -40,7 +39,9 @@
 # Generic interface definition for usr/src/lib/libunistat.
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
 	global:
 		spcs_s_uinit;
 		spcs_s_ucreate;
--- a/usr/src/lib/libuuid/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libuuid/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	uuid_clear;
 	uuid_compare;
@@ -51,7 +52,7 @@
 	uuid_unparse;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/libuutil/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libuutil/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	uu_alt_exit;
 	uu_avl_create;
--- a/usr/src/lib/libvolmgt/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libvolmgt/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -41,24 +40,26 @@
 # no SUNW_1.2 or SUNW_1.3 symbols, but they are now kept as placeholders.
 # Don't add any symbols to these versions.
 
-SUNW_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	SUNW_1.3;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	volmgt_acquire;
 	volmgt_feature_enabled;
 	volmgt_release;
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
 	media_findname;
 	media_getattr;
@@ -73,7 +74,7 @@
 	volmgt_symname;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_dev_mounted;
 	_dev_unmount;
--- a/usr/src/lib/libvrrpadm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libvrrpadm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # MAPFILE HEADER START
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	vrrp_close;
 	vrrp_create;
--- a/usr/src/lib/libvscan/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libvscan/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
     	vs_props_get_all;
 	vs_props_get;
--- a/usr/src/lib/libw/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libw/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,5 +1,4 @@
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -35,102 +34,104 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
     local:
 	*;
 } SUNW_0.8;
 
-SUNW_0.8 {
+SYMBOL_VERSION SUNW_0.8 {
     global:
-	getwc = FUNCTION;
-	putwc = FUNCTION;
-	iswctype = FUNCTION;
-	wcscoll = FUNCTION;
-	wcsftime = FUNCTION;
-	wcstod = FUNCTION;
-	wcstol = FUNCTION;
-	wcstoul = FUNCTION;
-	wcscat = FUNCTION;
-	wcsncat = FUNCTION;
-	wcscmp = FUNCTION;
-	wcsncmp = FUNCTION;
-	wcscpy = FUNCTION;
-	wcsncpy = FUNCTION;
-	wcslen = FUNCTION;
-	wcwidth = FUNCTION;
-	wcswidth = FUNCTION;
-	wcschr = FUNCTION;
-	wcsrchr = FUNCTION;
-	wcspbrk = FUNCTION;
-	wcsxfrm = FUNCTION;
-	wctype = FUNCTION;
-	strtows = FUNCTION;
-	wcscspn = FUNCTION;
-	wcsspn = FUNCTION;
-	wcstok = FUNCTION;
-	wcswcs = FUNCTION;
-	wstostr = FUNCTION;
+	getwc			{ TYPE = FUNCTION };
+	putwc			{ TYPE = FUNCTION };
+	iswctype		{ TYPE = FUNCTION };
+	wcscoll			{ TYPE = FUNCTION };
+	wcsftime		{ TYPE = FUNCTION };
+	wcstod			{ TYPE = FUNCTION };
+	wcstol			{ TYPE = FUNCTION };
+	wcstoul			{ TYPE = FUNCTION };
+	wcscat			{ TYPE = FUNCTION };
+	wcsncat			{ TYPE = FUNCTION };
+	wcscmp			{ TYPE = FUNCTION };
+	wcsncmp			{ TYPE = FUNCTION };
+	wcscpy			{ TYPE = FUNCTION };
+	wcsncpy			{ TYPE = FUNCTION };
+	wcslen			{ TYPE = FUNCTION };
+	wcwidth			{ TYPE = FUNCTION };
+	wcswidth		{ TYPE = FUNCTION };
+	wcschr			{ TYPE = FUNCTION };
+	wcsrchr			{ TYPE = FUNCTION };
+	wcspbrk			{ TYPE = FUNCTION };
+	wcsxfrm			{ TYPE = FUNCTION };
+	wctype			{ TYPE = FUNCTION };
+	strtows			{ TYPE = FUNCTION };
+	wcscspn			{ TYPE = FUNCTION };
+	wcsspn			{ TYPE = FUNCTION };
+	wcstok			{ TYPE = FUNCTION };
+	wcswcs			{ TYPE = FUNCTION };
+	wstostr			{ TYPE = FUNCTION };
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
-	getws = FUNCTION;
-	fgetws = FUNCTION;
-	fgetwc = FUNCTION;
-	getwchar = FUNCTION;
-	ungetwc = FUNCTION;
-	iswalpha = FUNCTION;
-	iswupper = FUNCTION;
-	iswlower = FUNCTION;
-	iswdigit = FUNCTION;
-	iswxdigit = FUNCTION;
-	iswalnum = FUNCTION;
-	iswspace = FUNCTION;
-	iswpunct = FUNCTION;
-	iswprint = FUNCTION;
-	iswgraph = FUNCTION;
-	iswcntrl = FUNCTION;
-	isphonogram = FUNCTION;
-	isideogram = FUNCTION;
-	isenglish = FUNCTION;
-	isnumber = FUNCTION;
-	isspecial = FUNCTION;
-	putws = FUNCTION;
-	fputwc = FUNCTION;
-	fputws = FUNCTION;
-	putwchar = FUNCTION;
-	towlower = FUNCTION;
-	towupper = FUNCTION;
-	wscoll = FUNCTION;
-	wstod = FUNCTION;
-	wstol = FUNCTION;
-	wscat = FUNCTION;
-	wsncat = FUNCTION;
-	wscmp = FUNCTION;
-	wsncmp = FUNCTION;
-	wscpy = FUNCTION;
-	wsncpy = FUNCTION;
-	wslen = FUNCTION;
-	wschr = FUNCTION;
-	wsrchr = FUNCTION;
-	wspbrk = FUNCTION;
-	wsxfrm = FUNCTION;
-	wsprintf = FUNCTION;
-	wsscanf = FUNCTION;
-	wscasecmp = FUNCTION;
-	wsncasecmp = FUNCTION;
-	wsdup = FUNCTION;
-	wscol = FUNCTION;
-	watoll = FUNCTION;
-	wscspn = FUNCTION;
-	wsspn = FUNCTION;
-	wstok = FUNCTION;
-	wstoll = FUNCTION;
+	getws			{ TYPE = FUNCTION };
+	fgetws			{ TYPE = FUNCTION };
+	fgetwc			{ TYPE = FUNCTION };
+	getwchar		{ TYPE = FUNCTION };
+	ungetwc			{ TYPE = FUNCTION };
+	iswalpha		{ TYPE = FUNCTION };
+	iswupper		{ TYPE = FUNCTION };
+	iswlower		{ TYPE = FUNCTION };
+	iswdigit		{ TYPE = FUNCTION };
+	iswxdigit		{ TYPE = FUNCTION };
+	iswalnum		{ TYPE = FUNCTION };
+	iswspace		{ TYPE = FUNCTION };
+	iswpunct		{ TYPE = FUNCTION };
+	iswprint		{ TYPE = FUNCTION };
+	iswgraph		{ TYPE = FUNCTION };
+	iswcntrl		{ TYPE = FUNCTION };
+	isphonogram		{ TYPE = FUNCTION };
+	isideogram		{ TYPE = FUNCTION };
+	isenglish		{ TYPE = FUNCTION };
+	isnumber		{ TYPE = FUNCTION };
+	isspecial		{ TYPE = FUNCTION };
+	putws			{ TYPE = FUNCTION };
+	fputwc			{ TYPE = FUNCTION };
+	fputws			{ TYPE = FUNCTION };
+	putwchar		{ TYPE = FUNCTION };
+	towlower		{ TYPE = FUNCTION };
+	towupper		{ TYPE = FUNCTION };
+	wscoll			{ TYPE = FUNCTION };
+	wstod			{ TYPE = FUNCTION };
+	wstol			{ TYPE = FUNCTION };
+	wscat			{ TYPE = FUNCTION };
+	wsncat			{ TYPE = FUNCTION };
+	wscmp			{ TYPE = FUNCTION };
+	wsncmp			{ TYPE = FUNCTION };
+	wscpy			{ TYPE = FUNCTION };
+	wsncpy			{ TYPE = FUNCTION };
+	wslen			{ TYPE = FUNCTION };
+	wschr			{ TYPE = FUNCTION };
+	wsrchr			{ TYPE = FUNCTION };
+	wspbrk			{ TYPE = FUNCTION };
+	wsxfrm			{ TYPE = FUNCTION };
+	wsprintf		{ TYPE = FUNCTION };
+	wsscanf			{ TYPE = FUNCTION };
+	wscasecmp		{ TYPE = FUNCTION };
+	wsncasecmp		{ TYPE = FUNCTION };
+	wsdup			{ TYPE = FUNCTION };
+	wscol			{ TYPE = FUNCTION };
+	watoll			{ TYPE = FUNCTION };
+	wscspn			{ TYPE = FUNCTION };
+	wsspn			{ TYPE = FUNCTION };
+	wstok			{ TYPE = FUNCTION };
+	wstoll			{ TYPE = FUNCTION };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
 };
--- a/usr/src/lib/libwanboot/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libwanboot/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	bootconf_end;
 	bootconf_errmsg;
--- a/usr/src/lib/libwanbootutil/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libwanbootutil/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	aes_decrypt;
 	aes_encrypt;
--- a/usr/src/lib/libwrap/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libwrap/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -22,8 +21,10 @@
 # defined by the application.
 #
 
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
-		allow_severity = extern;
-		deny_severity = extern;
+		allow_severity		{ FLAGS = extern };
+		deny_severity		{ FLAGS = extern };
 };
--- a/usr/src/lib/libxcurses/src/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libxcurses/src/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	COLOR_PAIRS;
 	COLORS;
@@ -51,7 +52,7 @@
 	tputs;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	addch;
 	addchnstr;
@@ -425,7 +426,7 @@
 	wvline_set;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/libxcurses2/src/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libxcurses2/src/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.2 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	add_wchstr;
 	COLOR_PAIRS;
@@ -53,7 +54,7 @@
 	tputs;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	addch;
 	addchnstr;
@@ -426,7 +427,7 @@
 	wvline_set;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	boolcodes;
 	boolfnames;
--- a/usr/src/lib/libxnet/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libxnet/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,127 +35,138 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.4 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.4 {
     global:
-	freeaddrinfo =		FUNCTION FILTER libsocket.so.1;
-	gai_strerror =		FUNCTION FILTER libsocket.so.1;
-	getaddrinfo =		FUNCTION FILTER libsocket.so.1;
-	getnameinfo =		FUNCTION FILTER libsocket.so.1;
-	inet_ntop =		FUNCTION FILTER libnsl.so.1;
-	inet_pton =		FUNCTION FILTER libnsl.so.1;
+	freeaddrinfo		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	gai_strerror		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getaddrinfo		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getnameinfo		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	inet_ntop		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	inet_pton		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
 } SUNW_1.3;
 
-SUNW_1.3 {
+SYMBOL_VERSION SUNW_1.3 {
     global:
-	if_freenameindex =	FUNCTION FILTER libsocket.so.1;
-	if_indextoname =	FUNCTION FILTER libsocket.so.1;
-	if_nameindex =		FUNCTION FILTER libsocket.so.1;
-	if_nametoindex =	FUNCTION FILTER libsocket.so.1;
-	sockatmark =		FUNCTION FILTER libsocket.so.1;
+	if_freenameindex	{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	if_indextoname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	if_nameindex		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	if_nametoindex		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	sockatmark		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
-	_xti_rcvreldata =	FUNCTION FILTER libnsl.so.1;
-	_xti_rcvv =		FUNCTION FILTER libnsl.so.1;
-	_xti_rcvvudata =	FUNCTION FILTER libnsl.so.1;
-	_xti_sndreldata =	FUNCTION FILTER libnsl.so.1;
-	_xti_sndv =		FUNCTION FILTER libnsl.so.1;
-	_xti_sndvudata =	FUNCTION FILTER libnsl.so.1;
-	_xti_sysconf =		FUNCTION FILTER libnsl.so.1;
-	_xti_xns5_accept =	FUNCTION FILTER libnsl.so.1;
-	_xti_xns5_snd =		FUNCTION FILTER libnsl.so.1;
+	_xti_rcvreldata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_rcvv		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_rcvvudata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_sndreldata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_sndv		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_sndvudata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_sysconf		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_xns5_accept	{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_xns5_snd		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
-	__t_errno =		FUNCTION FILTER libnsl.so.1;
-	__xnet_bind = 		FUNCTION FILTER libsocket.so.1;
-	__xnet_connect = 	FUNCTION FILTER libsocket.so.1;
-	__xnet_getsockopt = 	FUNCTION FILTER libsocket.so.1;
-	__xnet_listen = 	FUNCTION FILTER libsocket.so.1;
-	__xnet_recvmsg =	FUNCTION FILTER libsocket.so.1;
-	__xnet_sendmsg =	FUNCTION FILTER libsocket.so.1;
-	__xnet_sendto =		FUNCTION FILTER libsocket.so.1;
-	__xnet_socket = 	FUNCTION FILTER libsocket.so.1;
-	__xnet_socketpair = 	FUNCTION FILTER libsocket.so.1;
-	_xti_accept =		FUNCTION FILTER libnsl.so.1;
-	_xti_alloc =		FUNCTION FILTER libnsl.so.1;
-	_xti_bind =		FUNCTION FILTER libnsl.so.1;
-	_xti_close =		FUNCTION FILTER libnsl.so.1;
-	_xti_connect =		FUNCTION FILTER libnsl.so.1;
-	_xti_error =		FUNCTION FILTER libnsl.so.1;
-	_xti_free =		FUNCTION FILTER libnsl.so.1;
-	_xti_getinfo =		FUNCTION FILTER libnsl.so.1;
-	_xti_getprotaddr =	FUNCTION FILTER libnsl.so.1;
-	_xti_getstate =		FUNCTION FILTER libnsl.so.1;
-	_xti_listen =		FUNCTION FILTER libnsl.so.1;
-	_xti_look =		FUNCTION FILTER libnsl.so.1;
-	_xti_open =		FUNCTION FILTER libnsl.so.1;
-	_xti_optmgmt =		FUNCTION FILTER libnsl.so.1;
-	_xti_rcv =		FUNCTION FILTER libnsl.so.1;
-	_xti_rcvconnect =	FUNCTION FILTER libnsl.so.1;
-	_xti_rcvdis =		FUNCTION FILTER libnsl.so.1;
-	_xti_rcvrel =		FUNCTION FILTER libnsl.so.1;
-	_xti_rcvudata =		FUNCTION FILTER libnsl.so.1;
-	_xti_rcvuderr =		FUNCTION FILTER libnsl.so.1;
-	_xti_snd =		FUNCTION FILTER libnsl.so.1;
-	_xti_snddis =		FUNCTION FILTER libnsl.so.1;
-	_xti_sndrel =		FUNCTION FILTER libnsl.so.1;
-	_xti_sndudata =		FUNCTION FILTER libnsl.so.1;
-	_xti_strerror =		FUNCTION FILTER libnsl.so.1;
-	_xti_sync =		FUNCTION FILTER libnsl.so.1;
-	_xti_unbind =		FUNCTION FILTER libnsl.so.1;
-	accept =		FUNCTION FILTER libsocket.so.1;
-	bind =			FUNCTION FILTER libsocket.so.1;
-	connect = 		FUNCTION FILTER libsocket.so.1;
-	endhostent =		FUNCTION FILTER libnsl.so.1;
-	endnetent =		FUNCTION FILTER libsocket.so.1;
-	endprotoent =		FUNCTION FILTER libsocket.so.1;
-	endservent =		FUNCTION FILTER libsocket.so.1;
-	gethostbyaddr =		FUNCTION FILTER libnsl.so.1;
-	gethostbyname =		FUNCTION FILTER libnsl.so.1;
-	gethostent =		FUNCTION FILTER libnsl.so.1;
-	gethostname =		FUNCTION FILTER libc.so.1;
-	getnetbyaddr =		FUNCTION FILTER libsocket.so.1;
-	getnetbyname =		FUNCTION FILTER libsocket.so.1;
-	getnetent =		FUNCTION FILTER libsocket.so.1;
-	getpeername = 		FUNCTION FILTER libsocket.so.1;
-	getprotobyname =	FUNCTION FILTER libsocket.so.1;
-	getprotobynumber =	FUNCTION FILTER libsocket.so.1;
-	getprotoent =		FUNCTION FILTER libsocket.so.1;
-	getservbyname =		FUNCTION FILTER libsocket.so.1;
-	getservbyport =		FUNCTION FILTER libsocket.so.1;
-	getservent =		FUNCTION FILTER libsocket.so.1;
-	getsockname = 		FUNCTION FILTER libsocket.so.1;
-	getsockopt = 		FUNCTION FILTER libsocket.so.1;
-	h_errno =		DATA S0x4 NODIRECT FILTER libnsl.so.1;
-	htonl =			FUNCTION FILTER libc.so.1;
-	htons =			FUNCTION FILTER libc.so.1;
-	inet_addr =		FUNCTION FILTER libnsl.so.1;
-	inet_lnaof =		FUNCTION FILTER libsocket.so.1;
-	inet_makeaddr =		FUNCTION FILTER libsocket.so.1;
-	inet_netof =		FUNCTION FILTER libnsl.so.1;
-	inet_network =		FUNCTION FILTER libsocket.so.1;
-	inet_ntoa =		FUNCTION FILTER libnsl.so.1;
-	listen = 		FUNCTION FILTER libsocket.so.1;
-	ntohl =			FUNCTION FILTER libc.so.1;
-	ntohs =			FUNCTION FILTER libc.so.1;
-	recv =			FUNCTION FILTER libsocket.so.1;
-	recvfrom =		FUNCTION FILTER libsocket.so.1;
-	recvmsg =		FUNCTION FILTER libsocket.so.1;
-	send =			FUNCTION FILTER libsocket.so.1;
-	sendmsg =		FUNCTION FILTER libsocket.so.1;
-	sendto = 		FUNCTION FILTER libsocket.so.1;
-	sethostent =		FUNCTION FILTER libnsl.so.1;
-	setnetent =		FUNCTION FILTER libsocket.so.1;
-	setprotoent =		FUNCTION FILTER libsocket.so.1;
-	setservent =		FUNCTION FILTER libsocket.so.1;
-	setsockopt = 		FUNCTION FILTER libsocket.so.1;
-	shutdown = 		FUNCTION FILTER libsocket.so.1;
-	socket = 		FUNCTION FILTER libsocket.so.1;
-	socketpair = 		FUNCTION FILTER libsocket.so.1;
-	t_errno	=		DATA S0x4 FILTER libnsl.so.1;
+	__t_errno		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	__xnet_bind		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	__xnet_connect		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	__xnet_getsockopt	{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	__xnet_listen		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	__xnet_recvmsg		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	__xnet_sendmsg		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	__xnet_sendto		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	__xnet_socket		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	__xnet_socketpair	{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	_xti_accept		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_alloc		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_bind		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_close		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_connect		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_error		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_free		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_getinfo		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_getprotaddr	{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_getstate		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_listen		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_look		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_open		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_optmgmt		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_rcv		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_rcvconnect		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_rcvdis		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_rcvrel		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_rcvudata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_rcvuderr		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_snd		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_snddis		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_sndrel		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_sndudata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_strerror		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_sync		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	_xti_unbind		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	accept			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	bind			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	connect			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	endhostent		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	endnetent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	endprotoent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	endservent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	gethostbyaddr		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	gethostbyname		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	gethostent		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	gethostname		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	getnetbyaddr		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getnetbyname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getnetent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getpeername		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getprotobyname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getprotobynumber	{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getprotoent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getservbyname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getservbyport		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getservent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getsockname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	getsockopt		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	h_errno {
+		TYPE = DATA;
+		SIZE = 0x4;
+		FLAGS = NODIRECT;
+		FILTER = libnsl.so.1;
+	};
+	htonl			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	htons			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	inet_addr		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	inet_lnaof		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	inet_makeaddr		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	inet_netof		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	inet_network		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	inet_ntoa		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	listen	 		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	ntohl			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	ntohs			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	recv			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	recvfrom		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	recvmsg			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	send			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	sendmsg			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	sendto			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	sethostent		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
+	setnetent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	setprotoent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	setservent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	setsockopt		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	shutdown		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	socket			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	socketpair		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
+	t_errno {
+		TYPE = DATA;
+		SIZE = 0x4;
+		FILTER = libnsl.so.1;
+	};
     local:
 	*;
 };
--- a/usr/src/lib/libzfs/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libzfs/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	fletcher_2_native;
 	fletcher_2_byteswap;
--- a/usr/src/lib/libzfs_jni/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libzfs_jni/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dmgt_avail_disk_iter;
 	dmgt_free_disk;
--- a/usr/src/lib/libzonecfg/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libzonecfg/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -36,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	endzoneent;
 	getzoneent;
--- a/usr/src/lib/libzoneinfo/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/libzoneinfo/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	conv_gmt;
 	free_timezones;
--- a/usr/src/lib/lvm/libmeta/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/lvm/libmeta/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	add_key_name;
 	add_name;
@@ -161,7 +162,7 @@
 	md_got_sig;
 	mdhserror;
 	mdhsperror;
-	md_in_daemon = NODIRECT;
+	md_in_daemon			{ FLAGS = NODIRECT };
 	md_init;
 	md_init_daemon;
 	md_init_nosig;
@@ -710,40 +711,40 @@
 	resync_genid;
 	s_delrec;
 	s_delset;
-	sdssc_add_hosts = NODIRECT;
-	sdssc_bindclusterdevs = NODIRECT;
-	sdssc_binddevs = NODIRECT;
-	sdssc_bind_library = NODIRECT;
-	sdssc_clnt_bind_devs = NODIRECT;
-	sdssc_clnt_proxy_cmd = NODIRECT;
-	sdssc_cmd_proxy = NODIRECT;
-	sdssc_cm_nid2nm = NODIRECT;
-	sdssc_cm_nm2nid = NODIRECT;
-	sdssc_cm_sr_nid2nm = NODIRECT;
-	sdssc_cm_sr_nm2nid = NODIRECT;
-	sdssc_convert_cluster_path = NODIRECT;
-	sdssc_convert_ctd_path = NODIRECT;
-	sdssc_convert_path_free = NODIRECT;
-	sdssc_create_begin = NODIRECT;
-	sdssc_create_end = NODIRECT;
-	sdssc_delete_begin = NODIRECT;
-	sdssc_delete_end = NODIRECT;
-	sdssc_delete_hosts = NODIRECT;
-	sdssc_free_mdcerr_list = NODIRECT;
-	sdssc_freenodelist = NODIRECT;
-	sdssc_get_index = NODIRECT;
-	sdssc_getnodelist = NODIRECT;
-	sdssc_get_primary_host = NODIRECT;
-	sdssc_get_priv_ipaddr = NODIRECT;
-	sdssc_get_services = NODIRECT;
-	sdssc_get_services_free = NODIRECT;
-	sdssc_gettransportbynode = NODIRECT;
-	sdssc_mo_create_begin = NODIRECT;
-	sdssc_notify_service = NODIRECT;
-	sdssc_property_get = NODIRECT;
-	sdssc_property_set = NODIRECT;
-	sdssc_suspend = NODIRECT;
-	sdssc_version = NODIRECT;
+	sdssc_add_hosts			{ FLAGS = NODIRECT };
+	sdssc_bindclusterdevs		{ FLAGS = NODIRECT };
+	sdssc_binddevs			{ FLAGS = NODIRECT };
+	sdssc_bind_library		{ FLAGS = NODIRECT };
+	sdssc_clnt_bind_devs		{ FLAGS = NODIRECT };
+	sdssc_clnt_proxy_cmd		{ FLAGS = NODIRECT };
+	sdssc_cmd_proxy			{ FLAGS = NODIRECT };
+	sdssc_cm_nid2nm			{ FLAGS = NODIRECT };
+	sdssc_cm_nm2nid			{ FLAGS = NODIRECT };
+	sdssc_cm_sr_nid2nm		{ FLAGS = NODIRECT };
+	sdssc_cm_sr_nm2nid		{ FLAGS = NODIRECT };
+	sdssc_convert_cluster_path	{ FLAGS = NODIRECT };
+	sdssc_convert_ctd_path		{ FLAGS = NODIRECT };
+	sdssc_convert_path_free		{ FLAGS = NODIRECT };
+	sdssc_create_begin		{ FLAGS = NODIRECT };
+	sdssc_create_end		{ FLAGS = NODIRECT };
+	sdssc_delete_begin		{ FLAGS = NODIRECT };
+	sdssc_delete_end		{ FLAGS = NODIRECT };
+	sdssc_delete_hosts		{ FLAGS = NODIRECT };
+	sdssc_free_mdcerr_list		{ FLAGS = NODIRECT };
+	sdssc_freenodelist		{ FLAGS = NODIRECT };
+	sdssc_get_index			{ FLAGS = NODIRECT };
+	sdssc_getnodelist		{ FLAGS = NODIRECT };
+	sdssc_get_primary_host		{ FLAGS = NODIRECT };
+	sdssc_get_priv_ipaddr		{ FLAGS = NODIRECT };
+	sdssc_get_services		{ FLAGS = NODIRECT };
+	sdssc_get_services_free		{ FLAGS = NODIRECT };
+	sdssc_gettransportbynode	{ FLAGS = NODIRECT };
+	sdssc_mo_create_begin		{ FLAGS = NODIRECT };
+	sdssc_notify_service		{ FLAGS = NODIRECT };
+	sdssc_property_get		{ FLAGS = NODIRECT };
+	sdssc_property_set		{ FLAGS = NODIRECT };
+	sdssc_suspend			{ FLAGS = NODIRECT };
+	sdssc_version			{ FLAGS = NODIRECT };
 	setdevstamp;
 	setdup;
 	set_snarf;
--- a/usr/src/lib/lvm/libpreen/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/lvm/libpreen/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	preen_build_devs;
     local:
@@ -46,8 +47,8 @@
 
 # External interface requirements
 
-{
+SYMBOL_SCOPE {
     global:
-	preen_addunit =	EXTERN;
-	preen_subdev =	EXTERN;
+	preen_addunit	{ FLAGS = EXTERN };
+	preen_subdev	{ FLAGS = EXTERN };
 };
--- a/usr/src/lib/lvm/libsvm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/lvm/libsvm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	svm_alloc;
 	svm_check;
--- a/usr/src/lib/mpapi/libmpapi/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/mpapi/libmpapi/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.0 {
     global:
 	MP_GetLibraryProperties;
 	MP_GetPluginOidList;
--- a/usr/src/lib/mpapi/libmpscsi_vhci/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/mpapi/libmpscsi_vhci/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	Initialize;
 	Terminate;
@@ -90,7 +91,7 @@
 	*;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 	    init_sysevents;
 	    log;
--- a/usr/src/lib/nametoaddr/straddr/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/nametoaddr/straddr/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_2.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_2.1 {
     global:
 	_netdir_getbyaddr;
 	_netdir_getbyname;
--- a/usr/src/lib/ncad_addr/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/ncad_addr/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,10 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY =	ncad_addr.a
@@ -33,8 +30,6 @@
 
 SRCDIR =	../common
 
-MAPFILES +=	mapfile-vers
-
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lnsl
 CFLAGS +=	$(CCVERBOSE)
--- a/usr/src/lib/ncad_addr/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	# Bind is intended to interpose on the real system call. However,
-	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
-	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
-	bind = NODYNSORT;
-};
--- a/usr/src/lib/ncad_addr/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/ncad_addr/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,44 +36,66 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 # The following version madness was mistakenly inherited from
 # libsocket in Solaris 9, when this library was created.
 # See the isa-specific mapfiles for the contents of SUNW_0.7
 
-SUNW_1.4 {		# SunOS 5.9 (Solaris 9)
+SYMBOL_VERSION SUNW_1.4 {		# SunOS 5.9 (Solaris 9)
     global:
 	SUNW_1.4;
 } SUNW_1.3;
 
-SUNW_1.3 {
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	SUNW_1.3;
 } SUNW_1.2;
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.7;
 
+#
+# For most platforms, SUNW_0.7 contains bind. For ABI reasons, 32-bit sparc
+# puts it in SISCD_2.3 instead, and SUNW_0.7 exists solely so that 1.1 can
+# inherit from it on all platforms.
+#
+SYMBOL_VERSION SUNW_0.7 {
+    global:
+$if _sparc && _ELF32
+	SUNW_0.7;
+} SISCD_2.3;
+
+SYMBOL_VERSION SISCD_2.3 {
+    global:
+$endif
+	# Bind is intended to interpose on the real system call. However,
+	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
+	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
+	bind			{ FLAGS = NODYNSORT };
+};
+
 # There really should be only one SUNWprivate version.
 # Don't add any more.  Add new private symbols to SUNWprivate_1.3
 
-SUNWprivate_1.3 {
+SYMBOL_VERSION SUNWprivate_1.3 {
     global:
 	SUNWprivate_1.3;
 } SUNWprivate_1.2;
 
-SUNWprivate_1.2 {
+SYMBOL_VERSION SUNWprivate_1.2 {
     global:
 	SUNWprivate_1.2;
 } SUNWprivate_1.1;
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/ncad_addr/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	# Bind is intended to interpose on the real system call. However,
-	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
-	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
-	bind = NODYNSORT;
-};
--- a/usr/src/lib/ncad_addr/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	SUNW_0.7;
-} SISCD_2.3;
-
-SISCD_2.3 {
-    global:
-	# Bind is intended to interpose on the real system call. However,
-	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
-	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
-	bind = NODYNSORT;
-};
--- a/usr/src/lib/ncad_addr/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_0.7 {
-    global:
-	# Bind is intended to interpose on the real system call. However,
-	# we want debuggers to see its real name (nca_bind), so use NODYNSORT
-	# to prevent "bind" from going into the ELF .SUNW_dynsymsort section
-	bind = NODYNSORT;
-};
--- a/usr/src/lib/nsswitch/ad/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/nsswitch/ad/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
 	global:
 		_nss_ad_passwd_constr;
 		_nss_ad_shadow_constr;
--- a/usr/src/lib/nsswitch/compat/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/nsswitch/compat/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -39,7 +38,9 @@
 #
 
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		_nss_compat_audit_user_constr;
 		_nss_compat_group_constr;
--- a/usr/src/lib/nsswitch/dns/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/nsswitch/dns/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -40,7 +39,9 @@
 # Generic interface definition for usr/src/lib/nsswitch/dns.
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		_nss_dns_hosts_constr;
 		_nss_dns_ipnodes_constr;
--- a/usr/src/lib/nsswitch/files/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/nsswitch/files/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -40,7 +39,9 @@
 # Generic interface definition for usr/src/lib/nsswitch/files.
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		_nss_files_bootparams_constr;
 		_nss_files_auth_attr_constr;
--- a/usr/src/lib/nsswitch/ldap/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/nsswitch/ldap/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,11 +35,13 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Generic interface definition for usr/src/lib/nsswitch/ldap.
 #
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		_nss_ldap_audit_user_constr;
 		_nss_ldap_auth_attr_constr;
--- a/usr/src/lib/nsswitch/mdns/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/nsswitch/mdns/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,11 +37,13 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Generic interface definition for usr/src/lib/nsswitch/mdns.
 #
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		_nss_mdns_hosts_constr;
 		_nss_mdns_ipnodes_constr;
--- a/usr/src/lib/nsswitch/nis/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/nsswitch/nis/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -40,7 +39,9 @@
 # Generic interface definition for usr/src/lib/nsswitch/nis.
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		_nss_nis_bootparams_constr;
 		_nss_nis_auth_attr_constr;
--- a/usr/src/lib/nsswitch/user/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/nsswitch/user/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -40,7 +39,9 @@
 # Generic interface definition for usr/src/lib/nsswitch/user.
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		_nss_user_printers_constr;
 		_nss_user__printers_constr;
--- a/usr/src/lib/pam_modules/allow/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/allow/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_acct_mgmt;
 	pam_sm_authenticate;
--- a/usr/src/lib/pam_modules/authtok_check/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/authtok_check/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_chauthtok;
     local:
--- a/usr/src/lib/pam_modules/authtok_get/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/authtok_get/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_authenticate;
 	pam_sm_chauthtok;
--- a/usr/src/lib/pam_modules/authtok_store/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/authtok_store/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_chauthtok;
     local:
--- a/usr/src/lib/pam_modules/deny/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/deny/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_acct_mgmt;
 	pam_sm_authenticate;
--- a/usr/src/lib/pam_modules/dhkeys/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/dhkeys/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_authenticate;
 	pam_sm_chauthtok;
--- a/usr/src/lib/pam_modules/dial_auth/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/dial_auth/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_authenticate;
 	pam_sm_setcred;
--- a/usr/src/lib/pam_modules/krb5/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/krb5/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_acct_mgmt;
 	pam_sm_authenticate;
--- a/usr/src/lib/pam_modules/krb5_migrate/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/krb5_migrate/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_authenticate;
 	pam_sm_setcred;
--- a/usr/src/lib/pam_modules/ldap/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/ldap/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_acct_mgmt;
 	pam_sm_authenticate;
--- a/usr/src/lib/pam_modules/list/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/list/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_acct_mgmt;
     local:
--- a/usr/src/lib/pam_modules/passwd_auth/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/passwd_auth/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_authenticate;
 	pam_sm_setcred;
--- a/usr/src/lib/pam_modules/rhosts_auth/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/rhosts_auth/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_authenticate;
 	pam_sm_setcred;
--- a/usr/src/lib/pam_modules/roles/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/roles/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_acct_mgmt;
     local:
--- a/usr/src/lib/pam_modules/sample/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/sample/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_acct_mgmt;
 	pam_sm_authenticate;
--- a/usr/src/lib/pam_modules/smb/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/smb/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_chauthtok;
     local:
--- a/usr/src/lib/pam_modules/smbfs/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/smbfs/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_authenticate;
 	pam_sm_setcred;
--- a/usr/src/lib/pam_modules/tsol_acct/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/tsol_acct/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_acct_mgmt;
     local:
--- a/usr/src/lib/pam_modules/unix_account/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/unix_account/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_acct_mgmt;
     local:
--- a/usr/src/lib/pam_modules/unix_auth/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/unix_auth/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_authenticate;
 	pam_sm_setcred;
--- a/usr/src/lib/pam_modules/unix_cred/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/unix_cred/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_authenticate;
 	pam_sm_setcred;
--- a/usr/src/lib/pam_modules/unix_session/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pam_modules/unix_session/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	pam_sm_close_session;
 	pam_sm_open_session;
--- a/usr/src/lib/passwdutil/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/passwdutil/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	__check_history;
 	__get_authtoken_attr;
--- a/usr/src/lib/pkcs11/libkcfd/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pkcs11/libkcfd/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,75 +36,279 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
-	C_CancelFunction = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_CloseAllSessions = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_CloseSession = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_CopyObject = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_CreateObject = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_Decrypt = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DecryptDigestUpdate = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DecryptFinal = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DecryptInit = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DecryptUpdate = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DecryptVerifyUpdate = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DeriveKey = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DestroyObject = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_Digest = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DigestEncryptUpdate = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DigestFinal = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DigestInit = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DigestKey = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_DigestUpdate = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_Encrypt = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_EncryptFinal = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_EncryptInit = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_EncryptUpdate = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_Finalize = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_FindObjects = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_FindObjectsFinal = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_FindObjectsInit = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GenerateKey = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GenerateKeyPair = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GenerateRandom = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetAttributeValue = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetFunctionList = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetFunctionStatus = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetInfo = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetMechanismInfo = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetMechanismList = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetObjectSize = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetOperationState = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetSessionInfo = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetSlotInfo = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetSlotList = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_GetTokenInfo = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_Initialize = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_InitPIN = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_InitToken = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_Login = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_Logout = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_OpenSession = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_SeedRandom = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_SetAttributeValue = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_SetOperationState = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_SetPIN = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_Sign = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_SignEncryptUpdate = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_SignFinal = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_SignInit = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_SignRecover = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_SignRecoverInit = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_UnwrapKey = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_Verify = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_VerifyFinal = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_VerifyInit = FUNCTION FILTER pkcs11_softtoken.so.1;
-    	C_VerifyRecover = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_VerifyRecoverInit = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_VerifyUpdate = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_WaitForSlotEvent = FUNCTION FILTER pkcs11_softtoken.so.1;
-	C_WrapKey = FUNCTION FILTER pkcs11_softtoken.so.1;
+	C_CancelFunction {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_CloseAllSessions {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_CloseSession {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_CopyObject {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_CreateObject {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_Decrypt {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DecryptDigestUpdate {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DecryptFinal {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DecryptInit {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DecryptUpdate {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DecryptVerifyUpdate {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DeriveKey {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DestroyObject {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_Digest {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DigestEncryptUpdate {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DigestFinal {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DigestInit {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DigestKey {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_DigestUpdate {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_Encrypt {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_EncryptFinal {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_EncryptInit {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_EncryptUpdate {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_Finalize {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_FindObjects {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_FindObjectsFinal {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_FindObjectsInit {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GenerateKey {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GenerateKeyPair {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GenerateRandom {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetAttributeValue {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetFunctionList {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetFunctionStatus {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetInfo {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetMechanismInfo {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetMechanismList {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetObjectSize {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetOperationState {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetSessionInfo {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetSlotInfo {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetSlotList {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_GetTokenInfo {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_Initialize {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_InitPIN {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_InitToken {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_Login {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_Logout {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_OpenSession {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_SeedRandom {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_SetAttributeValue {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_SetOperationState {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_SetPIN {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_Sign {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_SignEncryptUpdate {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_SignFinal {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_SignInit {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_SignRecover {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_SignRecoverInit {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_UnwrapKey {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_Verify {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_VerifyFinal {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_VerifyInit {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+    	C_VerifyRecover {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_VerifyRecoverInit {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_VerifyUpdate {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_WaitForSlotEvent {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+	C_WrapKey {
+		TYPE = FUNCTION;
+		FILTER = pkcs11_softtoken.so.1;
+	};
+
     local:
 	*;
 };
--- a/usr/src/lib/pkcs11/libpkcs11/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pkcs11/libpkcs11/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	C_CancelFunction;
 	C_CloseAllSessions;
@@ -113,7 +114,7 @@
 	*;
 };
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
     global:
 	pkcs11_GetCriteriaSession;
 	pkcs11_ObjectToKey;
--- a/usr/src/lib/pkcs11/libsoftcrypto/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pkcs11/libsoftcrypto/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -38,7 +38,9 @@
 #
 
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	aes_alloc_keysched;
 	aes_copy_block;
--- a/usr/src/lib/pkcs11/libsoftcrypto/sun4u/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pkcs11/libsoftcrypto/sun4u/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -37,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
         aes_alloc_keysched;
 	aes_decrypt_contiguous_blocks;
--- a/usr/src/lib/pkcs11/libsoftcrypto/sun4v/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pkcs11/libsoftcrypto/sun4v/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -38,7 +38,9 @@
 #
 
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	arcfour_crypt;
 	arcfour_key_init;
--- a/usr/src/lib/pkcs11/pkcs11_kernel/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	C_CancelFunction;
 	C_CloseAllSessions;
@@ -109,7 +110,7 @@
 	C_WrapKey;
 };
 
-SUNWprivate {
+SYMBOL_VERSION SUNWprivate {
     global:
 	_SUNW_GetThreshold;
     local:
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	C_CancelFunction;
 	C_CloseAllSessions;
--- a/usr/src/lib/pkcs11/pkcs11_tpm/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # MAPFILE HEADER START
 #
@@ -34,7 +33,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	C_CancelFunction;
 	C_CloseAllSessions;
--- a/usr/src/lib/policykit/libpolkit/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/policykit/libpolkit/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	libpolkit_new_context;
 	libpolkit_free_context;
@@ -47,7 +48,7 @@
 	libpolkit_get_allowed_resources_for_privilege_for_uid;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/lib/print/libhttp-core/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/print/libhttp-core/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -47,7 +46,9 @@
 # PAPI implementations.
 #
 
-SUNWprivate_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.0 {
     global:
 	httpCheck ;
 	httpClose ;
--- a/usr/src/lib/print/libipp-core/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/print/libipp-core/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -42,12 +41,14 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Common interfaces that are most likely to be shared amongst the various
 # PAPI implementations.
 #
 
-SUNWprivate_1.0 {
+SYMBOL_VERSION SUNWprivate_1.0 {
     global:
 	ipp_read_message ;
 	ipp_write_message ;
--- a/usr/src/lib/print/libipp-listener/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/print/libipp-listener/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -42,7 +41,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.0 {
 	global:
 		ipp_configure_operation;
 		ipp_process_request;
--- a/usr/src/lib/print/libpapi-common/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/print/libpapi-common/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -42,12 +41,14 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Common interfaces that are most likely to be shared amongst the various
 # PAPI implementations.
 #
 
-SUNW_1.0 {
+SYMBOL_VERSION SUNW_1.0 {
     global:
 	# PAPI Attribute Calls
         papiAttributeListAddValue;
@@ -76,58 +77,58 @@
         papiAttributeListFree;
 
 	# PAPI Service Calls
-        papiServiceCreate =		NODYNSORT;
-        papiServiceDestroy =		NODYNSORT;
-        papiServiceSetUserName =	NODYNSORT;
-        papiServiceSetPassword =	NODYNSORT;
-        papiServiceSetEncryption =	NODYNSORT;
-        papiServiceSetAuthCB =		NODYNSORT;
-        papiServiceSetAppData =		NODYNSORT;
-        papiServiceGetUserName =	NODYNSORT;
-        papiServiceGetPassword =	NODYNSORT;
+        papiServiceCreate		{ FLAGS = NODYNSORT };
+        papiServiceDestroy		{ FLAGS = NODYNSORT };
+        papiServiceSetUserName		{ FLAGS = NODYNSORT };
+        papiServiceSetPassword		{ FLAGS = NODYNSORT };
+        papiServiceSetEncryption	{ FLAGS = NODYNSORT };
+        papiServiceSetAuthCB		{ FLAGS = NODYNSORT };
+        papiServiceSetAppData		{ FLAGS = NODYNSORT };
+        papiServiceGetUserName		{ FLAGS = NODYNSORT };
+        papiServiceGetPassword		{ FLAGS = NODYNSORT };
         papiServiceGetEncryption;
-        papiServiceGetAppData =		NODYNSORT;
-        papiServiceGetServiceName =	NODYNSORT;
-        papiServiceGetAttributeList =	NODYNSORT;
-        papiServiceGetStatusMessage =	NODYNSORT;
+        papiServiceGetAppData		{ FLAGS = NODYNSORT };
+        papiServiceGetServiceName	{ FLAGS = NODYNSORT };
+        papiServiceGetAttributeList	{ FLAGS = NODYNSORT };
+        papiServiceGetStatusMessage	{ FLAGS = NODYNSORT };
 
 	# PAPI Printer Calls
-        papiPrintersList =		NODYNSORT;
-        papiPrinterQuery =		NODYNSORT;
-        papiPrinterAdd =		NODYNSORT;
-        papiPrinterModify =		NODYNSORT;
-        papiPrinterRemove =		NODYNSORT;
-        papiPrinterDisable =		NODYNSORT;
-        papiPrinterEnable =		NODYNSORT;
-        papiPrinterPause =		NODYNSORT;
-        papiPrinterResume =		NODYNSORT;
-        papiPrinterPurgeJobs =		NODYNSORT;
-        papiPrinterListJobs =		NODYNSORT;
-        papiPrinterGetAttributeList =	NODYNSORT;
-        papiPrinterFree =		NODYNSORT;
-        papiPrinterListFree =		NODYNSORT;
+        papiPrintersList		{ FLAGS = NODYNSORT };
+        papiPrinterQuery		{ FLAGS = NODYNSORT };
+        papiPrinterAdd			{ FLAGS = NODYNSORT };
+        papiPrinterModify		{ FLAGS = NODYNSORT };
+        papiPrinterRemove		{ FLAGS = NODYNSORT };
+        papiPrinterDisable		{ FLAGS = NODYNSORT };
+        papiPrinterEnable		{ FLAGS = NODYNSORT };
+        papiPrinterPause		{ FLAGS = NODYNSORT };
+        papiPrinterResume		{ FLAGS = NODYNSORT };
+        papiPrinterPurgeJobs		{ FLAGS = NODYNSORT };
+        papiPrinterListJobs		{ FLAGS = NODYNSORT };
+        papiPrinterGetAttributeList	{ FLAGS = NODYNSORT };
+        papiPrinterFree			{ FLAGS = NODYNSORT };
+        papiPrinterListFree		{ FLAGS = NODYNSORT };
 
 	# PAPI Job Calls
-        papiJobSubmit =			NODYNSORT;
-        papiJobSubmitByReference =	NODYNSORT;
-        papiJobValidate =		NODYNSORT;
-        papiJobStreamOpen =		NODYNSORT;
-        papiJobStreamWrite =		NODYNSORT;
-        papiJobStreamClose =		NODYNSORT;
-        papiJobQuery =			NODYNSORT;
-        papiJobModify =			NODYNSORT;
-        papiJobMove =			NODYNSORT;
-        papiJobCancel =			NODYNSORT;
-        papiJobHold =			NODYNSORT;
-        papiJobRelease =		NODYNSORT;
-        papiJobRestart =		NODYNSORT;
-        papiJobPromote =		NODYNSORT;
-        papiJobGetAttributeList =	NODYNSORT;
-        papiJobGetPrinterName =		NODYNSORT;
+        papiJobSubmit			{ FLAGS = NODYNSORT };
+        papiJobSubmitByReference	{ FLAGS = NODYNSORT };
+        papiJobValidate			{ FLAGS = NODYNSORT };
+        papiJobStreamOpen		{ FLAGS = NODYNSORT };
+        papiJobStreamWrite		{ FLAGS = NODYNSORT };
+        papiJobStreamClose		{ FLAGS = NODYNSORT };
+        papiJobQuery			{ FLAGS = NODYNSORT };
+        papiJobModify			{ FLAGS = NODYNSORT };
+        papiJobMove			{ FLAGS = NODYNSORT };
+        papiJobCancel			{ FLAGS = NODYNSORT };
+        papiJobHold			{ FLAGS = NODYNSORT };
+        papiJobRelease			{ FLAGS = NODYNSORT };
+        papiJobRestart			{ FLAGS = NODYNSORT };
+        papiJobPromote			{ FLAGS = NODYNSORT };
+        papiJobGetAttributeList		{ FLAGS = NODYNSORT };
+        papiJobGetPrinterName		{ FLAGS = NODYNSORT };
         papiJobGetId;
-        papiJobGetJobTicket =		NODYNSORT;
-        papiJobFree =			NODYNSORT;
-        papiJobListFree =		NODYNSORT;
+        papiJobGetJobTicket		{ FLAGS = NODYNSORT };
+        papiJobFree			{ FLAGS = NODYNSORT };
+        papiJobListFree			{ FLAGS = NODYNSORT };
 
 	# Misc. PAPI Calls
         papiStatusString;
@@ -135,12 +136,12 @@
         papiLibrarySupportedCalls;
 };
 
-SUNWprivate_1.0 { # Misc. semi-private supporting calls
+SYMBOL_VERSION SUNWprivate_1.0 { # Misc. semi-private supporting calls
     global:
-        papiServiceSetPeer =		NODYNSORT;
-        papiJobCreate =			NODYNSORT;
-        papiJobStreamAdd =		NODYNSORT;
-        papiJobCommit =			NODYNSORT;
+        papiServiceSetPeer		{ FLAGS = NODYNSORT };
+        papiJobCreate			{ FLAGS = NODYNSORT };
+        papiJobStreamAdd		{ FLAGS = NODYNSORT };
+        papiJobCommit			{ FLAGS = NODYNSORT };
 
 	#     URI
         uri_from_string;
@@ -153,7 +154,7 @@
         list_concatenate;
 
 	#	NS
-	getprinterbyname =		NODYNSORT;
+	getprinterbyname		{ FLAGS = NODYNSORT };
 
 	#    extra Attribute Calls
         copy_attributes;
--- a/usr/src/lib/print/libpapi-dynamic/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/print/libpapi-dynamic/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -42,38 +41,112 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Common interfaces that are most likely to be shared amongst the various
 # PAPI implementations.
 #
 
-SUNW_1.0 {
+SYMBOL_VERSION SUNW_1.0 {
     global:
 	# PAPI Attribute Calls
-	papiAttributeListAddValue  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddBoolean  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddCollection  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddDatetime  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddInteger  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddMetadata  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddRange  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddResolution  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListDelete  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetValue  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetNext  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListFind  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetBoolean  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetCollection  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetDatetime  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetInteger  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetMetadata  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetRange  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetResolution  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListFromString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListToString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListFree  = FUNCTION FILTER libpapi-common.so ;
+	papiAttributeListAddValue {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddBoolean {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddCollection {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddDatetime {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddInteger {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddMetadata {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddRange {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddResolution {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListDelete {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetValue {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetNext {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListFind {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetBoolean {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetCollection {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetDatetime {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetInteger {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetMetadata {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetRange {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetResolution {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListFromString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListToString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListFree {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
 	# PAPI Service Calls
         papiServiceCreate ;
@@ -130,12 +203,21 @@
         papiJobListFree ;
 
 	# Misc. PAPI Calls
-	papiStatusString  = FUNCTION FILTER libpapi-common.so ;
-	papiLibrarySupportedCall  = FUNCTION FILTER libpapi-common.so ;
-	papiLibrarySupportedCalls  = FUNCTION FILTER libpapi-common.so ;
+	papiStatusString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiLibrarySupportedCall {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiLibrarySupportedCalls {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 };
 
-SUNWprivate_1.0 {
+SYMBOL_VERSION SUNWprivate_1.0 {
     global:
         papiServiceSetPeer ;	# extension
         papiJobCreate ;
@@ -144,24 +226,54 @@
 
 	# Misc. supporting calls
 	#     URI
-	uri_from_string  = FUNCTION FILTER libpapi-common.so ;
-	uri_to_string  = FUNCTION FILTER libpapi-common.so ;
-	uri_free  = FUNCTION FILTER libpapi-common.so ;
+	uri_from_string {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	uri_to_string {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	uri_free {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 	#    list
-	list_remove  = FUNCTION FILTER libpapi-common.so ;
-	list_append  = FUNCTION FILTER libpapi-common.so ;
-	list_concatenate  = FUNCTION FILTER libpapi-common.so ;
+	list_remove {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	list_append {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	list_concatenate {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 	#    NS
 	getprinterbyname ;
-	is_localhost  = FUNCTION FILTER libpapi-common.so ;
+	is_localhost {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
 	#    extra Attribute Calls
-	copy_attributes  = FUNCTION FILTER libpapi-common.so ;
-	split_and_copy_attributes  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListPrint  = FUNCTION FILTER libpapi-common.so ;
+	copy_attributes {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	split_and_copy_attributes {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListPrint {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
     local:
         * ;
 } ;
 
-FSG_1.0 {} SUNW_1.0;
+SYMBOL_VERSION FSG_1.0 {} SUNW_1.0;
--- a/usr/src/lib/print/libpapi-ipp/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/print/libpapi-ipp/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -42,38 +41,112 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Common interfaces that are most likely to be shared amongst the various
 # PAPI implementations.
 #
 
-SUNW_1.0 {
+SYMBOL_VERSION SUNW_1.0 {
     global:
 	# PAPI Attribute Calls
-	papiAttributeListAddValue  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddBoolean  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddCollection  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddDatetime  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddInteger  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddMetadata  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddRange  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddResolution  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListDelete  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetValue  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetNext  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListFind  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetBoolean  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetCollection  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetDatetime  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetInteger  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetMetadata  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetRange  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetResolution  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListFromString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListToString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListFree  = FUNCTION FILTER libpapi-common.so ;
+	papiAttributeListAddValue {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddBoolean {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddCollection {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddDatetime {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddInteger {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddMetadata {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddRange {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddResolution {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListDelete {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetValue {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetNext {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListFind {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetBoolean {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetCollection {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetDatetime {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetInteger {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetMetadata {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetRange {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetResolution {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListFromString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListToString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListFree {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
 	# PAPI Service Calls
         papiServiceCreate ;
@@ -130,35 +203,89 @@
         papiJobListFree ;
 
 	# Misc. PAPI Calls
-	papiStatusString  = FUNCTION FILTER libpapi-common.so ;
-	papiLibrarySupportedCall  = FUNCTION FILTER libpapi-common.so ;
-	papiLibrarySupportedCalls  = FUNCTION FILTER libpapi-common.so ;
-};
+	papiStatusString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiLibrarySupportedCall {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiLibrarySupportedCalls {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+} ;
 
-SUNWprivate_1.0 {
+SYMBOL_VERSION SUNWprivate_1.0 {
     global:
-	papiServiceSetPeer  = FUNCTION FILTER libpapi-common.so ;
-	papiJobCreate  = FUNCTION FILTER libpapi-common.so ;
-	papiJobStreamAdd  = FUNCTION FILTER libpapi-common.so ;
-	papiJobCommit  = FUNCTION FILTER libpapi-common.so ;
+	papiServiceSetPeer {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobCreate {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobStreamAdd {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobCommit {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
 	# Misc. supporting calls
 	#     URI
-	uri_from_string  = FUNCTION FILTER libpapi-common.so ;
-	uri_to_string  = FUNCTION FILTER libpapi-common.so ;
-	uri_free  = FUNCTION FILTER libpapi-common.so ;
+	uri_from_string {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	uri_to_string {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	uri_free {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 	#    list
-	list_remove  = FUNCTION FILTER libpapi-common.so ;
-	list_append  = FUNCTION FILTER libpapi-common.so ;
-	list_concatenate  = FUNCTION FILTER libpapi-common.so ;
+	list_remove {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	list_append {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	list_concatenate {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 	#    NS
-	getprinterbyname  = FUNCTION FILTER libpapi-common.so ;
-	is_localhost  = FUNCTION FILTER libpapi-common.so ;
+	getprinterbyname {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	is_localhost {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
 	#    extra Attribute Calls
-	copy_attributes  = FUNCTION FILTER libpapi-common.so ;
-	split_and_copy_attributes  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListPrint  = FUNCTION FILTER libpapi-common.so ;
+	copy_attributes {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	split_and_copy_attributes {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListPrint {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
     local:
         * ;
--- a/usr/src/lib/print/libpapi-lpd/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/print/libpapi-lpd/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -42,38 +41,112 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Common interfaces that are most likely to be shared amongst the various
 # PAPI implementations.
 #
 
-SUNW_1.0 {
+SYMBOL_VERSION SUNW_1.0 {
     global:
 	# PAPI Attribute Calls
-	papiAttributeListAddValue  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddBoolean  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddCollection  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddDatetime  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddInteger  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddMetadata  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddRange  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddResolution  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListAddString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListDelete  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetValue  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetNext  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListFind  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetBoolean  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetCollection  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetDatetime  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetInteger  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetMetadata  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetRange  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetResolution  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListGetString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListFromString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListToString  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListFree  = FUNCTION FILTER libpapi-common.so ;
+	papiAttributeListAddValue {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddBoolean {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddCollection {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddDatetime {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddInteger {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddMetadata {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddRange {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddResolution {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListAddString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListDelete {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetValue {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetNext {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListFind {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetBoolean {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetCollection {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetDatetime {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetInteger {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetMetadata {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetRange {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetResolution {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListGetString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListFromString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListToString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListFree {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
 	# PAPI Service Calls
         papiServiceCreate ;
@@ -92,11 +165,23 @@
         papiServiceGetStatusMessage ;
 
 	# PAPI Printer Calls
-	papiPrintersList  = FUNCTION FILTER libpapi-common.so ;
+	papiPrintersList {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
         papiPrinterQuery ;
-	papiPrinterAdd  = FUNCTION FILTER libpapi-common.so ;
-	papiPrinterModify  = FUNCTION FILTER libpapi-common.so ;
-	papiPrinterRemove  = FUNCTION FILTER libpapi-common.so ;
+	papiPrinterAdd {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiPrinterModify {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiPrinterRemove {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 	papiPrinterDisable ;
 	papiPrinterEnable ;
 	papiPrinterPause ;
@@ -110,55 +195,127 @@
 	# PAPI Job Calls
         papiJobSubmit ;
         papiJobSubmitByReference ;
-	papiJobValidate  = FUNCTION FILTER libpapi-common.so ;
+	papiJobValidate {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
         papiJobStreamOpen ;
         papiJobStreamWrite ;
         papiJobStreamClose ;
         papiJobQuery ;
-	papiJobModify  = FUNCTION FILTER libpapi-common.so ;
-	papiJobMove  = FUNCTION FILTER libpapi-common.so ;
+	papiJobModify {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobMove {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
         papiJobCancel ;
-	papiJobHold  = FUNCTION FILTER libpapi-common.so ;
-	papiJobRelease  = FUNCTION FILTER libpapi-common.so ;
-	papiJobRestart  = FUNCTION FILTER libpapi-common.so ;
-	papiJobPromote  = FUNCTION FILTER libpapi-common.so ;
+	papiJobHold {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobRelease {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobRestart {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobPromote {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
         papiJobGetAttributeList ;
         papiJobGetPrinterName ;
         papiJobGetId ;
-	papiJobGetJobTicket  = FUNCTION FILTER libpapi-common.so ;
+	papiJobGetJobTicket {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
         papiJobFree ;
         papiJobListFree ;
 
 	# Misc. PAPI Calls
-	papiStatusString  = FUNCTION FILTER libpapi-common.so ;
+	papiStatusString {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
         papiLibrarySupportedCall ;
         papiLibrarySupportedCalls ;
-};
+} ;
 
-SUNWprivate_1.0 {
+SYMBOL_VERSION SUNWprivate_1.0 {
     global:
-	papiServiceSetPeer  = FUNCTION FILTER libpapi-common.so ;
-	papiJobCreate  = FUNCTION FILTER libpapi-common.so ;
-	papiJobStreamAdd  = FUNCTION FILTER libpapi-common.so ;
-	papiJobCommit  = FUNCTION FILTER libpapi-common.so ;
+	papiServiceSetPeer {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobCreate {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobStreamAdd {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiJobCommit {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
 	# Misc. supporting calls
 	#     URI
-	uri_from_string  = FUNCTION FILTER libpapi-common.so ;
-	uri_to_string  = FUNCTION FILTER libpapi-common.so ;
-	uri_free  = FUNCTION FILTER libpapi-common.so ;
+	uri_from_string {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	uri_to_string {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	uri_free {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 	#    list
-	list_remove  = FUNCTION FILTER libpapi-common.so ;
-	list_append  = FUNCTION FILTER libpapi-common.so ;
-	list_concatenate  = FUNCTION FILTER libpapi-common.so ;
+	list_remove {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	list_append {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	list_concatenate {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 	#    NS
-	getprinterbyname  = FUNCTION FILTER libpapi-common.so ;
-	is_localhost  = FUNCTION FILTER libpapi-common.so ;
+	getprinterbyname {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	is_localhost {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
 	#    extra Attribute Calls
-	copy_attributes  = FUNCTION FILTER libpapi-common.so ;
-	split_and_copy_attributes  = FUNCTION FILTER libpapi-common.so ;
-	papiAttributeListPrint  = FUNCTION FILTER libpapi-common.so ;
+	copy_attributes {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	split_and_copy_attributes {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
+	papiAttributeListPrint {
+		TYPE = FUNCTION;
+		FILTER = libpapi-common.so;
+	} ;
 
     local:
         * ;
--- a/usr/src/lib/print/libprint/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/print/libprint/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,11 +36,13 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Generic interface definition for usr/src/lib/print.
 #
 
-SUNWprivate_2.1 {
+SYMBOL_VERSION SUNWprivate_2.1 {
 	global:
 		getprinterbyname;		# NSS support
 		getprinterentry;
--- a/usr/src/lib/print/mod_ipp/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/print/mod_ipp/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -42,7 +41,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.0 {
 	global:
 		ipp_module;
 
--- a/usr/src/lib/pyzfs/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/pyzfs/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	initioctl;
     local:
--- a/usr/src/lib/rpcsec_gss/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/rpcsec_gss/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,6 +35,8 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
 #
 # Generic interface definition for usr/src/lib/rpcsec_gss.
 #
@@ -46,17 +47,17 @@
 # present.  This is because applications built on 2.6 Beta 
 # (when it did contain symbols explicitly) may depend on it.
 #
-SUNW_1.2 {	# This empty version MUST BE preserved for 2.6Beta apps
+SYMBOL_VERSION SUNW_1.2 {
 	global:
 		SUNW_1.2;
 } SUNW_1.1;
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
 	global:
 		SUNW_1.1;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		__rpc_gss_seccreate;
 		__rpc_gss_set_defaults;
--- a/usr/src/lib/sasl_plugins/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/sasl_plugins/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	sasl_client_plug_init;
 	sasl_server_plug_init;
--- a/usr/src/lib/scsi/libscsi/libscsi_api.map	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/scsi/libscsi/libscsi_api.map	Thu Jun 24 18:16:42 2010 -0600
@@ -20,30 +20,30 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
+$mapfile_version 2
 
-{
-	libscsi_strerror = FUNCTION extern;
-	libscsi_errname = FUNCTION extern;
-	libscsi_errcode = FUNCTION extern;
-	libscsi_alloc = FUNCTION extern;
-	libscsi_zalloc = FUNCTION extern;
-	libscsi_strdup = FUNCTION extern;
-	libscsi_free = FUNCTION extern;
-	libscsi_set_errno = FUNCTION extern;
-	libscsi_verror = FUNCTION extern;
-	libscsi_error = FUNCTION extern;
-	libscsi_cmd_cdblen = FUNCTION extern;
-	libscsi_action_get_timeout = FUNCTION extern;
-	libscsi_action_get_flags = FUNCTION extern;
-	libscsi_action_get_cdb = FUNCTION extern;
-	libscsi_action_get_buffer = FUNCTION extern;
-	libscsi_action_get_sense = FUNCTION extern;
-	libscsi_action_set_status = FUNCTION extern;
-	libscsi_action_set_datalen = FUNCTION extern;
-	libscsi_action_set_senselen = FUNCTION extern;
-	libscsi_assert = FUNCTION extern;
+SYMBOL_SCOPE {
+	libscsi_strerror		{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_errname			{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_errcode			{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_alloc			{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_zalloc			{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_strdup			{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_free			{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_set_errno		{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_verror			{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_error			{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_cmd_cdblen		{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_action_get_timeout	{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_action_get_flags	{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_action_get_cdb		{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_action_get_buffer	{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_action_get_sense	{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_action_set_status	{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_action_set_datalen	{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_action_set_senselen	{ TYPE	= FUNCTION; FLAGS = extern };
+	libscsi_assert			{ TYPE	= FUNCTION; FLAGS = extern };
 };
--- a/usr/src/lib/scsi/libscsi/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/scsi/libscsi/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		libscsi_init;
 		libscsi_fini;
--- a/usr/src/lib/scsi/libses/libses_api.map	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/scsi/libses/libses_api.map	Thu Jun 24 18:16:42 2010 -0600
@@ -20,51 +20,51 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
+$mapfile_version 2
 
-{
-	ses_close = FUNCTION extern;
-	ses_errno = FUNCTION extern;
-	ses_errmsg = FUNCTION extern;
-	ses_node_child = FUNCTION extern;
-	ses_node_id = FUNCTION extern;
-	ses_node_lookup = FUNCTION extern;
-	ses_node_parent = FUNCTION extern;
-	ses_node_props = FUNCTION extern;
-	ses_node_prev_sibling = FUNCTION extern;
-	ses_node_sibling = FUNCTION extern;
-	ses_node_snapshot = FUNCTION extern;
-	ses_node_target = FUNCTION extern;
-	ses_node_type = FUNCTION extern;
-	ses_open = FUNCTION extern;
-	ses_root_node = FUNCTION extern;
-	ses_scsi_target = FUNCTION extern;
-	ses_snap_primary_enclosure = FUNCTION extern;
-	ses_snap_generation = FUNCTION extern;
-	ses_strerror = FUNCTION extern;
-	ses_walk = FUNCTION extern;
+SYMBOL_SCOPE {
+	ses_close			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_errno			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_errmsg			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_child			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_id			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_lookup			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_parent			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_props			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_prev_sibling		{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_sibling		{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_snapshot		{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_target			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_node_type			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_open			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_root_node			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_scsi_target			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_snap_primary_enclosure	{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_snap_generation		{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_strerror			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_walk			{ TYPE	= FUNCTION; FLAGS = extern };
 
-	nvlist_add_fixed_string = FUNCTION extern;
-	nvlist_add_fixed_string_trunc = FUNCTION extern;
+	nvlist_add_fixed_string		{ TYPE	= FUNCTION; FLAGS = extern };
+	nvlist_add_fixed_string_trunc	{ TYPE	= FUNCTION; FLAGS = extern };
 
-	ses_alloc = FUNCTION extern;
-	ses_assert = FUNCTION extern;
-	ses_error = FUNCTION extern;
-	ses_free = FUNCTION extern;
-	ses_nverror = FUNCTION extern;
-	ses_panic = FUNCTION extern;
-	ses_realloc = FUNCTION extern;
-	ses_set_nverrno = FUNCTION extern;
-	ses_set_errno = FUNCTION extern;
-	ses_strdup = FUNCTION extern;
-	ses_zalloc = FUNCTION extern;
+	ses_alloc			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_assert			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_error			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_free			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_nverror			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_panic			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_realloc			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_set_nverrno			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_set_errno			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_strdup			{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_zalloc			{ TYPE	= FUNCTION; FLAGS = extern };
 
-	ses_plugin_ctlpage_lookup = FUNCTION extern;
-	ses_plugin_page_lookup = FUNCTION extern;
-	ses_plugin_register = FUNCTION extern;
-	ses_plugin_setspecific = FUNCTION extern;
-	ses_plugin_getspecific = FUNCTION extern;
+	ses_plugin_ctlpage_lookup	{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_plugin_page_lookup		{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_plugin_register		{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_plugin_setspecific		{ TYPE	= FUNCTION; FLAGS = extern };
+	ses_plugin_getspecific		{ TYPE	= FUNCTION; FLAGS = extern };
 };
--- a/usr/src/lib/scsi/libses/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/scsi/libses/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
 	global:
 		ses_close;
 		ses_errno;
--- a/usr/src/lib/smbsrv/libmlrpc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/smbsrv/libmlrpc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
         ndr_buf_decode;
         ndr_buf_fini;
--- a/usr/src/lib/smbsrv/libmlsvc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/smbsrv/libmlsvc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	dfs_get_referrals;
 	dfs_info_free;
@@ -48,7 +49,7 @@
 	mlsvc_disconnect;
 	mlsvc_fini;
 	mlsvc_init;
-	mlsvc_join;	
+	mlsvc_join;
 	mlsvc_netlogon;
 	smb_autohome_add;
 	smb_autohome_remove;
--- a/usr/src/lib/smbsrv/libsmb/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/smbsrv/libsmb/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -35,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	bintohex;
 	dfs_referral_query_xdr;
--- a/usr/src/lib/smbsrv/libsmbns/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/smbsrv/libsmbns/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	dyndns_clear_zones;
 	dyndns_start;
--- a/usr/src/lib/smbsrv/libsmbrdr/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/smbsrv/libsmbrdr/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	smbrdr_close_pipe;
 	smbrdr_disconnect;
--- a/usr/src/lib/smhba/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/smhba/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,8 +36,9 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
 
-SUNW_1.1 {
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	HBA_GetVersion;
 	HBA_GetWrapperLibraryAttributes;
--- a/usr/src/lib/storage/liba5k/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/storage/liba5k/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -42,7 +41,9 @@
 # Generic interface definition for usr/src/lib/storage/liba5k.
 #
 
-SUNW_2.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_2.0 {
 	global:
 		l_chk_null_wwn;
 		l_convert_name;
--- a/usr/src/lib/storage/libg_fc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/storage/libg_fc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -41,7 +40,9 @@
 # Generic interface definition for usr/src/lib/storage/libg_fc.
 #
 
-SUNW_2.0 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_2.0 {
 	global:
 		g_device_in_map;
 		g_free_multipath;
--- a/usr/src/lib/sun_fc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/sun_fc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 #
 
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	HBA_RegisterLibrary;
 	HBA_RegisterLibraryV2;
--- a/usr/src/lib/sun_sas/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/sun_sas/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 #
 
 
-SUNWprivate {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	SMHBA_RegisterLibrary;
 	Sun_sasGetNumberOfAdapters;
--- a/usr/src/lib/udapl/libdat/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/udapl/libdat/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	dat_cno_create;
 	dat_cno_free;
--- a/usr/src/lib/udapl/udapl_tavor/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/udapl/udapl_tavor/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-SUNWprivate_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	dapl_cno_create;
 	dapl_cno_free;
--- a/usr/src/lib/watchmalloc/common/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/lib/watchmalloc/common/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,18 +36,20 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
-	calloc = NODIRECT;
-	cfree = NODIRECT;
-	free = NODIRECT;
-	malloc = NODIRECT;
-	memalign = NODIRECT;
-	realloc = NODIRECT;
-	valloc = NODIRECT;
+	calloc			{ FLAGS = NODIRECT };
+	cfree			{ FLAGS = NODIRECT };
+	free			{ FLAGS = NODIRECT };
+	malloc			{ FLAGS = NODIRECT };
+	memalign		{ FLAGS = NODIRECT };
+	realloc			{ FLAGS = NODIRECT };
+	valloc			{ FLAGS = NODIRECT };
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	SUNWprivate_1.1;
     local:
--- a/usr/src/pkg/manifests/developer-linker.mf	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/pkg/manifests/developer-linker.mf	Thu Jun 24 18:16:42 2010 -0600
@@ -72,14 +72,17 @@
 file path=usr/lib/$(ARCH64)/libldstab.so.1
 file path=usr/lib/abi/spec2map mode=0755
 file path=usr/lib/abi/spec2trace mode=0755
-file path=usr/lib/ld/$(ARCH64)/map.above4G mode=0444
-file path=usr/lib/ld/$(ARCH64)/map.below4G mode=0444
+file path=usr/lib/ld/map.above4G mode=0444
+link path=usr/lib/ld/$(ARCH64)/map.above4G target=../map.above4G
+file path=usr/lib/ld/map.below4G mode=0444
+link path=usr/lib/ld/$(ARCH64)/map.below4G target=../map.below4G
 file path=usr/lib/ld/map.bssalign mode=0444
 file path=usr/lib/ld/map.default mode=0444
+link path=usr/lib/ld/$(ARCH64)/map.default target=../map.default
 file path=usr/lib/ld/map.execdata mode=0444
 file path=usr/lib/ld/map.filter mode=0444
 file path=usr/lib/ld/map.noexbss mode=0444
-$(i386_ONLY)file path=usr/lib/ld/map.noexdata mode=0444
+file path=usr/lib/ld/map.noexdata mode=0444
 file path=usr/lib/ld/map.noexstk mode=0444
 file path=usr/lib/ld/map.pagealign mode=0444
 file path=usr/lib/lddstub mode=0555
@@ -108,7 +111,5 @@
 link path=usr/ccs/bin/ld target=../../bin/ld
 link path=usr/ccs/bin/regcmp target=../../bin/regcmp
 link path=usr/ccs/lib/link_audit target=../../lib/link_audit
-$(sparc_ONLY)link path=usr/lib/ld/$(ARCH64)/map.default target=./map.above4G
-$(i386_ONLY)link path=usr/lib/ld/$(ARCH64)/map.default target=./map.below4G
 link path=usr/lib/link_audit/32 target=.
 link path=usr/lib/link_audit/64 target=$(ARCH64)
--- a/usr/src/prototypes/prototype.mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/prototypes/prototype.mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -37,3 +37,6 @@
 # MAPFILE HEADER END
 #
 
+$mapfile_version 2
+
+
--- a/usr/src/psm/stand/boot/sparc/common/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/psm/stand/boot/sparc/common/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -19,18 +19,35 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI" 
+
+$mapfile_version 2
 
-text    = LOAD ?RX V0x130000;
-text    : $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	VADDR = 0x130000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
  
-data    = LOAD ?RWX A0x8;
-data    : $PROGBITS ?AW;
-data    : $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	ALIGN = 0x8;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+};
  
-note    = NOTE;
-note    : $NOTE;
-
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};
--- a/usr/src/psm/stand/bootlst/sparc/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/psm/stand/bootlst/sparc/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,3 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
@@ -21,20 +18,37 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # psm/stand/bootlst/sparc/mapfile
 #
 
-text    = LOAD ?RX V0x100000;
-text    : $PROGBITS ?A!W;
+$mapfile_version 2
+
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	VADDR = 0x100000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
  
-data    = LOAD ?RWX A0x8;
-data    : $PROGBITS ?AW;
-data    : $NOBITS ?AW;
- 
-note    = NOTE;
-note    : $NOTE;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	ALIGN = 0x8;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+ };
+
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};
--- a/usr/src/psm/stand/cpr/sparcv9/sun4u/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/psm/stand/cpr/sparcv9/sun4u/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,13 +1,11 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # 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,14 +20,33 @@
 #
 # CDDL HEADER END
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+$mapfile_version 2
 
-text    = LOAD ?RX V0x100000;
-text    : $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	VADDR = 0x100000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
  
-data    = LOAD ?RWX A0x8;
-data    : $PROGBITS ?AW;
-data    : $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	ALIGN = 0x8;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+};
  
-note    = NOTE;
-note    : $NOTE;
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};
--- a/usr/src/tools/onbld/Checks/Mapfile.py	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/tools/onbld/Checks/Mapfile.py	Thu Jun 24 18:16:42 2010 -0600
@@ -21,8 +21,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -39,10 +38,56 @@
 copy of that file. If you need help, contact a gatekeeper for guidance.
 '''
 
-import sys, CmtBlk
+import re, sys, CmtBlk
 
 MAPFILE = MAPFILE.splitlines()[1:]		# Don't include initial \n
 
 def mapfilechk(fh, filename=None, verbose=False, output=sys.stderr):
-	return CmtBlk.cmtblkchk(fh, 'MAPFILE', MAPFILE, filename=filename,
-				verbose=verbose, output=output)
+	if filename:
+		name = filename
+	else:
+		name = fh.name
+
+	# Verify that the mapfile is using version 2 syntax. Read and discard
+	# comment and empty lines until the first non-empty line is seen.
+	# This line must be '$mapfile_version 2'.
+        CmtRE = re.compile(r'#.*$')
+        LeadingWSRE = re.compile(r'^\s+')
+        VersionRE = re.compile(r'^\$mapfile_version\s+2\s*$')
+	for line in fh:
+		line = CmtRE.sub(r'', line)
+		line = LeadingWSRE.sub(r'', line)
+		if line == '' :
+			continue
+
+		# First non=empty line must be version declaration
+		if not VersionRE.match(line):
+			output.write("Warning: mapfile version 2 syntax"
+				" expected in file %s\n" % name)
+			return 1
+
+		# We have verified version 2 syntax. Exit the loop
+		break
+		
+
+	# If the mapfile contains a SYMBOL_VERSION directive, the file
+	# must include a copy of the MAPFILE warning comment above. The
+	# comment is specific to symbol versioning, so we don't harrass
+	# the authors of mapfiles used exclusively for other purposes.
+        SymVerRE = re.compile(r'^\s*symbol_version\s+', re.IGNORECASE)
+	for line in fh:
+		# If we find a SYMBOL_VERSION, then verify that the comment
+		# is present. The comment usually precedes the mapfile_version
+		# comment and any mapfile directives (including SYMBOL_VERSION),
+		# so we need to rewind the file. This is more efficient than it
+		# might seem: All of these items are near the top of the file,
+		# so not not many lines are read, and file contents are
+		# bufferred.
+		if SymVerRE.match(line):
+			fh.seek(0);
+			return CmtBlk.cmtblkchk(fh, 'MAPFILE', MAPFILE,
+				filename=filename, verbose=verbose,
+				output=output)
+
+	# Comment is not required.
+	return 0
--- a/usr/src/tools/onbld/hgext/cdm.py	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/tools/onbld/hgext/cdm.py	Thu Jun 24 18:16:42 2010 -0600
@@ -30,7 +30,7 @@
 Collapse all your changes into a single changeset	- recommit'''
 
 
-import atexit, os, stat, sys, termios
+import atexit, os, re, stat, sys, termios
 
 #
 # Adjust the load path based on the location of cdm.py and the version
@@ -344,12 +344,22 @@
     exclude = not_check(repo, 'mapfilechk')
     ret = 0
 
+    # We are interested in examining any file that has the following
+    # in its final path segment:
+    #    - Contains the word 'mapfile'
+    #    - Begins with 'map.'
+    #    - Ends with '.map'
+    # We don't want to match unless these things occur in final path segment
+    # because directory names with these strings don't indicate a mapfile.
+    MapfileRE = re.compile(r'.*((mapfile[^/]*)|(/map\.*[^/]*)|(\.map))$',
+    	re.IGNORECASE)
+
     ui.write('Mapfile comment check:\n')
 
     for f, e in filelist:
         if e and e.is_removed():
             continue
-        elif f.find('mapfile') == -1:
+        elif not MapfileRE.match(f):
             continue
         elif (e or opts.get('honour_nots')) and exclude(f):
             ui.status('Skipping %s...\n' % f)
--- a/usr/src/ucblib/libcurses/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/ucblib/libcurses/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	AL;
 	AL_PARM;
@@ -185,7 +186,7 @@
 	XX;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_putchar;
     local:
--- a/usr/src/ucblib/libdbm/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/ucblib/libdbm/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	bitno;
 	blkno;
@@ -57,7 +58,7 @@
 	store;
 };
 
-SUNWprivate_1.1 {
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	calchash;
 	hashinc;
--- a/usr/src/ucblib/librpcsoc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/ucblib/librpcsoc/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,12 +36,14 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	SUNW_1.1;
 } SUNW_0.7;
 
-SUNW_0.7 {
+SYMBOL_VERSION SUNW_0.7 {
     global:
 	clnttcp_create;
 	clntudp_bufcreate;
--- a/usr/src/ucblib/libtermcap/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/ucblib/libtermcap/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.1 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.1 {
     global:
 	BC;
 	ospeed;
--- a/usr/src/ucblib/libucb/Makefile.com	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/ucblib/libucb/Makefile.com	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY=	libucb.a
@@ -79,7 +78,7 @@
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=	$(ROOT)/usr/ucblib/$(MACH64)
 
-MAPFILES =	../port/mapfile-vers mapfile-vers
+MAPFILES =	../port/mapfile-vers
 
 SRCS=		$(PORTGENOBJS:%.o=../port/gen/%.c) \
 		$(PORTSTDIOOBJS:%.o=../port/stdio/%.c) \
--- a/usr/src/ucblib/libucb/amd64/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.1 {
-    global:
-	SUNW_1.1;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	alphasort;
-	bcmp;
-	bcopy;
-	bzero;
-	flock;
-	fopen;
-	fprintf;
-	freopen;
-	fstatfs;
-	ftime;
-	getdtablesize;
-	gethostid;
-	gethostname;
-	getpagesize;
-	getrusage = FUNCTION FILTER libc.so.1;
-	gettimeofday;
-	getwd;
-	index;
-	killpg;
-	mctl;
-	nice;
-	nlist;
-	printf;
-	psignal;
-	rand;
-	readdir;
-	reboot;
-	re_comp;
-	re_exec;
-	rindex;
-	scandir;
-	setbuffer;
-	sethostname;
-	setlinebuf;
-	setpgrp;
-	settimeofday;
-	sigblock;
-	siginterrupt;
-	signal;
-	sigpause;
-	sigsetmask;
-	sigstack;
-	sigvec;
-	sigvechandler;
-	sleep = FUNCTION FILTER libc.so.1;
-	sprintf;
-	srand;
-	statfs;
-	sys_siglist;
-	times;
-	ualarm = FUNCTION FILTER libc.so.1;
-	usignal;
-	usigpause;
-	usleep = FUNCTION FILTER libc.so.1;
-	vfprintf;
-	vprintf;
-	vsprintf;
-	wait3;
-	wait4;
-};
-
-SUNWprivate_1.1 {
-    global:
-};
--- a/usr/src/ucblib/libucb/i386/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.1 {
-    global:
-	alphasort64;
-	fopen64;
-	freopen64;
-	readdir64;
-	scandir64;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	alphasort;
-	bcmp;
-	bcopy;
-	bzero;
-	flock;
-	fopen;
-	fprintf;
-	freopen;
-	fstatfs;
-	ftime;
-	getdtablesize;
-	gethostid;
-	gethostname;
-	getpagesize;
-	getrusage = FUNCTION FILTER libc.so.1;
-	gettimeofday;
-	getwd;
-	index;
-	killpg;
-	longjmp = FUNCTION FILTER libc.so.1;
-	mctl;
-	nice;
-	nlist;
-	printf;
-	psignal;
-	rand;
-	readdir;
-	reboot;
-	re_comp;
-	re_exec;
-	rindex;
-	scandir;
-	setbuffer;
-	sethostname;
-	setjmp = FUNCTION FILTER libc.so.1;
-	setlinebuf;
-	setpgrp;
-	settimeofday;
-	sigblock;
-	siginterrupt;
-	signal;
-	sigpause;
-	sigsetmask;
-	sigstack;
-	sigvec;
-	sigvechandler;
-	sleep = FUNCTION FILTER libc.so.1;
-	sprintf;
-	srand;
-	statfs;
-	sys_siglist;
-	times;
-	ualarm = FUNCTION FILTER libc.so.1;
-	usignal;
-	usigpause;
-	usleep = FUNCTION FILTER libc.so.1;
-	vfprintf;
-	vprintf;
-	vsprintf;
-	wait3;
-	wait4;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_longjmp = FUNCTION FILTER libc.so.1;
-	_setjmp = FUNCTION FILTER libc.so.1;
-	_syscall = FUNCTION FILTER libc.so.1;
-	_times = FUNCTION FILTER libc.so.1;
-};
--- a/usr/src/ucblib/libucb/port/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/ucblib/libucb/port/mapfile-vers	Thu Jun 24 18:16:42 2010 -0600
@@ -19,8 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -37,7 +36,9 @@
 # MAPFILE HEADER END
 #
 
-SUNW_1.3 {
+$mapfile_version 2
+
+SYMBOL_VERSION SUNW_1.3 {
     global:
 	_siguhandler;
 } SUNW_1.2;
@@ -46,12 +47,119 @@
 # no SUNW_1.2 symbols, but the version is now kept as a placeholder.
 # Don't add any symbols to this version.
 
-SUNW_1.2 {
+SYMBOL_VERSION SUNW_1.2 {
     global:
 	SUNW_1.2;
 } SUNW_1.1;
 
-SUNWprivate_1.1 {
+# SUNW_1.1 inherits SUNW_0.7 on all platforms, encapsulating the same
+# set of symbols. However, the assignment of symbol to version varies
+# between platforms:
+#    amd64:  SUNW_1.1 is empty, and SUNW_0.7 contains everything.
+#    i386, sparc: SUNW_1.1 contains 5 largefile API routines, and everything
+#        else in in SUNW_0.7.
+#    sparcv9: Everything is in SUNW_1.1, and SUNW_0.7 is empty
+
+SYMBOL_VERSION SUNW_1.1 {
+    global:
+$if _ELF32		# largefile APIs
+	alphasort64;
+	fopen64;
+	freopen64;
+	readdir64;
+	scandir64;
+$endif
+$if _x86 && _ELF64
+	SUNW_1.1;
+$endif
+$if !(_sparc && _ELF64)
+} SUNW_0.7;
+
+SYMBOL_VERSION SUNW_0.7 {
+$endif
+    global:
+	alphasort;
+	bcmp;
+	bcopy;
+	bzero;
+	flock;
+	fopen;
+	fprintf;
+	freopen;
+	fstatfs;
+	ftime;
+	getdtablesize;
+	gethostid;
+	gethostname;
+	getpagesize;
+	getrusage		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	gettimeofday;
+	getwd;
+	index;
+	killpg;
+	mctl;
+	nice;
+	nlist;
+	printf;
+	psignal;
+	rand;
+	readdir;
+	reboot;
+	re_comp;
+	re_exec;
+	rindex;
+	scandir;
+	setbuffer;
+	sethostname;
+	setlinebuf;
+	setpgrp;
+	settimeofday;
+	sigblock;
+	siginterrupt;
+	signal;
+	sigpause;
+	sigsetmask;
+	sigstack;
+	sigvec;
+	sigvechandler;
+	sleep			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	sprintf;
+	srand;
+	statfs;
+	sys_siglist;
+	times;
+	ualarm			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	usignal;
+	usigpause;
+	usleep			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait3;
+	wait4;
+
+	# The longjmp/setjmp story is complex:
+	# - On sparc, they are supplied by the library
+	# - On 32-bit x86, they are filters on libc
+	# - On amd64, they are not present in this library
+$if _sparc
+	longjmp;
+	setjmp;
+$elif _x86 && _ELF32
+	longjmp			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	setjmp			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+$endif
+
+$if _sparc && _ELF64
+} SUNW_0.7;
+
+SYMBOL_VERSION SUNW_0.7 {
+    global:
+	SUNW_0.7;
+$endif
+};
+
+SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	_doprnt;
 	_getarg;
@@ -67,6 +175,28 @@
 	ucbsigpause;
 	ucbsigsetmask;
 	ucbsigvec;
+
+
+	# Handle per-platform variations
+$if _sparc
+	_longjmp;
+	_setjmp;
+	__sigcleanup;
+$if _ELF32
+	syscall			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+$endif
+$endif
+
+$if _x86 && _ELF32
+	_longjmp		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	_setjmp			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	_syscall		{ TYPE = FUNCTION; FILTER = libc.so.1 };
+	_times			{ TYPE = FUNCTION; FILTER = libc.so.1 };
+$endif
+
+
     local:
 	*;
 };
+
+
--- a/usr/src/ucblib/libucb/sparc/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.1 {
-    global:
-	alphasort64;
-	fopen64;
-	freopen64;
-	readdir64;
-	scandir64;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	alphasort;
-	bcmp;
-	bcopy;
-	bzero;
-	flock;
-	fopen;
-	fprintf;
-	freopen;
-	fstatfs;
-	ftime;
-	getdtablesize;
-	gethostid;
-	gethostname;
-	getpagesize;
-	getrusage = FUNCTION FILTER libc.so.1;
-	gettimeofday;
-	getwd;
-	index;
-	killpg;
-	longjmp;
-	mctl;
-	nice;
-	nlist;
-	printf;
-	psignal;
-	rand;
-	readdir;
-	reboot;
-	re_comp;
-	re_exec;
-	rindex;
-	scandir;
-	setbuffer;
-	sethostname;
-	setjmp;
-	setlinebuf;
-	setpgrp;
-	settimeofday;
-	sigblock;
-	siginterrupt;
-	signal;
-	sigpause;
-	sigsetmask;
-	sigstack;
-	sigvec;
-	sigvechandler;
-	sleep = FUNCTION FILTER libc.so.1;
-	sprintf;
-	srand;
-	statfs;
-	sys_siglist;
-	times;
-	ualarm = FUNCTION FILTER libc.so.1;
-	usignal;
-	usigpause;
-	usleep = FUNCTION FILTER libc.so.1;
-	vfprintf;
-	vprintf;
-	vsprintf;
-	wait3;
-	wait4;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_longjmp;
-	_setjmp;
-	__sigcleanup;
-	syscall = FUNCTION FILTER libc.so.1;
-};
--- a/usr/src/ucblib/libucb/sparcv9/mapfile-vers	Thu Jun 24 17:12:23 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-SUNW_1.1 {
-    global:
-	alphasort;
-	bcmp;
-	bcopy;
-	bzero;
-	flock;
-	fopen;
-	fprintf;
-	freopen;
-	fstatfs;
-	ftime;
-	getdtablesize;
-	gethostid;
-	gethostname;
-	getpagesize;
-	getrusage = FUNCTION FILTER libc.so.1;
-	gettimeofday;
-	getwd;
-	index;
-	killpg;
-	longjmp;
-	mctl;
-	nice;
-	nlist;
-	printf;
-	psignal;
-	rand;
-	readdir;
-	reboot;
-	re_comp;
-	re_exec;
-	rindex;
-	scandir;
-	setbuffer;
-	sethostname;
-	setjmp;
-	setlinebuf;
-	setpgrp;
-	settimeofday;
-	sigblock;
-	siginterrupt;
-	signal;
-	sigpause;
-	sigsetmask;
-	sigstack;
-	sigvec;
-	sigvechandler;
-	sleep = FUNCTION FILTER libc.so.1;
-	sprintf;
-	srand;
-	statfs;
-	sys_siglist;
-	times;
-	ualarm = FUNCTION FILTER libc.so.1;
-	usignal;
-	usigpause;
-	usleep = FUNCTION FILTER libc.so.1;
-	vfprintf;
-	vprintf;
-	vsprintf;
-	wait3;
-	wait4;
-} SUNW_0.7;
-
-SUNW_0.7 {
-    global:
-	SUNW_0.7;
-};
-
-SUNWprivate_1.1 {
-    global:
-	_longjmp;
-	_setjmp;
-	__sigcleanup;
-};
--- a/usr/src/uts/common/ctf/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/common/ctf/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
 		ctf_add_array;
 		ctf_add_const;
--- a/usr/src/uts/common/io/sdcard/impl/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/common/io/sdcard/impl/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -37,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
 		# consolidation private nexus interfaces 
 		sda_host_init_ops;
--- a/usr/src/uts/common/zmod/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/common/zmod/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -38,7 +37,9 @@
 # MAPFILE HEADER END
 #
 
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
 		# public interfaces
 		z_compress;
--- a/usr/src/uts/i86pc/conf/Mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/i86pc/conf/Mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -18,31 +18,61 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
+$mapfile_version 2
 
 #
 # this is the 32 bit 1:1 mapped code to which grub jumps.
 #
-dboot	= LOAD ?RWXN P0xC00000 V0xC00000;
-dboot	: $PROGBITS ?AW : *dboot.o;
+LOAD_SEGMENT dboot {
+	FLAGS = READ WRITE EXECUTE;
+	NOHDR;
+	PADDR = 0xC00000;
+	VADDR = 0xC00000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+		FILE_BASENAME = dboot.o;
+	};
+};
 
 #
 # this is the kernel text
 #
-text	= LOAD ?RXN P0x400000 V0xFE800000;
-text	| .text;
-text	: $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	NOHDR;
+	PADDR = 0x400000;
+	VADDR = 0xFE800000;
+	OS_ORDER = .text;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
 
 #
 # start the data segment on a new 4MB page boundary
 #
-data	= LOAD ?RWX P0x800000 V0xFEc00000;
-data	| .data;
-data	: $PROGBITS ?AW;
-data	: $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	PADDR = 0x800000;
+	VADDR = 0xFEc00000;
+	OS_ORDER = .data;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+};
 
-note	= NOTE;
-note	: $NOTE;
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};
--- a/usr/src/uts/i86pc/conf/Mapfile.amd64	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/i86pc/conf/Mapfile.amd64	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -22,27 +21,55 @@
 # CDDL HEADER END
 #
 
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
+$mapfile_version 2
 
 #
 # this is the 32 bit 1:1 mapped code to which grub jumps.
 #
-dboot   = LOAD ?RWXN P0xC00000 V0xC00000;
-dboot   : $PROGBITS ?AW : *dboot.o;
+LOAD_SEGMENT dboot {
+	FLAGS = READ WRITE EXECUTE;
+	NOHDR;
+	PADDR = 0xC00000;
+	VADDR = 0xC00000;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+		FILE_BASENAME = dboot.o;
+	};
+};
 
-text	= LOAD ?RXN P0x400000 V0xFFFFFFFFFB800000;
-text	| .text;
-text	: $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+	FLAGS =READ EXECUTE;
+	NOHDR;
+	PADDR = 0x400000;
+	VADDR = 0xFFFFFFFFFB800000;
+	OS_ORDER = .text;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
 
 #
 # kernel data
 #
-data	= LOAD ?RWX P0x800000 V0xFFFFFFFFFBc00000;
-data	| .data;
-data	: $PROGBITS ?AW;
-data	: $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	PADDR = 0x800000;
+	VADDR = 0xFFFFFFFFFBc00000;
+	OS_ORDER = .data;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+};
 
-note	= NOTE;
-note	: $NOTE;
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};
--- a/usr/src/uts/i86pc/conf/Mapfile.bios	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/i86pc/conf/Mapfile.bios	Thu Jun 24 18:16:42 2010 -0600
@@ -20,11 +20,18 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+$mapfile_version 2
 
-bios = LOAD ?NRWX V0x5000 P0x5000 A0x1000;
-bios : ?A;
+LOAD_SEGMENT bios {
+	NOHDR;
+	FLAGS = READ WRITE EXECUTE;
+	VADDR = 0x5000;
+	PADDR = 0x5000;
+	ALIGN = 0x1000;
+	ASSIGN_SECTION {
+		FLAGS = ALLOC;
+	};
+};
--- a/usr/src/uts/i86pc/conf/Mapfile.fb_swtch	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/i86pc/conf/Mapfile.fb_swtch	Thu Jun 24 18:16:42 2010 -0600
@@ -20,10 +20,18 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
+$mapfile_version 2
 
-fb_swtch = LOAD ?NRWX V0x5000 P0x5000 A0x2000;
-fb_swtch : ?A;
+LOAD_SEGMENT fb_swtch {
+	NOHDR;
+	FLAGS = READ WRITE EXECUTE;
+	VADDR = 0x5000;
+	PADDR = 0x5000;
+	ALIGN = 0x2000;
+	ASSIGN_SECTION {
+		FLAGS = ALLOC;
+	};
+};
--- a/usr/src/uts/i86pc/unix/dboot/Mapfile.dboot	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/i86pc/unix/dboot/Mapfile.dboot	Thu Jun 24 18:16:42 2010 -0600
@@ -20,19 +20,28 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-dboot = LOAD ?RWXO V0xC00000 P0xC00000 A0x1000;
-#
-# Make sure that dboot_grub.s`_start is the first thing in the dboot
-# .text segment, since when we boot that's where the boot loader will
-# start execution
-#
-dboot : .text : *dboot_grub.o;
-dboot : ?A;
+$mapfile_version 2
+
+LOAD_SEGMENT dboot {
+	FLAGS = READ WRITE EXECUTE;
+	VADDR = 0xC00000;
+	PADDR = 0xC00000;
+	ALIGN = 0x1000;
+
+	#
+	# Make sure that dboot_grub.s`_start is the first thing in the dboot
+	# .text segment, since when we boot that's where the boot loader will
+	# start execution
+	#
+	ASSIGN_SECTION is_text {
+		IS_NAME = .text;
+		FILE_BASENAME = dboot_grub.o;
+	};
+	ASSIGN_SECTION is_alloc {
+		FLAGS = ALLOC;
+	};
+	IS_ORDER = is_text is_alloc;
+};
--- a/usr/src/uts/i86xpv/conf/Mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/i86xpv/conf/Mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -20,36 +20,62 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
+$mapfile_version 2
 
 #
 # This is 1:1 mapped code to setup the kernel memory image.
 # It needs to be after (in physical) the kernel bits, so that
 # they have full 8 Meg of memory.
 # 
-dboot	= LOAD ?RWXN P0x40800000 V0x40800000;
-dboot	: .data : *dboot.o;
+LOAD_SEGMENT dboot {
+	FLAGS = READ WRITE EXECUTE;
+	NOHDR;
+	PADDR = 0x40800000;
+	VADDR = 0x40800000;
+	ASSIGN_SECTION {
+		IS_NAME = .data;
+		FILE_BASENAME = dboot.o;
+	};
+};
 
 #
 # kernel text segment
 #
-text	= LOAD ?RXN P0x40000000 V0xf4c00000;
-text	| .text;
-text	: $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	NOHDR;
+	PADDR = 0x40000000;
+	VADDR = 0xf4c00000;
+	OS_ORDER = .text;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
 
 #
 # start the data segment on a new 4MB page boundary
 #
-data	= LOAD ?RWX P0x40400000 V0xf5000000;
-data	| .data;
-data	: $PROGBITS ?AW;
-data	: $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	PADDR = 0x40400000;
+	VADDR = 0xf5000000;
+	OS_ORDER = .data;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+};
 
-note	= NOTE;
-note	: $NOTE;
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};
--- a/usr/src/uts/i86xpv/conf/Mapfile.amd64	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/i86xpv/conf/Mapfile.amd64	Thu Jun 24 18:16:42 2010 -0600
@@ -20,33 +20,59 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
+$mapfile_version 2
 
 #
 # This is 1:1 mapped code to setup the kernel memory image.
 # It needs to be after (in physical) the kernel bits, so that
 # they have full 8 Meg of memory.
 # 
-dboot	= LOAD ?RWXN P0x40800000 V0x40800000;
-dboot	: .data : *dboot.o;
+LOAD_SEGMENT dboot {
+	FLAGS = READ WRITE EXECUTE;
+	NOHDR;
+	PADDR = 0x40800000;
+	VADDR = 0x40800000;
+	ASSIGN_SECTION {
+		IS_NAME = .data;
+		FILE_BASENAME = dboot.o;
+	};
+};
 
-text    = LOAD ?RXN P0x40000000 V0xFFFFFFFFFB800000;
-text    | .text;
-text    : $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	NOHDR;
+	PADDR = 0x40000000;
+	VADDR = 0xFFFFFFFFFB800000;
+	OS_ORDER = .text;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
 
 #
 # start the data segment on a new 4MB page boundary
 #
-data	= LOAD ?RWX P0x40400000 V0xFFFFFFFFFBC00000;
-data	| .data;
-data	: $PROGBITS ?AW;
-data	: $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	PADDR = 0x40400000;
+	VADDR = 0xFFFFFFFFFBC00000;
+	OS_ORDER = .data;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+};
 
-note	= NOTE;
-note	: $NOTE;
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};
--- a/usr/src/uts/i86xpv/unix/dboot/Mapfile.dboot	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/i86xpv/unix/dboot/Mapfile.dboot	Thu Jun 24 18:16:42 2010 -0600
@@ -20,23 +20,40 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
+$mapfile_version 2
 
-dboot = LOAD ?NRWXO V0x40800000 P0x40800000 A0x1000;
-#
-# Make sure that dboot_xen.s`_start is the first thing in the dboot
-# .text segment, since when we boot that's where the boot loader will
-# start execution
-#
-dboot : .text : *dboot_xen.o;
-dboot : $PROGBITS ?A;
-dboot : $NOBITS ?A;
+LOAD_SEGMENT dboot {
+	NOHDR;
+	FLAGS = READ WRITE EXECUTE;
+	VADDR = 0x40800000;
+	PADDR = 0x40800000;
+	ALIGN = 0x1000;
 
-otherstuff : ?A;
+	#
+	# Make sure that dboot_xen.s`_start is the first thing in the dboot
+	# .text segment, since when we boot that's where the boot loader will
+	# start execution
+	#
+	ASSIGN_SECTION is_text {
+		IS_NAME = .text;
+		FILE_BASENAME = dboot_xen.o;
+	};
+	ASSIGN_SECTION is_progbits {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC;
+	};
+	ASSIGN_SECTION is_nobits {
+		TYPE = NOBITS;
+		FLAGS = ALLOC;
+	};
+	IS_ORDER = is_text is_progbits is_nobits;
+};
+
+LOAD_SEGMENT otherstuff {
+	ASSIGN_SECTION {
+		FLAGS = ALLOC;
+	};
+};
--- a/usr/src/uts/sparc/krtld/mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/sparc/krtld/mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -36,7 +35,9 @@
 # MAPFILE HEADER END
 #
 
-{
+$mapfile_version 2
+
+SYMBOL_SCOPE {
 	global:
 		kobj_addrcheck;
 		kobj_alloc;
--- a/usr/src/uts/sun4/conf/Mapfile	Thu Jun 24 17:12:23 2010 -0700
+++ b/usr/src/uts/sun4/conf/Mapfile	Thu Jun 24 18:16:42 2010 -0600
@@ -1,6 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -20,37 +19,59 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
+
+$mapfile_version 2
 
 #
 # Some four meg of kernel virtual address space
 # is mapped via a locked 4-meg mapping in the ITLB
 #
-text	= LOAD ?RXN V0x01000000;
-text	| .text;
-text	: $PROGBITS ?A!W;
+LOAD_SEGMENT text {
+	FLAGS = READ EXECUTE;
+	NOHDR;
+	VADDR = 0x01000000;
+	OS_ORDER = .text;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC !WRITE;
+	};
+};
 
 #
 # Another four meg of kernel virtual address space
 # is mapped via a locked 4-meg mapping in the DTLB
 #
-data	= LOAD ?RWX V0x01800000 A0x00400000;
-data	| .data;
-data	: $PROGBITS ?AW;
-data	: $NOBITS ?AW;
+LOAD_SEGMENT data {
+	FLAGS = READ WRITE EXECUTE;
+	VADDR = 0x01800000;
+	ALIGN = 0x00400000;
+	OS_ORDER = .data;
+	ASSIGN_SECTION {
+		TYPE = PROGBITS;
+		FLAGS = ALLOC WRITE;
+	};
+	ASSIGN_SECTION {
+		TYPE = NOBITS;
+		FLAGS = ALLOC WRITE;
+	};
+};
 
 #
 # put reloc seg in space between text and data
 # it will be freed by the kernel after use
 #
-reloc	= LOAD ?RW V0x01402000;
-reloc	: $DYNSYM;
-reloc	: $HASH;
-reloc	: .dynstr;
-reloc	: .rela.text;
-reloc	: .rela.data;
+LOAD_SEGMENT reloc {
+	FLAGS = READ WRITE;
+	VADDR = 0x01402000;
+	ASSIGN_SECTION { TYPE = DYNSYM };
+	ASSIGN_SECTION { TYPE = HASH };
+	ASSIGN_SECTION { IS_NAME = .dynstr };
+	ASSIGN_SECTION { IS_NAME = .rela.text };
+	ASSIGN_SECTION { IS_NAME = .rela.data };
+};
 
-note	= NOTE;
-note	: $NOTE;
+NOTE_SEGMENT note {
+	ASSIGN_SECTION {
+		TYPE = NOTE;
+	};
+};