changeset 10827:b91e34ae886e

Makefile.master: Remove fgnu89-inline flag Makefile.s390x: Specify MAPFILE.NED_s390 and MAPFILE.NGB_s390[x] cmd/Makefile: Remove xxxx_BDIRECT etc now that s390x supports Solaris linker cmd/Makefile.cmd: Remove unneeded targets from cmd build cmd/abi/spectrans/parser/s390/Makefile, cmd/backup/dump/Makefile, lib/hal/libhal-storage/s390/Makefile, lib/libast/s390[x]/Makefile, cmd/backup/restore/Makefile: Add -lgcc_s to recipe cmd/agents/snmp/parser/Makefile: Use s390 as target not s390x cmd/agents/snmp/snmplib/test/madman_api_test[_2].c, cmd/dtrace/dtrace.c, cmd/xargs/xargs.c, cmd/zoneadmd/zoneadmd.c, cmd/egrep/egrep.y: Use int for target of getopts() cmd/agents/snmp/snmprelayd/Makefile: Add -L$(ROOT)/usr/lib to search path cmd/cmd-inet/usr.bin/nca/Makefile, cmd/cmd-inet/usr.lib/wanboot/netbootinfo/Makefile, cmd/cmd-inet/usr.sbin/in.ftpd/Makefile, cmd/cmd-inet/usr.sbin/ipsecutils/Makefile, cmd/ed/Makefile, cmd/fm/fmd/Makefile.fmd, cmd/fm/modules/Makefile.plugin, cmd/link/Makefile, cmd/man/src/util/nsgmls.src/Makefile, cmd/svc/svccfg/Makefile, cmd/zonecfg/Makefile, lib/Makefile.lib, lib/brand/native/zone/Makefile, lib/fm/libfmd_snmp/s390x/Makefile, lib/fm/topo/modules/Makefile.plugin, lib/libaio/s390[x]/Makefile, cmd/fs.d/cachefs/cfsd/Makefile: Remove s390 specific library processing cmd/cmd-inet/usr.sbin/traceroute/traceroute.c: Use socklen_t instead of size_t for sock_len cmd/devfsadm/s390/Makefile, cmd/fm/fmd/s390/Makefile: Remove addition to LDFLAGS cmd/dtrace/Makefile: Add platform specific SUBDIR specification cmd/dtrace/test/tst/common/Makefile: Add support for using gcc for build cmd/eeprom/s390/Makefile, cmd/eeprom/s390/benv.c: Add support for s390 cmd/filebench/common/flowop_library.c: Specify type of memoffset based on _LP64 setting cmd/fm/eversholt/files/s390/Makefile: Correct recipe cmd/fm/modules/common/cpumem-retire/Makefile: Add s390 flags for LDFLAGS/LDLIBS cmd/fm/modules/common/cpumem-retire/cma_main.c: Add code for s390 cmd/hal/addons/network-devices/Makefile, cmd/hal/hald/Makefile, cmd/hal/hald/solaris/Makefile, cmd/hal/probing/network-printer/Makefile, cmd/man/src/util/instant.src/Makefile, cmd/mdb/tools/setdynflag/Makefile.com, cmd/mms/mm/Makefile.com, cmd/sdpadm/Makefile, cmd/spell/Makefile, cmd/sqlite/Makefile, lib/fm/libfmd_snmp/Makefile.com, lib/fm/topo/libtopo/s390[x]/Makefile, lib/mms/mms/Makefile.com, cmd/fm/modules/common/eversholt/Makefile: Add $(ROOT) directories to search paths cmd/fm/modules/common/snmp-trapgen/Makefile: Add -lnetsnmphelpers & -lsocket to SNMPLIB cmd/fm/schemes/Makefile.com, cmd/geniconvtbl/Makefile.com: Cannot specify -ztext for s390 cmd/fm/schemes/{cpu,dev,fmd,hc,legacy-hc,mem,mod,pkg,zfs}/s390[x]/Makefile: Fix makefile for clean build cmd/fm/schemes/mem/s390[x]/mem_disc.c: Update copyright cmd/fmli/menu/mcurrent.c: Move prototype of menu_show to global area cmd/fmli/menu/stmenu.c: Move prototypes of strtolower() and nocase_strncmp() to global area cmd/fmli/oh/if_form.c: Move prototype of chk_page() to global area cmd/fmli/oh/if_init.c: Move prototypes of set_default() and center_it() to global area cmd/fmli/oh/scram.c: Move prototype of regetkey() to global area cmd/fmli/oh/slk.c: Move prototype of showslks() to global area cmd/fmli/qued/multiline.c: Move prototype of emptyrow() to global area cmd/format/init_cs390.c: Fix copyright message cmd/fs.d/autofs/Makefile, cmd/fs.d/cachefs/Makefile.cachefs, cmd/fs.d/cachefs/share/Makefile, cmd/vt/Makefile, cmd/ypcmd/Makefile, cmd/fs.d/cachefs/unshare/Makefile: Add $(ROOT)/lib to specification cmd/fs.d/nfs/mount/mount.c: Fix source of memcpy() cmd/idmap/idmap/idmap_engine.c, cmd/intrstat/intrstat.c, cmd/iscsi/iscsitgtd/main.c, cmd/krb5/kadmin/kclient/kdyndns.c, cmd/krb5/kadmin/kclient/ksetpw.c, cmd/krb5/kadmin/kclient/ksmb.c, cmd/lockstat/lockstat.c, cmd/lvm/md_monitord/md_monitord.c, cmd/lvm/util/metadevadm.c, cmd/lvm/util/metaimport.c, cmd/mms/mgmt/adm/common/mmsadm.c, cmd/mms/mgmt/init/common/mmsinit.c, cmd/mms/mgmt/mnt/common/mmsmnt.c, cmd/mms/mm/common/mm.c, cmd/plockstat/plockstat.c, cmd/pools/pooladm/pooladm.c, cmd/pools/poolbind/poolbind.c, cmd/pools/poolstat/poolstat.c, cmd/raidctl/raidctl.c, cmd/rmformat/rmf_main.c, cmd/smbsrv/smbadm/smbadm.c, cmd/stmsboot/stmsboot_util.c, cmd/fs.d/udfs/labelit/labelit.c: Correctly cast parameters to getopts() cmd/fs.d/udfs/mkfs/mkfs.c: Correct definition of argv[] cmd/geniconvtbl/Makefile: Add platform specific specification of SUBDIRS (native not vaild for x-build) cmd/geniconvtbl/Makefile.com: Use XBUILDCC for s390 cmd/hal/probing/network-printer/probe-snmp.c, cmd/hal/addons/network-devices/snmp.c: Use size_t for oid_len cmd/halt/halt.c: Define CUR_ELFDATA for s390 cmd/ipf/lib/common/ipft_td.c: Use ip->ip_len instead of sizeof(ip_t) for building cmd/ipf/lib/s390[x]/Makefile: gcc 4.2 circumvention for ignoring warning for implicit conversion cmd/ipf/tools/ipmon.c: Add s390 code for testing ipf->fl_group[0] == 255 cmd/iscsi/iscsitgtd/s390/Makefile: Cannot use dtrace when x-building cmd/krb5/kadmin/gui/native/Kadmin.c: cmd/krb5/krb5kdc/Makefile: Avoid gnu warning cmd/ldapcachemgr/cachemgr.c: Move prototype of client_killserver() to global area cmd/mailx/hdr/glob.h: Use struct header for header[] instead of struct hdr cmd/mdb/{s390,zSeries}/*: Add (initial) code and Makefiles for build of s390 target cmd/mms/dm/common/dm_msg.c: Use va_copy() cmd/oawk/Makefile: Use XBUILDCC for MAKEPRCTAB when doing s390 x-build cmd/pcmciad/pcmciad.c, cmd/ypcmd/ypupdated/rpc.ypupdated.c, cmd/pg/pg.c: Move prototypes from within routines to global area cmd/pools/poold/poold.c: Fix definition of PLAT for s390 and correct result type from getopts() cmd/praudit/format.c: Use signed char cast for tests cmd/praudit/token.c: Use int8_t for tests cmd/rcm_daemon/common/rcm_event.c: Use uint_t for buflen and interval_size cmd/rmformat/rmf_misc.c: Add _s390_ to #ifdef for mult_factor & fix result type from getopts() cmd/rmformat/rmf_slice.c: Use struct extvtoc for definition of v_toc cmd/saf/log.c, cmd/saf/misc.c, cmd/saf/pmadm.c, cmd/saf/util.c: Fix #include sequence cmd/sgs/*: Fixes for getting native linker working with build and run cmd/ssh/libopenbsd-compat/s390[x]/Makefile: add -DHAVE_VA_COPY pkgdefs/*: Add prototypes for s390 cmd/ssh/libssh/common/packet.c: Specify uint_t for parameter of packet_get_string() cmd/ssh/libssh/common/ssh-gss.c: Specify %ld for format string to debug3 cmd/ssh/libssh/sshconnect[1|2].c, cmd/ssh/sshd/auth2-gss.c: Use gssLen variable for unloading cmd/stat/common/acquire.c: Use uint_t for pids_nr cmd/svc/configd/Makefile: Use XBUILDCC for native build portion cmd/svc/svccfg/svccfg_main.c: Fix detection of end of arguments (fixes problem with svccfg import) cmd/zic/Makefile, cmd/troff/troff.d/devaps/Makefile: Make platform dependent XCC for use in build cmd/truss/systable.c: Add support for cpcmd() call cmd/ypcmd/makedbm.c: Redefine key_sep so static area is not overwritten during execution common/atomic/s390[x]/atomic.c: Add atomic_add_short() common/dis/s390/dis_tables.h: Rename d390x_get_byte to d390x_get_bytes common/mapfiles/s390/map.pagealign: Change location of data from 0x2000 to 0x1000 uts/common/sys/types.h, head/iso/stddef_iso.h head/iso/stdio_iso.h head/iso/stdlib_iso.h head/iso/string_iso.h head/iso/time_iso.h head/iso/wchar_iso.h head/libintl.h head/limits.h head/mon.h head/regex.h head/stddef.h head/inttypes.h: Make sure __WCHAR_TYPE__ is used for wchar_t, and __SIZE_TYPE__ for size_t under GCC ldspec.s390: Specification for gcc when using Solaris linker and gcc is built for gnu linker lib/Makefile: Specify S390_SUBDIRS lib/brand/sn1/s390/sn1_handler.s: Correct the sn1_handler() routine lib/c_synonyms/s390x/Makefile: Fix options for use by Solaris linker lib/common/s390x/crt1.s: Remove .ident directive lib/fm/topo/maps/Makefile: Add s390_SUBDIRS lib/libadm/s390/mapfile-vers: Fix alignment to word instead of quad lib/libbsm/common/adt_xlate.h, lib/libbsm/common/adt_msg.h: Split content out of adt_xlate.h lib/libc/inc/thr_inlines.h: Use test-and-set (ts) instead of __sync_lock_test_and_set() which uses CS lib/libc/s390[x]/Makefile: Fix recipe of files to be built lib/libc/s390[x]/crt/cerror[64].s: Correct call to __errno lib/libc/s390/crt/hwmuldiv.s: System z versions of __{u,}{mul,div,rem}64 compiler support routines lib/libc/s390[x]/fp/fpgetsticky.c: Correct data structures used in fpgetsticky() lib/libc/s390[x]/fp/fpsetsticky.c: Correct data structures used in fpsetsticky() lib/libc/s390[x]/gen/_stack_grow.s: Fix register usage lib/libc/s390[x]/gen/byteorder.c: Define htonll and ntohll routines lib/libc/s390[x]/gen/cuexit.s: Correct call to __errorexit lib/libc/s390[x]/mapfile-vers: Correct attributes (e.g. from global to protected) lib/libc/s390[x]/offsets.in: Produce stack offset information lib/libc/s390[x]/sys/__clock_gettime.s: Preserve r6 lib/libc/s390[x]/sys/door.s: Correct external calls (don't use @PLT) lib/libc/s390[x]/sys/glibc_start.s: Detect gnu libc use - experimental lib/libdisasm/Makefile.targ, lib/libdisasm/s390/Makefile, lib/libdisasm/s390/dis_s390.c, lib/libdisasm/s390x/Makefile: Correct for clean build ucblib/lib*/s390[x]/Makefile, lib/lib*/s390[x]/Makefile: Remove gnu linker dependencies, re-enable Solaris mapfiles where used, and use -lgcc_s where needed lib/libnisdb/Makefile: Remove hack for s390 lib/libnisdb/db_index_c.x, lib/libnisdb/db_mindex_c.x: Correct declaration when using GNU c++ lib/libnsl/s390x/Makefile: Fix recipe for build lib/lib*/*/mapfile-vers: Get s390[x] versions to match other archs lib/libscf/native/Makefile, lib/libuutil/native/Makefile: Use XBUILDCC for s390 lib/lvm/Makefile.lvm: Add s390_C_PICFLAGS psm/stand/bootblks/ufs/s390/Makefile, psm/stand/bootblks/ufs/s390/installboot.sh, psm/stand/bootblks/ufs/s390/mboot.S: Add support for System z tools/kipl_cvt/kipl_cvt.c: Cater for objects built by Solaris linker ucbcmd/tr/tr.c: Prevent attempting to overwrite static area and SEGVing ucblib/libucb/s390[x]/*: Add setjmp/signal functions uts/common/conf/param.c: Redefine hw_serial to [9] uts/common/fs/proc/prvnops.c, uts/common/sys/prsystm.h, uts/common/fs/proc/prdata.h: Add support for /proc/<pid>/stat file uts/common/krtld/kobj.c: Set kobj_debug back to default of 0 uts/common/sys/elf_s390.h: Define ELF_390[X]_MAXPGSZ uts/common/sys/isa_defs.h: Define define _ILP32x for s390x uts/common/sys/vfs_opreg.h: Define fs_operation_def uts/common/vm/page.h: Add support for "init" state of a page uts/common/vm/seg_vn.c, uts/common/vm/seg_map.c: Set a page as "initialized" uts/common/vm/vm_pagelist.c, uts/common/vm/vm_page.c: Clear "init" value of page uts/s390x/kipl/kipl.s: Define types for variables, use _END_ for end of text (start of BSS) uts/s390x/conf/Mapfile: Rework to use Solaris linker not gnu uts/s390x/kipl/kipl_mem.c: Rework building of kernel R/S/P tables (fix >= 1.6GB and >= 3GB bugs) uts/s390x/ml/interrupt.s: Correct tracing of old program and I/O PSW uts/s390x/ml/mach_locore.s: Fix CPU id and HW serial number processing uts/s390x/ml/swtch.s: Trace switching using TRACG uts/s390x/os/mlsetup.c: Capture hw_serial, add trace table support uts/s390x/os/pgm_slih.c: Indicate whether instruction retry is required uts/s390x/os/ppage.c: Keep and restore state of mod/ref bits when copying page uts/s390x/os/sclp.c: Make msgnoh() SMP-safe uts/s390x/os/startup.c: Turn off some debugging, document kernel layout uts/s390x/sys/machparam.h: Move SEGKPMBASE higher up the address space uts/s390x/unix/Makefile: Enforce build of version.c after cleaning up; Support use of Solaris linker uts/s390x/vm/hat_s390x.c: Rationalize use of storage key resetting uts/s390x/vm/htable.c: Use page_create_contig() for all page table allocation so that we avoid the COREHEAP_BASE->COREHEAP_END areas; Check whether page(s) was/were obtained and force reap before retry if not uts/s390x/vm/mach_vm_dep.c: Avoid using real pages in the COREHEAP_BASE->COREHEAP_END area when obtaining pages for ptable_alloc. uts/s390x/vm/mm_s390x.h: Fix GET_KEY macro to prevent overwriting of register uts/zSeries/Makefile.files: Remove old dependency files needed before Solaris linker worked uts/zSeries/Makefile.rules: Remove old dependency files and build of zlib_obj.o uts/zSeries/Makefile.zSeries.shared: Cause mac_ether, kiconv_emea, kiconv_ja, kiconv_ko, kiconv_sc, and kiconv_tc to be built cmd/abi/spectrans/parser/s390/Makefile: Add support for System z (rename from s390x to s390) usr/src/psm/stand/bootblks/hsfs/s390/*: Add support for System z (rename from s390x to s390) uts/zSeries/*/Makefile: Restore -N specification for use by new linker
author tide@sparcv490
date Mon, 23 Mar 2009 14:01:42 -0400
parents b9315462f439
children 401753bbd3d9
files usr/src/Makefile.master usr/src/Makefile.s390x usr/src/cmd/Makefile usr/src/cmd/Makefile.cmd usr/src/cmd/abi/spectrans/parser/s390/Makefile usr/src/cmd/abi/spectrans/parser/s390x/Makefile usr/src/cmd/agents/snmp/parser/Makefile usr/src/cmd/agents/snmp/snmplib/test/madman_api_test.c usr/src/cmd/agents/snmp/snmplib/test/madman_api_test_2.c usr/src/cmd/agents/snmp/snmprelayd/Makefile usr/src/cmd/backup/dump/Makefile usr/src/cmd/backup/restore/Makefile usr/src/cmd/cmd-inet/usr.bin/nca/Makefile usr/src/cmd/cmd-inet/usr.lib/wanboot/netbootinfo/Makefile usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c usr/src/cmd/devfsadm/s390/Makefile usr/src/cmd/dtrace/Makefile usr/src/cmd/dtrace/dtrace.c usr/src/cmd/dtrace/test/tst/common/Makefile usr/src/cmd/ed/Makefile usr/src/cmd/eeprom/s390/Makefile usr/src/cmd/eeprom/s390/benv.c usr/src/cmd/egrep/egrep.y usr/src/cmd/filebench/common/flowop_library.c usr/src/cmd/fm/eversholt/files/s390/Makefile usr/src/cmd/fm/fmd/Makefile.fmd usr/src/cmd/fm/fmd/s390/Makefile usr/src/cmd/fm/modules/Makefile.plugin usr/src/cmd/fm/modules/common/cpumem-retire/Makefile usr/src/cmd/fm/modules/common/cpumem-retire/cma_main.c usr/src/cmd/fm/modules/common/eversholt/Makefile usr/src/cmd/fm/modules/common/snmp-trapgen/Makefile usr/src/cmd/fm/schemes/Makefile.com usr/src/cmd/fm/schemes/cpu/s390/Makefile usr/src/cmd/fm/schemes/cpu/s390x/Makefile usr/src/cmd/fm/schemes/dev/s390/Makefile usr/src/cmd/fm/schemes/dev/s390x/Makefile usr/src/cmd/fm/schemes/fmd/s390/Makefile usr/src/cmd/fm/schemes/fmd/s390x/Makefile usr/src/cmd/fm/schemes/hc/s390/Makefile usr/src/cmd/fm/schemes/hc/s390x/Makefile usr/src/cmd/fm/schemes/legacy-hc/s390/Makefile usr/src/cmd/fm/schemes/legacy-hc/s390x/Makefile usr/src/cmd/fm/schemes/mem/s390/Makefile usr/src/cmd/fm/schemes/mem/s390/mem_disc.c usr/src/cmd/fm/schemes/mem/s390x/Makefile usr/src/cmd/fm/schemes/mem/s390x/mem_disc.c usr/src/cmd/fm/schemes/mod/s390/Makefile usr/src/cmd/fm/schemes/mod/s390x/Makefile usr/src/cmd/fm/schemes/pkg/s390/Makefile usr/src/cmd/fm/schemes/pkg/s390x/Makefile usr/src/cmd/fm/schemes/zfs/s390/Makefile usr/src/cmd/fm/schemes/zfs/s390x/Makefile usr/src/cmd/fmli/menu/mcurrent.c usr/src/cmd/fmli/menu/stmenu.c usr/src/cmd/fmli/oh/if_form.c usr/src/cmd/fmli/oh/if_init.c usr/src/cmd/fmli/oh/scram.c usr/src/cmd/fmli/oh/slk.c usr/src/cmd/fmli/qued/multiline.c usr/src/cmd/format/init_cs390.c usr/src/cmd/fs.d/autofs/Makefile usr/src/cmd/fs.d/cachefs/Makefile.cachefs usr/src/cmd/fs.d/cachefs/cfsd/Makefile usr/src/cmd/fs.d/cachefs/share/Makefile usr/src/cmd/fs.d/cachefs/unshare/Makefile usr/src/cmd/fs.d/nfs/mount/mount.c usr/src/cmd/fs.d/udfs/labelit/labelit.c usr/src/cmd/fs.d/udfs/mkfs/mkfs.c usr/src/cmd/geniconvtbl/Makefile usr/src/cmd/geniconvtbl/Makefile.com usr/src/cmd/geniconvtbl/native/Makefile usr/src/cmd/hal/addons/network-devices/Makefile usr/src/cmd/hal/addons/network-devices/snmp.c usr/src/cmd/hal/hald/Makefile usr/src/cmd/hal/hald/solaris/Makefile usr/src/cmd/hal/probing/network-printer/Makefile usr/src/cmd/hal/probing/network-printer/probe-snmp.c usr/src/cmd/halt/halt.c usr/src/cmd/idmap/idmap/idmap_engine.c usr/src/cmd/intrstat/intrstat.c usr/src/cmd/ipf/lib/common/ipft_td.c usr/src/cmd/ipf/lib/s390/Makefile usr/src/cmd/ipf/lib/s390x/Makefile usr/src/cmd/ipf/tools/ipmon.c usr/src/cmd/iscsi/iscsitgtd/main.c usr/src/cmd/iscsi/iscsitgtd/s390/Makefile usr/src/cmd/krb5/kadmin/gui/native/Kadmin.c usr/src/cmd/krb5/kadmin/kclient/kdyndns.c usr/src/cmd/krb5/kadmin/kclient/ksetpw.c usr/src/cmd/krb5/kadmin/kclient/ksmb.c usr/src/cmd/krb5/krb5kdc/Makefile usr/src/cmd/ldapcachemgr/cachemgr.c usr/src/cmd/link/Makefile usr/src/cmd/lockstat/lockstat.c usr/src/cmd/lvm/md_monitord/md_monitord.c usr/src/cmd/lvm/util/metadevadm.c usr/src/cmd/lvm/util/metaimport.c usr/src/cmd/mailx/hdr/glob.h usr/src/cmd/man/src/util/instant.src/Makefile usr/src/cmd/man/src/util/nsgmls.src/Makefile usr/src/cmd/mdb/Makefile usr/src/cmd/mdb/s390/Makefile usr/src/cmd/mdb/s390/Makefile.kmdb usr/src/cmd/mdb/s390/Makefile.libstand usr/src/cmd/mdb/s390/kmdb/kaif.c usr/src/cmd/mdb/s390/kmdb/kaif.fdbg usr/src/cmd/mdb/s390/kmdb/kaif.h usr/src/cmd/mdb/s390/kmdb/kaif_activate.c usr/src/cmd/mdb/s390/kmdb/kaif_enter.s usr/src/cmd/mdb/s390/kmdb/kaif_off.in usr/src/cmd/mdb/s390/kmdb/kaif_start_isadep.c usr/src/cmd/mdb/s390/kmdb/kctl/kctl_asm.s usr/src/cmd/mdb/s390/kmdb/kctl/kctl_isadep.c usr/src/cmd/mdb/s390/kmdb/kmdb_asmutil.h usr/src/cmd/mdb/s390/kmdb/kmdb_asmutil.s usr/src/cmd/mdb/s390/kmdb/kmdb_context_off.in usr/src/cmd/mdb/s390/kmdb/kmdb_dpi_isadep.c usr/src/cmd/mdb/s390/kmdb/kmdb_dpi_isadep.h usr/src/cmd/mdb/s390/kmdb/kmdb_fault_isadep.c usr/src/cmd/mdb/s390/kmdb/kmdb_kdi_isadep.c usr/src/cmd/mdb/s390/kmdb/kmdb_kdi_isadep.h usr/src/cmd/mdb/s390/kmdb/kmdb_makecontext.c usr/src/cmd/mdb/s390/kmdb/kmdb_promif_isadep.c usr/src/cmd/mdb/s390/kmdb/kmdb_promif_isadep.h usr/src/cmd/mdb/s390/kmdb/kvm_isadep.c usr/src/cmd/mdb/s390/kmdb/kvm_isadep.h usr/src/cmd/mdb/s390/mdb/kvm_s390xdep.c usr/src/cmd/mdb/s390/mdb/mdb_kreg.h usr/src/cmd/mdb/s390/mdb/mdb_kreg_impl.h usr/src/cmd/mdb/s390/mdb/mdb_s390xutil.c usr/src/cmd/mdb/s390/mdb/mdb_s390xutil.h usr/src/cmd/mdb/s390/mdb/proc_isadep.c usr/src/cmd/mdb/s390/modules/intr/intr.c usr/src/cmd/mdb/s390/modules/s390xdis/dis.h usr/src/cmd/mdb/s390/modules/s390xdis/s390xdis.c usr/src/cmd/mdb/s390/zSeries/Makefile usr/src/cmd/mdb/s390/zSeries/Makefile.kmdb usr/src/cmd/mdb/s390/zSeries/audiosup/Makefile usr/src/cmd/mdb/s390/zSeries/cpc/Makefile usr/src/cmd/mdb/s390/zSeries/crypto/Makefile usr/src/cmd/mdb/s390/zSeries/dof/Makefile usr/src/cmd/mdb/s390/zSeries/dtrace/Makefile usr/src/cmd/mdb/s390/zSeries/genunix/Makefile usr/src/cmd/mdb/s390/zSeries/intr/Makefile usr/src/cmd/mdb/s390/zSeries/ip/Makefile usr/src/cmd/mdb/s390/zSeries/ipc/Makefile usr/src/cmd/mdb/s390/zSeries/ipp/Makefile usr/src/cmd/mdb/s390/zSeries/kmdb/Makefile usr/src/cmd/mdb/s390/zSeries/kmdb/client_handler.s usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_asmutil.h usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_handlers.s usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_invoke.s usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_regs.h usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_resume.s usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_startup.s usr/src/cmd/mdb/s390/zSeries/kmdb/kmdb_setcontext.s usr/src/cmd/mdb/s390/zSeries/kmdb/kmdb_start.s usr/src/cmd/mdb/s390/zSeries/kmdb/kmdb_v9asmutil.s usr/src/cmd/mdb/s390/zSeries/krtld/Makefile usr/src/cmd/mdb/s390/zSeries/libavl/Makefile usr/src/cmd/mdb/s390/zSeries/libc/Makefile usr/src/cmd/mdb/s390/zSeries/libnvpair/Makefile usr/src/cmd/mdb/s390/zSeries/libstand/Makefile usr/src/cmd/mdb/s390/zSeries/libstand/setjmp.s usr/src/cmd/mdb/s390/zSeries/libstandctf/Makefile usr/src/cmd/mdb/s390/zSeries/libsysevent/Makefile usr/src/cmd/mdb/s390/zSeries/libumem/Makefile usr/src/cmd/mdb/s390/zSeries/libuutil/Makefile usr/src/cmd/mdb/s390/zSeries/libzpool/Makefile usr/src/cmd/mdb/s390/zSeries/lofs/Makefile usr/src/cmd/mdb/s390/zSeries/logindmux/Makefile usr/src/cmd/mdb/s390/zSeries/md/Makefile usr/src/cmd/mdb/s390/zSeries/mdb/Makefile usr/src/cmd/mdb/s390/zSeries/mdb_ds/Makefile usr/src/cmd/mdb/s390/zSeries/mdb_ks/Makefile usr/src/cmd/mdb/s390/zSeries/mdb_test/Makefile usr/src/cmd/mdb/s390/zSeries/mpxio/Makefile usr/src/cmd/mdb/s390/zSeries/nca/Makefile usr/src/cmd/mdb/s390/zSeries/ptm/Makefile usr/src/cmd/mdb/s390/zSeries/random/Makefile usr/src/cmd/mdb/s390/zSeries/s1394/Makefile usr/src/cmd/mdb/s390/zSeries/sctp/Makefile usr/src/cmd/mdb/s390/zSeries/sd/Makefile usr/src/cmd/mdb/s390/zSeries/specfs/Makefile usr/src/cmd/mdb/s390/zSeries/sppp/Makefile usr/src/cmd/mdb/s390/zSeries/ssd/Makefile usr/src/cmd/mdb/s390/zSeries/ufs/Makefile usr/src/cmd/mdb/s390/zSeries/ufs_log/Makefile usr/src/cmd/mdb/s390/zSeries/usba/Makefile usr/src/cmd/mdb/s390/zSeries/zfs/Makefile usr/src/cmd/mdb/tools/setdynflag/Makefile.com usr/src/cmd/mdb/zSeries/z/mdb/Makefile usr/src/cmd/mms/dm/common/dm_msg.c usr/src/cmd/mms/mgmt/adm/common/mmsadm.c usr/src/cmd/mms/mgmt/init/common/mmsinit.c usr/src/cmd/mms/mgmt/mnt/common/mmsmnt.c usr/src/cmd/mms/mm/Makefile.com usr/src/cmd/mms/mm/common/mm.c usr/src/cmd/oawk/Makefile usr/src/cmd/pcmciad/pcmciad.c usr/src/cmd/pg/pg.c usr/src/cmd/plockstat/plockstat.c usr/src/cmd/pools/pooladm/pooladm.c usr/src/cmd/pools/poolbind/poolbind.c usr/src/cmd/pools/poold/poold.c usr/src/cmd/pools/poolstat/poolstat.c usr/src/cmd/praudit/format.c usr/src/cmd/praudit/token.c usr/src/cmd/raidctl/raidctl.c usr/src/cmd/rcm_daemon/common/rcm_event.c usr/src/cmd/rmformat/rmf_main.c usr/src/cmd/rmformat/rmf_misc.c usr/src/cmd/rmformat/rmf_slice.c usr/src/cmd/saf/log.c usr/src/cmd/saf/misc.c usr/src/cmd/saf/pmadm.c usr/src/cmd/saf/sac.c usr/src/cmd/saf/util.c usr/src/cmd/sdpadm/Makefile usr/src/cmd/sgs/elfedit/Makefile.com usr/src/cmd/sgs/ld/Makefile.com usr/src/cmd/sgs/lex/s390/Makefile usr/src/cmd/sgs/lex/s390x/Makefile usr/src/cmd/sgs/libdl/s390/Makefile usr/src/cmd/sgs/libdl/s390/mapfile-vers usr/src/cmd/sgs/libdl/s390x/Makefile usr/src/cmd/sgs/libld/common/machrel.s390.c usr/src/cmd/sgs/librtld/s390/Makefile usr/src/cmd/sgs/librtld/s390/_relocate.c usr/src/cmd/sgs/librtld/s390x/Makefile usr/src/cmd/sgs/librtld/s390x/_relocate.c usr/src/cmd/sgs/link_audit/common/who.h usr/src/cmd/sgs/link_audit/s390/mapfile-vers-bindings usr/src/cmd/sgs/link_audit/s390/mapfile-vers-perfcnt usr/src/cmd/sgs/link_audit/s390/mapfile-vers-symbindrep usr/src/cmd/sgs/link_audit/s390/mapfile-vers-truss usr/src/cmd/sgs/link_audit/s390/mapfile-vers-who usr/src/cmd/sgs/rtld/Makefile.com usr/src/cmd/sgs/rtld/common/elf.c usr/src/cmd/sgs/rtld/s390/Makefile usr/src/cmd/sgs/rtld/s390/_setup.c usr/src/cmd/sgs/rtld/s390/boot.s usr/src/cmd/sgs/rtld/s390/boot_elf.s usr/src/cmd/sgs/rtld/s390/s390_elf.c usr/src/cmd/sgs/rtld/s390x/Makefile usr/src/cmd/sgs/rtld/s390x/_setup.c usr/src/cmd/sgs/rtld/s390x/boot.s usr/src/cmd/sgs/rtld/s390x/boot_elf.s usr/src/cmd/sgs/rtld/s390x/caller.s usr/src/cmd/sgs/rtld/s390x/s390x_elf.c usr/src/cmd/sgs/size/common/process.c usr/src/cmd/smbsrv/smbadm/smbadm.c usr/src/cmd/spell/Makefile usr/src/cmd/sqlite/Makefile usr/src/cmd/ssh/libopenbsd-compat/s390/Makefile usr/src/cmd/ssh/libopenbsd-compat/s390x/Makefile usr/src/cmd/ssh/libssh/common/packet.c usr/src/cmd/ssh/libssh/common/ssh-gss.c usr/src/cmd/ssh/ssh/sshconnect1.c usr/src/cmd/ssh/ssh/sshconnect2.c usr/src/cmd/ssh/sshd/auth2-gss.c usr/src/cmd/stat/common/acquire.c usr/src/cmd/stmsboot/stmsboot_util.c usr/src/cmd/svc/configd/Makefile usr/src/cmd/svc/svccfg/Makefile usr/src/cmd/svc/svccfg/svccfg_main.c usr/src/cmd/troff/troff.d/devaps/Makefile usr/src/cmd/truss/systable.c usr/src/cmd/vt/Makefile usr/src/cmd/xargs/xargs.c usr/src/cmd/ypcmd/Makefile usr/src/cmd/ypcmd/makedbm.c usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c usr/src/cmd/zic/Makefile usr/src/cmd/zoneadmd/zoneadmd.c usr/src/cmd/zonecfg/Makefile usr/src/common/atomic/s390/atomic.c usr/src/common/atomic/s390x/atomic.c usr/src/common/dis/s390/dis_tables.h usr/src/common/mapfiles/s390/map.pagealign usr/src/head/inttypes.h usr/src/head/iso/stddef_iso.h usr/src/head/iso/stdio_iso.h usr/src/head/iso/stdlib_iso.h usr/src/head/iso/string_iso.h usr/src/head/iso/time_iso.h usr/src/head/iso/wchar_iso.h usr/src/head/libintl.h usr/src/head/limits.h usr/src/head/mon.h usr/src/head/regex.h usr/src/head/stddef.h usr/src/ldspec.s390 usr/src/lib/Makefile usr/src/lib/Makefile.lib usr/src/lib/brand/native/zone/Makefile usr/src/lib/brand/sn1/s390/sn1_handler.s usr/src/lib/c_synonyms/s390x/Makefile usr/src/lib/common/s390x/crt1.s usr/src/lib/fm/libfmd_snmp/Makefile.com usr/src/lib/fm/libfmd_snmp/s390x/Makefile usr/src/lib/fm/topo/libtopo/s390/Makefile usr/src/lib/fm/topo/libtopo/s390x/Makefile usr/src/lib/fm/topo/maps/Makefile usr/src/lib/fm/topo/modules/Makefile.plugin usr/src/lib/hal/libhal-storage/s390/Makefile usr/src/lib/libadm/s390/mapfile-vers usr/src/lib/libaio/s390/Makefile usr/src/lib/libaio/s390x/Makefile usr/src/lib/libast/s390/Makefile usr/src/lib/libast/s390x/Makefile usr/src/lib/libbsm/common/adt_msg.h usr/src/lib/libbsm/common/adt_xlate.h usr/src/lib/libc/inc/thr_inlines.h usr/src/lib/libc/s390/Makefile usr/src/lib/libc/s390/crt/cerror.s usr/src/lib/libc/s390/crt/cerror64.s usr/src/lib/libc/s390/crt/hwmuldiv.s usr/src/lib/libc/s390/fp/fpgetsticky.c usr/src/lib/libc/s390/fp/fpsetsticky.c usr/src/lib/libc/s390/gen/_stack_grow.s usr/src/lib/libc/s390/gen/byteorder.c usr/src/lib/libc/s390/gen/cuexit.s usr/src/lib/libc/s390/mapfile-vers usr/src/lib/libc/s390/offsets.in usr/src/lib/libc/s390/sys/__clock_gettime.s usr/src/lib/libc/s390/sys/door.s usr/src/lib/libc/s390/sys/glibc_start.s usr/src/lib/libc/s390x/Makefile usr/src/lib/libc/s390x/crt/cerror.s usr/src/lib/libc/s390x/fp/fpgetsticky.c usr/src/lib/libc/s390x/fp/fpsetsticky.c usr/src/lib/libc/s390x/gen/_stack_grow.s usr/src/lib/libc/s390x/gen/byteorder.c usr/src/lib/libc/s390x/gen/cuexit.s usr/src/lib/libc/s390x/mapfile-vers usr/src/lib/libc/s390x/offsets.in usr/src/lib/libc/s390x/sys/__clock_gettime.s usr/src/lib/libc/s390x/sys/door.s usr/src/lib/libc/s390x/sys/glibc_start.s usr/src/lib/libdisasm/Makefile.targ usr/src/lib/libdisasm/s390/Makefile usr/src/lib/libdisasm/s390/dis_s390.c usr/src/lib/libdisasm/s390x/Makefile usr/src/lib/libdladm/s390/Makefile usr/src/lib/libdladm/s390x/Makefile usr/src/lib/libdoor/s390/Makefile usr/src/lib/libdoor/s390x/Makefile usr/src/lib/libdtrace/s390/Makefile usr/src/lib/libdtrace/s390x/Makefile usr/src/lib/libintl/s390/Makefile usr/src/lib/libintl/s390x/Makefile usr/src/lib/libipsecutil/Makefile.com usr/src/lib/libkrb5/s390/Makefile usr/src/lib/libkrb5/s390x/Makefile usr/src/lib/libmd5/s390/Makefile usr/src/lib/libmd5/s390x/Makefile usr/src/lib/libmp/s390/Makefile usr/src/lib/libmp/s390x/Makefile usr/src/lib/libnisdb/Makefile usr/src/lib/libnisdb/db_index_c.x usr/src/lib/libnisdb/db_mindex_c.x usr/src/lib/libnsl/s390x/Makefile usr/src/lib/libnsl/s390x/mapfile-vers usr/src/lib/libproc/s390/mapfile-vers usr/src/lib/libproc/s390x/mapfile-vers usr/src/lib/libpthread/s390/Makefile usr/src/lib/libpthread/s390/mapfile-vers usr/src/lib/libpthread/s390x/Makefile usr/src/lib/librt/s390/Makefile usr/src/lib/librt/s390x/Makefile usr/src/lib/libscf/native/Makefile usr/src/lib/libsched/s390/Makefile usr/src/lib/libsched/s390x/Makefile usr/src/lib/libsqlite/Makefile.com usr/src/lib/libsys/s390/mapfile-vers usr/src/lib/libthread/s390/Makefile usr/src/lib/libthread/s390x/Makefile usr/src/lib/libtnfprobe/s390/Makefile usr/src/lib/libtnfprobe/s390/mapfile-vers usr/src/lib/libtnfprobe/s390x/Makefile usr/src/lib/libtnfprobe/s390x/mapfile-vers usr/src/lib/libumem/Makefile.com usr/src/lib/libuutil/native/Makefile usr/src/lib/libvscan/s390/Makefile usr/src/lib/libw/s390/Makefile usr/src/lib/libw/s390x/Makefile usr/src/lib/libzfs/s390/Makefile usr/src/lib/libzfs/s390x/Makefile usr/src/lib/libzonecfg/s390/Makefile usr/src/lib/libzonecfg/s390x/Makefile usr/src/lib/lvm/Makefile.lvm usr/src/lib/mms/mms/Makefile.com usr/src/lib/ncad_addr/s390/Makefile usr/src/lib/ncad_addr/s390/mapfile-vers usr/src/lib/ncad_addr/s390x/Makefile usr/src/lib/ncad_addr/s390x/mapfile-vers usr/src/lib/openssl/libcrypto/s390/Makefile usr/src/lib/openssl/libcrypto/s390x/Makefile usr/src/lib/pkcs11/pkcs11_softtoken/s390/Makefile usr/src/lib/pkcs11/pkcs11_softtoken/s390x/Makefile usr/src/lib/print/libhttp-core/s390/Makefile usr/src/lib/print/libipp-core/s390/Makefile usr/src/lib/print/libipp-listener/s390/Makefile usr/src/lib/print/libpapi-common/s390/Makefile usr/src/lib/print/libpapi-dynamic/s390/Makefile usr/src/lib/print/libpapi-ipp/s390/Makefile usr/src/lib/print/libpapi-lpd/Makefile.com usr/src/lib/print/libpapi-lpd/s390/Makefile usr/src/lib/print/libprint/s390/Makefile usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine usr/src/lib/scsi/plugins/ses/Makefile.lib usr/src/pkgdefs/PHXext/prototype_s390 usr/src/pkgdefs/SUNW0on/prototype_s390 usr/src/pkgdefs/SUNW1394/prototype_s390 usr/src/pkgdefs/SUNW1394h/prototype_s390 usr/src/pkgdefs/SUNWaac/prototype_s390 usr/src/pkgdefs/SUNWaccr/prototype_s390 usr/src/pkgdefs/SUNWaccu/prototype_s390 usr/src/pkgdefs/SUNWafe/prototype_s390 usr/src/pkgdefs/SUNWapct/prototype_s390 usr/src/pkgdefs/SUNWarbel/prototype_s390 usr/src/pkgdefs/SUNWarc/prototype_s390 usr/src/pkgdefs/SUNWarcr/prototype_s390 usr/src/pkgdefs/SUNWastdev/prototype_s390 usr/src/pkgdefs/SUNWatfsr/prototype_s390 usr/src/pkgdefs/SUNWatfsu/prototype_s390 usr/src/pkgdefs/SUNWauda/prototype_s390 usr/src/pkgdefs/SUNWaudd/prototype_s390 usr/src/pkgdefs/SUNWaudf/prototype_s390 usr/src/pkgdefs/SUNWaudh/prototype_s390 usr/src/pkgdefs/SUNWaudit/prototype_s390 usr/src/pkgdefs/SUNWav1394/prototype_s390 usr/src/pkgdefs/SUNWbart/prototype_s390 usr/src/pkgdefs/SUNWbcp/prototype_s390 usr/src/pkgdefs/SUNWbge/prototype_s390 usr/src/pkgdefs/SUNWbip/prototype_s390 usr/src/pkgdefs/SUNWbipr/prototype_s390 usr/src/pkgdefs/SUNWbnur/prototype_s390 usr/src/pkgdefs/SUNWbnuu/prototype_s390 usr/src/pkgdefs/SUNWbsr/prototype_s390 usr/src/pkgdefs/SUNWbsu/prototype_s390 usr/src/pkgdefs/SUNWbtool/prototype_s390 usr/src/pkgdefs/SUNWcakr.u/prototype_s390 usr/src/pkgdefs/SUNWcakr.v/prototype_s390 usr/src/pkgdefs/SUNWcakrnt2000.v/prototype_s390 usr/src/pkgdefs/SUNWcar.u/prototype_s390 usr/src/pkgdefs/SUNWcar.v/prototype_s390 usr/src/pkgdefs/SUNWcart200.v/prototype_s390 usr/src/pkgdefs/SUNWcdrw/prototype_s390 usr/src/pkgdefs/SUNWcg6.u/prototype_s390 usr/src/pkgdefs/SUNWcg6h/prototype_s390 usr/src/pkgdefs/SUNWchxge/prototype_s390 usr/src/pkgdefs/SUNWckr/prototype_s390 usr/src/pkgdefs/SUNWcnetr/prototype_s390 usr/src/pkgdefs/SUNWcnsr/prototype_s390 usr/src/pkgdefs/SUNWcnsu/prototype_s390 usr/src/pkgdefs/SUNWcpc.u/prototype_s390 usr/src/pkgdefs/SUNWcpc.v/prototype_s390 usr/src/pkgdefs/SUNWcpcu/prototype_s390 usr/src/pkgdefs/SUNWcpr.u/prototype_s390 usr/src/pkgdefs/SUNWcryptoint/prototype_s390 usr/src/pkgdefs/SUNWcsd/prototype_s390 usr/src/pkgdefs/SUNWcsl/prototype_s390 usr/src/pkgdefs/SUNWcslr/prototype_s390 usr/src/pkgdefs/SUNWcsr/prototype_s390 usr/src/pkgdefs/SUNWcstl/prototype_s390 usr/src/pkgdefs/SUNWcsu/prototype_s390 usr/src/pkgdefs/SUNWcti2.u/prototype_s390 usr/src/pkgdefs/SUNWcvc.u/prototype_s390 usr/src/pkgdefs/SUNWcvcr.u/prototype_s390 usr/src/pkgdefs/SUNWdcaf/prototype_s390 usr/src/pkgdefs/SUNWdcar/prototype_s390 usr/src/pkgdefs/SUNWdcsr/prototype_s390 usr/src/pkgdefs/SUNWdcsu/prototype_s390 usr/src/pkgdefs/SUNWdfbh/prototype_s390 usr/src/pkgdefs/SUNWdhcm/prototype_s390 usr/src/pkgdefs/SUNWdhcsb/prototype_s390 usr/src/pkgdefs/SUNWdhcsr/prototype_s390 usr/src/pkgdefs/SUNWdhcsu/prototype_s390 usr/src/pkgdefs/SUNWdmfe/prototype_s390 usr/src/pkgdefs/SUNWdmgtr/prototype_s390 usr/src/pkgdefs/SUNWdmgtu/prototype_s390 usr/src/pkgdefs/SUNWdoc/prototype_s390 usr/src/pkgdefs/SUNWdpl/prototype_s390 usr/src/pkgdefs/SUNWdrcr.u/prototype_s390 usr/src/pkgdefs/SUNWdrr.u/prototype_s390 usr/src/pkgdefs/SUNWdscpr.u/prototype_s390 usr/src/pkgdefs/SUNWdscpu.u/prototype_s390 usr/src/pkgdefs/SUNWdsdr/prototype_s390 usr/src/pkgdefs/SUNWdsdu/prototype_s390 usr/src/pkgdefs/SUNWdtrc/prototype_s390 usr/src/pkgdefs/SUNWdtrp/prototype_s390 usr/src/pkgdefs/SUNWdtrt/prototype_s390 usr/src/pkgdefs/SUNWefc.u/prototype_s390 usr/src/pkgdefs/SUNWefck/prototype_s390 usr/src/pkgdefs/SUNWefcl/prototype_s390 usr/src/pkgdefs/SUNWefcr/prototype_s390 usr/src/pkgdefs/SUNWefcu/prototype_s390 usr/src/pkgdefs/SUNWerid/prototype_s390 usr/src/pkgdefs/SUNWesu/prototype_s390 usr/src/pkgdefs/SUNWfilebench/prototype_s390 usr/src/pkgdefs/SUNWfmd/prototype_s390 usr/src/pkgdefs/SUNWfmdr/prototype_s390 usr/src/pkgdefs/SUNWfruid/prototype_s390 usr/src/pkgdefs/SUNWfruip.u/prototype_s390 usr/src/pkgdefs/SUNWfsr/prototype_s390 usr/src/pkgdefs/SUNWfss/prototype_s390 usr/src/pkgdefs/SUNWftdur/prototype_s390 usr/src/pkgdefs/SUNWftduu/prototype_s390 usr/src/pkgdefs/SUNWftpr/prototype_s390 usr/src/pkgdefs/SUNWftpu/prototype_s390 usr/src/pkgdefs/SUNWfwdc/prototype_s390 usr/src/pkgdefs/SUNWfwdcu/prototype_s390 usr/src/pkgdefs/SUNWfwflash/prototype_s390 usr/src/pkgdefs/SUNWgss/prototype_s390 usr/src/pkgdefs/SUNWgssc/prototype_s390 usr/src/pkgdefs/SUNWgssdh/prototype_s390 usr/src/pkgdefs/SUNWgssk/prototype_s390 usr/src/pkgdefs/SUNWhal/prototype_s390 usr/src/pkgdefs/SUNWhalr/prototype_s390 usr/src/pkgdefs/SUNWhea/prototype_s390 usr/src/pkgdefs/SUNWhermon/prototype_s390 usr/src/pkgdefs/SUNWhmd/prototype_s390 usr/src/pkgdefs/SUNWhmdu/prototype_s390 usr/src/pkgdefs/SUNWhwdata/prototype_s390 usr/src/pkgdefs/SUNWhxge/prototype_s390 usr/src/pkgdefs/SUNWib/prototype_s390 usr/src/pkgdefs/SUNWibsdp/prototype_s390 usr/src/pkgdefs/SUNWibsdpib/prototype_s390 usr/src/pkgdefs/SUNWibsdpu/prototype_s390 usr/src/pkgdefs/SUNWidn.u/prototype_s390 usr/src/pkgdefs/SUNWifp/prototype_s390 usr/src/pkgdefs/SUNWifph/prototype_s390 usr/src/pkgdefs/SUNWigb/prototype_s390 usr/src/pkgdefs/SUNWintgige/prototype_s390 usr/src/pkgdefs/SUNWiopc.u/prototype_s390 usr/src/pkgdefs/SUNWiopc.v/prototype_s390 usr/src/pkgdefs/SUNWioth/prototype_s390 usr/src/pkgdefs/SUNWiotu/prototype_s390 usr/src/pkgdefs/SUNWipc/prototype_s390 usr/src/pkgdefs/SUNWipfh/prototype_s390 usr/src/pkgdefs/SUNWipfr/prototype_s390 usr/src/pkgdefs/SUNWipfu/prototype_s390 usr/src/pkgdefs/SUNWipoib/prototype_s390 usr/src/pkgdefs/SUNWippcore/prototype_s390 usr/src/pkgdefs/SUNWipplr/prototype_s390 usr/src/pkgdefs/SUNWipplu/prototype_s390 usr/src/pkgdefs/SUNWiscsitgtr/prototype_s390 usr/src/pkgdefs/SUNWiscsitgtu/prototype_s390 usr/src/pkgdefs/SUNWixgb/prototype_s390 usr/src/pkgdefs/SUNWixgbe/prototype_s390 usr/src/pkgdefs/SUNWjcom/prototype_s390 usr/src/pkgdefs/SUNWjib/prototype_s390 usr/src/pkgdefs/SUNWkdcr/prototype_s390 usr/src/pkgdefs/SUNWkdcu/prototype_s390 usr/src/pkgdefs/SUNWkey/prototype_s390 usr/src/pkgdefs/SUNWkrbr/prototype_s390 usr/src/pkgdefs/SUNWkrbu/prototype_s390 usr/src/pkgdefs/SUNWkvm.c/prototype_s390 usr/src/pkgdefs/SUNWkvm.d/prototype_s390 usr/src/pkgdefs/SUNWkvm.m/prototype_s390 usr/src/pkgdefs/SUNWkvm.u/prototype_s390 usr/src/pkgdefs/SUNWkvm.v/prototype_s390 usr/src/pkgdefs/SUNWkvmt200.v/prototype_s390 usr/src/pkgdefs/SUNWldomr.v/prototype_s390 usr/src/pkgdefs/SUNWldomu.v/prototype_s390 usr/src/pkgdefs/SUNWldskint/prototype_s390 usr/src/pkgdefs/SUNWlibsasl/prototype_s390 usr/src/pkgdefs/SUNWllc/prototype_s390 usr/src/pkgdefs/SUNWllcr/prototype_s390 usr/src/pkgdefs/SUNWlldap/prototype_s390 usr/src/pkgdefs/SUNWloc/prototype_s390 usr/src/pkgdefs/SUNWlp-cmds/prototype_s390 usr/src/pkgdefs/SUNWlpr-cmds/prototype_s390 usr/src/pkgdefs/SUNWluxd.u/prototype_s390 usr/src/pkgdefs/SUNWluxl/prototype_s390 usr/src/pkgdefs/SUNWmdar/prototype_s390 usr/src/pkgdefs/SUNWmdau/prototype_s390 usr/src/pkgdefs/SUNWmdb/prototype_s390 usr/src/pkgdefs/SUNWmdbdm/prototype_s390 usr/src/pkgdefs/SUNWmdbr/prototype_s390 usr/src/pkgdefs/SUNWmddr/prototype_s390 usr/src/pkgdefs/SUNWmdr/prototype_s390 usr/src/pkgdefs/SUNWmdu/prototype_s390 usr/src/pkgdefs/SUNWmibii/prototype_s390 usr/src/pkgdefs/SUNWmmsr/prototype_s390 usr/src/pkgdefs/SUNWmmsu/prototype_s390 usr/src/pkgdefs/SUNWmxfe/prototype_s390 usr/src/pkgdefs/SUNWn2cp.v/prototype_s390 usr/src/pkgdefs/SUNWn2cpact.v/prototype_s390 usr/src/pkgdefs/SUNWncar/prototype_s390 usr/src/pkgdefs/SUNWncau/prototype_s390 usr/src/pkgdefs/SUNWndmpr/prototype_s390 usr/src/pkgdefs/SUNWndmpu/prototype_s390 usr/src/pkgdefs/SUNWnetcat/prototype_s390 usr/src/pkgdefs/SUNWnfsckr/prototype_s390 usr/src/pkgdefs/SUNWnfscr/prototype_s390 usr/src/pkgdefs/SUNWnfscu/prototype_s390 usr/src/pkgdefs/SUNWnfsskr/prototype_s390 usr/src/pkgdefs/SUNWnfssr/prototype_s390 usr/src/pkgdefs/SUNWnfssu/prototype_s390 usr/src/pkgdefs/SUNWnisr/prototype_s390 usr/src/pkgdefs/SUNWnisu/prototype_s390 usr/src/pkgdefs/SUNWniumx.v/prototype_s390 usr/src/pkgdefs/SUNWntpr/prototype_s390 usr/src/pkgdefs/SUNWntpu/prototype_s390 usr/src/pkgdefs/SUNWnwamintr/prototype_s390 usr/src/pkgdefs/SUNWnwamintu/prototype_s390 usr/src/pkgdefs/SUNWnxge.u/prototype_s390 usr/src/pkgdefs/SUNWnxge.v/prototype_s390 usr/src/pkgdefs/SUNWocf/prototype_s390 usr/src/pkgdefs/SUNWocfd/prototype_s390 usr/src/pkgdefs/SUNWocfh/prototype_s390 usr/src/pkgdefs/SUNWocfr/prototype_s390 usr/src/pkgdefs/SUNWonfmes/prototype_s390 usr/src/pkgdefs/SUNWonmtst.u/prototype_s390 usr/src/pkgdefs/SUNWonmtst.v/prototype_s390 usr/src/pkgdefs/SUNWonzfs/prototype_s390 usr/src/pkgdefs/SUNWopenssl-commands/prototype_s390 usr/src/pkgdefs/SUNWopenssl-include/prototype_s390 usr/src/pkgdefs/SUNWopenssl-libraries/prototype_s390 usr/src/pkgdefs/SUNWopenssl-man/prototype_s390 usr/src/pkgdefs/SUNWopensslr/prototype_s390 usr/src/pkgdefs/SUNWosdem/prototype_s390 usr/src/pkgdefs/SUNWpamsc/prototype_s390 usr/src/pkgdefs/SUNWpapi/prototype_s390 usr/src/pkgdefs/SUNWpcan/prototype_s390 usr/src/pkgdefs/SUNWpcelx/prototype_s390 usr/src/pkgdefs/SUNWpcmci/prototype_s390 usr/src/pkgdefs/SUNWpcmcu/prototype_s390 usr/src/pkgdefs/SUNWpcmem/prototype_s390 usr/src/pkgdefs/SUNWpcr/prototype_s390 usr/src/pkgdefs/SUNWpcser/prototype_s390 usr/src/pkgdefs/SUNWpcu/prototype_s390 usr/src/pkgdefs/SUNWpcwl/prototype_s390 usr/src/pkgdefs/SUNWpd/prototype_s390 usr/src/pkgdefs/SUNWpdu/prototype_s390 usr/src/pkgdefs/SUNWperl584core/prototype_s390 usr/src/pkgdefs/SUNWperl584usr/prototype_s390 usr/src/pkgdefs/SUNWphx/prototype_s390 usr/src/pkgdefs/SUNWpiclh/prototype_s390 usr/src/pkgdefs/SUNWpiclr/prototype_s390 usr/src/pkgdefs/SUNWpiclu/prototype_s390 usr/src/pkgdefs/SUNWpl5p/prototype_s390 usr/src/pkgdefs/SUNWpl5u/prototype_s390 usr/src/pkgdefs/SUNWpl5v/prototype_s390 usr/src/pkgdefs/SUNWpmr/prototype_s390 usr/src/pkgdefs/SUNWpmu/prototype_s390 usr/src/pkgdefs/SUNWpolkit/prototype_s390 usr/src/pkgdefs/SUNWpool/prototype_s390 usr/src/pkgdefs/SUNWpoold/prototype_s390 usr/src/pkgdefs/SUNWpoolr/prototype_s390 usr/src/pkgdefs/SUNWpowertop/prototype_s390 usr/src/pkgdefs/SUNWppm/prototype_s390 usr/src/pkgdefs/SUNWpppd/prototype_s390 usr/src/pkgdefs/SUNWpppdr/prototype_s390 usr/src/pkgdefs/SUNWpppdt/prototype_s390 usr/src/pkgdefs/SUNWpppdu/prototype_s390 usr/src/pkgdefs/SUNWpppg/prototype_s390 usr/src/pkgdefs/SUNWpppgS/prototype_s390 usr/src/pkgdefs/SUNWpsdpr/prototype_s390 usr/src/pkgdefs/SUNWpsf/prototype_s390 usr/src/pkgdefs/SUNWpsm-ipp/prototype_s390 usr/src/pkgdefs/SUNWpsm-lpd/prototype_s390 usr/src/pkgdefs/SUNWpsr/prototype_s390 usr/src/pkgdefs/SUNWpstl.u/prototype_s390 usr/src/pkgdefs/SUNWpsu/prototype_s390 usr/src/pkgdefs/SUNWqfed/prototype_s390 usr/src/pkgdefs/SUNWqos/prototype_s390 usr/src/pkgdefs/SUNWqosu/prototype_s390 usr/src/pkgdefs/SUNWrcapr/prototype_s390 usr/src/pkgdefs/SUNWrcapu/prototype_s390 usr/src/pkgdefs/SUNWrcmdc/prototype_s390 usr/src/pkgdefs/SUNWrcmdr/prototype_s390 usr/src/pkgdefs/SUNWrcmds/prototype_s390 usr/src/pkgdefs/SUNWrds/prototype_s390 usr/src/pkgdefs/SUNWrge/prototype_s390 usr/src/pkgdefs/SUNWrmvolmgr/prototype_s390 usr/src/pkgdefs/SUNWrmvolmgrr/prototype_s390 usr/src/pkgdefs/SUNWrmwbr/prototype_s390 usr/src/pkgdefs/SUNWrmwbu/prototype_s390 usr/src/pkgdefs/SUNWroute/prototype_s390 usr/src/pkgdefs/SUNWroutr/prototype_s390 usr/src/pkgdefs/SUNWrpcib/prototype_s390 usr/src/pkgdefs/SUNWrsg/prototype_s390 usr/src/pkgdefs/SUNWrsgk/prototype_s390 usr/src/pkgdefs/SUNWrsm/prototype_s390 usr/src/pkgdefs/SUNWrsmo/prototype_s390 usr/src/pkgdefs/SUNWrtls/prototype_s390 usr/src/pkgdefs/SUNWsacom/prototype_s390 usr/src/pkgdefs/SUNWsasnm/prototype_s390 usr/src/pkgdefs/SUNWsbp2/prototype_s390 usr/src/pkgdefs/SUNWsckm.u/prototype_s390 usr/src/pkgdefs/SUNWsckmr/prototype_s390 usr/src/pkgdefs/SUNWsckmu.u/prototype_s390 usr/src/pkgdefs/SUNWscmhdlr/prototype_s390 usr/src/pkgdefs/SUNWscplp/prototype_s390 usr/src/pkgdefs/SUNWscpr/prototype_s390 usr/src/pkgdefs/SUNWscpu/prototype_s390 usr/src/pkgdefs/SUNWscsa1394/prototype_s390 usr/src/pkgdefs/SUNWscsip/prototype_s390 usr/src/pkgdefs/SUNWsdcard/prototype_s390 usr/src/pkgdefs/SUNWses/prototype_s390 usr/src/pkgdefs/SUNWsfdr.u/prototype_s390 usr/src/pkgdefs/SUNWsfdrr.u/prototype_s390 usr/src/pkgdefs/SUNWsfe/prototype_s390 usr/src/pkgdefs/SUNWslpr/prototype_s390 usr/src/pkgdefs/SUNWslpu/prototype_s390 usr/src/pkgdefs/SUNWsmapi/prototype_s390 usr/src/pkgdefs/SUNWsmbfskr/prototype_s390 usr/src/pkgdefs/SUNWsmbfsr/prototype_s390 usr/src/pkgdefs/SUNWsmbfsu/prototype_s390 usr/src/pkgdefs/SUNWsmbskr/prototype_s390 usr/src/pkgdefs/SUNWsmbsr/prototype_s390 usr/src/pkgdefs/SUNWsmbsu/prototype_s390 usr/src/pkgdefs/SUNWsmedia/prototype_s390 usr/src/pkgdefs/SUNWsmediar/prototype_s390 usr/src/pkgdefs/SUNWsmpd/prototype_s390 usr/src/pkgdefs/SUNWsn1rint/prototype_s390 usr/src/pkgdefs/SUNWsn1uint/prototype_s390 usr/src/pkgdefs/SUNWsndmr/prototype_s390 usr/src/pkgdefs/SUNWsndmu/prototype_s390 usr/src/pkgdefs/SUNWspnego/prototype_s390 usr/src/pkgdefs/SUNWsra/prototype_s390 usr/src/pkgdefs/SUNWsrh/prototype_s390 usr/src/pkgdefs/SUNWssad/prototype_s390 usr/src/pkgdefs/SUNWsshcu/prototype_s390 usr/src/pkgdefs/SUNWsshdr/prototype_s390 usr/src/pkgdefs/SUNWsshdu/prototype_s390 usr/src/pkgdefs/SUNWsshr/prototype_s390 usr/src/pkgdefs/SUNWsshu/prototype_s390 usr/src/pkgdefs/SUNWstatl/prototype_s390 usr/src/pkgdefs/SUNWstc.u/prototype_s390 usr/src/pkgdefs/SUNWsvvs/prototype_s390 usr/src/pkgdefs/SUNWtavor/prototype_s390 usr/src/pkgdefs/SUNWtcpd/prototype_s390 usr/src/pkgdefs/SUNWtcpdS/prototype_s390 usr/src/pkgdefs/SUNWtecla/prototype_s390 usr/src/pkgdefs/SUNWter/prototype_s390 usr/src/pkgdefs/SUNWtftp/prototype_s390 usr/src/pkgdefs/SUNWtftpr/prototype_s390 usr/src/pkgdefs/SUNWtnetc/prototype_s390 usr/src/pkgdefs/SUNWtnetd/prototype_s390 usr/src/pkgdefs/SUNWtnetr/prototype_s390 usr/src/pkgdefs/SUNWtnfc/prototype_s390 usr/src/pkgdefs/SUNWtnfd/prototype_s390 usr/src/pkgdefs/SUNWtoo/prototype_s390 usr/src/pkgdefs/SUNWtsg/prototype_s390 usr/src/pkgdefs/SUNWtsr/prototype_s390 usr/src/pkgdefs/SUNWtsu/prototype_s390 usr/src/pkgdefs/SUNWuacm/prototype_s390 usr/src/pkgdefs/SUNWucbt/prototype_s390 usr/src/pkgdefs/SUNWudaplr/prototype_s390 usr/src/pkgdefs/SUNWudapltr/prototype_s390 usr/src/pkgdefs/SUNWudapltu/prototype_s390 usr/src/pkgdefs/SUNWudaplu/prototype_s390 usr/src/pkgdefs/SUNWudf/prototype_s390 usr/src/pkgdefs/SUNWudfr/prototype_s390 usr/src/pkgdefs/SUNWuedg/prototype_s390 usr/src/pkgdefs/SUNWugen/prototype_s390 usr/src/pkgdefs/SUNWugenu/prototype_s390 usr/src/pkgdefs/SUNWuksp/prototype_s390 usr/src/pkgdefs/SUNWukspfw/prototype_s390 usr/src/pkgdefs/SUNWuprl/prototype_s390 usr/src/pkgdefs/SUNWus.u/prototype_s390 usr/src/pkgdefs/SUNWusat10.v/prototype_s390 usr/src/pkgdefs/SUNWusb/prototype_s390 usr/src/pkgdefs/SUNWusbs/prototype_s390 usr/src/pkgdefs/SUNWusbu/prototype_s390 usr/src/pkgdefs/SUNWusbvc/prototype_s390 usr/src/pkgdefs/SUNWust1.v/prototype_s390 usr/src/pkgdefs/SUNWust2.v/prototype_s390 usr/src/pkgdefs/SUNWvscankr/prototype_s390 usr/src/pkgdefs/SUNWvscanr/prototype_s390 usr/src/pkgdefs/SUNWvscanu/prototype_s390 usr/src/pkgdefs/SUNWwbint/prototype_s390 usr/src/pkgdefs/SUNWwbsd/prototype_s390 usr/src/pkgdefs/SUNWwbsup/prototype_s390 usr/src/pkgdefs/SUNWwlanr/prototype_s390 usr/src/pkgdefs/SUNWwlanu/prototype_s390 usr/src/pkgdefs/SUNWwpar/prototype_s390 usr/src/pkgdefs/SUNWwpau/prototype_s390 usr/src/pkgdefs/SUNWxcu4/prototype_s390 usr/src/pkgdefs/SUNWxcu6/prototype_s390 usr/src/pkgdefs/SUNWxge/prototype_s390 usr/src/pkgdefs/SUNWxwdv/prototype_s390 usr/src/pkgdefs/SUNWypr/prototype_s390 usr/src/pkgdefs/SUNWypu/prototype_s390 usr/src/pkgdefs/SUNWzfskr/prototype_s390 usr/src/pkgdefs/SUNWzfsr/prototype_s390 usr/src/pkgdefs/SUNWzfsu/prototype_s390 usr/src/pkgdefs/SUNWzoneint/prototype_s390 usr/src/pkgdefs/SUNWzoner/prototype_s390 usr/src/pkgdefs/SUNWzoneu/prototype_s390 usr/src/pkgdefs/common_files/i.devlinktab_s390 usr/src/pkgdefs/common_files/i.kclasses_s390 usr/src/pkgdefs/common_files/i.minorperm_s390 usr/src/pkgdefs/common_files/i.sdconf_s390 usr/src/psm/stand/bootblks/hsfs/s390x/Makefile usr/src/psm/stand/bootblks/hsfs/s390x/unix/Makefile usr/src/psm/stand/bootblks/ufs/s390/Makefile usr/src/psm/stand/bootblks/ufs/s390/installboot.sh usr/src/psm/stand/bootblks/ufs/s390/mboot.S usr/src/psm/stand/bootblks/ufs/s390x/Makefile usr/src/psm/stand/bootblks/ufs/s390x/installboot.sh usr/src/psm/stand/bootblks/ufs/s390x/mboot.S usr/src/tools/kipl_cvt/kipl_cvt.c usr/src/ucbcmd/tr/tr.c usr/src/ucblib/libcurses/s390/Makefile usr/src/ucblib/libcurses/s390x/Makefile usr/src/ucblib/libtermcap/s390/Makefile usr/src/ucblib/libucb/s390/Makefile usr/src/ucblib/libucb/s390/sys/setjmp.s usr/src/ucblib/libucb/s390/sys/signal.c usr/src/ucblib/libucb/s390x/Makefile usr/src/ucblib/libucb/s390x/sys/setjmp.s usr/src/ucblib/libucb/s390x/sys/signal.c usr/src/uts/common/conf/param.c usr/src/uts/common/fs/fsflush.c usr/src/uts/common/fs/proc/prdata.h usr/src/uts/common/fs/proc/prvnops.c usr/src/uts/common/fs/ufs/ufs_dir.c usr/src/uts/common/fs/ufs/ufs_vnops.c usr/src/uts/common/fs/vnode.c usr/src/uts/common/krtld/kobj.c usr/src/uts/common/sys/elf_s390.h usr/src/uts/common/sys/isa_defs.h usr/src/uts/common/sys/prsystm.h usr/src/uts/common/sys/types.h usr/src/uts/common/sys/vfs_opreg.h usr/src/uts/common/vm/page.h usr/src/uts/common/vm/seg_map.c usr/src/uts/common/vm/seg_vn.c usr/src/uts/common/vm/vm_page.c usr/src/uts/common/vm/vm_pagelist.c usr/src/uts/common/vm/vpm.c usr/src/uts/s390x/conf/Mapfile usr/src/uts/s390x/kipl/kipl.s usr/src/uts/s390x/kipl/kipl_mem.c usr/src/uts/s390x/ml/interrupt.s usr/src/uts/s390x/ml/mach_locore.s usr/src/uts/s390x/ml/swtch.s usr/src/uts/s390x/os/mlsetup.c usr/src/uts/s390x/os/pgm_slih.c usr/src/uts/s390x/os/ppage.c usr/src/uts/s390x/os/sclp.c usr/src/uts/s390x/os/startup.c usr/src/uts/s390x/sys/machparam.h usr/src/uts/s390x/unix/Makefile usr/src/uts/s390x/vm/hat_s390x.c usr/src/uts/s390x/vm/htable.c usr/src/uts/s390x/vm/mach_vm_dep.c usr/src/uts/s390x/vm/mm_s390x.h usr/src/uts/zSeries/6to4tun/Makefile usr/src/uts/zSeries/Makefile.files usr/src/uts/zSeries/Makefile.rules usr/src/uts/zSeries/Makefile.zSeries.shared usr/src/uts/zSeries/aes/Makefile usr/src/uts/zSeries/amsrc2/Makefile usr/src/uts/zSeries/arp/Makefile usr/src/uts/zSeries/atun/Makefile usr/src/uts/zSeries/av1394/Makefile usr/src/uts/zSeries/bge/Makefile usr/src/uts/zSeries/blowfish/Makefile usr/src/uts/zSeries/consconfig/Makefile usr/src/uts/zSeries/conskbd/Makefile usr/src/uts/zSeries/crypto/Makefile usr/src/uts/zSeries/cryptoadm/Makefile usr/src/uts/zSeries/ctf/Makefile usr/src/uts/zSeries/dcam1394/Makefile usr/src/uts/zSeries/des/Makefile usr/src/uts/zSeries/dev/Makefile usr/src/uts/zSeries/dlcosmk/Makefile usr/src/uts/zSeries/dld/Makefile usr/src/uts/zSeries/dls/Makefile usr/src/uts/zSeries/dprov/Makefile usr/src/uts/zSeries/dscpmk/Makefile usr/src/uts/zSeries/ehci/Makefile usr/src/uts/zSeries/fasttrap/Makefile usr/src/uts/zSeries/fbt/Makefile usr/src/uts/zSeries/flowacct/Makefile usr/src/uts/zSeries/fs/proc/prmachdep.c usr/src/uts/zSeries/fssnap/Makefile usr/src/uts/zSeries/hci1394/Makefile usr/src/uts/zSeries/hid/Makefile usr/src/uts/zSeries/hidparser/Makefile usr/src/uts/zSeries/hubd/Makefile usr/src/uts/zSeries/ib/Makefile usr/src/uts/zSeries/ibcm/Makefile usr/src/uts/zSeries/ibd/Makefile usr/src/uts/zSeries/ibdm/Makefile usr/src/uts/zSeries/ibmf/Makefile usr/src/uts/zSeries/icmp/Makefile usr/src/uts/zSeries/icmp6/Makefile usr/src/uts/zSeries/idmap/Makefile usr/src/uts/zSeries/io/ccw/diag250_hl.c usr/src/uts/zSeries/io/ccw/diag250_ll.c usr/src/uts/zSeries/io/ccw/osa.c usr/src/uts/zSeries/ip/Makefile usr/src/uts/zSeries/ip6/Makefile usr/src/uts/zSeries/ipf/Makefile usr/src/uts/zSeries/ipgpc/Makefile usr/src/uts/zSeries/ipsecah/Makefile usr/src/uts/zSeries/ipsecesp/Makefile usr/src/uts/zSeries/kb8042/Makefile usr/src/uts/zSeries/keysock/Makefile usr/src/uts/zSeries/kmdb/Makefile usr/src/uts/zSeries/krtld/doreloc.c usr/src/uts/zSeries/krtld/mapfile usr/src/uts/zSeries/kssl/Makefile usr/src/uts/zSeries/lockstat/Makefile usr/src/uts/zSeries/md5/Makefile usr/src/uts/zSeries/mixer/Makefile usr/src/uts/zSeries/msgsys/Makefile usr/src/uts/zSeries/nattymod/Makefile usr/src/uts/zSeries/neti/Makefile usr/src/uts/zSeries/nfs_dlboot/Makefile usr/src/uts/zSeries/nfssrv/Makefile usr/src/uts/zSeries/ohci/Makefile usr/src/uts/zSeries/osa/Makefile usr/src/uts/zSeries/profile/Makefile usr/src/uts/zSeries/px_pci/Makefile usr/src/uts/zSeries/random/Makefile usr/src/uts/zSeries/rge/Makefile usr/src/uts/zSeries/rpcib/Makefile usr/src/uts/zSeries/rpcmod/Makefile usr/src/uts/zSeries/rsa/Makefile usr/src/uts/zSeries/rsm/Makefile usr/src/uts/zSeries/rts/Makefile usr/src/uts/zSeries/scsa1394/Makefile usr/src/uts/zSeries/scsa2usb/Makefile usr/src/uts/zSeries/sctp/Makefile usr/src/uts/zSeries/sctp6/Makefile usr/src/uts/zSeries/sdev_nsconfig_mod/Makefile usr/src/uts/zSeries/sdt/Makefile usr/src/uts/zSeries/semsys/Makefile usr/src/uts/zSeries/shmsys/Makefile usr/src/uts/zSeries/smbfs/Makefile usr/src/uts/zSeries/smbsrv/Makefile usr/src/uts/zSeries/sockfs/Makefile usr/src/uts/zSeries/softmac/Makefile usr/src/uts/zSeries/spdsock/Makefile usr/src/uts/zSeries/strplumb/Makefile usr/src/uts/zSeries/swrand/Makefile usr/src/uts/zSeries/sys/fasttrap_isa.h usr/src/uts/zSeries/sys/machs390x.h usr/src/uts/zSeries/syscall/cpcmd.c usr/src/uts/zSeries/systrace/Makefile usr/src/uts/zSeries/tcp/Makefile usr/src/uts/zSeries/tcp6/Makefile usr/src/uts/zSeries/tem/Makefile usr/src/uts/zSeries/tl/Makefile usr/src/uts/zSeries/tokenmt/Makefile usr/src/uts/zSeries/tswtclmt/Makefile usr/src/uts/zSeries/tun/Makefile usr/src/uts/zSeries/udp/Makefile usr/src/uts/zSeries/udp6/Makefile usr/src/uts/zSeries/ufs/Makefile usr/src/uts/zSeries/ugen/Makefile usr/src/uts/zSeries/uhci/Makefile usr/src/uts/zSeries/wc/Makefile usr/src/uts/zSeries/zfs/Makefile
diffstat 966 files changed, 38332 insertions(+), 2382 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/Makefile.master	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/Makefile.master	Mon Mar 23 14:01:42 2009 -0400
@@ -402,6 +402,10 @@
 		-_gcc=-Wa,-mzarch -_gcc=-fgnu89-inline
 s390_CFLAGS=	$(s390_XARCH) -_gcc=-gdwarf-2 -D__s390 -_gcc=-mbackchain \
 		-_gcc=-Wa,-mzarch -_gcc=-fgnu89-inline
+s390x_CCFLAGS=	$(s390x_XARCH) -_gcc=-gdwarf-2 -D__s390x -_gcc=-mbackchain \
+		-_gcc=-Wa,-mzarch
+s390_CCFLAGS=	$(s390_XARCH) -_gcc=-gdwarf-2 -D__s390 -_gcc=-mbackchain \
+		-_gcc=-Wa,-mzarch
 
 sparc_ASFLAGS=	$(sparc_AS_XARCH)
 sparcv9_ASFLAGS=$(sparcv9_AS_XARCH)
@@ -587,6 +591,7 @@
 #
 MAPFILE.NED_i386 =	$(SRC)/common/mapfiles/i386/map.noexdata
 MAPFILE.NED_sparc =
+MAPFILE.NED_s390  =
 MAPFILE.NED =		$(MAPFILE.NED_$(MACH))
 MAPFILE.PGA =		$(SRC)/common/mapfiles/$(MACH)/map.pagealign
 MAPFILE.NES =		$(SRC)/common/mapfiles/common/map.noexstk
@@ -609,6 +614,8 @@
 MAPFILE.NGB_amd64=	$(SRC)/common/mapfiles/gen/amd64_cc_map.noexeglobs
 $(__GNUC64)MAPFILE.NGB_amd64= \
 			$(SRC)/common/mapfiles/gen/amd64_gcc_map.noexeglobs
+MAPFILE.NGB_s390= 	$(SRC)/common/mapfiles/gen/s390_gcc_map.noexeglobs
+MAPFILE.NGB_s390x= 	$(SRC)/common/mapfiles/gen/s390x_gcc_map.noexeglobs
 MAPFILE.NGB =		$(MAPFILE.NGB_$(MACH))
 
 #
@@ -789,23 +796,11 @@
 # Pass -Y flag to cpp (method of which is release-dependent)
 CCYFLAG=		-Y I,
 
-sparc_BDIRECT=	-Bdirect
-i386_BDIRECT=	-Bdirect
-s390_BDIRECT=	
-BDIRECT=	$($(MACH)_BDIRECT)
+BDIRECT=	-Bdirect
 BDYNAMIC=	-Bdynamic
-sparc_BLOCAL=	-Blocal
-i386_BLOCAL=	-Blocal
-s390_BLOCAL=	
-BLOCAL=		$($(MACH)_BLOCAL)
-sparc_BNODIRECT=-Bdirect
-i386_BNODIRECT=	-Bdirect
-s390_BNODIRECT=	
-BNODIRECT=	$($(MACH)_BNODIRECT)
-sparc_BREDUCE=	-Breduce
-i386_BREDUCE=	-Breduce
-s390_BREDUCE=	
-BREDUCE=	$($(MACH)_BREDUCE)
+BLOCAL=		-Blocal
+BNODIRECT=	-Bnodirect
+BREDUCE=	-Breduce
 BSTATIC=	-Bstatic
 
 ZDEFS=		-zdefs
--- a/usr/src/Makefile.s390x	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/Makefile.s390x	Mon Mar 23 14:01:42 2009 -0400
@@ -34,17 +34,17 @@
 # that will generate zArchitecture opcodes
 #
 
-s390x_CC=		$(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc
-s390x_CCC=		$(ONBLD_TOOLS)/bin/$(MACH)/cw -_g++
+SPECS=			-_gcc=-specs=$(SRC)/ldspec.s390
+s390x_CC=		$(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc $(SPECS)
+s390x_CCC=		$(ONBLD_TOOLS)/bin/$(MACH)/cw -_g++ $(SPECS)
 s390x_CPP=		$(GNU_ROOT)/bin/cpp
-#s390x_AS=		$(ONBLD_TOOLS)/bin/$(NATIVE_MACH)/aw
 s390x_AS=		$(GNU_ROOT)/bin/gcc -c -x assembler-with-cpp -march=z9-109
-s390x_LD=		$(GNU_ROOT)/bin/ld -melf64_s390 --enable-new-dtags
-s390x_LINT=		$(SPRO_VROOT)/bin/lint -D__s390 -D__s390x -Ds390 -Ds390x -Usparc -U__sparc 
-s390_CC=		$(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc -_gcc=-m31
-s390_CCC=		$(ONBLD_TOOLS)/bin/$(MACH)/cw -_g++ -_gcc=-m31
+s390x_LD=		$(HOME)/bin/ld -z target=s390 -64 
+s390x_LINT=		$(SPRO_VROOT)/bin/lint -D__s390 -D__s390x -Ds390 -Ds390x -Usparc -U__sparc -D__SIZE_TYPE__=ulong_t -D__WCHAR_TYPE__=ushort_t
+s390_CC=		$(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc -_gcc=-m31 $(SPECS)
+s390_CCC=		$(ONBLD_TOOLS)/bin/$(MACH)/cw -_g++ -_gcc=-m31 $(SPECS)
 s390_CPP=		$(GNU_ROOT)/bin/cpp
 s390_AS=		$(GNU_ROOT)/bin/gcc -c -x assembler-with-cpp -march=z9-109 -m31 -Wa,-mzarch
-s390_LD=		$(GNU_ROOT)/bin/ld -melf_s390 --enable-new-dtags
-s390_LINT=		$(SPRO_VROOT)/bin/lint -D__s390 -Ds390 -Usparc -U__sparc
+s390_LD=		$(HOME)/bin/ld -z target=s390 
+s390_LINT=		$(SPRO_VROOT)/bin/lint -D__s390 -Ds390 -Usparc -U__sparc -D__SIZE_TYPE__=ulong_t -D__WCHAR_TYPE__=ushort_t
 CW_NO_SHADOW=		1
--- a/usr/src/cmd/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -244,7 +244,6 @@
 	mail		\
 	mailx		\
 	makekey		\
-	mdb		\
 	mesg		\
 	mkdir		\
 	mkfifo		\
@@ -292,8 +291,6 @@
 	plimit		\
 	policykit	\
 	pools		\
-	power		\
-	powertop	\
 	ppgsz		\
 	pg		\
 	plockstat	\
@@ -420,7 +417,6 @@
 	vt		\
 	w		\
 	wall		\
-	wbem		\
 	wc		\
 	which		\
 	who		\
@@ -445,6 +441,10 @@
 	zonename	\
 	zpool		\
 	ztest
+#
+#	Temporary hack to remove from COMMON_SUBDIRS until mdb is coded for System z
+#
+#	mdb		\
 
 $(CLOSED_BUILD)COMMON_SUBDIRS += \
 	$(CLOSED)/cmd/dodatadm	\
@@ -473,8 +473,11 @@
 	biosdev		\
 	diskscan	\
 	OWconfig	\
+	power		\
+	powertop	\
 	rtc		\
 	ucodeadm	\
+	wbem		\
 	xvm
 
 sparc_SUBDIRS=		\
@@ -484,12 +487,15 @@
 	fps		\
 	fruadm		\
 	oplhpd		\
+	power		\
+	powertop	\
 	prtdscp		\
 	prtfru		\
 	scadm		\
 	sckmd		\
 	sf880drd	\
-	vntsd
+	vntsd		\
+	wbem		
 
 #
 # Commands that are messaged.  Note that 'lp' and 'man' come first
--- a/usr/src/cmd/Makefile.cmd	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/Makefile.cmd	Mon Mar 23 14:01:42 2009 -0400
@@ -135,17 +135,13 @@
 ISAEXEC=	$(ROOT)/usr/lib/isaexec
 PLATEXEC=	$(ROOT)/usr/lib/platexec
 
-s390_XLDLIBS=	-ldl -lgcc_s
+s390_XLDLIBS=	-lgcc_s
 XLDLIBS=	$($(MACH)_XLDLIBS)
-LDLIBS =	$(LDLIBS.cmd:-L%=-L% -Wl,--rpath-link %) $(XLDLIBS)
-
-sparc_MAPFILES=	$(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
-i386_MAPFILES= 	$(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
-s390_MAPFILES= 	
+LDLIBS =	$(LDLIBS.cmd) $(XLDLIBS)
 
 LDFLAGS.cmd = \
 	$(BDIRECT) $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) \
-	$($(MACH)_MAPFILES)
+	$(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
 
 LDFLAGS =	$(LDFLAGS.cmd)
 
@@ -499,11 +495,11 @@
 # This flag is being added only for SCO (x86) compatibility
 i386_SPFLAG=    -D_iBCS2
 sparc_SPFLAG=
-s390x_SPFLAG=
+s390_SPFLAG=
 
 iBCS2FLAG = $($(MACH)_SPFLAG)
 
 # This flag is for programs which should not build a 32-bit binary
 sparc_64ONLY= $(POUND_SIGN)
-s390x_64ONLY= $(POUND_SIGN)
+s390_64ONLY= $(POUND_SIGN)
 64ONLY=	 $($(MACH)_64ONLY)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/abi/spectrans/parser/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# cmd/abi/spectrans/parser/s390x/Makefile
+
+.KEEP_STATE:
+
+include		../Makefile.targ
--- a/usr/src/cmd/abi/spectrans/parser/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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 2008 Sine Nomine Associates. All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# cmd/abi/spectrans/parser/s390x/Makefile
-
-.KEEP_STATE:
-
-include		../Makefile.targ
--- a/usr/src/cmd/agents/snmp/parser/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/agents/snmp/parser/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -71,7 +71,7 @@
 DEFINES= -D$(TARG_SYS)
 
 $(S390_BLD)CPPFLAGS +=	-I$(ROOT)/usr/include
-$(S390_BLD)LDFLAGS +=	-L $(ROOT)/usr/lib/s390x -Wl,-rpath-link=$(ROOT)/usr/lib/s390x
+$(S390_BLD)LDFLAGS +=	-L $(ROOT)/usr/lib/s390x -Wl,-R=$(ROOT)/usr/lib/s390x
 
 CPPFLAGS += -I. -I../snmplib -I../../include/netmgt
 
--- a/usr/src/cmd/agents/snmp/snmplib/test/madman_api_test.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/agents/snmp/snmplib/test/madman_api_test.c	Mon Mar 23 14:01:42 2009 -0400
@@ -817,7 +817,7 @@
 	struct timeval timeout;
 	char targets[1000];
 	char target[1000];
-	char c;
+	int c;
 	char *ptr;
 	int i = 0;
 	Target *t;
--- a/usr/src/cmd/agents/snmp/snmplib/test/madman_api_test_2.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/agents/snmp/snmplib/test/madman_api_test_2.c	Mon Mar 23 14:01:42 2009 -0400
@@ -802,7 +802,7 @@
 	struct timeval timeout;
 	char targets[1000];
 	char target[1000];
-	char c;
+	int c;
 	char *ptr;
 	int i = 0;
 	Target *t;
--- a/usr/src/cmd/agents/snmp/snmprelayd/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/agents/snmp/snmprelayd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -115,17 +115,13 @@
 MYLIBS=	../agent/$(MACH)/libssagent.so.$(EXT) ../snmplib/$(MACH)/libssasnmp.so.$(EXT)
 MYLINKLIBS += -L../agent/$(MACH) -lssagent -L../snmplib -lssasnmp
 
-LIBS=	-lsocket -lnsl
-#LIBS=	-lsocket -lnsl -ll
+LIBS=	-L$(ROOT)/usr/lib -lsocket -lnsl -ll
 
 # snmpdx has a name clash with main() and libl.so.1.  However, snmpdx must
 # still export a number of "yy*" (libl) interfaces, and interfaces for
 # libssagent.so.1.  Reduce all other symbols to local scope.
 MAPFILES +=	$(MAPFILE.INT) $(MAPFILE.LEX) $(MAPFILE.NGB)
-sparc_MAPOPTS = $(MAPFILES:%=-M%)
-i386_MAPOPTS =	$(MAPFILES:%=-M%)
-s390_MAPOPTS =	$(MAPFILES:%=-_gcc=--version-script=%)
-MAPOPTS =	$($(MACH)_MAPOPTS)
+MAPOPTS = $(MAPFILES:%=-M%)
 
 CPPFLAGS +=	-I. -I../agent -I../snmplib -I../../include/netmgt -I${BIN}
 CFLAGS +=	-c -D$(TARG_SYS)
--- a/usr/src/cmd/backup/dump/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/backup/dump/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -71,7 +71,7 @@
 		-D_LARGEFILE64_SOURCE=1
 LIBDUMP=	../lib/libdump.a
 LINTLIBDUMP=	../lib/llib-ldump.ln -lkstat
-s390_XLDLIBS=	-ldl -lgcc_s
+s390_XLDLIBS=	-lgcc_s
 XLDLIBS=	$($(MACH)_XLDLIBS)
 LDLIBS +=	$(BSTATIC) -L../lib -ldump $(BDYNAMIC) \
 		-lsocket -lnsl -ladm -lm -lkstat $(XLDLIBS)
--- a/usr/src/cmd/backup/restore/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/backup/restore/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -46,7 +46,7 @@
 			$(CPPFLAGS.master) -D_LARGEFILE64_SOURCE=1
 LIBDUMP=	../lib/libdump.a
 LINTLIBDUMP=	../lib/llib-ldump.ln
-s390_XLDLIBS=	-ldl -lgcc_s
+s390_XLDLIBS=	-lgcc_s
 XLDLIBS=	$($(MACH)_XLDLIBS)
 LDLIBS +=	$(BSTATIC) -L../lib -ldump $(BDYNAMIC) -lsocket -lnsl -lsec $(XLDLIBS)
 
--- a/usr/src/cmd/cmd-inet/usr.bin/nca/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/cmd-inet/usr.bin/nca/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -48,8 +48,6 @@
 INC_PATH +=	../../../../uts/common/inet/nca -I.
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(INC_PATH)
-s390_LDLIBS =	-L$(ROOT)/usr/lib -lc -ldl
-LDLIBS =	$($(MACH)_LDLIBS)
 
 .KEEP_STATE:
 
--- a/usr/src/cmd/cmd-inet/usr.lib/wanboot/netbootinfo/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/wanboot/netbootinfo/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -33,9 +33,7 @@
 
 # The OpenSSL libraries need to be linked against in order to resolve
 # references made to them by libwanboot.
-s390_XLDLIBS=	-lssl -L$(ROOT)/usr/lib -lcrypto
-XLDLIBS=	$($(MACH)_XLDLIBS)
-LDLIBS +=	-lwanbootutil -lwanboot $(OPENSSL_LDFLAGS) $(XLDLIBS)
+LDLIBS +=	-lwanbootutil -lwanboot $(OPENSSL_LDFLAGS)
 CPPFLAGS +=     -I$(CMNCRYPTDIR)
 
 all:		$(PROG)
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -49,8 +49,7 @@
 		-DSOLARIS_GSS_USEROK -DSOLARIS_PRIVS
 LDLIBS +=	-lsocket -lnsl -lpam -lbsm -lsendfile -lgss
 YFLAGS +=	-d
-s390_LDDIR=	-L$(ROOT)/usr/lib -lmd -lmp -lscf -luutil -ldl -lgen 
-LDDIR=		$($(MACH)_LDDIR)
+LDDIR=		-L$(ROOT)/usr/lib
 
 in.ftpd :=	LDFLAGS += $(MAPFILE.NGB:%=-M%)
 
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -60,8 +60,8 @@
 CPPFLAGS +=     -DSYSV -DBSD_COMP -I$(CMDINETCOMMONDIR) -I.
 
 CFLAGS += $(XSTRCONST)
-LDLIBS += -lipsecutil -lnsl
-$(SOCKETPROG)	:=      LDLIBS += -lsocket
+LDLIBS += -L$(ROOT)/usr/lib -lipsecutil -lnsl -L$(ROOT)/usr/sfw/lib -lcrypto
+$(SOCKETPROG)	:=      LDLIBS += -lsocket 
 
 .KEEP_STATE:
 
--- a/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1789,7 +1789,7 @@
 	struct sockaddr *sock;
 	struct sockaddr_in *sin;
 	struct sockaddr_in6 *sin6;
-	size_t sock_len;
+	socklen_t sock_len;
 
 	sock = (struct sockaddr *)malloc(sizeof (struct sockaddr_in6));
 	if (sock == NULL) {
--- a/usr/src/cmd/devfsadm/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/devfsadm/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -36,6 +36,4 @@
 
 GSHARED +=	-L$(ROOT)/usr/lib
 
-devfsadm := LDFLAGS += -Wl,--export-dynamic
-
 install: all
--- a/usr/src/cmd/dtrace/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/dtrace/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,7 +30,11 @@
 
 include ../Makefile.cmd
 
-SUBDIRS=	$(MACH) demo test
+sparc_SUBDIRS=	test
+i386_SUBDIRS=	test
+s390_SUBDIRS=
+
+SUBDIRS=	$(MACH) demo $($(MACH)_SUBDIRS)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all	:=	TARGET = all
--- a/usr/src/cmd/dtrace/dtrace.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/dtrace/dtrace.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1161,7 +1161,8 @@
 
 	int done = 0, mode = 0;
 	int err, i;
-	char c, *p, **v;
+	int c;
+	char *p, **v;
 	struct ps_prochandle *P;
 	pid_t pid;
 
--- a/usr/src/cmd/dtrace/test/tst/common/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/dtrace/test/tst/common/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -47,7 +47,9 @@
 
 ustack/tst.bigstack.exe := COPTFLAG += -xO1
 
-GCC = $(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc
+s390_GCCOPTS = -_gcc=-m31 -_gcc=-specs=$(SRC)/ldspec.s390 -I$(ROOT)/usr/include -L$(ROOT)/usr/lib
+GCCOPTS = $($(MACH)_GCCOPTS)
+GCC = $(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc $(GCCOPTS)
 
 nfs/%.o: $(SNOOPDIR)/%.c
 	$(COMPILE.c) -o $@ $< -I$(SNOOPDIR)
--- a/usr/src/cmd/ed/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ed/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -46,10 +46,7 @@
 LDLIBS += -lmapmalloc -lgen -lcrypt_i
 XGETFLAGS += -a -x ed.xcl
 
-sparc_MAPFILEINT = ../expr/mapfile-intf
-i386_MAPFILEINT = ../expr/mapfile-intf
-s390_MAPFILEINT =
-MAPFILE.INT =	$($(MACH)_MAPFILEINT)
+MAPFILE.INT = ../expr/mapfile-intf
 LDFLAGS +=	$(MAPFILE.INT:%=-M%)
 
 POFILE= ed_cmd.po
--- a/usr/src/cmd/eeprom/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/eeprom/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -33,7 +33,7 @@
 CFLAGS +=	-I../../boot/bootadm
 LINTFLAGS +=	-I../../boot/bootadm
 
-OBJS += benv.o benv_kvm.o
+OBJS += benv.o
 
 .KEEP_STATE:
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/eeprom/s390/benv.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+int
+main(int argc, char **argv)
+{
+	fprintf(stderr,"eeprom does nothing on System z\n");
+	return(0);
+}
--- a/usr/src/cmd/egrep/egrep.y	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/egrep/egrep.y	Mon Mar 23 14:01:42 2009 -0400
@@ -649,7 +649,7 @@
 int
 main(int argc, char **argv)
 {
-	char c;
+	int  c;
 	char nl = '\n';
 	int errflag = 0;
 	
--- a/usr/src/cmd/filebench/common/flowop_library.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/filebench/common/flowop_library.c	Mon Mar 23 14:01:42 2009 -0400
@@ -419,7 +419,11 @@
     caddr_t *iobufp, fbint_t iosize)
 {
 	long memsize;
-	size_t memoffset;
+#ifdef _LP64
+	uint64_t memoffset;
+#else
+	uint32_t memoffset;
+#endif
 
 	if (iosize == 0) {
 		filebench_log(LOG_ERROR, "zero iosize for thread %s",
--- a/usr/src/cmd/fm/eversholt/files/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/eversholt/files/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -25,6 +25,7 @@
 #
 #ident	"%Z%%M%	%I%	%E% CP"
 
-EFT_COMMON_FILES= pci.eft
+SUBDIRS=zSeries
+EFT_COMMON_FILES= 
 
 include ../Makefile.com
--- a/usr/src/cmd/fm/fmd/Makefile.fmd	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/fmd/Makefile.fmd	Mon Mar 23 14:01:42 2009 -0400
@@ -76,11 +76,7 @@
 PROG = fmd
 MANIFEST = ../common/$(PROG).xml
 
-sparc_MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern
-i386_MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern
-s390_MAPFILE-DMOD =
-MAPFILE-DMOD = $($(MACH)_MAPFILE-DMOD)
-
+MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern
 
 ROOTPDIR = $(ROOT)/usr/lib/fm/$(PROG)
 ROOTVDIR = $(ROOT)/var/fm/$(PROG)
--- a/usr/src/cmd/fm/fmd/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/fmd/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -26,7 +26,6 @@
 
 include ../../../Makefile.cmd
 
-LDFLAGS += -Wl,--export-dynamic
 DMODLDLIBS = -L$(ROOT)/usr/lib -ldl -lmd
 
 include ../Makefile.fmd
--- a/usr/src/cmd/fm/modules/Makefile.plugin	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/modules/Makefile.plugin	Mon Mar 23 14:01:42 2009 -0400
@@ -68,28 +68,22 @@
 DMODLINTTGT = $(DMOD:%=lint_dmod)
 DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln)
 
-sparc_APIMAP = -M../../../fmd/common/fmd_api.map
-i386_APIMAP = -M../../../fmd/common/fmd_api.map
-s390_APIMAP = 
-APIMAP = $($(MACH)_APIMAP)
-sparc_FMRIMAP = -M../../../fmd/common/fmd_fmri.map
-i386_FMRIMAP = -M../../../fmd/common/fmd_fmri.map
-s390_FMRIMAP = 
-FMRIMAP = $($(MACH)_FMRIMAP)
+APIMAP = ../../../fmd/common/fmd_api.map
+FMRIMAP = ../../../fmd/common/fmd_fmri.map
 
 CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
 CFLAGS += -G $(XREGSFLAG) 
 
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
-LDFLAGS += $(ZDEFS) $(ZTEXT) $(ZIGNORE)
+sparc_XLDFLAGS = $(ZTEXT)
+i386_XLDFLAGS = $(ZTEXT)
+s390_XLDFLAGS = 
+XLDFLAGS = $($(MACH)_XLDFLAGS)
+LDFLAGS += $(ZDEFS) $(ZIGNORE) $(XLDFLAGS)
 
-sparc_MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern
-i386_MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern
-s390_MAPFILE-DMOD = 
-MAPFILE-DMOD = $($(MACH)_MAPFILE-DMOD)
+MAPFILE-DMOD = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern
 
-
-$(PROG) := LDFLAGS += $(APIMAP) $(FMRIMAP)
+$(PROG) := LDFLAGS += -M$(APIMAP) -M$(FMRIMAP)
 $(PROG) := LDLIBS += -lnvpair -lc
 
 all: $(PROG) $(DMODPROG)
--- a/usr/src/cmd/fm/modules/common/cpumem-retire/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/modules/common/cpumem-retire/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -47,3 +47,5 @@
 
 $(SPARC_BLD)LDFLAGS += -R/usr/lib/fm
 $(SPARC_BLD)LDLIBS += -L$(ROOTLIB)/fm -lfmd_agent
+$(S390_BLD)LDFLAGS += -R/usr/lib/fm
+$(S390_BLD)LDLIBS += -L$(ROOTLIB)/fm -lfmd_agent
--- a/usr/src/cmd/fm/modules/common/cpumem-retire/cma_main.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/modules/common/cpumem-retire/cma_main.c	Mon Mar 23 14:01:42 2009 -0400
@@ -186,7 +186,7 @@
 	    cma_cpu_hc_retire },
 	{ "fault.cpu.*", FM_FMRI_SCHEME_CPU, FM_CPU_SCHEME_VERSION,
 	    cma_cpu_hc_retire },
-#elif defined(sun4v)
+#elif defined(sun4v) || defined(__s390__)
 	{ "fault.memory.page", FM_FMRI_SCHEME_MEM, FM_MEM_SCHEME_VERSION,
 	    cma_page_retire },
 	{ "fault.memory.dimm", FM_FMRI_SCHEME_MEM, FM_MEM_SCHEME_VERSION,
--- a/usr/src/cmd/fm/modules/common/eversholt/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/modules/common/eversholt/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -43,7 +43,8 @@
 
 include ../../Makefile.plugin
 
-CPPFLAGS += -DFMAPLUGIN -I$(EVERSRCDIR) -I.
+CPPFLAGS += -DFMAPLUGIN -I$(EVERSRCDIR) -I. -I$(ROOT)/usr/include
+LDFLAGS +=  -L$(ROOTLIB)
 
 $(PROG) := LDFLAGS += -R/usr/lib/fm
 $(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo
--- a/usr/src/cmd/fm/modules/common/snmp-trapgen/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/modules/common/snmp-trapgen/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -36,11 +36,11 @@
 
 include ../../Makefile.plugin
 
-SNMPLIBS = -lnetsnmp -lnetsnmpagent
+SNMPLIBS = -lnetsnmp -lnetsnmphelpers -lnetsnmpagent -lsocket
 lint := SNMPLIBS =
 
 CPPFLAGS += -I/usr/sfw/include
-LDFLAGS += -L/usr/sfw/lib -L$(ROOT)/usr/lib/fm -R/usr/sfw/lib:/usr/lib/fm
+LDFLAGS += -L$(ROOT)/usr/sfw/lib -L/usr/sfw/lib -L$(ROOT)/usr/lib/fm -R/usr/sfw/lib:/usr/lib/fm
 LINTFLAGS += -L$(ROOT)/usr/lib/fm
 LDLIBS += $(SNMPLIBS) -lfmd_msg
 
--- a/usr/src/cmd/fm/schemes/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -54,5 +54,9 @@
 CFLAGS64 += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
 CFLAGS64 += -G $(XREGSFLAG)
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D$(MACH) -I..
-LDFLAGS += $(ZTEXT) $(ZDEFS) $(ZIGNORE) -M$(MAPFILE)
+sparc_XLDFLAGS += $(ZTEXT)
+i386_XLDFLAGS += $(ZTEXT)
+s390_XLDFLAGS +=
+XLDFLAGS=$($(MACH)_XLDFLAGS)
+LDFLAGS += $(XLDFLAGS) $(ZDEFS) $(ZIGNORE) -M$(MAPFILE)
 LDLIBS += -lnvpair -lc
--- a/usr/src/cmd/fm/schemes/cpu/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/cpu/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,16 +28,12 @@
 
 include ../../Makefile.com
 
-MAPFILES = $(MAPFILE)
+SRCS = cpu.c
 
-SRCS = cpu.c
-OBJS += mapfile.o
-LDLIBS += ./mapfile.o -lkstat \
+LDLIBS += -lkstat \
 	-L$(ROOTLIB)/fm -ltopo
 LDFLAGS += -R/usr/lib/fm
 
 include ../../Makefile.targ
 
 install: all $(ROOTPROG)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/cpu/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/cpu/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,17 +30,13 @@
 include ../../Makefile.com
 include $(SRC)/Makefile.master.64
 
-MAPFILES = $(MAPFILE)                                                                                                               
-                                                                                                                                    
 SRCS = cpu.c
-OBJS += mapfile.o
+
 CPPFLAGS += -I.
-LDLIBS += -L$(ROOTLIB)/fm/$(MACH64) -lkstat\
-	-L$(ROOTLIB)/fm/$(MACH64) -ltopo
+LDLIBS += -L$(ROOTLIB)/fm/$(MACH64) -lkstat	\
+	-L$(ROOTLIB)/fm/$(MACH64) -ltopo	
 LDFLAGS += -R/usr/lib/fm/$(MACH64)
 
 include ../../Makefile.targ
 
 install: all $(ROOTPROG64)
-
-include ../../../../../Makefile.mapfilegnu                                                                                          
--- a/usr/src/cmd/fm/schemes/dev/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/dev/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -27,15 +27,10 @@
 #
 
 include ../Makefile.com
+include ../../Makefile.targ
 
-MAPFILES = $(MAPFILE)
-OBJS += mapfile.o
 LDLIBS += -ltopo
 LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
 LINTFLAGS += -L$(ROOT)/usr/lib/fm
 
-include ../../Makefile.targ
-
 install: all $(ROOTPROG)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/dev/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/dev/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,15 +29,10 @@
 
 include ../Makefile.com
 include $(SRC)/Makefile.master.64
-
-MAPFILES = $(MAPFILE)
-OBJS += mapfile.o
-LDLIBS += -ltopo
-LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64)
-LINTFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64)
-
 include ../../Makefile.targ
 
-install: all $(ROOTPROG64)
+LDLIBS += -ltopo
+LDFLAGS += -L$(ROOT)/usr/lib/fm/s390x -R/usr/lib/fm/s390x
+LINTFLAGS += -L$(ROOT)/usr/lib/fm/s390x
 
-include ../../../../../Makefile.mapfilegnu
+install: all $(ROOTPROG64)
--- a/usr/src/cmd/fm/schemes/fmd/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/fmd/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -27,15 +27,6 @@
 #
 
 include ../../Makefile.com
-
-MAPFILES = $(MAPFILE)
-OBJS += mapfile.o
-LDLIBS += -ltopo
-LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
-LINTFLAGS += -L$(ROOT)/usr/lib/fm
-
 include ../../Makefile.targ
 
 install: all $(ROOTPROG)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/fmd/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/fmd/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,15 +29,6 @@
 
 include ../../Makefile.com
 include $(SRC)/Makefile.master.64
-
-MAPFILES = $(MAPFILE)                                                                                                               
-OBJS += mapfile.o                                                                                                                   
-LDLIBS += -ltopo                                                                                                                    
-LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64)                                                                   
-LINTFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64)                                                                                    
-
 include ../../Makefile.targ
 
 install: all $(ROOTPROG64)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/hc/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/hc/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -27,15 +27,10 @@
 #
 
 include ../../Makefile.com
+install: all $(ROOTPROG)
 
-MAPFILES = $(MAPFILE)
-OBJS += mapfile.o
 LDLIBS += -ltopo
 LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
 LINTFLAGS += -L$(ROOT)/usr/lib/fm
 
-install: all $(ROOTPROG)
-
 include ../../Makefile.targ
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/hc/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/hc/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,15 +29,10 @@
 
 include ../../Makefile.com
 include $(SRC)/Makefile.master.64
-
-MAPFILES = $(MAPFILE)                                                                                                               
-OBJS += mapfile.o                                                                                                                   
-LDLIBS += -ltopo                                                                                                                    
-LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64)                                                                   
-LINTFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64)                                                                                    
-
 include ../../Makefile.targ
 
-install: all $(ROOTPROG64)
+LDLIBS += -ltopo
+LDFLAGS += -L$(ROOT)/usr/lib/fm/s390x -R/usr/lib/fm/s390x
+LINTFLAGS += -L$(ROOT)/usr/lib/fm/s390x
 
-include ../../../../../Makefile.mapfilegnu
+install: all $(ROOTPROG64)
--- a/usr/src/cmd/fm/schemes/legacy-hc/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/legacy-hc/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -27,15 +27,6 @@
 #
 
 include ../../Makefile.com
-
-MAPFILES = $(MAPFILE)
-OBJS += mapfile.o
-LDLIBS += -ltopo
-LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
-LINTFLAGS += -L$(ROOT)/usr/lib/fm
-
 include ../../Makefile.targ
 
 install: all $(ROOTPROG)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/legacy-hc/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/legacy-hc/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,15 +29,6 @@
 
 include ../../Makefile.com
 include $(SRC)/Makefile.master.64
-
-MAPFILES = $(MAPFILE)                                                                                                               
-OBJS += mapfile.o                                                                                                                   
-LDLIBS += -ltopo                                                                                                                    
-LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64)                                                                   
-LINTFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64)                                                                                   
-
 include ../../Makefile.targ
 
 install: all $(ROOTPROG64)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/mem/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/mem/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -27,15 +27,10 @@
 #
 
 include ../Makefile.com
-
-MAPFILES = $(MAPFILE)
-OBJS += mapfile.o
-LDLIBS += -ltopo
-LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
-LINTFLAGS += -L$(ROOT)/usr/lib/fm
-
 include ../../Makefile.targ
 
-install: all $(ROOTPROG)
+CPPFLAGS += -I$(ROOT)/usr/platform/s390x/include
+LDLIBS += -L$(ROOTLIB)/fm -lfmd_agent -ltopo 
+LDFLAGS += -R/usr/lib/fm
 
-include ../../../../../Makefile.mapfilegnu
+install: all $(ROOTPROG)
--- a/usr/src/cmd/fm/schemes/mem/s390/mem_disc.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/mem/s390/mem_disc.c	Mon Mar 23 14:01:42 2009 -0400
@@ -17,6 +17,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * Copyright 2008 Sine Nomine Associates.
+ * All rights reserved.
+ * Use is subject to license terms.
  */
 
 /*
--- a/usr/src/cmd/fm/schemes/mem/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/mem/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,15 +29,10 @@
 
 include ../Makefile.com
 include $(SRC)/Makefile.master.64
-
-MAPFILES = $(MAPFILE)                                                                                                               
-OBJS += mapfile.o                                                                                                                   
-LDLIBS += -ltopo                                                                                                                    
-LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64)                                                                   
-LINTFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64)                                                                                    
-
 include ../../Makefile.targ
 
-install: all $(ROOTPROG64)
+CPPFLAGS += -I$(ROOT)/usr/platform/s390x/include
+LDLIBS += -L$(ROOTLIB)/fm/$(MACH64) -lfmd_agent -ltopo 
+LDFLAGS += -R/usr/lib/fm/$(MACH64)
 
-include ../../../../../Makefile.mapfilegnu
+install: all $(ROOTPROG64)
--- a/usr/src/cmd/fm/schemes/mem/s390x/mem_disc.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/mem/s390x/mem_disc.c	Mon Mar 23 14:01:42 2009 -0400
@@ -17,10 +17,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
-/*                                                                  */
-/* Copyright 2008 Sine Nomine Associates.                           */
-/* All rights reserved.                                             */
-/* Use is subject to license terms.                                 */
+ *
+ * Copyright 2008 Sine Nomine Associates.
+ * All rights reserved.
+ * Use is subject to license terms.
  */
 
 /*
--- a/usr/src/cmd/fm/schemes/mod/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/mod/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,14 +28,10 @@
 
 include ../../Makefile.com
 
-MAPFILES = $(MAPFILE)
-OBJS += mapfile.o
-LDLIBS += -ltopo
-LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
-LINTFLAGS += -L$(ROOT)/usr/lib/fm
+LDLIBS += \
+	-L$(ROOTLIB)/fm -ltopo
+LDFLAGS += -R/usr/lib/fm
 
 include ../../Makefile.targ
 
 install: all $(ROOTPROG)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/mod/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/mod/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,13 +30,10 @@
 include ../../Makefile.com
 include $(SRC)/Makefile.master.64
 
-MAPFILES = $(MAPFILE)                                                                                                               
-OBJS += mapfile.o                                                                                                                   
-LDLIBS += -ltopo                                                                                                                    
-LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64)                                                                   
-LINTFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64)                                                                                    
+LDLIBS += \
+	-L$(ROOTLIB)/fm/$(MACH64) -ltopo
+LDFLAGS += -R/usr/lib/fm/$(MACH64)
+
 include ../../Makefile.targ
 
 install: all $(ROOTPROG64)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/pkg/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/pkg/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,14 +28,10 @@
 
 include ../../Makefile.com
 
-MAPFILES = $(MAPFILE)
-OBJS += mapfile.o
-LDLIBS += -ltopo
-LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
-LINTFLAGS += -L$(ROOT)/usr/lib/fm
+LDLIBS += \
+	-L$(ROOTLIB)/fm -ltopo
+LDFLAGS += -R/usr/lib/fm
 
 include ../../Makefile.targ
 
 install: all $(ROOTPROG)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/pkg/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/pkg/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,14 +30,10 @@
 include ../../Makefile.com
 include $(SRC)/Makefile.master.64
 
-MAPFILES = $(MAPFILE)                                                                                                               
-OBJS += mapfile.o                                                                                                                   
-LDLIBS += -ltopo                                                                                                                    
-LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64)                                                                   
-LINTFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64)                                                                                   
+LDLIBS += \
+	-L$(ROOTLIB)/fm/$(MACH64) -ltopo
+LDFLAGS += -R/usr/lib/fm/$(MACH64)
 
 include ../../Makefile.targ
 
 install: all $(ROOTPROG64)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/zfs/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/zfs/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -25,17 +25,8 @@
 #ident	"%Z%%M%	%I%	%E% SMI"
 
 include ../../Makefile.com
-
-MAPFILES = $(MAPFILE)
-OBJS += mapfile.o
-LDLIBS += -ltopo
-LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
-LINTFLAGS += -L$(ROOT)/usr/lib/fm
-
 include ../../Makefile.targ
 
 LDLIBS += -lzfs
 
 install: all $(ROOTPROG)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fm/schemes/zfs/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fm/schemes/zfs/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -27,16 +27,8 @@
 #
 include ../../Makefile.com
 include $(SRC)/Makefile.master.64
-
-MAPFILES = $(MAPFILE)                                                                                                               
-OBJS += mapfile.o                                                                                                                   
-LDLIBS += -ltopo                                                                                                                    
-LDFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64) -R/usr/lib/fm/$(MACH64)                                                                   
-LINTFLAGS += -L$(ROOT)/usr/lib/fm/$(MACH64)                                                                                   
 include ../../Makefile.targ
 
 LDLIBS += -lzfs
 
 install: all $(ROOTPROG64)
-
-include ../../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/fmli/menu/mcurrent.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fmli/menu/mcurrent.c	Mon Mar 23 14:01:42 2009 -0400
@@ -45,6 +45,7 @@
 
 menu_id	MNU_curid = -1;
 void	menu_index();
+static void	menu_show();
 
 int
 menu_current(mid)
@@ -110,7 +111,6 @@
 	int	scol;
 	int	sind;
 	struct menu_line	ml;
-	static void	menu_show();
 
 	vt_ctl(m->vid, CTGETSIZ, &rows, &cols);
 	huse = min(m->hwidth, cwidth = (cols - 1) / m->ncols);
--- a/usr/src/cmd/fmli/menu/stmenu.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fmli/menu/stmenu.c	Mon Mar 23 14:01:42 2009 -0400
@@ -46,6 +46,8 @@
 
 static char	*curstring;
 static int      menu_match();
+static void strtolower();
+static int  nocase_strncmp();
 /* mouse coordinates */
 extern int Mouse_row;
 extern int Mouse_col;
@@ -540,8 +542,6 @@
 	register int	start;
 	register int	count;
 	register char	*p;
-	static void strtolower();
-	static int  nocase_strncmp();
 	char badmatch[PATHSIZ];
 
 	start = m->index;
--- a/usr/src/cmd/fmli/oh/if_form.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fmli/oh/if_form.c	Mon Mar 23 14:01:42 2009 -0400
@@ -192,6 +192,7 @@
 static int fld_ck();
 static int is_valid();
 static struct fm_mn parse_form();
+static int chk_page();
 
 static struct actrec *Cur_rec;		/* current activation record */
 static char *Equal = "=";
@@ -989,7 +990,6 @@
 {
     register int n, page, fldnum;
     int savefield, savepage, retval;
-    static int chk_page();
 
     /*
      * Save current form page/field
--- a/usr/src/cmd/fmli/oh/if_init.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fmli/oh/if_init.c	Mon Mar 23 14:01:42 2009 -0400
@@ -225,6 +225,8 @@
 
 char *strnsave();
 static int settoggle();
+static char *set_default();
+static int center_it();
 static struct fm_mn Inits;
 
 /*
@@ -236,8 +238,6 @@
 {
 	register int i, numslks;
 	char  *permmsg, *get_def();
-	static char *set_default();
-	static int center_it();
 	static int free_inits = FALSE;
 	int sbutton;
 	FILE *fp;
--- a/usr/src/cmd/fmli/oh/scram.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fmli/oh/scram.c	Mon Mar 23 14:01:42 2009 -0400
@@ -69,6 +69,7 @@
 static int unpack();
 static int keysave();
 static int keyvalid();
+static void regetkey();
 
 /*
  *	scram -- Scramble an object and pack all its parts into an OEU package
@@ -77,8 +78,6 @@
 scram(file)
 register char *file;
 {
-	static void regetkey();
-
 	strcpy(Keyprompt, "Please enter scramble key: ");
 	strcpy(Srcfile, file);
 	get_string(regetkey, Keyprompt, "",
@@ -124,7 +123,6 @@
 {
 	struct ott_entry *entry, *path_to_ott();
 	struct stat buf;
-	static void regetkey();
 
 	if (t == TOK_CANCEL)
 		return (SUCCESS);
--- a/usr/src/cmd/fmli/oh/slk.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fmli/oh/slk.c	Mon Mar 23 14:01:42 2009 -0400
@@ -177,6 +177,7 @@
 
 static void showslks();
 static bool sfk_prompt();
+static  void	showslks();
 
 extern int Vflag;
 
@@ -513,7 +514,6 @@
 int flag;
 {
 	register int	i, more_slks;
-	static  void	showslks();
 
 #ifdef _DEBUG
 	_debug(stderr, "in setslk!\n");
--- a/usr/src/cmd/fmli/qued/multiline.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fmli/qued/multiline.c	Mon Mar 23 14:01:42 2009 -0400
@@ -39,6 +39,7 @@
 
 static token _fixed();
 static token _virtual();
+static int emptyrow();
 
 #define SCROLLSIZE	((Cfld->rows - 2 <= 0) ? 1 : Cfld->rows - 2)
 #define HALFSIZE	(int)(Cfld->rows / 2)
@@ -58,7 +59,6 @@
 {
 	register token rettok;
 	register int col;
-	static int emptyrow();
 
 	rettok = TOK_NOP;
 	switch (tok) {
--- a/usr/src/cmd/format/init_cs390.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/format/init_cs390.c	Mon Mar 23 14:01:42 2009 -0400
@@ -18,10 +18,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
-/*                                                                  */
-/* Copyright 2008 Sine Nomine Associates.                           */
-/* All rights reserved.                                             */
-/* Use is subject to license terms.                                 */
+ *
+ * Copyright 2008 Sine Nomine Associates.
+ * All rights reserved.
+ * Use is subject to license terms.
  */
 /*
  * Copyright 1996,1998,2000,2002 Sun Microsystems, Inc.  All rights reserved.
--- a/usr/src/cmd/fs.d/autofs/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fs.d/autofs/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -118,11 +118,11 @@
 		$(POST_PROCESS)
 
 $(SHARE):	$(SHAREOBJS)
-		$(LINK.c) -o $@ $(SHAREOBJS)
+		$(LINK.c) -o $@ $(SHAREOBJS) -L$(ROOT)/usr/lib
 		$(POST_PROCESS)
 
 $(UNSHARE):	$(UNSHAREOBJS)
-		$(LINK.c) -o $@ $(UNSHAREOBJS)
+		$(LINK.c) -o $@ $(UNSHAREOBJS) -L$(ROOT)/usr/lib
 		$(POST_PROCESS)
 
 $(ROOTSVCSYSTEM)/filesystem/%: %
--- a/usr/src/cmd/fs.d/cachefs/Makefile.cachefs	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fs.d/cachefs/Makefile.cachefs	Mon Mar 23 14:01:42 2009 -0400
@@ -50,7 +50,7 @@
 LIBRARYMT=	libcachefsmt.a
 CFSLIB=		$(CACHEFSDIR)/$(LIBRARY)
 CFSLIBMT=	$(CACHEFSDIR)/$(LIBRARYMT)
-LDLIBS +=	$(CFSLIB)
+LDLIBS +=	$(CFSLIB) -L$(ROOT)/usr/lib
 
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
--- a/usr/src/cmd/fs.d/cachefs/cfsd/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fs.d/cachefs/cfsd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -39,7 +39,12 @@
 		cfsd_logelem.o cfsd_cache.o cfsd_fscache.o cfsd_all.o \
 		cfsd_logfile.o cfsd_subr.o
 
-LDLIBSMT =	$(LDLIBS.cmd) $(CFSLIBMT) $(MDBUGLIB) -lnsl
+sparc_XLDLIBS =
+i386_XLDLIBS =
+s390_XLDLIBS = -lgcc_s
+XLDLIBS = $($(MACH)_XLDLIBS)
+
+LDLIBSMT =	$(LDLIBS.cmd) $(CFSLIBMT) $(MDBUGLIB) -lnsl $(XLDLIBS)
 include		../Makefile.cachefs
 
 MDBUGLIB=	../mdbug/libdbug.a
--- a/usr/src/cmd/fs.d/cachefs/share/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fs.d/cachefs/share/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -39,7 +39,7 @@
 PROGSRCS=	$(LIBPROG:%=%.c)
 
 $(LIBPROG): 	$(PROGOBJS)
-	$(LINK.c) -o $@ $(PROGOBJS)
+	$(LINK.c) -o $@ $(PROGOBJS) -L$(ROOT)/usr/lib
 	$(POST_PROCESS)
 
 clean:
--- a/usr/src/cmd/fs.d/cachefs/unshare/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fs.d/cachefs/unshare/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -39,7 +39,7 @@
 PROGSRCS=	$(LIBPROG:%=%.c)
 
 $(LIBPROG): 	$(PROGOBJS)
-	$(LINK.c) -o $@ $(PROGOBJS)
+	$(LINK.c) -o $@ $(PROGOBJS) -L$(ROOT)/usr/lib
 	$(POST_PROCESS)
 
 clean:
--- a/usr/src/cmd/fs.d/nfs/mount/mount.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fs.d/nfs/mount/mount.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1615,7 +1615,7 @@
 			fh3p->fh3_length =
 			    res.WNL_LOOKUP3res_u.res_ok.object.data.data_len;
 			memcpy(fh3p->fh3_u.data,
-			    &res.WNL_LOOKUP3res_u.res_ok.object.data.data_val,
+			    res.WNL_LOOKUP3res_u.res_ok.object.data.data_val,
 			    fh3p->fh3_length);
 
 			*fhp = (caddr_t)fh3p;
--- a/usr/src/cmd/fs.d/udfs/labelit/labelit.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fs.d/udfs/labelit/labelit.c	Mon Mar 23 14:01:42 2009 -0400
@@ -120,8 +120,9 @@
 			 */
 			options = optarg;
 			while (*options != '\0') {
-				switch (getsubopt(&options, labelit_subopts,
-						&value)) {
+				switch (getsubopt((char **)&options, 
+					        (char *const *)labelit_subopts,
+						(char **)&value)) {
 				case LVINFO1 :
 					set_flags |= SET_LVINFO1;
 					(void) convert_string(value,
--- a/usr/src/cmd/fs.d/udfs/mkfs/mkfs.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/fs.d/udfs/mkfs/mkfs.c	Mon Mar 23 14:01:42 2009 -0400
@@ -177,7 +177,7 @@
 static char *oldlabel;
 
 int
-main(int32_t argc, int8_t *argv[])
+main(int32_t argc, char *argv[])
 {
 	long i;
 	FILE *mnttab;
--- a/usr/src/cmd/geniconvtbl/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/geniconvtbl/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,7 +28,10 @@
 
 include	../Makefile.cmd
 
-SUBDIRS=	native $(MACH)
+sparc_SUBDIRS= 	native
+i386_SUBDIRS=	native
+s390_SUBDIRS=	native
+SUBDIRS=	$($(MACH)_SUBDIRS) $(MACH)
 $(BUILD64)SUBDIRS +=	$(MACH64)
 
 SAMPLES =	 samples
--- a/usr/src/cmd/geniconvtbl/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/geniconvtbl/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -90,7 +90,11 @@
 YFLAGS		+= -d -v
 CFLAGS 		+= -D_FILE_OFFSET_BITS=64
 
-$(ITM) :=	CFLAGS += $(GSHARED) $(C_PICFLAGS) $(ZTEXT) -h $@
+sparc_XZFLAGS=	$(ZTEXT)
+i386_XZFLAGS=	$(ZTEXT)
+s390_XZFLAGS=	
+XZFLAGS=	$($(MACH)_XZFLAGS)
+$(ITM) :=	CFLAGS += $(GSHARED) $(C_PICFLAGS) $(XZFLAGS) -h $@
 $(ITM) :=	CPPFLAGS += -D_REENTRANT 
 $(ITM) :=	sparc_CFLAGS += -xregs=no%appl
 $(ITM) :=	sparcv9_CFLAGS += -xregs=no%appl
--- a/usr/src/cmd/geniconvtbl/native/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/geniconvtbl/native/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -34,6 +34,8 @@
 
 CC =		$(NATIVECC)
 LD =		$(NATIVELD)
+$(s390_BLD)CC=	$(XBUILDCC)
+$(s390_BLD)LD=	$(XBUILDCC)
 CFLAGS =	$(NATIVE_CFLAGS)
 CPPFLAGS =	$(MY_NATIVE_CPPFLAGS)
 LDFLAGS =	$(MY_NATIVE_LDFLAGS)
--- a/usr/src/cmd/hal/addons/network-devices/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/hal/addons/network-devices/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 
 LDLIBS +=	-lc -ldbus-1 -lhal -lglib-2.0 -ldbus-glib-1
 LDLIBS +=	-lnsl -lsocket
-LDLIBS +=	-L$(SFWLIBDIR) -R$(SFWLIBDIR) $(ZIGNORE) -lnetsnmp
+LDLIBS +=	-L$(ROOT)/$(SFWLIBDIR) -L$(SFWLIBDIR) -R$(SFWLIBDIR) $(ZIGNORE) -lnetsnmp
 
 CPPFLAGS +=	$(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS)
 CPPFLAGS +=	-I$(ROOT)/usr/include/hal -I../../hald -I../../utils
--- a/usr/src/cmd/hal/addons/network-devices/snmp.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/hal/addons/network-devices/snmp.c	Mon Mar 23 14:01:42 2009 -0400
@@ -71,7 +71,7 @@
 	struct snmp_session session, *ss;
 	struct snmp_pdu *request = NULL, *response = NULL;
 	oid Oid[MAX_OID_LEN];
-	unsigned int oid_len = MAX_OID_LEN;
+	size_t oid_len = MAX_OID_LEN;
 	GList *elem;
 
 	HAL_DEBUG(("scan_for_devices_using_snmp(0x%8.8x, %s, %s, %s)",
--- a/usr/src/cmd/hal/hald/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/hal/hald/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -48,7 +48,7 @@
 all install $(PROG) :=	LDLIBS += -lexpat
 
 CPPFLAGS +=	$(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS)
-CPPFLAGS +=	-I/usr/sfw/include
+CPPFLAGS +=	-I$(ROOT)/usr/sfw/include -I/usr/sfw/include
 C99MODE =	$(C99_ENABLE)
 
 all :=		TARGET= all
--- a/usr/src/cmd/hal/hald/solaris/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/hal/hald/solaris/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 $(ROOTLIBSVCMETHOD)/svc-hal:= FILEMODE = 555
 
 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS)
-CPPFLAGS += -I/usr/sfw/include
+CPPFLAGS += -I$(ROOT)/usr/sfw/include -I/usr/sfw/include
 C99MODE =	$(C99_ENABLE)
 
 .KEEP_STATE:
--- a/usr/src/cmd/hal/probing/network-printer/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/hal/probing/network-printer/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -35,7 +35,7 @@
 ROOTCMDDIR =	$(ROOTLIB_HAL)
 
 LDLIBS +=	-lc -ldbus-1 -lhal
-LDLIBS +=	-L$(SFWLIBDIR) -R$(SFWLIBDIR) $(ZIGNORE) -lnetsnmp
+LDLIBS +=	-L$(ROOT)/$(SFWLIBDIR) -L$(SFWLIBDIR) -R$(SFWLIBDIR) $(ZIGNORE) -lnetsnmp
 
 CPPFLAGS +=	$(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS)
 CPPFLAGS +=	-I$(ROOT)/usr/include/hal -I../../utils -I../../hald
--- a/usr/src/cmd/hal/probing/network-printer/probe-snmp.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/hal/probing/network-printer/probe-snmp.c	Mon Mar 23 14:01:42 2009 -0400
@@ -56,7 +56,7 @@
 	struct snmp_session session, *ss;
 	struct snmp_pdu *request = NULL, *result = NULL;
 	oid Oid[MAX_OID_LEN];
-	unsigned int oid_len = MAX_OID_LEN;
+	size_t oid_len = MAX_OID_LEN;
 
 	/* initialize the SNMP session */
 	snmp_sess_init(&session);
--- a/usr/src/cmd/halt/halt.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/halt/halt.c	Mon Mar 23 14:01:42 2009 -0400
@@ -87,6 +87,8 @@
 #define	CUR_ELFDATA	ELFDATA2MSB
 #elif defined(__i386)
 #define	CUR_ELFDATA	ELFDATA2LSB
+#elif defined(__s390)
+#define	CUR_ELFDATA	ELFDATA2MSB
 #endif
 
 static libzfs_handle_t *g_zfs;
--- a/usr/src/cmd/idmap/idmap/idmap_engine.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/idmap/idmap/idmap_engine.c	Mon Mar 23 14:01:42 2009 -0400
@@ -78,7 +78,7 @@
 static int
 options_parse(int argc, char *argv[], const char *options)
 {
-	char c;
+	int c;
 
 	optind = 1;
 
--- a/usr/src/cmd/intrstat/intrstat.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/intrstat/intrstat.c	Mon Mar 23 14:01:42 2009 -0400
@@ -356,7 +356,7 @@
 	sigset_t set;
 	timer_t tid;
 	char *end;
-	char c;
+	int c;
 	hrtime_t last, now;
 	dtrace_optval_t statustime;
 
--- a/usr/src/cmd/ipf/lib/common/ipft_td.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ipf/lib/common/ipft_td.c	Mon Mar 23 14:01:42 2009 -0400
@@ -139,7 +139,8 @@
 		(void) inet_aton(src, &ip->ip_dst);
 	}
 	ip->ip_len = sizeof(ip_t);
-	IP_HL_A(ip, sizeof(ip_t));
+	IP_HL_A(ip, ip->ip_len);
+//	IP_HL_A(ip, sizeof(ip_t));
 
 	s = strtok(misc, " :");
 	ip->ip_p = getproto(s);
--- a/usr/src/cmd/ipf/lib/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ipf/lib/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -6,4 +6,10 @@
 
 include ../Makefile.com
 
+#
+#	FIXME - circumvent bug with gcc 4.2 
+#		../common/ipft_ef.c:122: warning: large integer implicitly truncated to unsigned type
+#
+CFLAGS=	-_gcc=-w
+
 install: all
--- a/usr/src/cmd/ipf/lib/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ipf/lib/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -23,6 +23,11 @@
 #
 
 include ../Makefile.com
+#
+#	FIXME - circumvent bug with gcc 4.2 
+#		../common/ipft_ef.c:122: warning: large integer implicitly truncated to unsigned type
+#
+CFLAGS64 +=	-_gcc=-w
 include $(SRC)/lib/Makefile.lib.64
 
 install: all
--- a/usr/src/cmd/ipf/tools/ipmon.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ipf/tools/ipmon.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1043,7 +1043,7 @@
 	t += strlen(t);
 #endif
 #if defined(__sgi) || defined(_AIX51) || defined(__powerpc__) || \
-    defined(__arm__)
+    defined(__arm__) || defined(__s390)
 	if ((ipf->fl_group[0] == 255) && (ipf->fl_group[1] == '\0'))
 #else
 	if ((ipf->fl_group[0] == -1) && (ipf->fl_group[1] == '\0'))
--- a/usr/src/cmd/iscsi/iscsitgtd/main.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/iscsi/iscsitgtd/main.c	Mon Mar 23 14:01:42 2009 -0400
@@ -676,7 +676,8 @@
 int
 main(int argc, char **argv)
 {
-	char			c, *p, *door_name;
+	int			c;
+	char			*p, *door_name;
 	msg_t			*msg;
 	target_queue_t		*q;
 	port_args_t		port1, port2;
--- a/usr/src/cmd/iscsi/iscsitgtd/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/iscsi/iscsitgtd/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -25,7 +25,14 @@
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
 # cmd/iscsi/iscsitgt/s390/Makefile
+all:
+	@echo "S390X FIXME - Cannot use dtrace in x-build mode"
+	@touch s390_iscsi
 
-include ../Makefile.com
+install:
+	@echo "S390X FIXME - Cannot use dtrace in x-build mode"
+	@touch s390_iscsi
 
-install: all $(ROOTUSRSBINPROG32)
+#include ../Makefile.com
+#
+#install: all $(ROOTUSRSBINPROG32)
--- a/usr/src/cmd/krb5/kadmin/gui/native/Kadmin.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/krb5/kadmin/gui/native/Kadmin.c	Mon Mar 23 14:01:42 2009 -0400
@@ -297,7 +297,8 @@
 		handle_error(env, errno);
 		return (NULL);
 	}
-	for (i = 0; i < num_keysalts; grp[i] = i++);
+	for (i = 0; i < num_keysalts; i++)
+		grp[i] = i + 1;
 	for (i = 0; i < num_keysalts; i++) {
 		if (grp[i] != i)
 			continue;
--- a/usr/src/cmd/krb5/kadmin/kclient/kdyndns.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/krb5/kadmin/kclient/kdyndns.c	Mon Mar 23 14:01:42 2009 -0400
@@ -48,8 +48,9 @@
 int
 main(int argc, char **argv)
 {
-	char c, fqdn[MAXHOSTNAMELEN];
-	int ret = 0;
+	char fqdn[MAXHOSTNAMELEN];
+	int ret = 0,
+	    c;
 
 	(void) setlocale(LC_ALL, "");
 
--- a/usr/src/cmd/krb5/kadmin/kclient/ksetpw.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/krb5/kadmin/kclient/ksetpw.c	Mon Mar 23 14:01:42 2009 -0400
@@ -58,7 +58,8 @@
 	krb5_keytab kt = NULL;
 	krb5_kvno kvno = 1;
 	krb5_principal victim;
-	char c, *vprincstr, *ktname, *token, *lasts, *newpw;
+	int c;
+	char *vprincstr, *ktname, *token, *lasts, *newpw;
 	int result_code, i, len, nflag = 0;
 	krb5_data result_code_string, result_string;
 
--- a/usr/src/cmd/krb5/kadmin/kclient/ksmb.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/krb5/kadmin/kclient/ksmb.c	Mon Mar 23 14:01:42 2009 -0400
@@ -60,7 +60,8 @@
 int
 main(int argc, char **argv)
 {
-	char c, fqdn[MAXHOSTNAMELEN], server[MAXHOSTNAMELEN];
+	int c;
+	char fqdn[MAXHOSTNAMELEN], server[MAXHOSTNAMELEN];
 	char *newpw;
 	int ret = 0;
 
--- a/usr/src/cmd/krb5/krb5kdc/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/krb5/krb5kdc/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,6 +42,10 @@
 ROOTMANIFESTDIR=	$(ROOTSVCNETWORKSECURITY)
 
 CFLAGS += $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+#
+#	S390X FIXME - Avoid gnu warning
+#
+$(s390_BLD)CFLAGS += -_gcc=-Wstrict-overflow=0
 
 CPPFLAGS += \
 	-I$(SRC)/lib/gss_mechs/mech_krb5/include \
--- a/usr/src/cmd/ldapcachemgr/cachemgr.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ldapcachemgr/cachemgr.c	Mon Mar 23 14:01:42 2009 -0400
@@ -72,6 +72,7 @@
 static  int client_setadmin(admin_t *ptr);
 static int client_showstats(admin_t *ptr);
 static int is_root(int free_uc, char *dc_str, ucred_t **uc);
+static void client_killserver();
 
 #ifdef SLP
 int			use_slp = 0;
@@ -280,7 +281,6 @@
 	struct stat		buf;
 	sigset_t		myset;
 	struct sigaction	sighupaction;
-	static void		client_killserver();
 	int			debug_level = 0;
 
 	/* setup for localization */
--- a/usr/src/cmd/link/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/link/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -34,10 +34,6 @@
 
 clean $(XPG4) := OBJS += values-xpg4.o
 
-s390_XLIBS =	-L$(ROOT)/usr/lib -ldl 
-$(PROG)	:=	LDFLAGS += $($(MACH)_XLIBS)
-$(XPG4)	:=	LDFLAGS += $($(MACH)_XLIBS)
-
 FILEMODE= 0555
 
 .KEEP_STATE:
@@ -45,7 +41,7 @@
 all: $(PROG) $(XPG4)
 
 $(PROG) $(XPG4): $$(OBJS)
-	$(LINK.c) -o $@ $(OBJS)
+	$(LINK.c) -o $@ $(OBJS) -L$(ROOT)/usr/lib
 	$(POST_PROCESS)
 
 install: all $(ROOTUSRSBINPROG) $(ROOTXPG4PROG)
--- a/usr/src/cmd/lockstat/lockstat.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/lockstat/lockstat.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1018,7 +1018,7 @@
 	char *data_buf;
 	lsrec_t *lsp, **current, **first, **sort_buf, **merge_buf;
 	FILE *out = stdout;
-	char c;
+	int c;
 	pid_t child;
 	int status;
 	int i, j;
--- a/usr/src/cmd/lvm/md_monitord/md_monitord.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/lvm/md_monitord/md_monitord.c	Mon Mar 23 14:01:42 2009 -0400
@@ -380,7 +380,7 @@
 	boolean_e	startup = True;
 	boolean_e	verbose = False;
 	int		i;
-	char		c;
+	int		c;
 	md_error_t	status = mdnullerror;
 	struct sigaction act;
 	sigset_t	mask;
--- a/usr/src/cmd/lvm/util/metadevadm.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/lvm/util/metadevadm.c	Mon Mar 23 14:01:42 2009 -0400
@@ -56,7 +56,7 @@
 int
 main(int argc, char **argv)
 {
-	char		c;
+	int		c;
 	char		*sname = MD_LOCAL_NAME;
 	mddevopts_t	options = 0;
 	md_error_t	status = mdnullerror;
--- a/usr/src/cmd/lvm/util/metaimport.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/lvm/util/metaimport.c	Mon Mar 23 14:01:42 2009 -0400
@@ -429,7 +429,7 @@
 int
 main(int argc, char *argv[])
 {
-	char			c;
+	int			c;
 	md_error_t		status = mdnullerror;
 	md_error_t		*ep = &status;
 	mdsetname_t		*sp = NULL;
--- a/usr/src/cmd/mailx/hdr/glob.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mailx/hdr/glob.h	Mon Mar 23 14:01:42 2009 -0400
@@ -69,7 +69,7 @@
 extern int		exitflg;	/* -e for mail test */
 extern NODE		*fplist;	/* ???? */
 extern struct grouphead	*groups[];	/* Pointer to active groups */
-extern struct hdr	header[];	/* Known header types */
+extern struct header	header[];	/* Known header types */
 extern int		hflag;		/* Sequence number for network -h */
 extern char		homedir[];	/* Name of home directory */
 extern char		host[];		/* ???? */
--- a/usr/src/cmd/man/src/util/instant.src/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/man/src/util/instant.src/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -77,15 +77,13 @@
 TPTLIB		= $(ROOTSHLIB)/sgml/locale/C/transpec
 REGEX_INC	= -Itptregexp
 REGEX_LIB	= tptregexp
-BINDIR		= $(PROGROOT)
+BINDIR		= $(ROOT)/$(PROGROOT)
 DEFINES		= -DDEF_TPT_LIB=\"$(TPTLIB)\" $(XDEFINES)
 
 #OPT	= -O
 CFLAGS	+= $(OPT) $(REGEX_INC) $(DEFINES)
 LDFLAGS	+= $(OPT)
-s390_LDLIBS = -L$(ROOT)/usr/lib -ldl
-LDLIBS      = $($(MACH)_LDLIBS)
-REGEX	= -L$(REGEX_LIB) -ltptregexp
+REGEX	= -L$(REGEX_LIB) -ltptregexp -L$(ROOT)/usr/lib
 
 CFILES	= main.c util.c info.c translate.c traninit.c tranvar.c tables.c \
 	browse.c
@@ -100,7 +98,7 @@
 	cd tptregexp; $(MAKE) all
 
 instant: $(OBJ)
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(REGEX) $(LDLIBS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(REGEX)
 	$(POST_PROCESS)
 	cp $@ ..
 
--- a/usr/src/cmd/man/src/util/nsgmls.src/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/man/src/util/nsgmls.src/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -56,8 +56,7 @@
 # If you defined SP_HAVE_SOCKET, add any libraries that are needed for sockets
 #-lsocket -lnsl needed on Solaris 2.x
 # -lnsl on SunOS 4.1.3
-s390_XLIBS=-ldl -lmd -lmp -lm -lscf -luutil -lgen 
-XLIBS=-lsocket -lnsl $($(MACH)_XLIBS)
+XLIBS=-lsocket -lnsl 
 # -L/usr/local/lib may be needed on the RS/6000
 LIBS += $(ENVLDLIBS1) $(ENVLDLIBS2) $(XLIBS) $(CCNEEDED) -lc
 # If you're building in another directory, copy or link this Makefile
--- a/usr/src/cmd/mdb/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mdb/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -34,7 +34,7 @@
 
 sparc_SUBDIRS = sparc sun4u sun4v
 i386_SUBDIRS = intel i86pc i86xpv
-s390_SUBDIRS = zSeries s390x
+s390_SUBDIRS = zSeries s390
 
 MACHDIR = $($(MACH)_MACHDIR)
 SUBDIRS = tools $($(MACH)_SUBDIRS) demo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+SUBDIRS = zSeries
+
+include ../Makefile.subdirs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/Makefile.kmdb	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,41 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+SACPPFLAGS = -D__s390x
+
+MAPFILE_SOURCES = \
+	../../../common/mdb/mdb_ctf.h \
+	../../../common/kmdb/kmdb_dpi.h \
+	../../../common/kmdb/kmdb_kctl.h \
+	../../../common/kmdb/kmdb_kdi.h \
+	../../../common/mdb/mdb_ks.h \
+	../../../common/mdb/mdb_modapi.h \
+	../../../common/mdb/mdb_param.h \
+	../../../common/kmdb/kmdb_wr.h \
+	../../../zSeries/kmdb/kmdb_dpi_isadep.h \
+	$(MAPFILE_SOURCES_$(MACH))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/Makefile.libstand	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kaif.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,971 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * The debugger/PROM interface
+ */
+
+#include <sys/types.h>
+#include <sys/mmu.h>
+
+#include <sys/machasi.h>
+#include <sys/machtrap.h>
+#include <sys/trap.h>
+#include <sys/privregs.h>
+
+#include <kmdb/kaif.h>
+#include <kmdb/kaif_regs.h>
+#include <kmdb/kmdb_asmutil.h>
+#include <kmdb/kmdb_kdi.h>
+#include <kmdb/kmdb_promif_isadep.h>
+#include <kmdb/kmdb_dpi_impl.h>
+#include <mdb/mdb_debug.h>
+#include <mdb/mdb_err.h>
+#include <mdb/mdb_modapi.h>
+#include <mdb/mdb_nv.h>
+#include <mdb/mdb_kreg_impl.h>
+#include <mdb/mdb_v9util.h>
+#include <mdb/mdb.h>
+
+#define	KAIF_PREGNO_PSTATE	0x6		/* %pstate is priv reg 6 */
+#define	KAIF_BRKPT_INSTR	0x91d0207e	/* ta 0x7e */
+
+
+#define	OP(x)		((x) >> 30)
+#define	OP2(x)		(((x) >> 22) & 0x07)
+#define	OP3(x)		(((x) >> 19) & 0x3f)
+#define	COND(x)		(((x) >> 25) & 0x0f)
+#define	RD(x)		(((x) >> 25) & 0x1f)
+#define	RS1(x)		(((x) >> 14) & 0x1f)
+#define	RS2(x)		((x) & 0x1f)
+
+#define	OP_BRANCH	0x0
+#define	OP_ARITH	0x2
+
+#define	OP2_BPcc	0x1
+#define	OP2_Bicc	0x2
+#define	OP2_BPr		0x3
+#define	OP2_FBPfcc	0x5
+#define	OP2_FBfcc	0x6
+
+#define	OP3_RDPR	0x2a
+#define	OP3_WRPR	0x32
+
+#define	A(x)		(((x) >> 29) & 0x01)
+#define	I(x)		(((x) >> 13) & 0x01)
+#define	DISP16(x)	((((x) >> 6) & 0xc000) | ((x) & 0x3fff))
+#define	DISP22(x)	((x) & 0x3fffff)
+#define	DISP19(x)	((x) & 0x7ffff)
+#define	SIMM13(x)	((x) & 0x1fff)
+
+static uint64_t		kaif_vwapt_addr;
+static uint64_t		kaif_pwapt_addr;
+
+kaif_cpusave_t		*kaif_cpusave;
+int			kaif_ncpusave;
+caddr_t			kaif_dseg;
+caddr_t			kaif_dseg_lim;
+caddr_t			kaif_tba;		/* table currently in use */
+caddr_t			kaif_tba_obp;		/* obp's trap table */
+caddr_t			kaif_tba_native;	/* our table; needs khat */
+size_t			kaif_tba_native_sz;
+int			*kaif_promexitarmp;
+int			kaif_trap_switch;
+
+void (*kaif_modchg_cb)(struct modctl *, int);
+void (*kaif_ktrap_install)(int, void (*)(void));
+void (*kaif_ktrap_restore)(void);
+
+static int
+kaif_get_master_cpuid(void)
+{
+	return (kaif_master_cpuid);
+}
+
+/*ARGSUSED*/
+static int
+kaif_get_nwin(int cpuid)
+{
+	return (get_nwin());
+}
+
+static int
+kaif_get_cpu_state(int cpuid)
+{
+	if (cpuid == DPI_MASTER_CPUID)
+		return (DPI_CPU_STATE_MASTER);
+
+	if (cpuid < 0 || cpuid >= kaif_ncpusave)
+		return (set_errno(EINVAL));
+
+	switch (kaif_cpusave[cpuid].krs_cpu_state) {
+	case KAIF_CPU_STATE_MASTER:
+		return (DPI_CPU_STATE_MASTER);
+	case KAIF_CPU_STATE_SLAVE:
+		return (DPI_CPU_STATE_SLAVE);
+	default:
+		return (set_errno(EINVAL));
+	}
+}
+
+static const mdb_tgt_gregset_t *
+kaif_get_gregs(int cpuid)
+{
+	kaif_cpusave_t *cpusave;
+	mdb_tgt_gregset_t *gregs;
+	int wp, i;
+
+	if (cpuid == DPI_MASTER_CPUID)
+		cpuid = kaif_master_cpuid;
+
+	if (cpuid < 0 || cpuid >= kaif_ncpusave) {
+		(void) set_errno(EINVAL);
+		return (NULL);
+	}
+
+	cpusave = &kaif_cpusave[cpuid];
+	gregs = &cpusave->krs_gregs;
+
+	/*
+	 * The DPI startup routine populates the register window portions of
+	 * the kaif_cpusave_t.  We copy the current set of ins, outs, and
+	 * locals to the gregs.  We also extract %pstate from %tstate.
+	 */
+	wp = gregs->kregs[KREG_CWP];
+	for (i = 0; i < 8; i++) {
+		gregs->kregs[KREG_L0 + i] = cpusave->krs_rwins[wp].rw_local[i];
+		gregs->kregs[KREG_I0 + i] = cpusave->krs_rwins[wp].rw_in[i];
+	}
+
+	gregs->kregs[KREG_PSTATE] = KREG_TSTATE_PSTATE(cpusave->krs_tstate);
+
+	if (++wp == kaif_get_nwin(cpuid))
+		wp = 0;
+
+	for (i = 0; i < 8; i++)
+		gregs->kregs[KREG_O0 + i] = cpusave->krs_rwins[wp].rw_in[i];
+
+	return (gregs);
+}
+
+static kreg_t *
+kaif_find_regp(int cpuid, int win, const char *regname)
+{
+	kaif_cpusave_t *cpusave;
+	mdb_tgt_gregset_t *gregs;
+	int nwin, i;
+
+	ASSERT(cpuid != DPI_MASTER_CPUID);
+
+	if (cpuid < 0 || cpuid >= kaif_ncpusave) {
+		(void) set_errno(EINVAL);
+		return (NULL);
+	}
+
+	nwin = kaif_get_nwin(cpuid);
+
+	if (win < -1 || win >= nwin) {
+		(void) set_errno(EINVAL);
+		return (NULL);
+	}
+
+	cpusave = &kaif_cpusave[cpuid];
+	gregs = &cpusave->krs_gregs;
+
+	if (win == DPI_TOP_WINDOW)
+		win = gregs->kregs[KREG_CWP];
+
+	if (strcmp(regname, "sp") == 0)
+		regname = "o6";
+	else if (strcmp(regname, "fp") == 0)
+		regname = "i6";
+
+	if (strlen(regname) == 2 && regname[1] >= '0' && regname[1] <= '7') {
+		int idx = regname[1] - '0';
+
+		switch (regname[0]) {
+		case 'o':
+			if (++win == nwin)
+				win = 0;
+			/*FALLTHROUGH*/
+		case 'i':
+			return ((kreg_t *)&cpusave->krs_rwins[win].rw_in[idx]);
+		case 'l':
+			return ((kreg_t *)
+			    &cpusave->krs_rwins[win].rw_local[idx]);
+		}
+	}
+
+	for (i = 0; mdb_sparcv9_kregs[i].rd_name != NULL; i++) {
+		const mdb_tgt_regdesc_t *rd = &mdb_sparcv9_kregs[i];
+
+		if (strcmp(rd->rd_name, regname) == 0)
+			return (&gregs->kregs[rd->rd_num]);
+	}
+
+	(void) set_errno(ENOENT);
+	return (NULL);
+}
+
+static int
+kaif_get_cpu_register(int cpuid, int win, const char *regname, kreg_t *valp)
+{
+	kreg_t *regp;
+
+	if (cpuid == DPI_MASTER_CPUID)
+		cpuid = kaif_master_cpuid;
+
+	if (cpuid < 0 || cpuid >= kaif_ncpusave)
+		return (set_errno(EINVAL));
+
+	if (strcmp(regname, "pstate") == 0) {
+		*valp = KREG_TSTATE_PSTATE(kaif_cpusave[cpuid].krs_tstate);
+		return (0);
+	}
+
+	if ((regp = kaif_find_regp(cpuid, win, regname)) == NULL)
+		return (-1);
+
+	*valp = *regp;
+
+	return (0);
+}
+
+static int
+kaif_set_cpu_register(int cpuid, int win, const char *regname, kreg_t val)
+{
+	kreg_t *regp;
+
+	if (cpuid == DPI_MASTER_CPUID)
+		cpuid = kaif_master_cpuid;
+
+	if (cpuid < 0 || cpuid >= kaif_ncpusave)
+		return (set_errno(EINVAL));
+
+	if (strcmp(regname, "g0") == 0) {
+		return (0);
+
+	} else if (strcmp(regname, "pstate") == 0) {
+		kaif_cpusave[cpuid].krs_tstate &= ~KREG_TSTATE_PSTATE_MASK;
+		kaif_cpusave[cpuid].krs_tstate |=
+		    (val & KREG_PSTATE_MASK) << KREG_TSTATE_PSTATE_SHIFT;
+		return (0);
+	}
+
+	if ((regp = kaif_find_regp(cpuid, win, regname)) == NULL)
+		return (-1);
+
+	*regp = val;
+
+	return (0);
+}
+
+static int
+kaif_brkpt_arm(uintptr_t addr, mdb_instr_t *instrp)
+{
+	mdb_instr_t bkpt = KAIF_BRKPT_INSTR;
+
+	if (mdb_tgt_vread(mdb.m_target, instrp, sizeof (mdb_instr_t), addr) !=
+	    sizeof (mdb_instr_t))
+		return (-1); /* errno is set for us */
+
+	if (mdb_tgt_vwrite(mdb.m_target, &bkpt, sizeof (mdb_instr_t), addr) !=
+	    sizeof (mdb_instr_t))
+		return (-1); /* errno is set for us */
+
+	return (0);
+}
+
+static int
+kaif_brkpt_disarm(uintptr_t addr, mdb_instr_t instrp)
+{
+	if (mdb_tgt_vwrite(mdb.m_target, &instrp, sizeof (mdb_instr_t), addr) !=
+	    sizeof (mdb_instr_t))
+		return (-1); /* errno is set for us */
+
+	return (0);
+}
+
+/*
+ * Calculate the watchpoint mask byte (VM or PM, as appropriate).  A 1 bit in
+ * the mask indicates that the corresponding byte in the watchpoint address
+ * should be used for activation comparison.
+ */
+static uchar_t
+kaif_wapt_calc_mask(size_t len)
+{
+	int pow;
+
+	if (len == 8)
+		return (0xff);
+
+	for (pow = 0; len > 1; len /= 256, pow++);
+
+	return (~((1 << pow) - 1));
+}
+
+/*
+ * System z processors have one physical watchpoint.  This
+ * watchpoints are specified by setting the address in a control register.
+ */
+static int
+kaif_wapt_validate(kmdb_wapt_t *wp)
+{
+	if (wp->wp_wflags & MDB_TGT_WA_X) {
+		warn("execute watchpoints are not supported on this "
+		    "platform\n");
+		return (set_errno(EMDB_TGTNOTSUP));
+	}
+
+	if (wp->wp_size % 0xff != 0 && wp->wp_size != 8) {
+		warn("watchpoint size must be 8 or a power of 256 bytes\n");
+		return (set_errno(EINVAL));
+	}
+
+	if (wp->wp_addr & (wp->wp_size - 1)) {
+		warn("%lu-byte watchpoints must be %lu-byte aligned\n",
+		    wp->wp_size, wp->wp_size);
+		return (set_errno(EINVAL));
+	}
+
+	if (wp->wp_type != DPI_WAPT_TYPE_PHYS &&
+	    wp->wp_type != DPI_WAPT_TYPE_VIRT) {
+		warn("requested watchpoint type not supported on this "
+		    "platform\n");
+		return (set_errno(EMDB_TGTHWNOTSUP));
+	}
+
+	return (0);
+}
+
+static int
+kaif_wapt_reserve(kmdb_wapt_t *wp)
+{
+	uint64_t *addrp;
+
+	if (wp->wp_type == DPI_WAPT_TYPE_PHYS)
+		addrp = &kaif_pwapt_addr;
+	else
+		addrp = &kaif_vwapt_addr;
+
+	if (*addrp != NULL)
+		return (set_errno(EMDB_WPTOOMANY));
+
+	*addrp = wp->wp_addr;
+
+	return (0);
+}
+
+static void
+kaif_wapt_release(kmdb_wapt_t *wp)
+{
+	uint64_t *addrp = (wp->wp_type == DPI_WAPT_TYPE_PHYS ?
+	    &kaif_pwapt_addr : &kaif_vwapt_addr);
+
+	ASSERT(*addrp != NULL);
+	*addrp = NULL;
+}
+
+/*ARGSUSED*/
+static void
+kaif_wapt_arm(kmdb_wapt_t *wp)
+{
+	uint64_t mask = kaif_wapt_calc_mask(wp->wp_size);
+
+	if (wp->wp_type == DPI_WAPT_TYPE_PHYS) {
+		kaif_lsuctl &= ~KAIF_LSUCTL_PWAPT_MASK;
+
+		if (wp->wp_wflags & MDB_TGT_WA_R)
+			kaif_lsuctl |= LSU_PR;
+		if (wp->wp_wflags & MDB_TGT_WA_W)
+			kaif_lsuctl |= LSU_PW;
+		kaif_lsuctl |= ((mask << LSU_PM_SHIFT) & LSU_PM);
+
+	} else if (wp->wp_type == DPI_WAPT_TYPE_VIRT) {
+		kaif_lsuctl &= ~KAIF_LSUCTL_VWAPT_MASK;
+
+		if (wp->wp_wflags & MDB_TGT_WA_R)
+			kaif_lsuctl |= LSU_VR;
+		if (wp->wp_wflags & MDB_TGT_WA_W)
+			kaif_lsuctl |= LSU_VW;
+		kaif_lsuctl |= ((mask << LSU_VM_SHIFT) & LSU_VM);
+	}
+}
+
+/*ARGSUSED*/
+static void
+kaif_wapt_disarm(kmdb_wapt_t *wp)
+{
+	/*
+	 * Sun4v dosen't have watch point regs
+	 */
+	if (wp->wp_type == DPI_WAPT_TYPE_PHYS) {
+		ASSERT(kaif_pwapt_addr != NULL);
+		kaif_lsuctl &= ~(LSU_PR|LSU_PW);
+	} else {
+		ASSERT(kaif_vwapt_addr != NULL);
+		kaif_lsuctl &= ~(LSU_VR|LSU_VW);
+	}
+}
+
+/*
+ * `kaif_wapt_arm' and `kaif_wapt_disarm' modify the global state we keep that
+ * indicates what the values of the wapt control registers should be.  These
+ * values must be individually set and cleared on each active CPU, a task which
+ * is performed by `kaif_wapt_clear_regs' and `kaif_wapt_set_regs', invoked as
+ * the world is stopped and resumed, respectively.  `kaif_wapt_set_regs' is also
+ * used for CPU initialization.
+ */
+void
+kaif_wapt_set_regs(void)
+{
+	/*
+	 * Sun4v dosen't have watch point regs
+	 */
+	uint64_t lsu;
+
+	wrasi(ASI_DMMU, MMU_VAW, kaif_vwapt_addr);
+	wrasi(ASI_DMMU, MMU_PAW, kaif_pwapt_addr);
+
+	ASSERT((kaif_lsuctl & ~KAIF_LSUCTL_WAPT_MASK) == NULL);
+
+	lsu = rdasi(ASI_LSU, NULL);
+	lsu &= ~KAIF_LSUCTL_WAPT_MASK;
+	lsu |= kaif_lsuctl;
+	wrasi(ASI_LSU, NULL, lsu);
+}
+
+void
+kaif_wapt_clear_regs(void)
+{
+	/*
+	 * Sun4v dosen't have watch point regs
+	 */
+	uint64_t lsu = rdasi(ASI_LSU, NULL);
+	lsu &= ~KAIF_LSUCTL_WAPT_MASK;
+	wrasi(ASI_LSU, NULL, lsu);
+}
+
+/*
+ * UltraSPARC has one PA watchpoint and one VA watchpoint.  The trap we get will
+ * tell us which one we hit, but it won't tell us where.  We could attempt to
+ * dissect the instruction at %pc to see where it was reading from or writing
+ * to, but that gets messy in a hurry.  We can, however, make a couple of
+ * assumptions:
+ *
+ * - kaif_set_watchpoint and kaif_delete_watchpoint will enforce the limits as
+ *   to the number of watch points.  As such, at most one VA watchpoint and one
+ *   PA watchpoint will be on the active list.
+ *
+ * - We'll only be called on watchpoints that are on the active list.
+ *
+ * Taking these two assumptions, we can conclude that, if we're stopped due to
+ * a watchpoint and we're asked to match against a watchpoint, we must have
+ * stopped due to the watchpoint.  This is all very terrifying, but the
+ * alternative (taking instructions apart) is worse.
+ */
+/*ARGSUSED*/
+static int
+kaif_wapt_match(kmdb_wapt_t *wp)
+{
+	int state, why, deswhy;
+
+	state = kmdb_dpi_get_state(&why);
+
+	if (wp->wp_type == DPI_WAPT_TYPE_PHYS)
+		deswhy = DPI_STATE_WHY_P_WAPT;
+	else
+		deswhy = DPI_STATE_WHY_V_WAPT;
+
+	return (state == DPI_STATE_FAULTED && why == deswhy);
+}
+
+static const char *
+regno2name(int idx)
+{
+	const mdb_tgt_regdesc_t *rd;
+
+	for (rd = mdb_sparcv9_kregs; rd->rd_name != NULL; rd++) {
+		if (idx == rd->rd_num)
+			return (rd->rd_name);
+	}
+
+	ASSERT(rd->rd_name != NULL);
+
+	return ("unknown");
+}
+
+/*
+ * System z doesn't support single-step natively, so we have to do it
+ * ourselves, by placing breakpoints at the instruction after the current one.
+ *
+ * If %pc is an unconditional annulled branch, we put a breakpoint at the branch
+ * target.  If it is a conditional annulled branch, we put breakpoints at %pc +
+ * 8 and the branch target.  For all other branches, %npc will be set correctly
+ * as determined by the branch condition, and thus we can step through the
+ * branch by putting a breakpoint at %npc.  If %pc contains a non-branch
+ * instruction (with the exception of certain rdpr and wrpr instructions,
+ * described more below), we step over it by placing a breakpoint at %npc.
+ */
+static int
+kaif_step(void)
+{
+	kreg_t pc, npc, brtgt, pstate, tt;
+	int bptgt = 0, bpnpc = 0, bppc8 = 0;
+	mdb_instr_t svtgt = 0, svnpc = 0, svpc8 = 0;
+	mdb_instr_t instr;
+	int ie, err;
+
+	(void) kmdb_dpi_get_register("pc", &pc);
+	(void) kmdb_dpi_get_register("npc", &npc);
+
+	if (mdb_tgt_vread(mdb.m_target, &instr, sizeof (instr), pc) !=
+	    sizeof (instr)) {
+		warn("failed to read %%pc at %p for step", (void *)pc);
+		return (-1);
+	}
+
+	/*
+	 * If the current instruction is a read or write of PSTATE we need
+	 * to emulate it because we've taken over management of PSTATE and
+	 * we need keep interrupts disabled. If it's a branch, we may need
+	 * to set two breakpoints -- one at the target and one at the
+	 * subsequent instruction.
+	 */
+	if (OP(instr) == OP_ARITH) {
+		if (OP3(instr) == OP3_RDPR &&
+		    RS1(instr) == KAIF_PREGNO_PSTATE) {
+			const char *tgtreg =
+			    mdb_sparcv9_kregs[RD(instr)].rd_name;
+			kreg_t pstate;
+
+			(void) kmdb_dpi_get_register("pstate", &pstate);
+			(void) kmdb_dpi_set_register(tgtreg, pstate);
+
+			(void) kmdb_dpi_set_register("pc", npc);
+			(void) kmdb_dpi_set_register("npc", npc + 4);
+			return (0);
+
+		} else if (OP3(instr) == OP3_WRPR &&
+		    RD(instr) == KAIF_PREGNO_PSTATE) {
+			kreg_t rs1, rs2, val;
+
+			(void) kmdb_dpi_get_register(regno2name(RS1(instr)),
+			    &rs1);
+
+			if (I(instr)) {
+				int imm = SIMM13(instr);
+				imm <<= 19;
+				imm >>= 19;
+				rs2 = imm;
+			} else {
+				(void) kmdb_dpi_get_register(
+				    regno2name(RS2(instr)), &rs2);
+			}
+
+			val = rs1 ^ rs2;
+
+			(void) kmdb_dpi_set_register("pstate", val);
+
+			(void) kmdb_dpi_set_register("pc", npc);
+			(void) kmdb_dpi_set_register("npc", npc + 4);
+			return (0);
+
+		}
+
+		bpnpc = 1;
+
+	} else if (OP(instr) == OP_BRANCH) {
+		int disp, cond, annul;
+
+		switch (OP2(instr)) {
+		case OP2_BPcc:
+		case OP2_FBPfcc:
+			cond = (COND(instr) != 8);
+
+			disp = DISP19(instr);
+			disp <<= 13;
+			disp >>= 11;
+			break;
+
+		case OP2_Bicc:
+		case OP2_FBfcc:
+			cond = (COND(instr) != 8);
+
+			disp = DISP22(instr);
+			disp <<= 10;
+			disp >>= 8;
+			break;
+
+		case OP2_BPr:
+			cond = 1;
+
+			disp = DISP16(instr);
+			disp <<= 16;
+			disp >>= 14;
+			break;
+
+		default:
+			bpnpc = 1;
+		}
+
+		if (!bpnpc) {
+			annul = A(instr);
+
+			if (!cond && annul) {
+				brtgt = pc + disp;
+				bptgt = 1;
+			} else {
+				bpnpc = 1;
+
+				if (cond && annul)
+					bppc8 = 1;
+			}
+		}
+
+	} else {
+		bpnpc = 1;
+	}
+
+	/*
+	 * Place the breakpoints and resume this CPU with IE off.  We'll come
+	 * back after having encountered either one of the breakpoints we placed
+	 * or a trap.
+	 */
+	err = 0;
+	if ((bpnpc && kaif_brkpt_arm(npc, &svnpc) != 0) ||
+	    (bppc8 && kaif_brkpt_arm(pc + 8, &svpc8) != 0) ||
+	    (bptgt && kaif_brkpt_arm(brtgt, &svtgt) != 0)) {
+		err = errno;
+		goto step_done;
+	}
+
+	(void) kmdb_dpi_get_register("pstate", &pstate);
+	ie = pstate & KREG_PSTATE_IE_MASK;
+	(void) kmdb_dpi_set_register("pstate", (pstate & ~KREG_PSTATE_IE_MASK));
+
+	kmdb_dpi_resume_master(); /* ... there and back again ... */
+
+	(void) kmdb_dpi_get_register("pstate", &pstate);
+	(void) kmdb_dpi_set_register("pstate",
+	    ((pstate & ~KREG_PSTATE_IE_MASK) | ie));
+
+	(void) kmdb_dpi_get_register("tt", &tt);
+
+step_done:
+	if (svnpc)
+		(void) kaif_brkpt_disarm(npc, svnpc);
+	if (svpc8)
+		(void) kaif_brkpt_disarm(pc + 8, svpc8);
+	if (svtgt)
+		(void) kaif_brkpt_disarm(brtgt, svtgt);
+
+	return (err == 0 ? 0 : set_errno(err));
+}
+
+static uintptr_t
+kaif_call(uintptr_t funcva, uint_t argc, const uintptr_t *argv)
+{
+	return (kaif_invoke(funcva, argc, argv);
+}
+
+static const mdb_bitmask_t krm_flag_bits[] = {
+	{ "M_W",	KAIF_CRUMB_F_MAIN_OBPWAPT, KAIF_CRUMB_F_MAIN_OBPWAPT },
+	{ "M_PE",	KAIF_CRUMB_F_MAIN_OBPPENT, KAIF_CRUMB_F_MAIN_OBPPENT },
+	{ "M_NRM",	KAIF_CRUMB_F_MAIN_NORMAL, KAIF_CRUMB_F_MAIN_NORMAL },
+	{ "I_RE",	KAIF_CRUMB_F_IVEC_REENTER, KAIF_CRUMB_F_IVEC_REENTER },
+	{ "I_OBP", 	KAIF_CRUMB_F_IVEC_INOBP, KAIF_CRUMB_F_IVEC_INOBP },
+	{ "I_NRM",	KAIF_CRUMB_F_IVEC_NORMAL, KAIF_CRUMB_F_IVEC_NORMAL },
+	{ "O_NRM",	KAIF_CRUMB_F_OBP_NORMAL, KAIF_CRUMB_F_OBP_NORMAL },
+	{ "O_REVEC",	KAIF_CRUMB_F_OBP_REVECT, KAIF_CRUMB_F_OBP_REVECT },
+	{ NULL }
+};
+
+static void
+dump_crumb(kaif_crumb_t *crumb)
+{
+	mdb_printf(" src: ");
+	switch (crumb->krm_src) {
+	case KAIF_CRUMB_SRC_OBP:
+		mdb_printf("O");
+		break;
+	case KAIF_CRUMB_SRC_IVEC:
+		mdb_printf("I");
+		break;
+	case KAIF_CRUMB_SRC_MAIN:
+		mdb_printf("M");
+		break;
+	case 0:
+		mdb_printf("-");
+		break;
+	default:
+		mdb_printf("%d", crumb->krm_src);
+	}
+
+	mdb_printf(" tt %3x pc %8p %-20A <%b>\n",
+	    crumb->krm_tt, crumb->krm_pc, crumb->krm_pc,
+	    crumb->krm_flag, krm_flag_bits);
+}
+
+static void
+dump_crumbs(kaif_cpusave_t *save)
+{
+	int i;
+
+	for (i = KAIF_NCRUMBS; i > 0; i--) {
+		uint_t idx = (save->krs_curcrumbidx + i) % KAIF_NCRUMBS;
+
+		dump_crumb(&save->krs_crumbs[idx]);
+	}
+}
+
+static void
+kaif_dump_crumbs(uintptr_t addr, int cpuid)
+{
+	int i;
+
+	if (addr != NULL) {
+		dump_crumb((kaif_crumb_t *)addr);
+
+	} else if (cpuid != -1) {
+		if (cpuid >= kaif_ncpusave)
+			return;
+
+		dump_crumbs(&kaif_cpusave[cpuid]);
+
+	} else {
+		for (i = 0; i < kaif_ncpusave; i++) {
+			kaif_cpusave_t *save = &kaif_cpusave[i];
+
+			if (save->krs_cpu_state == KAIF_CPU_STATE_NONE)
+				continue;
+
+			mdb_printf("%sCPU %d crumbs: (curidx %d)\n",
+			    (i == 0 ? "" : "\n"), i, save->krs_curcrumbidx);
+
+			dump_crumbs(save);
+		}
+	}
+}
+
+static int
+kaif_get_rwin(int cpuid, int win, struct rwindow *rwin)
+{
+	if (cpuid == DPI_MASTER_CPUID)
+		cpuid = kaif_master_cpuid;
+	if (win == DPI_TOP_WINDOW)
+		win = kaif_cpusave[cpuid].krs_gregs.kregs[KREG_CWP];
+
+	if (win < 0 || win >= kaif_get_nwin(cpuid))
+		return (-1);
+
+	bcopy(&kaif_cpusave[cpuid].krs_rwins[win], rwin,
+	    sizeof (struct rwindow));
+
+	return (0);
+}
+
+static void
+kaif_enter_mon(void)
+{
+	kmdb_prom_enter_mon();
+	kaif_prom_rearm();
+}
+
+static void
+kaif_modchg_register(void (*func)(struct modctl *, int))
+{
+	kaif_modchg_cb = func;
+}
+
+static void
+kaif_modchg_cancel(void)
+{
+	ASSERT(kaif_modchg_cb != NULL);
+
+	kaif_modchg_cb = NULL;
+}
+
+void
+kaif_mod_loaded(struct modctl *modp)
+{
+	if (kaif_modchg_cb != NULL)
+		kaif_modchg_cb(modp, 1);
+}
+
+void
+kaif_mod_unloading(struct modctl *modp)
+{
+	if (kaif_modchg_cb != NULL)
+		kaif_modchg_cb(modp, 0);
+}
+
+/*ARGSUSED*/
+int
+kaif_memrange_add(caddr_t base, size_t len)
+{
+	/* We don't support multiple memory ranges on S390X */
+	return (set_errno(ENOTSUP));
+}
+
+void
+kaif_trap_set_debugger(void)
+{
+	set_tba(kaif_tba);
+}
+
+void
+kaif_trap_set_saved(kaif_cpusave_t *cpusave)
+{
+	set_tba((caddr_t)cpusave->krs_gregs.kregs[KREG_TBA]);
+}
+
+static void
+kaif_kernpanic(int cpuid)
+{
+	struct regs regs;
+
+	/*
+	 * We're going to try to panic the system by using the same entry point
+	 * used by the PROM when told to `sync'.  The kernel wants a
+	 * fully-populated struct regs, which we're going to build using the
+	 * state captured at the time of the debugger fault.  Said state lives
+	 * in kaif_cb_save, since we haven't yet copied it over to the cpusave
+	 * structure for the current master.
+	 */
+
+	regs.r_tstate = kaif_cb_save.krs_tstate;
+
+	regs.r_g1 = kaif_cb_save.krs_gregs.kregs[KREG_G1];
+	regs.r_g2 = kaif_cb_save.krs_gregs.kregs[KREG_G2];
+	regs.r_g3 = kaif_cb_save.krs_gregs.kregs[KREG_G3];
+	regs.r_g4 = kaif_cb_save.krs_gregs.kregs[KREG_G4];
+	regs.r_g5 = kaif_cb_save.krs_gregs.kregs[KREG_G5];
+	regs.r_g6 = kaif_cb_save.krs_gregs.kregs[KREG_G6];
+	regs.r_g7 = kaif_cb_save.krs_gregs.kregs[KREG_G7];
+
+	regs.r_o0 = kaif_cb_save.krs_gregs.kregs[KREG_O0];
+	regs.r_o1 = kaif_cb_save.krs_gregs.kregs[KREG_O1];
+	regs.r_o2 = kaif_cb_save.krs_gregs.kregs[KREG_O2];
+	regs.r_o3 = kaif_cb_save.krs_gregs.kregs[KREG_O3];
+	regs.r_o4 = kaif_cb_save.krs_gregs.kregs[KREG_O4];
+	regs.r_o5 = kaif_cb_save.krs_gregs.kregs[KREG_O5];
+	regs.r_o6 = kaif_cb_save.krs_gregs.kregs[KREG_O6];
+	regs.r_o7 = kaif_cb_save.krs_gregs.kregs[KREG_O7];
+
+	regs.r_pc = kaif_cb_save.krs_gregs.kregs[KREG_PC];
+	regs.r_npc = kaif_cb_save.krs_gregs.kregs[KREG_NPC];
+	regs.r_y = kaif_cb_save.krs_gregs.kregs[KREG_Y];
+
+	/*
+	 * The %tba is, as ever, different.  We don't want the %tba from the
+	 * time of the fault -- that'll be the debugger's.  We want the %tba
+	 * saved when the debugger was initially entered.  It'll be saved in
+	 * the cpusave area for the current CPU.
+	 */
+	set_tba((caddr_t)kaif_cpusave[cpuid].krs_gregs.kregs[KREG_TBA]);
+
+	kmdb_kdi_kernpanic(&regs, kaif_cb_save.krs_gregs.kregs[KREG_TT]);
+}
+
+static int
+kaif_init(kmdb_auxv_t *kav)
+{
+	struct rwindow *rwins;
+	int nwin = get_nwin();
+	int i;
+
+	kaif_vwapt_addr = kaif_pwapt_addr = 0;
+
+	kaif_tba = kav->kav_tba_active;
+	kaif_tba_obp = kav->kav_tba_obp;
+	kaif_tba_native = kav->kav_tba_native;
+	kaif_tba_native_sz = kav->kav_tba_native_sz;
+
+	/* Allocate the per-CPU save areas */
+	kaif_cpusave = mdb_zalloc(sizeof (kaif_cpusave_t) * kav->kav_ncpu,
+	    UM_SLEEP);
+	kaif_ncpusave = kav->kav_ncpu;
+
+	rwins = mdb_zalloc(sizeof (struct rwindow) * nwin * kav->kav_ncpu,
+	    UM_SLEEP);
+
+	for (i = 0; i < kaif_ncpusave; i++) {
+		kaif_cpusave[i].krs_rwins = &rwins[nwin * i];
+		kaif_cpusave[i].krs_cpu_id = i;
+
+		kaif_cpusave[i].krs_curcrumb =
+		    &kaif_cpusave[i].krs_crumbs[KAIF_NCRUMBS - 1];
+		kaif_cpusave[i].krs_curcrumbidx = KAIF_NCRUMBS - 1;
+	}
+
+	kaif_dseg = kav->kav_dseg;
+	kaif_dseg_lim = kav->kav_dseg + kav->kav_dseg_size;
+
+	kaif_promexitarmp = kav->kav_promexitarmp;
+
+	kaif_ktrap_install = kav->kav_ktrap_install;
+	kaif_ktrap_restore = kav->kav_ktrap_restore;
+
+	kaif_modchg_cb = NULL;
+
+	kaif_trap_switch = (kav->kav_flags & KMDB_AUXV_FL_NOTRPSWTCH) == 0;
+
+	return (0);
+}
+
+dpi_ops_t kmdb_dpi_ops = {
+	kaif_init,
+	kaif_activate,
+	kaif_deactivate,
+	kaif_enter_mon,
+	kaif_modchg_register,
+	kaif_modchg_cancel,
+	kaif_get_cpu_state,
+	kaif_get_master_cpuid,
+	kaif_get_gregs,
+	kaif_get_cpu_register,
+	kaif_set_cpu_register,
+	kaif_get_rwin,
+	kaif_get_nwin,
+	kaif_brkpt_arm,
+	kaif_brkpt_disarm,
+	kaif_wapt_validate,
+	kaif_wapt_reserve,
+	kaif_wapt_release,
+	kaif_wapt_arm,
+	kaif_wapt_disarm,
+	kaif_wapt_match,
+	kaif_step,
+	kaif_call,
+	kaif_dump_crumbs,
+	kaif_memrange_add,
+	kaif_kernpanic
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kaif.fdbg	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,41 @@
+
+\ 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	"@(#)kaif.fdbg	1.3	05/06/08 SMI"
+
+#include <kmdb/kaif_regs.h>
+
+kaif_cpusave
+	krs_rwins
+	krs_tstate
+	krs_mmu_pcontext
+	krs_cpu_state
+	krs_cpu_flushed
+	krs_lsucr_save
+	krs_instr_save
+	krs_cpu_id
+	krs_curcrumbidx
+	krs_curcrumb
+
+kaif_crumb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kaif.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,125 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _KAIF_H
+#define	_KAIF_H
+
+#ifndef	sun4v
+#include <sys/spitregs.h>
+#endif	/* sun4v */
+
+#ifndef _ASM
+#include <kmdb/kmdb_dpi_impl.h>
+#include <kmdb/kaif_regs.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	KAIF_MASTER_CPUID_UNSET		-1
+
+#define	KAIF_CPU_STATE_NONE		0
+#define	KAIF_CPU_STATE_MASTER		1
+#define	KAIF_CPU_STATE_SLAVE		2
+
+#define	KAIF_CPU_CMD_RESUME		0
+#define	KAIF_CPU_CMD_RESUME_MASTER	1
+#define	KAIF_CPU_CMD_SWITCH		2
+
+#define	KAIF_LSUCTL_VWAPT_MASK	(LSU_VM|LSU_VR|LSU_VW)
+#define	KAIF_LSUCTL_PWAPT_MASK	(LSU_PM|LSU_PR|LSU_PW)
+#define	KAIF_LSUCTL_WAPT_MASK	(LSU_PM|LSU_VM|LSU_PR|LSU_PW|LSU_VR|LSU_VW)
+
+#ifndef _ASM
+extern kaif_cpusave_t *kaif_cpusave;
+extern kaif_cpusave_t kaif_cb_save;
+extern int kaif_ncpusave;
+extern int kaif_master_cpuid;
+
+extern int *kaif_promexitarmp;
+
+extern void (*kaif_ktrap_install)(int, void (*)(void));
+extern void (*kaif_ktrap_restore)(void);
+
+extern caddr_t kaif_tba;
+extern caddr_t kaif_tba_obp;
+#ifdef	sun4v
+extern caddr_t	kaif_tba_kernel;
+#endif
+extern caddr_t kaif_tba_native;
+extern size_t kaif_tba_native_sz;
+
+extern int kaif_trap_switch;
+
+extern void kaif_trap_set_debugger(void);
+extern void kaif_trap_set_saved(kaif_cpusave_t *);
+
+extern void kaif_hdlr_imiss(void);
+extern caddr_t kaif_hdlr_imiss_patch;
+extern void kaif_hdlr_dmiss(void);
+extern caddr_t kaif_hdlr_dmiss_patch;
+extern void kaif_hdlr_generic(void);
+extern void kaif_dtrap(void);
+
+extern caddr_t kaif_dseg_start;
+extern caddr_t kaif_dseg_lim;
+
+extern uintptr_t kaif_invoke(uintptr_t, uint_t, const uintptr_t[],
+    kreg_t, kreg_t);
+
+extern void kaif_enter(void);
+
+extern void kaif_ktrap(void);
+extern void kaif_slave_entry(void);
+extern void kaif_trap_obp(void);
+
+extern void kaif_mod_loaded(struct modctl *);
+extern void kaif_mod_unloading(struct modctl *);
+
+extern void kaif_wapt_set_regs(void);
+extern void kaif_wapt_clear_regs(void);
+
+extern void kaif_activate(kdi_debugvec_t **, uint_t);
+extern void kaif_deactivate(void);
+extern void kaif_resume(int);
+extern void kaif_slave_entry(void);
+extern void kaif_prom_rearm(void);
+extern void kaif_debugger_entry(kaif_cpusave_t *);
+
+extern int kaif_memrange_add(caddr_t, size_t);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _KAIF_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kaif_activate.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,289 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * The debugger/PROM interface layer - debugger activation
+ */
+
+#include <kmdb/kmdb_promif_isadep.h>
+#include <kmdb/kmdb_start.h>
+#include <kmdb/kmdb_kdi.h>
+#include <kmdb/kmdb_asmutil.h>
+#include <kmdb/kaif.h>
+#include <mdb/mdb_debug.h>
+#include <mdb/mdb_kreg.h>
+
+#include <sys/cpuvar.h>
+#include <sys/kdi_impl.h>
+#include <sys/machtrap.h>
+
+kaif_cpusave_t kaif_cb_save;
+
+static const char kaif_defer_word_tmpl[] =
+	/*  1 */ ": kmdb_callback "
+
+	/*
+	 * Don't hand control to the debugger if we're coming from OBP's text.
+	 */
+
+	/*  2 */ "  %%pc f000.0000 ffff.ffff between if exit then "
+
+	/*
+	 * Save registers
+	 */
+
+	/*  3 */ "  %%pc h# %x x! "
+	/*  4 */ "  %%npc h# %x x! "
+	/*  5 */ "  %%g1 h# %x x! "
+	/*  6 */ "  %%g2 h# %x x! "
+	/*  7 */ "  %%g3 h# %x x! "
+	/*  8 */ "  %%g4 h# %x x! "
+	/*  9 */ "  %%g5 h# %x x! "
+	/* 10 */ "  %%g6 h# %x x! "
+	/* 11 */ "  %%g7 h# %x x! "
+	/* 12 */ "  1 %%tstate h# %x x! "
+	/* 13 */ "  1 %%tt h# %x x! "
+	/* 14 */ "  %%tba h# %x x! "
+	/* 15 */ "  h# %x set-pc "
+	/* 16 */ "    go "
+	/* 17 */ "; ";
+
+/*
+ * Format the Forth word which tells the prom how to save state for
+ * giving control to us.
+ */
+static char *
+kaif_format_word(void)
+{
+	static char prom_str[550];
+	kreg_t *kregs = kaif_cb_save.krs_gregs.kregs;
+	int len;
+
+	len = mdb_snprintf(prom_str, sizeof (prom_str), kaif_defer_word_tmpl,
+	    &kregs[KREG_PC],			/*  3 */
+	    &kregs[KREG_NPC],			/*  4 */
+	    &kregs[KREG_G1],			/*  5 */
+	    &kregs[KREG_G2],			/*  6 */
+	    &kregs[KREG_G3],			/*  7 */
+	    &kregs[KREG_G4],			/*  8 */
+	    &kregs[KREG_G5],			/*  9 */
+	    &kregs[KREG_G6],			/* 10 */
+	    &kregs[KREG_G7],			/* 11 */
+	    &kaif_cb_save.krs_tstate,		/* 12 */
+	    &kregs[KREG_TT],			/* 13 */
+	    &kregs[KREG_TBA],			/* 14 */
+	    kaif_trap_obp);			/* 15 */
+
+	ASSERT(len <= sizeof (prom_str));
+
+	return (prom_str);
+}
+
+static void
+kaif_prom_install(void)
+{
+	kmdb_prom_interpret(kaif_format_word());
+	kmdb_prom_interpret(" ['] kmdb_callback init-debugger-hook ");
+}
+
+void
+kaif_prom_rearm(void)
+{
+	kmdb_prom_interpret(" ['] kmdb_callback is debugger-hook ");
+}
+
+/*ARGSUSED*/
+static void
+kaif_cpu_init(cpu_t *cp)
+{
+	kaif_wapt_set_regs();
+}
+
+/*ARGSUSED*/
+static void
+kaif_install_generic(caddr_t tgt, caddr_t arg)
+{
+	bcopy((caddr_t)kaif_hdlr_generic, tgt, 32);
+}
+
+#ifndef sun4v
+static void
+kaif_install_dmmumiss(caddr_t tgt, caddr_t vatotte)
+{
+	uint32_t *patch;
+
+	bcopy((caddr_t)kaif_hdlr_dmiss, tgt, 128);
+
+	/* LINTED - pointer alignment */
+	patch = (uint32_t *)(tgt + ((uintptr_t)&kaif_hdlr_dmiss_patch -
+	    (uintptr_t)kaif_hdlr_dmiss));
+	*patch++ |= (uintptr_t)vatotte >> 10;
+	*patch |= ((uintptr_t)vatotte) & 0x3ff;
+}
+
+static void
+kaif_install_immumiss(caddr_t tgt, caddr_t vatotte)
+{
+	uint32_t *patch;
+
+	bcopy((caddr_t)kaif_hdlr_imiss, tgt, 128);
+
+	/* LINTED - pointer alignment */
+	patch = (uint32_t *)(tgt + ((uintptr_t)&kaif_hdlr_imiss_patch -
+	    (uintptr_t)kaif_hdlr_imiss));
+	*patch++ |= (uintptr_t)vatotte >> 10;
+	*patch |= ((uintptr_t)vatotte) & 0x3ff;
+}
+#endif /* sun4v */
+
+static struct kaif_trap_handlers {
+	uint_t th_tt;
+	void (*th_install)(caddr_t, caddr_t);
+} kaif_trap_handlers[] = {
+	{ T_INSTR_EXCEPTION,			kaif_install_generic },
+	{ T_IDIV0,				kaif_install_generic },
+	{ T_DATA_EXCEPTION,			kaif_install_generic },
+	{ T_DATA_ERROR,				kaif_install_generic },
+	{ T_ALIGNMENT,				kaif_install_generic },
+#ifdef sun4v
+#else /* sun4v */
+	{ T_FAST_INSTR_MMU_MISS,		kaif_install_immumiss },
+	{ T_FAST_DATA_MMU_MISS,			kaif_install_dmmumiss },
+	{ T_FAST_DATA_MMU_PROT,			kaif_install_generic },
+	{ T_FAST_INSTR_MMU_MISS + T_TL1,	kaif_install_immumiss },
+	{ T_FAST_DATA_MMU_MISS + T_TL1,		kaif_install_dmmumiss },
+#endif /* sun4v */
+	{ 0 }
+};
+
+static void
+kaif_trap_init(void)
+{
+	caddr_t vatotte = kmdb_kdi_get_trap_vatotte();
+	uintptr_t brtgt;
+	int i;
+
+	/*
+	 * We rely upon OBP for the handling of a great many traps.  As such,
+	 * we begin by populating our table with pointers to OBP's handlers.
+	 * We then copy in our own handlers where appropriate.  At some point,
+	 * when we provide the bulk of the handlers, this process will be
+	 * reversed.
+	 */
+	for (i = 0; i < kaif_tba_native_sz; i += 0x20) {
+		/* LINTED - pointer alignment */
+		uint32_t *hdlr = (uint32_t *)(kaif_tba_native + i);
+#ifdef	sun4v
+		uint32_t tt = i/0x20;
+
+		/*
+		 * We use obp's tl0 handlers. Sine kmdb installs itsdebug
+		 * hook in obp, if obp cannot handle any traps, such as
+		 * user enter an invalid address in kmdb, obp will call
+		 * kmdb's callback and the control goes back to kmdb.
+		 * For tl>0 traps, kernel's trap handlers are good at
+		 * handling these on sun4v.
+		 */
+		if (tt >= T_TL1)
+			brtgt = (uintptr_t)(kaif_tba_kernel + i);
+		else
+			brtgt = (uintptr_t)(kaif_tba_obp + i);
+#else /* !sun4v */
+		brtgt = (uintptr_t)(kaif_tba_obp + i);
+#endif /* sun4v */
+
+		*hdlr++ = 0x03000000 | (brtgt >> 10);	/* sethi brtgt, %g1 */
+		*hdlr++ = 0x81c06000 | (brtgt & 0x3ff);	/* jmp %g1 + brtgt */
+		*hdlr++ = 0x01000000;			/* nop */
+	}
+
+	for (i = 0; kaif_trap_handlers[i].th_tt != 0; i++) {
+		struct kaif_trap_handlers *th = &kaif_trap_handlers[i];
+		th->th_install(kaif_tba_native + th->th_tt * 0x20, vatotte);
+	}
+	membar_producer();
+}
+
+/*
+ * The kernel is ready for us to switch to our table (the HAT has been
+ * initialized, the hments are walkable, and the trap table's pages
+ * have been locked into the TLBs.
+ */
+static void
+kaif_vmready(void)
+{
+	kaif_tba = kaif_tba_native;
+}
+
+/*
+ * Called on the CPR master CPU.  The driver has taken care of locking the
+ * TLB entries.  CPR restored the OBP image which contains kmdb_callback,
+ * so there's nothing we need to do.  This function should be removed entirely
+ * in a future release.
+ */
+static void
+kaif_cpr_restart(void)
+{
+}
+
+static kdi_debugvec_t kaif_dvec = {
+	kaif_enter,
+	kaif_cpu_init,
+	NULL,			/* dv_kctl_cpu_init */
+	kaif_vmready,
+	NULL,			/* dv_kctl_vmready */
+	NULL,			/* dv_kctl_memavail */
+	kaif_memrange_add,
+	kaif_cpr_restart,
+	NULL,			/* dv_kctl_modavail */
+	NULL,			/* dv_kctl_thravail */
+	kaif_mod_loaded,
+	kaif_mod_unloading
+};
+
+/*ARGSUSED1*/
+void
+kaif_activate(kdi_debugvec_t **dvecp, uint_t flags)
+{
+	kaif_prom_install();
+
+	kaif_ktrap_install(0, kaif_ktrap);
+	kaif_trap_init();
+
+	*dvecp = &kaif_dvec;
+}
+
+void
+kaif_deactivate(void)
+{
+	kmdb_prom_interpret(" ['] noop is debugger-hook ");
+
+	kaif_ktrap_restore();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kaif_enter.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <sys/asm_linkage.h>
+
+#if defined(__lint)
+#include <kmdb/kaif.h>
+#endif /* __lint */
+
+#if defined(__lint)
+void
+kaif_enter(void)
+{
+}
+#else	/* __lint */
+
+/* S390X FIXME */
+	ENTRY(kaif_enter)
+	br	%r14
+	SET_SIZE(kaif_enter)
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kaif_off.in	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,71 @@
+\
+\ 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	"@(#)kaif_off.in	1.3	05/06/08 SMI"
+\
+\ Keep in sync with kaif_regs.h
+\
+
+#include "kaif_regs.h"
+
+kaif_crumb_t	KRM_SIZE
+		krm_src
+		krm_pc
+		krm_tt
+		krm_flag
+
+kaif_cpusave_t	KRS_SIZE
+		krs_gregs
+		krs_rwins
+		krs_fpregs
+		krs_tstate
+		krs_mmu_pcontext
+		krs_cpu_state
+		krs_cpu_id
+		krs_instr_save
+		krs_lsucr_save
+		krs_curcrumbidx
+		krs_curcrumb
+		krs_crumbs
+		krs_cpustack
+
+mdb_tgt_gregset_t GREG_SIZE
+		kregs				GREG_KREGS
+		kreg_flags			GREG_FLAGS
+
+mdb_t
+		m_kdi				MDB_KDI
+
+kdi_t
+		kdi_mach.mkdi_cpu_index		MKDI_CPU_INDEX
+
+kreg_t		KREG_SIZE
+
+\#define	KREG_OFF(name)	(name << 3)
+
+rwindow		RWIN_SIZE
+
+kfpu_t
+		fpu_fprs
+		fpu_fsr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kaif_start_isadep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * The SPARC-specific interface to the main CPU-control loops
+ */
+
+#include <sys/types.h>
+#include <sys/trap.h>
+
+#include <kmdb/kaif.h>
+#include <kmdb/kaif_regs.h>
+#include <kmdb/kaif_start.h>
+#include <kmdb/kmdb_asmutil.h>
+#include <kmdb/kmdb_dpi_impl.h>
+#include <kmdb/kmdb_kdi.h>
+#include <mdb/mdb.h>
+
+void
+kaif_debugger_entry(kaif_cpusave_t *cpusave)
+{
+	kaif_wapt_clear_regs();
+
+	(void) kaif_main_loop(cpusave);
+
+	kaif_wapt_set_regs();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kctl/kctl_asm.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#if defined(__lint)
+#include <sys/thread.h>
+#include <kmdb/kctl/kctl.h>
+#else
+#include <sys/asm_linkage.h>
+#endif
+
+#if defined(__lint)
+/*ARGSUSED*/
+kthread_t *
+kctl_curthread_set(kthread_t *thr)
+{
+	return (NULL);
+}
+#else
+
+	ENTRY_NP(kctl_curthread_set)
+	SET_THR(2,48(15))
+	br      %r14
+	SET_SIZE(kctl_curthread_set)
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kctl/kctl_isadep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,256 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/bootconf.h>
+#include <sys/cpu_module.h>
+#include <sys/x_call.h>
+#include <sys/kdi_impl.h>
+#include <sys/mmu.h>
+#include <sys/cpuvar.h>
+#include <sys/kobj.h>
+#include <sys/kobj_impl.h>
+
+#include <kmdb/kctl/kctl.h>
+
+#define	KCTL_TTABLE_SIZE	0x6000	/* trap table size */
+
+static uint32_t kctl_trap_brsav;	/* saved ba,a from kmdb_trap */
+static uint32_t kctl_trap_tl1_brsav;	/* saved ba,a from kmdb_trap_tl1 */
+
+extern struct scb trap_table;
+
+static void
+kctl_patch_text(caddr_t addr, uint32_t data)
+{
+	if (kctl.kctl_boot_loaded) {
+		/* LINTED - pointer alignment */
+		*((uint32_t *)addr) = data;
+	} else {
+		hot_patch_kernel_text(addr, data, sizeof (data));
+	}
+}
+
+/*
+ * The traps that transfer control to kmdb (breakpoint, programmed entry, etc)
+ * use kmdb_trap and kmdb_trap_tl1, which normally begin with a ba,a to
+ * trap_table0 - a bad trap entry.  When kmdb starts, it will use
+ * kctl_ktrap_install to replace the ba with a jmp to the appropriate kmdb
+ * entry points.  Deactivation uses kctl_ktrap_restore to restore the ba
+ * instructions.
+ */
+static void
+kctl_ktrap_install(int tl, void (*handler)(void))
+{
+	extern uint32_t kmdb_trap, kmdb_trap_tl1;
+	uint32_t *entryp = tl ? &kmdb_trap_tl1 : &kmdb_trap;
+	uint32_t *savp = tl ? &kctl_trap_brsav : &kctl_trap_tl1_brsav;
+	uint32_t hi = (uint32_t)(uintptr_t)handler >> 10;
+	uint32_t lo = (uint32_t)(uintptr_t)handler & 0x3ff;
+	uint32_t inst;
+
+	*savp = *entryp;
+
+	inst = 0x81c06000 | lo; /* jmp %g1 + %lo(handler) */
+	kctl_patch_text((caddr_t)(entryp + 1), inst);
+
+	inst = 0x03000000 | hi;	/* sethi %hi(handler), %g1 */
+	kctl_patch_text((caddr_t)entryp, inst);
+}
+
+static void
+kctl_ktrap_restore(void)
+{
+	extern uint32_t kmdb_trap, kmdb_trap_tl1;
+
+	hot_patch_kernel_text((caddr_t)&kmdb_trap, kctl_trap_brsav, 4);
+	hot_patch_kernel_text((caddr_t)&kmdb_trap_tl1, kctl_trap_tl1_brsav, 4);
+}
+
+static void
+kctl_ttable_tlb_modify(caddr_t tba, size_t sz, void (*func)(caddr_t, int))
+{
+#if defined(KMDB_TRAPCOUNT)
+	int do_dtlb = 1;
+#else
+	int do_dtlb = 0;
+#endif
+
+	caddr_t va;
+
+	ASSERT((sz & MMU_PAGEOFFSET) == 0);
+
+	for (va = tba; sz > 0; sz -= MMU_PAGESIZE, va += MMU_PAGESIZE)
+		func(va, do_dtlb);
+}
+
+static void
+kctl_ttable_tlb_lock(caddr_t tba, size_t sz)
+{
+	kctl_ttable_tlb_modify(tba, sz, kdi_tlb_page_lock);
+}
+
+static void
+kctl_ttable_tlb_unlock(caddr_t tba, size_t sz)
+{
+	kctl_ttable_tlb_modify(tba, sz, kdi_tlb_page_unlock);
+}
+
+/*
+ * kmdb has its own trap table.  Life is made considerably easier if
+ * we allocate and configure it here, passing it to the debugger for
+ * final tweaking.
+ *
+ * The debugger code, and data accessed by the handlers are either
+ * a) locked into the TLB or b) accessible by our tte-lookup code.  As
+ * such, we need only lock the trap table itself into the TLBs.  We'll
+ * get the memory for the table from the beginning of the debugger
+ * segment, which has already been allocated.
+ */
+static void
+kctl_ttable_init(void)
+{
+	xc_all((xcfunc_t *)kctl_ttable_tlb_lock, (uint64_t)kctl.kctl_tba,
+	    KCTL_TTABLE_SIZE);
+}
+
+static void
+kctl_ttable_fini(void)
+{
+	xc_all((xcfunc_t *)kctl_ttable_tlb_unlock, (uint64_t)kctl.kctl_dseg,
+	    KCTL_TTABLE_SIZE);
+}
+
+static caddr_t
+kctl_ttable_reserve(kmdb_auxv_t *kav, size_t *szp)
+{
+	caddr_t tba = kav->kav_dseg;
+
+	ASSERT(kav->kav_dseg_size > KCTL_TTABLE_SIZE);
+	ASSERT(((uintptr_t)kav->kav_dseg & ((1 << 16) - 1)) == 0);
+
+	kav->kav_dseg += KCTL_TTABLE_SIZE;
+	kav->kav_dseg_size -= KCTL_TTABLE_SIZE;
+
+	*szp = KCTL_TTABLE_SIZE;
+	return (tba);
+}
+
+static void
+kctl_cpu_init(void)
+{
+	kctl_ttable_tlb_lock(kctl.kctl_tba, KCTL_TTABLE_SIZE);
+}
+
+int
+kctl_preactivate_isadep(void)
+{
+	if (!kctl.kctl_boot_loaded) {
+		if (kdi_watchdog_disable() != 0) {
+			cmn_err(CE_WARN, "hardware watchdog disabled while "
+			    "debugger is activated");
+		}
+
+		kctl_ttable_init();
+	}
+
+	return (0);
+}
+
+void
+kctl_depreactivate_isadep(void)
+{
+	kctl_ttable_fini();
+
+	kdi_watchdog_restore();
+}
+
+int
+kctl_activate_isadep(kdi_debugvec_t *dvec)
+{
+	dvec->dv_kctl_cpu_init = kctl_cpu_init;
+	dvec->dv_kctl_vmready = kctl_ttable_init;
+
+	return (0);
+}
+
+void
+kctl_deactivate_isadep(void)
+{
+}
+
+void
+kctl_auxv_init_isadep(kmdb_auxv_t *kav, void *romp)
+{
+	extern caddr_t boot_tba;
+	extern void *get_tba(void);
+	extern int (*cif_handler)(void *);
+	extern int prom_exit_enter_debugger;
+
+	kctl.kctl_tba = kav->kav_tba_native = kctl_ttable_reserve(kav,
+	    &kav->kav_tba_native_sz);
+
+	kav->kav_tba_obp = (boot_tba == NULL ? get_tba() : boot_tba);
+#ifdef	sun4v
+	kav->kav_tba_kernel = (caddr_t)&trap_table;
+#endif
+	kav->kav_tba_active = (kctl.kctl_boot_loaded ? kav->kav_tba_obp :
+	    kav->kav_tba_native);
+
+	kav->kav_promexitarmp = &prom_exit_enter_debugger;
+
+	kav->kav_romp = (kctl.kctl_boot_loaded ? romp : (void *)cif_handler);
+
+	kav->kav_ktrap_install = kctl_ktrap_install;
+	kav->kav_ktrap_restore = kctl_ktrap_restore;
+}
+
+/*ARGSUSED*/
+void
+kctl_auxv_fini_isadep(kmdb_auxv_t *auxv)
+{
+}
+
+void *
+kctl_boot_tmpinit(void)
+{
+	kthread_t *kt0 = kobj_zalloc(sizeof (kthread_t), KM_TMP);
+	cpu_t *cpu = kobj_zalloc(sizeof (cpu_t), KM_TMP);
+	kt0->t_cpu = cpu;
+
+	return (kctl_curthread_set(kt0));
+}
+
+void
+kctl_boot_tmpfini(void *old)
+{
+	(void) kctl_curthread_set(old);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_asmutil.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _KMDB_ASMUTIL_H
+#define	_KMDB_ASMUTIL_H
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int get_nwin(void);
+extern uintptr_t get_fp(void);
+extern void flush_windows(void);
+extern uintptr_t cas(uintptr_t *, uintptr_t, uintptr_t);
+extern void membar_producer(void);
+extern void interrupts_on(void);
+extern void interrupts_off(void);
+extern caddr_t get_tba(void);
+extern void set_tba(caddr_t);
+extern uint64_t rdasi(uint32_t, uintptr_t);
+extern void wrasi(uint32_t, uintptr_t, uint64_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _KMDB_ASMUTIL_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_asmutil.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,115 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Utility Assembly routines used by the debugger. S390X FIXME
+ */
+
+#if defined(__lint)
+#include <sys/types.h>
+#include <kmdb/kmdb_asmutil.h>
+#endif
+
+#include <sys/asm_linkage.h>
+#include <sys/privregs.h>
+#include "mach_asmutil.h"
+
+#if defined(__lint)
+uintptr_t
+get_fp(void)
+{
+	return (0);
+}
+#else
+
+	ENTRY(get_fp)
+	lgr     %r2,%r15
+	br	%r14
+	SET_SIZE(get_fp)
+
+#endif
+
+#if defined(__lint)
+void
+interrupts_on(void)
+{
+}
+#else
+
+	ENTRY(interrupts_on)
+	stosm	48(%r15),0x03
+	br	%r14
+	SET_SIZE(interrupts_on)
+
+#endif
+
+#if defined(__lint)
+void
+interrupts_off(void)
+{
+}
+#else
+
+	ENTRY(interrupts_off)
+	stnsm	48(%r15),0xfc
+	br	%r14
+	SET_SIZE(interrupts_off)
+
+#endif
+
+#if defined(__lint)
+caddr_t
+get_tba(void)
+{
+	return (0);
+}
+#else
+
+	ENTRY(get_tba)
+	lhi	%r2,0
+	br	%r14
+	SET_SIZE(get_tba)
+
+#endif
+
+#if defined(__lint)
+/*ARGSUSED*/
+void
+set_tba(caddr_t new)
+{
+}
+#else
+
+	ENTRY(set_tba)
+	lhi	%r2,0
+	br	%r14
+	SET_SIZE(set_tba)
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_context_off.in	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,36 @@
+\
+\ 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	"@(#)kmdb_context_off.in	1.2	05/06/08 SMI"
+\
+\ Structure offsets for use in context-switching assembly code.
+\
+
+#include <ucontext.h>
+
+ucontext
+		uc_mcontext	UC_MCTX
+
+mcontext_t
+		gregs		MCTX_GREGS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_dpi_isadep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,200 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * SPARC-specific portions of the DPI
+ */
+
+#include <sys/types.h>
+#include <sys/mmu.h>
+#include <sys/trap.h>
+#include <sys/machtrap.h>
+
+#include <kmdb/kmdb_dpi_impl.h>
+#include <kmdb/kmdb_asmutil.h>
+#include <kmdb/kmdb_promif.h>
+#include <kmdb/kmdb_fault.h>
+#include <mdb/mdb_err.h>
+#include <mdb/mdb_debug.h>
+#include <mdb/mdb_kreg.h>
+#include <mdb/mdb.h>
+
+void
+kmdb_dpi_handle_fault(kreg_t tt, kreg_t tpc, kreg_t tnpc, kreg_t sp, int cpuid)
+{
+	mdb_dprintf(MDB_DBG_DPI, "\ndpi_handle_fault: tt 0x%01lx, tpc 0x%0?p, "
+	    "tnpc 0x%0?p, sp 0x%0?p, fault_pcb 0x%0?p\n", tt, tpc, tnpc, sp,
+	    kmdb_dpi_fault_pcb);
+
+	switch (tt) {
+	case FAST_PROT_TT:
+		errno = EACCES;
+		break;
+	case T_DATA_ERROR:
+		errno = EIO;
+		break;
+#ifdef sun4v
+	case T_DATA_MMU_MISS:
+#endif /* sun4v */
+	case FAST_DMMU_MISS_TT:
+	default:
+		errno = EMDB_NOMAP;
+	}
+
+	if (kmdb_dpi_fault_pcb != NULL) {
+		longjmp(*kmdb_dpi_fault_pcb, 1);
+		/*NOTREACHED*/
+	}
+
+	/* Debugger fault */
+	kmdb_fault(tt, tpc, sp, cpuid);
+}
+
+int
+kmdb_dpi_get_register(const char *regname, kreg_t *kregp)
+{
+	return (mdb.m_dpi->dpo_get_cpu_register(DPI_MASTER_CPUID,
+	    DPI_TOP_WINDOW, regname, kregp));
+}
+
+int
+kmdb_dpi_get_win_register(int win, const char *regname, kreg_t *kregp)
+{
+	return (mdb.m_dpi->dpo_get_cpu_register(DPI_MASTER_CPUID,
+	    win, regname, kregp));
+}
+
+int
+kmdb_dpi_get_cpu_register(int cpuid, int win, const char *regname,
+    kreg_t *kregp)
+{
+	return (mdb.m_dpi->dpo_get_cpu_register(cpuid, win, regname, kregp));
+}
+
+int
+kmdb_dpi_set_register(const char *regname, kreg_t kreg)
+{
+	return (mdb.m_dpi->dpo_set_cpu_register(DPI_MASTER_CPUID,
+	    DPI_TOP_WINDOW, regname, kreg));
+}
+
+int
+kmdb_dpi_set_win_register(int win, const char *regname, kreg_t kreg)
+{
+	return (mdb.m_dpi->dpo_set_cpu_register(DPI_MASTER_CPUID,
+	    win, regname, kreg));
+}
+
+int
+kmdb_dpi_set_cpu_register(int cpuid, int win, const char *regname,
+    kreg_t kreg)
+{
+	return (mdb.m_dpi->dpo_set_cpu_register(cpuid, win, regname, kreg));
+}
+
+int
+kmdb_dpi_get_rwin(int cpuid, int win, struct rwindow *rwin)
+{
+	return (mdb.m_dpi->dpo_get_rwin(cpuid, win, rwin));
+}
+
+int
+kmdb_dpi_get_nwin(int cpuid)
+{
+	return (mdb.m_dpi->dpo_get_nwin(cpuid));
+}
+
+void
+kmdb_dpi_kernpanic(int cpuid)
+{
+	mdb.m_dpi->dpo_kernpanic(cpuid);
+}
+
+/*
+ * Continue/resume handling.  If the target calls kmdb_dpi_resume(), it
+ * expects that the world will be resumed, and that the call will return
+ * when the world has stopped again.
+ *
+ * For support, we have resume_return(), which is called from main() when
+ * the continuation has completed (when the world has stopped again).
+ * set_resume_exit() tells where to jump to actually restart the world.
+ *
+ * CAUTION: This routine may be called *after* mdb_destroy.
+ */
+void
+kmdb_dpi_resume_common(int cmd)
+{
+	kreg_t pc, tt;
+
+	ASSERT(kmdb_dpi_resume_requested == 0);
+
+	if (setjmp(kmdb_dpi_resume_pcb) == 0) {
+		(void) kmdb_dpi_get_register("pc", &pc);
+		mdb_dprintf(MDB_DBG_PROC, "Resume requested, pc is %p\n",
+		    (void *)pc);
+
+		if (cmd != KMDB_DPI_CMD_RESUME_UNLOAD)
+			kmdb_dpi_resume_requested = 1;
+
+		longjmp(kmdb_dpi_entry_pcb, cmd);
+		/*NOTREACHED*/
+
+	} else {
+		(void) kmdb_dpi_get_register("pc", &pc);
+		(void) kmdb_dpi_get_register("tt", &tt);
+		mdb_dprintf(MDB_DBG_PROC, "Back from resume, pc: %p, tt: %lx\n",
+		    (void *)pc, tt);
+
+		kmdb_dpi_resume_requested = 0;
+
+		switch (tt) {
+		case T_PA_WATCHPOINT:
+			kmdb_dpi_set_state(DPI_STATE_FAULTED,
+			    DPI_STATE_WHY_P_WAPT);
+			break;
+		case T_VA_WATCHPOINT:
+			kmdb_dpi_set_state(DPI_STATE_FAULTED,
+			    DPI_STATE_WHY_V_WAPT);
+			break;
+		case ST_KMDB_BREAKPOINT|T_SOFTWARE_TRAP:
+		case ST_MON_BREAKPOINT|T_SOFTWARE_TRAP: /* Shouldn't happen */
+			kmdb_dpi_set_state(DPI_STATE_FAULTED,
+			    DPI_STATE_WHY_BKPT);
+			break;
+		case ST_KMDB_TRAP|T_SOFTWARE_TRAP:
+			kmdb_dpi_set_state(DPI_STATE_STOPPED, 0);
+			break;
+		default:
+			kmdb_dpi_set_state(DPI_STATE_FAULTED,
+			    DPI_STATE_WHY_TRAP);
+			break;
+		}
+	}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_dpi_isadep.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,59 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _KMDB_DPI_ISADEP_H
+#define	_KMDB_DPI_ISADEP_H
+
+#include <mdb/mdb_v9util.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	DPI_TOP_WINDOW		(-1)		/* matches cwp */
+
+extern int kmdb_dpi_get_win_register(int, const char *, kreg_t *);
+extern int kmdb_dpi_get_cpu_register(int, int, const char *, kreg_t *);
+
+extern int kmdb_dpi_set_win_register(int, const char *, kreg_t);
+extern int kmdb_dpi_set_cpu_register(int, int, const char *, kreg_t);
+
+extern int kmdb_dpi_get_rwin(int, int, struct rwindow *);
+extern int kmdb_dpi_get_nwin(int);
+
+extern void kmdb_dpi_handle_fault(kreg_t, kreg_t, kreg_t, kreg_t, int);
+
+extern void kmdb_dpi_kernpanic(int cpuid);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _KMDB_DPI_ISADEP_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_fault_isadep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,165 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * SPARC-specific portions of the debugger fault routines
+ */
+
+#include <sys/types.h>
+#include <sys/stack.h>
+#include <sys/frame.h>
+#include <sys/machtrap.h>
+#include <sys/machasi.h>
+#include <sys/sun4asi.h>
+#include <sys/intreg.h>
+#include <sys/mmu.h>
+
+#include <kmdb/kmdb_asmutil.h>
+#include <kmdb/kmdb_fault.h>
+#include <mdb/mdb_io.h>
+#include <mdb/mdb.h>
+
+#define	MAX_STACK_FRAMES	30
+
+static void
+print_frame(uintptr_t sp, uintptr_t pc, int fnum, int safe)
+{
+	if (safe) {
+		mdb_iob_printf(mdb.m_err, "    [%2d] %?p %?p()\n",
+		    fnum, sp, pc);
+	} else {
+		mdb_iob_printf(mdb.m_err, "    [%2d] %?p %a()\n",
+		    fnum, sp, pc);
+	}
+}
+
+static int
+valid_frame(struct frame *fr)
+{
+	uintptr_t addr = (uintptr_t)fr;
+
+	if (!(addr - (uintptr_t)mdb.m_dseg < mdb.m_dsegsz)) {
+		mdb_iob_printf(mdb.m_err, "    frame (%p) outside of "
+		    "debugger segment\n", addr);
+		return (0);
+	}
+
+	if (addr & (STACK_ALIGN - 1)) {
+		mdb_iob_printf(mdb.m_err, "    mis-aligned frame (%p)\n", fr);
+		return (0);
+	}
+
+	return (1);
+}
+
+static void
+print_stack(kreg_t sp, int safe)
+{
+	struct frame *fr = (struct frame *)(sp + STACK_BIAS);
+	struct frame *nfr;
+	int frnum = 1;
+
+	while (fr != NULL && valid_frame(fr) && fr->fr_savpc != 0 &&
+	    frnum <= MAX_STACK_FRAMES) {
+		print_frame((uintptr_t)fr - STACK_BIAS, fr->fr_savpc, frnum++,
+		    safe);
+
+		nfr = (struct frame *)
+		    ((uintptr_t)fr->fr_savfp + STACK_BIAS);
+
+		if ((uintptr_t)nfr == STACK_BIAS)
+			break;
+
+		if ((uintptr_t)nfr < (uintptr_t)fr) {
+			mdb_iob_printf(mdb.m_err,
+			    "    fp (%p) < sp (%p)\n", nfr, fr);
+			break;
+		}
+
+		fr = nfr;
+	}
+}
+
+void
+kmdb_print_stack(void)
+{
+	print_stack(get_fp(), FALSE); /* show sym names */
+}
+
+void
+kmdb_fault_display(kreg_t tt, kreg_t pc, kreg_t sp, int safe)
+{
+	mdb_iob_printf(mdb.m_err, "    tt: %p, sp: %p, pc: %p", tt, sp, pc);
+	if (!safe)
+		mdb_iob_printf(mdb.m_err, " %A", pc);
+	mdb_iob_printf(mdb.m_err, "\n");
+
+	switch (tt) {
+	case T_FAST_DATA_MMU_MISS: {
+#ifdef sun4v
+#else /* sun4v */
+		uint64_t dsfar = rdasi(ASI_DMMU, MMU_SFAR);
+		const char *fmt = safe ? "%s%p\n" : "%s%a\n";
+		mdb_iob_printf(mdb.m_err, fmt, "\tDSFAR now: ", dsfar);
+#endif /* sun4v */
+		break;
+	}
+	case T_VECTORED_INT:
+#ifdef sun4v
+#else /* sun4v */
+		mdb_iob_printf(mdb.m_err,
+		    "\tIRDR now: 0: %lx, 1: %lx, 2: %lx\n",
+		    (ulong_t)rdasi(ASI_INTR_RECEIVE, IRDR_0),
+		    (ulong_t)rdasi(ASI_INTR_RECEIVE, IRDR_1),
+		    (ulong_t)rdasi(ASI_INTR_RECEIVE, IRDR_2));
+#endif /* sun4v */
+		break;
+	}
+
+	mdb_iob_printf(mdb.m_err, "\n");
+
+	if (mdb.m_dseg == NULL || mdb.m_dsegsz == 0) {
+		mdb_iob_printf(mdb.m_err,
+		    "\t*** Stack trace omitted because debugger segment size\n"
+		    "\t*** and/or length not set.\n");
+		return;
+	}
+
+	if (!(sp - (uintptr_t)mdb.m_dseg < mdb.m_dsegsz)) {
+		mdb_iob_printf(mdb.m_err,
+		    "\t*** Stack trace omitted because sp (%p) isn't in the\n"
+		    "\t*** debugger segment.\n", sp);
+		return;
+	}
+
+	flush_windows();
+
+	print_stack(sp, safe);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_kdi_isadep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,260 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * SPARC-specific portions of the KDI
+ */
+
+#include <sys/types.h>
+#include <sys/kdi_impl.h>
+
+#include <kmdb/kmdb_kdi_impl.h>
+#include <kmdb/kmdb_dpi.h>
+#include <kmdb/kmdb_promif.h>
+#include <mdb/mdb_debug.h>
+#include <mdb/mdb_err.h>
+#include <mdb/mdb.h>
+
+#define	KDI_XC_RETRIES			10
+
+static size_t kdi_dcache_size;
+static size_t kdi_dcache_linesize;
+static size_t kdi_icache_size;
+static size_t kdi_icache_linesize;
+
+static uint_t kdi_max_cpu_freq;
+static uint_t kdi_sticks_per_usec;
+
+void
+kdi_usecwait(clock_t n)
+{
+	mdb.m_kdi->mkdi_tickwait(n * kdi_sticks_per_usec);
+}
+
+static int
+kdi_cpu_ready_iter(int (*cb)(int, void *), void *arg)
+{
+	return (mdb.m_kdi->mkdi_cpu_ready_iter(cb, arg));
+}
+
+static int
+kdi_xc_one(int cpuid, void (*cb)(void))
+{
+	return (mdb.m_kdi->mkdi_xc_one(cpuid, (void (*)())cb, NULL, NULL));
+}
+
+/*ARGSUSED1*/
+static int
+kdi_init_cpus_cb(pnode_t node, void *arg, void *result)
+{
+	/*
+	 * Sun4v dosen't support virtual address cache
+	 */
+#ifndef	sun4v
+	int dcache_size, dcache_linesize;
+	int icache_size, icache_linesize;
+#endif
+	int cpu_freq;
+
+#ifndef	sun4v
+	/*
+	 * data cache
+	 */
+
+	if (kmdb_prom_getprop(node, "dcache-size",
+	    (caddr_t)&dcache_size) == -1 &&
+	    kmdb_prom_getprop(node, "l1-dcache-size",
+	    (caddr_t)&dcache_size) == -1)
+		fail("can't get dcache size for node %x\n", node);
+
+	if (kdi_dcache_size == 0 || dcache_size > kdi_dcache_size)
+		kdi_dcache_size = dcache_size;
+
+	if (kmdb_prom_getprop(node, "dcache-line-size",
+	    (caddr_t)&dcache_linesize) == -1 &&
+	    kmdb_prom_getprop(node, "l1-dcache-line-size",
+	    (caddr_t)&dcache_linesize) == -1)
+		fail("can't get dcache line size for node %x\n", node);
+
+	if (kdi_dcache_linesize == 0 || dcache_linesize < kdi_dcache_linesize)
+		kdi_dcache_linesize = dcache_linesize;
+
+	/*
+	 * instruction cache
+	 */
+
+	if (kmdb_prom_getprop(node, "icache-size",
+	    (caddr_t)&icache_size) == -1 &&
+	    kmdb_prom_getprop(node, "l1-icache-size",
+	    (caddr_t)&icache_size) == -1)
+		fail("can't get icache size for node %x\n", node);
+
+	if (kdi_icache_size == 0 || icache_size > kdi_icache_size)
+		kdi_icache_size = icache_size;
+
+	if (kmdb_prom_getprop(node, "icache-line-size",
+	    (caddr_t)&icache_linesize) == -1 &&
+	    kmdb_prom_getprop(node, "l1-icache-line-size",
+	    (caddr_t)&icache_linesize) == -1)
+		fail("can't get icache size for node %x\n", node);
+
+	if (kdi_icache_linesize == 0 || icache_linesize < kdi_icache_linesize)
+		kdi_icache_linesize = icache_linesize;
+#endif
+
+	if (kmdb_prom_getprop(node, "clock-frequency",
+	    (caddr_t)&cpu_freq) == -1) {
+		fail("can't get cpu frequency for node %x\n", node);
+	}
+
+	kdi_max_cpu_freq = MAX(kdi_max_cpu_freq, cpu_freq);
+
+	return (0);
+}
+
+void
+kdi_cpu_init(void)
+{
+	kdi_dcache_size = kdi_dcache_linesize =
+	    kdi_icache_size = kdi_icache_linesize = 0;
+
+	kdi_max_cpu_freq = kdi_sticks_per_usec = 0;
+
+	mdb_dprintf(MDB_DBG_KDI, "Initializing CPUs\n");
+
+	kmdb_prom_walk_cpus(kdi_init_cpus_cb, NULL, NULL);
+
+	/*
+	 * If we can't find one, guess high.  The CPU frequency is going to be
+	 * used to determine the length of various delays, such as the mondo
+	 * interrupt retry delay.  Too long is generally better than too short.
+	 */
+	if (kdi_max_cpu_freq == 0) {
+		mdb_dprintf(MDB_DBG_KDI, "No CPU freq found - assuming "
+		    "500MHz\n");
+		kdi_max_cpu_freq = 500 * MICROSEC;
+	}
+
+	kdi_sticks_per_usec =
+	    MAX((kdi_max_cpu_freq + (MICROSEC - 1)) / MICROSEC, 1);
+
+	mdb.m_kdi->mkdi_cpu_init(kdi_dcache_size, kdi_dcache_linesize,
+	    kdi_icache_size, kdi_icache_linesize);
+}
+
+/*
+ * Called on an individual CPU.  Tries to send it off to the state saver if it
+ * hasn't already entered the debugger.  Returns non-zero if it *fails* to stop
+ * the CPU.
+ */
+static int
+kdi_halt_cpu(int cpuid, void *state_saverp)
+{
+	void (*state_saver)(void) = (void (*)(void))state_saverp;
+	int state = kmdb_dpi_get_cpu_state(cpuid);
+	const char *msg;
+	int rc = 0;
+	int res;
+
+	if (state != DPI_CPU_STATE_MASTER && state != DPI_CPU_STATE_SLAVE) {
+		res = kdi_xc_one(cpuid, state_saver);
+			rc = 1;
+
+		if (res == KDI_XC_RES_OK)
+			msg = "accepted the";
+		else {
+			if (res == KDI_XC_RES_BUSY)
+				msg = "too busy for";
+			else if (res == KDI_XC_RES_NACK)
+				msg = "NACKED the";
+			else
+				msg = "errored the";
+		}
+		mdb_dprintf(MDB_DBG_KDI, "CPU %d %s halt\n", cpuid, msg);
+	}
+
+	return (rc);
+}
+
+/*ARGSUSED1*/
+static int
+kdi_report_unhalted(int cpuid, void *junk)
+{
+	int state = kmdb_dpi_get_cpu_state(cpuid);
+
+	if (state != DPI_CPU_STATE_MASTER && state != DPI_CPU_STATE_SLAVE)
+		mdb_warn("CPU %d: stop failed\n", cpuid);
+
+	return (0);
+}
+
+/*ARGSUSED*/
+void
+kmdb_kdi_stop_other_cpus(int my_cpuid, void (*slave_saver)(void))
+{
+	int i;
+
+	for (i = 0; i < KDI_XC_RETRIES; i++) {
+		if (kdi_cpu_ready_iter(kdi_halt_cpu, (void *)slave_saver) == 0)
+			break;
+
+		kdi_usecwait(2000);
+	}
+	(void) kdi_cpu_ready_iter(kdi_report_unhalted, NULL);
+}
+
+int
+kmdb_kdi_get_stick(uint64_t *stickp)
+{
+	return (mdb.m_kdi->mkdi_get_stick(stickp));
+}
+
+caddr_t
+kmdb_kdi_get_trap_vatotte(void)
+{
+	return ((caddr_t)mdb.m_kdi->mkdi_trap_vatotte);
+}
+
+void
+kmdb_kdi_kernpanic(struct regs *regs, uint_t tt)
+{
+	uintptr_t args[2];
+
+	args[0] = (uintptr_t)regs;
+	args[1] = tt;
+
+	(void) kmdb_dpi_call((uintptr_t)mdb.m_kdi->mkdi_kernpanic, 2, args);
+}
+
+/*ARGSUSED*/
+void
+kmdb_kdi_init_isadep(kdi_t *kdi, kmdb_auxv_t *kav)
+{
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_kdi_isadep.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _KMDB_KDI_ISADEP_H
+#define	_KMDB_KDI_ISADEP_H
+
+#include <sys/pte.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct regs;
+
+extern int kmdb_kdi_get_stick(uint64_t *);
+extern caddr_t kmdb_kdi_get_trap_vatotte(void);
+extern void kmdb_kdi_kernpanic(struct regs *, uint_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _KMDB_KDI_ISADEP_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_makecontext.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,66 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Context-saving routine used for pipelines.  Designed for use only
+ * with kmdb_setcontext, and with the assumption that func() will never
+ * return.
+ */
+
+#include <strings.h>
+#include <ucontext.h>
+#include <sys/types.h>
+#include <sys/stack.h>
+
+#include <kmdb/kmdb_context_impl.h>
+#include <mdb/mdb_kreg.h>
+
+void
+kmdb_makecontext(ucontext_t *ucp, void (*func)(void *), void *arg, caddr_t stk,
+    size_t stksize)
+{
+	/*
+	 * Top-of-stack must be rounded down to STACK_ALIGN and
+	 * there must be a minimum frame for the register window.
+	 */
+	uintptr_t stack = (((uintptr_t)stk + stksize - 1) &
+	    ~(STACK_ALIGN - 1)) - SA(MINFRAME);
+
+	/* clear the top stack frame */
+	bzero((void *)stack, SA(MINFRAME));
+
+	/* fill in registers of interest */
+	ucp->uc_mcontext.gregs[REG_PC] = (greg_t)func;
+	ucp->uc_mcontext.gregs[REG_nPC] = (greg_t)func + 4;
+	ucp->uc_mcontext.gregs[REG_O0] = (greg_t)arg;
+	ucp->uc_mcontext.gregs[REG_SP] = (greg_t)(stack - STACK_BIAS);
+	ucp->uc_mcontext.gregs[REG_O7] = NULL;
+	ucp->uc_mcontext.gregs[REG_G7] = NULL;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_promif_isadep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,197 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * PROM interface
+ */
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define	_KERNEL
+#define	_BOOT
+#include <sys/promif.h>
+#undef _BOOT
+#undef _KERNEL
+
+#include <mdb/mdb_debug.h>
+#include <mdb/mdb_err.h>
+#include <kmdb/kmdb_promif_impl.h>
+#include <kmdb/kmdb_kdi.h>
+#include <mdb/mdb_string.h>
+#include <mdb/mdb.h>
+
+ssize_t
+kmdb_prom_obp_writer(caddr_t buf, size_t len)
+{
+	return (prom_write(prom_stdout_ihandle(), buf, len, 0, 0));
+}
+
+ihandle_t
+kmdb_prom_get_handle(char *name)
+{
+	if (strcmp(name, "stdin") == 0)
+		return (prom_stdin_ihandle());
+	else if (strcmp(name, "stdout") == 0 || strcmp(name, "stderr") == 0)
+		return (prom_stdout_ihandle());
+	else
+		return (-1);
+}
+
+/*ARGSUSED*/
+char *
+kmdb_prom_get_options_prop(kmdb_auxv_t *kav, char *propname)
+{
+	pnode_t node;
+	ssize_t len;
+	char *val;
+
+	if ((node = prom_finddevice("/options")) == NULL)
+		return (NULL);
+
+	if ((len = prom_getproplen(node, propname)) < 0)
+		return (NULL);
+
+	val = mdb_alloc(len + 1, UM_SLEEP);
+
+	if (prom_bounded_getprop(node, propname, val, len) != len) {
+		mdb_free(val, len);
+		return (NULL);
+	}
+	val[len] = '\0';
+
+	return (val);
+}
+
+void
+kmdb_prom_free_options_prop(char *val)
+{
+	strfree(val);
+}
+
+int
+kmdb_prom_getprop(pnode_t node, char *name, caddr_t value)
+{
+	return (prom_getprop(node, name, value));
+}
+
+typedef struct walk_cpu_data {
+	int (*wcd_cb)(pnode_t, void *, void *);
+	void *wcd_arg;
+} walk_cpu_data_t;
+
+static int
+walk_cpus_cb(pnode_t node, void *arg, void *result)
+{
+	walk_cpu_data_t *wcd = arg;
+
+	/*
+	 * Sun4v dosen't support port_id on guest.
+	 */
+#ifndef	sun4v
+	int port_id;
+#endif	/* sun4v */
+
+	if (!prom_devicetype(node, OBP_CPU))
+		return (PROM_WALK_CONTINUE);
+
+#ifndef	sun4v
+	if ((prom_getprop(node, "portid", (caddr_t)&port_id) == -1) &&
+	    (prom_getprop(node, "upa-portid", (caddr_t)&port_id) == -1) &&
+	    (prom_getprop(node, "cpuid", (caddr_t)&port_id) == -1)) {
+		warn("cpu node %x has no identifying properties\n",
+		    node);
+		return (PROM_WALK_CONTINUE);
+	}
+#endif	/* sun4v */
+
+	if (wcd->wcd_cb(node, wcd->wcd_arg, result) != 0)
+		return (PROM_WALK_TERMINATE);
+
+	return (PROM_WALK_CONTINUE);
+}
+
+void
+kmdb_prom_walk_cpus(int (*cb)(pnode_t, void *, void *), void *arg, void *result)
+{
+	walk_cpu_data_t wcd;
+
+	wcd.wcd_cb = cb;
+	wcd.wcd_arg = arg;
+
+	prom_walk_devs(prom_rootnode(), walk_cpus_cb, &wcd, result);
+}
+
+void
+kmdb_prom_enter_mon(void)
+{
+	prom_enter_mon();
+}
+
+void
+kmdb_prom_exit_to_mon(void)
+{
+	prom_exit_to_mon();
+}
+
+void
+kmdb_prom_interpret(const char *str)
+{
+	prom_interpret((char *)str, 0, 0, 0, 0, 0);
+}
+
+/*ARGSUSED*/
+int
+kmdb_prom_translate_virt(uintptr_t virt, physaddr_t *pap)
+{
+	extern int prom_translate_virt(caddr_t, int *, u_longlong_t *, int *);
+
+	int valid, mode;
+	uintptr_t vabase = virt & ~(mdb.m_pagesize - 1);
+	uintptr_t off = virt - vabase;
+	u_longlong_t pa;
+
+	mdb_dprintf(MDB_DBG_DPI, "using OBP for vtop of %p\n", (void *)virt);
+
+	if (prom_translate_virt((caddr_t)vabase, &valid, &pa, &mode) != 0)
+		return (set_errno(EMDB_NOMAP));
+
+	*pap = pa + off;
+	return (0);
+}
+
+/*ARGSUSED*/
+int
+kmdb_prom_stdout_is_framebuffer(kmdb_auxv_t *kav)
+{
+	return (prom_stdout_is_framebuffer());
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kmdb_promif_isadep.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,58 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _KMDB_PROMIF_ISADEP_H
+#define	_KMDB_PROMIF_ISADEP_H
+
+#include <sys/obpdefs.h>
+#include <sys/termios.h>
+
+#include <mdb/mdb_target.h>
+#include <kmdb/kmdb_promif.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void kmdb_prom_walk_cpus(int (*)(pnode_t, void *, void *),
+    void *, void *);
+extern void kmdb_prom_enter_mon(void);
+extern void kmdb_prom_exit_to_mon(void);
+extern void kmdb_prom_interpret(const char *);
+extern int kmdb_prom_getprop(pnode_t, char *, caddr_t);
+
+/* private to promif */
+extern int kmdb_prom_translate_virt(uintptr_t, physaddr_t *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _KMDB_PROMIF_ISADEP_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kvm_isadep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,526 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * isa-dependent portions of the kmdb target
+ */
+
+#include <mdb/mdb_kreg_impl.h>
+#include <mdb/mdb_debug.h>
+#include <mdb/mdb_modapi.h>
+#include <mdb/mdb_v9util.h>
+#include <mdb/mdb_target_impl.h>
+#include <mdb/mdb_err.h>
+#include <mdb/mdb_umem.h>
+#include <kmdb/kmdb_kdi.h>
+#include <kmdb/kmdb_dpi.h>
+#include <kmdb/kmdb_promif.h>
+#include <kmdb/kmdb_asmutil.h>
+#include <kmdb/kvm.h>
+#include <mdb/mdb.h>
+
+#include <sys/types.h>
+#include <sys/stack.h>
+#include <sys/regset.h>
+#include <sys/sysmacros.h>
+#include <sys/bitmap.h>
+#include <sys/machtrap.h>
+#include <sys/trap.h>
+
+/* Higher than the highest trap number for which we have a specific specifier */
+#define	KMT_MAXTRAPNO	0x1ff
+
+#define	OP(x)		((x) >> 30)
+#define	OP3(x)		(((x) >> 19) & 0x3f)
+#define	RD(x)		(((x) >> 25) & 0x1f)
+#define	RS1(x)		(((x) >> 14) & 0x1f)
+#define	RS2(x)		((x) & 0x1f)
+
+#define	OP_ARITH	0x2
+
+#define	OP3_OR		0x02
+#define	OP3_SAVE	0x3c
+#define	OP3_RESTORE	0x3d
+
+static int
+kmt_stack_iter(mdb_tgt_t *t, const mdb_tgt_gregset_t *gsp,
+    mdb_tgt_stack_f *func, void *arg, int cpu)
+{
+	mdb_tgt_gregset_t gregs;
+	kreg_t *kregs = &gregs.kregs[0];
+	long nwin, stopwin, canrestore, wp, i, sp;
+	long argv[6];
+
+	/*
+	 * If gsp isn't null, we were asked to dump a trace from a
+	 * specific location.  The normal iterator can handle that.
+	 */
+	if (gsp != NULL) {
+		if (cpu != DPI_MASTER_CPUID)
+			warn("register set provided - ignoring cpu argument\n");
+		return (mdb_kvm_v9stack_iter(t, gsp, func, arg));
+	}
+
+	if (kmdb_dpi_get_cpu_state(cpu) < 0) {
+		warn("failed to iterate through stack for cpu %u", cpu);
+		return (DCMD_ERR);
+	}
+
+	/*
+	 * We're being asked to dump the trace for the current CPU.
+	 * To do that, we need to iterate first through the saved
+	 * register windors.  If there's more to the trace than that,
+	 * we'll hand off to the normal iterator.
+	 */
+	bcopy(kmdb_dpi_get_gregs(cpu), &gregs, sizeof (mdb_tgt_gregset_t));
+
+	wp = kregs[KREG_CWP];
+	canrestore = kregs[KREG_CANRESTORE];
+	nwin = kmdb_dpi_get_nwin(cpu);
+	stopwin = ((wp + nwin) - canrestore - 1) % nwin;
+
+	mdb_dprintf(MDB_DBG_KMOD, "dumping cwp = %lu, canrestore = %lu, "
+	    "stopwin = %lu\n", wp, canrestore, stopwin);
+
+	for (;;) {
+		struct rwindow rwin;
+
+		for (i = 0; i < 6; i++)
+			argv[i] = kregs[KREG_I0 + i];
+
+		if (kregs[KREG_PC] != 0 &&
+		    func(arg, kregs[KREG_PC], 6, argv, &gregs) != 0)
+			return (0);
+
+		kregs[KREG_PC] = kregs[KREG_I7];
+		kregs[KREG_NPC] = kregs[KREG_PC] + 4;
+
+		if ((sp = kregs[KREG_FP] + STACK_BIAS) == STACK_BIAS || sp == 0)
+			return (0); /* Stop if we're at the end of stack */
+
+		if (sp & (STACK_ALIGN - 1))
+			return (set_errno(EMDB_STKALIGN));
+
+		wp = (wp + nwin - 1) % nwin;
+
+		if (wp == stopwin)
+			break;
+
+		bcopy(&kregs[KREG_I0], &kregs[KREG_O0], 8 * sizeof (kreg_t));
+
+		if (kmdb_dpi_get_rwin(cpu, wp, &rwin) < 0) {
+			warn("unable to get registers from window %ld\n", wp);
+			return (-1);
+		}
+
+		for (i = 0; i < 8; i++)
+			kregs[KREG_L0 + i] = (uintptr_t)rwin.rw_local[i];
+		for (i = 0; i < 8; i++)
+			kregs[KREG_I0 + i] = (uintptr_t)rwin.rw_in[i];
+	}
+
+	mdb_dprintf(MDB_DBG_KMOD, "dumping wp %ld and beyond normally\n", wp);
+
+	/*
+	 * hack - if we null out pc here, iterator won't print the frame
+	 * that corresponds to the current set of registers.  That's what we
+	 * want because we just printed them above.
+	 */
+	kregs[KREG_PC] = 0;
+	return (mdb_kvm_v9stack_iter(t, &gregs, func, arg));
+}
+
+void
+kmt_printregs(const mdb_tgt_gregset_t *gregs)
+{
+	mdb_v9printregs(gregs);
+}
+
+static int
+kmt_stack_common(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv,
+    int cpuid, mdb_tgt_stack_f *func, kreg_t saved_pc)
+{
+	mdb_tgt_gregset_t *grp = NULL;
+	mdb_tgt_gregset_t gregs;
+	void *arg = (void *)(uintptr_t)mdb.m_nargs;
+
+	if (flags & DCMD_ADDRSPEC) {
+		bzero(&gregs, sizeof (gregs));
+		gregs.kregs[KREG_FP] = addr;
+		gregs.kregs[KREG_I7] = saved_pc;
+		grp = &gregs;
+	}
+
+	if (argc != 0) {
+		if (argv->a_type == MDB_TYPE_CHAR || argc > 1)
+			return (DCMD_USAGE);
+
+		if (argv->a_type == MDB_TYPE_STRING)
+			arg = (void *)(uintptr_t)(uint_t)
+			    mdb_strtoull(argv->a_un.a_str);
+		else
+			arg = (void *)(uintptr_t)(uint_t)argv->a_un.a_val;
+	}
+
+	(void) kmt_stack_iter(mdb.m_target, grp, func, arg, cpuid);
+
+	return (DCMD_OK);
+}
+
+int
+kmt_cpustack(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv,
+    int cpuid, int verbose)
+{
+	return (kmt_stack_common(addr, flags, argc, argv, cpuid,
+	    (verbose ? mdb_kvm_v9framev : mdb_kvm_v9frame), 0));
+}
+
+int
+kmt_stack(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	return (kmt_stack_common(addr, flags, argc, argv, DPI_MASTER_CPUID,
+	    mdb_kvm_v9frame, 0));
+}
+
+int
+kmt_stackv(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	return (kmt_stack_common(addr, flags, argc, argv, DPI_MASTER_CPUID,
+	    mdb_kvm_v9framev, 0));
+}
+
+int
+kmt_stackr(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	/*
+	 * Force printing of the first register window by setting the saved
+	 * pc (%i7) to PC_FAKE.
+	 */
+	return (kmt_stack_common(addr, flags, argc, argv, DPI_MASTER_CPUID,
+	    mdb_kvm_v9framer, PC_FAKE));
+}
+
+ssize_t
+kmt_write_page(mdb_tgt_t *t, const void *buf, size_t nbytes, uintptr_t addr)
+{
+	jmp_buf *oldpcb = NULL;
+	jmp_buf pcb;
+	physaddr_t pa;
+
+	/*
+	 * Can we write to this page?
+	 */
+	if (!(t->t_flags & MDB_TGT_F_ALLOWIO) &&
+	    (nbytes = kmdb_kdi_range_is_nontoxic(addr, nbytes, 1)) == 0)
+		return (set_errno(EMDB_NOMAP));
+
+	/*
+	 * The OBP va>pa call returns a protection value that's right only some
+	 * of the time.  We can, however, tell if we failed a write due to a
+	 * protection violation.  If we get such an error, we'll retry the
+	 * write using pwrite.
+	 */
+	if (setjmp(pcb) != 0) {
+		/* We failed the write */
+		kmdb_dpi_restore_fault_hdlr(oldpcb);
+
+		if (errno == EACCES && kmdb_prom_vtop(addr, &pa) == 0)
+			return (kmt_pwrite(t, buf, nbytes, pa));
+		return (-1); /* errno is set for us */
+	}
+
+	mdb_dprintf(MDB_DBG_KMOD, "copying %lu bytes from %p to %p\n", nbytes,
+	    buf, (void *)addr);
+
+	oldpcb = kmdb_dpi_set_fault_hdlr(&pcb);
+	(void) kmt_writer((void *)buf, nbytes, addr);
+	kmdb_dpi_restore_fault_hdlr(oldpcb);
+
+	return (nbytes);
+}
+
+/*ARGSUSED*/
+ssize_t
+kmt_write(mdb_tgt_t *t, const void *buf, size_t nbytes, uintptr_t addr)
+{
+	size_t ntowrite, nwritten, n;
+	int rc;
+
+	kmdb_prom_check_interrupt();
+
+	if (nbytes == 0)
+		return (0);
+
+	/*
+	 * Break the writes up into page-sized chunks.  First, the leading page
+	 * fragment (if any), then the subsequent pages.
+	 */
+
+	if ((n = (addr & (mdb.m_pagesize - 1))) != 0) {
+		ntowrite = MIN(mdb.m_pagesize - n, nbytes);
+
+		if ((rc = kmt_write_page(t, buf, ntowrite, addr)) != ntowrite)
+			return (rc);
+
+		addr = roundup(addr, mdb.m_pagesize);
+		nbytes -= ntowrite;
+		nwritten = ntowrite;
+		buf = ((caddr_t)buf + ntowrite);
+	}
+
+	while (nbytes > 0) {
+		ntowrite = MIN(mdb.m_pagesize, nbytes);
+
+		if ((rc = kmt_write_page(t, buf, ntowrite, addr)) != ntowrite)
+			return (rc < 0 ? rc : rc + nwritten);
+
+		addr += mdb.m_pagesize;
+		nbytes -= ntowrite;
+		nwritten += ntowrite;
+		buf = ((caddr_t)buf + ntowrite);
+	}
+
+	return (rc);
+}
+
+/*ARGSUSED*/
+ssize_t
+kmt_ioread(mdb_tgt_t *t, void *buf, size_t nbytes, uintptr_t addr)
+{
+	return (set_errno(EMDB_TGTHWNOTSUP));
+}
+
+/*ARGSUSED*/
+ssize_t
+kmt_iowrite(mdb_tgt_t *t, const void *buf, size_t nbytes, uintptr_t addr)
+{
+	return (set_errno(EMDB_TGTHWNOTSUP));
+}
+
+const char *
+kmt_def_dismode(void)
+{
+#ifdef __sparcv9
+	return ("v9plus");
+#else
+	return ("v8");
+#endif
+}
+
+/*
+ * If we are stopped on a save instruction or at the first instruction of a
+ * known function, return %o7 as the step-out address; otherwise return the
+ * current frame's return address (%i7).  Significantly better handling of
+ * step out in leaf routines could be accomplished by implementing more
+ * complex decoding of the current function and our current state.
+ */
+int
+kmt_step_out(mdb_tgt_t *t, uintptr_t *p)
+{
+	kreg_t pc, i7, o7;
+	GElf_Sym func;
+
+	(void) kmdb_dpi_get_register("pc", &pc);
+	(void) kmdb_dpi_get_register("i7", &i7);
+	(void) kmdb_dpi_get_register("o7", &o7);
+
+	if (mdb_tgt_lookup_by_addr(t, pc, MDB_TGT_SYM_FUZZY, NULL, 0,
+	    &func, NULL) == 0 && func.st_value == pc)
+		*p = o7 + 2 * sizeof (mdb_instr_t);
+	else {
+		mdb_instr_t instr;
+
+		if (mdb_tgt_vread(t, &instr, sizeof (instr), pc) !=
+		    sizeof (instr)) {
+			warn("failed to read instruction at %p for step out",
+			    (void *)pc);
+			return (-1);
+		}
+
+		if (OP(instr) == OP_ARITH && OP3(instr) == OP3_SAVE)
+			*p = o7 + 2 * sizeof (mdb_instr_t);
+		else
+			*p = i7 + 2 * sizeof (mdb_instr_t);
+	}
+
+	return (0);
+}
+
+/*ARGSUSED*/
+int
+kmt_step_branch(mdb_tgt_t *t)
+{
+	return (set_errno(EMDB_TGTHWNOTSUP));
+}
+
+static const char *
+regno2name(int idx)
+{
+	const mdb_tgt_regdesc_t *rd;
+
+	for (rd = mdb_sparcv9_kregs; rd->rd_name != NULL; rd++) {
+		if (idx == rd->rd_num)
+			return (rd->rd_name);
+	}
+
+	ASSERT(rd->rd_name != NULL);
+
+	return ("unknown");
+}
+
+/*
+ * Step over call and jmpl by returning the address of the position where a
+ * temporary breakpoint can be set to catch return from the control transfer.
+ * This function does not currently provide advanced decoding of DCTI couples
+ * or any other complex special case; we just fall back to single-step.
+ */
+int
+kmt_next(mdb_tgt_t *t, uintptr_t *p)
+{
+	kreg_t pc, npc;
+	GElf_Sym func;
+
+	(void) kmdb_dpi_get_register("pc", &pc);
+	(void) kmdb_dpi_get_register("npc", &npc);
+
+	if (mdb_tgt_lookup_by_addr(t, pc, MDB_TGT_SYM_FUZZY, NULL, 0,
+	    &func, NULL) != 0)
+		return (-1);
+
+	if (npc < func.st_value || func.st_value + func.st_size <= npc) {
+		mdb_instr_t instr;
+		kreg_t reg;
+
+		/*
+		 * We're about to transfer control outside this function, so we
+		 * want to stop when control returns from the other function.
+		 * Normally the return address will be in %o7, tail-calls being
+		 * the exception.  We try to discover if this is a tail-call and
+		 * compute the return address in that case.
+		 */
+		if (mdb_tgt_vread(t, &instr, sizeof (instr), pc) !=
+		    sizeof (instr)) {
+			warn("failed to read instruction at %p for next",
+			    (void *)pc);
+			return (-1);
+		}
+
+		if (OP(instr) == OP_ARITH && OP3(instr) == OP3_RESTORE) {
+			(void) kmdb_dpi_get_register("i7", &reg);
+		} else if (OP(instr) == OP_ARITH && OP3(instr) == OP3_OR &&
+		    RD(instr) == KREG_O7) {
+			if (RS1(instr) == KREG_G0)
+				return (set_errno(EAGAIN));
+
+			(void) kmdb_dpi_get_register(regno2name(RS2(instr)),
+			    &reg);
+		} else
+			(void) kmdb_dpi_get_register("o7", &reg);
+
+		*p = reg + 2 * sizeof (mdb_instr_t);
+
+		return (0);
+	}
+
+	return (set_errno(EAGAIN));
+}
+
+const char *
+kmt_trapname(int trapnum)
+{
+	static char trapname[11];
+
+	switch (trapnum) {
+	case T_INSTR_EXCEPTION:
+		return ("instruction access error trap");
+	case T_ALIGNMENT:
+		return ("improper alignment trap");
+	case T_UNIMP_INSTR:
+		return ("illegal instruction trap");
+	case T_IDIV0:
+		return ("division by zero trap");
+	case T_FAST_INSTR_MMU_MISS:
+		return ("instruction access MMU miss trap");
+	case T_FAST_DATA_MMU_MISS:
+		return ("data access MMU miss trap");
+	case ST_KMDB_TRAP|T_SOFTWARE_TRAP:
+		return ("debugger entry trap");
+	case ST_KMDB_BREAKPOINT|T_SOFTWARE_TRAP:
+		return ("breakpoint trap");
+	default:
+		(void) mdb_snprintf(trapname, sizeof (trapname), "trap %#x",
+		    trapnum);
+		return (trapname);
+	}
+}
+
+void
+kmt_init_isadep(mdb_tgt_t *t)
+{
+	kmt_data_t *kmt = t->t_data;
+
+	kmt->kmt_rds = mdb_sparcv9_kregs;
+
+	kmt->kmt_trapmax = KMT_MAXTRAPNO;
+	kmt->kmt_trapmap = mdb_zalloc(BT_SIZEOFMAP(kmt->kmt_trapmax), UM_SLEEP);
+
+	/* Traps for which we want to provide an explicit message */
+	(void) mdb_tgt_add_fault(t, T_INSTR_EXCEPTION, MDB_TGT_SPEC_INTERNAL,
+	    no_se_f, NULL);
+	(void) mdb_tgt_add_fault(t, T_ALIGNMENT, MDB_TGT_SPEC_INTERNAL,
+	    no_se_f, NULL);
+	(void) mdb_tgt_add_fault(t, T_UNIMP_INSTR, MDB_TGT_SPEC_INTERNAL,
+	    no_se_f, NULL);
+	(void) mdb_tgt_add_fault(t, T_IDIV0, MDB_TGT_SPEC_INTERNAL,
+	    no_se_f, NULL);
+	(void) mdb_tgt_add_fault(t, T_FAST_INSTR_MMU_MISS,
+	    MDB_TGT_SPEC_INTERNAL, no_se_f, NULL);
+	(void) mdb_tgt_add_fault(t, T_FAST_DATA_MMU_MISS, MDB_TGT_SPEC_INTERNAL,
+	    no_se_f, NULL);
+
+	/*
+	 * Traps which will be handled elsewhere, and which therefore don't
+	 * need the trap-based message.
+	 */
+	BT_SET(kmt->kmt_trapmap, ST_KMDB_TRAP|T_SOFTWARE_TRAP);
+	BT_SET(kmt->kmt_trapmap, ST_KMDB_BREAKPOINT|T_SOFTWARE_TRAP);
+	BT_SET(kmt->kmt_trapmap, T_PA_WATCHPOINT);
+	BT_SET(kmt->kmt_trapmap, T_VA_WATCHPOINT);
+
+	/* Catch-all for traps not explicitly listed here */
+	(void) mdb_tgt_add_fault(t, KMT_TRAP_NOTENUM, MDB_TGT_SPEC_INTERNAL,
+	    no_se_f, NULL);
+}
+
+/*ARGSUSED*/
+void
+kmt_startup_isadep(mdb_tgt_t *t)
+{
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/kmdb/kvm_isadep.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,46 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _KMDB_KVM_ISADEP_H
+#define	_KMDB_KVM_ISADEP_H
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uintptr_t kmt_invoke(uintptr_t, uint_t, const uintptr_t *, kreg_t, kreg_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _KMDB_KVM_ISADEP_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/mdb/kvm_s390xdep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,368 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Libkvm Kernel Target s390x component
+ *
+ * This file provides the ISA-dependent portion of the libkvm kernel target.
+ * For more details on the implementation refer to mdb_kvm.c.  
+ */
+
+#ifndef __s390xcpu
+#define	__s390xcpu
+#endif
+
+#include <sys/types.h>
+#include <sys/machtypes.h>
+#include <sys/regset.h>
+#include <sys/frame.h>
+#include <sys/stack.h>
+#include <sys/sysmacros.h>
+#include <sys/panic.h>
+#include <strings.h>
+
+#include <mdb/mdb_target_impl.h>
+#include <mdb/mdb_disasm.h>
+#include <mdb/mdb_modapi.h>
+#include <mdb/mdb_conf.h>
+#include <mdb/mdb_kreg_impl.h>
+#include <mdb/mdb_s390xutil.h>
+#include <mdb/mdb_kvm.h>
+#include <mdb/mdb_err.h>
+#include <mdb/mdb_debug.h>
+#include <mdb/mdb.h>
+
+#ifndef STACK_BIAS
+#define	STACK_BIAS	0
+#endif
+
+static int
+kt_getareg(mdb_tgt_t *t, mdb_tgt_tid_t tid,
+    const char *rname, mdb_tgt_reg_t *rp)
+{
+	const mdb_tgt_regdesc_t *rdp;
+	kt_data_t *kt = t->t_data;
+
+	if (tid != kt->k_tid)
+		return (set_errno(EMDB_NOREGS));
+
+	for (rdp = kt->k_rds; rdp->rd_name != NULL; rdp++) {
+		if (strcmp(rname, rdp->rd_name) == 0) {
+			*rp = kt->k_regs->kregs[rdp->rd_num];
+			return (0);
+		}
+	}
+
+	return (set_errno(EMDB_BADREG));
+}
+
+static int
+kt_putareg(mdb_tgt_t *t, mdb_tgt_tid_t tid, const char *rname, mdb_tgt_reg_t r)
+{
+	const mdb_tgt_regdesc_t *rdp;
+	kt_data_t *kt = t->t_data;
+
+	if (tid != kt->k_tid)
+		return (set_errno(EMDB_NOREGS));
+
+	for (rdp = kt->k_rds; rdp->rd_name != NULL; rdp++) {
+		if (strcmp(rname, rdp->rd_name) == 0) {
+			kt->k_regs->kregs[rdp->rd_num] = r;
+			return (0);
+		}
+	}
+
+	return (set_errno(EMDB_BADREG));
+}
+
+	/*
+	 * - If we got a pc, invoke the call back function starting
+	 *   with gsp.
+	 * - If we got a saved pc (%i7), invoke the call back function
+	 *   starting with the first register window.
+	 * - If we got neither a pc nor a saved pc, invoke the call back
+	 *   function starting with the second register window.
+	 */
+
+/*ARGSUSED*/
+static int
+kt_regs(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	kt_data_t *kt = mdb.m_target->t_data;
+
+	if (argc != 0 || (flags & DCMD_ADDRSPEC))
+		return (DCMD_USAGE);
+
+	mdb_s390xprintregs(kt->k_regs);
+
+	return (DCMD_OK);
+}
+
+static int
+kt_stack_common(uintptr_t addr, uint_t flags, int argc,
+    const mdb_arg_t *argv, mdb_tgt_stack_f *func, kreg_t saved_pc)
+{
+	kt_data_t *kt = mdb.m_target->t_data;
+	void *arg = (void *)(uintptr_t)mdb.m_nargs;
+	mdb_tgt_gregset_t gregs, *grp;
+
+	if (flags & DCMD_ADDRSPEC) {
+		bzero(&gregs, sizeof (gregs));
+		gregs.kregs[KREG_FP] = addr;
+		gregs.kregs[KREG_I7] = saved_pc;
+		grp = &gregs;
+	} else
+		grp = kt->k_regs;
+
+	if (argc != 0) {
+		if (argv->a_type == MDB_TYPE_CHAR || argc > 1)
+			return (DCMD_USAGE);
+
+		if (argv->a_type == MDB_TYPE_STRING)
+			arg = (void *)(uintptr_t)(uint_t)
+			    mdb_strtoull(argv->a_un.a_str);
+		else
+			arg = (void *)(uintptr_t)(uint_t)argv->a_un.a_val;
+	}
+
+	(void) mdb_kvm_s390xstack_iter(mdb.m_target, grp, func, arg);
+	return (DCMD_OK);
+}
+
+static int
+kt_stack(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	return (kt_stack_common(addr, flags, argc, argv, mdb_kvm_s390xframe, 0));
+}
+
+static int
+kt_stackv(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	return (kt_stack_common(addr, flags, argc, argv, mdb_kvm_s390xframev, 0));
+}
+
+static int
+kt_stackr(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	/*
+	 * Force printing of first register window by setting the
+	 * saved pc (%i7) to PC_FAKE.
+	 */
+	return (kt_stack_common(addr, flags, argc, argv, mdb_kvm_s390xframer,
+	    PC_FAKE));
+}
+
+const mdb_tgt_ops_t kt_s390x_ops = {
+	kt_setflags,				/* t_setflags */
+	kt_setcontext,				/* t_setcontext */
+	kt_activate,				/* t_activate */
+	kt_deactivate,				/* t_deactivate */
+	(void (*)()) mdb_tgt_nop,		/* t_periodic */
+	kt_destroy,				/* t_destroy */
+	kt_name,				/* t_name */
+	(const char *(*)()) mdb_conf_isa,	/* t_isa */
+	kt_platform,				/* t_platform */
+	kt_uname,				/* t_uname */
+	kt_dmodel,				/* t_dmodel */
+	kt_aread,				/* t_aread */
+	kt_awrite,				/* t_awrite */
+	kt_vread,				/* t_vread */
+	kt_vwrite,				/* t_vwrite */
+	kt_pread,				/* t_pread */
+	kt_pwrite,				/* t_pwrite */
+	kt_fread,				/* t_fread */
+	kt_fwrite,				/* t_fwrite */
+	(ssize_t (*)()) mdb_tgt_notsup,		/* t_ioread */
+	(ssize_t (*)()) mdb_tgt_notsup,		/* t_iowrite */
+	kt_vtop,				/* t_vtop */
+	kt_lookup_by_name,			/* t_lookup_by_name */
+	kt_lookup_by_addr,			/* t_lookup_by_addr */
+	kt_symbol_iter,				/* t_symbol_iter */
+	kt_mapping_iter,			/* t_mapping_iter */
+	kt_object_iter,				/* t_object_iter */
+	kt_addr_to_map,				/* t_addr_to_map */
+	kt_name_to_map,				/* t_name_to_map */
+	kt_addr_to_ctf,				/* t_addr_to_ctf */
+	kt_name_to_ctf,				/* t_name_to_ctf */
+	kt_status,				/* t_status */
+	(int (*)()) mdb_tgt_notsup,		/* t_run */
+	(int (*)()) mdb_tgt_notsup,		/* t_step */
+	(int (*)()) mdb_tgt_notsup,		/* t_step_out */
+	(int (*)()) mdb_tgt_notsup,		/* t_step_branch */
+	(int (*)()) mdb_tgt_notsup,		/* t_next */
+	(int (*)()) mdb_tgt_notsup,		/* t_cont */
+	(int (*)()) mdb_tgt_notsup,		/* t_signal */
+	(int (*)()) mdb_tgt_null,		/* t_add_vbrkpt */
+	(int (*)()) mdb_tgt_null,		/* t_add_sbrkpt */
+	(int (*)()) mdb_tgt_null,		/* t_add_pwapt */
+	(int (*)()) mdb_tgt_null,		/* t_add_iowapt */
+	(int (*)()) mdb_tgt_null,		/* t_add_vwapt */
+	(int (*)()) mdb_tgt_null,		/* t_add_sysenter */
+	(int (*)()) mdb_tgt_null,		/* t_add_sysexit */
+	(int (*)()) mdb_tgt_null,		/* t_add_signal */
+	(int (*)()) mdb_tgt_null,		/* t_add_fault */
+	kt_getareg,				/* t_getareg */
+	kt_putareg,				/* t_putareg */
+	mdb_kvm_s390xstack_iter,		/* t_stack_iter */
+};
+
+void
+kt_s390x_init(mdb_tgt_t *t)
+{
+	kt_data_t *kt = t->t_data;
+
+	struct rwindow rwin;
+	panic_data_t pd;
+	label_t label;
+	kreg_t *kregs;
+
+	uint64_t tick;
+	uint32_t pil;
+
+	/*
+	 * Initialize the machine-dependent parts of the kernel target
+	 * structure.  Once this is complete and we fill in the ops
+	 * vector, the target is now fully constructed and we can use
+	 * the target API itself to perform the rest of our initialization.
+	 */
+	kt->k_rds = mdb_s390x_kregs;
+	kt->k_regs = mdb_zalloc(sizeof (mdb_tgt_gregset_t), UM_SLEEP);
+	kt->k_regsize = sizeof (mdb_tgt_gregset_t);
+	kt->k_dcmd_regs = kt_regs;
+	kt->k_dcmd_stack = kt_stack;
+	kt->k_dcmd_stackv = kt_stackv;
+	kt->k_dcmd_stackr = kt_stackr;
+
+	t->t_ops = &kt_s390x_ops;
+	kregs = kt->k_regs->kregs;
+
+	(void) mdb_dis_select("s390x");
+
+	/*
+	 * Don't attempt to load any thread or register information if
+	 * we're examining the live operating system.
+	 */
+	if (strcmp(kt->k_symfile, "/dev/ksyms") == 0)
+		return;
+
+	/*
+	 * If the panicbuf symbol is present and we can consume a panicbuf
+	 * header of the appropriate version from this address, then
+	 * we can initialize our current register set based on its contents:
+	 */
+	if (mdb_tgt_readsym(t, MDB_TGT_AS_VIRT, &pd, sizeof (pd),
+	    MDB_TGT_OBJ_EXEC, "panicbuf") == sizeof (pd) &&
+	    pd.pd_version == PANICBUFVERS) {
+
+		size_t pd_size = MIN(PANICBUFSIZE, pd.pd_msgoff);
+		panic_data_t *pdp = mdb_zalloc(pd_size, UM_SLEEP);
+		uint_t i, n;
+
+		(void) mdb_tgt_readsym(t, MDB_TGT_AS_VIRT, pdp, pd_size,
+		    MDB_TGT_OBJ_EXEC, "panicbuf");
+
+		n = (pd_size - (sizeof (panic_data_t) -
+		    sizeof (panic_nv_t))) / sizeof (panic_nv_t);
+
+		for (i = 0; i < n; i++) {
+			const char *name = pdp->pd_nvdata[i].pnv_name;
+			uint64_t value = pdp->pd_nvdata[i].pnv_value;
+
+			if (strcmp(name, "tstate") == 0) {
+				kregs[KREG_CCR] = KREG_TSTATE_CCR(value);
+				kregs[KREG_ASI] = KREG_TSTATE_ASI(value);
+				kregs[KREG_PSTATE] = KREG_TSTATE_PSTATE(value);
+				kregs[KREG_CWP] = KREG_TSTATE_CWP(value);
+			} else
+				(void) kt_putareg(t, kt->k_tid, name, value);
+		}
+
+		mdb_free(pdp, pd_size);
+	}
+
+	/*
+	 * Prior to the re-structuring of panicbuf, our only register data
+	 * was the panic_regs label_t, into which a setjmp() was performed.
+	 */
+	if (kregs[KREG_PC] == 0 && kregs[KREG_SP] == 0 &&
+	    mdb_tgt_readsym(t, MDB_TGT_AS_VIRT, &label, sizeof (label),
+	    MDB_TGT_OBJ_EXEC, "panic_regs") == sizeof (label)) {
+
+		kregs[KREG_PC] = label.val[0];
+		kregs[KREG_SP] = label.val[1];
+	}
+
+	/*
+	 * If we can read a saved register window from the stack at %sp,
+	 * we can also fill in the locals and inputs.
+	 */
+	if (kregs[KREG_SP] != 0 && mdb_tgt_vread(t, &rwin, sizeof (rwin),
+	    kregs[KREG_SP] + STACK_BIAS) == sizeof (rwin)) {
+
+		kregs[KREG_L0] = rwin.rw_local[0];
+		kregs[KREG_L1] = rwin.rw_local[1];
+		kregs[KREG_L2] = rwin.rw_local[2];
+		kregs[KREG_L3] = rwin.rw_local[3];
+		kregs[KREG_L4] = rwin.rw_local[4];
+		kregs[KREG_L5] = rwin.rw_local[5];
+		kregs[KREG_L6] = rwin.rw_local[6];
+		kregs[KREG_L7] = rwin.rw_local[7];
+
+		kregs[KREG_I0] = rwin.rw_in[0];
+		kregs[KREG_I1] = rwin.rw_in[1];
+		kregs[KREG_I2] = rwin.rw_in[2];
+		kregs[KREG_I3] = rwin.rw_in[3];
+		kregs[KREG_I4] = rwin.rw_in[4];
+		kregs[KREG_I5] = rwin.rw_in[5];
+		kregs[KREG_I6] = rwin.rw_in[6];
+		kregs[KREG_I7] = rwin.rw_in[7];
+
+	} else if (kregs[KREG_SP] != 0) {
+		warn("failed to read rwindow at %p -- current "
+		    "frame inputs will be unavailable\n",
+		    (void *)(uintptr_t)(kregs[KREG_SP] + STACK_BIAS));
+	}
+
+	/*
+	 * The panic_ipl variable records the IPL of the panic CPU,
+	 * which on s390x is the %pil register's value.
+	 */
+	if (mdb_tgt_readsym(t, MDB_TGT_AS_VIRT, &pil, sizeof (pil),
+	    MDB_TGT_OBJ_EXEC, "panic_ipl") == sizeof (pil))
+		kregs[KREG_PIL] = pil;
+
+	/*
+	 * The panic_tick variable records %tick at the approximate
+	 * time of the panic in a DEBUG kernel.
+	 */
+	if (mdb_tgt_readsym(t, MDB_TGT_AS_VIRT, &tick, sizeof (tick),
+	    MDB_TGT_OBJ_EXEC, "panic_tick") == sizeof (tick))
+		kregs[KREG_TICK] = tick;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/mdb/mdb_kreg.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,245 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/* S390X FIXME */
+
+#ifndef	_MDB_KREG_H
+#define	_MDB_KREG_H
+
+#ifndef _ASM
+#include <sys/types.h>
+#endif
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	KREG_NGREG	48
+#ifndef _ASM
+ typedef uint64_t kreg_t;
+#endif
+
+/*
+ * mdb_tgt_gregset_t register indicies
+ */
+
+#define	KREG_G0		0
+#define	KREG_G1		1
+#define	KREG_G2		2
+#define	KREG_G3		3
+#define	KREG_G4		4
+#define	KREG_G5		5
+#define	KREG_G6		6
+#define	KREG_G7		7
+#define	KREG_G8		8
+#define	KREG_G9		9
+#define	KREG_G10	10
+#define	KREG_G11	11
+#define	KREG_G12	12
+#define	KREG_G13	13
+#define	KREG_G14	14
+#define	KREG_G15	15
+#define	KREG_FP		KREG_G15
+#define KREG_PSW	16
+#define KREG_C0		17
+#define KREG_C1		18
+#define KREG_C2		19
+#define KREG_C3		20
+#define KREG_C4		21
+#define KREG_C5		22
+#define KREG_C6		23
+#define KREG_C7		24
+#define KREG_C8		25
+#define KREG_C9		26
+#define KREG_C10	27
+#define KREG_C11	28
+#define KREG_C12	29
+#define KREG_C13	30
+#define KREG_C14	31
+#define KREG_C15	32
+#define	KREG_A0		33
+#define KREG_A1		34
+#define KREG_A2		35
+#define KREG_A3		36
+#define KREG_A4		37
+#define KREG_A5		38
+#define KREG_A6		39
+#define KREG_A7		40
+#define KREG_A8		41
+#define KREG_A9		42
+#define KREG_A10	43
+#define KREG_A11	44
+#define KREG_A12	45
+#define KREG_A13	46
+#define KREG_A14	47 
+#define KREG_A15	48
+
+#ifdef __sparcv9cpu
+
+#define	KREG_CCR_XCC_N_MASK	0x80
+#define	KREG_CCR_XCC_Z_MASK	0x40
+#define	KREG_CCR_XCC_V_MASK	0x20
+#define	KREG_CCR_XCC_C_MASK	0x10
+
+#define	KREG_CCR_ICC_N_MASK	0x08
+#define	KREG_CCR_ICC_Z_MASK	0x04
+#define	KREG_CCR_ICC_V_MASK	0x02
+#define	KREG_CCR_ICC_C_MASK	0x01
+
+#define	KREG_FPRS_FEF_MASK	0x4
+#define	KREG_FPRS_FEF_SHIFT	2
+
+#define	KREG_FPRS_DU_MASK	0x2
+#define	KREG_FPRS_DU_SHIFT	1
+
+#define	KREG_FPRS_DL_MASK	0x1
+#define	KREG_FPRS_DL_SHIFT	0
+
+#define	KREG_TICK_NPT_MASK	0x8000000000000000ULL
+#define	KREG_TICK_NPT_SHIFT	63
+
+#define	KREG_TICK_CNT_MASK	0x7fffffffffffffffULL
+#define	KREG_TICK_CNT_SHIFT	0
+
+#define	KREG_PSTATE_CLE_MASK	0x200
+#define	KREG_PSTATE_CLE_SHIFT	9
+
+#define	KREG_PSTATE_TLE_MASK	0x100
+#define	KREG_PSTATE_TLE_SHIFT	8
+
+#define	KREG_PSTATE_MM_MASK	0x0c0
+#define	KREG_PSTATE_MM_SHIFT	6
+
+#define	KREG_PSTATE_MM_TSO(x)	(((x) & KREG_PSTATE_MM_MASK) == 0x000)
+#define	KREG_PSTATE_MM_PSO(x)	(((x) & KREG_PSTATE_MM_MASK) == 0x040)
+#define	KREG_PSTATE_MM_RMO(x)	(((x) & KREG_PSTATE_MM_MASK) == 0x080)
+#define	KREG_PSTATE_MM_UNDEF(x)	(((x) & KREG_PSTATE_MM_MASK) == 0x0c0)
+
+#define	KREG_PSTATE_RED_MASK	0x020
+#define	KREG_PSTATE_RED_SHIFT	5
+
+#define	KREG_PSTATE_PEF_MASK	0x010
+#define	KREG_PSTATE_PEF_SHIFT	4
+
+#define	KREG_PSTATE_AM_MASK	0x008
+#define	KREG_PSTATE_AM_SHIFT	3
+
+#define	KREG_PSTATE_PRIV_MASK	0x004
+#define	KREG_PSTATE_PRIV_SHIFT	2
+
+#define	KREG_PSTATE_IE_MASK	0x002
+#define	KREG_PSTATE_IE_SHIFT	1
+
+#define	KREG_PSTATE_AG_MASK	0x001
+#define	KREG_PSTATE_AG_SHIFT	0
+
+#define	KREG_PSTATE_MASK	0xfff
+
+#define	KREG_TSTATE_CCR(x)	(((x) >> 32) & 0xff)
+#define	KREG_TSTATE_ASI(x)	(((x) >> 24) & 0xff)
+#define	KREG_TSTATE_PSTATE(x)	(((x) >> 8) & 0xfff)
+#define	KREG_TSTATE_CWP(x)	((x) & 0x1f)
+
+#define	KREG_TSTATE_PSTATE_MASK	0x000000000000fff0ULL
+#define	KREG_TSTATE_PSTATE_SHIFT 8
+
+#define	KREG_TBA_TBA_MASK	0xffffffffffff8000ULL
+#define	KREG_TBA_TBA_SHIFT	0
+
+#define	KREG_TBA_TLG0_MASK	0x4000
+#define	KREG_TBA_TLG0_SHIFT	14
+
+#define	KREG_TBA_TT_MASK	0x3fd0
+#define	KREG_TBA_TT_SHIFT	5
+
+#define	KREG_VER_MANUF_MASK	0xffff000000000000ULL
+#define	KREG_VER_MANUF_SHIFT	48
+
+#define	KREG_VER_IMPL_MASK	0x0000ffff00000000ULL
+#define	KREG_VER_IMPL_SHIFT	32
+
+#define	KREG_VER_MASK_MASK	0xff000000
+#define	KREG_VER_MASK_SHIFT	24
+
+#define	KREG_VER_MAXTL_MASK	0x0000ff00
+#define	KREG_VER_MAXTL_SHIFT	8
+
+#define	KREG_VER_MAXWIN_MASK	0x0000000f
+#define	KREG_VER_MAXWIN_SHIFT	0
+
+#else	/* __sparcv9cpu */
+
+#define	KREG_PSR_IMPL_MASK	0xf0000000
+#define	KREG_PSR_IMPL_SHIFT	28
+
+#define	KREG_PSR_VER_MASK	0x0f000000
+#define	KREG_PSR_VER_SHIFT	24
+
+#define	KREG_PSR_ICC_MASK	0x00f00000
+#define	KREG_PSR_ICC_N_MASK	0x00800000
+#define	KREG_PSR_ICC_Z_MASK	0x00400000
+#define	KREG_PSR_ICC_V_MASK	0x00200000
+#define	KREG_PSR_ICC_C_MASK	0x00100000
+#define	KREG_PSR_ICC_SHIFT	20
+
+#define	KREG_PSR_EC_MASK	0x00002000
+#define	KREG_PSR_EC_SHIFT	13
+
+#define	KREG_PSR_EF_MASK	0x00001000
+#define	KREG_PSR_EF_SHIFT	12
+
+#define	KREG_PSR_PIL_MASK	0x00000f00
+#define	KREG_PSR_PIL_SHIFT	8
+
+#define	KREG_PSR_S_MASK		0x00000080
+#define	KREG_PSR_S_SHIFT	7
+
+#define	KREG_PSR_PS_MASK	0x00000040
+#define	KREG_PSR_PS_SHIFT	6
+
+#define	KREG_PSR_ET_MASK	0x00000020
+#define	KREG_PSR_ET_SHIFT	5
+
+#define	KREG_PSR_CWP_MASK	0x0000001f
+#define	KREG_PSR_CWP_SHIFT	0
+
+#define	KREG_TBR_TBA_MASK	0xfffff000
+#define	KREG_TBR_TBA_SHIFT	0
+
+#define	KREG_TBR_TT_MASK	0x00000ff0
+#define	KREG_TBR_TT_SHIFT	4
+
+#endif	/* __sparcv9cpu */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _MDB_KREG_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/mdb/mdb_kreg_impl.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,59 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/* S390X FIXME */
+
+#ifndef _MDB_KREG_IMPL_H
+#define	_MDB_KREG_IMPL_H
+
+#include <mdb/mdb_kreg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	MDB_V9GREG_F_STICK_VALID	0x1	/* set on systems with %stick */
+
+#ifndef _ASM
+/*
+ * The mdb_tgt_gregset type is opaque to callers of the target interface
+ * and to our own target common code.
+ */
+struct mdb_tgt_gregset {
+	kreg_t kregs[KREG_NGREG];
+	uint_t kreg_flags;
+};
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MDB_KREG_IMPL_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/mdb/mdb_s390xutil.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,314 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Routines common to the kvm target and the kmdb target that manipulate
+ * registers.  This includes register dumps, registers as named variables,
+ * and stack traces.
+ */
+
+#include <sys/types.h>
+#include <sys/stack.h>
+#include <sys/regset.h>
+
+#ifndef	__s390xcpu
+#define	__s390xcpu
+#endif
+
+#include <mdb/mdb_debug.h>
+#include <mdb/mdb_modapi.h>
+#include <mdb/mdb_s390xutil.h>
+#include <mdb/mdb_target_impl.h>
+#include <mdb/mdb_err.h>
+#include <mdb/mdb.h>
+
+#include <mdb/mdb_kreg_impl.h>
+
+/*
+ * We also define an array of register names and their corresponding
+ * array indices.  This is used by the getareg and putareg entry points,
+ * and also by our register variable discipline.
+ */
+const mdb_tgt_regdesc_t mdb_sparcs390x_kregs[] = {
+	{ "g0",  KREG_G0,  MDB_TGT_R_EXPORT },
+	{ "g1",  KREG_G1,  MDB_TGT_R_EXPORT },
+	{ "g2",  KREG_G2,  MDB_TGT_R_EXPORT },
+	{ "g3",  KREG_G3,  MDB_TGT_R_EXPORT },
+	{ "g4",  KREG_G4,  MDB_TGT_R_EXPORT },
+	{ "g5",  KREG_G5,  MDB_TGT_R_EXPORT },
+	{ "g6",  KREG_G6,  MDB_TGT_R_EXPORT },
+	{ "g7",  KREG_G7,  MDB_TGT_R_EXPORT },
+	{ "g8",  KREG_G8,  MDB_TGT_R_EXPORT },
+	{ "g9",  KREG_G9,  MDB_TGT_R_EXPORT },
+	{ "g10", KREG_G10, MDB_TGT_R_EXPORT },
+	{ "g11", KREG_G11, MDB_TGT_R_EXPORT },
+	{ "g12", KREG_G12, MDB_TGT_R_EXPORT },
+	{ "g13", KREG_G13, MDB_TGT_R_EXPORT },
+	{ "g14", KREG_G14, MDB_TGT_R_EXPORT },
+	{ "g15", KREG_G15, MDB_TGT_R_EXPORT },
+	{ "psw", KREG_PSW, MDB_TGT_R_EXPORT },
+	{ "c0",  KREG_C0,  MDB_TGT_R_EXPORT },
+	{ "c1",  KREG_C1,  MDB_TGT_R_EXPORT },
+	{ "c2",  KREG_C2,  MDB_TGT_R_EXPORT },
+	{ "c3",  KREG_C3,  MDB_TGT_R_EXPORT },
+	{ "c4",  KREG_C4,  MDB_TGT_R_EXPORT },
+	{ "c5",  KREG_C5,  MDB_TGT_R_EXPORT },
+	{ "c6",  KREG_C6,  MDB_TGT_R_EXPORT },
+	{ "c7",  KREG_C7,  MDB_TGT_R_EXPORT },
+	{ "c8",  KREG_C8,  MDB_TGT_R_EXPORT },
+	{ "c9",  KREG_C9,  MDB_TGT_R_EXPORT },
+	{ "c10", KREG_C10, MDB_TGT_R_EXPORT },
+	{ "c11", KREG_C11, MDB_TGT_R_EXPORT },
+	{ "c12", KREG_C12, MDB_TGT_R_EXPORT },
+	{ "c13", KREG_C13, MDB_TGT_R_EXPORT },
+	{ "c14", KREG_C14, MDB_TGT_R_EXPORT },
+	{ "c15", KREG_C15, MDB_TGT_R_EXPORT },
+	{ "a0",  KREG_A0,  MDB_TGT_R_EXPORT },
+	{ "a1",  KREG_A1,  MDB_TGT_R_EXPORT },
+	{ "a2",  KREG_A2,  MDB_TGT_R_EXPORT },
+	{ "a3",  KREG_A3,  MDB_TGT_R_EXPORT },
+	{ "a4",  KREG_A4,  MDB_TGT_R_EXPORT },
+	{ "a5",  KREG_A5,  MDB_TGT_R_EXPORT },
+	{ "a6",  KREG_A6,  MDB_TGT_R_EXPORT },
+	{ "a7",  KREG_A7,  MDB_TGT_R_EXPORT },
+	{ "a8",  KREG_A8,  MDB_TGT_R_EXPORT },
+	{ "a9",  KREG_A9,  MDB_TGT_R_EXPORT },
+	{ "a10", KREG_A10, MDB_TGT_R_EXPORT },
+	{ "a11", KREG_A11, MDB_TGT_R_EXPORT },
+	{ "a12", KREG_A12, MDB_TGT_R_EXPORT },
+	{ "a13", KREG_A13, MDB_TGT_R_EXPORT },
+	{ "a14", KREG_A14, MDB_TGT_R_EXPORT },
+	{ "a15", KREG_A15, MDB_TGT_R_EXPORT },
+	{ NULL, 0, 0 }
+};
+
+static const char *
+pstate_mm_to_str(kreg_t pstate)
+{
+	if (KREG_PSTATE_MM_TSO(pstate))
+		return ("TSO");
+
+	if (KREG_PSTATE_MM_PSO(pstate))
+		return ("PSO");
+
+	if (KREG_PSTATE_MM_RMO(pstate))
+		return ("RMO");
+
+	return ("???");
+}
+
+void
+mdb_s390xprintregs(const mdb_tgt_gregset_t *gregs)
+{
+	const kreg_t *kregs = gregs->kregs;
+
+#define	GETREG2(x) ((uintptr_t)kregs[(x)]), ((uintptr_t)kregs[(x)])
+
+	mdb_printf("%%g0  = 0x%0?p %15A %%a0  = 0x%0?p %A\n",
+	    GETREG2(KREG_G0), GETREG2(KREG_A0));
+
+	mdb_printf("%%g1  = 0x%0?p %15A %%a1  = 0x%0?p %A\n",
+	    GETREG2(KREG_G1), GETREG2(KREG_A1));
+
+	mdb_printf("%%g2  = 0x%0?p %15A %%a2  = 0x%0?p %A\n",
+	    GETREG2(KREG_G2), GETREG2(KREG_A2));
+
+	mdb_printf("%%g3  = 0x%0?p %15A %%a3  = 0x%0?p %A\n",
+	    GETREG2(KREG_G3), GETREG2(KREG_A3));
+
+	mdb_printf("%%g4  = 0x%0?p %15A %%a4  = 0x%0?p %A\n",
+	    GETREG2(KREG_G4), GETREG2(KREG_A4));
+
+	mdb_printf("%%g5  = 0x%0?p %15A %%a5  = 0x%0?p %A\n",
+	    GETREG2(KREG_G5), GETREG2(KREG_A5));
+
+	mdb_printf("%%g6  = 0x%0?p %15A %%a6  = 0x%0?p %A\n",
+	    GETREG2(KREG_G6), GETREG2(KREG_A6));
+
+	mdb_printf("%%g7  = 0x%0?p %15A %%a7  = 0x%0?p %A\n\n",
+	    GETREG2(KREG_G7), GETREG2(KREG_A7));
+
+	mdb_printf("%%g8  = 0x%0?p %15A %%a8  = 0x%0?p %A\n",
+	    GETREG2(KREG_G8), GETREG2(KREG_A8));
+
+	mdb_printf("%%g9  = 0x%0?p %15A %%a9  = 0x%0?p %A\n",
+	    GETREG2(KREG_G9), GETREG2(KREG_A9));
+
+	mdb_printf("%%g10 = 0x%0?p %15A %%a10 = 0x%0?p %A\n",
+	    GETREG2(KREG_G10), GETREG2(KREG_A10));
+
+	mdb_printf("%%g11 = 0x%0?p %15A %%a11 = 0x%0?p %A\n",
+	    GETREG2(KREG_G11), GETREG2(KREG_A11));
+
+	mdb_printf("%%g12 = 0x%0?p %15A %%a12 = 0x%0?p %A\n",
+	    GETREG2(KREG_G12), GETREG2(KREG_A12));
+
+	mdb_printf("%%g13 = 0x%0?p %15A %%a13 = 0x%0?p %A\n",
+	    GETREG2(KREG_G13), GETREG2(KREG_A13));
+
+	mdb_printf("%%g14 = 0x%0?p %15A %%a14 = 0x%0?p %A\n",
+	    GETREG2(KREG_G14), GETREG2(KREG_A14));
+
+	mdb_printf("%%g15 = 0x%0?p %15A %%a15 = 0x%0?p %A\n\n",
+	    GETREG2(KREG_G15), GETREG2(KREG_A15));
+
+
+}
+
+int
+mdb_kvm_s390xstack_iter(mdb_tgt_t *t, const mdb_tgt_gregset_t *gsp,
+    mdb_tgt_stack_f *func, void *arg)
+{
+	mdb_tgt_gregset_t gregs;
+	kreg_t *kregs = &gregs.kregs[0];
+	int got_pc = (gsp->kregs[KREG_PC] != 0);
+
+	struct rwindow rwin;
+	uintptr_t sp;
+	long argv[6];
+	int i;
+
+	/*
+	 * - If we got a pc, invoke the call back function starting
+	 *   with gsp.
+	 * - If we got a saved pc (%i7), invoke the call back function
+	 *   starting with the first register window.
+	 * - If we got neither a pc nor a saved pc, invoke the call back
+	 *   function starting with the second register window.
+	 */
+
+	bcopy(gsp, &gregs, sizeof (gregs));
+
+	for (;;) {
+		for (i = 0; i < 6; i++)
+			argv[i] = kregs[KREG_I0 + i];
+
+		if (got_pc && func(arg, kregs[KREG_PC], 6, argv, &gregs) != 0)
+			break;
+
+		kregs[KREG_PC] = kregs[KREG_I7];
+		kregs[KREG_NPC] = kregs[KREG_PC] + 4;
+
+		bcopy(&kregs[KREG_I0], &kregs[KREG_O0], 8 * sizeof (kreg_t));
+		got_pc |= (kregs[KREG_PC] != 0);
+
+		if ((sp = kregs[KREG_FP] + STACK_BIAS) == STACK_BIAS || sp == 0)
+			break; /* Stop if we're at the end of the stack */
+
+		if (sp & (STACK_ALIGN - 1))
+			return (set_errno(EMDB_STKALIGN));
+
+		if (mdb_tgt_vread(t, &rwin, sizeof (rwin), sp) != sizeof (rwin))
+			return (-1); /* Failed to read frame */
+
+		for (i = 0; i < 8; i++)
+			kregs[KREG_L0 + i] = (uintptr_t)rwin.rw_local[i];
+		for (i = 0; i < 8; i++)
+			kregs[KREG_I0 + i] = (uintptr_t)rwin.rw_in[i];
+	}
+
+	return (0);
+}
+
+/*ARGSUSED*/
+int
+mdb_kvm_s390xframe(void *arglim, uintptr_t pc, uint_t argc, const long *argv,
+    const mdb_tgt_gregset_t *gregs)
+{
+	argc = MIN(argc, (uint_t)(uintptr_t)arglim);
+	mdb_printf("%a(", pc);
+
+	if (argc != 0) {
+		mdb_printf("%lr", *argv++);
+		for (argc--; argc != 0; argc--)
+			mdb_printf(", %lr", *argv++);
+	}
+
+	mdb_printf(")\n");
+	return (0);
+}
+
+int
+mdb_kvm_s390xframev(void *arglim, uintptr_t pc, uint_t argc, const long *argv,
+    const mdb_tgt_gregset_t *gregs)
+{
+	argc = MIN(argc, (uint_t)(uintptr_t)arglim);
+	mdb_printf("%0?llr %a(", gregs->kregs[KREG_SP], pc);
+
+	if (argc != 0) {
+		mdb_printf("%lr", *argv++);
+		for (argc--; argc != 0; argc--)
+			mdb_printf(", %lr", *argv++);
+	}
+
+	mdb_printf(")\n");
+	return (0);
+}
+
+int
+mdb_kvm_s390xframer(void *arglim, uintptr_t pc, uint_t argc, const long *argv,
+    const mdb_tgt_gregset_t *gregs)
+{
+	char buf[BUFSIZ];
+	const kreg_t *kregs = &gregs->kregs[0];
+
+	argc = MIN(argc, (uint_t)(uintptr_t)arglim);
+
+	if (pc == PC_FAKE)
+		mdb_printf("%<b>%0?llr% %s%</b>(", kregs[KREG_SP], "?");
+	else
+		mdb_printf("%<b>%0?llr% %a%</b>(", kregs[KREG_SP], pc);
+
+	if (argc != 0) {
+		mdb_printf("%lr", *argv++);
+		for (argc--; argc != 0; argc--)
+			mdb_printf(", %lr", *argv++);
+	}
+
+	mdb_printf(")\n");
+
+	(void) mdb_inc_indent(2);
+
+	mdb_printf("%%l0-%%l3: %?lr %?lr %?lr %?lr\n",
+	    kregs[KREG_L0], kregs[KREG_L1], kregs[KREG_L2], kregs[KREG_L3]);
+
+	mdb_printf("%%l4-%%l7: %?lr %?lr %?lr %?lr\n",
+	    kregs[KREG_L4], kregs[KREG_L5], kregs[KREG_L6], kregs[KREG_L7]);
+
+	if (kregs[KREG_FP] != 0 && (kregs[KREG_FP] + STACK_BIAS) != 0)
+		if (mdb_dis_ins2str(mdb.m_disasm, mdb.m_target, MDB_TGT_AS_VIRT,
+		    buf, sizeof (buf), kregs[KREG_I7]) != kregs[KREG_I7])
+			mdb_printf("%-#25a%s\n", kregs[KREG_I7], buf);
+
+	(void) mdb_dec_indent(2);
+	mdb_printf("\n");
+
+	return (0);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/mdb/mdb_s390xutil.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,64 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/* S390X FIXME */
+
+#ifndef _MDB_S390XUTIL_H
+#define	_MDB_S390XUTIL_H
+
+#include <mdb/mdb_kreg.h>
+#include <mdb/mdb_target_impl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	PC_FAKE		-1UL	/* illegal pc value unequal 0 */
+
+typedef uint32_t mdb_instr_t;
+
+extern const mdb_tgt_regdesc_t mdb_sparcs390x_kregs[];
+
+extern void mdb_s390xprintregs(const mdb_tgt_gregset_t *);
+extern int mdb_kvm_s390xstack_iter(mdb_tgt_t *, const mdb_tgt_gregset_t *,
+    mdb_tgt_stack_f *, void *);
+
+extern int mdb_kvm_s390xframe(void *, uintptr_t, uint_t, const long *,
+    const mdb_tgt_gregset_t *);
+extern int mdb_kvm_s390xframev(void *, uintptr_t, uint_t, const long *,
+    const mdb_tgt_gregset_t *);
+extern int mdb_kvm_s390xframer(void *, uintptr_t, uint_t, const long *,
+    const mdb_tgt_gregset_t *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MDB_S390XUTIL_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/mdb/proc_isadep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,775 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/* S390X FIXME */
+
+/*
+ * User Process Target s390x
+ *
+ * This file provides the ISA-dependent portion of the user process target
+ * for both the sparcv7 and s390x ISAs.  For more details on the
+ * implementation refer to mdb_proc.c.
+ */
+
+#ifdef __s390x
+#define	__s390xcpu
+#endif
+
+#include <mdb/mdb_proc.h>
+#include <mdb/mdb_kreg.h>
+#include <mdb/mdb_err.h>
+#include <mdb/mdb_stdlib.h>
+#include <mdb/mdb.h>
+
+#include <sys/elf_SPARC.h>
+#include <sys/stack.h>
+#include <libproc.h>
+
+#ifndef STACK_BIAS
+#define	STACK_BIAS	0
+#endif
+
+const mdb_tgt_regdesc_t pt_regdesc[] = {
+	{ "g0", R_G0, MDB_TGT_R_EXPORT },
+	{ "g1", R_G1, MDB_TGT_R_EXPORT },
+	{ "g2", R_G2, MDB_TGT_R_EXPORT },
+	{ "g3", R_G3, MDB_TGT_R_EXPORT },
+	{ "g4", R_G4, MDB_TGT_R_EXPORT },
+	{ "g5", R_G5, MDB_TGT_R_EXPORT },
+	{ "g6", R_G6, MDB_TGT_R_EXPORT },
+	{ "g7", R_G7, MDB_TGT_R_EXPORT },
+	{ "o0", R_O0, MDB_TGT_R_EXPORT },
+	{ "o1", R_O1, MDB_TGT_R_EXPORT },
+	{ "o2", R_O2, MDB_TGT_R_EXPORT },
+	{ "o3", R_O3, MDB_TGT_R_EXPORT },
+	{ "o4", R_O4, MDB_TGT_R_EXPORT },
+	{ "o5", R_O5, MDB_TGT_R_EXPORT },
+	{ "o6", R_O6, MDB_TGT_R_EXPORT },
+	{ "o7", R_O7, MDB_TGT_R_EXPORT },
+	{ "l0", R_L0, MDB_TGT_R_EXPORT },
+	{ "l1", R_L1, MDB_TGT_R_EXPORT },
+	{ "l2", R_L2, MDB_TGT_R_EXPORT },
+	{ "l3", R_L3, MDB_TGT_R_EXPORT },
+	{ "l4", R_L4, MDB_TGT_R_EXPORT },
+	{ "l5", R_L5, MDB_TGT_R_EXPORT },
+	{ "l6", R_L6, MDB_TGT_R_EXPORT },
+	{ "l7", R_L7, MDB_TGT_R_EXPORT },
+	{ "i0", R_I0, MDB_TGT_R_EXPORT },
+	{ "i1", R_I1, MDB_TGT_R_EXPORT },
+	{ "i2", R_I2, MDB_TGT_R_EXPORT },
+	{ "i3", R_I3, MDB_TGT_R_EXPORT },
+	{ "i4", R_I4, MDB_TGT_R_EXPORT },
+	{ "i5", R_I5, MDB_TGT_R_EXPORT },
+	{ "i6", R_I6, MDB_TGT_R_EXPORT },
+	{ "i7", R_I7, MDB_TGT_R_EXPORT },
+#ifdef __s390x
+	{ "ccr", R_CCR, MDB_TGT_R_EXPORT },
+#else
+	{ "psr", R_PSR, MDB_TGT_R_EXPORT },
+#endif
+	{ "pc", R_PC, MDB_TGT_R_EXPORT },
+	{ "npc", R_nPC, MDB_TGT_R_EXPORT },
+	{ "y", R_Y, 0 },
+#ifdef __s390x
+	{ "asi", R_ASI, MDB_TGT_R_EXPORT },
+	{ "fprs", R_FPRS, MDB_TGT_R_EXPORT },
+#else
+	{ "wim", R_WIM, MDB_TGT_R_EXPORT | MDB_TGT_R_PRIV },
+	{ "tbr", R_TBR, MDB_TGT_R_EXPORT | MDB_TGT_R_PRIV },
+#endif
+	{ "sp", R_SP, MDB_TGT_R_EXPORT | MDB_TGT_R_ALIAS },
+	{ "fp", R_FP, MDB_TGT_R_EXPORT | MDB_TGT_R_ALIAS },
+	{ NULL, 0, 0 }
+};
+
+#define	FPU_FSR		0	/* fake register number for %fsr */
+#define	FPU_FPRS	1	/* fake register number for %fprs */
+
+/*
+ * We cannot rely on pr_instr, because if we hit a breakpoint or the user has
+ * artifically modified memory, it will no longer be correct.
+ */
+static uint32_t
+pt_read_instr(mdb_tgt_t *t)
+{
+	const lwpstatus_t *psp = &Pstatus(t->t_pshandle)->pr_lwp;
+	uint32_t ret = 0;
+
+	(void) mdb_tgt_vread(t, &ret, sizeof (ret), psp->pr_reg[R_PC]);
+
+	return (ret);
+}
+
+/*ARGSUSED*/
+int
+pt_regs(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	mdb_tgt_t *t = mdb.m_target;
+	mdb_tgt_tid_t tid;
+	prgregset_t grs;
+	uint64_t xgregs[8];
+	uint64_t xoregs[8];
+	int rwidth, i;
+
+#if defined(__sparc) && defined(_ILP32)
+	static const uint32_t zero[8] = { 0 };
+	prxregset_t xrs;
+#endif
+
+#define	GETREG2(x) ((uintptr_t)grs[(x)]), ((uintptr_t)grs[(x)])
+
+	if (argc != 0)
+		return (DCMD_USAGE);
+
+	if (t->t_pshandle == NULL || Pstate(t->t_pshandle) == PS_UNDEAD) {
+		mdb_warn("no process active\n");
+		return (DCMD_ERR);
+	}
+
+	if (Pstate(t->t_pshandle) == PS_LOST) {
+		mdb_warn("debugger has lost control of process\n");
+		return (DCMD_ERR);
+	}
+
+	if (flags & DCMD_ADDRSPEC)
+		tid = (mdb_tgt_tid_t)addr;
+	else
+		tid = PTL_TID(t);
+
+	if (PTL_GETREGS(t, tid, grs) != 0) {
+		mdb_warn("failed to get current register set");
+		return (DCMD_ERR);
+	}
+
+	for (i = 0; i < 8; i++) {
+		xgregs[i] = (ulong_t)grs[R_G0 + i];
+		xoregs[i] = (ulong_t)grs[R_O0 + i];
+	}
+
+	if (Pstatus(t->t_pshandle)->pr_dmodel == PR_MODEL_LP64)
+		rwidth = 16;
+	else
+		rwidth = 8;
+
+#if defined(__sparc) && defined(_ILP32)
+	/*
+	 * If we are debugging a 32-bit SPARC process on an UltraSPARC CPU,
+	 * the globals and outs can have 32 upper bits hiding in the xregs.
+	 */
+	if (PTL_GETXREGS(t, tid, &xrs) == 0 && xrs.pr_type == XR_TYPE_V8P) {
+		for (i = 0; i < 8; i++) {
+			xgregs[i] |= (uint64_t)
+			    xrs.pr_un.pr_v8p.pr_xg[XR_G0 + i] << 32;
+			xoregs[i] |= (uint64_t)
+			    xrs.pr_un.pr_v8p.pr_xo[XR_O0 + i] << 32;
+		}
+
+		if (bcmp(xrs.pr_un.pr_v8p.pr_xg, zero, sizeof (zero)) ||
+		    bcmp(xrs.pr_un.pr_v8p.pr_xo, zero, sizeof (zero)))
+			rwidth = 16; /* one or more have upper bits set */
+	}
+#endif	/* __sparc && _ILP32 */
+
+	for (i = 0; i < 8; i++) {
+		mdb_printf("%%g%d = 0x%0*llx %15llA %%l%d = 0x%0?p %A\n",
+		    i, rwidth, xgregs[i], xgregs[i], i, GETREG2(R_L0 + i));
+	}
+
+	for (i = 0; i < 8; i++) {
+		mdb_printf("%%o%d = 0x%0*llx %15llA %%i%d = 0x%0?p %A\n",
+		    i, rwidth, xoregs[i], xoregs[i], i, GETREG2(R_I0 + i));
+	}
+
+	mdb_printf("\n");
+
+#ifdef __s390x
+	mdb_printf(" %%ccr = 0x%02x xcc=%c%c%c%c icc=%c%c%c%c\n", grs[R_CCR],
+	    (grs[R_CCR] & KREG_CCR_XCC_N_MASK) ? 'N' : 'n',
+	    (grs[R_CCR] & KREG_CCR_XCC_Z_MASK) ? 'Z' : 'z',
+	    (grs[R_CCR] & KREG_CCR_XCC_V_MASK) ? 'V' : 'v',
+	    (grs[R_CCR] & KREG_CCR_XCC_C_MASK) ? 'C' : 'c',
+	    (grs[R_CCR] & KREG_CCR_ICC_N_MASK) ? 'N' : 'n',
+	    (grs[R_CCR] & KREG_CCR_ICC_Z_MASK) ? 'Z' : 'z',
+	    (grs[R_CCR] & KREG_CCR_ICC_V_MASK) ? 'V' : 'v',
+	    (grs[R_CCR] & KREG_CCR_ICC_C_MASK) ? 'C' : 'c');
+#else	/* __s390x */
+	mdb_printf(" %%psr = 0x%08x impl=0x%x ver=0x%x icc=%c%c%c%c\n"
+	    "                   ec=%u ef=%u pil=%u s=%u ps=%u et=%u cwp=0x%x\n",
+	    grs[R_PSR],
+	    (grs[R_PSR] & KREG_PSR_IMPL_MASK) >> KREG_PSR_IMPL_SHIFT,
+	    (grs[R_PSR] & KREG_PSR_VER_MASK) >> KREG_PSR_VER_SHIFT,
+	    (grs[R_PSR] & KREG_PSR_ICC_N_MASK) ? 'N' : 'n',
+	    (grs[R_PSR] & KREG_PSR_ICC_Z_MASK) ? 'Z' : 'z',
+	    (grs[R_PSR] & KREG_PSR_ICC_V_MASK) ? 'V' : 'v',
+	    (grs[R_PSR] & KREG_PSR_ICC_C_MASK) ? 'C' : 'c',
+	    grs[R_PSR] & KREG_PSR_EC_MASK, grs[R_PSR] & KREG_PSR_EF_MASK,
+	    (grs[R_PSR] & KREG_PSR_PIL_MASK) >> KREG_PSR_PIL_SHIFT,
+	    grs[R_PSR] & KREG_PSR_S_MASK, grs[R_PSR] & KREG_PSR_PS_MASK,
+	    grs[R_PSR] & KREG_PSR_ET_MASK,
+	    (grs[R_PSR] & KREG_PSR_CWP_MASK) >> KREG_PSR_CWP_SHIFT);
+#endif	/* __s390x */
+
+	mdb_printf("   %%y = 0x%0?p\n", grs[R_Y]);
+
+	mdb_printf("  %%pc = 0x%0?p %A\n", GETREG2(R_PC));
+	mdb_printf(" %%npc = 0x%0?p %A\n", GETREG2(R_nPC));
+
+	mdb_printf("  %%sp = 0x%0?p\n", grs[R_SP]);
+	mdb_printf("  %%fp = 0x%0?p\n\n", grs[R_FP]);
+
+#ifdef __s390x
+	mdb_printf(" %%asi = 0x%02lx\n", grs[R_ASI]);
+	mdb_printf("%%fprs = 0x%02lx\n", grs[R_FPRS]);
+#else	/* __s390x */
+	mdb_printf(" %%wim = 0x%08x\n", grs[R_WIM]);
+	mdb_printf(" %%tbr = 0x%08x\n", grs[R_TBR]);
+#endif	/* __s390x */
+
+	return (DCMD_OK);
+}
+
+/*ARGSUSED*/
+int
+pt_fpregs(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	mdb_tgt_t *t = mdb.m_target;
+	mdb_tgt_tid_t tid;
+	int is_v8plus, is_v9, i;
+#ifdef	__s390x
+	prgregset_t grs;
+#endif
+	prfpregset_t fprs;
+	prxregset_t xrs;
+	uint32_t *regs;
+	int ns, nd, nq;
+
+	enum {
+		FPR_MIXED	= 0x0, /* show single, double, and status */
+		FPR_SINGLE	= 0x1, /* show single-precision only */
+		FPR_DOUBLE	= 0x2, /* show double-precision only */
+		FPR_QUAD	= 0x4  /* show quad-precision only */
+	};
+
+	uint_t opts = FPR_MIXED;
+
+	/*
+	 * The prfpregset structure only provides us with the FPU in the form
+	 * of 32-bit integers, doubles, or quads.  We use this union of the
+	 * various types to display floats, doubles, and long doubles.
+	 */
+	union {
+		struct {
+			uint32_t i1;
+			uint32_t i2;
+			uint32_t i3;
+			uint32_t i4;
+		} ip;
+		float f;
+		double d;
+		long double ld;
+	} fpu;
+
+	if (mdb_getopts(argc, argv,
+	    's', MDB_OPT_SETBITS, FPR_SINGLE, &opts,
+	    'd', MDB_OPT_SETBITS, FPR_DOUBLE, &opts,
+	    'q', MDB_OPT_SETBITS, FPR_QUAD, &opts, NULL) != argc)
+		return (DCMD_USAGE);
+
+	if (t->t_pshandle == NULL || Pstate(t->t_pshandle) == PS_UNDEAD) {
+		mdb_warn("no process active\n");
+		return (DCMD_ERR);
+	}
+
+	if (Pstate(t->t_pshandle) == PS_LOST) {
+		mdb_warn("debugger has lost control of process\n");
+		return (DCMD_ERR);
+	}
+
+	if (flags & DCMD_ADDRSPEC)
+		tid = (mdb_tgt_tid_t)addr;
+	else
+		tid = PTL_TID(t);
+
+	is_v9 = Pstatus(t->t_pshandle)->pr_dmodel == PR_MODEL_LP64;
+	is_v8plus = is_v9 == 0 && PTL_GETXREGS(t, tid, &xrs) == 0 &&
+	    xrs.pr_type == XR_TYPE_V8P;
+
+#ifdef	__s390x
+	if (is_v9 && opts == FPR_MIXED) {
+		if (PTL_GETREGS(t, tid, grs) == 0)
+			mdb_printf("fprs %lx\n", grs[R_FPRS]);
+		else
+			mdb_warn("failed to read fprs register");
+	}
+#endif
+	if (is_v8plus && opts == FPR_MIXED)
+		mdb_printf("fprs %x\n", xrs.pr_un.pr_v8p.pr_fprs);
+
+	if (PTL_GETFPREGS(t, tid, &fprs) != 0) {
+		mdb_warn("failed to get floating point registers");
+		return (DCMD_ERR);
+	}
+
+	if (opts == FPR_MIXED) {
+		uint64_t fsr = fprs.pr_fsr;
+		if (is_v8plus)
+			fsr |= (uint64_t)xrs.pr_un.pr_v8p.pr_xfsr << 32;
+		mdb_printf("fsr  %llx\n", fsr);
+	}
+
+	/*
+	 * Set up the regs pointer to be a pointer to a contiguous chunk of
+	 * memory containing all the floating pointer register data.  Set
+	 * ns, nd, and nq to indicate the number of registers of each type.
+	 */
+	if (is_v9) {
+		regs = fprs.pr_fr.pr_regs;
+		ns = 64;
+		nd = 32;
+		nq = 16;
+	} else if (is_v8plus) {
+		regs = mdb_alloc(sizeof (uint32_t) * 64, UM_SLEEP | UM_GC);
+		bcopy(fprs.pr_fr.pr_regs, regs, sizeof (uint32_t) * 32);
+		bcopy(xrs.pr_un.pr_v8p.pr_xfr.pr_regs, regs + 32,
+		    sizeof (uint32_t) * 32);
+		ns = 64;
+		nd = 32;
+		nq = 16;
+	} else {
+		regs = fprs.pr_fr.pr_regs;
+		ns = 32;
+		nd = 16;
+		nq = 0;
+	}
+
+	if (opts == FPR_MIXED) {
+		for (i = 0; i < ns; i++) {
+			fpu.ip.i1 = regs[i];
+			mdb_printf("f%-3d %08x   %e", i, fpu.ip.i1, fpu.f);
+			if (i & 1) {
+				fpu.ip.i1 = regs[i - 1];
+				fpu.ip.i2 = regs[i];
+				mdb_printf("   %g", fpu.d);
+			}
+			mdb_printf("\n");
+		}
+	}
+
+	if (opts & FPR_SINGLE) {
+		for (i = 0; i < ns; i++) {
+			fpu.ip.i1 = regs[i];
+			mdb_printf("f%-3d %08x   %e\n", i, fpu.ip.i1, fpu.f);
+		}
+	}
+
+	if (opts & FPR_DOUBLE) {
+		for (i = 0; i < nd; i++) {
+			fpu.ip.i1 = regs[i * 2 + 0];
+			fpu.ip.i2 = regs[i * 2 + 1];
+			mdb_printf("f%-3d %08x.%08x   %g\n", i * 2,
+			    fpu.ip.i1, fpu.ip.i2, fpu.d);
+		}
+	}
+
+	if (opts & FPR_QUAD) {
+		for (i = 0; i < nq; i++) {
+			fpu.ip.i1 = regs[i * 4 + 0];
+			fpu.ip.i2 = regs[i * 4 + 1];
+			fpu.ip.i3 = regs[i * 4 + 2];
+			fpu.ip.i4 = regs[i * 4 + 3];
+			mdb_printf("f%-3d %08x.%08x.%08x.%08x   %s\n", i * 4,
+			    fpu.ip.i1, fpu.ip.i2, fpu.ip.i3, fpu.ip.i4,
+			    longdoubletos(&fpu.ld, 16, 'e'));
+		}
+	}
+
+	return (DCMD_OK);
+}
+
+/*
+ * Read a single floating-point register.  If it's a v8 or v9 register, then
+ * we get its value from prfpregset_t.  If it's a v8+ register, look in xregs.
+ */
+int
+pt_getfpreg(mdb_tgt_t *t, mdb_tgt_tid_t tid, ushort_t rd_num,
+    ushort_t rd_flags, mdb_tgt_reg_t *rp)
+{
+	mdb_tgt_reg_t rval;
+	prfpregset_t fprs;
+	prxregset_t xrs;
+
+	if (PTL_GETFPREGS(t, tid, &fprs) != 0)
+		return (-1); /* errno is set for us */
+
+	if ((rd_flags & MDB_TGT_R_XREG) && PTL_GETXREGS(t, tid, &xrs) != 0)
+		return (-1); /* errno is set for us */
+
+	if (rd_flags & MDB_TGT_R_FPU) {
+		switch (rd_num) {
+		case FPU_FSR:
+			rval = fprs.pr_fsr;
+			if (rd_flags & MDB_TGT_R_XREG)
+				rval |= (uint64_t)
+				    xrs.pr_un.pr_v8p.pr_xfsr << 32;
+			break;
+		case FPU_FPRS:
+			if (rd_flags & MDB_TGT_R_XREG)
+				rval = xrs.pr_un.pr_v8p.pr_fprs;
+			break;
+		}
+
+	} else if (rd_flags & MDB_TGT_R_FPS) {
+		if (rd_flags & MDB_TGT_R_XREG)
+			rval = xrs.pr_un.pr_v8p.pr_xfr.pr_regs[rd_num - 32];
+		else
+			rval = fprs.pr_fr.pr_regs[rd_num];
+
+	} else if (rd_flags & MDB_TGT_R_FPD) {
+		if (rd_flags & MDB_TGT_R_XREG)
+			rval = ((uint64_t *)
+			    xrs.pr_un.pr_v8p.pr_xfr.pr_dregs)[rd_num - 16];
+		else
+			rval = ((uint64_t *)fprs.pr_fr.pr_dregs)[rd_num];
+	}
+
+	*rp = rval;
+	return (0);
+}
+
+/*
+ * Write a single floating-point register.  If it's a v8 or v9 register, then
+ * we set its value in prfpregset_t.  If it's a v8+ register, modify the xregs.
+ */
+int
+pt_putfpreg(mdb_tgt_t *t, mdb_tgt_tid_t tid, ushort_t rd_num,
+    ushort_t rd_flags, mdb_tgt_reg_t rval)
+{
+	prfpregset_t fprs;
+	prxregset_t xrs;
+
+	if (PTL_GETFPREGS(t, tid, &fprs) != 0)
+		return (-1); /* errno is set for us */
+
+	if ((rd_flags & MDB_TGT_R_XREG) && PTL_GETXREGS(t, tid, &xrs) != 0)
+		return (-1); /* errno is set for us */
+
+	if (rd_flags & MDB_TGT_R_FPU) {
+		switch (rd_num) {
+		case FPU_FSR:
+			fprs.pr_fsr = (uint32_t)rval;
+			if (rd_flags & MDB_TGT_R_XREG)
+				xrs.pr_un.pr_v8p.pr_xfsr = rval >> 32;
+			break;
+		case FPU_FPRS:
+			if (rd_flags & MDB_TGT_R_XREG)
+				xrs.pr_un.pr_v8p.pr_fprs = rval;
+			break;
+		}
+
+	} else if (rd_flags & MDB_TGT_R_FPS) {
+		if (rd_flags & MDB_TGT_R_XREG)
+			xrs.pr_un.pr_v8p.pr_xfr.pr_regs[rd_num - 32] = rval;
+		else
+			fprs.pr_fr.pr_regs[rd_num] = rval;
+
+	} else if (rd_flags & MDB_TGT_R_FPD) {
+		if (rd_flags & MDB_TGT_R_XREG)
+			((uint64_t *)xrs.pr_un.pr_v8p.pr_xfr.pr_dregs)
+			    [rd_num - 16] = rval;
+		else
+			((uint64_t *)fprs.pr_fr.pr_dregs)[rd_num] = rval;
+	}
+
+	if (PTL_SETFPREGS(t, tid, &fprs) != 0)
+		return (-1); /* errno is set for us */
+
+	if ((rd_flags & MDB_TGT_R_XREG) && PTL_SETXREGS(t, tid, &xrs) != 0)
+		return (-1); /* errno is set for us */
+
+	return (0);
+}
+
+/*
+ * Utility function for inserting a floating-point register description into
+ * the p_regs hash table of register descriptions.
+ */
+static void
+pt_addfpreg(mdb_nv_t *nvp, uint_t rnum, uint_t rnam, char pref, ushort_t flags)
+{
+	uintmax_t nval = MDB_TGT_R_NVAL(rnum, flags | MDB_TGT_R_EXPORT);
+	char name[8]; /* enough for "[fdq][0-9][0-9]\0" */
+
+	(void) mdb_iob_snprintf(name, sizeof (name), "%c%u", pref, rnam);
+	(void) mdb_nv_insert(nvp, name, NULL, nval, MDB_NV_RDONLY);
+}
+
+/*
+ * Determine the ISA of the target and then insert the appropriate register
+ * description entries into p_regs.  If the target is v8plus or v9, add the
+ * entire v9 floating-point model; otherwise just add the v8 registers.
+ */
+void
+pt_addfpregs(mdb_tgt_t *t)
+{
+	pt_data_t *pt = t->t_data;
+	struct ps_prochandle *P = t->t_pshandle;
+	prxregset_t xrs;
+	uint_t i;
+
+	uint_t fpuflag = MDB_TGT_R_FPU | MDB_TGT_R_EXPORT;
+	uint_t e_mach = pt->p_file ? pt->p_file->gf_ehdr.e_machine : EM_NONE;
+	uint_t model = P ? Pstatus(P)->pr_dmodel : PR_MODEL_UNKNOWN;
+
+	/*
+	 * If the ELF file is SPARCv9 or the process or core is 64-bit, then
+	 * add the SPARCv9 floating-point descriptions.  Otherwise use v7/v8.
+	 */
+	if (e_mach == EM_SPARCV9 || model == PR_MODEL_LP64) {
+		for (i = 0; i < 64; i++)
+			pt_addfpreg(&pt->p_regs, i, i, 'f', MDB_TGT_R_FPS);
+		for (i = 0; i < 32; i++)
+			pt_addfpreg(&pt->p_regs, i, i * 2, 'd', MDB_TGT_R_FPD);
+	} else {
+		for (i = 0; i < 32; i++)
+			pt_addfpreg(&pt->p_regs, i, i, 'f', MDB_TGT_R_FPS);
+		for (i = 0; i < 16; i++)
+			pt_addfpreg(&pt->p_regs, i, i * 2, 'd', MDB_TGT_R_FPD);
+	}
+
+	/*
+	 * If the ELF file is SPARCv8+ or the process or core has v8+ xregs,
+	 * then include the additional v8plus register descriptions.
+	 */
+	if (e_mach == EM_SPARC32PLUS || (P != NULL && PTL_GETXREGS(t,
+	    PTL_TID(t), &xrs) == 0 && xrs.pr_type == XR_TYPE_V8P)) {
+
+		for (i = 32; i < 64; i++) {
+			pt_addfpreg(&pt->p_regs, i, i, 'f',
+			    MDB_TGT_R_FPS | MDB_TGT_R_XREG);
+		}
+
+		for (i = 16; i < 32; i++) {
+			pt_addfpreg(&pt->p_regs, i, i * 2, 'd',
+			    MDB_TGT_R_FPD | MDB_TGT_R_XREG);
+		}
+
+		fpuflag |= MDB_TGT_R_XREG; /* fpu status regs are in xregs */
+
+		(void) mdb_nv_insert(&pt->p_regs, "fsr", NULL,
+		    MDB_TGT_R_NVAL(FPU_FSR, fpuflag), MDB_NV_RDONLY);
+
+		(void) mdb_nv_insert(&pt->p_regs, "fprs", NULL,
+		    MDB_TGT_R_NVAL(FPU_FPRS, fpuflag), MDB_NV_RDONLY);
+
+	} else {
+		(void) mdb_nv_insert(&pt->p_regs, "fsr", NULL,
+		    MDB_TGT_R_NVAL(FPU_FSR, fpuflag), MDB_NV_RDONLY);
+	}
+}
+
+int
+pt_frameregs(void *arglim, uintptr_t pc, uint_t argc, const long *argv,
+    const mdb_tgt_gregset_t *gregs, boolean_t pc_faked)
+{
+	char buf[BUFSIZ];
+	const prgreg_t *pregs = &gregs->gregs[0];
+
+	argc = MIN(argc, (uint_t)(uintptr_t)arglim);
+
+	if (pc_faked)
+		mdb_printf("%<b>%0?lr %s%</b>(", pregs[R_SP], "?");
+	else
+		mdb_printf("%<b>%0?lr %a%</b>(", pregs[R_SP], pc);
+
+	if (argc != 0) {
+		mdb_printf("%lr", *argv++);
+		for (argc--; argc != 0; argc--)
+			mdb_printf(", %lr", *argv++);
+	}
+
+	mdb_printf(")\n");
+
+	(void) mdb_inc_indent(2);
+
+	mdb_printf("%%l0-%%l3: %?lr %?lr %?lr %?lr\n",
+	    pregs[R_L0], pregs[R_L1], pregs[R_L2], pregs[R_L3]);
+
+	mdb_printf("%%l4-%%l7: %?lr %?lr %?lr %?lr\n",
+	    pregs[R_L4], pregs[R_L5], pregs[R_L6], pregs[R_L7]);
+
+	if (pregs[R_FP] != 0 && (pregs[R_FP] + STACK_BIAS) != 0)
+		if (mdb_dis_ins2str(mdb.m_disasm, mdb.m_target, MDB_TGT_AS_VIRT,
+		    buf, sizeof (buf), pregs[R_I7]) != pregs[R_I7])
+			mdb_printf("%-#25a%s\n", pregs[R_I7], buf);
+
+	(void) mdb_dec_indent(2);
+	mdb_printf("\n");
+
+	return (0);
+}
+
+const char *
+pt_disasm(const GElf_Ehdr *ehp)
+{
+	const char *disname = "s390x";
+
+	return (disname);
+}
+
+/*
+ * Macros and #defines for extracting and interpreting SPARC instruction set,
+ * used in pt_step_out() and pt_next() below.
+ */
+#define	OP(machcode)	((machcode) >> 30)
+#define	OP2(machcode)	(((machcode) >> 22) & 0x07)
+#define	OP3(machcode)	(((machcode) >> 19) & 0x3f)
+#define	RD(machcode)	(((machcode) >> 25) & 0x1f)
+#define	RS1(machcode)	(((machcode) >> 14) & 0x1f)
+#define	RS2(machcode)	((machcode) & 0x1f)
+
+#define	OP_BRANCH	0x0
+#define	OP_ARITH	0x2
+
+#define	OP2_ILLTRAP	0x0
+
+#define	OP3_OR		0x02
+#define	OP3_SAVE	0x3c
+#define	OP3_RESTORE	0x3d
+
+/*
+ * If we are stopped on a save instruction or at the first instruction of a
+ * known function, return %o7 as the step-out address; otherwise return the
+ * current frame's return address (%i7).  Significantly better handling of
+ * step out in leaf routines could be accomplished by implementing more
+ * complex decoding of the current function and our current state.
+ */
+int
+pt_step_out(mdb_tgt_t *t, uintptr_t *p)
+{
+	const lwpstatus_t *psp = &Pstatus(t->t_pshandle)->pr_lwp;
+	uintptr_t pc = psp->pr_reg[R_PC];
+	uint32_t instr;
+
+	char buf[1];
+	GElf_Sym s;
+
+	if (Pstate(t->t_pshandle) != PS_STOP)
+		return (set_errno(EMDB_TGTBUSY));
+
+	instr = pt_read_instr(t);
+
+	if (mdb_tgt_lookup_by_addr(t, pc, MDB_TGT_SYM_FUZZY,
+	    buf, sizeof (buf), &s, NULL) == 0 && s.st_value == pc)
+		*p = psp->pr_reg[R_O7] + 2 * sizeof (instr_t);
+	else if (OP(instr) == OP_ARITH &&
+	    OP3(instr) == OP3_SAVE)
+		*p = psp->pr_reg[R_O7] + 2 * sizeof (instr_t);
+	else
+		*p = psp->pr_reg[R_I7] + 2 * sizeof (instr_t);
+
+	return (0);
+}
+
+/*
+ * Step over call and jmpl by returning the address of the position where a
+ * temporary breakpoint can be set to catch return from the control transfer.
+ * This function does not currently provide advancing decoding of DCTI
+ * couples or any other complex special case; we just fall back to single-step.
+ */
+int
+pt_next(mdb_tgt_t *t, uintptr_t *p)
+{
+	const lwpstatus_t *psp = &Pstatus(t->t_pshandle)->pr_lwp;
+	uintptr_t pc;
+	uintptr_t npc;
+	GElf_Sym func;
+	char name[1];
+	instr_t instr;
+
+	if (Pstate(t->t_pshandle) != PS_STOP)
+		return (set_errno(EMDB_TGTBUSY));
+
+	pc = psp->pr_reg[R_PC];
+	npc = psp->pr_reg[R_nPC];
+	instr = pt_read_instr(t);
+
+	if (mdb_tgt_lookup_by_addr(t, pc, MDB_TGT_SYM_FUZZY,
+	    name, sizeof (name), &func, NULL) != 0)
+		return (-1);
+
+	if (npc < func.st_value || func.st_value + func.st_size <= npc) {
+		uint_t reg;
+
+		/*
+		 * We're about to transfer control outside this function,
+		 * so we want to stop when control returns from the other
+		 * function. Normally the return address will be in %o7,
+		 * tail-calls being the exception. We try to discover
+		 * if this is a tail-call and compute the return address
+		 * in that case.
+		 */
+		if (OP(instr) == OP_ARITH &&
+		    OP3(instr) == OP3_RESTORE) {
+			reg = R_I7;
+
+		} else if (OP(instr) == OP_ARITH &&
+		    OP3(instr) == OP3_OR &&
+		    RD(instr) == R_O7) {
+
+			if (RS1(instr) != R_G0)
+				return (set_errno(EAGAIN));
+			reg = RS2(instr);
+
+		} else {
+			reg = R_O7;
+		}
+
+		*p = psp->pr_reg[reg] + 2 * sizeof (instr_t);
+
+		/*
+		 * If a function returns a structure, the caller may place
+		 * an illtrap whose const22 field represents the size of
+		 * the structure immediately after the delay slot of the
+		 * call (or jmpl) instruction. To handle this case, we
+		 * check the instruction that we think we're going to
+		 * return to, and advance past it if it's an illtrap
+		 * instruction. Note that this applies to SPARC v7 and v8,
+		 * but not v9.
+		 */
+		if (mdb_tgt_vread(t, &instr, sizeof (instr_t), *p) ==
+		    sizeof (instr_t) &&
+		    OP(instr) == OP_BRANCH && OP2(instr) == OP2_ILLTRAP)
+			*p += sizeof (instr_t);
+
+		return (0);
+	}
+
+	return (set_errno(EAGAIN));
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/modules/intr/intr.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,462 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <sys/mdb_modapi.h>
+#include <mdb/mdb_ks.h>
+#include <sys/async.h>		/* ecc_flt for pci_ecc.h */
+#include <sys/ddi_subrdefs.h>
+#include <sys/pci/pci_obj.h>
+#include "px_obj.h"
+
+static int intr_pci_walk_step(mdb_walk_state_t *);
+static int intr_px_walk_step(mdb_walk_state_t *);
+static void intr_pci_print_items(mdb_walk_state_t *);
+static void intr_px_print_items(mdb_walk_state_t *);
+static char *intr_get_intr_type(msiq_rec_type_t);
+static void intr_print_banner(void);
+
+typedef struct intr_info {
+	uint32_t	cpuid;
+	uint32_t	inum;
+	uint32_t	num;
+	uint32_t	pil;
+	uint16_t	mondo;
+	uint8_t		ino_ino;
+	uint_t		intr_state;
+	int		instance;
+	int		shared;
+	msiq_rec_type_t intr_type;
+	char		driver_name[12];
+	char		pathname[MAXNAMELEN];
+}
+intr_info_t;
+
+static void intr_print_elements(intr_info_t);
+static int detailed = 0; /* Print detailed view */
+
+
+static int
+intr_walk_init(mdb_walk_state_t *wsp)
+{
+	wsp->walk_addr = NULL;
+
+	return (WALK_NEXT);
+}
+
+static int
+intr_walk_step(mdb_walk_state_t *wsp)
+{
+	pci_t		*pci_per_p;
+	px_t		*px_state_p;
+
+	/* read globally declared structures in the pci driver */
+	if (mdb_readvar(&pci_per_p, "per_pci_state") != -1) {
+		wsp->walk_addr = (uintptr_t)pci_per_p;
+		intr_pci_walk_step(wsp);
+	}
+
+	/* read globally declared structures in the px driver */
+	if (mdb_readvar(&px_state_p, "px_state_p") != -1) {
+		wsp->walk_addr = (uintptr_t)px_state_p;
+		intr_px_walk_step(wsp);
+	}
+
+	return (WALK_DONE);
+}
+
+static int
+intr_pci_walk_step(mdb_walk_state_t *wsp)
+{
+	pci_t		*pci_per_p;
+	pci_t		pci_per;
+	uintptr_t	start_addr;
+
+	/* Read start of state structure array */
+	if (mdb_vread(&pci_per_p, sizeof (uintptr_t),
+	    (uintptr_t)wsp->walk_addr) == -1) {
+		mdb_warn("intr: failed to read the initial pci_per_p "
+		    "structure\n");
+		return (WALK_ERR);
+	}
+
+	/* Figure out how many items are here */
+	start_addr = (uintptr_t)pci_per_p;
+
+	intr_print_banner();
+
+	while (mdb_vread(&pci_per_p, sizeof (uintptr_t),
+	    (uintptr_t)start_addr) != -1) {
+		/* Read until nothing is left */
+		if (mdb_vread(&pci_per, sizeof (pci_t),
+		    (uintptr_t)pci_per_p) == -1) {
+			return (WALK_DONE);
+		}
+
+		wsp->walk_addr = (uintptr_t)pci_per.pci_ib_p;
+		intr_pci_print_items(wsp);
+
+		start_addr += sizeof (uintptr_t);
+	}
+
+	return (WALK_DONE);
+}
+
+static int
+intr_px_walk_step(mdb_walk_state_t *wsp)
+{
+	px_t		*px_state_p;
+	px_t		px_state;
+	uintptr_t	start_addr;
+
+	/* Read start of state structure array */
+	if (mdb_vread(&px_state_p, sizeof (uintptr_t),
+	    (uintptr_t)wsp->walk_addr) == -1) {
+		mdb_warn("intr: failed to read the initial px_per_p "
+		    "structure\n");
+		return (WALK_ERR);
+	}
+
+	/* Figure out how many items are here */
+	start_addr = (uintptr_t)px_state_p;
+
+	intr_print_banner();
+
+	while (mdb_vread(&px_state_p, sizeof (uintptr_t),
+	    (uintptr_t)start_addr) != -1) {
+		/* Read until nothing is left */
+		if (mdb_vread(&px_state, sizeof (px_t),
+		    (uintptr_t)px_state_p) == -1) {
+			return (WALK_DONE);
+		}
+
+		wsp->walk_addr = (uintptr_t)px_state.px_ib_p;
+		intr_px_print_items(wsp);
+
+		start_addr += sizeof (uintptr_t);
+	}
+
+	return (WALK_DONE);
+}
+
+static void
+intr_pci_print_items(mdb_walk_state_t *wsp)
+{
+	ib_t			pci_ib;
+	ib_ino_info_t		*ib_ino_lst;
+	ib_ino_info_t		list;
+	ih_t			ih;
+	int			count;
+	char			name[MODMAXNAMELEN + 1];
+	struct dev_info		devinfo;
+	intr_info_t		info;
+
+	if (mdb_vread(&pci_ib, sizeof (ib_t),
+	    (uintptr_t)wsp->walk_addr) == -1) {
+		mdb_warn("intr: failed to read pci interrupt block "
+		    "structure\n");
+		return;
+	}
+
+	/* Read in ib_ino_info_t structure at address */
+	ib_ino_lst = pci_ib.ib_ino_lst;
+	if (mdb_vread(&list, sizeof (ib_ino_info_t),
+	    (uintptr_t)ib_ino_lst) == -1) {
+		/* Nothing here to read from */
+		return;
+	}
+
+	do {
+		if (mdb_vread(&ih, sizeof (ih_t),
+		    (uintptr_t)list.ino_ih_start) == -1) {
+			mdb_warn("intr: failed to read pci interrupt entry "
+			    "structure\n");
+			return;
+		}
+
+		count = 0;
+
+		do {
+			bzero((void *)&info, sizeof (intr_info_t));
+
+			if (list.ino_ih_size > 1) {
+				info.shared = 1;
+			}
+
+			(void) mdb_devinfo2driver((uintptr_t)ih.ih_dip,
+			    name, sizeof (name));
+
+			(void) mdb_ddi_pathname((uintptr_t)ih.ih_dip,
+			    info.pathname, sizeof (info.pathname));
+
+			/* Get instance */
+			if (mdb_vread(&devinfo, sizeof (struct dev_info),
+			    (uintptr_t)ih.ih_dip) == -1) {
+				mdb_warn("intr: failed to read DIP "
+				    "structure\n");
+				return;
+			}
+
+			/* Make sure the name doesn't over run */
+			(void) mdb_snprintf(info.driver_name,
+			    sizeof (info.driver_name), "%s", name);
+
+			info.instance = devinfo.devi_instance;
+			info.inum = ih.ih_inum;
+			info.intr_type = INTX_REC;
+			info.num = 0;
+			info.intr_state = ih.ih_intr_state;
+			info.ino_ino = list.ino_ino;
+			info.mondo = list.ino_mondo;
+			info.pil = list.ino_pil;
+			info.cpuid = list.ino_cpuid;
+
+			intr_print_elements(info);
+			count++;
+
+			(void) mdb_vread(&ih, sizeof (ih_t),
+			    (uintptr_t)ih.ih_next);
+
+		} while (count < list.ino_ih_size);
+
+	} while (mdb_vread(&list, sizeof (ib_ino_info_t),
+	    (uintptr_t)list.ino_next) != -1);
+}
+
+static void
+intr_px_print_items(mdb_walk_state_t *wsp)
+{
+	px_ib_t			px_ib;
+	px_ib_ino_info_t	*px_ib_ino_lst;
+	px_ib_ino_info_t	px_list;
+	px_ih_t			px_ih;
+	int			count;
+	char			name[MODMAXNAMELEN + 1];
+	struct dev_info		devinfo;
+	intr_info_t		info;
+
+	if (mdb_vread(&px_ib, sizeof (px_ib_t), wsp->walk_addr) == -1) {
+		mdb_warn("intr: failed to read px interrupt block "
+		    "structure\n");
+		return;
+	}
+
+	/* Read in px_ib_ino_info_t structure at address */
+	px_ib_ino_lst = px_ib.ib_ino_lst;
+	if (mdb_vread(&px_list, sizeof (px_ib_ino_info_t),
+	    (uintptr_t)px_ib_ino_lst) == -1) {
+		/* Nothing here to read from */
+		return;
+	}
+
+	do {
+		if (mdb_vread(&px_ih, sizeof (px_ih_t),
+		    (uintptr_t)px_list.ino_ih_start) == -1) {
+			mdb_warn("intr: failed to read px interrupt entry "
+			    "structure\n");
+			return;
+		}
+
+		count = 0;
+
+		do {
+			bzero((void *)&info, sizeof (intr_info_t));
+
+			if (px_list.ino_ih_size > 1) {
+				info.shared = 1;
+			}
+
+			(void) mdb_devinfo2driver((uintptr_t)px_ih.ih_dip,
+			    name, sizeof (name));
+
+			(void) mdb_ddi_pathname((uintptr_t)px_ih.ih_dip,
+			    info.pathname, sizeof (info.pathname));
+
+			/* Get instance */
+			if (mdb_vread(&devinfo, sizeof (struct dev_info),
+			    (uintptr_t)px_ih.ih_dip) == -1) {
+				mdb_warn("intr: failed to read DIP "
+				    "structure\n");
+				return;
+			}
+
+			/* Make sure the name doesn't over run */
+			(void) mdb_snprintf(info.driver_name,
+			    sizeof (info.driver_name), "%s", name);
+
+			info.instance = devinfo.devi_instance;
+			info.inum = px_ih.ih_inum;
+			info.intr_type = px_ih.ih_rec_type;
+			info.num = px_ih.ih_msg_code;
+			info.intr_state = px_ih.ih_intr_state;
+			info.ino_ino = px_list.ino_ino;
+			info.mondo = px_list.ino_sysino;
+			info.pil = px_list.ino_pil;
+			info.cpuid = px_list.ino_cpuid;
+
+			intr_print_elements(info);
+			count++;
+
+			(void) mdb_vread(&px_ih, sizeof (ih_t),
+			    (uintptr_t)px_ih.ih_next);
+
+		} while (count < px_list.ino_ih_size);
+
+	} while (mdb_vread(&px_list, sizeof (px_ib_ino_info_t),
+	    (uintptr_t)px_list.ino_next) != -1);
+}
+
+static char *
+intr_get_intr_type(msiq_rec_type_t rec_type)
+{
+	switch (rec_type) {
+		case	MSG_REC:
+			return ("PCIe");
+		case	MSI32_REC:
+		case	MSI64_REC:
+			return ("MSI");
+		case	INTX_REC:
+		default:
+			return ("Fixed");
+	}
+}
+
+static void
+intr_print_banner(void)
+{
+	if (!detailed) {
+		mdb_printf("\n%<u>\tDevice\t"
+		    " Shared\t"
+		    " Type\t"
+		    " MSG #\t"
+		    " State\t"
+		    " INO\t"
+		    " Mondo\t"
+		    "  Pil\t"
+		    " CPU   %</u>"
+		    "\n");
+	}
+}
+
+static void
+intr_print_elements(intr_info_t info)
+{
+	if (!detailed) {
+		mdb_printf(" %11s#%d\t", info.driver_name, info.instance);
+		mdb_printf(" %5s\t",
+		    info.shared ? "yes" : "no");
+		mdb_printf(" %s\t", intr_get_intr_type(info.intr_type));
+		if (strcmp("Fixed", intr_get_intr_type(info.intr_type)) == 0) {
+			mdb_printf("  --- \t");
+		} else {
+			mdb_printf(" %4d\t", info.num);
+		}
+
+		mdb_printf(" %2s\t",
+		    info.intr_state ? "enbl" : "disbl");
+		mdb_printf(" 0x%x\t", info.ino_ino);
+		mdb_printf(" 0x%x\t", info.mondo);
+		mdb_printf(" %4d\t", info.pil);
+		mdb_printf(" %3d \n", info.cpuid);
+	} else {
+		mdb_printf("\n-------------------------------------------\n");
+		mdb_printf("Device:\t\t%s\n", info.driver_name);
+		mdb_printf("Instance:\t%d\n", info.instance);
+		mdb_printf("Path:\t\t%s\n", info.pathname);
+		mdb_printf("Inum:\t\t%d\n", info.inum);
+		mdb_printf("Interrupt Type:\t%s\n",
+		    intr_get_intr_type(info.intr_type));
+		if (strcmp("MSI", intr_get_intr_type(info.intr_type)) == 0)
+			mdb_printf("MSI/X Number:\t%s\n", info.num);
+
+		mdb_printf("Shared Intr:\t%s\n",
+		    info.shared ? "yes" : "no");
+		mdb_printf("State:\t\t%d (%s)\n", info.intr_state,
+		    info.intr_state ? "Enabled" : "Disabled");
+		mdb_printf("INO:\t\t0x%x\n", info.ino_ino);
+		mdb_printf("Mondo:\t\t0x%x\n", info.mondo);
+		mdb_printf("Pil:\t\t%d\n", info.pil);
+		mdb_printf("CPU:\t\t%d\n", info.cpuid);
+	}
+}
+
+/*ARGSUSED*/
+static void
+intr_walk_fini(mdb_walk_state_t *wsp)
+{
+	/* Nothing to do here */
+}
+
+/*ARGSUSED*/
+static int
+intr_intr(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	detailed = 0;
+
+	if (mdb_getopts(argc, argv, 'd', MDB_OPT_SETBITS, TRUE, &detailed,
+	    NULL) != argc)
+		return (DCMD_USAGE);
+
+	if (!(flags & DCMD_ADDRSPEC)) {
+		if (mdb_walk_dcmd("interrupts", "interrupts", argc, argv)
+		    == -1) {
+			mdb_warn("can't walk pci/px buffer entries\n");
+			return (DCMD_ERR);
+		}
+		return (DCMD_OK);
+	}
+
+	return (DCMD_OK);
+}
+
+/*
+ * MDB module linkage information:
+ */
+
+static const mdb_dcmd_t dcmds[] = {
+	{ "interrupts", "[-d]", "display the interrupt info registered with "
+	    "the PCI/PX nexus drivers", intr_intr },
+	{ NULL }
+};
+
+static const mdb_walker_t walkers[] = {
+	{ "interrupts", "walk PCI/PX interrupt structures",
+		intr_walk_init, intr_walk_step, intr_walk_fini },
+	{ NULL }
+};
+
+static const mdb_modinfo_t modinfo = {
+	MDB_API_VERSION, dcmds, walkers
+};
+
+const mdb_modinfo_t *
+_mdb_init(void)
+{
+	return (&modinfo);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/modules/s390xdis/dis.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,226 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	_DIS_H
+#define	_DIS_H
+
+#include <strings.h>
+#include <stdlib.h>
+#include <gelf.h>
+
+#include <mdb/mdb_disasm_impl.h>
+#include <mdb/mdb_err.h>
+#include <mdb/mdb_io.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	V8_MODE		1	/* V8 */
+#define	V9_MODE		2	/* V9 */
+#define	V9_SGI_MODE	4	/* V9/SGI */
+
+#define	APNO	10
+#define	FPNO	9
+#define	PCNO	15
+#define	NCPS	10	/* number of chars per symbol	*/
+#define	NHEX	80	/* max # chars in object per line */
+#define	NLINE	1024	/* max # chars in mnemonic per line */
+#define	FAIL	0
+#define	LEAD	1
+#define	NOLEAD	0
+
+/*
+ * used in tables.c to indicate  that the 'indirect' field of term
+ * 'instable' terminates - no pointer. Is also checked in 'dis_text()' in
+ * bits.c.
+ */
+#define	TERM	0
+
+/*
+ * used in string compare operation in 'disassembly' routine
+ */
+#define	STRNGEQ 0
+
+/*
+ *	The following are constants that are used in the disassembly
+ *	of floating point immediate operands.
+ */
+#define	NOTFLOAT	0
+#define	FPSINGLE	1
+#define	FPDOUBLE	2
+
+/*
+ * 2 ** 23 used in conversion of floating point object to
+ * a decimal number in _utls.c
+ */
+#define	TWO_23	8388608
+
+/*
+ * 2 ** 32 also used in floating point number conversion in _utls.c
+ */
+#define	TWO_32	4294967296.
+
+/*
+ * 2 ** 52 also used in floating point conversion routines.
+ */
+#define	TWO_52	4503599627370496.
+
+/*
+ * bias on 8 bit exponent of floating  point number in _utls.c
+ */
+#define	BIAS	127
+
+/*
+ * bias on 11 bit exponent of double precision floating point number
+ * in _utls.c
+ */
+#define	DBIAS	1023
+/*
+ * The following are the 7 posssible types of floating point immediate
+ * operands. These are the possible values of [s|d]fpconv() which
+ * are in _utls.c.
+ */
+#define	NOTANUM		0
+#define	NEGINF		1
+#define	INFINITY	2
+#define	ZERO		3
+#define	NEGZERO		4
+#define	FPNUM		5
+#define	FPBIGNUM	6
+
+/*
+ *	This is a symbolic representation of all support processor
+ *	identifiers.
+ */
+
+#define	MAU_ID		0
+
+/*
+ *	This is the structure that will be used for storing all the
+ *	op code information.  The structure values themselves are
+ *	in 'tables.c'.
+ */
+
+struct	instable {
+	char		name[NCPS];
+	unsigned	class;
+};
+/*
+ *	This is the structure that will be used for storing all the
+ *	address modification information.  The structure values
+ *	themselves are in 'tables.c'.
+ */
+struct	formtable {
+	char		name[NCPS];
+	unsigned	typ;
+};
+
+typedef struct {
+	char *name;
+	unsigned long op;
+	unsigned long mask;
+	int type;
+	unsigned long vermask;
+} INST;
+
+typedef unsigned int Instruction;
+typedef char *(*FUNCPTR)(GElf_Addr);
+typedef unsigned char FORMAT;
+
+/*
+ *	NOTE:	the following information in this file must be changed
+ *		between the different versions of the disassembler.
+ *
+ *	These are the instruction classes as they appear in
+ *	'tables.c'.  Here they are given numerical values
+ *	for use in the actual disassembly of an object file.
+ */
+
+#define	UNKNOWN		0
+#define	OPRNDS0		1	/* instructions with no operands */
+#define	OPRNDS1		2	/* instructions with 1 operand */
+#define	OPRNDS2		3	/* instructions with 2 operands	*/
+#define	OPRNDS3		4	/* instructions with 3 operands	*/
+#define	OPRNDS4		5	/* instructions with 4 operands	*/
+#define	JUMP		6	/* "jump" instruction */
+#define	JUMPSB		7	/* "jumpsb" instruction */
+#define	JUMP1		8	/* 1 byte offset jump instruction */
+#define	JUMP2		9	/* 2 byte offset jump instruction */
+#define	BSBB		10	/* "BSBB" instruction */
+#define	BSBH		11	/* "BSBB" instruction */
+#define	NOOP8		12	/* 8 bit offset (no operands) */
+#define	NOOP16		13	/* 16 bit offset (no operands) */
+#define	CALL		14	/* "call" instruction */
+#define	EXT		15	/* "extendop" instruction */
+#define	AD1OP3		17	/* 4 operands but add 1 to 3nd op */
+#define	SFPOPS2		18	/* single floating point, 2 operands */
+#define	SFPOPS3		19	/* single floating point, 3 operands */
+#define	MACRO		20	/* macro-rom instruction */
+#define	DFPOPS2		21	/* double floating point, 2 operands */
+#define	DFPOPS3		22	/* double floating point, 3 operands */
+#define	SPRTOP0		23	/* support processor inst.0 operands */
+#define	SPRTOP1		24	/* support processor inst. 1 operand */
+#define	SPRTOP2		25	/* support processor inst. 2 operand */
+
+/*
+ *	These are the address modification types as they appear in
+ *	'tables.c'.  Here they are given numerical values for
+ *	use in the actual disassembly of an object file.
+ */
+
+#define	IM6	1	/* immediate 6 bit field */
+#define	R	2	/* register */
+#define	RDF	3	/* register deferred (indirect) */
+#define	R4	4	/* register and 4 bit displacement */
+#define	IMB	5	/* immediate byte */
+#define	IMH	6	/* immediate half word */
+#define	IMW	7	/* immediate word */
+#define	BDB	8	/* base (register) and byte displacement */
+#define	BDH	9	/* base (register) and half word disp */
+#define	BDW	10	/* base (register) and word displacement */
+#define	BDBDF	11	/* base and byte displacement deferred */
+#define	BDHDF	12	/* base and half word displacement deferred */
+#define	BDWDF	13	/* base and word displacement deferred */
+#define	EXPSB	14	/* expanded signed byte	*/
+#define	EXPUB	15	/* expanded unsigned byte */
+#define	EXPSH	16	/* expanded signed half word */
+#define	EXPUH	17	/* expanded unsigned half word */
+#define	EXPSW	18	/* expanded signed word	*/
+#define	EXPUW	19	/* expanded unsigned word */
+#define	IM4	20	/* immediate 4 bit field */
+#define	ABAD	21	/* absolute address */
+#define	ABADDF	22	/* absolute address deferred */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _DIS_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/modules/s390xdis/s390xdis.c	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,130 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/* S390X FIXME */
+
+#include "dis.h"
+
+extern mdb_tgt_addr_t s390xdis_ins2str(mdb_disasm_t *, mdb_tgt_t *,
+    mdb_tgt_as_t, char *, size_t, mdb_tgt_addr_t);
+
+/*ARGSUSED*/
+static void
+s390xdis_destroy(mdb_disasm_t *dp)
+{
+	/* Nothing to do here */
+}
+
+/*ARGSUSED*/
+static mdb_tgt_addr_t
+s390xdis_previns(mdb_disasm_t *dp, mdb_tgt_t *t, mdb_tgt_as_t as,
+    mdb_tgt_addr_t pc, uint_t n)
+{
+	mdb_tgt_addr_t res = (pc < n * 4 ? 0 : pc - n * 4);
+	uint32_t buf;
+
+	/*
+	 * Probe the address to make sure we can read from it - we want the
+	 * address we return to actually contain something.
+	 */
+	while (res < pc && mdb_tgt_aread(t, as, &buf, sizeof (buf), res) !=
+	    sizeof (buf))
+		res += 4;
+
+	return (res);
+}
+
+/*ARGSUSED*/
+static mdb_tgt_addr_t
+s390xdis_nextins(mdb_disasm_t *dp, mdb_tgt_t *t, mdb_tgt_as_t as,
+    mdb_tgt_addr_t pc)
+{
+	mdb_tgt_addr_t npc = pc + 4;
+	uint32_t buf;
+
+	/*
+	 * Probe the address to make sure we can read from it - we want the
+	 * address we return to actually contain something.
+	 */
+	if (mdb_tgt_aread(t, as, &buf, sizeof (buf), npc) != sizeof (buf))
+		return (pc);
+
+	return (npc);
+}
+
+static const mdb_dis_ops_t s390xdis_ops = {
+	s390xdis_destroy,
+	s390xdis_ins2str,
+	s390xdis_previns,
+	s390xdis_nextins
+};
+
+int
+s390x_create(mdb_disasm_t *dp)
+{
+	dp->dis_name = "s390x";
+	dp->dis_ops  = &s390xdis_ops;
+	dp->dis_data = 0;
+	dp->dis_desc = "s390x disassembler";
+	return (0);
+}
+
+
+static struct {
+	mdb_dis_ctor_f *ctor;
+	mdb_disasm_t *hdl;
+} s390x_dis[] = {
+	{ s390x_create }
+};
+
+static const mdb_modinfo_t modinfo = { MDB_API_VERSION, NULL, NULL };
+
+const mdb_modinfo_t *
+_mdb_init(void)
+{
+	int i;
+
+	for (i = 0; i < sizeof (s390x_dis) / sizeof (s390x_dis[0]); i++) {
+		s390x_dis[i].hdl = mdb_dis_create(s390x_dis[i].ctor);
+	}
+
+	return (&modinfo);
+}
+
+void
+_mdb_fini(void)
+{
+	int i;
+
+	for (i = 0; i < sizeof (s390x_dis) / sizeof (s390x_dis[0]); i++) {
+		if (s390x_dis[i].hdl != NULL)
+			mdb_dis_destroy(s390x_dis[i].hdl);
+	}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+include ../../Makefile.common
+
+MODULES = \
+	$(COMMON_MODULES_PROC) \
+	$(COMMON_MODULES_KVM) \
+	intr \
+	sd \
+	ssd
+
+#
+# a "$(MODULES): kmdb" rule would seem to do the trick but, for some reason,
+# it serializes $(MODULES).
+#
+SUBDIRS = mdb mdb_ks kmdb libstandctf libstand .WAIT $(MODULES)
+
+include ../../Makefile.subdirs
+
+.PARALLEL: $(SUBDIRS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/Makefile.kmdb	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,58 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+ARCHOPTS = -D__s390xcpu -D__s390x
+
+ASFLAGS += -I$(ROOT)/usr/include/s390x
+CPPFLAGS += -I$(ROOT)/usr/include/s390x
+
+KMDBML += \
+	client_handler.s \
+	kaif_handlers.s \
+	kaif_invoke.s \
+	kaif_resume.s \
+	kaif_startup.s \
+	kmdb_setcontext.s \
+	kmdb_start.s \
+	kmdb_s390xasmutil.s
+
+KMDBSRCS += \
+	mdb_s390xutil.c
+
+REGOFFUSERS = \
+	kaif_resume.o \
+	kaif_startup.o
+
+CTXOFFUSERS = \
+	kmdb_setcontext.o
+
+$(REGOFFUSERS) $(REGOFFUSERS:%.o=%.ln): kaif_off.h
+
+$(CTXOFFUSERS) $(CTXOFFUSERS:%.o=%.ln): kmdb_context_off.h
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/audiosup/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = audiosup.so
+MDBTGT = kvm
+
+MODSRCS = audiosup.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/cpc/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = cpc.so
+MDBTGT = kvm
+
+MODSRCS = cpc.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/crypto/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = crypto.so
+MDBTGT = kvm
+
+MODSRCS = impl.c spi.c common.c sched_impl.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/dof/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = dof.so
+MDBTGT = raw
+
+MODSRCS = dof.c dof_names.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+MODSRCS_DIR = ../../../common/modules/dtrace
+
+LDLIBS  += -ldtrace
+CLEANFILES += dof_names.c
+
+dof_names.c: $(MODSRCS_DIR)/mkdof.sh $(SRC)/uts/common/sys/dtrace.h
+	sh $(MODSRCS_DIR)/mkdof.sh < $(SRC)/uts/common/sys/dtrace.h > $@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/dtrace/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = dtrace.so
+MDBTGT = kvm
+
+MODSRCS = dtrace.c dof.c dof_names.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+MODULE_BUILD_TYPE = mdb
+MODSRCS_DIR = ../../../common/modules/dtrace
+
+CPPFLAGS += -I$(SRC)/uts/sun4u
+LDLIBS  += -ldtrace -lm
+CLEANFILES += dof_names.c
+
+dof_names.c: $(MODSRCS_DIR)/mkdof.sh $(SRC)/uts/common/sys/dtrace.h
+	sh $(MODSRCS_DIR)/mkdof.sh < $(SRC)/uts/common/sys/dtrace.h > $@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/genunix/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,93 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = genunix.so
+MDBTGT = kvm
+
+COMMONSRCS = \
+	avl.c \
+	bio.c \
+	contract.c \
+	cpupart.c \
+	ctxop.c \
+	cyclic.c \
+	devinfo.c \
+	findstack.c \
+	genunix.c \
+	kgrep.c \
+	kmem.c \
+	ldi.c \
+	leaky.c \
+	leaky_subr.c \
+	lgrp.c \
+	list.c \
+	log.c \
+	memory.c \
+	mmd.c \
+	modhash.c \
+	ndievents.c \
+	net.c \
+	nvpair.c \
+	rctl.c \
+	sobj.c \
+	streams.c \
+	sysevent.c \
+	thread.c \
+	tsd.c \
+	vfs.c \
+	zone.c
+
+KMODSRCS = \
+	$(COMMONSRCS)
+
+MODSRCS = \
+	$(COMMONSRCS) \
+	typegraph.c
+
+#
+# This signals that $(KMODSRCS) != $(MODSRCS).  Typegraph is not usable under
+# kmdb.  As such, we don't bother compiling it.
+KMOD_SOURCES_DIFFERENT=$(POUND_SIGN)
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+#
+# We are not actually hardwiring some dependency on sun4u, we just need to
+# include sys/param.h with _MACHDEP defined, and this forces the inclusion of
+# machparam.h, even though we don't use anything there.  This is a temporary
+# kludge until we invent -DDONTINCLUDEMACHPARAM or something.
+#
+CPPFLAGS += -I$(SRC)/uts/sun4u
+
+# Needed to include c2/audit.h (from cred.h)
+CPPFLAGS += -I$(SRC)/uts/common
+# Needed to find include file mutex_impl.h
+CPPFLAGS += -I$(SRC)/uts/sparc/v9
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/intr/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,71 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = intr.so
+MDBTGT = kvm
+
+MODSRCS = intr.c
+
+MDB_DIR= $(ROOT)/usr/lib/mdb/kvm/sparcv9
+MDB_INTR=intr.so
+MDB_PCIPSY=pcipsy.so
+MDB_PCISCH=pcisch.so
+MDB_PX=px.so
+
+KMDB_DIR= $(ROOT)/kernel/kmdb/sparcv9
+KMDB_INTR=intr
+KMDB_PCIPSY=pcipsy
+KMDB_PCISCH=pcisch
+KMDB_PX=px
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+CPPFLAGS += -I$(SRC)/uts/common
+CPPFLAGS += -I$(SRC)/uts/sun4
+CPPFLAGS += -I$(SRC)/uts/sun4/io/px
+CPPFLAGS += -I$(SRC)/uts/sun4u
+CPPFLAGS += -I$(SRC)/uts/sparc/v9
+
+MODSRCS_DIR = ../../../sparc/modules/intr
+
+install: all
+	-$(RM) $(MDB_DIR)/$(MDB_PCIPSY)
+	-$(RM) $(MDB_DIR)/$(MDB_PCISCH)
+	-$(RM) $(MDB_DIR)/$(MDB_PX)
+	-cd $(MDB_DIR); $(SYMLINK) $(MDB_INTR) $(MDB_PCIPSY)
+	-cd $(MDB_DIR); $(SYMLINK) $(MDB_INTR) $(MDB_PCISCH)
+	-cd $(MDB_DIR); $(SYMLINK) $(MDB_INTR) $(MDB_PX)
+	-$(RM) $(KMDB_DIR)/$(KMDB_PCIPSY)
+	-$(RM) $(KMDB_DIR)/$(KMDB_PCISCH)
+	-$(RM) $(KMDB_DIR)/$(KMDB_PX)
+	-cd $(KMDB_DIR); $(SYMLINK) $(KMDB_INTR) $(KMDB_PCIPSY)
+	-cd $(KMDB_DIR); $(SYMLINK) $(KMDB_INTR) $(KMDB_PCISCH)
+	-cd $(KMDB_DIR); $(SYMLINK) $(KMDB_INTR) $(KMDB_PX)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/ip/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1998-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = ip.so
+MDBTGT = kvm
+
+MODSRCS = ip.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/ipc/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = ipc.so
+MDBTGT = kvm
+
+MODSRCS = ipc.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/ipp/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = ipp.so
+MDBTGT = kvm
+
+MODSRCS = ipp.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../Makefile.kmdb.64
+include ../../../Makefile.kmdb
+
+all:	kmdb_modlinktest.o
+lint:	FRC
+
+#
+# Uncomment the following line to enable trap accounting.  A DTLB translation
+# will be added for the trap table, and each handler installed by KMDB will use
+# its padding to keep a trap count.  See kaif_handlers.s.
+#
+#TRAPCOUNT = -DKMDB_TRAPCOUNT
+
+CPPFLAGS += -I../../mdb -I.. -I$(SRC)/uts/sun4 -I$(SRC)/uts/sun4u $(TRAPCOUNT)
+ASFLAGS += -I$(SRC)/uts/sun4 -I$(SRC)/uts/sun4u $(TRAPCOUNT)
+
+install: all
+
+FRC:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/client_handler.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#if !defined(__lint)
+#include <sys/asm_linkage.h>
+#include <sys/privregs.h>
+#endif
+
+/*
+ * The interface for a client programs that call the 64-bit romvec OBP
+ */
+
+#if defined(__lint)
+/* ARGSUSED */
+int
+client_handler(void *cif_handler, void *arg_array)
+{
+	return (0);
+}
+#else	/* __lint */
+
+	ENTRY(client_handler)
+	stmg	%r14,48(%r15)
+	aghi	%r15,-SA(MINFRAME)
+	lgr	%r1,%r2				// Get A(Handler)
+	lgr	%r2,%r3				// Get A(Argument Array)
+	basr	%r14,%r1			// Call handler
+	aghi	%r15,SA(MINFRAME)		
+	lmg	%r14,48(%r15)
+	br	%r14
+	SET_SIZE(client_handler)
+
+#endif	/* __lint */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_asmutil.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,91 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _KAIF_ASMUTIL_H
+#define	_KAIF_ASMUTIL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "mach_asmutil.h"
+
+#ifdef _ASM
+
+/*
+ * Each cpusave buffer has an area set aside for a ring buffer of breadcrumbs.
+ * The following macros manage the buffer.
+ */
+
+/* Advance the ring buffer */
+#define	ADVANCE_CRUMB_POINTER(cpusave, tmp1, tmp2) 	\
+	ld	[cpusave + KRS_CURCRUMBIDX], tmp1;	\
+	cmp	tmp1, KAIF_NCRUMBS - 1;			\
+	bge	1f;					\
+	/* Advance the pointer and index */		\
+	add	tmp1, 1, tmp1;				\
+	st	tmp1, [cpusave + KRS_CURCRUMBIDX];	\
+	ldx	[cpusave + KRS_CURCRUMB], tmp1;		\
+	ba	2f;					\
+	add	tmp1, KRM_SIZE, tmp1;			\
+1:	/* Reset the pointer and index */		\
+	st	%g0, [cpusave + KRS_CURCRUMBIDX];	\
+	add	cpusave, KRS_CRUMBS, tmp1;		\
+2:	stx	tmp1, [cpusave + KRS_CURCRUMB];		\
+	/* Clear the new crumb */			\
+	set	KRM_SIZE, tmp2;				\
+3:	subcc	tmp2, 8, tmp2;				\
+	bg	3b;					\
+	stx	%g0, [tmp1 + tmp2]
+
+/* Set a value in the current breadcrumb buffer */
+#define	ADD_CRUMB(cpusave, offset, value, tmp) 		\
+	ldx	[cpusave + KRS_CURCRUMB], tmp;		\
+	stx	value, [tmp + offset];
+
+#define	ADD_CRUMB_CONST(cpusave, offset, value, tmp1, tmp2) \
+	ldx	[cpusave + KRS_CURCRUMB], tmp1;		\
+	mov	value, tmp2;				\
+	stx	tmp2, [tmp1 + offset]
+
+#define	ADD_CRUMB_FLAG(cpusave, flag, tmp1, tmp2, tmp3) \
+	ldx	[cpusave + KRS_CURCRUMB], tmp1;		\
+	ld	[tmp1 + KRM_FLAG], tmp2;		\
+	set	flag, tmp3;				\
+	or	tmp2, tmp3, tmp2;			\
+	st	tmp2, [tmp1 + KRM_FLAG]
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _KAIF_ASMUTIL_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_handlers.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,240 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <sys/asm_linkage.h>
+#include <sys/machasi.h>
+#include <sys/machtrap.h>
+#include <sys/privregs.h>
+#include <sys/mmu.h>
+
+/*
+ * This file contains the trap handlers that will be copied to kmdb's trap
+ * table.  See kaif_activate.c for the code that does the actual copying.
+ *
+ * The handlers have a debugging feature, enabled when KMDB_TRAPCOUNT is
+ * defined, which allows them to keep a running count of the number of times
+ * a given trap has occurred.  The counter is stored in the padding at the end
+ * of the handler.  Write access is of course required to allow the values to
+ * be updated, so KMDB_TRAPCOUNT also enables the installation of DTLB entries
+ * for each trap table page.  Finally, the code in this file is copied into
+ * the actual location used by the handler, so we can't perform compile-time
+ * counter location calculations.  The calculations are instead performed at
+ * run-time, as A) we generally already derive the table location as part of
+ * the trap processing and B) simplicity is more of a concern than is speed.
+ */
+
+#if defined(lint)
+#include <kmdb/kaif.h>
+#endif /* lint */
+
+#if defined(lint)
+
+#ifdef sun4v
+#else /* sun4v */
+void
+kaif_hdlr_dmiss(void)
+{
+}
+
+void
+kaif_itlb_handler(void)
+{
+}
+#endif /* sun4v */
+#else	/* lint */
+
+#ifdef sun4v
+#else /* sun4v */
+
+	.global	kaif_hdlr_dmiss_patch
+	.global	kaif_hdlr_imiss_patch
+
+	/*
+	 * This routine must be exactly 32 instructions long.
+	 */
+	ENTRY_NP(kaif_hdlr_dmiss)
+	mov	MMU_TAG_ACCESS, %g1
+	ldxa	[%g1]ASI_DMMU, %g1		/* %g1 = addr|ctx */
+	sllx	%g1, TAGACC_CTX_LSHIFT, %g2	/* strip addr */
+	srlx	%g2, TAGACC_CTX_LSHIFT, %g2	/* %g2 = ctx */
+
+	/*
+	 * Use kdi_vatotte to look up the tte.  We don't bother stripping the
+	 * context, as it won't change the tte we get.
+	 */
+kaif_hdlr_dmiss_patch:
+	sethi	%hi(0), %g3	/* set by kaif to kdi_vatotte */
+	or	%g3, %lo(0), %g3
+	jmpl	%g3, %g7	/* uses all regs, ret to %g7, tte or 0 in %g1 */
+	add	%g7, 8, %g7	/* adjust return */
+
+	brz	%g1, 1f
+	nop
+
+	/* 
+	 * kdi_vatotte gave us a TTE to use.  Load it up and head back 
+	 * into the world, but first bump a counter.
+	 */
+#ifdef	KMDB_TRAPCOUNT
+	ldx	[%g7 + 0x40], %g2	/* Trap counter.  See top comment */
+	add	%g2, 1, %g2
+	stx	%g2, [%g7 + 0x40]
+#else
+	nop
+	nop
+	nop
+#endif
+	stxa	%g1, [%g0]ASI_DTLB_IN
+	retry
+
+1:	/* 
+	 * kdi_vatotte didn't give us a tte, which is unfortunate.  We're
+	 * going to need to jump into the debugger so as to allow it to
+	 * handle the trap.  The debugger itself isn't locked into the TLB,
+	 * so we may well incur a TLB miss while trying to get into it.  As
+	 * such, we're going to switch off the MMU globals before setting foot
+	 * into the debugger, thus allowing a TL>1 miss to be handled without
+	 * clobbering our state.  We'll also save off the tag just in case the
+	 * world ends and someone wants to find out what happened.
+	 *
+	 * We will only reach this point at TL=1, as kdi_vatotte will always
+	 * find the TTE for the debugger without missing.
+	 */
+
+#ifdef	KMDB_TRAPCOUNT
+	mov	MMU_TAG_ACCESS, %g1	/* Trap address "counter". */
+	ldxa	[%g1]ASI_DMMU, %g1
+	stx	%g1, [%g7 + 0x48]
+#else
+	nop
+	nop
+	nop
+#endif
+
+	mov	PTSTATE_KERN_COMMON | PSTATE_AG, %g3
+	wrpr	%g3, %pstate
+	sethi	%hi(kaif_dtrap), %g4
+	jmp	%g4 + %lo(kaif_dtrap)
+	nop
+	unimp	0
+	unimp	0	/* counter goes here (base + 0x60) */
+	unimp	0
+	unimp	0	/* miss address goes here (base + 0x68) */
+	unimp	0
+	unimp	0
+	unimp	0
+	unimp	0
+	unimp	0
+	SET_SIZE(kaif_hdlr_dmiss)
+
+	/*
+	 * This routine must be exactly 32 instructions long.
+	 */
+	ENTRY_NP(kaif_hdlr_imiss)
+	rdpr	%tpc, %g1
+	ldxa	[%g0]ASI_IMMU, %g2
+	srlx	%g2, TTARGET_CTX_SHIFT, %g2
+
+kaif_hdlr_imiss_patch:
+	sethi	%hi(0), %g3	/* set by kaif to kdi_vatotte */
+	or	%g3, %lo(0), %g3
+	jmpl	%g3, %g7	/* uses all regs, ret to %g7, tte or 0 in %g1 */
+	add	%g7, 8, %g7	/* adjust return */
+
+	brz	%g1, 1f
+	nop
+
+	/* 
+	 * kdi_vatotte gave us a TTE to use.  Load it up and head back 
+	 * into the world, but first bump a counter.
+	 */
+#ifdef	KMDB_TRAPCOUNT
+	ldx	[%g7 + 0x3c], %g2	/* Trap counter.  See top comment */
+	add	%g2, 1, %g2
+	stx	%g2, [%g7 + 0x3c]
+#else
+	nop
+	nop
+	nop
+#endif
+	stxa	%g1, [%g0]ASI_ITLB_IN
+	retry
+
+1:	/* 
+	 * kdi_vatotte didn't give us a tte, which is unfortunate.  We're
+	 * going to need to jump into the debugger so as to allow it to
+	 * handle the trap.  The debugger itself isn't locked into the TLB,
+	 * so we may well incur a TLB miss while trying to get into it.  As
+	 * such, we're going to switch off the MMU globals before setting foot
+	 * into the debugger, thus allowing a TL>1 miss to be handled without
+	 * clobbering our state.
+	 *
+	 * We will only reach this point at TL=1, as kdi_vatotte will always
+	 * find the TTE for the debugger without missing.
+	 */
+	rdpr	%pstate, %g1
+	or	%g0, PTSTATE_KERN_COMMON | PSTATE_AG, %g2
+	set	kaif_dtrap, %g3
+	jmp	%g3
+	wrpr	%g2, %pstate
+	unimp	0
+	unimp	0
+	unimp	0	/* counter goes here */
+	unimp	0
+	unimp	0
+	unimp	0
+	unimp	0
+	unimp	0
+	unimp	0
+	unimp	0
+	unimp	0
+	unimp	0
+	SET_SIZE(kaif_hdlr_imiss)
+#endif /* sun4v */
+
+	ENTRY_NP(kaif_hdlr_generic)
+#ifdef	KMDB_TRAPCOUNT
+	rd	%pc, %g3		/* Trap counter.  See top comment */
+	ld	[%g3 + 0x1c], %g4
+	add	%g4, 1, %g4
+	st	%g4, [%g3 + 0x1c]
+#else
+	nop
+	nop
+	nop
+	nop
+#endif
+	sethi	%hi(kaif_dtrap), %g3
+	jmp	%g3 + %lo(kaif_dtrap)
+	rdpr	%pstate, %g1
+	unimp	0	/* counter goes here */
+	SET_SIZE(kaif_hdlr_generic)
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_invoke.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,158 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <sys/asm_linkage.h>
+
+#include <mdb/mdb_kreg.h>
+
+/*
+ * Kernel function call invocation
+ */
+
+#if !defined(__lint)
+
+	.section	RODATA
+	.align		8
+
+	/*
+	 * A jump table containing the addresses for register argument copy 
+	 * code.
+	 */
+copyargs:
+	.xword	cp0arg
+	.xword	cp1arg
+	.xword	cp2arg
+	.xword	cp3arg
+	.xword	cp4arg
+	.xword	cp5arg
+copyargsend:
+	.xword	cp6arg
+
+#endif	/* __lint */
+
+#if defined(__lint)
+/*ARGSUSED*/
+uintptr_t
+kaif_invoke(uintptr_t funcva, uint_t argc, const uintptr_t *argv, 
+    kreg_t g6, kreg_t g7)
+{
+	return (0);
+}
+#else
+
+	ENTRY_NP(kaif_invoke)
+
+	save	%sp, -SA(MINFRAME), %sp
+
+	/*
+	 * Will registers suffice, or do we need to put excess args (>6) on the
+	 * stack?
+	 */
+	sub	%i1, 6, %i1	! %i1 is now num regs over 6 (if any)
+	brgz,pn	%i1, savestackargs
+	sllx	%i1, 3, %i1	! (argc - 6) * 8
+
+	/*
+	 * We have fewer than six arguments.  Below, starting at the cp6arg 
+	 * label, we've got code that'll copy these arguments to the out
+	 * registers in descending order (%o5 is copied, then %o4, and so on).
+	 * We only want to move valid arguments, so we'll jump into this copy
+	 * code just before it copies our highest arg.  If we have four args,
+	 * for example, we'll jump to cp4arg.
+	 *
+	 * %i6 is now a negative word-scaled offset, which we can use to
+	 * retrieve the appropriate address from the jump table.  We start at
+	 * bottom of the table, and let the negative offset jump back to the
+	 * correct location.  If we have four arguments, %i1 will be -16.  
+	 * Starting from copyargs+48 (the address of the last slot), we get
+	 * copyargs+32, which contains the address (cp4arg) to be used to copy 
+	 * four arguments.
+	 */
+	setx	copyargsend, %l1, %l0
+	ldx	[%l0 + %i1], %l0
+	jmp	%l0
+	nop
+
+savestackargs:	
+	/*
+	 * We have more than six arguments, and will thus need to allocate space
+	 * for the seventh and beyond on the stack.  %i1 is the number of bytes
+	 * needed to hold the seventh and higher arguments.
+	 */
+
+	/* Allocate swap space - %i1 rounded up to STACK_ALIGN */
+	add	%i1, STACK_ALIGN/2, %g1
+	and	%g1, -STACK_ALIGN, %g1
+	sub	%sp, %g1, %sp
+
+	add	%i2, 6*8, %l0			! %l0 is &argv[6]
+	add	%sp, STACK_BIAS+MINFRAME, %l1	! %l1 is base of stack reg save
+
+	/* 
+	 * Copy arguments to the stack.  %i1 is the offset from the seventh arg
+	 * in argv and the offset from the base of the stack save area.
+	 */
+	sub	%i1, 8, %i1
+1:
+	ldx	[%l0 + %i1], %l2
+	stx	%l2, [%l1 + %i1]
+	brnz,pt	%i1, 1b
+	sub	%i1, 8, %i1
+
+	/*
+	 * Copy the register arguments.  The argc <= 6 case will be jumping to
+	 * one of these labels.
+	 */
+cp6arg:	ldx	[%i2 + 5*8], %o5
+cp5arg:	ldx	[%i2 + 4*8], %o4
+cp4arg:	ldx	[%i2 + 3*8], %o3
+cp3arg:	ldx	[%i2 + 2*8], %o2
+cp2arg:	ldx	[%i2 + 1*8], %o1
+cp1arg:	ldx	[%i2 + 0*8], %o0
+cp0arg:
+
+	mov	%g6, %l0
+	mov	%i3, %g6	! Restore PROC_REG for kernel call
+
+	mov	%g7, %l1
+	mov	%i4, %g7	! Restore THREAD_REG for kernel call
+
+	jmpl	%i0, %o7	! Make call
+	nop
+
+	mov	%l0, %g6
+	mov	%l1, %g7
+
+	ret
+	restore	%g0, %o0, %o0
+
+	SET_SIZE(kaif_invoke)
+	
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_regs.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,111 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _KAIF_REGS_H
+#define	_KAIF_REGS_H
+
+#ifndef _ASM
+#include <sys/types.h>
+#include <sys/regset.h>
+#include <sys/stack.h>
+#include <sys/kdi_impl.h>
+
+#include <mdb/mdb_kreg_impl.h>
+#include <mdb/mdb_target.h>
+#include <mdb/mdb.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	KAIF_CPU_STKSZ	((MINFRAME64 * 20) + STACK_ALIGN64)
+
+#define	KAIF_NCRUMBS	5
+
+#define	KAIF_CRUMB_SRC_OBP	1
+#define	KAIF_CRUMB_SRC_IVEC	2
+#define	KAIF_CRUMB_SRC_MAIN	3
+
+#define	KAIF_CRUMB_F_MAIN_OBPWAPT	0x01
+#define	KAIF_CRUMB_F_MAIN_OBPPENT	0x02
+#define	KAIF_CRUMB_F_MAIN_NORMAL	0x04
+
+#define	KAIF_CRUMB_F_IVEC_REENTER	0x08
+#define	KAIF_CRUMB_F_IVEC_INOBP		0x10
+#define	KAIF_CRUMB_F_IVEC_NORMAL	0x20
+
+#define	KAIF_CRUMB_F_OBP_NORMAL		0x40
+#define	KAIF_CRUMB_F_OBP_REVECT		0x80
+
+#ifndef _ASM
+
+/*
+ * We maintain a ring buffer of bread crumbs for debugging purposes.  The
+ * current buffer pointer is advanced along the ring with each intercepted
+ * trap (debugger entry, invalid memory access, etc).  The structure must have a
+ * size equal to a multiple of 8.
+ */
+typedef struct kaif_crumb {
+	uint64_t krm_src;
+	uint64_t krm_pc;
+	uint64_t krm_tt;
+	uint32_t krm_flag;
+	uint32_t krm_pad;
+} kaif_crumb_t;
+
+/* Keep in sync with kaif_regs.in */
+typedef struct kaif_cpusave {
+	mdb_tgt_gregset_t	krs_gregs;	/* Saved registers */
+	kfpu_t			krs_fpregs;	/* Saved FP registers */
+
+	kreg_t			krs_tstate;	/* Saved %tstate */
+	kreg_t			krs_mmu_pcontext; /* Context # at kmdb entry */
+
+	uint_t			krs_cpu_state;	/* KAIF_CPU_STATE_* */
+	uint_t			krs_cpu_id;	/* this CPU's ID */
+
+	uint64_t		krs_lsucr_save;	/* LSUCR for wapt step */
+	uint32_t		krs_instr_save;	/* OBP instr for wapt step */
+
+	/* Bread crumb ring buffer */
+	uint_t			krs_curcrumbidx; /* Current krs_crumbs idx */
+	kaif_crumb_t		*krs_curcrumb;	/* Current crumb */
+	kaif_crumb_t		krs_crumbs[KAIF_NCRUMBS];  /* Crumbs */
+
+	char			krs_cpustack[KAIF_CPU_STKSZ];
+} kaif_cpusave_t;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _KAIF_REGS_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_resume.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,185 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * System-resumption code.  kaif_resume is called whenever the world, as a whole
+ * or merely a single CPU, is to be resumed.
+ */
+
+#if !defined(__lint)
+#include <sys/asm_linkage.h>
+#include <sys/trap.h>
+#include <sys/machtrap.h>
+#include <sys/mmu.h>
+#include <sys/machasi.h>
+#define _KERNEL
+#include <sys/privregs.h>
+#undef _KERNEL
+#include <sys/machthread.h>
+#include <sys/machparam.h>
+#endif
+
+#if defined(__lint)
+#include <sys/ddi.h>
+#include <sys/sunddi.h>
+#endif
+
+#include <mdb/mdb_kreg.h>
+#include <kmdb/kaif_asmutil.h>
+#include <kmdb/kaif_off.h>
+#include <kmdb/kaif.h>
+
+#if defined(__lint)
+/*ARGSUSED*/
+void
+kaif_resume(int work_required)
+{
+}
+#else /* __lint */
+
+	/*
+	 * Used to start the world back up, as a whole or in part (single-step).
+	 * Arguments:
+	 *    %l5 - the CPU-specific gregs save area
+	 *    %l6 - the CPU-specific save area
+	 */
+	ENTRY_NP(kaif_resume)
+
+	/* globals only from here on out */
+	mov	%l5, %g5
+	mov	%l6, %g6
+
+	/*
+	 * To resume the world, we reverse what we did in startup
+	 */
+
+	/* FP state */
+	add	%g6, KRS_FPREGS, %g4	! %g4 = &cpusave[this_cpuid].krs_fpregs
+
+	ldx	[%g4 + FPU_FPRS], %g2
+	btst	FPRS_FEF, %g2		! was fp enabled?
+	bz,pt	%icc, 1f		! nope drive on...
+	wr	%g2, %fprs		! restore %fprs regardless
+
+	LOAD_FPREGS(%g4)
+	ldx	[%g4 + FPU_FSR], %fsr
+
+1:
+	/* Register windows */
+	GET_NWIN(%g1, %g4);		! %g1 is scratch, %g4 set to nwin-1
+	wrpr	%g4, %cleanwin
+
+	sub	%g4, 1, %g1
+	wrpr	%g1, %cansave
+
+	wrpr	%g0, %otherwin
+	wrpr	%g0, %canrestore
+	wrpr	%g0, %cwp
+	clr	%g2
+
+	ldx	[%g6 + KRS_RWINS], %g3	! %g3 = &cpusave[this_cpuid].krs_wins
+
+1:
+	RESTORE_V9WINDOW(%g3)
+	add	%g2, 1, %g2
+	add	%g3, RWIN_SIZE, %g3
+	cmp	%g2, %g4
+	ble	1b
+	wrpr	%g2, %cwp
+
+	/* Restore various privileged registers */
+	ldx	[%g5 + KREG_OFF(KREG_CWP)], %g4
+	wrpr	%g4, %cwp
+	ldx	[%g5 + KREG_OFF(KREG_OTHERWIN)], %g4
+	wrpr	%g4, %otherwin
+	ldx	[%g5 + KREG_OFF(KREG_CLEANWIN)], %g4
+	wrpr	%g4, %cleanwin
+	ldx	[%g5 + KREG_OFF(KREG_CANSAVE)], %g4
+	wrpr	%g4, %cansave
+	ldx	[%g5 + KREG_OFF(KREG_CANRESTORE)], %g4
+	wrpr	%g4, %canrestore
+	ldx	[%g5 + KREG_OFF(KREG_WSTATE)], %g4
+	wrpr	%g4, %wstate
+
+	ldx	[%g5 + KREG_OFF(KREG_Y)], %g4
+	wr	%g4, %y
+
+	ldx	[%g5 + KREG_OFF(KREG_PIL)], %g4
+	wrpr	%g4, %pil
+
+	/* Set up the return from the trap */
+	wrpr	%g0, 1, %tl
+
+	/*
+	 * Restore the MMU primary context.  
+	 */
+	mov	MMU_PCONTEXT, %g3
+	ldx	[%g6 + KRS_MMU_PCONTEXT], %g4
+	KAIF_DEMAP_TLB_ALL(%g2)
+	stxa	%g4, [%g3]ASI_MMU_CTX
+	membar	#Sync
+
+	ldx	[%g6 + KRS_TSTATE], %g4
+	wrpr	%g4, %tstate
+
+	ldx	[%g5 + KREG_OFF(KREG_PC)], %g4
+	wrpr	%g4, %tpc
+	
+	ldx	[%g5 + KREG_OFF(KREG_NPC)], %g4
+	wrpr	%g4, %tnpc
+
+	/*
+	 * If we're here because of the debugger trap (most likely from 
+	 * kaif_entry), we don't want to jump back to %tpc, since it
+	 * is likely to be the ta that brought us here in the first place.
+	 * We'll test for it here, and we'll leave %xcc untouched until
+	 * the end when we're about to return.
+	 */
+	ldx	[%g5 + KREG_OFF(KREG_TT)], %g4
+	wrpr	%g4, %tt
+	cmp	%g4, ST_KMDB_TRAP|T_SOFTWARE_TRAP
+
+	/* Restore saved globals */
+	ldx	[%g5 + KREG_OFF(KREG_G1)], %g1
+	ldx	[%g5 + KREG_OFF(KREG_G2)], %g2
+	ldx	[%g5 + KREG_OFF(KREG_G3)], %g3
+	ldx	[%g5 + KREG_OFF(KREG_G4)], %g4
+	ldx	[%g5 + KREG_OFF(KREG_G6)], %g6
+	ldx	[%g5 + KREG_OFF(KREG_G7)], %g7
+	be	%xcc, 1f			! the trap type check, above
+	ldx	[%g5 + KREG_OFF(KREG_G5)], %g5
+
+	retry
+1:
+	done
+
+	SET_SIZE(kaif_resume)
+
+#endif	/* __lint */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/kaif_startup.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,854 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#if !defined(__lint)
+#include <sys/asm_linkage.h>
+#include <sys/trap.h>
+#include <sys/mmu.h>
+#include <sys/machasi.h>
+#include <sys/intreg.h>
+#define	_KERNEL
+#include <sys/privregs.h>
+#undef _KERNEL
+#include <sys/machthread.h>
+#include <sys/machtrap.h>
+#include <sys/machparam.h>
+#endif
+
+#include <mdb/mdb_kreg_impl.h>
+#include <kmdb/kaif_regs.h>
+#include <kmdb/kaif_off.h>
+#include <kmdb/kaif.h>
+#include <kmdb/kaif_asmutil.h>
+
+#define	KAIF_CPU_INDEX				\
+	set	mdb, %g1;			\
+	ldx	[%g1 + MDB_KDI], %g1;		\
+	ldx	[%g1 + MKDI_CPU_INDEX], %g1;	\
+	set	1f, %g7;			\
+	jmp	%g1;				\
+	nop;					\
+1:
+
+#define	KAIF_CPU_GETADDR_TL1			\
+	set	kaif_cpusave_getaddr, %g6;	\
+	sethi	%hi(1f), %g7;			\
+	jmp	%g6;				\
+	or	%g7, %lo(1f), %g7;		\
+1:
+
+#define	KAIF_COPY_KREG(src, tgt, idx, tmp)	\
+	ldx	[src + KREG_OFF(idx)], tmp;	\
+	stx	tmp, [tgt + KREG_OFF(idx)]
+
+#if !defined(__lint)
+
+	/*
+	 * Calculate the address of the save area for the current CPU.  This
+	 * would be a macro, but for need to call platform-specific CPU ID
+	 * routines.  The kernel provides, via the KDI, a TL=1-safe "function"
+	 * for CPU ID retrieval, which we call here.  The retrieval code returns
+	 * the ID in %g1, and is allowed to clobber %g2.  It also assumes that
+	 * the return address is in %g7.
+	 *
+	 * Arguments:
+	 *   %g7 - return address
+	 * Returns:
+	 *   %g6 - address of save area
+	 *
+	 * %g4 will be preserved.
+	 */
+	ENTRY_NP(kaif_cpusave_getaddr)
+
+	mov	%g7, %g5	! we'll need %g7 for the ID retriever
+	KAIF_CPU_INDEX		! index returned in %g1, clobbers %g2, %g7
+
+	set	KRS_SIZE, %g2
+	mulx	%g1, %g2, %g2
+	set	kaif_cpusave, %g6
+	ldx	[%g6], %g6
+
+	jmp	%g5		! return to caller-provided address
+	add	%g6, %g2, %g6
+
+	SET_SIZE(kaif_cpusave_getaddr)
+
+	/*
+	 * Save volatile state - state that won't be available when we switch
+	 * back to TL=0.  We're currently at TL=1, and are on either the
+	 * alternate or interrupt globals, so we'll need to do a bit of a
+	 * dance in order to save the normal globals.
+	 *
+	 * NOTE: This routine and kaif_trap_obp must be equivalent.
+	 *
+	 * Parameters:
+	 *  %g7 - return address
+	 *  %g6 - cpusave area
+	 *  %g4 - the %pstate value to get us back to our current globals set
+	 *  %g4 not applicable on sun4v as it uses %gl
+	 */
+
+	ENTRY_NP(kaif_save_tl1_state)
+
+	add	%g6, KRS_GREGS + GREG_KREGS, %g5
+
+	rdpr	%tstate, %g2
+	stx	%g2, [%g6 + KRS_TSTATE]
+	rdpr	%tpc, %g2
+	stx	%g2, [%g5 + KREG_OFF(KREG_PC)]
+	rdpr	%tnpc, %g2
+	stx	%g2, [%g5 + KREG_OFF(KREG_NPC)]
+	rdpr	%tt, %g2
+	stx	%g2, [%g5 + KREG_OFF(KREG_TT)]
+
+	/*
+	 * Switch over to the normal globals, so we can save them.  We'll need
+	 * our gregs pointer and the return %pstate value, so stash them in
+	 * registers that will be available to us on both sides.
+	 *
+	 * NOTE: Global register sets is selected by %gl register in sun4v.
+	 *	 There is no PSTATE.AG bit in sun4v to select global set.
+	 *       - Normal globals is the set when %gl = 0.
+	 *	 - TL1 globals is the set when %gl = 1.
+	 */
+	SWITCH_TO_NORMAL_GLOBALS();	/* saves %o5 and %o4 */
+	stx	%g1, [%o5 + KREG_OFF(KREG_G1)]
+	stx	%g2, [%o5 + KREG_OFF(KREG_G2)]
+	stx	%g3, [%o5 + KREG_OFF(KREG_G3)]
+	stx	%g4, [%o5 + KREG_OFF(KREG_G4)]
+	stx	%g5, [%o5 + KREG_OFF(KREG_G5)]
+	stx	%g6, [%o5 + KREG_OFF(KREG_G6)]
+	stx	%g7, [%o5 + KREG_OFF(KREG_G7)]
+
+	/*
+	 * Restore saved %o registers and return.
+	 */
+	SWITCH_TO_TL1_GLOBALS_AND_RET();	/* restores %o5 and %o4 */
+	SET_SIZE(kaif_save_tl1_state)
+
+	/*
+	 * Save the remaining state, and prepare to enter the debugger.
+	 */
+
+	ENTRY_NP(kaif_trap_common)
+
+	/* Make sure the world is as it should be */
+	wrpr	%g0, PTSTATE_KERN_COMMON, %pstate
+	wrpr	%g0, %tl
+
+	SET_GL(0);
+	set	1f, %g7
+	set	kaif_cpusave_getaddr, %g6
+	jmp	%g6
+	nop
+1:	/* CPU save area address is now in %g6 */
+	add	%g6, KRS_GREGS + GREG_KREGS, %g5
+
+	ldx	[%g5 + KREG_OFF(KREG_PC)], %g4
+	ADD_CRUMB(%g6, KRM_PC, %g4, %g1)
+	ldx	[%g5 + KREG_OFF(KREG_TT)], %g4
+	ADD_CRUMB(%g6, KRM_TT, %g4, %g1)
+
+	/*
+	 * The %tba is special.  With normal entry, we're on the same trap table
+	 * the kernel is using (this could be OBP's table if we're early enough
+	 * in the boot process).  We want to save it, but we don't want to
+	 * switch to OBP's table just yet, as we need to ensure that only one
+	 * CPU uses OBP's table at a time.  We do this by waiting until we've
+	 * selected the master before switching.
+	 *
+	 * Single-step is a bit different.  Everything about the CPU's state is
+	 * as it should be, with the exception of %tba.  We need to step on
+	 * OBP's trap table, so we didn't restore %tba during resume.  The save
+	 * state area still contains the real %tba value - the one we had when
+	 * we first entered the debugger.  We don't want to clobber that, so
+	 * we'll only save %tba if we're not stepping.
+	 */
+
+	set	kaif_master_cpuid, %g1
+	ld	[%g1], %g1
+	ld	[%g6 + KRS_CPU_ID], %g2
+	cmp	%g1, %g2
+	be	1f
+	nop
+
+	rdpr	%tba, %g2
+	stx	%g2, [%g5 + KREG_OFF(KREG_TBA)]
+
+1:
+	rdpr	%pil, %g4
+	stx	%g4, [%g5 + KREG_OFF(KREG_PIL)]
+	wrpr	%g0, 14, %pil
+
+	rd	%y, %g4
+	stx	%g4, [%g5 + KREG_OFF(KREG_Y)]
+
+	/*
+	 * Save window state and windows
+	 */
+	rdpr	%cwp, %g4
+	stx	%g4, [%g5 + KREG_OFF(KREG_CWP)]
+	rdpr	%otherwin, %g4
+	stx	%g4, [%g5 + KREG_OFF(KREG_OTHERWIN)]
+	rdpr	%cleanwin, %g4
+	stx	%g4, [%g5 + KREG_OFF(KREG_CLEANWIN)]
+	rdpr	%cansave, %g4
+	stx	%g4, [%g5 + KREG_OFF(KREG_CANSAVE)]
+	rdpr	%canrestore, %g4
+	stx	%g4, [%g5 + KREG_OFF(KREG_CANRESTORE)]
+	rdpr	%wstate, %g4
+	stx	%g4, [%g5 + KREG_OFF(KREG_WSTATE)]
+
+	GET_NWIN(%g1, %g4);	! %g1 is scratch, %g4 set to nwin-1
+
+	wrpr	%g4, %cleanwin
+
+	sub	%g4, 1, %g1
+	wrpr	%g1, %cansave
+	wrpr	%g0, %otherwin
+	wrpr	%g0, %canrestore
+	wrpr	%g0, %cwp
+
+	clr	%g2
+	ldx	[%g6 + KRS_RWINS], %g3
+1:	SAVE_V9WINDOW(%g3)
+	inc	%g2
+	add	%g3, RWIN_SIZE, %g3
+	cmp	%g2, %g4
+	ble	1b
+	wrpr	%g2, %cwp
+
+	/*
+	 * Save FP state
+	 */
+	add	%g6, KRS_FPREGS, %g4
+	rd	%fprs, %g1
+	stx	%g1, [%g4 + FPU_FPRS]
+	btst	FPRS_FEF, %g1		! is FP enabled?
+	bz	%icc, 1f		! if not, don't save FP regs
+	wr	%g0, FPRS_FEF, %fprs	! enable FP
+
+	STORE_FPREGS(%g4)
+	stx	%fsr, [%g4 + FPU_FSR]
+
+1:	/*
+	 * We're almost done saving state.  Go back to the starting window, and
+	 * switch to the CPU-specific stack.  We'll use this stack to finish
+	 * saving state, and for the next stage of debugger startup/resumption,
+	 * when we designate the master.  The slaves will continue to run on
+	 * this stack until released or turned into masters.
+	 */
+	ldx	[%g5 + KREG_OFF(KREG_CWP)], %g4
+	wrpr	%g4, %cwp
+
+	set	KRS_CPUSTACK + KAIF_CPU_STKSZ - 1, %g1
+	add	%g1, %g6, %g1
+	and	%g1, -STACK_ALIGN64, %g1
+	sub	%g1, SA64(MINFRAME) + V9BIAS64, %sp
+	clr	%fp
+	save	%sp, -SA64(MINFRAME64), %sp
+
+	/*
+	 * We'll need to access cpusave and gregs for our final state-saving,
+	 * so stash them where they won't be clobbered by function calls.
+	 */
+	mov	%g6, %l6
+	mov	%g5, %l5
+
+	/*
+	 * Now that we have a stack, we can save %stick.  %stick isn't present
+	 * on all of our target machines, so we have to use the KDI to fetch the
+	 * current value (if any).  We save %tick here too, because they get
+	 * lonely if separated.
+	 */
+	rd	%tick, %g4
+	stx	%g4, [%l5 + KREG_OFF(KREG_TICK)]
+
+	call	kmdb_kdi_get_stick
+	add	%l5, KREG_OFF(KREG_STICK), %o0
+	brnz	%o0, 1f
+	nop
+
+	/*
+	 * We found %stick.  Set the %stick-found flag.
+	 */
+	ld	[%l5 + GREG_FLAGS], %g1
+	or	%g1, MDB_V9GREG_F_STICK_VALID, %g1
+	st	%g1, [%l5 + GREG_FLAGS]
+
+1:	/*
+	 * Enter the next phase of debugger startup
+	 */
+	call	kaif_debugger_entry
+	mov	%l6, %o0
+
+	ba,a	kaif_resume	! expects valid %l5, %l6
+
+	/*NOTREACHED*/
+
+	SET_SIZE(kaif_trap_common)
+
+#endif	/* !__lint */
+
+	/*
+	 * The primary debugger-entry routine.  This routine is the trap handler
+	 * for programmed entry, watchpoints, and breakpoints, and is entered at
+	 * TL=1, on the kernel's trap table, with PSTATE.AG set.  It is used in
+	 * the following cases:
+	 *
+	 * 1. (common case) - intentional entry by a CPU intending to be the
+	 *    master.  The CPU may have encountered a watchpoint, a breakpoint,
+	 *    or a programmed entry trap, and is *NOT* coming from OBP.  The CPU
+	 *    is allowed direct entry into the debugger.
+	 *
+	 * 2. A CPU was cross-called into kaif_slave_entry while executing in 
+	 *    OBP.  The CPU was released, but a programmed entry trap was 
+	 *    activated, designed to be encountered when the cross-called CPU
+	 *    returned from OBP.  The CPU is allowed to enter the debugger.  We
+	 *    don't know how many other CPUs need the PROM-return trap, so we'll
+	 *    leave it active until everyone arrives.
+	 *
+	 * The remaining cases deal with instances where OBP got in the way.
+	 * We can't allow a CPU into the debugger if it is currently executing
+	 * in OBP, as chaos would ensue (OBP isn't re-entrant).  As such, we
+	 * have to ask the CPU to come back when it has finished with OBP (or
+	 * vice versa).  Depending on the circumstances, we'll need to dance
+	 * around it.
+	 *
+	 * 3. A bystander CPU runs into the PROM-return trap described above
+	 *    before being cross-called.  We'll let it into the debugger now, as
+	 *    it would have ended up here anyway.
+	 *
+	 * 4. An innocent CPU encounters a watchpoint while executing in OBP.
+	 *    We can't let the CPU into the debugger for the reasons given
+	 *    above, so we'll need to ignore the watchpoint.  We disable
+	 *    watchpoints, place a programmed-entry trap at %npc, and release
+	 *    the CPU.
+	 *
+	 * 5. The stepping CPU described in case 4 encounters the programmed-
+	 *    entry trap.  We'll remove the trap, re-enable watchpoints, and
+	 *    send the CPU on its way.
+	 *
+	 * 6. Someone encounters a breakpoint or a programmed-entry trap in OBP.
+	 *    We can step through watchpoints, as the text hasn't been touched.
+	 *    With breakpoints and programmed-entry traps, however, chances are
+	 *    high that someone replaced an instruction in the text with the
+	 *    trap instruction.  We don't know where they stashed the
+	 *    (presumably) saved instruction, so we can't step through it.  This
+	 *    is a very unlikely scenario, so we're going to throw up our hands,
+	 *    and will attempt to trigger a panic.
+	 */
+
+#if defined(__lint)
+void
+kaif_ktrap(void)
+{
+}
+#else	/* __lint */
+
+	ENTRY_NP(kaif_ktrap)
+
+	set	1f, %g7
+	set	kaif_cpusave_getaddr, %g6
+	jmp	%g6
+	nop
+1:	/* CPU save area address is now in %g6 */
+
+	ADVANCE_CRUMB_POINTER(%g6, %g1, %g2)
+	ADD_CRUMB_CONST(%g6, KRM_SRC, KAIF_CRUMB_SRC_MAIN, %g1, %g2)
+
+	rdpr	%tpc, %g2
+	set	OFW_START_ADDR, %g1
+	cmp	%g2, %g1
+	bl	main_not_in_obp
+	nop
+
+	set	OFW_END_ADDR, %g1
+	cmp	%g2, %g1
+	bg	main_not_in_obp
+	nop
+
+	/*
+	 * The CPU was in OBP when it encountered the trap that sent it here.
+	 * See cases 3-6 above.
+	 */
+	rdpr	%tt, %g4
+	cmp	%g4, T_PA_WATCHPOINT
+	be	main_obp_wapt
+
+	cmp	%g4, T_VA_WATCHPOINT
+	be	main_obp_wapt
+
+	cmp	%g4, T_SOFTWARE_TRAP|ST_KMDB_TRAP
+	be	main_obp_progent
+
+	cmp	%g4, T_SOFTWARE_TRAP|ST_BREAKPOINT
+	be	main_obp_breakpoint
+	nop
+
+	/* This shouldn't happen - all valid traps should be checked above */
+1:	ldx	[%g0], %g0
+	ba,a	1b
+
+	/* Cases 1 and 2 - head into the debugger, via the state-saver */
+main_not_in_obp:
+	ADD_CRUMB_FLAG(%g6, KAIF_CRUMB_F_MAIN_NORMAL, %g1, %g2, %g3)
+
+	/* A formality - we know we came from kernel context */
+	mov	MMU_PCONTEXT, %g3
+	ldxa	[%g3]ASI_MMU_CTX, %g2	! ASI_MMU_CTX == ASI_DMMU for sun4u
+	stx	%g2, [%g6 + KRS_MMU_PCONTEXT]
+	KAIF_DEMAP_TLB_ALL(%g4)
+	stxa	%g0, [%g3]ASI_MMU_CTX	! ASI_MMU_CTX == ASI_DMMU for sun4u
+	membar	#Sync
+
+	set	kaif_trap_common, %g7
+
+	KAIF_SAVE_TL1_STATE();
+	/*NOTREACHED*/
+
+	/* Case 4 - watchpoint in OBP - step over it */
+main_obp_wapt:
+	ADD_CRUMB_FLAG(%g6, KAIF_CRUMB_F_MAIN_OBPWAPT, %g1, %g2, %g3)
+
+#ifndef sun4v
+	/* Turn off watchpoints */
+	ldxa	[%g0]ASI_LSU, %g4
+	stx	%g4, [%g6 + KRS_LSUCR_SAVE]
+	setx	KAIF_LSUCTL_WAPT_MASK, %g1, %g3
+	andn	%g4, %g3, %g4
+	stxa	%g4, [%g0]ASI_LSU
+#endif /* sun4v */
+
+	/*
+	 * SPARC only supports data watchpoints, and we know that only certain
+	 * types of instructions, none of which include branches, can trigger
+	 * memory reads.  As such, we can simply place a breakpoint at %npc.
+	 */
+	rdpr	%tnpc, %g4
+	ld	[%g4], %g3
+	st	%g3, [%g6 + KRS_INSTR_SAVE]
+	set	0x91d0207d, %g3	! ta ST_KMDB_TRAP
+	st	%g3, [%g4]
+	flush	%g4
+	membar	#Sync
+
+	/* Back into the pool */
+	retry
+
+	/* Case 5 - programmed entry from wapt step - restore and resume */
+main_obp_progent:
+	ADD_CRUMB_FLAG(%g6, KAIF_CRUMB_F_MAIN_OBPPENT, %g1, %g2, %g3)
+
+	rdpr	%tpc, %g4
+	ld	[%g6 + KRS_INSTR_SAVE], %g3
+	brz	%g3, main_obp_fail ! we don't have any open wapt steps
+	nop
+
+	st	%g3, [%g4]
+	membar	#Sync
+	st	%g0, [%g6 + KRS_INSTR_SAVE]
+
+	/* XXX I$ invalidate? */
+
+#ifndef sun4v
+	ldx	[%g6 + KRS_LSUCR_SAVE], %g4
+	stxa	%g4, [%g0]ASI_LSU
+#endif /* sun4v */
+
+	/* Restored - throw it back */
+	retry
+
+	/* Case 6 - breakpoint or unclaimed programmed entry */
+main_obp_breakpoint:
+main_obp_fail:
+	ldx	[%g0], %g0
+	ba,a	main_obp_fail
+
+	SET_SIZE(kaif_ktrap)
+
+#endif	/* __lint */
+
+	/*
+	 * The target for slave-stopping cross calls.  This routine is entered at
+	 * TL=1, on the kernel's trap table, with PSTATE.IG set.  CPUs entering
+	 * this handler will fall into one of the following categories:
+	 *
+	 * 1. (common case) - the CPU was not executing in OBP when it entered
+	 *    this routine.  It will be allowed direct entry into the debugger.
+	 *
+	 * 2. The CPU had already entered the debugger, and was spinning in the
+	 *    slave loop (at TL=0) when it was cross-called by the debugger's
+	 *    world-stopper.  This could happen if two CPUs encountered
+	 *    breakpoints simultaneously, triggering a race to become master.
+	 *    One would lose, and would already be in the slave loop when the
+	 *    master started trying to stop the world.  The CPU is already where
+	 *    it is supposed to be, so we ignore the trap.
+	 *
+	 * 3. The CPU was executing in OBP.  We can't allow it to go directly
+	 *    into OBP (see the kaif_ktrap comment), but we want to grab it when
+	 *    it leaves OBP.  Arm the PROM-return programmed entry trap and
+	 *    release the CPU.
+	 */
+
+#if defined(__lint)
+void
+kaif_slave_entry(void)
+{
+}
+#else	/* __lint */
+
+	ENTRY_NP(kaif_slave_entry)
+
+	/*
+	 * We may have arrived from userland.  We need to be in kernel context
+	 * before we can save state, so we'll stash the current value in %g4
+	 * until we've calculated the save address and have decided that we're
+	 * heading into the debugger.
+	 *
+	 * %g4 is used to hold the entry MMU context until we decide whether to
+	 * return or re-enter the debugger.
+	 */
+	mov	MMU_PCONTEXT, %g3
+	ldxa	[%g3]ASI_MMU_CTX, %g4
+	KAIF_DEMAP_TLB_ALL(%g1)
+	stxa	%g0, [%g3]ASI_MMU_CTX
+	membar	#Sync
+
+	set	1f, %g7
+	set	kaif_cpusave_getaddr, %g6
+	jmp	%g6		! is not to alter %g4
+	nop
+1:	/* CPU save area address is now in %g6 */
+
+	ADVANCE_CRUMB_POINTER(%g6, %g1, %g2)
+	ADD_CRUMB_CONST(%g6, KRM_SRC, KAIF_CRUMB_SRC_IVEC, %g1, %g2)
+
+	ld	[%g6 + KRS_CPU_STATE], %g5
+	cmp	%g5, KAIF_CPU_STATE_NONE
+	be,a	ivec_not_already_in_debugger
+
+	/* Case 2 - CPU was already stopped, so ignore this cross call */
+	ADD_CRUMB_FLAG(%g6, KAIF_CRUMB_F_IVEC_REENTER, %g1, %g2, %g3)
+
+	/* Restore MMU_PCONTEXT, which we set on the way in */
+	mov	MMU_PCONTEXT, %g3
+	KAIF_DEMAP_TLB_ALL(%g2)
+	stxa	%g4, [%g3]ASI_MMU_CTX
+	membar	#Sync
+
+	retry
+
+ivec_not_already_in_debugger:
+	brnz	%g4, ivec_not_in_obp	/* OBP runs in kernel context */
+	nop
+
+	/* Were we in OBP's memory range? */
+	rdpr	%tpc, %g2
+	set	OFW_START_ADDR, %g1
+	cmp	%g2, %g1
+	bl	ivec_not_in_obp
+	nop
+
+	set	OFW_END_ADDR, %g1
+	cmp	%g2, %g1
+	bg	ivec_not_in_obp
+	nop
+
+	/* Case 3 - CPU in OBP - arm return trap, release the CPU */
+	ADD_CRUMB_FLAG(%g6, KAIF_CRUMB_F_IVEC_INOBP, %g1, %g2, %g3)
+
+	set	kaif_promexitarmp, %g1
+	ldx	[%g1], %g1
+	mov	1, %g2
+	st	%g2, [%g1]
+
+	/* We were already in kernel context, so no need to restore it */
+
+	retry
+
+	/* Case 1 - head into debugger, via the state-saver */
+ivec_not_in_obp:
+	ADD_CRUMB_FLAG(%g6, KAIF_CRUMB_F_IVEC_NORMAL, %g1, %g2, %g3)
+
+	stx	%g4, [%g6 + KRS_MMU_PCONTEXT]
+
+	set	kaif_trap_common, %g7
+
+	KAIF_SAVE_TL1_STATE_SLAVE();
+
+	/*NOTREACHED*/
+
+	SET_SIZE(kaif_slave_entry)
+
+#endif
+
+	/*
+	 * The trap handler used when we're on OBP's trap table, which is used
+	 * during initial system startup, while the debugger itself is
+	 * executing, and when we're single-stepping.  When a trap occurs that
+	 * it can't handle, OBP will execute our Forth word (kmdb_callback).
+	 * Our word saves TL1 state, much as kaif_save_tl1_state does for the
+	 * other handlers.  kmdb_callback will then cause control to be
+	 * transferred to this routine.
+	 *
+	 * CPUs entering this routine will fall into the following categories:
+	 *
+	 * 1. The system is booting, and we encountered a trap that OBP couldn't
+	 *    handle.  We save the CPU's state, and let it into the debugger.
+	 *
+	 * 2. We were single-stepping this CPU, causing it to encounter one of
+	 *    the breakpoint traps we installed for stepping.  We save the CPU's
+	 *    state, and let it back into the debugger.
+	 *
+	 * 3. We took a trap while executing in the debugger.  Before saving
+	 *    this CPU's state in the CPU-specific save area, we will let the
+	 *    debugger handle the trap.  If the trap resulted from a debugger
+	 *    problem, and if the user decides to use the debugger to debug
+	 *    itself, we'll overwrite the existing state with the state saved
+	 *    by the Forth word, after which we'll let the CPU enter the
+	 *    debugger.
+	 *
+	 * NOTE: The Forth word and the copying code here *must* be kept
+	 * in sync with kaif_save_tl1_state.
+	 */
+
+#if defined(__lint)
+void
+kaif_trap_obp(void)
+{
+}
+#else	/* __lint */
+
+	ENTRY_NP(kaif_trap_obp)
+
+	set	1f, %g7
+	set	kaif_cpusave_getaddr, %g6
+	jmp	%g6
+	nop
+1:	/* CPU save area address is now in %g6 */
+	add	%g6, KRS_GREGS + GREG_KREGS, %g5
+
+	ADVANCE_CRUMB_POINTER(%g6, %g1, %g2)
+	ADD_CRUMB_CONST(%g6, KRM_SRC, KAIF_CRUMB_SRC_OBP, %g1, %g2)
+	ADD_CRUMB_FLAG(%g6, KAIF_CRUMB_F_OBP_NORMAL, %g1, %g2, %g3)
+
+	set	kaif_cb_save, %g4
+	add	%g4, KRS_GREGS + GREG_KREGS, %g4
+	ldx	[%g4 + KREG_OFF(KREG_PC)], %g1
+	ADD_CRUMB(%g6, KRM_PC, %g1, %g2)
+	ldx	[%g4 + KREG_OFF(KREG_TT)], %g1
+	ADD_CRUMB(%g6, KRM_TT, %g1, %g2)
+
+	ALTENTRY(kaif_trap_obp_saved)
+
+	/*
+	 * Are we here because of a trap we took while running the debugger, or
+	 * because of one we took while executing kernel code?
+	 */
+	set	kaif_dseg, %g1
+	ldx	[%g1], %g1
+	cmp	%sp, %g1
+	bl	obp_normal_entry
+	nop
+
+	set	kaif_dseg_lim, %g1
+	ldx	[%g1], %g1
+	cmp	%sp, %g1
+	bg	obp_normal_entry
+	nop
+
+	/*
+	 * The debugger fault code will need access to saved copies of the outs
+	 * and %y if the user elects to panic.  We'll also need the saved outs if
+	 * they decide to debug the fault with the debugger, as we'll have 
+	 * trashed the outs while asking the user how to handle the fault.
+	 */
+	set	kaif_cb_save, %g4
+	add	%g4, KRS_GREGS + GREG_KREGS, %g4
+	rd	%y, %g2
+	stx	%g2, [%g4 + KREG_OFF(KREG_Y)]
+	stx	%o0, [%g4 + KREG_OFF(KREG_O0)]
+	stx	%o1, [%g4 + KREG_OFF(KREG_O1)]
+	stx	%o2, [%g4 + KREG_OFF(KREG_O2)]
+	stx	%o3, [%g4 + KREG_OFF(KREG_O3)]
+	stx	%o4, [%g4 + KREG_OFF(KREG_O4)]
+	stx	%o5, [%g4 + KREG_OFF(KREG_O5)]
+	stx	%o6, [%g4 + KREG_OFF(KREG_O6)]
+	stx	%o7, [%g4 + KREG_OFF(KREG_O7)]
+
+	/*
+	 * Receipt of an XIR while on the debugger's stack is likely to mean
+	 * that something has gone very wrong in the debugger.  Our safest
+	 * course of action is to bail out to OBP, thus preserving as much state
+	 * as we can.
+	 */
+	ldx	[%g4 + KREG_OFF(KREG_TT)], %g1
+	cmp	%g1, T_XIR
+	bne	1f
+	nop
+
+	call	prom_enter_mon
+	nop
+
+1:
+	/*
+	 * We're still on the debugger's stack, as we were when we took the
+	 * fault.  Re-arm the Forth word and transfer control to the debugger.
+	 */
+	call	kaif_prom_rearm
+	nop
+
+	KAIF_CPU_INDEX		! index returned in %g1, clobbers %g2, %g7
+	mov	%g1, %o4
+
+	set	kaif_cb_save, %g5
+	ldx	[%g5 + KREG_OFF(KREG_TT)], %o0
+	ldx	[%g5 + KREG_OFF(KREG_PC)], %o1
+	ldx	[%g5 + KREG_OFF(KREG_NPC)], %o2
+	call	kmdb_dpi_handle_fault
+	mov	%sp, %o3
+
+	/*
+	 * If we return from kmdb_dpi_handle_fault, the trap was due to a
+	 * problem in the debugger, and the user has elected to diagnose it
+	 * using the debugger.  When we pass back into the normal kaif_trap_obp
+	 * flow, we'll save the debugger fault state over the state saved when
+	 * we initially entered the debugger.  Debugger fault handling trashed
+	 * the out registers, so we'll need to restore them before returning
+	 * to the normal flow.
+	 */
+
+	set	kaif_cb_save, %g4
+	ldx	[%g4 + KREG_OFF(KREG_O0)], %o0
+	ldx	[%g4 + KREG_OFF(KREG_O1)], %o1
+	ldx	[%g4 + KREG_OFF(KREG_O2)], %o2
+	ldx	[%g4 + KREG_OFF(KREG_O3)], %o3
+	ldx	[%g4 + KREG_OFF(KREG_O4)], %o4
+	ldx	[%g4 + KREG_OFF(KREG_O5)], %o5
+	ldx	[%g4 + KREG_OFF(KREG_O6)], %o6
+	ldx	[%g4 + KREG_OFF(KREG_O7)], %o7
+
+obp_normal_entry:
+
+	set	1f, %g7
+	set	kaif_cpusave_getaddr, %g6
+	jmp	%g6
+	nop
+1:	/* CPU save area address is now in %g6 */
+	add	%g6, KRS_GREGS + GREG_KREGS, %g5
+
+	/*
+	 * Register state has been saved in kaif_cb_save.  Now that we're sure
+	 * we're going into the debugger using this state, copy it to the CPU-
+	 * specific save area.
+	 */
+
+	set	kaif_cb_save, %g4
+	add	%g4, KRS_GREGS + GREG_KREGS, %g3
+
+	KAIF_COPY_KREG(%g3, %g5, KREG_PC, %g1)
+	KAIF_COPY_KREG(%g3, %g5, KREG_NPC, %g1)
+	KAIF_COPY_KREG(%g3, %g5, KREG_G1, %g1)
+	KAIF_COPY_KREG(%g3, %g5, KREG_G2, %g1)
+	KAIF_COPY_KREG(%g3, %g5, KREG_G3, %g1)
+	KAIF_COPY_KREG(%g3, %g5, KREG_G4, %g1)
+	KAIF_COPY_KREG(%g3, %g5, KREG_G5, %g1)
+	KAIF_COPY_KREG(%g3, %g5, KREG_G6, %g1)
+	KAIF_COPY_KREG(%g3, %g5, KREG_G7, %g1)
+	KAIF_COPY_KREG(%g3, %g5, KREG_TT, %g1)
+
+	ldx	[%g4 + KRS_TSTATE], %g1
+	stx	%g1, [%g6 + KRS_TSTATE]
+
+	/* A formality */
+	mov	MMU_PCONTEXT, %g3
+	ldxa	[%g3]ASI_MMU_CTX, %g2
+	stx	%g2, [%g6 + KRS_MMU_PCONTEXT]
+	KAIF_DEMAP_TLB_ALL(%g4)
+	stxa	%g0, [%g3]ASI_MMU_CTX
+	membar	#Sync
+
+	ba,a	kaif_trap_common
+
+	SET_SIZE(kaif_trap_obp_saved)
+	SET_SIZE(kaif_trap_obp)
+
+#endif	/* __lint */
+
+#if defined(lint)
+void
+kaif_dtrap_dprot(void)
+{
+}
+#else   /* lint */
+
+	/*
+	 * This routine is used to handle all "failed" traps.  A trap is
+	 * considered to have failed if it was not able to return to the code
+	 * that caused the trap.  A DTLB miss handler, for example, fails if
+	 * it can't find a translation for a given address.  Some traps always
+	 * fail, because the thing that caused the trap is an actual problem
+	 * that can't be resolved by the handler.  Examples of these include
+	 * alignment and DTLB protection faults.
+	 */
+
+	ENTRY_NP(kaif_dtrap)
+
+	SET_PSTATE_COMMON_AG(%g1);
+	SET_GL(1);		/* set %gl = 1 */
+
+	KAIF_CPU_GETADDR_TL1	/* uses label 1, %g1, %g2, %g7, ret in %g6 */
+
+	ADVANCE_CRUMB_POINTER(%g6, %g1, %g2)
+	ADD_CRUMB_CONST(%g6, KRM_SRC, KAIF_CRUMB_SRC_OBP, %g1, %g2)
+	ADD_CRUMB_FLAG(%g6, KAIF_CRUMB_F_OBP_REVECT, %g1, %g2, %g3)
+
+	rdpr	%tt, %g1
+	ADD_CRUMB(%g6, KRM_TT, %g1, %g2)
+	rdpr	%tpc, %g1
+	ADD_CRUMB(%g6, KRM_PC, %g1, %g2)
+
+	set	kaif_cb_save, %g6
+
+	set	1f, %g7
+	ba	kaif_save_tl1_state
+	rdpr	%pstate, %g4
+
+1:	wrpr	%g0, PTSTATE_KERN_COMMON, %pstate
+	wrpr	%g0, %tl
+	SET_GL(0);
+
+	ba	kaif_trap_obp_saved
+	nop
+
+	SET_SIZE(kaif_dtrap)
+
+#endif	/* lint */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/kmdb_setcontext.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,79 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <sys/asm_linkage.h>
+#include <sys/regset.h>
+
+#if defined(__lint)
+#include <ucontext.h>
+#endif
+
+#include "kmdb_context_off.h"
+
+#define	UC_GREG(name)	(UC_MCTX + MCTX_GREGS + (name * MCTX_GREGS_INCR))
+
+#if defined(__lint)
+/*ARGSUSED*/
+int
+kmdb_setcontext(ucontext_t *ucp)
+{
+	return (0);
+}
+#else
+
+	ENTRY(kmdb_setcontext)
+	flushw
+
+	mov	%o0, %g7
+
+	ldx	[%g7 + UC_GREG(REG_O0)], %o0
+	ldx	[%g7 + UC_GREG(REG_O1)], %o1
+	ldx	[%g7 + UC_GREG(REG_O2)], %o2
+	ldx	[%g7 + UC_GREG(REG_O3)], %o3
+	ldx	[%g7 + UC_GREG(REG_O4)], %o4
+	ldx	[%g7 + UC_GREG(REG_O5)], %o5
+	ldx	[%g7 + UC_GREG(REG_O6)], %o6
+	ldx	[%g7 + UC_GREG(REG_O7)], %o7
+
+	ldx	[%g7 + UC_GREG(REG_G1)], %g1
+	ldx	[%g7 + UC_GREG(REG_G2)], %g2
+	ldx	[%g7 + UC_GREG(REG_G3)], %g3
+	ldx	[%g7 + UC_GREG(REG_G4)], %g4
+	ldx	[%g7 + UC_GREG(REG_G5)], %g5
+	ldx	[%g7 + UC_GREG(REG_G6)], %g6
+
+	/* ick */
+	ldx	[%g7 + UC_GREG(REG_PC)], %l0
+	jmp	%l0
+	ldx	[%g7 + UC_GREG(REG_G7)], %g7
+
+	SET_SIZE(kmdb_setcontext)
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/kmdb_start.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,81 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <sys/asm_linkage.h>
+#include <sys/privregs.h>
+
+#if defined(__lint)
+#include <kmdb/kmdb_start.h>
+#endif
+
+#include <kmdb/kaif_asmutil.h>
+
+/*
+ * This routine is called for the initial trip into the debugger.  We need
+ * to switch over to the debugger stack (which we also need to initialize)
+ * before entering the debugger.  Subsequent re-entries will longjmp their
+ * way in.
+ */
+#if defined(__lint)
+void
+kmdb_first_start(void)
+{
+}
+#else	/* __lint */
+
+	ENTRY(kmdb_first_start)
+
+	GET_NWIN(%g1, %g2);	/* %g1 is scratch, %g2 set to nwin-1 */
+	sub	%g2, 1, %g2
+
+	wrpr	%g2, %cansave
+	wrpr	%g0, %canrestore
+
+	set	kmdb_main_stack, %g1
+	ldx	[%g1], %g1
+
+	set	kmdb_main_stack_size, %g2
+	ldx	[%g2], %g2
+
+	add	%g1, %g2, %g1
+	sub	%g1, 1, %g1
+	and	%g1, -STACK_ALIGN64, %g1
+	sub	%g1, SA64(MINFRAME) + V9BIAS64, %sp
+
+	mov	0, %fp
+	save	%sp, -SA64(MINFRAME64), %sp
+
+	/* start the debugger */	
+	call	kmdb_main
+	nop
+
+	SET_SIZE(kmdb_first_start)
+#endif
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/kmdb/kmdb_v9asmutil.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,129 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#if defined(__lint)
+#include <sys/types.h>
+#include <kmdb/kmdb_asmutil.h>
+#endif
+
+#include <sys/asm_linkage.h>
+
+#if defined(__lint)
+/*ARGSUSED*/
+uintptr_t
+cas(uintptr_t *rs1, uintptr_t rs2, uintptr_t rd)
+{
+	return (0);
+}
+#else
+
+	ENTRY(cas)
+	casx	[%o0], %o1, %o2
+	retl
+	mov	%o2, %o0
+	SET_SIZE(cas)
+
+#endif
+
+#if defined(__lint)
+/*ARGSUSED*/
+void
+flush_windows(void)
+{
+}
+#else
+
+	ENTRY(flush_windows)
+	save
+	flushw
+	restore
+	retl
+	nop
+	SET_SIZE(flush_windows)
+
+#endif
+
+#if defined(__lint)
+/*ARGSUSED*/
+void
+membar_producer(void)
+{
+}
+#else
+
+	/*
+	 * US I has a problem with membars in the delay slot.  We don't care 
+	 * about performance here, so for safety's sake, we'll assume that all 
+	 * the world's an US I.
+	 */
+	ENTRY(membar_producer)
+	membar	#StoreStore
+	retl
+	nop
+	SET_SIZE(membar_producer)
+
+#endif
+
+#if defined(__lint)
+/*ARGSUSED*/
+uint64_t
+rdasi(uint32_t asi, uintptr_t va)
+{
+	return (0);
+}
+#else
+
+	ENTRY_NP(rdasi)
+	rd	%asi, %o3
+	wr	%o0, %asi
+	ldxa	[%o1]%asi, %o0
+	retl
+	wr	%o3, %asi
+	SET_SIZE(rdasi)
+
+#endif
+
+#if defined(__lint)
+/*ARGSUSED*/
+void
+wrasi(uint32_t asi, uintptr_t va, uint64_t val)
+{
+}
+#else
+
+	ENTRY_NP(wrasi)
+	rd	%asi, %o3
+	wr	%o0, %asi
+	stxa	%o2, [%o1]%asi
+	retl
+	wr	%o3, %asi
+	SET_SIZE(wrasi)
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/krtld/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1998-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = krtld.so
+MDBTGT = kvm
+
+MODSRCS = krtld.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libavl/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = libavl.so
+MDBTGT = proc
+
+MODSRCS = libavl.c \
+	  avl.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libc/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,41 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2000-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+MODULE = libc.so
+MDBTGT = proc
+
+MODSRCS = libc.c
+
+include ../../../../Makefile.cmd
+
+CPPFLAGS += -I$(SRC)/lib/libc/inc
+
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libnvpair/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = libnvpair.so
+MDBTGT = proc
+
+MODSRCS = libnvpair.c \
+	  nvpair.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libstand/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,44 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+SRCS += \
+	setjmp.s
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../Makefile.kmdb.64
+include ../../../Makefile.libstand
+
+%.o: %.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
+%.o: %.s
+	$(COMPILE.s) -o $@ $<
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libstand/setjmp.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,175 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License                  
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#if defined(__lint)
+#include <setjmp.h>
+#endif
+
+#include <sys/asm_linkage.h>
+
+/*
+ * This is a copy of the setjmp (and longjmp) code used in libc.  Note that
+ * we use sigsetjmp as an alias for setjmp, with a corresponding alias between
+ * siglongjmp and longjmp.  We can do this because there aren't any signals
+ * in kmdb (with the possible exception of the smoke signals the machine will
+ * emit when we break something).  We can also use a sigjmp_buf as a jmp_buf,
+ * since the latter is smaller than the former.
+ */
+
+#if !defined(__lint)
+JB_FLAGS	= (0*8)	! offsets in jmpbuf (see sigsetjmp.c)
+JB_SP		= (1*8)	! words 5 through 11 are unused!
+JB_PC		= (2*8)
+JB_FP		= (3*8)
+JB_I7		= (4*8)
+#endif
+
+/*
+ * setjmp(buf_ptr)
+ * buf_ptr points to a twelve word array (jmp_buf)
+ */
+
+#if defined(__lint)
+/* ARGSUSED */
+int 
+setjmp(jmp_buf env)
+{
+	return (0);
+}
+
+/* ARGSUSED */
+int
+sigsetjmp(sigjmp_buf env, int savemask)
+{
+	return (0);
+}
+#else	/* __lint */
+
+	ENTRY(setjmp)
+	ALTENTRY(sigsetjmp)
+	clr	[%o0 + JB_FLAGS]	! clear flags (used by sigsetjmp)
+	stx	%sp, [%o0 + JB_SP]	! save caller's sp
+	add	%o7, 8, %o1		! compute return pc
+	stx	%o1, [%o0 + JB_PC]	! save pc
+	stx	%fp, [%o0 + JB_FP]	! save fp
+	stx	%i7, [%o0 + JB_I7]	! save %i7
+	flushw
+	retl
+	clr	%o0			! return (0)
+
+	SET_SIZE(setjmp)
+#endif	/* __lint */
+
+/*
+ * longjmp(buf_ptr, val)
+ * buf_ptr points to a jmpbuf which has been initialized by setjmp.
+ * val is the value we wish to return to setjmp's caller
+ *
+ * We flush the register file to the stack by doing a kernel call.
+ * This is necessary to ensure that the registers we want to
+ * pick up are stored on the stack, and that subsequent restores
+ * will function correctly.
+ *
+ * sp, fp, and %i7, the caller's return address, are all restored
+ * to the values they had at the time of the call to setjmp().  All
+ * other locals, ins and outs are set to potentially random values
+ * (as per the man page).  This is sufficient to permit the correct
+ * operation of normal code.
+ *
+ * Actually, the above description is not quite correct.  If the routine
+ * that called setjmp() has not altered the sp value of their frame we
+ * will restore the remaining locals and ins to the values these
+ * registers had in the this frame at the time of the call to longjmp()
+ * (not setjmp()!).  This is intended to help compilers, typically not
+ * C compilers, that have some registers assigned to fixed purposes,
+ * and that only alter the values of these registers on function entry
+ * and exit.
+ *
+ * Since a C routine could call setjmp() followed by alloca() and thus
+ * alter the sp this feature will typically not be helpful for a C
+ * compiler.
+ *
+ * Note also that because the caller of a routine compiled "flat" (without
+ * register windows) assumes that their ins and locals are preserved,
+ * routines that call setjmp() must not be flat.
+ */
+
+#if defined(__lint)
+/* ARGSUSED */
+void 
+longjmp(jmp_buf env, int val)
+{
+}
+
+/* ARGSUSED */
+void 
+siglongjmp(sigjmp_buf env, int val)
+{
+}
+#else	/* __lint */
+
+	ENTRY(longjmp)
+	ALTENTRY(siglongjmp)
+
+	/* flush all reg windows to the stack. */
+	save
+	flushw
+	restore
+	nop
+
+	ldx	[%o0 + JB_SP], %o2	! sp in %o2 until safe to puke there
+	ldx	[%o2 + STACK_BIAS], %l0	! restore locals and ins if we can
+	ldx	[%o2 + (1*8) + STACK_BIAS], %l1
+	ldx	[%o2 + (2*8) + STACK_BIAS], %l2
+	ldx	[%o2 + (3*8) + STACK_BIAS], %l3
+	ldx	[%o2 + (4*8) + STACK_BIAS], %l4
+	ldx	[%o2 + (5*8) + STACK_BIAS], %l5
+	ldx	[%o2 + (6*8) + STACK_BIAS], %l6
+	ldx	[%o2 + (7*8) + STACK_BIAS], %l7
+	ldx	[%o2 + (8*8) + STACK_BIAS], %i0
+	ldx	[%o2 + (9*8) + STACK_BIAS], %i1
+	ldx	[%o2 + (10*8) + STACK_BIAS], %i2
+	ldx	[%o2 + (11*8) + STACK_BIAS], %i3
+	ldx	[%o2 + (12*8) + STACK_BIAS], %i4
+	ldx	[%o2 + (13*8) + STACK_BIAS], %i5
+	ldx	[%o0 + JB_FP], %fp	! restore fp
+	mov	%o2, %sp		! restore sp
+	ldx	[%o0 + JB_I7], %i7	! restore %i7
+	ldx	[%o0 + JB_PC], %o3	! get new return pc
+	tst	%o1			! is return value 0?
+	bnz	1f			! no - leave it alone
+	sub	%o3, 8, %o7		! normalize return (for adb) (dly slot)
+	mov	1, %o1			! yes - set it to one
+1:
+	retl
+	mov	%o1, %o0		! return (val)
+
+	SET_SIZE(longjmp)
+#endif	/* __lint */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libstandctf/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../Makefile.kmdb.64
+include ../../../Makefile.libstandctf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libsysevent/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = libsysevent.so
+MDBTGT = proc
+
+MODSRCS = libsysevent.c \
+	  sysevent.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libumem/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,77 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = libumem.so
+MDBTGT = proc
+
+MODSRCS_DIR = ../../../common/modules/genunix
+
+COMMONSRCS = \
+	libumem.c \
+	misc.c \
+	umem.c
+
+KMODSRCS = \
+	$(COMMONSRCS)
+
+MODSRCS = \
+	$(COMMONSRCS) \
+	kgrep.c \
+	leaky.c \
+	leaky_subr.c \
+	proc_kludges.c
+
+#
+# This signals that $(KMODSRCS) != $(MODSRCS).  There are certain features of
+# the libumem dmod, such as leak detection, that we cannot yet use in the kmod.
+# In most cases, the inability to use a given function is due to that function's
+# dependance on libproc interfaces - interfaces which are not present in kmdb.
+KMOD_SOURCES_DIFFERENT=$(POUND_SIGN)
+
+include ../../../../Makefile.cmd
+
+CPPFLAGS += -I$(SRC)/lib/libumem/common
+CPPFLAGS += -I$(MODSRCS_DIR)
+
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+%.o: $(MODSRCS_DIR)/%.c
+	$(COMPILE.c) $<
+	$(CTFCONVERT_O)
+
+%.ln: $(MODSRCS_DIR)/%.c
+	$(LINT.c) -c $<
+
+#
+# This module is somewhat unusual in that it is a proc-style dmod.  proc dmods
+# are not normally built both for mdb and kmdb.  These overrides build it as a
+# proc dmod and as a kvm kmod.
+TARGETS = $(TARGETS_proc) $(TARGETS_kvm_kmdb)
+ROOTTGTS = $(ROOTTGTS_proc)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libuutil/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = libuutil.so
+MDBTGT = proc
+
+MODSRCS_DIR = ../../../common/modules/libuutil
+
+MODSRCS = libuutil.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+%.o: $(MODSRCS_DIR)/%.c
+	$(COMPILE.c) $<
+	$(CTFCONVERT_O)
+
+%.ln: $(MODSRCS_DIR)/%.c
+	$(LINT.c) -c $<
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/libzpool/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = libzpool.so
+MDBTGT = proc
+
+MODSRCS = zfs.c list.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+MODSRCS_DIR = ../../../common/modules/zfs
+GENUNIX_DIR = ../../../common/modules/genunix
+
+CPPFLAGS += -I../../../../../lib/libzpool/common \
+	-I../../../../../uts/common/fs/zfs
+
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
+
+dmod/%.o: $(GENUNIX_DIR)/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
+dmod/%.ln: $(GENUNIX_DIR)/%.c
+	$(LINT.c) -c $<
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/lofs/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1998-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = lofs.so
+MDBTGT = kvm
+
+MODSRCS = lofs.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/logindmux/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1998-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = logindmux.so
+MDBTGT = kvm
+
+MODSRCS = logindmux.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/md/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.   All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"@(#)Makefile	1.2	05/06/08 SMI"
+
+MODULE = md.so 
+MDBTGT = kvm
+
+MODSRCS = dumphotspare.c \
+	dumpnamespace.c \
+	findset.c \
+	md.c  \
+	metaset.c \
+	metastat.c \
+	set_io_cnt.c \
+	snarf.c \
+	simple_de_ic.c \
+	walk_hsp.c \
+	walk_sets.c \
+	walk_units.c \
+	walk_didnm.c \
+	walk_nm.c \
+	walk_directory_block.c \
+	walk_directory_entry.c
+
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/mdb/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+SRCS =	kvm_v9dep.c \
+	mdb_v9util.c \
+	proc_isadep.c
+
+%.o: ../../mdb/%.c
+	$(COMPILE.c) $<
+	$(CTFCONVERT_O)
+
+%.ln: ../../mdb/%.c
+	$(LINT.c) -c $<
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.mdb
+
+CPPFLAGS += -I../../mdb
+
+install: all $(ISAEXEC) $(ROOTPROG64) $(ROOTLINK64)
+	-$(RM) $(ROOTPROG)
+	-$(LN) $(ISAEXEC) $(ROOTPROG)
+	-$(RM) $(ROOTLINK)
+	-$(LN) $(ISAEXEC) $(ROOTLINK)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/mdb_ds/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,44 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = mdb_ds.so
+MDBTGT = proc
+
+MODSRCS = mdb_ds.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+#
+# This module is somewhat unusual in that it is a proc-style dmod.  proc dmods
+# are not normally built both for mdb and kmdb.  These overrides build it as a
+# proc dmod and as a kvm kmod.
+TARGETS = $(TARGETS_proc) $(TARGETS_kvm_kmdb)
+ROOTTGTS = $(ROOTTGTS_proc) $(ROOTTGTS_kvm_kmdb)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/mdb_ks/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# In the mdb world, mdb_ks is delivered as a dmod, albeit one with special
+# powers.  Various other dmods use symbols provided by mdb_ks, through the
+# magic of dynamic linking.  In the kmdb world, however, things are different.
+# kmdb dmods are not allowed to consume symbols exported by anything other
+# than the kmdb module.  In order to allow other kmdb dmods to use the mdb_ks
+# symbols, we link mdb_ks into kmdb.
+#
+
+MODULE = mdb_ks.so
+MDBTGT = kvm
+
+MODSRCS = mdb_ks.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+include ../../../Makefile.mdb_ks
+
+#
+# We are not actually hardwiring some dependency on sun4u, we just need to
+# include sys/param.h with _MACHDEP defined, and this forces the inclusion of
+# machparam.h, even though we don't use anything there.  This is a temporary
+# kludge until we invent -DDONTINCLUDEMACHPARAM or something.
+#
+CPPFLAGS += -I$(SRC)/uts/sun4u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/mdb_test/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,44 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = mdb_test.so
+MDBTGT = proc
+
+MODSRCS = mdb_test.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+#
+# This module is somewhat unusual in that this dmod is a proc-style dmod.  proc
+# dmods are not normally built both for mdb and kmdb.  These overrides build
+# this dmod as a proc dmod and as a kvm kmod.
+TARGETS = $(TARGETS_proc) $(TARGETS_kvm_kmdb)
+ROOTTGTS = $(ROOTTGTS_proc)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/mpxio/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.   All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"@(#)Makefile	1.2	05/06/08 SMI"
+
+MODULE = mpxio.so 
+MDBTGT = kvm
+
+MODSRCS = main.c \
+	mdi_walkers.c \
+	mpxio_dcmds.c \
+	util.c
+
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/nca/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = nca.so
+MDBTGT = kvm
+
+MODSRCS = nca.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/ptm/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1998-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = ptm.so
+MDBTGT = kvm
+
+MODSRCS = ptm.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/random/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = random.so
+MDBTGT = kvm
+
+MODSRCS = random.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/s1394/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,40 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = s1394.so
+MDBTGT = kvm
+
+MODSRCS = s1394.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+# Needed to #include <sys/1394/s1394.h>
+CPPFLAGS += -I$(SRC)/uts/common
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/sctp/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,40 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = sctp.so
+MDBTGT = kvm
+
+MODSRCS = sctp.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+
+CPPFLAGS += -I$(SRC)/uts/common/inet
+
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/sd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma	ident	"@(#)Makefile	1.3	05/06/08 SMI"
+
+MODULE = sd.so
+MDBTGT = kvm
+
+MODSRCS = sd.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/specfs/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = specfs.so
+MDBTGT = kvm
+
+MODSRCS = specfs.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/sppp/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000-2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = sppp.so
+MDBTGT = kvm
+
+MODSRCS = sppp.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+CPPFLAGS += -I../../../../../uts/common/io/ppp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/ssd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma	ident	"@(#)Makefile	1.4	05/06/08 SMI"
+
+MODULE = ssd.so
+MDBTGT = kvm
+
+MODSRCS = sd.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+MODSRCS_DIR = ../../../common/modules/sd
+
+CPPFLAGS += -D__fibre
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/ufs/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = ufs.so
+MDBTGT = kvm
+
+MODSRCS = ufs.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/ufs_log/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = ufs_log.so
+MDBTGT = kvm
+
+MODSRCS = ufs_log.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/usba/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+MODULE = usba.so
+MDBTGT = kvm
+
+MODSRCS = usb.c usba.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+CPPFLAGS += -I../../../../../uts/common 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/s390/zSeries/zfs/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+MODULE = zfs.so
+MDBTGT = kvm
+
+MODSRCS = zfs.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+CPPFLAGS += -I../../../../../uts/common/fs/zfs
+
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
--- a/usr/src/cmd/mdb/tools/setdynflag/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mdb/tools/setdynflag/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -43,9 +43,9 @@
 # We're going to run this as part of the build, so we want it to use the
 # running kernel's includes and libraries.
 #
-CPPFLAGS = -I../../common
+CPPFLAGS = -I../../common -I$(ROOT)/usr/include
 CFLAGS += $(CCVERBOSE)
-LDFLAGS =
+LDFLAGS = -L$(ROOT)/usr/lib
 LDLIBS	= -lelf
 
 LINTFILES = $(SRCS:%.c=%.ln)
--- a/usr/src/cmd/mdb/zSeries/z/mdb/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mdb/zSeries/z/mdb/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -39,7 +39,7 @@
 
 include ../../../../Makefile.cmd
 include ../../../../Makefile.cmd.64
-include ../../Makefile.sparcv9
+include ../../Makefile.s390x
 include ../../../Makefile.mdb
 
 CPPFLAGS += -I../../mdb
--- a/usr/src/cmd/mms/dm/common/dm_msg.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mms/dm/common/dm_msg.c	Mon Mar 23 14:01:42 2009 -0400
@@ -108,7 +108,7 @@
 
 	assert(fmt != NULL);
 
-	ap = args;
+	va_copy(ap, args);
 	text = mms_vstrapp(NULL, fmt, ap);
 	/* Allocate a message struct */
 	msg = (dm_msg_t *)malloc(sizeof (dm_msg_t));
--- a/usr/src/cmd/mms/mgmt/adm/common/mmsadm.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mms/mgmt/adm/common/mmsadm.c	Mon Mar 23 14:01:42 2009 -0400
@@ -248,7 +248,7 @@
 	int		cmdidx = -1;
 	char		*subcmd = NULL;
 	nvlist_t	*nvl = NULL;
-	char		c;
+	int		c;
 	int		newargc = argc;
 	char		**newargv = argv;
 	char		buf[2048];
--- a/usr/src/cmd/mms/mgmt/init/common/mmsinit.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mms/mgmt/init/common/mmsinit.c	Mon Mar 23 14:01:42 2009 -0400
@@ -87,7 +87,7 @@
 {
 	int		st = 0;
 	int		mmsind = 0;
-	char		c;
+	int		c;
 	char		*mmtype = "server";
 #ifdef	MMS_VAR_CFG
 	char		*mmhost = "localhost";
--- a/usr/src/cmd/mms/mgmt/mnt/common/mmsmnt.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mms/mgmt/mnt/common/mmsmnt.c	Mon Mar 23 14:01:42 2009 -0400
@@ -111,7 +111,7 @@
 main(int argc, char *argv[])
 {
 	int		st;
-	char		c;
+	int		c;
 	pid_t		pid;
 	int		nullfd;
 	sigset_t	mask;
--- a/usr/src/cmd/mms/mm/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mms/mm/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -42,6 +42,8 @@
 CPPFLAGS += -DMMS_OPENSSL
 CPPFLAGS += -I. -I../common -I$(SRC)/common/mms/mms
 CPPFLAGS += -I$(SRC)/lib/mms/mms/common -I$(SRC)/lib/mms/mms/common
+CPPFLAGS += -I$(ROOT)/usr/include/libxml2 -I$(ROOT)/usr/include/pgsql -I$(ROOT)/usr/include
+CPPFLAGS += -I$(ROOT)/usr/include/pgsql -I$(ROOT)/usr/include/pgsql/server
 CPPFLAGS += -I/usr/include/libxml2 -I/usr/include/pgsql
 
 CFLAGS +=  $(CTF_FLAGS) $(CC_VERBOSE)
--- a/usr/src/cmd/mms/mm/common/mm.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/mms/mm/common/mm.c	Mon Mar 23 14:01:42 2009 -0400
@@ -4803,7 +4803,7 @@
 	pthread_t	 notify_tid;
 	mms_t		*cli_conn;
 	char		 ebuf[MMS_EBUF_LEN];
-	char		 c;
+	int		c;
 	void		*status;
 	/* Time out */
 	struct timespec timeout;
--- a/usr/src/cmd/oawk/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/oawk/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -52,6 +52,7 @@
 
 NATIVEOBJS =	$(NATIVEDIR)/makeprctab.o $(NATIVEDIR)/tmptoken.o
 $(MAKEPRCTAB) :=	CC = $(NATIVECC)
+$(s390_BLD)$(MAKEPRCTAB) :=	CC = $(XBUILDCC)
 $(MAKEPRCTAB) :=	POST_PROCESS=
 $(MAKEPRCTAB) :=	POST_PROCESS_O=
 
--- a/usr/src/cmd/pcmciad/pcmciad.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/pcmciad/pcmciad.c	Mon Mar 23 14:01:42 2009 -0400
@@ -160,6 +160,13 @@
 static void disk(char *, char *, int, int, void *);
 static void diskinit(void);
 
+static void makepdir();
+static void start_unmount(char *, char *);
+static int req_vold_umount(char *);
+static int do_umount(char *);
+static void wr_to_pipe(char *, char *, int);
+static const char *get_rdsk_path(char *);
+
 #define	MAX_DRIVERS		128
 
 #define	DRV_NOT_INIT		0x0002
@@ -1315,8 +1322,6 @@
 static void
 meminit()
 {
-	static void makepdir();
-
 #ifndef	lint
 	mutex_lock(&meminit_lock);
 #endif
@@ -1589,7 +1594,6 @@
 static void
 unmount_media(long socket, char *device_type)
 {
-	static void	start_unmount(char *, char *);
 	static FILE	*fp = NULL;
 	struct mnttab	mnt;
 	const char	*nvp;
@@ -1653,8 +1657,6 @@
 static void
 start_unmount(char *mnt_special, char *mnt_mountp)
 {
-	static int	req_vold_umount(char *);
-	static int	do_umount(char *);
 	int		err = 0;
 
 	/*
@@ -1889,8 +1891,6 @@
 static void
 signal_vold(long socket, char *device)
 {
-	static void		wr_to_pipe(char *, char *, int);
-	static const char	*get_rdsk_path(char *);
 	const char		*rpath;
 
 
--- a/usr/src/cmd/pg/pg.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/pg/pg.c	Mon Mar 23 14:01:42 2009 -0400
@@ -106,6 +106,7 @@
 static	int	screen(char *);
 static	int	fgetputc();
 static 	char	*pg_strchr();
+static	int	readch();
 
 
 struct line {			/* how line addresses are stored */
@@ -859,7 +860,6 @@
 	int state = 0;
 	int width, length;
 	char multic[MB_LEN_MAX];
-	static	int	readch();
 	int 	len;
 
 	(void) fixterm();
--- a/usr/src/cmd/plockstat/plockstat.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/plockstat/plockstat.c	Mon Mar 23 14:01:42 2009 -0400
@@ -758,7 +758,8 @@
 	ucred_t *ucp;
 	int err;
 	int opt_C = 0, opt_H = 0, opt_p = 0, opt_v = 0;
-	char c, *p, *end;
+	int c;
+	char *p, *end;
 	struct sigaction act;
 	int done = 0;
 
--- a/usr/src/cmd/pools/pooladm/pooladm.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/pools/pooladm/pooladm.c	Mon Mar 23 14:01:42 2009 -0400
@@ -133,7 +133,7 @@
 int
 main(int argc, char *argv[])
 {
-	char c;
+	int c;
 	pool_conf_t *conf = NULL;
 	const char *static_conf_loc;
 
--- a/usr/src/cmd/pools/poolbind/poolbind.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/pools/poolbind/poolbind.c	Mon Mar 23 14:01:42 2009 -0400
@@ -109,7 +109,7 @@
 int
 main(int argc, char *argv[])
 {
-	char c;
+	int c;
 	int i;
 	idtype_t idtype = P_PID;
 	char *idstr = "pid";
--- a/usr/src/cmd/pools/poold/poold.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/pools/poold/poold.c	Mon Mar 23 14:01:42 2009 -0400
@@ -55,17 +55,14 @@
 #define	SMF_SVC_INSTANCE	"svc:/system/pools/dynamic:default"
 
 #if defined(sparc)
-#define	PLAT	"sparc"
-#else
-#if defined(i386)
-#define	PLAT	"i386"
-#if defined(__s390__)
-#define	PLAT	"s390"
-#else
+# define	PLAT	"sparc"
+#elif defined(i386)
+# define	PLAT	"i386"
+#elif defined(__s390__)
+# define	PLAT	"s390"
 #else
 #error Unrecognized platform.
 #endif
-#endif
 
 #define	CLASS_FIELD_DESC(class_desc)	"L" class_desc ";"
 
@@ -406,7 +403,7 @@
 int
 main(int argc, char *argv[])
 {
-	char c;
+	int c;
 	char log_severity[16] = "";
 	JavaVMInitArgs vm_args;
 	JavaVMOption vm_opts[5];
--- a/usr/src/cmd/pools/poolstat/poolstat.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/pools/poolstat/poolstat.c	Mon Mar 23 14:01:42 2009 -0400
@@ -192,7 +192,7 @@
 int
 main(int argc, char *argv[])
 {
-	char		c;
+	int		c;
 	int 		error = 0;
 
 	(void) getpname(argv[0]);
--- a/usr/src/cmd/praudit/format.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/praudit/format.c	Mon Mar 23 14:01:42 2009 -0400
@@ -2611,7 +2611,7 @@
 {
 	if (err == ADT_SUCCESS) {
 		(void) strlcpy(buf, gettext("success"), buflen);
-	} else if ((char)err == ADT_FAILURE) {
+	} else if ((signed char)err == ADT_FAILURE) {
 		(void) strlcpy(buf, gettext("failure"), buflen);
 	} else {
 		char *emsg = strerror(err);
@@ -2649,7 +2649,7 @@
 	    (retval < ADT_FAIL_PAM + PAM_TOTAL_ERRNUM)) {
 		(void) strlcpy(buf, pam_strerror(NULL, retval - ADT_FAIL_PAM),
 		    buflen);
-	} else if ((char)err == ADT_FAILURE) {
+	} else if ((signed char)err == ADT_FAILURE) {
 		char *emsg = strerror(retval);
 
 		if (emsg != NULL) {
--- a/usr/src/cmd/praudit/token.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/praudit/token.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1075,7 +1075,7 @@
 			pa_retval(number, value, pb, sizeof (pb));
 		} else {
 			uval.uvaltype = PRA_INT32;
-			if ((char)number == -1)
+			if ((int8_t)number == -1)
 				uval.int32_val = -1;
 			else
 				uval.int32_val = number;
@@ -1180,7 +1180,7 @@
 			pa_retval(number, rval.r_val1, pb, sizeof (pb));
 		} else {
 			uval.uvaltype = PRA_INT32;
-			if ((char)number == -1)
+			if ((int8_t)number == -1)
 				uval.int32_val = -1;
 			else
 				uval.int32_val = number;
--- a/usr/src/cmd/raidctl/raidctl.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/raidctl/raidctl.c	Mon Mar 23 14:01:42 2009 -0400
@@ -229,7 +229,7 @@
 	/* index and temporary variables */
 	int ret;
 	int status;
-	char c = '\0';
+	int c = 0;
 
 	/* fd for the filelock */
 	int fd;
--- a/usr/src/cmd/rcm_daemon/common/rcm_event.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/rcm_daemon/common/rcm_event.c	Mon Mar 23 14:01:42 2009 -0400
@@ -121,8 +121,8 @@
 	pid_t pid;
 	uint32_t flag = (uint32_t)0;
 	uint64_t pid64 = (uint64_t)0;
-	size_t buflen = 0;
-	size_t interval_size = 0;
+	uint_t buflen = 0;
+	uint_t interval_size = 0;
 	timespec_t *interval = NULL;
 	nvlist_t *change_data = NULL;
 	nvlist_t *event_data = NULL;
--- a/usr/src/cmd/rmformat/rmf_main.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/rmformat/rmf_main.c	Mon Mar 23 14:01:42 2009 -0400
@@ -74,7 +74,7 @@
 int
 main(int32_t argc, char **argv)
 {
-	char i;
+	int i;
 	char *tmp_ptr;
 
 	/*
--- a/usr/src/cmd/rmformat/rmf_misc.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/rmformat/rmf_misc.c	Mon Mar 23 14:01:42 2009 -0400
@@ -768,7 +768,7 @@
 		}
 
 		/* SPARC and x86 fd drivers use fdc_medium differently */
-#if defined(__sparc)
+#if defined(__sparc) || defined(__s390)
 		mult_factor = (fdchar.fdc_medium) ? 2 : 1;
 #elif defined(__x86)
 		mult_factor = (fdchar.fdc_medium == 5) ? 2 : 1;
@@ -924,7 +924,7 @@
 static void
 intr_sig_handler()
 {
-	char c;
+	int c;
 
 	(void) fprintf(stderr, gettext(global_intr_msg));
 	(void) fprintf(stderr,
--- a/usr/src/cmd/rmformat/rmf_slice.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/rmformat/rmf_slice.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1496,7 +1496,7 @@
 
 	int32_t i, ret;
 	struct dk_geom  dkg;
-	struct vtoc v_toc;
+	struct extvtoc v_toc;
 	int tmp_fd;
 	char *fdisk_buf;
 	struct mboot boot_code;		/* Buffer for master boot record */
--- a/usr/src/cmd/saf/log.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/saf/log.c	Mon Mar 23 14:01:42 2009 -0400
@@ -37,12 +37,12 @@
 #include <stdarg.h>
 #include <strings.h>
 #include <errno.h>
+#include <sac.h>
 
-#include "extern.h"
 #include "misc.h"
+#include "structs.h"
+#include "extern.h"
 #include "msgs.h"
-#include <sac.h>
-#include "structs.h"
 
 static	FILE	*Lfp;	/* log file */
 #ifdef DEBUG
--- a/usr/src/cmd/saf/misc.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/saf/misc.c	Mon Mar 23 14:01:42 2009 -0400
@@ -38,12 +38,12 @@
 #include <signal.h>
 #include <sys/stat.h>
 #include <poll.h>
+#include <sac.h>
 #include "misc.h"
 #include "msgs.h"
+#include "structs.h"
 #include "extern.h"
-#include <sac.h>
 #include "adm.h"
-#include "structs.h"
 
 
 /*
--- a/usr/src/cmd/saf/pmadm.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/saf/pmadm.c	Mon Mar 23 14:01:42 2009 -0400
@@ -35,10 +35,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "extern.h"
+#include <sac.h>
 #include "misc.h"
-#include <sac.h>
 #include "structs.h"
+#include "extern.h"
 
 #define	ADD		0x1	/* -a or other required options seen */
 #define	REMOVE		0x2	/* -r seen */
--- a/usr/src/cmd/saf/sac.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/saf/sac.c	Mon Mar 23 14:01:42 2009 -0400
@@ -43,11 +43,11 @@
 #include <unistd.h>
 #include <utmpx.h>
 #include <memory.h>
+#include <sac.h>
 #include "msgs.h"
-#include "extern.h"
-#include <sac.h>
 #include "misc.h"
 #include "structs.h"
+#include "extern.h"
 
 #include <security/pam_appl.h>
 
--- a/usr/src/cmd/saf/util.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/saf/util.c	Mon Mar 23 14:01:42 2009 -0400
@@ -36,10 +36,10 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "extern.h"
+#include <sac.h>
 #include "misc.h"
-#include <sac.h>
 #include "structs.h"
+#include "extern.h"
 #ifdef SAC
 #include "msgs.h"
 #endif
--- a/usr/src/cmd/sdpadm/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sdpadm/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -53,7 +53,7 @@
 all: $(PROG) $(ETCFILES)
 
 $(PROG): $(OBJS)
-	$(LINK.c) -o $@ $(OBJS)
+	$(LINK.c) -o $@ $(OBJS) -L$(ROOT)/usr/lib
 	$(POST_PROCESS)
 
 install: all $(ROOTUSRSBINPROG) $(ROOTETCFILES)
--- a/usr/src/cmd/sgs/elfedit/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/elfedit/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -43,17 +43,14 @@
 
 OBJS=		$(BLTOBJ) $(COMOBJ) $(COMOBJ32) $(COMOBJ64) elfcap.o
 
-sparc_MAPFILE=	-M../common/mapfile-vers
-i386_MAPFILE=	-M../common/mapfile-vers
-s390_MAPFILE=	
-MAPFILE=	$($(MACH)_MAPFILE)
+MAPFILE=	../common/mapfile-vers
 
 CPPFLAGS=	-I. -I../common -I../../include -I../../include/$(MACH) \
 		-I$(SRCBASE)/lib/libc/inc -I$(SRCBASE)/uts/$(ARCH)/sys \
 		-I$(ELFCAP) $(CPPFLAGS.master)
 LLDFLAGS =	$(VAR_ELFEDIT_LLDFLAGS)
 LLDFLAGS64 =	$(VAR_ELFEDIT_LLDFLAGS64)
-LDFLAGS +=	$(VERSREF) $(USE_PROTO) $(MAPFILE) $(LLDFLAGS)
+LDFLAGS +=	$(VERSREF) $(USE_PROTO) -M$(MAPFILE) $(LLDFLAGS)
 LDLIBS +=	$(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \
 		    $(CONVLIBDIR) $(CONV_LIB) -ltecla
 
--- a/usr/src/cmd/sgs/ld/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/ld/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -38,11 +38,7 @@
 .PARALLEL:	$(OBJS)
 
 MAPFILES =	../common/mapfile-intf $(MAPFILE.NGB)
-sparc_MAPOPTS =	$(MAPFILES:%=-M%)
-i386_MAPOPTS =	$(MAPFILES:%=-M%)
-s390_MAPOPTS =
-MAPOPTS =	$($(MACH)_MAPOPTS)
-
+MAPOPTS =	$(MAPFILES:%=-M%)
 
 LDFLAGS +=	$(VERSREF) $(USE_PROTO) $(MAPOPTS) $(VAR_LD_LLDFLAGS)
 LDLIBS +=	$(LDLIBDIR) $(LD_LIB) $(ELFLIBDIR) -lelf \
--- a/usr/src/cmd/sgs/lex/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/lex/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,11 +28,10 @@
 #
 
 PROG=		lex
-INCLIST_sparc=	-I../common
+INCLIST_s390=	-I../common
 
 include 	../../../Makefile.cmd
 include		../Makefile.com
-LDLIBS += -ldl
 
 .KEEP_STATE:
 
--- a/usr/src/cmd/sgs/lex/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/lex/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -35,8 +35,6 @@
 include ../Makefile.com
 include ../../../../lib/Makefile.lib.64
 
-LDLIBS += -ldl
-
 .KEEP_STATE:
 
 all_lib: $(LIBS)
--- a/usr/src/cmd/sgs/libdl/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/libdl/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -54,6 +54,3 @@
 
 $(ROOT4LINKS):	$(ROOTFS_DYNLIB)
 	$(INS.liblink)
-
-# Add build for generated mapfile
-include ../../../../Makefile.mapfilegnu.maponly
--- a/usr/src/cmd/sgs/libdl/s390/mapfile-vers	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/libdl/s390/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -24,6 +24,21 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 
+GLIBC_2.3 {
+};
+
+GLIBC_2.2 {
+};
+
+GLIBC_2.1.3 {
+};
+
+GLIBC_2.1 {
+};
+
+GLIBC_2.0 {
+};
+
 SUNW_0.8 {
     global:
 	dladdr = FUNCTION;
--- a/usr/src/cmd/sgs/libdl/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/libdl/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -46,6 +46,3 @@
 $(DYNLIB):	$(MAPFILES)
 
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS)
-
-# Add build for generated mapfile
-include ../../../../Makefile.mapfilegnu
--- a/usr/src/cmd/sgs/libld/common/machrel.s390.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/libld/common/machrel.s390.c	Mon Mar 23 14:01:42 2009 -0400
@@ -116,7 +116,7 @@
 	uint8_t	loff[6];	/* lgf	%r1,12(%r1)		    */
 	uint8_t	jg[2];		/* jg				    */
 	uint8_t	plt0[4];	/* offset(plt0)			    */
-	uint8_t	gotoff[4];	/* offset(symbol table)		    */
+	uint8_t	symoff[4];	/* offset(rela.plt table)	    */
 } plt1_t;
 
 #else
@@ -144,29 +144,29 @@
 } plt0_abs_t;
 
 typedef struct __plt1_pic {
-	uint8_t	larl[2];	/* larl	%r1,			    */
-	uint8_t	gotent[4];	/* ep@GOTENT              	    */
-	uint8_t	lgot[4];	/* l	%r1,0(%r1)		    */
+	uint8_t	basr[2];	/* basr	%r1,%r0			    */
+	uint8_t	lgoto[4];	/* l	%r1,22(%r1)		    */
+	uint8_t	lgot[4];	/* l	%r1,0(%r1,%r12)		    */
 	uint8_t	br[2];		/* br	%r1			    */
-	uint8_t	basr[2];	/* basr	%r1,0			    */
-	uint8_t	loff[4];	/* l	%r1,12(%r1)		    */
+	uint8_t	basr2[2];	/* basr	%r1,0			    */
+	uint8_t	loff[4];	/* l	%r1,14(%r1)		    */
 	uint8_t	jg[2];		/* jg				    */
-	uint8_t	plt0[4];	/* offset(plt0)			    */
-	uint8_t	gotoff[4];	/* offset(symbol table)		    */
-	uint8_t pad[4];		/* Padding			    */
+	uint8_t plt0[4];	/* offset(plt0/2)		    */
+	uint8_t	got[4];		/* offset(got)			    */
+	uint8_t	symoff[4];	/* offset(rela.plt table)	    */
 } plt1_pic_t;
 
 typedef struct __plt1_abs {
 	uint8_t	basr[2];	/* basr	%r1,%r0			    */
-	uint8_t	lasym[4];	/* l	%r1,22(%r1)		    */
+	uint8_t	lgot[4];	/* l	%r1,22(%r1)		    */
 	uint8_t	lrtn[4];	/* l	%r1,0(%r1)		    */
 	uint8_t	br[2];		/* br	%r1			    */
 	uint8_t	basr2[2];	/* basr	%r1,0			    */
 	uint8_t	loff[4];	/* l	%r1,14(%r1)		    */
 	uint8_t	jg[2];		/* jg				    */
-	uint8_t	plt0[4];	/* offset(plt0)			    */
+	uint8_t plt0[4];	/* offset(plt0/2)		    */
 	uint8_t	gotaddr[4];	/* Address(GOT entry)      	    */
-	uint8_t symoff[4];	/* Symtable offset		    */
+	uint8_t	symoff[4];	/* offset(rela.plt table)	    */
 } plt1_abs_t;
 
 #endif
@@ -221,36 +221,37 @@
  *  and insert the address in the GOT.
  *
  *  Loc	Code				Description
- *  0	PLT1: 	larl r1,<fn>@GOTENT 	// R1 = A(GOT)
- *  6    	l    r1,0(r1)      	// R1 = *(A(GOT))
+ *  0	PLT1: 	basr r1,r0		// Establish addressability
+ *  2    	l    r1,22(r1)      	// R1 = O(GOT)
+ *  6		l    r1,0(r1,r12)	// R1 = *GOT
  *  10    	br   r1        		// Branch to GOT entry address
  *  12	RET1: 	basr r1,0         	// Return point from 1st call to GOT
- *  14    	l    r1,12(r1)     	// R1 = Offset in symbol table 
+ *  14    	l    r1,14(r1)     	// R1 = Offset in symbol table 
  *  18    	jg   -x       	 	// Jump to start of PLT
- *  24    	.long ?          	// Symbol table offset
- *  28    	.long 0          	// Filler
+ *  24    	.long ?          	// GOT offset
+ *  28    	.long ?          	// Symbol table offset
  *  32					// PLT = 32 bytes in length
  *
  *  There needs to be a couple of dynamic patches:
- *  Offset 2:  Subject of larl = Relative address to GOT entry
  *  Offset 20: Relative branch to PLT0
- *  Offset 24: 32 bit offset into symbol table (max 2GB for symbol table)
+ *  Offset 24: 32 bit offset into GOT
+ *  Offset 28: 32 bit offset into symbol table (max 2GB for symbol table)
 
 */
 
 /*------------------------------------------------------------------*/
 
 plt1_pic_t pltTemplate = {
-	{0xc0, 0x10},
-	{0, 0, 0, 0},
-	{0x58, 0x10, 0x10, 0x00},
+	{0x0d, 0x10},
+	{0x58, 0x10, 0x10, 0x16},
+	{0x58, 0x11, 0xc0, 0x00},
 	{0x07, 0xf1},
 	{0x0d, 0x10},
-	{0x58, 0x10, 0x10, 0x0c},
+	{0x58, 0x10, 0x10, 0x0e},
 	{0xc0, 0xf4},
+	{0, 0},
 	{0, 0, 0, 0},
-	{0, 0, 0, 0},
-	{0x00, 0x00, 0x00, 0x00}
+	{0, 0, 0, 0}
 };
 
 /*  The 32-bit GOT holds the address within the PLT to be executed.  
@@ -602,12 +603,12 @@
 /*                                                                  */
 /* Name		- plt_entry.                                        */
 /*                                                                  */
-/* Function	-                                                   */
+/* Function	- Create a PLT entry and a corresponding GOT entry. */
 /*		                               		 	    */
 /*------------------------------------------------------------------*/
 
 static void
-plt_entry(Ofl_desc *ofl, Word rel_off, Sym_desc *sdp)
+plt_entry(Ofl_desc *ofl, Sym_desc *sdp)
 {
 	plt1_t	*pltent;	/* PLT entry being created */
 	Sxword	pltoff,		/* Offset of this entry from PLT top */
@@ -633,11 +634,11 @@
 		   OFFSETOF(plt1_t, pltent, larl))) >> 1;
 	SWORD(pltent->gotent) = (Sword) pltgot;
 	SWORD(pltent->plt0)   = (Sword) -(pltoff + OFFSETOF(plt1_t, pltent, jg)) >> 1;
-	SWORD(pltent->gotoff) = rel_off;
+	SWORD(pltent->symoff) = (sdp->sd_aux->sa_PLTndx - 1) * sizeof(Elf64_Rela);
 	if (bswap) {
 		WORD(pltent->gotent) = ld_bswap_Word((Word) pltent->gotent);
 		WORD(pltent->plt0)   = ld_bswap_Word((Word) pltent->plt0);
-		WORD(pltent->gotoff) = ld_bswap_Word((Word) pltent->gotoff);
+		WORD(pltent->symoff) = ld_bswap_Word((Word) pltent->symoff);
 		*gotent = ld_bswap_Xword(*gotent);
 	}
 }
@@ -671,12 +672,12 @@
 /*                                                                  */
 /* Name		- plt_entry.                                        */
 /*                                                                  */
-/* Function	- Build a single PLT entry.                         */
+/* Function	- Create a PLT entry and a corresponding GOT entry. */
 /*		                               		 	    */
 /*------------------------------------------------------------------*/
 
 static void
-plt_entry(Ofl_desc *ofl, Word rel_off, Sym_desc *sdp)
+plt_entry(Ofl_desc *ofl, Sym_desc *sdp)
 {
 	Sword	pltoff,		/* Offset of this entry from PLT top */
 		gotoff,		/* Offset of the got entry */
@@ -688,20 +689,26 @@
 	pltoff = M_PLT_RESERVSZ + ((sdp->sd_aux->sa_PLTndx - 1) * M_PLT_ENTSIZE);
 	gotent = (Sword *)((intptr_t) ofl->ofl_osgot->os_outdata->d_buf + gotoff);
 
-	if (!(flags & FLG_OF_SHAROBJ)) {
+//
+//	S390X FIXME - Bug in Sun Studio 12 compiler
+//
+//	if (!(flags & FLG_OF_SHAROBJ)) {
+	if (!(flags & 0x10)) {
 		plt1_abs_t *pltent;
 
 		pltent  = (plt1_abs_t *) ((intptr_t) ofl->ofl_osplt->os_outdata->d_buf + pltoff);
 		(void) memcpy(pltent, &pltTemplateABS, M_PLT_ENTSIZE);
 		*gotent = ofl->ofl_osplt->os_shdr->sh_addr + pltoff + 
 			  OFFSETOF(plt1_abs_t, pltent, basr2);
-		SWORD(pltent->plt0)    = (Sword) -(pltoff + OFFSETOF(plt1_abs_t, pltent, jg)) >> 1;
+		SWORD(pltent->plt0)    = (Sword) -(pltoff + 
+						OFFSETOF(plt1_abs_t, pltent, jg)) >> 1;
 		SWORD(pltent->gotaddr) = ofl->ofl_osgot->os_shdr->sh_addr + gotoff;
-		SWORD(pltent->symoff)  = rel_off;
+		SWORD(pltent->symoff)  = (sdp->sd_aux->sa_PLTndx - 1) * sizeof(Elf32_Rela);
 		if (bswap) {
 			WORD(pltent->plt0)    = ld_bswap_Word((Word) pltent->plt0);
 			WORD(pltent->gotaddr) = ld_bswap_Word((Word) pltent->gotaddr);
 			WORD(pltent->symoff)  = ld_bswap_Word((Word) pltent->symoff);
+			*gotent = ld_bswap_Word(*gotent);
 		}
 	} else {
 		plt1_pic_t *pltent;
@@ -709,17 +716,16 @@
 		pltent = (plt1_pic_t *) ((intptr_t) ofl->ofl_osplt->os_outdata->d_buf + pltoff);
 		(void) memcpy(pltent, &pltTemplate, M_PLT_ENTSIZE);
 		*gotent = ofl->ofl_osplt->os_shdr->sh_addr + pltoff + 
-			  OFFSETOF(plt1_pic_t, pltent, basr);
+			  OFFSETOF(plt1_pic_t, pltent, basr2);
 
-		SWORD(pltent->gotent) = (((Sword) ofl->ofl_osgot->os_shdr->sh_addr + gotoff) - 
-					  ((Sword) ofl->ofl_osplt->os_shdr->sh_addr + pltoff +
-					  OFFSETOF(plt1_pic_t, pltent, larl))) >> 1;
-		SWORD(pltent->plt0)   = (Sword) -(pltoff + OFFSETOF(plt1_pic_t, pltent, jg)) >> 1;
-		SWORD(pltent->gotoff) = rel_off;
+		SWORD(pltent->plt0)   = (Sword) -(pltoff + 
+						OFFSETOF(plt1_pic_t, pltent, jg)) >> 1;
+		SWORD(pltent->got)    = gotoff;
+		SWORD(pltent->symoff) = (sdp->sd_aux->sa_PLTndx - 1) * sizeof(Elf32_Rela);
 		if (bswap) {
-			WORD(pltent->gotent) = ld_bswap_Word((Word) pltent->gotent);
+			WORD(pltent->got)    = ld_bswap_Word((Word) pltent->got);
 			WORD(pltent->plt0)   = ld_bswap_Word((Word) pltent->plt0);
-			WORD(pltent->gotoff) = ld_bswap_Word((Word) pltent->gotoff);
+			WORD(pltent->symoff) = ld_bswap_Word((Word) pltent->symoff);
 			*gotent = ld_bswap_Word(*gotent);
 		}
 	}
@@ -741,7 +747,7 @@
 ld_perform_outreloc(Rel_desc * orsp, Ofl_desc * ofl)
 {
 	Os_desc *	relosp, * osp = 0;
-	Xword		ndx, roffset, value;
+	Word		ndx, roffset, value;
 	Sxword		raddend;
 	const Rel_entry	*rep;
 	Rela		rea;
@@ -820,8 +826,8 @@
 		roffset = (Word) (ofl->ofl_osgot->os_shdr->sh_addr) +
 		    sdp->sd_aux->sa_PLTGOTndx * M_GOT_ENTSIZE;
 
-		plt_entry(ofl, osp->os_relosdesc->os_szoutrels, sdp);
-
+		plt_entry(ofl, sdp);
+		raddend = 0;
 #if 0
 	} else if (orsp->rel_flags & FLG_REL_PLTOFF) {
 		/*
@@ -836,6 +842,7 @@
 
 		plt_entry(ofl, osp->os_relosdesc->os_szoutrels, sdp);
 
+		raddend = 0;
 #endif
 	} else if (orsp->rel_flags & FLG_REL_BSS) {
 		/*
@@ -850,13 +857,6 @@
 		 * relocation.  Null it out because it can confuse people.
 		 */
 		raddend = 0;
-	} else if (orsp->rel_flags & FLG_REL_REG) {
-		/*
-		 * The offsets of relocations against register symbols
-		 * identifiy the register directly - so the offset
-		 * does not need to be adjusted.
-		 */
-		roffset = orsp->rel_roffset;
 	} else {
 		osp = orsp->rel_osdesc;
 
@@ -902,9 +902,11 @@
 	 * the output sections symbols index.  Otherwise the index can be
 	 * derived from the symbols index itself.
 	 */
-	if (orsp->rel_rtype == R_390_RELATIVE)
+	if (orsp->rel_rtype == M_R_RELATIVE) {
 		ndx = STN_UNDEF;
-	else if ((orsp->rel_flags & FLG_REL_SCNNDX) ||
+		if (orsp->rel_flags & FLG_REL_GOT)
+			raddend = 0;
+	} else if ((orsp->rel_flags & FLG_REL_SCNNDX) ||
 	    (ELF_ST_TYPE(sdp->sd_sym->st_info) == STT_SECTION)) {
 		if (sectmoved == 0) {
 			/*
@@ -933,7 +935,8 @@
 	 * mean nothing.  The addend is propagated in the corresponding
 	 * R_390_TLS_DTPOFF* relocations.
 	 */
-	if (orsp->rel_rtype == M_R_DTPMOD)
+	if ((orsp->rel_rtype == M_R_DTPMOD) ||
+	    (orsp->rel_rtype == M_R_GLOB_DAT))
 		raddend = 0;
 
 	relbits = (char *)relosp->os_outdata->d_buf;
@@ -1279,7 +1282,8 @@
 			 * Add relocations addend to value.  Add extra
 			 * relocation addend if needed.
 			 */
-			value += arsp->rel_raddend;
+			if (arsp->rel_rtype != R_390_GOTENT) 
+				value += arsp->rel_raddend;
 
 			/*
 			 * Determine whether the value needs further adjustment.
@@ -1344,8 +1348,25 @@
 
 			} else if (IS_GOT_PC(arsp->rel_rtype) &&
 			    ((flags & FLG_OF_RELOBJ) == 0)) {
-				value =
-				    (Xword)(ofl->ofl_osgot->os_shdr->sh_addr) -
+				Xword		R1addr;
+				Gotndx		*gnp;
+
+				/*
+				 * For R_390_GOTPCDBL types we have not 
+				 * registered a GOT index - all we want
+				 * is the start of the GOT (i.e. index = 0)
+				 */
+				if (arsp->rel_rtype != R_390_GOTPCDBL) {
+					gnp = ld_find_gotndx(&(sdp->sd_GOTndxs), gref,
+					    ofl, 0);
+					assert(gnp);
+					R1addr = (Xword)(gnp->gn_gotndx * M_GOT_ENTSIZE);
+				} else {
+					R1addr = 0;
+				}
+
+				value = (R1addr + 
+				    (Xword)(ofl->ofl_osgot->os_shdr->sh_addr)) -
 				    refaddr;
 
 			} else if ((IS_PC_RELATIVE(arsp->rel_rtype)) &&
@@ -1701,7 +1722,7 @@
 			return (ld_add_outrel((FLG_REL_SCNNDX | FLG_REL_ADVAL),
 			    rsp, ofl));
 
-		rsp->rel_rtype = R_390_RELATIVE;
+		rsp->rel_rtype = M_R_RELATIVE;
 		if (ld_add_outrel(FLG_REL_ADVAL, rsp, ofl) == S_ERROR)
 			return (S_ERROR);
 		rsp->rel_rtype = ortype;
@@ -1806,7 +1827,7 @@
 				 */
 				if (((flags & FLG_OF_EXEC) == 0) &&
 				    (rtype == R_390_TLS_IE64)) {
-					rsp->rel_rtype = R_390_RELATIVE;
+					rsp->rel_rtype = M_R_RELATIVE;  
 					return (ld_add_outrel(NULL, rsp, ofl));
 				}
 				return (1);
@@ -1863,16 +1884,20 @@
 		    ofl, MSG_STR_TLSREL)) == (Sym_desc *)S_ERROR)
 			return (S_ERROR);
 
-		rsp->rel_sym   = tlsgetsym;
-		rsp->rel_sname = tlsgetsym->sd_name;
-		rsp->rel_rtype = R_390_PLT32DBL;
+		rsp->rel_sym   	  = tlsgetsym;
+		rsp->rel_sname 	  = tlsgetsym->sd_name;
+		rsp->rel_rtype    = R_390_PLT32DBL;
+		rsp->rel_roffset += 2;
+		rsp->rel_raddend += 2;
 
 		if (ld_reloc_plt(rsp, ofl) == S_ERROR)
 			return (S_ERROR);
 
-		rsp->rel_sym = sdp;
-		rsp->rel_sname = sdp->sd_name;
-		rsp->rel_rtype = rtype;
+		rsp->rel_sym 	  = sdp;
+		rsp->rel_sname 	  = sdp->sd_name;
+		rsp->rel_rtype 	  = rtype;
+		rsp->rel_roffset -= 2;
+		rsp->rel_raddend -= 2;
 		return (1);
 	}
 
@@ -1966,6 +1991,7 @@
 {
 	Gotndx	*gnp;
 	uint_t	gotents;
+	Xword	raddend;
 
 	if (pgnp)
 		return (1);
@@ -1975,11 +2001,13 @@
 	else
 		gotents = 1;
 
+	raddend = rsp->rel_raddend;
+
 	if ((gnp = libld_calloc(sizeof (Gotndx), 1)) == 0)
 		return (S_ERROR);
-	gnp->gn_gotndx = ofl->ofl_gotcnt;
-	gnp->gn_gotref = gref;
-
+	gnp->gn_gotndx   = ofl->ofl_gotcnt;
+	gnp->gn_gotref   = gref;
+	gnp->gn_addend   = raddend;
 	ofl->ofl_gotcnt += gotents;
 
 	if (gref == GOT_REF_TLSLD) {
--- a/usr/src/cmd/sgs/librtld/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/librtld/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -40,6 +40,3 @@
 lint:		$(LINTLIB) $(LINTOUT32) $(SGSLINTOUT)
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.targ
-
-# HACK to use GNU mapfile
-DYNFLAGS +=  -_gcc=-Wl,-Map=map-script -_gcc=-Wl,--version-script=mapfile-vers.gnu
--- a/usr/src/cmd/sgs/librtld/s390/_relocate.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/librtld/s390/_relocate.c	Mon Mar 23 14:01:42 2009 -0400
@@ -141,7 +141,7 @@
 	} else {
 		if (IS_EXTOFFSET(type))
 			value += ELF_R_TYPE_DATA(rel->r_info);
-		(void) do_reloc(type, oaddr, &value, reloc->r_name, name,
+		(void) do_reloc_rtld(type, oaddr, &value, reloc->r_name, name,
 		    LIST(lmp));
 	}
 }
--- a/usr/src/cmd/sgs/librtld/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/librtld/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -53,7 +53,3 @@
 
 CONVLIBDIR =	$(CONVLIBDIR64)
 ELFLIBDIR =	$(ELFLIBDIR64)
-
-# HACK to use GNU mapfile
-DYNFLAGS +=  -_gcc=-Wl,-Map=map-script -_gcc=-Wl,--version-script=mapfile-vers.gnu
-
--- a/usr/src/cmd/sgs/librtld/s390x/_relocate.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/librtld/s390x/_relocate.c	Mon Mar 23 14:01:42 2009 -0400
@@ -142,7 +142,7 @@
 	} else {
 		if (IS_EXTOFFSET(type))
 			value += ELF_R_TYPE_DATA(rel->r_info);
-		(void) do_reloc(type, oaddr, &value, reloc->r_name, name,
+		(void) do_reloc_rtld(type, oaddr, &value, reloc->r_name, name,
 		    LIST(lmp));
 	}
 }
--- a/usr/src/cmd/sgs/link_audit/common/who.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/link_audit/common/who.h	Mon Mar 23 14:01:42 2009 -0400
@@ -33,7 +33,7 @@
 #include <sys/frame.h>
 #include <sys/elf.h>
 
-#if defined(__sparcv9)
+#if defined(__sparcv9) || defined(__s390x)
 #define	Elf_Ehdr	Elf64_Ehdr
 #define	Elf_Phdr	Elf64_Phdr
 #define	Elf_Shdr	Elf64_Shdr
@@ -73,7 +73,7 @@
 #endif
 #endif
 
-#if defined(__x86)
+#if defined(__x86) || defined(__s390)
 #define	FLUSHWIN()
 #endif
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/s390/mapfile-vers-bindings	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,35 @@
+#
+#ident	"@(#)mapfile-vers-bindings	1.2	05/06/08 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
+#
+
+SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+		la_s390_pltenter;
+	local:
+		*;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/s390/mapfile-vers-perfcnt	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,36 @@
+#
+#ident	"@(#)mapfile-vers-perfcnt	1.2	05/06/08 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
+#
+
+SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+		la_s390_pltenter;
+		la_pltexit;
+	local:
+		*;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/s390/mapfile-vers-symbindrep	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,36 @@
+#
+#ident	"@(#)mapfile-vers-symbindrep	1.2	05/06/08 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
+#
+
+SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+		la_preinit;
+		la_symbind32;
+	local:
+		*;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/s390/mapfile-vers-truss	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+#ident	"@(#)mapfile-vers-truss	1.2	05/06/08 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
+#
+
+SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+		la_pltexit;
+		la_s390_pltenter;
+		la_symbind32;
+	local:
+		*;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sgs/link_audit/s390/mapfile-vers-who	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,36 @@
+#
+#ident	"@(#)mapfile-vers-who	1.2	05/06/08 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
+#
+
+SUNWprivate_1.1 {
+	global:
+		la_version;		# Audit interfaces
+		la_objopen;
+		la_objclose;
+		la_s390_pltenter;
+	local:
+		*;
+};
--- a/usr/src/cmd/sgs/rtld/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -98,10 +98,7 @@
 		$(RTLDLIB) -lrtld \
 		$(LDLIB) $(LD_LIB) 
 
-sparc_DYNFLAGS = -i
-i386_DYNFLAGS = -i
-s390_DYNFLAGS = 
-DYNFLAGS +=	$($(MACH)_DYNFLAGS) -e _rt_boot $(VERSREF) $(ZNODLOPEN) \
+DYNFLAGS +=	-i -e _rt_boot $(VERSREF) $(ZNODLOPEN) \
 		$(ZINTERPOSE) -zdtrace=dtrace_data '-R$$ORIGIN'
 
 BUILD.s=	$(AS) $(ASFLAGS) $< -o $@
--- a/usr/src/cmd/sgs/rtld/common/elf.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/common/elf.c	Mon Mar 23 14:01:42 2009 -0400
@@ -253,7 +253,7 @@
 	if (elf_needed(lml, ALIST_OFF_DATA, lmp, NULL) == 0)
 		return (0);
 
-#if	defined(__i386) || defined(__s390)
+#if	defined(__i386)
 	/*
 	 * This is a kludge to give ld.so.1 a performance benefit on i386.
 	 * It's based around two factors.
--- a/usr/src/cmd/sgs/rtld/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 
 P_MACHOBJS=	s390_elf.o	_setup.o
 
-CP_MACHOBJS=	pics/liblddbg.a
+CP_MACHOBJS=	
 
 P_ASOBJS=	boot.o		boot_elf.o	caller.o	zero.o
 
@@ -68,12 +68,11 @@
 CPPFLAGS +=	-I../../../../uts/s390x/krtld 
 CFLAGS +=	-_gcc=-Wa,-mzarch
 ASFLAGS +=	-fPIC
-LINTFLAGS +=	-DA_OUT
+LINTFLAGS +=	
 ADBGENCFLAGS +=	-erroff=%all
 ADBGENFLAGS +=	-milp32
 ADBSUB=		$(ADBSUB32)
 SONAME=		$(VAR_RTLD_SONAME)
-DYNFLAGS +=	-zlazyload -Bsymbolic 
 
 MAPFILES +=	../common/mapfile-32-vers
 
@@ -81,12 +80,7 @@
 
 .KEEP_STATE:
 
-all:		pics/liblddbg.a $(RTLD)
-
-pics/liblddbg.a:	
-		@mkdir -p pics
-		@rm -f $@
-		@ar -rc $@ ../../liblddbg/s390/pics/*.o
+all:		$(RTLD)
 
 install:	all $(ROOTDYNLIB) $(VAR_RTLD_ETCDYNLIB)
 
--- a/usr/src/cmd/sgs/rtld/s390/_setup.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390/_setup.c	Mon Mar 23 14:01:42 2009 -0400
@@ -288,8 +288,12 @@
 		ulong_t	roffset;
 
 		roffset = ((Rela *)reladdr)->r_offset + ld_base;
-		*((ulong_t *)roffset) = ld_base +
-		    ((Rela *)reladdr)->r_addend;
+		if (ELF_R_TYPE(((Rela *)reladdr)->r_info, M_MACH) == R_390_JMP_SLOT)
+			*((ulong_t *)roffset) += ld_base +
+			    ((Rela *)reladdr)->r_addend;
+		else
+			*((ulong_t *)roffset) = ld_base +
+			    ((Rela *)reladdr)->r_addend;
 		reladdr += relaent;
 	}
 
--- a/usr/src/cmd/sgs/rtld/s390/boot.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390/boot.s	Mon Mar 23 14:01:42 2009 -0400
@@ -67,8 +67,6 @@
 /*                 I n c l u d e s                                  */
 /*------------------------------------------------------------------*/
 
-#pragma ident   "%Z%%M% %I%     %E% NAF"
-
 #include <sys/asm_linkage.h>
 #include <sys/param.h>
 #include <link.h>
@@ -186,7 +184,9 @@
 	stm	%r6,%r14,24(%r15)
 	lr	%r11,%r15
 	lr	%r2,%r15
-	ahi	%r15,-SA(MINFRAME32 + (EB_MAX * 16))
+	ahi	%r15,-SA(MINFRAME32 + (EB_MAX * 16)+7)
+	lhi	%r0,-8
+	nr	%r15,%r0
 	ahi	%r11,-SA(MINFRAME32)
 	ahi	%r2,SA(MINFRAME32)
 
@@ -280,6 +280,7 @@
 	l	%r3,EBOFF_ARGV(%r11)	// Get **argv
 	l	%r4,EBOFF_ENVP(%r11)	// Get envp
 	larl	%r5,atexit_fini		// Get exit function
+	stm	%r2,%r4,0(%r15)		// For glibc-compatibility only
 	br	%r6			// Call main program
 	.size	_rt_boot, . - _rt_boot
 #endif
--- a/usr/src/cmd/sgs/rtld/s390/boot_elf.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390/boot_elf.s	Mon Mar 23 14:01:42 2009 -0400
@@ -220,7 +220,7 @@
 	 * routine.  Instead we jump to it and remove ourself
 	 * from the stack at the same time.
 	 */
-	l	%r1,audit_flags(%r12)			// Get Audit Flags
+	larl	%r1,audit_flags				// Get Audit Flags
 	lb	%r1,0(%r1)
 	lhi	%r0,AF_PLTEXIT
 	nr	%r0,%r1					// Do we need to record exit
@@ -268,7 +268,7 @@
 	 *	 by 4 which is the 'word size' to calculate the amount
 	 *	 of stack space needed.
 	 */
-	l	%r7,audit_argcnt(%r12)
+	larl	%r7,audit_argcnt
 	l	%r7,0(%r7)			// r7 = audit_argcnt
 	chi	%r7,5				// Fit in registers?
 	jle	.grow_stack			// Yes... Skip
--- a/usr/src/cmd/sgs/rtld/s390/s390_elf.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390/s390_elf.c	Mon Mar 23 14:01:42 2009 -0400
@@ -57,8 +57,6 @@
 /*                 I n c l u d e s                                  */
 /*------------------------------------------------------------------*/
 
-#include	"gnu_pragma.h"
-
 #include	<stdio.h>
 #include	<sys/elf.h>
 #include	<sys/elf_s390.h>
@@ -672,7 +670,8 @@
 		/*
 		 * Perform the actual relocation.
 		 */
-		*((ulong_t *)roffset) += basebgn;
+		*((ulong_t *)roffset) = basebgn + 
+					((Rela *)relbgn)->r_addend;
 
 		relbgn += relsiz;
 
@@ -738,16 +737,13 @@
 	relsiz = (ulong_t)(RELENT(lmp));
 	basebgn = ADDR(lmp);
 	emap = ADDR(lmp) + MSIZE(lmp);
-#if 0
-	fprintf(stderr,"elf_reloc (s390): init %s=%lx [%lx]\n", NAME(lmp), basebgn, emap);
-#endif
 
 	if (PLTRELSZ(lmp))
 		plthint = PLTRELSZ(lmp) / relsiz;
 
 	/*
 	 * If we've been called upon to promote an RTLD_LAZY object to an
-	 * RTLD_NOW then we're only interested in scaning the .plt table.
+	 * RTLD_NOW then we're only interested in scanning the .plt table.
 	 * An uninitialized .plt is the case where the associated got entry
 	 * points back to the plt itself.  Determine the range of the real .plt
 	 * entries using the _PROCEDURE_LINKAGE_TABLE_ symbol.
@@ -884,9 +880,26 @@
 			if (plthint && (plt == 0) &&
 			    (rtype == R_390_JMP_SLOT) &&
 			    ((MODE(lmp) & RTLD_NOW) == 0)) {
-				relbgn = elf_reloc_relacount(relbgn,
-				    plthint, relsiz, basebgn);
-				plthint = 0;
+				/*
+				 * The PLT relocations (for lazy bindings)
+				 * are additive to what's already in the GOT.
+				 * This differs to what happens in
+				 * elf_reloc_relacount() and that's why we
+				 * just do it inline here.
+				 */
+				for (roffset = ((Rela *)relbgn)->r_offset;
+				    plthint; plthint--) {
+					roffset += basebgn;
+
+					/*
+					 * Perform the actual relocation.
+					 */
+					*((ulong_t *)roffset) += basebgn;
+
+					relbgn += relsiz;
+					roffset = ((Rela *)relbgn)->r_offset;
+
+				}
 				continue;
 			}
 			roffset += basebgn;
@@ -1216,9 +1229,6 @@
 			break;
 
 		if (binfo) {
-#if 0
-			printf("elf_reloc (s390): %s=%x\n",name,value);
-#endif
 			DBG_CALL(Dbg_bind_global(lmp, (Addr)roffset,
 			    (Off)(roffset - basebgn), (Xword)(-1), PLT_T_FULL,
 			    _lmp, (Addr)value, symdef->st_value, name, binfo));
--- a/usr/src/cmd/sgs/rtld/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -43,8 +43,7 @@
 
 P_MACHOBJS=	s390x_elf.o	_setup.o
 
-CP_MACHOBJS=	dtrace_data.o	\
-		liblddbg.a
+CP_MACHOBJS=	dtrace_data.o	
 
 S_MACHOBJS=	
 
@@ -61,10 +60,9 @@
 
 BASEPLAT=	s390
 
-# __GNUC is overridden in the environment when building with gcc
-__GNUC:sh=		echo \\043
+include		$(SRC)/Makefile.master
 
-# We build s390x objects with cc by default
+# We build s390x objects with gcc by default
 MAPFILE-ORDER =		../common/mapfile-order-devpro
 $(__GNUC)MAPFILE-ORDER =	../common/mapfile-order-gcc
 
@@ -82,7 +80,8 @@
 CPPFLAGS +=	-D_ELF64
 LINTFLAGS64 +=	$(VAR_LINTFLAGS64)
 SONAME=		$(VAR_RTLD_S390X_SONAME)
-DYNFLAGS += 	-melf64_s390 -zlazyload -Bsymbolic 
+
+MAPFILES +=	../common/mapfile-64-vers
 
 SGSMSGTARG +=	$(SGSMSGZSERIES) $(SGSMSGZSERIES64) $(SGSMSG64)
 
@@ -96,12 +95,7 @@
 
 .KEEP_STATE:
 
-all:		pics/liblddbg.a $(RTLD)
-
-pics/liblddbg.a:	
-		@mkdir -p pics
-		@rm -f $@
-		@ar -rc $@ ../../liblddbg/s390x/pics/*.o
+all:		$(RTLD)
 
 install:	all $(ROOTDYNLIB64)
 
--- a/usr/src/cmd/sgs/rtld/s390x/_setup.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390x/_setup.c	Mon Mar 23 14:01:42 2009 -0400
@@ -290,8 +290,12 @@
 		ulong_t	roffset;
 
 		roffset = ((Rela *)reladdr)->r_offset + ld_base;
-		*((ulong_t *)roffset) = ld_base +
-		    ((Rela *)reladdr)->r_addend;
+		if (ELF_R_TYPE(((Rela *)reladdr)->r_info, M_MACH) == R_390_JMP_SLOT)
+			*((ulong_t *)roffset) += ld_base +
+			    ((Rela *)reladdr)->r_addend;
+		else
+			*((ulong_t *)roffset) = ld_base +
+			    ((Rela *)reladdr)->r_addend;
 		reladdr += relaent;
 	}
 
--- a/usr/src/cmd/sgs/rtld/s390x/boot.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390x/boot.s	Mon Mar 23 14:01:42 2009 -0400
@@ -282,6 +282,7 @@
 	lg	%r3,EBOFF_ARGV(%r11)	// Get **argv
 	lg	%r4,EBOFF_ENVP(%r11)	// Get envp
 	larl	%r5,atexit_fini
+	stmg	%r2,%r4,0(%r15)		// For glibc compatibility only
 	br	%r6			// Call main program
 	.size	_rt_boot, . - _rt_boot
 #endif
--- a/usr/src/cmd/sgs/rtld/s390x/boot_elf.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390x/boot_elf.s	Mon Mar 23 14:01:42 2009 -0400
@@ -223,7 +223,7 @@
 	 * routine.  Instead we jump to it and remove ourself
 	 * from the stack at the same time.
 	 */
-	lg	%r1,audit_flags(%r12)			// Get Audit Flags
+	larl	%r1,audit_flags				// Get Audit Flags
 	lb	%r1,0(%r1)
 	lghi	%r0,AF_PLTEXIT
 	ngr	%r0,%r1					// Do we need to record exit
@@ -271,7 +271,7 @@
 	 *	 by 4 which is the 'word size' to calculate the amount
 	 *	 of stack space needed.
 	 */
-	lg	%r7,audit_argcnt(%r12)
+	larl	%r7,audit_argcnt
 	lg	%r7,0(%r7)			// r7 = audit_argcnt
 	cghi	%r7,5				// Fit in registers?
 	jle	.grow_stack			// Yes... Skip
--- a/usr/src/cmd/sgs/rtld/s390x/caller.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390x/caller.s	Mon Mar 23 14:01:42 2009 -0400
@@ -18,10 +18,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
-/*                                                                  */
-/* Copyright 2008 Sine Nomine Associates.                           */
-/* All rights reserved.                                             */
-/* Use is subject to license terms.                                 */
+ *
+ * Copyright 2008 Sine Nomine Associates.
+ * All rights reserved.
+ * Use is subject to license terms.
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
--- a/usr/src/cmd/sgs/rtld/s390x/s390x_elf.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/rtld/s390x/s390x_elf.c	Mon Mar 23 14:01:42 2009 -0400
@@ -57,8 +57,6 @@
 /*                 I n c l u d e s                                  */
 /*------------------------------------------------------------------*/
 
-#include	"gnu_pragma.h"
-
 #include	<stdio.h>
 #include	<sys/elf.h>
 #include	<sys/elf_s390.h>
@@ -664,7 +662,8 @@
 		/*
 		 * Perform the actual relocation.
 		 */
-		*((ulong_t *)roffset) += basebgn;
+		*((ulong_t *)roffset) = basebgn + 
+					((Rela *)relbgn)->r_addend;
 
 		relbgn += relsiz;
 
@@ -730,11 +729,6 @@
 	relsiz = (ulong_t)(RELENT(lmp));
 	basebgn = ADDR(lmp);
 	emap = ADDR(lmp) + MSIZE(lmp);
-#if 0
-{
-	fprintf(stderr,"elf_reloc (s390): init %s=%lx [%lx]\n", NAME(lmp), basebgn, emap);
-}
-#endif
 
 	if (PLTRELSZ(lmp))
 		plthint = PLTRELSZ(lmp) / relsiz;
@@ -878,9 +872,26 @@
 			if (plthint && (plt == 0) &&
 			    (rtype == R_390_JMP_SLOT) &&
 			    ((MODE(lmp) & RTLD_NOW) == 0)) {
-				relbgn = elf_reloc_relacount(relbgn,
-				    plthint, relsiz, basebgn);
-				plthint = 0;
+				/*
+				 * The PLT relocations (for lazy bindings)
+				 * are additive to what's already in the GOT.
+				 * This differs to what happens in
+				 * elf_reloc_relacount() and that's why we
+				 * just do it inline here.
+				 */
+				for (roffset = ((Rela *)relbgn)->r_offset;
+				    plthint; plthint--) {
+					roffset += basebgn;
+
+					/*
+					 * Perform the actual relocation.
+					 */
+					*((ulong_t *)roffset) += basebgn;
+
+					relbgn += relsiz;
+					roffset = ((Rela *)relbgn)->r_offset;
+
+				}
 				continue;
 			}
 			roffset += basebgn;
--- a/usr/src/cmd/sgs/size/common/process.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sgs/size/common/process.c	Mon Mar 23 14:01:42 2009 -0400
@@ -60,6 +60,7 @@
 	"%lld + %lld + %lld = %lld\n"
 };
 
+static void	process_phdr(Elf *elf, GElf_Half num);
 
 void
 process(Elf * elf)
@@ -92,7 +93,6 @@
 	int		notfirst = 0;
 	int		i;
 	char		*name = 0;
-	static void	process_phdr(Elf *elf, GElf_Half num);
 
 /*
  * If there is a program header and the -f flag requesting section infor-
--- a/usr/src/cmd/smbsrv/smbadm/smbadm.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/smbsrv/smbadm/smbadm.c	Mon Mar 23 14:01:42 2009 -0400
@@ -392,7 +392,7 @@
 static int
 smbadm_join(int argc, char **argv)
 {
-	char option;
+	int option;
 	smb_joininfo_t jdi;
 	boolean_t join_w = B_FALSE;
 	boolean_t join_d = B_FALSE;
@@ -596,7 +596,7 @@
 {
 	char *gname = NULL;
 	char *desc = NULL;
-	char option;
+	int option;
 	int status;
 
 	while ((option = getopt(argc, argv, "d:")) != -1) {
@@ -733,7 +733,7 @@
 	char *gname = NULL;
 	boolean_t show_privs;
 	boolean_t show_members;
-	char option;
+	int option;
 	int status;
 	smb_group_t grp;
 	smb_giter_t gi;
@@ -881,7 +881,7 @@
 	char *gname = NULL;
 	smbadm_prop_t props[SMBADM_NPROP];
 	smbadm_prop_handle_t *phandle;
-	char option;
+	int option;
 	int pcnt = 0;
 	int ret;
 	int p;
@@ -941,7 +941,7 @@
 	char *gname = NULL;
 	smbadm_prop_t props[SMBADM_NPROP];
 	smbadm_prop_handle_t *phandle;
-	char option;
+	int option;
 	int pcnt = 0;
 	int ret;
 	int p;
@@ -1003,8 +1003,8 @@
 {
 	char *gname = NULL;
 	char **mname;
-	char option;
 	smb_gsid_t msid;
+	int option;
 	int status;
 	int mcnt = 0;
 	int ret = 0;
@@ -1081,8 +1081,8 @@
 {
 	char *gname = NULL;
 	char **mname;
-	char option;
 	smb_gsid_t msid;
+	int option;
 	int status;
 	int mcnt = 0;
 	int ret = 0;
--- a/usr/src/cmd/spell/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/spell/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -54,7 +54,7 @@
 
 include ../Makefile.cmd
 
-CFLAGS += $(CCVERBOSE)
+CFLAGS += $(CCVERBOSE) -I$(ROOT)/usr/include
 
 XGETFLAGS += -a -x spell.xcl
 
@@ -78,6 +78,7 @@
 $(ROOTVARADMF) :=	FILEMODE =	0666
 
 spellin1 hashmk1 := CC = $(NATIVECC)
+$(s390_BLD)spellin1 hashmk1 := CC = $(XBUILDCC)
 spellin1 hashmk1 := POST_PROCESS =
 spellin1 hashmk1 := CPPFLAGS =
 spellin1 hashmk1 := LDFLAGS =
--- a/usr/src/cmd/sqlite/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/sqlite/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -52,7 +52,7 @@
 		-I$(SQLITEHDRDIR)
 
 $(PROG): $(OBJS) $(SQLITEHDRDIR)/sqlite.h
-	$(LINK.c) -o $@ $(OBJS) \
+	$(LINK.c) -o $@ $(OBJS) -L$(ROOT)/usr/lib \
 	    $(MAPFILE.NES:%=-M%) $(MAPFILE.NED:%=-M%) $(LIBSQLITE)
 	$(CTFMERGE) -t -L VERSION -o $@ $(OBJS) $(LIBSQLITE)
 	$(POST_PROCESS)
--- a/usr/src/cmd/ssh/libopenbsd-compat/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ssh/libopenbsd-compat/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -27,4 +27,6 @@
 
 include ../Makefile.com
 
+CFLAGS += -DHAVE_VA_COPY
+
 install: all
--- a/usr/src/cmd/ssh/libopenbsd-compat/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ssh/libopenbsd-compat/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,4 +28,6 @@
 
 include ../Makefile.com
 
+CFLAGS += -DHAVE_VA_COPY
+
 install: all
--- a/usr/src/cmd/ssh/libssh/common/packet.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ssh/libssh/common/packet.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1398,7 +1398,7 @@
  */
 
 void *
-packet_get_string(u_int *length_ptr)
+packet_get_string(uint_t *length_ptr)
 {
 	return buffer_get_string(&incoming_packet, length_ptr);
 }
--- a/usr/src/cmd/ssh/libssh/common/ssh-gss.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ssh/libssh/common/ssh-gss.c	Mon Mar 23 14:01:42 2009 -0400
@@ -740,7 +740,7 @@
 	ret = snprintf(name_buf.value, name_buf.length + 1, "%s@%s",
 	    SSH_GSS_HOSTBASED_SERVICE, server_host);
 
-	debug3("%s: snprintf() returned %d, expected %d", __func__, ret,
+	debug3("%s: snprintf() returned %d, expected %ld", __func__, ret,
 	    name_buf.length + 1);
 
 	ctx->major = gss_import_name(&ctx->minor, &name_buf,
--- a/usr/src/cmd/ssh/ssh/sshconnect1.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ssh/ssh/sshconnect1.c	Mon Mar 23 14:01:42 2009 -0400
@@ -403,6 +403,7 @@
 	MSG_DAT msg_data;
 	struct sockaddr_in local, foreign;
 	struct stat st;
+	uint_t gssLen;
 
 	/* Don't do anything if we don't have any tickets. */
 	if (stat(tkt_string(), &st) < 0)
@@ -468,7 +469,8 @@
 		debug("Kerberos v4 authentication accepted.");
 
 		/* Get server's response. */
-		reply = packet_get_string((u_int *) &auth.length);
+		reply = packet_get_string(&gssLen);
+		gssLen = auth.length;
 		if (auth.length >= MAX_KTXT_LEN)
 			fatal("Kerberos v4: Malformed response from server");
 		memcpy(auth.dat, reply, auth.length);
@@ -522,6 +524,7 @@
 	int type;
 	krb5_ap_rep_enc_part *reply = NULL;
 	int ret;
+	uint_t gssLen;
 
 	memset(&ap, 0, sizeof(ap));
 
@@ -599,7 +602,8 @@
 		debug("Kerberos v5 authentication accepted.");
 
 		/* Get server's response. */
-		ap.data = packet_get_string((unsigned int *) &ap.length);
+		ap.data = packet_get_string(&gssLen);
+		gssLen = ap.length;
 		packet_check_eom();
 		/* XXX je to dobre? */
 
--- a/usr/src/cmd/ssh/ssh/sshconnect2.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ssh/ssh/sshconnect2.c	Mon Mar 23 14:01:42 2009 -0400
@@ -770,12 +770,14 @@
 	Authctxt *authctxt = ctxt;
 	Gssctxt *gssctxt;
 	gss_buffer_desc send_tok, recv_tok;
+	uint_t gssLen;
 	
 	if (authctxt == NULL)
 		fatal("input_gssapi_response: no authentication context");
 	gssctxt = authctxt->methoddata;
 	
-	recv_tok.value=packet_get_string(&recv_tok.length);
+	recv_tok.value=packet_get_string(&gssLen);
+	gssLen = recv_tok.length;
 
 	/* Stick it into GSSAPI and see what it says */
 	(void) ssh_gssapi_init_ctx(gssctxt, authctxt->host,
--- a/usr/src/cmd/ssh/sshd/auth2-gss.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ssh/sshd/auth2-gss.c	Mon Mar 23 14:01:42 2009 -0400
@@ -58,6 +58,7 @@
 	gss_buffer_desc g_mic_data, mic_tok;
 	Buffer mic_data;
 	OM_uint32 maj_status, min_status;
+	uint_t gssLen;
 
 	if (authctxt == NULL || authctxt->method == NULL)
 		fatal("No authentication context during gssapi-keyex userauth");
@@ -79,7 +80,8 @@
 	g_mic_data.value  = buffer_ptr(&mic_data);
 	g_mic_data.length = buffer_len(&mic_data);
 
-	mic_tok.value = packet_get_string(&mic_tok.length);
+	mic_tok.value = packet_get_string(&gssLen);
+	gssLen = mic_tok.length;
 
 	maj_status = gss_verify_mic(&min_status, xxx_gssctxt->context,
 	    &g_mic_data, &mic_tok, NULL);
@@ -249,6 +251,7 @@
 	Authctxt *authctxt = ctxt;
 	Gssctxt *gssctxt;
 	gss_buffer_desc send_tok, recv_tok;
+	uint_t gssLen;
 
 	if (authctxt == NULL || authctxt->method == NULL ||
 	    (authctxt->method->method_data == NULL)) {
@@ -257,7 +260,8 @@
 	}
 
 	gssctxt = authctxt->method->method_data;
-	recv_tok.value = packet_get_string(&recv_tok.length);
+	recv_tok.value = packet_get_string(&gssLen);
+	gssLen  = recv_tok.length;
 	packet_check_eom();
 
 	/* Push the error token into GSSAPI to see what it says */
@@ -291,6 +295,7 @@
 	gss_buffer_desc g_mic_data, mic_tok;
 	Buffer mic_data;
 	OM_uint32 maj_status, min_status;
+	uint_t gssLen;
 
 	if (authctxt == NULL || authctxt->method == NULL ||
 	    (authctxt->method->method_data == NULL)) {
@@ -312,7 +317,8 @@
 	g_mic_data.value  = buffer_ptr(&mic_data);
 	g_mic_data.length = buffer_len(&mic_data);
 
-	mic_tok.value = packet_get_string(&mic_tok.length);
+	mic_tok.value = packet_get_string(&gssLen);
+	gssLen = mic_tok.length;
 
 	maj_status = gss_verify_mic(&min_status, gssctxt->context,
 	    &g_mic_data, &mic_tok, NULL);
@@ -469,7 +475,7 @@
 		if (major == GSS_S_COMPLETE) {
 			log("Authorized principal %.*s, authenticated with "
 			    "GSS mechanism %s, to: %s",
-			    dispname.length, (char *)dispname.value,
+			    (uint_t)dispname.length, (char *)dispname.value,
 			    ssh_gssapi_oid_to_name(gssctxt->actual_mech),
 			    authctxt->user);
 		}
--- a/usr/src/cmd/stat/common/acquire.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/stat/common/acquire.c	Mon Mar 23 14:01:42 2009 -0400
@@ -121,7 +121,7 @@
 {
 	psetid_t *pids = NULL;
 	struct pset_snapshot *ps;
-	size_t pids_nr;
+	uint_t pids_nr;
 	size_t i, j;
 
 	/*
--- a/usr/src/cmd/stmsboot/stmsboot_util.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/stmsboot/stmsboot_util.c	Mon Mar 23 14:01:42 2009 -0400
@@ -339,7 +339,7 @@
 static void
 parse_args(int argc, char *argv[])
 {
-	char opt;
+	int opt;
 
 	if (argc == 1)
 		usage();
--- a/usr/src/cmd/svc/configd/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/svc/configd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -67,6 +67,8 @@
 
 $(NATIVE_BUILD)CC =	$(NATIVECC)
 $(NATIVE_BUILD)LD =	$(NATIVELD)
+$(s390_BLD)$(NATIVE_BUILD)CC =	$(XBUILDCC)
+$(s390_BLD)$(NATIVE_BUILD)LD =	$(XBUILDCC)
 $(NATIVE_BUILD)CFLAGS =	$(NATIVE_CFLAGS)
 $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
 $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD
--- a/usr/src/cmd/svc/svccfg/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/svc/svccfg/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -64,10 +64,7 @@
 # still export a number of "yy*" (libl) interfaces.  Reduce all other symbols
 # to local scope.
 MAPFILES +=	$(MAPFILE.LEX) $(MAPFILE.NGB)
-sparc_MAPOPTS =	$(MAPFILES:%=-M%)
-i386_MAPOPTS =	$(MAPFILES:%=-M%)
-s390_MAPOPTS =
-MAPOPTS	=	$($(MACH)_MAPOPTS)
+MAPOPTS =	$(MAPFILES:%=-M%)
 
 MYCPPFLAGS =	-I ../common -I$(ROOT)/usr/include/libxml2 -I/usr/include/libxml2
 CPPFLAGS +=	$(MYCPPFLAGS)
@@ -95,6 +92,8 @@
 
 $(NATIVE_BUILD)CC =	$(NATIVECC)
 $(NATIVE_BUILD)LD =	$(NATIVELD)
+$(s390_BLD)$(NATIVE_BUILD)CC =	$(XBUILDCC)
+$(s390_BLD)$(NATIVE_BUILD)LD =	$(XBUILDCC)
 $(NATIVE_BUILD)CFLAGS =	$(NATIVE_CFLAGS)
 $(NATIVE_BUILD)CPPFLAGS = \
 	-DNATIVE_BUILD \
--- a/usr/src/cmd/svc/svccfg/svccfg_main.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/svc/svccfg/svccfg_main.c	Mon Mar 23 14:01:42 2009 -0400
@@ -229,8 +229,10 @@
 	cmd = safe_malloc(MAX_CMD_LINE_SZ);
 	for (c = optind; c < argc; c++) {
 		(void) strlcat(cmd, argv[c], MAX_CMD_LINE_SZ);
-		(void) strlcat(cmd, " ", MAX_CMD_LINE_SZ);
+		if (c + 1 != argc)
+			(void) strlcat(cmd, " ", MAX_CMD_LINE_SZ);
 	}
+	(void) strlcat(cmd, "\n", MAX_CMD_LINE_SZ);
 
 	return (engine_exec(cmd));
 }
--- a/usr/src/cmd/troff/troff.d/devaps/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/troff/troff.d/devaps/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -77,6 +77,11 @@
 
 $(ROOTPROG) := FILEMODE = 555
 
+sparc_XCC = $(NATIVECC)
+i386_XCC = $(NATIVECC)
+s390_XCC = $(XBUILDCC)
+XCC = $($(MACH)_XCC)
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
@@ -88,7 +93,7 @@
 		$(POST_PROCESS)
 
 $(MAKEDEV):	$$@.c
-		$(NATIVECC) -O $(CPPFLAGS) -o $@ $@.c
+		$(XCC) -O $(CPPFLAGS) -o $@ $@.c
 
 $(COMMONOBJS) :	$$(@:%.o=%.c)
 		cd $(@D); $(MAKE) $(@F)
--- a/usr/src/cmd/truss/systable.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/truss/systable.c	Mon Mar 23 14:01:42 2009 -0400
@@ -430,7 +430,11 @@
 {"signotify",	3, DEC, NOV, DEC, HEX, HEX},			/* 205 */
 {"schedctl",	0, HEX, NOV},					/* 206 */
 {"pset",	5, DEC, NOV, DEC, HEX, HEX, HEX, HEX},		/* 207 */
+#ifndef __s390__
 {"sparc_utrap_install", 5, DEC, NOV, UTT, UTH, UTH, HEX, HEX},	/* 208 */
+#else
+{"cpcmd", 2, DEC, NOV, STG, DEC},				/* 208 */
+#endif
 {"resolvepath",	3, DEC, NOV, STG, RLK, DEC},			/* 209 */
 {"lwp_mutex_timedlock", 2, DEC, NOV, HEX, HEX},			/* 210 */
 {"lwp_sema_timedwait", 3, DEC, NOV, HEX, HEX, DEC},		/* 211 */
--- a/usr/src/cmd/vt/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/vt/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -32,7 +32,7 @@
 
 CFLAGS += $(CCVERBOSE)
 
-LDLIBS += -ldoor -lpam -lbsm
+LDLIBS += -L$(ROOT)/usr/lib -ldoor -lpam -lbsm
 
 .KEEP_STATE:
 
@@ -43,7 +43,7 @@
 	$(POST_PROCESS)
 
 vtinfo: $(VTINFO_SRC)
-	$(LINK.c) -o $@ $(VTINFO_SRC)
+	$(LINK.c) -o $@ $(VTINFO_SRC) -L$(ROOT)/usr/lib
 	$(POST_PROCESS)
 
 install: all $(ROOTLIBPROG)
--- a/usr/src/cmd/xargs/xargs.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/xargs/xargs.c	Mon Mar 23 14:01:42 2009 -0400
@@ -142,7 +142,7 @@
 {
 	int	j;
 	struct inserts *psave;
-	int c;
+	int	c;
 	int	initsize;
 	char	*cmdname, *initbuf, **initlist;
 
--- a/usr/src/cmd/ypcmd/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ypcmd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -221,37 +221,37 @@
 
 ypxfrd: $(YPXFRDOBJ) $(SHAREDOBJ)
 	$(LINK.cc) $(YPXFRDOBJ) $(SHAREDOBJ) \
-	-o $@ $(LDLIBS) -lc
+	-o $@ -L$(ROOT)/usr/lib $(LDLIBS) -lc
 	$(POST_PROCESS)
 
 ypxfr: $(YPXFROBJ) $(COMMONOBJ) $(YPMASTEROBJ) $(SHAREDOBJ)
 	$(LINK.cc) -o $@ $(YPXFROBJ) $(YPMASTEROBJ) $(COMMONOBJ) \
-		$(SHAREDOBJ) $(LDLIBS)
+		$(SHAREDOBJ) -L$(ROOT)/usr/lib $(LDLIBS)
 	$(POST_PROCESS)
 
 ypserv: $(YPSERVOBJ) $(COMMONOBJ) $(SHAREDOBJ)
 	$(LINK.cc) $(YPSERVOBJ) $(COMMONOBJ) \
-		$(SHAREDOBJ) -o $@ $(LDLIBS)
+		$(SHAREDOBJ) -o $@ -L$(ROOT)/usr/lib $(LDLIBS)
 	$(POST_PROCESS)
 
 yppush: $(YPPUSHOBJ) $(COMMONOBJ)
-	$(LINK.c) $(YPPUSHOBJ) $(COMMONOBJ) -o $@ $(LDLIBS)
+	$(LINK.c) $(YPPUSHOBJ) $(COMMONOBJ) -o $@ -L$(ROOT)/usr/lib $(LDLIBS)
 	$(POST_PROCESS)
 
 udpublickey: $(UDPUBLICKEYOBJ)
-	$(LINK.c) $(UDPUBLICKEYOBJ) -o $@
+	$(LINK.c) $(UDPUBLICKEYOBJ) -o $@ -L$(ROOT)/usr/lib
 	$(POST_PROCESS)
 
 mkalias: $(MKALIASOBJ)
-	$(LINK.c) $(MKALIASOBJ) -o $@ -lnsl
+	$(LINK.c) $(MKALIASOBJ) -o $@ -L$(ROOT)/usr/lib -lnsl
 	$(POST_PROCESS)
 
 stdethers: $(STDETHERSOBJ)
-	$(LINK.c) $(STDETHERSOBJ) -o $@ -lsocket
+	$(LINK.c) $(STDETHERSOBJ) -o $@ -L$(ROOT)/usr/lib -lsocket
 	$(POST_PROCESS)
 
 stdhosts: $(STDHOSTSOBJ)
-	$(LINK.c) $(STDHOSTSOBJ) -o $@ $(LDLIBS)
+	$(LINK.c) $(STDHOSTSOBJ) -o $@ -L$(ROOT)/usr/lib $(LDLIBS)
 	$(POST_PROCESS)
 
 install: all $(PROG) $(ROOTDIRS) $(ROOTETCFILE) $(ROOTYPFILES) $(IBINPROG) \
--- a/usr/src/cmd/ypcmd/makedbm.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ypcmd/makedbm.c	Mon Mar 23 14:01:42 2009 -0400
@@ -128,7 +128,7 @@
 	char *last_slash, *next_to_last_slash;
 	char *infilename, *outfilename, *mastername, *domainname,
 	    *interdomain_bind, *security, *lower_case_keys;
-	char *key_sep = DEFAULT_SEP;
+	char key_sep[MAXLINE];
 	char local_host[MAX_MASTER_NAME];
 	int cnt, i;
 	DBM *fdb;
@@ -140,6 +140,7 @@
 	/* Ignore existing umask, always force 077 (owner rw only) */
 	umask(077);
 
+	strcpy(key_sep, DEFAULT_SEP);
 	infile = outfile = NULL; /* where to get files */
 	/* name to imbed in database */
 	infilename = outfilename = mastername = domainname = interdomain_bind =
--- a/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c	Mon Mar 23 14:01:42 2009 -0400
@@ -58,6 +58,7 @@
 void detachfromtty();
 
 static int addr2netname(char *, SVCXPRT *);
+static int issock();
 
 int insecure;
 extern SVCXPRT *svctcp_create(int, uint_t, uint_t);
@@ -69,7 +70,6 @@
 	char *argv[];
 {
 	char *cmd;
-	static int issock();
 	int connmaxrec = RPC_MAXDATASIZE;
 	struct stat filestat;
 
--- a/usr/src/cmd/zic/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/zic/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -49,6 +49,11 @@
 TEXT_DOMAIN2=SUNW_OST_ZONEINFO
 MSGDOMAIN2=$(MSGROOT)/$(TEXT_DOMAIN2)
 
+sparc_XCC=	$(NATIVECC)
+i386_XCC=	$(NATIVECC)
+s390_XCC=	$(XBUILDCC) 
+XCC=		$($(MACH)_XCC)
+
 .KEEP_STATE:
 
 all: $(PROG) $(NPROG) $(KSHPROG)
@@ -63,8 +68,7 @@
 	$(CH) $(CHGRP) -R $(GROUP) $(ROOTTZD)
 
 $(NPROG): $(NATIVE) $(NOBJS)
-	$(NATIVECC) -o $@ $(NOBJS)
-
+	$(XCC) -o $@ $(NOBJS)
 #
 # XXX
 # There is a .ksh rule in Makefile.targ, but we need our custom POFILE rules.
@@ -92,7 +96,7 @@
 lint: lint_SRCS
 
 $(NOBJS): $$(@F:.o=.c)
-	$(NATIVECC) -O $(NCPPFLAGS) -c -o $@ $(@F:.o=.c)
+	$(XCC) -O $(NCPPFLAGS) -c -o $@ $(@F:.o=.c)
 
 $(NATIVE)/zic.o: $(NATIVE)/tzfile.h
 
--- a/usr/src/cmd/zoneadmd/zoneadmd.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/zoneadmd/zoneadmd.c	Mon Mar 23 14:01:42 2009 -0400
@@ -270,7 +270,7 @@
 	char *arg, *lasts, **argv = NULL, **argv_save;
 	char zonecfg_args[BOOTARGS_MAX];
 	char scratchargs[BOOTARGS_MAX], *sargs;
-	char c;
+	int c;
 
 	bzero(outargs, BOOTARGS_MAX);
 	bzero(badarg, BOOTARGS_MAX);
--- a/usr/src/cmd/zonecfg/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/cmd/zonecfg/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -34,10 +34,7 @@
 # still export a number of "yy*" (libl) interfaces.  Reduce all other symbols
 # to local scope.
 MAPFILES +=	$(MAPFILE.LEX) $(MAPFILE.NGB)
-sparc_MAPOPTS =	$(MAPFILES:%=-M%)
-i386_MAPOPTS =	$(MAPFILES:%=-M%)
-s390_MAPOPTS =	
-MAPOPTS =	$($(MACH)_MAPOPTS)
+MAPOPTS =	$(MAPFILES:%=-M%)
 
 LFLAGS =	-t
 YFLAGS =	-d -b zonecfg_grammar
--- a/usr/src/common/atomic/s390/atomic.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/common/atomic/s390/atomic.c	Mon Mar 23 14:01:42 2009 -0400
@@ -344,6 +344,11 @@
 { return __sync_add_and_fetch(target, value); }
 
 __inline__
+void
+atomic_add_short(volatile ushort_t *target, short delta)
+{ __sync_add_and_fetch(target, delta); }
+
+__inline__
 uint32_t
 atomic_add_32_nv(volatile uint32_t *target, int32_t delta)
 { return __sync_add_and_fetch(target, delta); }
--- a/usr/src/common/atomic/s390x/atomic.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/common/atomic/s390x/atomic.c	Mon Mar 23 14:01:42 2009 -0400
@@ -346,6 +346,11 @@
 { return __sync_add_and_fetch(target, value); }
 
 __inline__
+void
+atomic_add_short(volatile ushort_t *target, short delta)
+{ __sync_add_and_fetch(target, delta); }
+
+__inline__
 uint32_t
 atomic_add_32_nv(volatile uint32_t *target, int32_t delta)
 { return __sync_add_and_fetch(target, delta); }
--- a/usr/src/common/dis/s390/dis_tables.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/common/dis/s390/dis_tables.h	Mon Mar 23 14:01:42 2009 -0400
@@ -56,7 +56,7 @@
 typedef struct dis390x {
 	int		d390x_flags;
 	int		(*d390x_check_func)(void *);
-	int		(*d390x_get_byte)(void *, uchar_t *, int);
+	int		(*d390x_get_bytes)(void *, uchar_t *, int);
 	int		(*d390x_sym_lookup)(void *, uint64_t, char *, size_t);
 	int		(*d390x_sprintf_func)(char *, size_t, const char *, ...);
 	void		*d390x_data;
--- a/usr/src/common/mapfiles/s390/map.pagealign	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/common/mapfiles/s390/map.pagealign	Mon Mar 23 14:01:42 2009 -0400
@@ -30,4 +30,4 @@
 #
 #	cc -M /usr/lib/ld/map.pagealign myprogram.c
 #
-data = R0x2000;
+data = R0x1000;
--- a/usr/src/head/inttypes.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/inttypes.h	Mon Mar 23 14:01:42 2009 -0400
@@ -66,14 +66,18 @@
  * gcc/fixinc/inclhack.def is updated to bypass this header.
  */
 #if !defined(__cplusplus) || (__cplusplus < 199711L && !defined(__GNUG__))
-#ifndef _WCHAR_T
-#define	_WCHAR_T
-#if defined(_LP64) || defined(__s390__)
+# ifndef _WCHAR_T
+#  define	_WCHAR_T
+#  ifdef __GNUC__
+typedef __WCHAR_TYPE__	wchar_t;
+#  else
+#   if defined(_LP64) 
 typedef	int	wchar_t;
-#else
+#   else
 typedef	long	wchar_t;
-#endif
-#endif	/* !_WCHAR_T */
+#   endif
+#  endif
+# endif	/* !_WCHAR_T */
 #endif	/* !__cplusplus || (__cplusplus < 199711L && !__GNUG__) */
 
 #if (!defined(_XOPEN_SOURCE) || defined(_XPG6)) || defined(_STDC_C99) || \
--- a/usr/src/head/iso/stddef_iso.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/iso/stddef_iso.h	Mon Mar 23 14:01:42 2009 -0400
@@ -72,14 +72,19 @@
 #endif
 #endif	/* !_PTRDIFF_T */
 
-#if !defined(_SIZE_T) || __cplusplus >= 199711L
-#define	_SIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+#if defined(__GNUC__) && !defined(_SIZE_T)
+typedef __SIZE_TYPE__	size_t;
+# define _SIZE_T
+#else
+# if !defined(_SIZE_T) || __cplusplus >= 199711L
+#  define	_SIZE_T
+#  if defined(_LP64) || defined(_I32LPx)
 typedef unsigned long	size_t;		/* size of something in bytes */
-#else
+#  else
 typedef unsigned int	size_t;		/* (historical version) */
-#endif
-#endif	/* !_SIZE_T */
+#  endif
+# endif	/* !_SIZE_T */
+#endif	/* !__GNUC__ */
 
 #if __cplusplus >= 199711L
 }
--- a/usr/src/head/iso/stdio_iso.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/iso/stdio_iso.h	Mon Mar 23 14:01:42 2009 -0400
@@ -91,14 +91,19 @@
 typedef	__FILE FILE;
 #endif
 
-#if !defined(_SIZE_T) || __cplusplus >= 199711L
-#define	_SIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+#if defined(__GNUC__) && !defined(_SIZE_T)	/* If GNU then use the builtin type */
+# define _SIZE_T
+typedef __SIZE_TYPE__	size_t;
+#else
+# if !defined(_SIZE_T) || __cplusplus >= 199711L
+#  define	_SIZE_T
+#  if defined(_LP64) || defined(_I32LPx)
 typedef unsigned long	size_t;		/* size of something in bytes */
-#else
+#  else
 typedef unsigned int	size_t;		/* (historical version) */
-#endif
-#endif	/* !_SIZE_T */
+#  endif
+# endif	/* !_SIZE_T */
+#endif /* __GNUC__ */
 
 #if defined(_LP64) || _FILE_OFFSET_BITS == 32
 typedef long		fpos_t;
--- a/usr/src/head/iso/stdlib_iso.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/iso/stdlib_iso.h	Mon Mar 23 14:01:42 2009 -0400
@@ -73,14 +73,19 @@
 	long	rem;
 } ldiv_t;
 
-#if !defined(_SIZE_T) || __cplusplus >= 199711L
-#define	_SIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+#if defined(__GNUC__) && !defined(_SIZE_T)
+typedef __SIZE_TYPE__	size_t;
+# define _SIZE_T
+#else
+# if !defined(_SIZE_T) || __cplusplus >= 199711L
+#  define	_SIZE_T
+#  if defined(_LP64) || defined(_I32LPx)
 typedef unsigned long	size_t;		/* size of something in bytes */
-#else
-typedef unsigned int    size_t;		/* (historical version) */
-#endif
-#endif	/* !_SIZE_T */
+#  else
+typedef unsigned int	size_t;		/* (historical version) */
+#  endif
+# endif	/* !_SIZE_T */
+#endif	/* !__GNUC__ */
 
 #ifndef	NULL
 #if defined(_LP64)
@@ -108,14 +113,18 @@
  * gcc/fixinc/inclhack.def is updated to bypass this header.
  */
 #if !defined(__cplusplus) || (__cplusplus < 199711L && !defined(__GNUG__))
-#ifndef _WCHAR_T
-#define	_WCHAR_T
-#if defined(_LP64) || defined(__s390__)
+# ifndef _WCHAR_T
+#  define	_WCHAR_T
+#  ifdef __GNUC__
+typedef __WCHAR_TYPE__	wchar_t;
+#  else
+#   if defined(_LP64)
 typedef	int	wchar_t;
-#else
+#   else
 typedef long	wchar_t;
-#endif
-#endif	/* !_WCHAR_T */
+#   endif
+#  endif
+# endif	/* !_WCHAR_T */
 #endif	/* !defined(__cplusplus) ... */
 
 #if defined(__STDC__)
--- a/usr/src/head/iso/string_iso.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/iso/string_iso.h	Mon Mar 23 14:01:42 2009 -0400
@@ -55,14 +55,19 @@
 namespace std {
 #endif
 
-#if !defined(_SIZE_T) || __cplusplus >= 199711L
-#define	_SIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+#if defined(__GNUC__) && !defined(_SIZE_T)
+typedef __SIZE_TYPE__	size_t;
+# define _SIZE_T
+#else
+# if !defined(_SIZE_T) || __cplusplus >= 199711L
+#  define	_SIZE_T
+#  if defined(_LP64) || defined(_I32LPx)
 typedef unsigned long	size_t;		/* size of something in bytes */
-#else
+#  else
 typedef unsigned int	size_t;		/* (historical version) */
-#endif
-#endif	/* !_SIZE_T */
+#  endif
+# endif	/* !_SIZE_T */
+#endif	/* __GNUC__ */
 
 #ifndef	NULL
 #if defined(_LP64)
--- a/usr/src/head/iso/time_iso.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/iso/time_iso.h	Mon Mar 23 14:01:42 2009 -0400
@@ -63,14 +63,19 @@
 #endif
 #endif
 
-#if !defined(_SIZE_T) || __cplusplus >= 199711L
-#define	_SIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+#if defined(__GNUC__) && !defined(_SIZE_T)
+typedef __SIZE_TYPE__	size_t;
+# define _SIZE_T
+#else
+# if !defined(_SIZE_T) || __cplusplus >= 199711L
+#  define	_SIZE_T
+#  if defined(_LP64) || defined(_I32LPx)
 typedef	unsigned long	size_t;		/* size of something in bytes */
-#else
+#  else
 typedef unsigned	size_t;		/* (historical version) */
-#endif
-#endif	/* !_SIZE_T */
+#  endif
+# endif	/* !_SIZE_T */
+#endif /* __GNUC__ */
 
 #if !defined(_CLOCK_T) || __cplusplus >= 199711L
 #define	_CLOCK_T
--- a/usr/src/head/iso/wchar_iso.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/iso/wchar_iso.h	Mon Mar 23 14:01:42 2009 -0400
@@ -81,14 +81,18 @@
  * gcc/fixinc/inclhack.def is updated to bypass this header.
  */
 #if !defined(__cplusplus) || (__cplusplus < 199711L && !defined(__GNUG__))
-#ifndef _WCHAR_T
-#define	_WCHAR_T
-#if defined(_LP64)
+# ifndef _WCHAR_T
+#  define	_WCHAR_T
+#  ifdef __GNUC__
+typedef __WCHAR_TYPE__	wchar_t;
+#  else
+#   if defined(_LP64)
 typedef	int	wchar_t;
-#else
+#   else
 typedef	long	wchar_t;
-#endif
-#endif	/* !_WCHAR_T */
+#   endif
+#  endif
+# endif	/* !_WCHAR_T */
 #endif	/* !defined(__cplusplus) ... */
 
 #if !defined(_WINT_T) || __cplusplus >= 199711L
@@ -100,14 +104,19 @@
 #endif
 #endif	/* !defined(_WINT_T) || __cplusplus >= 199711L */
 
-#if !defined(_SIZE_T) || __cplusplus >= 199711L
-#define	_SIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+#if defined(__GNUC__) && !defined(_SIZE_T)
+typedef __SIZE_TYPE__	size_t;
+# define _SIZE_T
+#else 
+# if !defined(_SIZE_T) || __cplusplus >= 199711L
+#  define	_SIZE_T
+#  if defined(_LP64) || defined(_I32LPx)
 typedef	unsigned long	size_t;		/* size of something in bytes */
-#else
+#  else
 typedef unsigned int	size_t;		/* (historical version) */
-#endif
-#endif  /* !defined(_SIZE_T) || __cplusplus >= 199711L */
+#  endif
+# endif  /* !defined(_SIZE_T) || __cplusplus >= 199711L */
+#endif /* __GNUC__ */
 
 #ifndef NULL
 #if defined(_LP64)
--- a/usr/src/head/libintl.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/libintl.h	Mon Mar 23 14:01:42 2009 -0400
@@ -49,14 +49,18 @@
  * gcc/fixinc/inclhack.def is updated to bypass this header.
  */
 #if !defined(__cplusplus) || (__cplusplus < 199711L && !defined(__GNUG__))
-#ifndef _WCHAR_T
-#define	_WCHAR_T
-#if defined(_LP64)
+# ifndef _WCHAR_T
+#  define	_WCHAR_T
+#  ifdef __GNUC__
+typedef __WCHAR_TYPE__	wchar_t;
+#  else
+#   if defined(_LP64)
 typedef int	wchar_t;
-#else
+#   else
 typedef long	wchar_t;
-#endif
-#endif	/* !_WCHAR_T */
+#   endif
+#  endif
+# endif	/* !_WCHAR_T */
 #endif	/* !defined(__cplusplus) ... */
 
 #define	TEXTDOMAINMAX	256
--- a/usr/src/head/limits.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/limits.h	Mon Mar 23 14:01:42 2009 -0400
@@ -298,14 +298,19 @@
 #if	defined(__EXTENSIONS__) || (_POSIX_C_SOURCE >= 199506L)
 #include <sys/unistd.h>
 
-#if !defined(_SIZE_T) || __cplusplus >= 199711L
-#define	_SIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+#if defined(__GNUC__) && !defined(_SIZE_T)
+typedef __SIZE_TYPE__ size_t;
+# define _SIZE_T
+#else
+# if !defined(_SIZE_T) || __cplusplus >= 199711L
+#  define	_SIZE_T
+#  if defined(_LP64) || defined(_I32LPx)
 typedef	unsigned long size_t;	/* size of something in bytes */
-#else
+#  else
 typedef	unsigned int  size_t;	/* (historical version) */
-#endif
-#endif	/* _SIZE_T */
+#  endif
+# endif	/* _SIZE_T */
+#endif	/* _GNUC_ */
 
 extern long _sysconf(int);	/* System Private interface to sysconf() */
 
--- a/usr/src/head/mon.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/mon.h	Mon Mar 23 14:01:42 2009 -0400
@@ -41,14 +41,19 @@
  * Inclusion of <sys/types.h> will break SVID namespace, hence only
  * the size_t type is defined in this header.
  */
-#if !defined(_SIZE_T) || __cplusplus >= 199711L
-#define	_SIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+#if defined(__GNUC__) && !defined(_SIZE_T)
+typedef __SIZE_TYPE__	size_t;
+# define _SIZE_T
+#else
+# if !defined(_SIZE_T) || __cplusplus >= 199711L
+#  define	_SIZE_T
+#  if defined(_LP64) || defined(_I32LPx)
 typedef unsigned long size_t;	/* size of something in bytes */
-#else
+#  else
 typedef unsigned int  size_t;	/* (historical version) */
-#endif
-#endif  /* _SIZE_T */
+#  endif
+# endif  /* _SIZE_T */
+#endif /* __GNUC__ */
 
 struct hdr {
 	char	*lpc;
--- a/usr/src/head/regex.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/regex.h	Mon Mar 23 14:01:42 2009 -0400
@@ -56,14 +56,18 @@
  * gcc/fixinc/inclhack.def is updated to bypass this header.
  */
 #if !defined(__cplusplus) || (__cplusplus < 199711L && !defined(__GNUG__))
-#ifndef _WCHAR_T
-#define	_WCHAR_T
-#if defined(_LP64) || defined(__s390__)
+# ifndef _WCHAR_T
+#  define	_WCHAR_T
+#  ifdef __GNUC__
+typedef __WCHAR_TYPE__	wchar_t;
+#  else
+#   if defined(_LP64)
 typedef int	wchar_t;
-#else
+#   else
 typedef long    wchar_t;
-#endif
-#endif	/* !_WCHAR_T */
+#   endif
+#  endif
+# endif	/* !_WCHAR_T */
 #endif	/* !defined(__cplusplus) ... */
 
 typedef ssize_t regoff_t;
--- a/usr/src/head/stddef.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/head/stddef.h	Mon Mar 23 14:01:42 2009 -0400
@@ -63,14 +63,18 @@
  * gcc/fixinc/inclhack.def is updated to bypass this header.
  */
 #if !defined(__cplusplus) || (__cplusplus < 199711L && !defined(__GNUG__))
-#ifndef _WCHAR_T
-#define	_WCHAR_T
-#if defined(_LP64) || defined(__s390__)
+# ifndef _WCHAR_T
+#  define	_WCHAR_T
+#  ifdef __GNUC__
+typedef __WCHAR_TYPE__	wchar_t;
+#  else
+#   if defined(_LP64)
 typedef int	wchar_t;
-#else
+#   else
 typedef long    wchar_t;
-#endif
-#endif  /* !_WCHAR_T */
+#   endif
+#  endif
+# endif  /* !_WCHAR_T */
 #endif	/* !defined(__cplusplus) ... */
 
 #ifdef	__cplusplus
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/ldspec.s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,142 @@
+*asm:
+%{m31&m64}%{mesa&mzarch}%{march=*}
+
+*asm_debug:
+%{gstabs*:--gstabs}%{!gstabs*:%{g*:--gdwarf2}}
+
+*asm_final:
+
+
+*asm_options:
+%a %Y %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}
+
+*invoke_as:
+%{!S:-o %|.s |
+ as %(asm_options) %|.s %A }
+
+*startfile_arch:
+%{ansi:values-Xc.o%s}                       %{!ansi:values-Xa.o%s} 
+
+*cpp:
+
+
+*cpp_options:
+%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w} %{f*} %{g*:%{!g0:%{!fno-working-directory:-fworking-directory}}} %{O*} %{undef} %{save-temps:-fpch-preprocess}
+
+*cpp_debug_options:
+%{d*}
+
+*cpp_unique_options:
+%{C|CC:%{!E:%eGCC does not support -C or -CC without -E}} %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*&F*} %{P} %I %{MD:-MD %{!o:%b.d}%{o*:%.d%*}} %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}} %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*} %{!E:%{!M:%{!MM:%{MD|MMD:%{o*:-MQ %*}}}}} %{remap} %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i %{fmudflap:-D_MUDFLAP -include mf-runtime.h} %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h} %{E|M|MM:%W{o*}}
+
+*trad_capable_cpp:
+cc1 -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}
+
+*cc1:
+
+
+*cc1_options:
+%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}} %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*} %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs} %{v:-version} %{pg:-p} %{p} %{f*} %{undef} %{Qn:-fno-ident} %{--help:--help} %{--target-help:--target-help} %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}} %{fsyntax-only:-o %j} %{-param*} %{fmudflap|fmudflapth:-fno-builtin -fno-merge-constants} %{coverage:-fprofile-arcs -ftest-coverage}
+
+*cc1plus:
+
+
+*link_gcc_c_sequence:
+%G %L %G %L
+
+*link_ssp:
+%{fstack-protector|fstack-protector-all:-lssp_nonshared -lssp}
+
+*endfile:
+crtend.o%s crtn.o%s
+
+*link:
+%(link_arch)    %{shared:-shared -G -dy}    %{h*}    %{b}    %{symbolic:-Bsymbolic -G -dy -z text}    %{Qy:} %{!Qn:-Qy}
+
+*lib:
+%{compat-bsd:-lucb -lsocket -lnsl -lelf -laio}    %{!shared:     %{!symbolic:       %{pthreads|pthread:-lpthread}        %{!pthreads:%{!pthread:%{threads:-lthread}}}        -ldl -lc}       }
+
+*mfwrap:
+ %{static: %{fmudflap|fmudflapth:  --wrap=malloc --wrap=free --wrap=calloc --wrap=realloc --wrap=mmap --wrap=munmap --wrap=alloca} %{fmudflapth: --wrap=pthread_create}} %{fmudflap|fmudflapth: --wrap=main}
+
+*mflib:
+%{fmudflap|fmudflapth: -export-dynamic}
+
+*link_gomp:
+
+
+*libgcc:
+%{static|static-libgcc:-lgcc -lgcc_eh}%{!static:%{!static-libgcc:%{!shared:%{!shared-libgcc:-lgcc -lgcc_eh}%{shared-libgcc:-lgcc_s -lgcc}}%{shared:-lgcc_s}}}
+
+*startfile:
+%{!shared: 			 %{!symbolic:                           %{p:crt1.o%s}                           %{!p:                             %{pg:crt1.o%s}                             %{!pg:crt1.o%s}                            }                           }                          } 			crti.o%s 			%(startfile_arch)	crtbegin.o%s
+
+*switches_need_spaces:
+
+
+*cross_compile:
+1
+
+*version:
+4.2.3
+
+*multilib:
+. !m64 !m31;s390x:s390x m64 !m31;s390:. !m64 m31;
+
+*multilib_defaults:
+m64
+
+*multilib_extra:
+
+
+*multilib_matches:
+m64 m64;m31 m31;
+
+*multilib_exclusions:
+
+
+*multilib_options:
+m64/m31
+
+*linker:
+/export/home/tide/bin/ld 
+
+*link_libgcc:
+%D
+
+*md_exec_prefix:
+
+
+*md_startfile_prefix:
+
+
+*md_startfile_prefix_1:
+
+
+*startfile_prefix_spec:
+
+
+*sysroot_spec:
+--sysroot=%R
+
+*sysroot_suffix_spec:
+
+
+*sysroot_hdrs_suffix_spec:
+
+
+*link_arch31:
+%{G:-G}    %{YP,*}    %{R*}    %{compat-bsd:      %{!YP,*:%{p|pg:-Y P,/usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}              %{!p:%{!pg:-Y P,/usr/ucblib:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ucblib:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}}}              }    %{!compat-bsd:      %{!YP,*:%{p|pg:-Y P,/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}              %{!p:%{!pg:-Y P,/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}}}}
+
+*link_arch64:
+%{G:-G}    %{YP,*}    %{R*}    %{compat-bsd:      %{!YP,*:%{p|pg:-Y P,/usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64}        %{!p:%{!pg:-Y P,/usr/ucblib/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/ucblib/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64}}}      }    %{!compat-bsd:      %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64}        %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /lib/64:/usr/lib/64:/usr/sfw/lib/64}}}}
+
+*link_arch_default:
+%{G:-G}    %{YP,*}    %{R*}    %{compat-bsd:      %{!YP,*:%{p|pg:-Y P,/usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}              %{!p:%{!pg:-Y P,/usr/ucblib:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ucblib:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}}}              }    %{!compat-bsd:      %{!YP,*:%{p|pg:-Y P,/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}              %{!p:%{!pg:-Y P,/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}}}}
+
+*link_arch:
+ %{m31:%(link_arch31)} %{m64:%(link_arch64)} %{!m31:%{!m64:%(link_arch_default)}} 
+
+*link_command:
+%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:    %(linker) %l %{pie:-pie} %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}    %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}    %{static:} %{L*} %(mfwrap) %(link_libgcc) %o    %{fopenmp:%:include(libgomp.spec)%(link_gomp)} %(mflib)    %{fprofile-arcs|fprofile-generate|coverage:-lgcov}    %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}    %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}}
+
--- a/usr/src/lib/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -258,6 +258,8 @@
 	libpcp		\
 	libtsalarm
 
+s390_SUBDIRS=	
+
 FM_sparc_DEPLIBS= libpri
 
 fm:			\
--- a/usr/src/lib/Makefile.lib	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/Makefile.lib	Mon Mar 23 14:01:42 2009 -0400
@@ -162,26 +162,13 @@
 ARFLAGS=	r
 SONAME=		$(DYNLIB)
 
-#
-# GNU ld doesn't understand mapfiles used by the Solaris linker so we have
-# to make them disappear
-#
-#s390_MAPFLAG=   $(MAPFILES:%=-Wl,--version-script %) 
-# $(MAPFILE.PGA:%=-Wl,--version-script %) $(MAPFILE.NED:%=-Wl,--version-script %)
-#s390x_MAPFLAG=  $(MAPFILES:%=-Wl,--version-script %) 
-# $(MAPFILE.PGA:%=-Wl,--version-script %) $(MAPFILE.NED:%=-Wl,--version-script %)
-sparcv9_MAPFLAG=	$(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
-sparc_MAPFLAG=		$(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
-i386_MAPFLAG=		$(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
-amd64_MAPFLAG=		$(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
-MAPFLAGS= $($(MACH)_MAPFLAG)
+MAPFLAGS=	$(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
 
-
-sparc_ZFLAGS=	$(ZTEXT) $(ZDEFS)
+_ZFLAGS=	$(ZTEXT) $(ZDEFS)
 i386_ZFLAGS=	$(ZTEXT) $(ZDEFS)
 amd64_ZFLAGS=	$(ZTEXT) $(ZDEFS)
-s390_ZFLAGS=	$(ZTEXT) $(ZCOMBRELOC) $(ZMULDEFS) -L$(ROOT)/lib
-s390x_ZFLAGS=	$(ZTEXT) $(ZCOMBRELOC) $(ZMULDEFS) -L$(ROOT)/lib/s390x
+s390_ZFLAGS=	$(ZDEFS) 
+s390x_ZFLAGS=	$(ZDEFS) 
 ZFLAGS=		$($(MACH)_ZFLAGS)
 
 # For most libraries, we should be able to resolve all symbols at link time,
--- a/usr/src/lib/brand/native/zone/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/brand/native/zone/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -39,8 +39,7 @@
 include ../../Makefile.brand
 
 CPPFLAGS +=	-I$(ROOT)/usr/include/libxml2 -I/usr/include/libxml2 -D_REENTRANT
-s390_XLDLIBS +=	-_gcc="-Wl,-rpath-link=$(ROOT)/usr/lib"
-LDLIBS += -lzonecfg -luutil $($(MACH)_XLDLIBS)
+LDLIBS += -lzonecfg -luutil 
 
 POFILES=	$(PROGS:%=%.po)
 POFILE=		native_zone.po
--- a/usr/src/lib/brand/sn1/s390/sn1_handler.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/brand/sn1/s390/sn1_handler.s	Mon Mar 23 14:01:42 2009 -0400
@@ -32,34 +32,6 @@
 
 #define	RVAL2_FLAG	0x100
 
-#ifdef __s390x
-#define	PIC_SETUP(r)						\
-	bras	0,8f;						\
-8:;								\
-	agr	r,0;						
-#else
-#define	PIC_SETUP(r)						\
-	bras	0,8f;						\
-8:;								\
-	ar	r,0;						
-#endif
-
-/*
- * Translate a global symbol into an address.  The resulting address
- * is returned in the first register parameter.  The second register
- * is just for scratch space.
- */
-#ifdef __s390x
-#define	GET_SYM_ADDR(r1, r2, name)		\
-	PIC_SETUP(r1)				;\
-	larl	r2,name				;\
-	lg	r1,0(r1,r2)			;
-#else
-#define	GET_SYM_ADDR(r1, r2, name)		\
-	PIC_SETUP(r1)				;\
-	l	r1,name(r1)			;
-#endif
-
 #if defined(lint)
 
 void
@@ -90,11 +62,8 @@
 	 * emulation routine.
 	 */
 	sllg	%r7,%r0,(1+CLONGSHIFT)		/* Each entry has 2 longs */
-
-	GET_SYM_ADDR(%r8, %r9, sn1_sysent_table)
-	
-	lgr	%r10,%r7
-	agr	%r10,%r2			/* Index to proper entry  */
+	larl	%r10,sn1_sysent_table		/* Address syscall table  */
+	agr	%r10,%r7			/* Index to wanted entry  */
 	lg	%r11,CPTRSIZE(%r10)		/* Save NARGS             */
 	lg	%r10,0(%r10)			/* Emulation address	  */
 	basr	%r14,%r10			/* Go call		  */
@@ -141,7 +110,7 @@
 	ENTRY_NP(sn1_handler)
 	stm	%r6,%r14,24(%r15)
 	lr	%r14,%r15
-	aghi	%r15,-SA(MINFRAME)
+	ahi	%r15,-SA(MINFRAME)
 	st	%r14,0(%r15)
 	
 
@@ -152,11 +121,8 @@
 	 */
 	lr	%r7,%r0
 	sll	%r7,(1+CLONGSHIFT)		/* Each entry has 2 longs */
-
-	GET_SYM_ADDR(%r8, %r9, sn1_sysent_table)
-	
-	lr	%r10,%r7
-	ar	%r10,%r2			/* Index to proper entry  */
+	larl	%r10,sn1_sysent_table		/* Address syscall table  */
+	ar	%r10,%r7			/* Index to wanted entry  */
 	l	%r11,CPTRSIZE(%r10)		/* Save NARGS             */
 	l	%r10,0(%r10)			/* Emulation address	  */
 	basr	%r14,%r10			/* Go call		  */
@@ -196,7 +162,7 @@
 #ifdef	__s390x
 #define	WORD	.quad 
 #else
-#define	WORD	.word
+#define	WORD	.long
 #endif
 
 #define NOSYS	\
@@ -210,7 +176,6 @@
 
 sn1_sysent_table:
 	.type   sn1_sysent_table, @object
-	.size   sn1_sysent_table, (2 * 256 * CLONGSIZE)
 	.align	CLONGSIZE
 	NOSYS					/*  0 */
 	NOSYS					/*  1 */
@@ -468,5 +433,6 @@
 	NOSYS					/* 253 */
 	NOSYS					/* 254 */
 	NOSYS					/* 255 */
+	.size   sn1_sysent_table, . - sn1_sysent_table
 
 #endif	/* lint */
--- a/usr/src/lib/c_synonyms/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/c_synonyms/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -31,6 +31,6 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-BUILD.SO=	$(LD) -o $@ -G -melf64_s390 $(DYNFLAGS) $(PICS) $(LDLIBS)
+BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS) $(PICS) $(LDLIBS)
 
 install: all $(ROOTLIBS64)
--- a/usr/src/lib/common/s390x/crt1.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/common/s390x/crt1.s	Mon Mar 23 14:01:42 2009 -0400
@@ -34,8 +34,6 @@
  * where it will be picked up by gcc, along with crti.o and crtn.o
  */
 
-	.ident	"@(#)crt1.s	1.2	05/06/08 SMI"
-
 	.file	"crt1.s"
 
 	.globl	_start
--- a/usr/src/lib/fm/libfmd_snmp/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/fm/libfmd_snmp/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -50,10 +50,7 @@
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 
 # No lint libraries are delivered for Net-SNMP yet
-sparc_SNMPDIR = -L$(SFWLIBDIR)
-i38l_SNMPDIR =	-L$(SFWLIBDIR)
-s390_SNMPDIR = 
-SNMPLIBS = $($(MACH)_SNMPDIR) -lnetsnmp -lnetsnmphelpers -lnetsnmpagent
+SNMPLIBS = -L$(ROOT)$(SFWLIBDIR) -L$(SFWLIBDIR) -lnetsnmp -lnetsnmphelpers -lnetsnmpagent
 lint := SNMPLIBS=
 
 LDLIBS += $(MACH_LDLIBS)
--- a/usr/src/lib/fm/libfmd_snmp/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/fm/libfmd_snmp/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -27,7 +27,6 @@
 # Use is subject to license terms.
 #
 
-MAPDIR = ../spec/s390x
 MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64)
 
 include ../Makefile.com
--- a/usr/src/lib/fm/topo/libtopo/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/fm/topo/libtopo/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,8 +28,7 @@
 
 include ../Makefile.com
 
-CPPFLAGS += -I $(ROOT)/usr/platform/sun4v/include
-LDLIBS += -L$(ROOTLIBDIR)
-DYNFLAGS += -R/usr/lib/fm
+CPPFLAGS += -I $(ROOT)/usr/platform/s390x/include
+LDLIBS += -L$(ROOTLIBDIR) -lzfs
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/fm/topo/libtopo/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/fm/topo/libtopo/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -26,8 +26,13 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-MAPDIR = ../spec/s390x
+
 include ../Makefile.com
 include ../../../../Makefile.lib.64
 
+CPPFLAGS += -I $(ROOT)/usr/platform/s390x/include
+LDLIBS += -L$(ROOTLIBDIR64)
+
+LDLIBS += -lzfs
+
 install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
--- a/usr/src/lib/fm/topo/maps/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/fm/topo/maps/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -47,6 +47,8 @@
 		SUNW,Sun-Fire-X4500 \
 		SUNW,Sun-Fire-X4540
 
+s390_SUBDIRS = s390
+
 SUBDIRS = $($(MACH)_SUBDIRS)
 
 include ../../Makefile.subdirs
--- a/usr/src/lib/fm/topo/modules/Makefile.plugin	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/fm/topo/modules/Makefile.plugin	Mon Mar 23 14:01:42 2009 -0400
@@ -60,10 +60,7 @@
 LINTFLAGS = -msux
 LINTFILES = $(SRCS:%.c=%.ln)
 
-sparc_APIMAP =	-M../../../libtopo/common/topo_mod.map
-i386_APIMAP =	-M../../../libtopo/common/topo_mod.map
-s390_APIMAP =
-APIMAP = $($(MACH)_APIMAP)
+APIMAP =	../../../libtopo/common/topo_mod.map
 MAPFILES =		# use APIMAP instead
 
 CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
@@ -71,7 +68,7 @@
 
 CPPFLAGS += -I.
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
-LDFLAGS += $(ZIGNORE) $(APIMAP)
+LDFLAGS += $(ZIGNORE) -M$(APIMAP)
 LDLIBS += -L$(ROOTLIBDIR)/fm -ltopo -lnvpair -lc
 DYNFLAGS += -R/usr/lib/fm
 
--- a/usr/src/lib/hal/libhal-storage/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/hal/libhal-storage/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,4 +28,6 @@
 
 include ../Makefile.com
 
+LDLIBS += -lgcc_s
+
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBPC) $(ROOTMAJLINK)
--- a/usr/src/lib/libadm/s390/mapfile-vers	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libadm/s390/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -33,9 +33,9 @@
 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;
+	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;
 };
--- a/usr/src/lib/libaio/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libaio/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,7 +28,4 @@
 
 include ../Makefile.com
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
 install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/libaio/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libaio/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,7 +30,6 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
+BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- a/usr/src/lib/libast/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libast/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -45,5 +45,6 @@
 # (and on 32bit it is close to the barrier)
 s390_C_PICFLAGS = $(C_BIGPICFLAGS)
 CPPFLAGS +=  -I$(ROOT)/usr/include
+LDLIBS += -lgcc_s
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/libast/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libast/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -46,5 +46,6 @@
 # (and on 32bit it is close to the barrier)
 s390x_C_PICFLAGS  = $(C_BIGPICFLAGS)
 CPPFLAGS += -I$(ROOT)/usr/include 
+LDLIBS += -lgcc_s
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libbsm/common/adt_msg.h	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,48 @@
+/*
+ * 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
+ */
+/*
+ * adt_msg.h
+ *
+ * Copyright 2008 Sine Nomine Associates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * This is a contract private interface and is subject to change
+ */
+
+#ifndef _ADT_MSG_H
+#define	_ADT_MSG_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+struct msg_text {
+        int     ml_min_index;
+        int     ml_max_index;
+        char    **ml_msg_list;
+        int     ml_offset;
+};
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _ADT_MSG_H */
--- a/usr/src/lib/libbsm/common/adt_xlate.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libbsm/common/adt_xlate.h	Mon Mar 23 14:01:42 2009 -0400
@@ -35,6 +35,7 @@
 
 #include <tsol/label.h>
 
+#include "adt_msg.h"
 #include "adt_event.h"
 
 #ifdef	__cplusplus
@@ -312,13 +313,6 @@
 	adt_token_func_t	jmp_to;
 };
 
-struct msg_text {
-	int	ml_min_index;
-	int	ml_max_index;
-	char	**ml_msg_list;
-	int	ml_offset;
-};
-
 extern void adt_write_syslog(const char *, int);
 extern void adt_token_open(struct adt_event_state *);
 extern int adt_token_close(struct adt_event_state *);
--- a/usr/src/lib/libc/inc/thr_inlines.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/inc/thr_inlines.h	Mon Mar 23 14:01:42 2009 -0400
@@ -186,7 +186,13 @@
 		"membar #LoadLoad"
 		: "=r" (__value), "+m" (*__lockp));
 #elif defined(__s390x) || defined(__s390)
-	__value = __sync_lock_test_and_set(__lockp, (uint8_t) 1);
+	__asm__ __volatile__ (
+		"lhi	%1,0\n"
+		"ts	%0\n"
+		"jz	0f\n"
+		"lhi	%1,1\n"
+		"0:\n"
+		: "+m" (*__lockp), "=r" (__value));
 #else
 #error	"port me"
 #endif
--- a/usr/src/lib/libc/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -37,13 +37,12 @@
 # objects are grouped by source directory
 
 # local objects
-GCCOBJS=			\
-	protect.o
 
 CRTOBJS=			\
 	_ftou.o			\
 	cerror.o		\
-	cerror64.o		
+	cerror64.o		\
+	hwmuldiv.o
 
 FPOBJS=				\
 	_D_cplx_div.o		\
@@ -56,10 +55,12 @@
 	_F_cplx_mul.o		\
 	fpgetmask.o		\
 	fpgetround.o		\
+	fpgetsticky.o		\
 	fpsetmask.o		\
 	fpsetround.o		\
-	fpstart.o
-
+	fpsetsticky.o		\
+	fpstart.o		
+ 
 FPASMOBJS=			\
 	_Q_get_rp_rd.o		\
 	_xtoll.o		\
@@ -308,6 +309,7 @@
 	forkx.o			\
 	forkallx.o		\
 	gettimeofday.o		\
+	glibc_start.o		\
 	pipe.o			\
 	ptrace.o		\
 	syscall.o		\
@@ -470,6 +472,7 @@
 	isastream.o		\
 	isatty.o		\
 	killpg.o		\
+	klpdlib.o		\
 	l64a.o			\
 	lckpwdf.o		\
 	lconstants.o		\
@@ -560,6 +563,7 @@
 	strncasecmp.o		\
 	strpbrk.o		\
 	strrchr.o		\
+	strsep.o		\
 	strsignal.o		\
 	strspn.o		\
 	strstr.o		\
@@ -833,6 +837,7 @@
 	inst_sync.o		\
 	issetugid.o		\
 	label.o			\
+	libc_fcntl.o		\
 	libc_link.o		\
 	libc_open.o		\
 	lockf.o			\
@@ -875,7 +880,6 @@
 VALUES=	values-Xa.o
 
 MOSTOBJS=			\
-	$(GCCOBJS)		\
 	$(CRTOBJS)		\
 	$(DYNOBJS)		\
 	$(FPOBJS)		\
@@ -956,13 +960,9 @@
 ALTPICS= $(TRACEOBJS:%=pics/%)
 
 $(DYNLIB) := PICS +=  $(ROOTFS_LIBDIR)/libc_i18n.a 
-$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) -whole-archive $(PICS) -no-whole-archive $(ALTPICS) 
-
-MAPFILES =	../port/mapfile-vers mapfile-vers
+$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) 
 
-# Override mapfile settings (for GNU ld)
-s390_MAPFLAG=   --version-script mapfile-vers.gnu
-s390x_MAPFLAG=   --version-script mapfile-vers.gnu
+MAPFILES =	../port/mapfile-vers mapfile-vers mapfile-vers-compat
 
 CFLAGS +=	$(EXTN_CFLAGS)
 CPPFLAGS=	-D_REENTRANT -Ds390 $(EXTN_CPPFLAGS) \
@@ -977,8 +977,6 @@
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
 DYNFLAGS +=	$(RTLDINFO) 
-
-DYNFLAGS +=	-e __rtboot
 DYNFLAGS +=	$(EXTN_DYNFLAGS)
 
 # Inform the kernel about the initial DTrace area (in case
@@ -1032,13 +1030,11 @@
 	$(UNWINDMACHOBJS:%.o=../port/unwind/%.c)	\
 	$(FPOBJS:%.o=../$(MACH)/fp/%.c)			\
 	$(LIBCBASE)/crt/_ftou.c				\
-	$(LIBCBASE)/gen/_xregs_clrptr.c			\
 	$(LIBCBASE)/gen/byteorder.c			\
 	$(LIBCBASE)/gen/ecvt.c				\
 	$(LIBCBASE)/gen/getctxt.c			\
 	$(LIBCBASE)/gen/lexp10.c			\
 	$(LIBCBASE)/gen/llog10.c			\
-	$(LIBCBASE)/gen/lmul.c				\
 	$(LIBCBASE)/gen/makectxt.c			\
 	$(LIBCBASE)/gen/siginfolst.c			\
 	$(LIBCBASE)/gen/siglongjmp.c			\
--- a/usr/src/lib/libc/s390/crt/cerror.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/crt/cerror.s	Mon Mar 23 14:01:42 2009 -0400
@@ -52,7 +52,7 @@
 	ahi	%r15,-SA(MINFRAME32)
 	lr	%r6,%r14
 	lr	%r7,%r2
-	brasl	%r14,___errno@PLT
+	brasl	%r14,___errno
 	st	%r7,0(%r2)
 	lhi	%r2,-1
 	lr	%r14,%r6
--- a/usr/src/lib/libc/s390/crt/cerror64.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/crt/cerror64.s	Mon Mar 23 14:01:42 2009 -0400
@@ -51,7 +51,7 @@
 	ahi	%r15,-SA(MINFRAME32)
 	lr	%r6,%r14
 	lr	%r7,%r2
-	brasl	%r14,___errno@PLT
+	brasl	%r14,___errno
 	st	%r7,0(%r2)
 	lr	%r14,%r6
 	ahi	%r15,SA(MINFRAME32)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libc/s390/crt/hwmuldiv.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,106 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sine Nomine Associates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+	.file	"hwmuldiv.s"
+
+#include <sys/asm_linkage.h>
+
+
+/*
+ * System z versions of __{u,}{mul,div,rem}64 compiler support routines
+ */
+
+/*
+ * Convert 32-bit arg pairs in %o0:o1 and %o2:%o3 to 64-bit args in %o1 and %o2
+ */
+#define	ARGS_TO_64				\
+	sllg	%r2,%r2,32;			\
+	ogr	%r2,%r3;			\
+	sllg	%r4,%r4,32;			\
+	ogr	%r4,%r5	
+
+//
+// division, signed
+//
+	ENTRY(__div64)
+	ARGS_TO_64
+	dsgr	%r2,%r4
+	llgfr	%r2,%r3
+	br	%r14
+	SET_SIZE(__div64)
+
+//
+// division, unsigned
+//
+	ENTRY(__udiv64)
+	ARGS_TO_64
+	dlgr	%r2,%r4
+	lgfr	%r2,%r3
+	br	%r14
+	SET_SIZE(__udiv64)
+
+//
+// multiplication, signed
+//
+	ENTRY(__mul64)
+	ARGS_TO_64
+	msgr	%r2,%r4
+	lgfr	%r2,%r2
+	br	%r14
+	SET_SIZE(__mul64)
+
+//
+// multiplication, unsigned
+//
+	ENTRY(__umul64)
+	ARGS_TO_64
+	mlgr	%r2,%r4
+	lgfr	%r2,%r2
+	br	%r14
+	SET_SIZE(__umul64)
+
+//
+// unsigned remainder 
+//
+	ENTRY(__urem64)
+	ARGS_TO_64
+	dsgr	%r2,%r4
+	lgfr	%r2,%r2
+	br	%r14
+	SET_SIZE(__urem64)
+
+//
+// signed remainder
+//
+	ENTRY(__rem64)
+	ARGS_TO_64
+	dlgr	%r2,%r4
+	llgfr	%r2,%r2
+	br	%r14
+	SET_SIZE(__rem64)
--- a/usr/src/lib/libc/s390/fp/fpgetsticky.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/fp/fpgetsticky.c	Mon Mar 23 14:01:42 2009 -0400
@@ -30,14 +30,15 @@
 
 #include "lint.h"
 #include <ieeefp.h>
+#include "fp.h"
 
 #pragma weak _fpgetsticky = fpgetsticky
 
 fp_except
 fpgetsticky(void)
 {
-	struct fpc sw;
+	struct fpc cw;
 
-	_getsw(&sw);
-	return (fp_except)sw.exFlags;
+	_getcw(&cw);
+	return (fp_except)cw.exFlags;
 }
--- a/usr/src/lib/libc/s390/fp/fpsetsticky.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/fp/fpsetsticky.c	Mon Mar 23 14:01:42 2009 -0400
@@ -30,18 +30,17 @@
 
 #include "lint.h"
 #include <ieeefp.h>
+#include "fp.h"
 
 #pragma weak _fpsetsticky = fpsetsticky
 
 fp_except
 fpsetsticky(fp_except s)
 {
-	struct fpc sw;
-	fp_except = oldfp;
+	struct fpc cw;
 
-	_getsw(&sw);
-	oldfp = sw.exFlags;
-	sw.exFlags = s.exFlags;
-	_putsw(&sw);
-	return oldfp;
+	_getcw(&cw);
+	cw.exFlags = s;
+	_putcw(&cw);
+	return (cw.exFlags);
 }
--- a/usr/src/lib/libc/s390/gen/_stack_grow.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/gen/_stack_grow.s	Mon Mar 23 14:01:42 2009 -0400
@@ -88,9 +88,9 @@
 	/*
 	 * Dereference an address in the guard page.
 	 */
-	lr	%r8,%r3
-	ahi	%r8,-1
-	ic	%r9,0(%r8)
+	lr	%r1,%r3
+	ahi	%r1,-1
+	ic	%r0,0(%r1)
 
 	/*
 	 * If the above load doesn't raise a SIGSEGV then do it ourselves.
--- a/usr/src/lib/libc/s390/gen/byteorder.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/gen/byteorder.c	Mon Mar 23 14:01:42 2009 -0400
@@ -17,14 +17,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- *
- * Copyright 2008 Sine Nomine Associates.
- * All rights reserved.
- * Use is subject to license terms.
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -38,6 +34,25 @@
 
 #else	/* !_LITTLE_ENDIAN */
 
+/*
+ * htonll(), ntohll(), htonl(), ntohl(), htons(), ntohs()
+ * These functions just return the input parameter, as the host
+ * byte order is the same as the network byte order (big endian).
+ * On little endian machines, these functions byte swap.
+ */
+
+uint64_t
+htonll(uint64_t in)
+{
+	return (in);
+}
+
+uint64_t
+ntohll(uint64_t in)
+{
+	return (in);
+}
+
 uint32_t
 htonl(uint32_t in)
 {
--- a/usr/src/lib/libc/s390/gen/cuexit.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/gen/cuexit.s	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 	ENTRY(exit)
 	stm	%r2,%r14,8(%r15)
 	ahi	%r15,-SA(MINFRAME32)
-	brasl	%r14,_exithandle@PLT
+	brasl	%r14,_exithandle
 	ahi	%r15,SA(MINFRAME32)
 	lm	%r2,%r14,8(%r15)
 	SYSTRAP_RVAL1(exit)
--- a/usr/src/lib/libc/s390/mapfile-vers	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -26,7 +26,7 @@
 #
 
 SUNW_1.23 {
-    global:
+    protected:
 	aio_cancel64;
 	aio_error64;
 	aio_fsync64;
@@ -40,12 +40,11 @@
 	enable_extended_FILE_stdio;
 	lio_listio64;
 	mkstemps64;
-	_mkstemps64;
 	posix_fallocate64;
 };
 
 SUNW_1.22.1 {
-    global:
+    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
@@ -72,6 +71,16 @@
 
 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;
 
@@ -83,28 +92,19 @@
 	atomic_add_32_nv =		NODYNSORT;
 	atomic_add_64_nv =		NODYNSORT;
 
-	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;
 	pselect_large_fdset;
 	scandir64;
 	_scandir64;
 };
 
 SUNW_1.21.2 {
-    global:
+    protected:
 	__makecontext_v2;
 	___makecontext_v2;
 };
 
 SUNW_1.21 {
-    global:
+    protected:
 	attropen64;
 	_attropen64;
 	fstatat64;
@@ -115,12 +115,12 @@
 };
 
 SUNW_1.18 {
-    global:
+    protected:
 	select_large_fdset;
 };
 
 SUNW_1.1 {
-    global:
+    protected:
 	creat64;
 	_creat64;
 	fgetpos64;
@@ -184,23 +184,11 @@
 
 SUNW_0.7 {
     global:
-	_assert;
 	_bufendtab;
-	__builtin_alloca;
 	_ctype;
-	file_to_decimal;
-	_flsbuf;
-	_lastbuf;
-	_mutex_held = NODYNSORT;
-	_mutex_lock = NODYNSORT;
-	p_online;
-	_rw_read_held;
-	_rw_write_held;
 	_sibuf;
 	_sobuf;
-	srand48;
 	_sys_buslist;
-	_syscall;
 	_sys_cldlist;
 	sys_errlist;
 	_sys_fpelist;
@@ -212,10 +200,26 @@
 	_sys_siglistn;
 	_sys_siglistp;
 	_sys_traplist;
+    protected:
+	_assert;
+	__builtin_alloca;
+	file_to_decimal;
+	_flsbuf;
+	_lastbuf;
+	_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;
@@ -223,21 +227,16 @@
 	_crypt;
 	ctime_r;
 	__div64;
-	__dtoll;
-	__dtoull;
 	encrypt;
 	_encrypt;
 	endgrent;
 	endpwent;
-	errno = NODIRECT;
 	___errno;
 	fgetgrent;
 	fgetgrent_r;
 	fgetpwent;
 	fgetpwent_r;
 	flockfile;
-	__ftoll;
-	__ftoull;
 	funlockfile;
 	getchar_unlocked;
 	getc_unlocked;
@@ -255,15 +254,10 @@
 	gettimeofday;
 	_gettimeofday;
 	gmtime_r;
-	_iob;
 	localtime_r;
 	__mul64;
 	putchar_unlocked;
 	putc_unlocked;
-	_Q_lltoq;
-	_Q_qtoll;
-	_Q_qtoull;
-	_Q_ulltoq;
 	rand_r;
 	readdir_r;
 	__rem64;
@@ -286,17 +280,44 @@
 
 SYSVABI_1.3 {
     global:
-	.div;
-	.mul;
-	.rem;
-	.stret1;
-	.stret2;
-	.stret4;
-	# .stret4 and .stret8 are the same thing
-	.stret8 = NODYNSORT;
-	.udiv;
-	.umul;
-	.urem;
+	_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:
 	abort;
 	abs;
 	access;
@@ -305,7 +326,6 @@
 	_acct;
 	alarm;
 	_alarm;
-	_altzone;
 	asctime;
 	__assert;
 	atexit;
@@ -313,7 +333,6 @@
 	atoi;
 	atol;
 	bsearch;
-	calloc = NODIRECT;
 	catclose;
 	_catclose;
 	catgets;
@@ -340,19 +359,17 @@
 	clearerr;
 	clock;
 	_close;
-	close = NODIRECT;
+	close;
 	closedir;
 	_closedir;
+	cpcmd;
 	creat;
 	_creat;
 	ctermid;
 	_ctermid;
 	ctime;
-	__ctype;
 	cuserid;
 	_cuserid;
-	daylight;
-	_daylight;
 	difftime;
 	div;
 	__dtou;
@@ -360,8 +377,6 @@
 	_dup;
 	dup2;
 	_dup2;
-	environ = NODIRECT;
-	_environ = NODIRECT;
 	execl;
 	_execl;
 	execle;
@@ -405,16 +420,14 @@
 	_fmtmsg;
 	fopen;
 	_fork;
-	fork = NODIRECT;
+	fork;
 	fpathconf;
 	_fpathconf;
 	fprintf;
 	fputc;
 	fputs;
 	fread;
-	free = NODIRECT;
 	freopen;
-	frexp = FUNCTION FILTER libm.so.2;
 	fscanf;
 	fseek;
 	fsetpos;
@@ -437,11 +450,8 @@
 	_getcwd;
 	getdate;
 	_getdate;
-	getdate_err;
-	_getdate_err;
 	getegid;
 	_getegid;
-	getenv;
 	geteuid;
 	_geteuid;
 	getgid;
@@ -496,10 +506,8 @@
 	_hdestroy;
 	hsearch;
 	_hsearch;
-	__huge_val;
 	initgroups;
 	_initgroups;
-	__iob;
 	ioctl;
 	_ioctl;
 	isalnum;
@@ -514,10 +522,6 @@
 	isdigit;
 	isgraph;
 	islower;
-	isnan = FUNCTION FILTER libm.so.2;
-	_isnan = FUNCTION FILTER libm.so.2;
-	isnand = FUNCTION FILTER libm.so.2;
-	_isnand = FUNCTION FILTER libm.so.2;
 	isprint;
 	ispunct;
 	isspace;
@@ -528,7 +532,6 @@
 	labs;
 	lchown;
 	_lchown;
-	ldexp = FUNCTION FILTER libm.so.2;
 	ldiv;
 	lfind;
 	_lfind;
@@ -538,7 +541,6 @@
 	localtime;
 	lockf;
 	_lockf;
-	logb = FUNCTION FILTER libm.so.2;
 	longjmp;
 	lsearch;
 	_lsearch;
@@ -548,19 +550,18 @@
 	_lstat;
 	makecontext;
 	_makecontext;
-	malloc = NODIRECT;
 	mblen;
 	mbstowcs;
 	mbtowc;
 	memccpy;
 	_memccpy;
 	memchr;
-	memcmp = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	memcmp;
 	memcntl;
 	_memcntl;
-	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;
+	memcpy;
+	memmove;
+	memset;
 	mkdir;
 	_mkdir;
 	mkfifo;
@@ -574,8 +575,6 @@
 	_mlock;
 	mmap;
 	_mmap;
-	modf = FUNCTION FILTER libm.so.2;
-	_modf = FUNCTION FILTER libm.so.2;
 	monitor;
 	_monitor;
 	mount;
@@ -596,23 +595,16 @@
 	_munlock;
 	munmap;
 	_munmap;
-	nextafter = FUNCTION FILTER libm.so.2;
-	_nextafter = FUNCTION FILTER libm.so.2;
 	nftw;
 	_nftw;
 	nice;
 	_nice;
 	nl_langinfo;
 	_nl_langinfo;
-	_numeric;
 	open;
 	_open;
 	opendir;
 	_opendir;
-	optarg;
-	opterr;
-	optind;
-	optopt;
 	pathconf;
 	_pathconf;
 	pause;
@@ -644,29 +636,7 @@
 	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;
@@ -677,7 +647,6 @@
 	_readlink;
 	readv;
 	_readv;
-	realloc = NODIRECT;
 	remove;
 	rename;
 	_rename;
@@ -686,8 +655,6 @@
 	_rewinddir;
 	rmdir;
 	_rmdir;
-	scalb = FUNCTION FILTER libm.so.2;
-	_scalb = FUNCTION FILTER libm.so.2;
 	scanf;
 	seekdir;
 	_seekdir;
@@ -726,8 +693,8 @@
 	_shmdt;
 	shmget;
 	_shmget;
-	sigaction = NODIRECT;
-	_sigaction = NODIRECT NODYNSORT;
+	sigaction;
+	_sigaction = NODYNSORT;
 	sigaddset;
 	_sigaddset;
 	sigaltstack;
@@ -842,8 +809,6 @@
 	_time;
 	times;
 	_times;
-	timezone;
-	_timezone;
 	tmpfile;
 	tmpnam;
 	toascii;
@@ -858,8 +823,6 @@
 	_ttyname;
 	twalk;
 	_twalk;
-	tzname;
-	_tzname;
 	tzset;
 	_tzset;
 	ulimit;
@@ -897,12 +860,6 @@
 
 SUNWprivate_1.1 {
     global:
-	__ashldi3;
-	__ashrdi3;
-	_cerror;
-	_cerror64;
-	__cmpdi2;
-	__divdi3;
 	_dladdr = FUNCTION FILTER /usr/lib/ld.so.1;
 	_dladdr1 = FUNCTION FILTER /usr/lib/ld.so.1;
 	_dlclose = FUNCTION FILTER /usr/lib/ld.so.1;
@@ -912,6 +869,22 @@
 	_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;
@@ -921,32 +894,18 @@
 	_fwprintf_c89;
 	_fwscanf_c89;
 	gtty;
-	_gtty;
-	_hasmntopt;
 	_imaxabs_c89;
 	_imaxdiv_c89;
 	install_utrap;
 	_install_utrap;
-	_ld_libc = FUNCTION FILTER /usr/lib/ld.so.1;
 	__lshrdi3;
-	__lyday_to_month;
-	_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;
+	_memcpy;
+	_memmove;
+	_memset;
 	__moddi3;
-	__mon_lengths;
 	__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;
@@ -956,12 +915,7 @@
 	_strtoumax_c89;
 	_swprintf_c89;
 	_swscanf_c89;
-	_sys_errlist;
-	_sys_errs;
-	_sys_index;
-	_sys_nerr = NODYNSORT;
-	_sys_num_err;
-	_syssun;
+	__tls_get_offset;
 	__ucmpdi2;
 	__udivdi3;
 	__umoddi3;
@@ -982,8 +936,6 @@
 	_wcstoumax_c89;
 	_wprintf_c89;
 	_wscanf_c89;
-	_xregs_clrptr;
-	__yday_to_month;
 
     local:
 	__cerror =		NODYNSORT;
--- a/usr/src/lib/libc/s390/offsets.in	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/offsets.in	Mon Mar 23 14:01:42 2009 -0400
@@ -32,6 +32,7 @@
 #include "libc_int.h"
 #include "thr_uberdata.h"
 #include "sigjmp_struct.h"
+#include "stdio_impl.h"
 
 TLS_index
 	ti_moduleid
@@ -60,3 +61,5 @@
 stack_t
 	ss_sp
 	ss_size
+
+__FILE_TAG	SIZEOF_FILE_TAG
--- a/usr/src/lib/libc/s390/sys/__clock_gettime.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/sys/__clock_gettime.s	Mon Mar 23 14:01:42 2009 -0400
@@ -44,9 +44,9 @@
 	chi	%r2,CLOCK_REALTIME		// (clock_id == CLOCK_REALTIME) 
 	jne	1f	
 2:
-	lr	%r6,%r3				// Copy
+	lr	%r5,%r3				// Copy
 	SYSFASTTRAP(GETHRESTIME)
-	stm	%r2,%r3,0(%r6)
+	stm	%r2,%r3,0(%r5)
 	RETC
 1:
 	SYSTRAP_RVAL1(clock_gettime)
--- a/usr/src/lib/libc/s390/sys/door.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390/sys/door.s	Mon Mar 23 14:01:42 2009 -0400
@@ -129,7 +129,7 @@
 
 	/* Exit the thread if we return here */
 	lhi	%r2,0
-	brasl	%r14,_thrp_terminate@PLT
+	brasl	%r14,_thrp_terminate
 	/* NOTREACHED */
 2:
 	/*
@@ -145,7 +145,7 @@
 	jgne	__cerror		// No.. return the error
 
 	ahi	%r15,-SA(MINFRAME32)
-	brasl	%r14,getpid@PLT
+	brasl	%r14,getpid
 	ahi	%r15,SA(MINFRAME32)
 	larl	%r6,door_create_pid
 	l	%r1,0(%r6)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libc/s390/sys/glibc_start.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,205 @@
+/*------------------------------------------------------------------*/
+/* 								    */
+/* Name        - glibc_compat.c					    */
+/* 								    */
+/* Function    - Compatability routines for glibc-based programs.   */
+/* 								    */
+/* Name	       - Neale Ferguson					    */
+/* 								    */
+/* Date        - February, 2009  				    */
+/* 								    */
+/*------------------------------------------------------------------*/
+
+/*------------------------------------------------------------------*/
+/*                   L I C E N S E                                  */
+/*------------------------------------------------------------------*/
+
+/*==================================================================*/
+/* 								    */
+/* 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 the the License.  */
+/* 								    */
+/* You can obtain a copy of the license at: 			    */
+/* - usr/src/OPENSOLARIS.LICENSE, or,				    */
+/* - http://www.opensolaris.org/os/licensing.			    */
+/* See the License for the specific language governing permissions  */
+/* and limitations under the License.				    */
+/* 								    */
+/* When distributing Covered Code, include this CDDL HEADER in each */
+/* file and include the License file at usr/src/OPENSOLARIS.LICENSE.*/
+/* If applicable, add the following below this CDDL HEADER, with    */
+/* the fields enclosed by brackets "[]" replaced with your own      */
+/* identifying information: 					    */
+/* Portions Copyright [yyyy] [name of copyright owner]		    */
+/* 								    */
+/* CDDL HEADER END						    */
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+/* 								    */
+/*==================================================================*/
+
+/*------------------------------------------------------------------*/
+/*                 I n c l u d e s                                  */
+/*------------------------------------------------------------------*/
+
+#include <sys/asm_linkage.h>
+#include <sys/errno.h>
+#include <../assym.h>
+
+/*========================= End of Includes ========================*/
+
+/*------------------------------------------------------------------*/
+/*                 D e f i n e s                                    */
+/*------------------------------------------------------------------*/
+
+#if defined(__STDC__)
+# define IOB	__iob
+#else
+# define IOB	_iob
+#endif
+
+#define O_MAIN	8
+#define O_ARGC	12
+#define O_UBP	16
+#define	O_INIT	20
+#define O_FINI	24
+#define O_STKE	28
+
+	.file	"glibc_compat.s"
+
+/*========================= End of Defines =========================*/
+
+/*------------------------------------------------------------------*/
+/*                 T y p e d e f s                                  */
+/*------------------------------------------------------------------*/
+
+
+/*========================= End of Typedefs ========================*/
+
+/*------------------------------------------------------------------*/
+/*                E x t e r n a l   R e f e r e n c e s             */
+/*------------------------------------------------------------------*/
+
+/* global entities defined elsewhere but used here */
+	.globl	exit
+	.globl	_exit
+	.weak	_DYNAMIC
+	.globl	___Argv
+	.globl  _environ
+	.globl  IOB
+	.globl	fstat64,lstat64,stat64
+
+/*=================== End of External References ===================*/
+
+/*------------------------------------------------------------------*/
+/*                   P r o t o t y p e s                            */
+/*------------------------------------------------------------------*/
+
+
+/*========================= End of Prototypes ======================*/
+
+/*------------------------------------------------------------------*/
+/*                 G l o b a l   V a r i a b l e s                  */
+/*------------------------------------------------------------------*/
+
+	.section	.data
+	.globl		__libc_stack_end
+	.size		__libc_stack_end,4
+	.type		__libc_stack_end,@object
+	.align		4
+__libc_stack_end:
+	.long		0
+
+	.section	.text
+
+	.align	4
+pDYNAMIC:
+	.long   _DYNAMIC
+
+/*====================== End of Global Variables ===================*/
+
+/*------------------------------------------------------------------*/
+/*                                                                  */
+/* Name		- __libc_start_main                                 */
+/*                                                                  */
+/* Function	- This module provides the equivalent of 	    */
+/*		  __libc_start_main for an object linked against    */
+/*		  glibc. It is a direct copy of crt1.s and provides */
+/*		  that function inside libc rather than as the stub */
+/*		  _start provided by crt1.s when using the Solaris  */
+/*		  linker and libc.so.1				    */
+/*		                               		 	    */
+/*------------------------------------------------------------------*/
+
+/*
+ * int __libc_start_main(int *(main) (int, char **, char **), int argc, 
+ * 			 char **ubp_av, void (*init) (void), void (*fini) (void), 
+ * 			 void (*rtld_fini) (void), void (*stack_end));
+ */
+	ENTRY(__libc_start_main)
+	larl	%r13,pDYNAMIC
+	stm	%r2,%r6,O_MAIN(%r15)	// Save parms
+	lr	%r6,%r15		// Save stack pointer
+	lay	%r11,104(%r15)		// Point at parms saved by boot.s
+	ahi	%r15,-SA(MINFRAME)	// New stack pointer
+	lr	%r12,%r2		// Save *main
+	l	%r7,4(%r11)		// Get **argv
+	l	%r8,8(%r11)		// Get envp
+	larl	%r9,__libc_stack_end	
+	l	%r0,O_STKE(%r6)
+	st	%r0,0(%r9)
+	lhi	%r0,0			// 
+	st	%r0,0(%r15)		// Clear FPC
+	lfpc	0(%r15)			//
+	l	%r5,0(%r13)		// Get *DYNAMIC
+	ltr	%r5,%r5
+	jz	1f
+
+	l	%r2,O_FINI(%r6)		// Get exit function
+	ltr	%r2,%r2			// Is there one?
+	jz	1f			// No... Skip
+
+	brasl	%r14,atexit@PLT		// Go set
+1:
+
+/*
+ * Calculate the location of the envp array by adding the size of
+ * the argv array to the start of the argv array.
+ */
+
+	larl	%r4,_environ		/* Get A(A(Environment)) */
+	larl	%r10,___Argv
+	l	%r2,O_ARGC(%r6)		/* Restore argc */
+	lr	%r3,%r7			/* Get Argv */
+	l	%r11,0(%r4)		
+	ltr	%r11,%r11		/* _environ set? */
+	jnz	3f			/* Yes... Skip */
+
+	st	%r8,0(%r4)		/* copy to _environ */
+3:
+	l	%r2,O_ARGC(%r6)		/* Restore argc */
+	st	%r3,0(%r10)
+	l	%r4,0(%r4)		/* envp */
+	lr	%r8,%r4			/* Save envp */
+	l	%r1,O_INIT(%r6)		/* Get *init */
+	ltr	%r1,%r1			/* Is there one? */
+	jz	4f			/* No... Skip */
+	basr	%r14,%r1
+4:
+	l	%r2,O_ARGC(%r6)		/* Restore argc - again */
+	lr	%r3,%r7			/* .... argv */
+	lr	%r4,%r8			/* .... envp */
+	basr	%r14,%r12
+	ahi	%r15,SA(MINFRAME)
+	lr	%r8,%r2			/* Save return value */
+	brasl   %r14,exit
+	lr	%r2,%r8
+	jg      _exit
+	SET_SIZE(__libc_start_main)
+
+/*========================= End of Function ========================*/
--- a/usr/src/lib/libc/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -39,6 +39,10 @@
 # objects are grouped by source directory
 
 # local objects
+
+GCCOBJS=			\
+	protect.o
+
 STRETS=
 
 CRTOBJS=			\
@@ -67,8 +71,10 @@
 	_X_cplx_mul.o		\
 	fpgetmask.o		\
 	fpgetround.o		\
+	fpgetsticky.o		\
 	fpsetmask.o		\
 	fpsetround.o		\
+	fpsetsticky.o		\
 	fpstart.o
 
 FPOBJS64=			\
@@ -252,7 +258,6 @@
 	processor_bind.o	\
 	processor_info.o	\
 	profil.o		\
-	protect.o		\
 	putmsg.o		\
 	putpmsg.o		\
 	pwrite.o		\
@@ -309,6 +314,7 @@
 	forkx.o			\
 	forkallx.o		\
 	gettimeofday.o		\
+	glibc_start.o		\
 	pipe.o			\
 	ptrace.o		\
 	syscall.o		\
@@ -466,6 +472,7 @@
 	isastream.o		\
 	isatty.o		\
 	killpg.o		\
+	klpdlib.o		\
 	l64a.o			\
 	lckpwdf.o		\
 	lconstants.o		\
@@ -476,7 +483,6 @@
 	llabs.o			\
 	lldiv.o			\
 	lltostr.o		\
-	lmath.o			\
 	localtime.o		\
 	lsearch.o		\
 	madvise.o		\
@@ -557,6 +563,7 @@
 	strncasecmp.o		\
 	strpbrk.o		\
 	strrchr.o		\
+	strsep.o		\
 	strsignal.o		\
 	strspn.o		\
 	strstr.o		\
@@ -815,6 +822,7 @@
 	inst_sync.o		\
 	issetugid.o		\
 	label.o			\
+	libc_fcntl.o		\
 	libc_link.o		\
 	libc_open.o		\
 	lockf.o			\
@@ -938,14 +946,9 @@
 ALTPICS= $(TRACEOBJS:%=pics/%)
 
 $(DYNLIB) := PICS += $(ROOTFS_LIBDIR64)/libc_i18n.a
-$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) -whole-archive $(PICS) -no-whole-archive $(ALTPICS) 
+$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) 
 
-#MAPFILE=	$(MAPDIR)/mapfile
-MAPFILES =	../port/mapfile-vers mapfile-vers
-
-# Override mapfile settings (for GNU ld)
-s390_MAPFLAG=   --version-script mapfile-vers.gnu
-s390x_MAPFLAG=   --version-script mapfile-vers.gnu
+MAPFILES =	../port/mapfile-vers mapfile-vers mapfile-vers-compat
 
 CFLAGS64 +=	$(EXTN_CFLAGS)
 CPPFLAGS=	-D_REENTRANT -D__s390__ -Ds390 -Ds390x $(EXTN_CPPFLAGS) \
@@ -960,10 +963,7 @@
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
 
-#DYNFLAGS +=	-M $(MAPFILE) $(RTLDINFO)
 DYNFLAGS +=	$(RTLDINFO)
-
-DYNFLAGS +=	-e __rtboot
 DYNFLAGS +=	$(EXTN_DYNFLAGS)
 
 # Inform the kernel about the initial DTrace area (in case
@@ -1017,13 +1017,11 @@
 	$(FPOBJS:%.o=../$(MACH)/fp/%.c)			\
 	$(FPOBJS64:%.o=$(LIBCBASE)/fp/%.c)		\
 	$(LIBCBASE)/crt/_ftou.c				\
-	$(LIBCBASE)/gen/_xregs_clrptr.c			\
 	$(LIBCBASE)/gen/byteorder.c			\
 	$(LIBCBASE)/gen/ecvt.c				\
 	$(LIBCBASE)/gen/getctxt.c			\
 	$(LIBCBASE)/gen/lexp10.c			\
 	$(LIBCBASE)/gen/llog10.c			\
-	$(LIBCBASE)/gen/lmul.c				\
 	$(LIBCBASE)/gen/makectxt.c			\
 	$(LIBCBASE)/gen/siginfolst.c			\
 	$(LIBCBASE)/gen/siglongjmp.c			\
--- a/usr/src/lib/libc/s390x/crt/cerror.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/crt/cerror.s	Mon Mar 23 14:01:42 2009 -0400
@@ -51,7 +51,7 @@
 	aghi	%r15,-SA(MINFRAME)
 	lgr	%r6,%r14
 	lgr	%r7,%r2
-	brasl	%r14,___errno@PLT
+	brasl	%r14,___errno
 	st	%r7,0(%r2)
 	lghi	%r2,-1
 	aghi	%r15,SA(MINFRAME)
--- a/usr/src/lib/libc/s390x/fp/fpgetsticky.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/fp/fpgetsticky.c	Mon Mar 23 14:01:42 2009 -0400
@@ -30,14 +30,15 @@
 
 #include <ieeefp.h>
 #include "lint.h"
+#include "fp.h"
 
 #pragma weak _fpgetsticky = fpgetsticky
 
 fp_except
 fpgetsticky(void)
 {
-	struct fpc sw;
+	struct fpc cw;
 
-	_getsw(&sw);
-	return (fp_except)sw.exFlags;
+	_getcw(&cw);
+	return (fp_except)cw.exFlags;
 }
--- a/usr/src/lib/libc/s390x/fp/fpsetsticky.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/fp/fpsetsticky.c	Mon Mar 23 14:01:42 2009 -0400
@@ -30,18 +30,17 @@
 
 #include <ieeefp.h>
 #include "lint.h"
+#include "fp.h"
 
 #pragma weak _fpsetsticky = fpsetsticky
 
 fp_except
 fpsetsticky(fp_except s)
 {
-	struct fpc sw;
-	fp_except = oldfp;
+	struct fpc cw;
 
-	_getsw(&sw);
-	oldfp = sw.exFlags;
-	sw.exFlags = s.exFlags;
-	_putsw(&sw);
-	return oldfp;
+	_getcw(&cw);
+	cw.exFlags = s;
+	_putcw(&cw);
+	return (cw.exFlags);
 }
--- a/usr/src/lib/libc/s390x/gen/_stack_grow.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/gen/_stack_grow.s	Mon Mar 23 14:01:42 2009 -0400
@@ -88,9 +88,9 @@
 	/*
 	 * Dereference an address in the guard page.
 	 */
-	lgr	%r8,%r3
-	aghi	%r8,-1
-	ic	%r9,0(%r8)
+	lgr	%r1,%r3
+	aghi	%r1,-1
+	ic	%r0,0(%r1)
 
 	/*
 	 * If the above load doesn't raise a SIGSEGV then do it ourselves.
--- a/usr/src/lib/libc/s390x/gen/byteorder.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/gen/byteorder.c	Mon Mar 23 14:01:42 2009 -0400
@@ -17,14 +17,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- *
- * Copyright 2008 Sine Nomine Associates.
- * All rights reserved.
- * Use is subject to license terms.
  */
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -38,6 +34,25 @@
 
 #else	/* !_LITTLE_ENDIAN */
 
+/*
+ * htonll(), ntohll(), htonl(), ntohl(), htons(), ntohs()
+ * These functions just return the input parameter, as the host
+ * byte order is the same as the network byte order (big endian).
+ * On little endian machines, these functions byte swap.
+ */
+
+uint64_t
+htonll(uint64_t in)
+{
+	return (in);
+}
+
+uint64_t
+ntohll(uint64_t in)
+{
+	return (in);
+}
+
 uint32_t
 htonl(uint32_t in)
 {
--- a/usr/src/lib/libc/s390x/gen/cuexit.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/gen/cuexit.s	Mon Mar 23 14:01:42 2009 -0400
@@ -43,7 +43,7 @@
 
 	stmg	%r2,%r14,16(%r15)
 	aghi	%r15,-SA(MINFRAME)
-	larl	%r1,_exithandle@PLT
+	larl	%r1,_exithandle
 	basr	%r14,%r1
 	aghi	%r15,SA(MINFRAME)
 	lmg	%r2,%r14,16(%r15)
--- a/usr/src/lib/libc/s390x/mapfile-vers	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -25,8 +25,11 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+SYSVABI_1.3 {
+};
+
 SUNW_1.22.1 {
-    global:
+    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
@@ -53,14 +56,6 @@
 
 SUNW_1.22 {
     global:
-	# 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;
-
 	dladdr = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
 	dladdr1 = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
 	dlclose = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
@@ -70,22 +65,87 @@
 	dlmopen = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
 	dlopen = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
 	dlsym = FUNCTION FILTER /usr/lib/s390x/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 {
-    global:
+    protected:
 	__makecontext_v2;
 	___makecontext_v2;
 };
 
 SUNW_1.1 {
-    global:
+    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;
+	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;
@@ -96,15 +156,6 @@
 	_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;
-	_altzone;
 	asctime;
 	asctime_r;
 	_assert;
@@ -115,7 +166,6 @@
 	atol;
 	bsearch;
 	__builtin_alloca;
-	calloc = NODIRECT;
 	catclose;
 	_catclose;
 	catgets;
@@ -142,9 +192,10 @@
 	clearerr;
 	clock;
 	_close;
-	close = NODIRECT;
+	close;
 	closedir;
 	_closedir;
+	cpcmd;
 	creat;
 	_creat;
 	crypt;
@@ -153,16 +204,11 @@
 	_ctermid;
 	ctime;
 	ctime_r;
-	_ctype;
-	__ctype;
 	cuserid;
 	_cuserid;
-	daylight;
-	_daylight;
 	difftime;
 	div;
 	__dtou;
-	__dtoul;
 	dup;
 	_dup;
 	dup2;
@@ -171,9 +217,6 @@
 	_encrypt;
 	endgrent;
 	endpwent;
-	environ = NODIRECT;
-	_environ = NODIRECT;
-	errno = NODIRECT;
 	___errno;
 	execl;
 	_execl;
@@ -225,16 +268,14 @@
 	_fmtmsg;
 	fopen;
 	_fork;
-	fork = NODIRECT;
+	fork;
 	fpathconf;
 	_fpathconf;
 	fprintf;
 	fputc;
 	fputs;
 	fread;
-	free = NODIRECT;
 	freopen;
-	frexp = FUNCTION FILTER libm.so.2;
 	fscanf;
 	fseek;
 	fsetpos;
@@ -248,7 +289,6 @@
 	ftok;
 	_ftok;
 	__ftou;
-	__ftoul;
 	funlockfile;
 	fwrite;
 	getc;
@@ -261,11 +301,8 @@
 	_getcwd;
 	getdate;
 	_getdate;
-	getdate_err;
-	_getdate_err;
 	getegid;
 	_getegid;
-	getenv;
 	geteuid;
 	_geteuid;
 	getgid;
@@ -334,11 +371,8 @@
 	_hdestroy;
 	hsearch;
 	_hsearch;
-	__huge_val;
 	initgroups;
 	_initgroups;
-	_iob;
-	__iob;
 	ioctl;
 	_ioctl;
 	isalnum;
@@ -353,10 +387,6 @@
 	isdigit;
 	isgraph;
 	islower;
-	isnan = FUNCTION FILTER libm.so.2;
-	_isnan = FUNCTION FILTER libm.so.2;
-	isnand = FUNCTION FILTER libm.so.2;
-	_isnand = FUNCTION FILTER libm.so.2;
 	isprint;
 	ispunct;
 	isspace;
@@ -367,7 +397,6 @@
 	labs;
 	lchown;
 	_lchown;
-	ldexp = FUNCTION FILTER libm.so.2;
 	ldiv;
 	lfind;
 	_lfind;
@@ -378,7 +407,6 @@
 	localtime_r;
 	lockf;
 	_lockf;
-	logb = FUNCTION FILTER libm.so.2;
 	longjmp;
 	lsearch;
 	_lsearch;
@@ -388,19 +416,18 @@
 	_lstat;
 	makecontext;
 	_makecontext;
-	malloc = NODIRECT;
 	mblen;
 	mbstowcs;
 	mbtowc;
 	memccpy;
 	_memccpy;
 	memchr;
-	memcmp = AUXILIARY /platform/$PLATFORM/lib/s390x/libc_psr.so.1;
+	memcmp;
 	memcntl;
 	_memcntl;
-	memcpy = AUXILIARY /platform/$PLATFORM/lib/s390x/libc_psr.so.1;
-	memmove = AUXILIARY /platform/$PLATFORM/lib/s390x/libc_psr.so.1;
-	memset = AUXILIARY /platform/$PLATFORM/lib/s390x/libc_psr.so.1;
+	memcpy;
+	memmove;
+	memset;
 	mkdir;
 	_mkdir;
 	mkfifo;
@@ -414,8 +441,6 @@
 	_mlock;
 	mmap;
 	_mmap;
-	modf = FUNCTION FILTER libm.so.2;
-	_modf = FUNCTION FILTER libm.so.2;
 	monitor;
 	_monitor;
 	mount;
@@ -438,23 +463,16 @@
 	_munmap;
 	_mutex_held = NODYNSORT;
 	_mutex_lock = NODYNSORT;
-	nextafter = FUNCTION FILTER libm.so.2;
-	_nextafter = FUNCTION FILTER libm.so.2;
 	nftw;
 	_nftw;
 	nice;
 	_nice;
 	nl_langinfo;
 	_nl_langinfo;
-	_numeric;
 	open;
 	_open;
 	opendir;
 	_opendir;
-	optarg;
-	opterr;
-	optind;
-	optopt;
 	pathconf;
 	_pathconf;
 	pause;
@@ -488,8 +506,6 @@
 	putw;
 	_putw;
 	_Qp_add;
-	_Qp_cmp;
-	_Qp_cmpe;
 	_Qp_div;
 	_Qp_dtoq;
 	_Qp_feq;
@@ -504,15 +520,11 @@
 	_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;
@@ -526,7 +538,6 @@
 	_readlink;
 	readv;
 	_readv;
-	realloc = NODIRECT;
 	remove;
 	rename;
 	_rename;
@@ -539,8 +550,6 @@
 	_rw_write_held;
 	sbrk;
 	_sbrk;
-	scalb = FUNCTION FILTER libm.so.2;
-	_scalb = FUNCTION FILTER libm.so.2;
 	scanf;
 	seekdir;
 	_seekdir;
@@ -585,9 +594,8 @@
 	_shmdt;
 	shmget;
 	_shmget;
-	_sibuf;
-	sigaction = NODIRECT;
-	_sigaction = NODIRECT NODYNSORT;
+	sigaction;
+	_sigaction = NODYNSORT;
 	sigaddset;
 	_sigaddset;
 	sigaltstack;
@@ -627,8 +635,6 @@
 	_sigsuspend;
 	sleep;
 	_sleep;
-	_sobuf;
-#	__sparc_utrap_install;
 	sprintf;
 	srand;
 	srand48;
@@ -671,21 +677,12 @@
 	_symlink;
 	sync;
 	_sync;
-	_sys_buslist;
 	_syscall;
-	_sys_cldlist;
 	sysconf;
 	_sysconf;
-	_sys_fpelist;
 	sysinfo;
 	_sysinfo;
-	_sys_segvlist;
-	_sys_siginfolistp;
-	_sys_siglist;
-	_sys_siglistn;
-	_sys_siglistp;
 	system;
-	_sys_traplist;
 	tcdrain;
 	_tcdrain;
 	tcflow;
@@ -718,8 +715,6 @@
 	_time;
 	times;
 	_times;
-	timezone;
-	_timezone;
 	tmpfile;
 	tmpnam;
 	toascii;
@@ -735,8 +730,6 @@
 	ttyname_r;
 	twalk;
 	_twalk;
-	tzname;
-	_tzname;
 	tzset;
 	_tzset;
 	ulimit;
@@ -774,7 +767,6 @@
 
 SUNWprivate_1.1 {
     global:
-	_cerror;
 	_dladdr = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
 	_dladdr1 = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
 	_dlclose = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
@@ -784,32 +776,22 @@
 	_dlmopen = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
 	_dlopen = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
 	_dlsym = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
-	__fseterror_u;
-	gtty;
-	_gtty;
-	_hasmntopt;
-	install_utrap;
-	_install_utrap;
 	_ld_libc = FUNCTION FILTER /usr/lib/s390x/ld.so.1;
 	__lyday_to_month;
-	_memcmp = AUXILIARY /platform/$PLATFORM/lib/s390x/libc_psr.so.1;
-	_memcpy = AUXILIARY /platform/$PLATFORM/lib/s390x/libc_psr.so.1;
-	_memmove = AUXILIARY /platform/$PLATFORM/lib/s390x/libc_psr.so.1;
-	_memset = AUXILIARY /platform/$PLATFORM/lib/s390x/libc_psr.so.1;
 	__mon_lengths;
-	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;
+	__yday_to_month;
+    protected:
+	_cerror;
+	__fseterror_u;
+	gtty;
+	install_utrap;
+	_install_utrap;
+	_memcmp;
+	_memcpy;
+	_memmove;
+	_memset;
 	_QgetRD;
-	_syssun;
-	_xregs_clrptr;
-	__yday_to_month;
+	__tls_get_offset;
 
     local:
 	__cerror =		NODYNSORT;
--- a/usr/src/lib/libc/s390x/offsets.in	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/offsets.in	Mon Mar 23 14:01:42 2009 -0400
@@ -60,3 +60,5 @@
 stack_t
 	ss_sp
 	ss_size
+
+__FILE_TAG	SIZEOF_FILE_TAG
--- a/usr/src/lib/libc/s390x/sys/__clock_gettime.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/sys/__clock_gettime.s	Mon Mar 23 14:01:42 2009 -0400
@@ -44,9 +44,9 @@
 	cghi	%r2,CLOCK_REALTIME		// (clock_id == CLOCK_REALTIME) 
 	jne	1f	
 2:
-	lgr	%r6,%r3				// Copy
+	lgr	%r5,%r3				// Copy
 	SYSFASTTRAP(GETHRESTIME)
-	stg	%r2,0(%r6)
+	stg	%r2,0(%r5)
 	RETC
 1:
 	SYSTRAP_RVAL1(clock_gettime)
--- a/usr/src/lib/libc/s390x/sys/door.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libc/s390x/sys/door.s	Mon Mar 23 14:01:42 2009 -0400
@@ -127,7 +127,7 @@
 
 	/* Exit the thread if we return here */
 	lghi	%r2,0
-	brasl	%r14,_thrp_terminate@PLT
+	brasl	%r14,_thrp_terminate
 	/* NOTREACHED */
 2:
 	/*
@@ -143,7 +143,7 @@
 	jgne	__cerror		// No.. return the error
 
 	aghi	%r15,-SA(MINFRAME+CLONGSIZE)
-	brasl	%r14,getpid@PLT
+	brasl	%r14,getpid
 	aghi	%r15,SA(MINFRAME+CLONGSIZE)
 	larl	%r6,door_create_pid
 	lg	%r1,0(%r6)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libc/s390x/sys/glibc_start.s	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,205 @@
+/*------------------------------------------------------------------*/
+/* 								    */
+/* Name        - glibc_compat.c					    */
+/* 								    */
+/* Function    - Compatability routines for glibc-based programs.   */
+/* 								    */
+/* Name	       - Neale Ferguson					    */
+/* 								    */
+/* Date        - February, 2009  				    */
+/* 								    */
+/*------------------------------------------------------------------*/
+
+/*------------------------------------------------------------------*/
+/*                   L I C E N S E                                  */
+/*------------------------------------------------------------------*/
+
+/*==================================================================*/
+/* 								    */
+/* 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 the the License.  */
+/* 								    */
+/* You can obtain a copy of the license at: 			    */
+/* - usr/src/OPENSOLARIS.LICENSE, or,				    */
+/* - http://www.opensolaris.org/os/licensing.			    */
+/* See the License for the specific language governing permissions  */
+/* and limitations under the License.				    */
+/* 								    */
+/* When distributing Covered Code, include this CDDL HEADER in each */
+/* file and include the License file at usr/src/OPENSOLARIS.LICENSE.*/
+/* If applicable, add the following below this CDDL HEADER, with    */
+/* the fields enclosed by brackets "[]" replaced with your own      */
+/* identifying information: 					    */
+/* Portions Copyright [yyyy] [name of copyright owner]		    */
+/* 								    */
+/* CDDL HEADER END						    */
+/*                                                                  */
+/* Copyright 2008 Sine Nomine Associates.                           */
+/* All rights reserved.                                             */
+/* Use is subject to license terms.                                 */
+/* 								    */
+/*==================================================================*/
+
+/*------------------------------------------------------------------*/
+/*                 I n c l u d e s                                  */
+/*------------------------------------------------------------------*/
+
+#include <sys/asm_linkage.h>
+#include <../assym.h>
+#include <sys/errno.h>
+
+/*========================= End of Includes ========================*/
+
+/*------------------------------------------------------------------*/
+/*                 D e f i n e s                                    */
+/*------------------------------------------------------------------*/
+
+#if defined(__STDC__)
+# define IOB	__iob
+#else
+# define IOB	_iob
+#endif
+
+#define O_MAIN	16
+#define O_ARGC	24
+#define O_UBP	32
+#define	O_INIT	40
+#define O_FINI	48
+#define O_STKE	56
+
+	.file	"glibc_compat.s"
+
+/*========================= End of Defines =========================*/
+
+/*------------------------------------------------------------------*/
+/*                 T y p e d e f s                                  */
+/*------------------------------------------------------------------*/
+
+
+/*========================= End of Typedefs ========================*/
+
+/*------------------------------------------------------------------*/
+/*                E x t e r n a l   R e f e r e n c e s             */
+/*------------------------------------------------------------------*/
+
+/* global entities defined elsewhere but used here */
+	.globl	exit
+	.globl	_exit
+	.weak	_DYNAMIC
+	.extern ___Argv
+	.extern _environ
+	.extern IOB
+
+/*=================== End of External References ===================*/
+
+/*------------------------------------------------------------------*/
+/*                   P r o t o t y p e s                            */
+/*------------------------------------------------------------------*/
+
+
+/*========================= End of Prototypes ======================*/
+
+/*------------------------------------------------------------------*/
+/*                 G l o b a l   V a r i a b l e s                  */
+/*------------------------------------------------------------------*/
+
+	.section	.data
+	.globl		__libc_stack_end
+	.size		__libc_stack_end,8
+	.type		__libc_stack_end,@object
+	.align		4
+__libc_stack_end:
+	.quad		0
+
+	.section	.text
+
+	.align	4
+pDYNAMIC:
+	.long   _DYNAMIC
+
+/*====================== End of Global Variables ===================*/
+
+/*------------------------------------------------------------------*/
+/*                                                                  */
+/* Name		- __libc_start_main                                 */
+/*                                                                  */
+/* Function	- This module provides the equivalent of 	    */
+/*		  __libc_start_main for an object linked against    */
+/*		  glibc. It is a direct copy of crt1.s and provides */
+/*		  that function inside libc rather than as the stub */
+/*		  _start provided by crt1.s when using the Solaris  */
+/*		  linker and libc.so.1				    */
+/*		                               		 	    */
+/*------------------------------------------------------------------*/
+
+/*
+ * int __libc_start_main(int *(main) (int, char **, char **), int argc, 
+ * 			 char **ubp_av, void (*init) (void), void (*fini) (void), 
+ * 			 void (*rtld_fini) (void), void (*stack_end));
+ */
+	ENTRY(__libc_start_main)
+	stmg	%r2,%r6,O_MAIN(%r15)
+	lgr	%r6,%r15		// Save stack address
+	aghi	%r15,-SA(MINFRAME)	// New 
+	lay	%r11,176(%r6)		// Point at parm save area
+	lg	%r7,8(%r11)		// Get **argv
+	lg	%r8,16(%r11)		// Get envp
+	larl	%r9,__libc_stack_end	
+	lg	%r0,O_STKE(%r6)
+	stg	%r0,0(%r9)
+	larl	%r13,pDYNAMIC
+	lgr	%r12,%r2		// Save *main
+	lhi	%r0,0			// 
+	st	%r0,8(%r15)		// Clear FPC
+	lfpc	8(%r15)			//
+	lg	%r5,0(%r13)		// Get _DYNAMIC
+	ltgr	%r5,%r5			// Set?
+	jz	1f			// No... Skip
+
+	lg	%r2,O_FINI(%r6)		// Get _fini function
+	ltgr	%r2,%r2			// Is there any?
+	jz	1f			// No... Skip
+
+	brasl	%r14,atexit@PLT		// Go set
+1:
+
+/*
+ * Calculate the location of the envp array by adding the size of
+ * the argv array to the start of the argv array.
+ */
+
+	larl	%r4,_environ		/* Get A(A(Environment)) */
+	larl	%r10,___Argv
+	lg	%r2,O_ARGC(%r6)		/* Restore argc */
+	lgr	%r3,%r7			/* Get Argv */
+	lg	%r11,0(%r4)		/* Get A(Environment) */
+	ltgr	%r11,%r11		/* _environ set? */
+	jnz	3f			/* Yep... Skip */
+
+	stg	%r8,0(%r4)		/* Copy to _environ */
+3:
+	lg	%r2,O_ARGC(%r6)		/* Restore argc */
+	stg	%r3,0(%r10)
+	lg	%r4,0(%r4)		/* envp */
+	lgr	%r8,%r4			/* Save envp */
+	lg	%r1,O_INIT(%r6)		/* Get *init */
+	ltgr	%r1,%r1			/* Is there one? */
+	jz	4f			/* No... Skip */
+
+	basr	%r14,%r1		/* Call init routine */
+4:
+	lg	%r2,O_ARGC(%r6)		/* Restore argc - again */
+	lgr	%r3,%r7			/* .... argv */
+	lgr	%r4,%r8			/* .... envp */
+	basr	%r14,%r12		/* Go mainlining */
+	lgr	%r8,%r2			/* Save return value */
+	aghi	%r15,SA(MINFRAME)	/* Restore stack pointer */
+	brasl	%r14,exit		
+	lgr	%r2,%r8
+	jg      _exit
+	SET_SIZE(__libc_start_main)
+
+/*========================= End of Function ========================*/
--- a/usr/src/lib/libdisasm/Makefile.targ	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdisasm/Makefile.targ	Mon Mar 23 14:01:42 2009 -0400
@@ -95,8 +95,3 @@
 objs/%.o pics/%.o: $(SRC)/common/dis/i386/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
-
-# install rule for s390 common source
-objs/%.o pics/%.o: $(SRC)/common/dis/s390/%.c
-	$(COMPILE.c) -o $@ $<
-	$(POST_PROCESS_O)
--- a/usr/src/lib/libdisasm/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdisasm/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -37,3 +37,8 @@
 include ../Makefile.targ
 
 C99MODE = $(C99_ENABLE)
+
+# install rule for s390 common source
+objs/dis_tables.o pics/dis_tables.o: $(SRC)/common/dis/s390/dis_tables.c
+	$(COMPILE.c) -o $@ $(SRC)/common/dis/s390/dis_tables.c
+	$(POST_PROCESS_O)
--- a/usr/src/lib/libdisasm/s390/dis_s390.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdisasm/s390/dis_s390.c	Mon Mar 23 14:01:42 2009 -0400
@@ -53,6 +53,8 @@
 /*                 D e f i n e s                                    */
 /*------------------------------------------------------------------*/
 
+#define	MIN(a, b)	((a) < (b) ? (a) : (b))
+
 
 /*========================= End of Defines =========================*/
 
--- a/usr/src/lib/libdisasm/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdisasm/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -38,3 +38,8 @@
 include ../Makefile.targ
 
 C99MODE = $(C99_ENABLE)
+
+# install rule for s390x common source
+objs/dis_tables.o pics/dis_tables.o: $(SRC)/common/dis/s390x/dis_tables.c
+	$(COMPILE.c) -o $@ $(SRC)/common/dis/s390x/dis_tables.c
+	$(POST_PROCESS_O)
--- a/usr/src/lib/libdladm/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdladm/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -31,4 +31,6 @@
 
 include ../Makefile.com
 
+LDLIBS += -lgcc_s
+
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/libdladm/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdladm/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -32,4 +32,6 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
+LDLIBS += -lgcc_s
+
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- a/usr/src/lib/libdoor/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdoor/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,9 +28,6 @@
 
 include ../Makefile.com
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
 .KEEP_STATE:
 
 all: $(LIBS)
--- a/usr/src/lib/libdoor/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdoor/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -35,9 +35,6 @@
 
 LIBS = $(DYNLIB) $(LINTLIB)
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
 .KEEP_STATE:
 
 all: $(LIBS)
--- a/usr/src/lib/libdtrace/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdtrace/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,7 +30,7 @@
 
 MAPDIR = ../spec/s390x
 include ../Makefile.com
-LDLIBS += -lgen -lelf -lproc -lrtld_db -lctf
+LDLIBS += -lgcc_s
 
 SRCS += dt_asmsubr.s
 OBJECTS += dt_asmsubr.o
--- a/usr/src/lib/libdtrace/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libdtrace/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -34,7 +34,7 @@
 
 SRCS += dt_asmsubr.s
 OBJECTS += dt_asmsubr.o
-LDFLAGS += -lelf -lproc -lrtld_db -lgen -lctf
+LDFLAGS += -lgcc_s
 
 install yydebug: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) \
 	$(ROOTDLIBS) $(ROOTDOBJS64)
--- a/usr/src/lib/libintl/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libintl/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,8 +29,4 @@
 
 include		../Makefile.com
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
-
 install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/libintl/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libintl/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,7 +30,6 @@
 include		../Makefile.com
 include		../../Makefile.lib.64
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
+BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS)
 
 install:	all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT)
--- a/usr/src/lib/libipsecutil/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libipsecutil/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -37,7 +37,7 @@
 SRCDIR =	../common
 
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
-LDLIBS +=	-lsocket -lnsl -lc
+LDLIBS +=	-lsocket -lnsl -lc -lcrypto
 LDLIBS +=	$(OPENSSL_LDFLAGS)
 DYNFLAGS +=	$(OPENSSL_DYNFLAGS)
 
--- a/usr/src/lib/libkrb5/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libkrb5/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,13 +28,8 @@
 
 include		../Makefile.com
 
-DYNFLAGS +=	-R/usr/lib/gss mapfile.o
-
-MAPFILES = ../common/mapfile
+DYNFLAGS +=	-R/usr/lib/gss
 
 install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
-all:	mapfile.o
+all:
--- a/usr/src/lib/libkrb5/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libkrb5/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,14 +28,6 @@
 
 include		../Makefile.com
 
-DYNFLAGS +=	-melf64_s390 -R/usr/lib/64/gss mapfile.o
-
-MAPFILES = ../common/mapfile
-
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
+DYNFLAGS +=	-64 -R/usr/lib/64/gss 
 
 install:	all $(ROOTLIBS64) $(ROOTLINKS64)
-
-mapfile.o:	mapfile.s
-	$(CC) -m64 -c mapfile.s
--- a/usr/src/lib/libmd5/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libmd5/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -32,9 +32,6 @@
 
 DYNFLAGS +=     -F libmd.so.1
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
 MAPFILES = ../common/mapfile-vers
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/libmd5/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libmd5/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -35,7 +35,4 @@
 
 BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS)
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- a/usr/src/lib/libmp/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libmp/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -41,10 +41,9 @@
 .KEEP_STATE:
 
 $(OLIBRARY):	pics/pics_mp.o libmp.so.2 $(OMAPFILE)
-	$(CC) $(CFLAGS) -o $@ $(GSHARED) -h $(OLIBRARY) $(ZTEXT) $(ZDEFS) -_gcc=-nostartfiles \
-	    $(ZCOMBRELOC) pics/pics_mp.o libmp.so.2
-# \
-# -M$(OMAPFILE) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
+	$(CC) $(CFLAGS) -o $@ $(GSHARED) -h $(OLIBRARY) $(ZDEFS) \
+	    $(BDIRECT) $(ZCOMBRELOC) pics/pics_mp.o libmp.so.2 -M$(OMAPFILE) \
+	    $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) -L$(ROOT)/usr/lib -lc
 	$(POST_PROCESS_SO)
 
 pics/pics_mp.o:
--- a/usr/src/lib/libmp/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libmp/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,8 +28,6 @@
 #
 # lib/libmp/s390x/Makefile
 
-MAPDIR=	../spec/s390x
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
--- a/usr/src/lib/libnisdb/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libnisdb/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,14 +30,6 @@
 PROTOCOL_DIR= $(ROOT)/include/rpcsvc
 YPTOL_DIR= ./yptol
 
-#
-# Temporary hack for s390
-#
-s390_CCFLAGS=-xarch=z9 -Wa,-mzarch
-#
-# End of hack
-#
-
 SED=	sed
 
 OBJECTS = \
--- a/usr/src/lib/libnisdb/db_index_c.x	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libnisdb/db_index_c.x	Mon Mar 23 14:01:42 2009 -0400
@@ -101,7 +101,11 @@
 %  void init( db_key_desc * );
 %
 %/* Moves an index from an xdr index */
+%#ifndef __GNUC__
 %  db_status db_index::move_xdr_db_index(db_index *orig);
+%#else
+%  db_status move_xdr_db_index(db_index *orig);
+%#endif
 %
 %/* Dumps this index to named file. */
 %  int dump( char *);
--- a/usr/src/lib/libnisdb/db_mindex_c.x	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libnisdb/db_mindex_c.x	Mon Mar 23 14:01:42 2009 -0400
@@ -266,7 +266,11 @@
 %
 % /* Delete the given list of results; used when no longer interested in 
 %    the results of the first/next query that returned this list.     */
+%#ifndef __GNUC__
 %  db_status db_mindex::reset_next( db_next_index_desc *orig );
+%#else
+%  db_status reset_next( db_next_index_desc *orig );
+%#endif
 %
 %/* Return all entries within table.  Returns the answer by
 %   setting the pointer 'rp' to point to the list of answers.
--- a/usr/src/lib/libnsl/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libnsl/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -2,7 +2,7 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License                  
+# Common Development and Distribution License, Version 1.0 only
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
@@ -19,14 +19,15 @@
 #
 # CDDL HEADER END
 #
+#
 # Copyright 2008 Sine Nomine Associates. All rights reserved.
 # Use is subject to license terms.
 #
-#
-# Copyright 1998-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
+
 include ../Makefile.com
 include ../../Makefile.lib.64
 
@@ -35,8 +36,6 @@
 # large parts of the 32-bit library with PIC unnecessarily.
 
 s390x_C_PICFLAGS = -K PIC
-s390x_CC_PICFLAGS = -K PIC
-
-all: $(LIBS)
+s390x_CC_PICFLAGS = -KPIC
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- a/usr/src/lib/libnsl/s390x/mapfile-vers	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libnsl/s390x/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -25,31 +25,8 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-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;
@@ -70,6 +47,8 @@
 	endnetconfig;
 	endnetpath;
 	freenetconfigent;
+	gethostbyaddr;
+	gethostbyname;
 	getnetconfig;
 	getnetconfigent;
 	getnetname;
@@ -77,6 +56,9 @@
 	getpublickey;
 	getsecretkey;
 	host2netname;
+	inet_addr;
+	inet_netof;
+	inet_ntoa;
 	key_decryptsession;
 	key_encryptsession;
 	key_gendes;
@@ -89,15 +71,18 @@
 	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;
@@ -110,7 +95,9 @@
 	svcerr_progvers;
 	svcerr_systemerr;
 	svcerr_weakauth;
+	svc_exit;
 	svc_fd_create;
+	svc_fdset;
 	svc_getreqset;
 	svc_raw_create;
 	svc_reg;
--- a/usr/src/lib/libproc/s390/mapfile-vers	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libproc/s390/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -27,10 +27,4 @@
 
 SUNWprivate_1.1 {
     global:
-	Plwp_getgwindows;
-	Plwp_getxregs;
-	Plwp_setxregs;
-	ps_lgetxregs;
-	ps_lgetxregsize;
-	ps_lsetxregs;
 };
--- a/usr/src/lib/libproc/s390x/mapfile-vers	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libproc/s390x/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -27,12 +27,4 @@
 
 SUNWprivate_1.1 {
     global:
-	Plwp_getasrs;
-	Plwp_getgwindows;
-	Plwp_getxregs;
-	Plwp_setasrs;
-	Plwp_setxregs;
-	ps_lgetxregs;
-	ps_lgetxregsize;
-	ps_lsetxregs;
 };
--- a/usr/src/lib/libpthread/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libpthread/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,6 +30,3 @@
 include ../Makefile.com
 
 install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
-
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
--- a/usr/src/lib/libpthread/s390/mapfile-vers	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libpthread/s390/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -32,6 +32,21 @@
 # DO NOT TOUCH THIS FILE.
 #
 
+GLIBC_2.3 {
+};
+
+GLIBC_2.2 {
+};
+
+GLIBC_2.1.3 {
+};
+
+GLIBC_2.1 {
+};
+
+GLIBC_2.0 {
+};
+
 SUNW_1.4 {
     global:
 	pthread_cond_reltimedwait_np = FUNCTION;
--- a/usr/src/lib/libpthread/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libpthread/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -33,6 +33,3 @@
 BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS)
 
 install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
-
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
--- a/usr/src/lib/librt/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/librt/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,7 +28,4 @@
 
 include ../Makefile.com
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
 install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/librt/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/librt/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,7 +30,6 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
+BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64) 
--- a/usr/src/lib/libscf/native/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libscf/native/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -32,6 +32,8 @@
 
 CC =		$(NATIVECC)
 LD =		$(NATIVELD)
+$(s390_BLD)CC =	$(XBUILDCC)
+$(s390_BLD)LD =	$(XBUILDCC)
 CFLAGS =	$(NATIVE_CFLAGS)
 CPPFLAGS =	$(MY_NATIVE_CPPFLAGS)
 LDFLAGS =
--- a/usr/src/lib/libsched/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libsched/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -33,6 +33,3 @@
 .KEEP_STATE:
 
 install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
-
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
--- a/usr/src/lib/libsched/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libsched/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -36,6 +36,3 @@
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS)
 
 install:	all $(ROOTLIBS64) $(ROOTLINKS64)
-
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
--- a/usr/src/lib/libsqlite/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libsqlite/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -94,10 +94,7 @@
 	 	-I$(ROOT)/usr/include
 CPPFLAGS += $(MYCPPFLAGS)
 
-sparc_MAPFILES = -M../mapfile-sqlite
-i386_MAPFILES = -M../mapfile-sqlite
-s390_MAPFILES = 
-MAPFILES = $($(MACH)_MAPFILES)
+MAPFILES = ../mapfile-sqlite
 
 # Header files used by all library source files.
 #
@@ -217,11 +214,11 @@
 native: $(NATIVERELOC)
 
 $(RELOC): objs .WAIT $(OBJS)
-	$(LD) -r $(MAPFILES) -o $(RELOC) $(OBJS)
+	$(LD) -r $(MAPFILES:%=-M%) -o $(RELOC) $(OBJS)
 	$(CTFMERGE) -t -f -L VERSION -o $(RELOC) $(OBJS)
 
 $(NATIVERELOC):	objs .WAIT $(OBJS:%.o=%-native.o)
-	$(LD) -r $(MAPFILES) -o $(NATIVERELOC) $(OBJS:%.o=%-native.o)
+	$(LD) -r $(MAPFILES:%=-M%) -o $(NATIVERELOC) $(OBJS:%.o=%-native.o)
 
 opcodes.h: $(SRCDIR)/vdbe.c
 	@echo "Generating $@"; \
--- a/usr/src/lib/libsys/s390/mapfile-vers	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libsys/s390/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -45,16 +45,6 @@
 	acct;
 	alarm;
 	atexit;
-	.div;
-	.mul;
-	.rem;
-	.stret1;
-	.stret2;
-	.stret4;
-	.stret8;
-	.udiv;
-	.umul;
-	.urem;
 	_Q_add;
 	_Q_cmp;
 	_Q_cmpe;
--- a/usr/src/lib/libthread/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libthread/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,6 +30,3 @@
 include ../Makefile.com
 
 install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
-
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
--- a/usr/src/lib/libthread/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libthread/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -33,6 +33,3 @@
 BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS)
 
 install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
-
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
--- a/usr/src/lib/libtnfprobe/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libtnfprobe/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,11 +28,6 @@
 
 include ../Makefile.com
 
-MAPFILES = ../mapfile-vers
 .KEEP_STATE:
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu
-
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libtnfprobe/s390/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,28 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+SUNWprivate_1.1 {
+    global:
+};
--- a/usr/src/lib/libtnfprobe/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libtnfprobe/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,15 +30,9 @@
 #
 # lib/libtnfprobe/s390x/Makefile
 
-MAPDIR=	../spec/s390x
 include ../Makefile.com
 include ../../Makefile.lib.64
-MAPFILES = ../mapfile-vers
 
 .KEEP_STATE:
 
-
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu
-
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libtnfprobe/s390x/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,28 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+SUNWprivate_1.1 {
+    global:
+};
--- a/usr/src/lib/libumem/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libumem/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -117,10 +117,8 @@
 
 LDLIBS +=	-lc
 
-sparc_SAFLAGS= -M../common/mapfile-vers -M$(MAPFILE_SUPPLEMENTAL)
-i386_SAFLAGS= -M../common/mapfile-vers -M$(MAPFILE_SUPPLEMENTAL)
-s390_SAFLAGS= 
-LDFLAGS_standalone = $(ZNOVERSION) $(BREDUCE) -dy -r $($(MACH)_SAFLAGS)
+SAFLAGS= -M../common/mapfile-vers -M$(MAPFILE_SUPPLEMENTAL)
+LDFLAGS_standalone = $(ZNOVERSION) $(BREDUCE) -dy -r $(SAFLAGS)
 LDFLAGS = $(LDFLAGS_$(CURTYPE))
 
 ASFLAGS_standalone = -DUMEM_STANDALONE
--- a/usr/src/lib/libuutil/native/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libuutil/native/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -32,6 +32,8 @@
 
 CC =		$(NATIVECC)
 LD =		$(NATIVELD)
+$(s390_BLD)CC =	$(XBUILDCC)
+$(s390_BLD)LD =	$(XBUILDCC)
 CFLAGS =	$(NATIVE_CFLAGS)
 CPPFLAGS =	-I. $(MY_NATIVE_CPPFLAGS)
 LDFLAGS =
--- a/usr/src/lib/libvscan/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libvscan/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,4 +28,6 @@
 
 include ../Makefile.com
 
+LDLIBS += -lgcc_s
+
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/libw/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libw/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,7 +30,4 @@
 
 .KEEP_STATE:
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
 install:	all $(ROOTLIBS) $(ROOTLINKS)
--- a/usr/src/lib/libw/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libw/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -33,7 +33,4 @@
 
 .KEEP_STATE:
 
-# Add build for generated mapfile
-include ../../../Makefile.mapfilegnu.maponly
-
 install:	all $(ROOTLIBS64) $(ROOTLINKS64)
--- a/usr/src/lib/libzfs/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libzfs/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,4 +28,6 @@
 #
 include ../Makefile.com
 
+LDLIBS += -lgcc_s
+
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/libzfs/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libzfs/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,4 +29,6 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
+LDLIBS += -lgcc_s
+
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- a/usr/src/lib/libzonecfg/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libzonecfg/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,4 +29,6 @@
 
 include ../Makefile.com
 
+LDLIBS += -lgcc_s
+
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/libzonecfg/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/libzonecfg/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,4 +30,6 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
+LDLIBS += -lgcc_s
+
 install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
--- a/usr/src/lib/lvm/Makefile.lvm	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/lvm/Makefile.lvm	Mon Mar 23 14:01:42 2009 -0400
@@ -29,6 +29,7 @@
 include $(SRC)/lib/Makefile.lib
 
 sparc_C_PICFLAGS =	-K PIC
+s390_C_PICFLAGS =	-K PIC
 
 SRCDIR =		../common
 
--- a/usr/src/lib/mms/mms/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/mms/mms/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -53,7 +53,7 @@
 LDLIBS +=	-lc -lsocket -lnsl -lscf
 LDLIBS +=	-L$(ROOT)/usr/sfw/lib -lssl -lcrypto
 
-DYNFLAGS +=	-R/usr/sfw/lib	
+DYNFLAGS +=	-R$(ROOT)/usr/sfw/lib -R/usr/sfw/lib	
 
 CFLAGS +=	$(CTF_FLAGS) $(CCVERBOSE)
 CFLAGS += 	$(C_BIGPICFLAGS)
--- a/usr/src/lib/ncad_addr/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/ncad_addr/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,6 +29,4 @@
 
 include ../Makefile.com
 
-MAPFILES=../common/mapfile-vers
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/ncad_addr/s390/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# 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 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+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/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/ncad_addr/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,6 +30,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-MAPFILES=../common/mapfile-vers
-
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/ncad_addr/s390x/mapfile-vers	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,32 @@
+#
+# 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 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+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/openssl/libcrypto/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/openssl/libcrypto/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,4 +28,6 @@
 
 include ../Makefile.com
 
+LDLIBS	+=	-lgcc_s
+
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- a/usr/src/lib/openssl/libcrypto/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/openssl/libcrypto/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -34,4 +34,6 @@
 CFLAGS64 += -erroff=E_TYP_STORAGE_CLASS_OBSOLESCENT \
 	-erroff=E_CONST_PROMOTED_UNSIGNED_LONG
 
+LDLIBS	+=	-lgcc_s
+
 install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -40,7 +40,7 @@
 include ../Makefile.com
 CFLAGS		+=	-Ds390
 CPPFLAGS	+=	-DMP_USE_UINT_DIGIT
-LDLIBS		+=	-lm
+LDLIBS		+=	-lm -lgcc_s
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
 
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -44,7 +44,7 @@
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
-LDLIBS		+=	-lm
+LDLIBS		+=	-lm -lgcc_s
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
 
--- a/usr/src/lib/print/libhttp-core/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/print/libhttp-core/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,5 +29,3 @@
 include ../Makefile.com
 
 install:	all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS)
-
-include ../../../../Makefile.mapfilegnu
\ No newline at end of file
--- a/usr/src/lib/print/libipp-core/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/print/libipp-core/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,5 +29,3 @@
 include ../Makefile.com
 
 install:	all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT)
-
-include ../../../../Makefile.mapfilegnu
\ No newline at end of file
--- a/usr/src/lib/print/libipp-listener/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/print/libipp-listener/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,5 +29,3 @@
 include ../Makefile.com
 
 install:	all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT)
-
-include ../../../../Makefile.mapfilegnu
--- a/usr/src/lib/print/libpapi-common/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/print/libpapi-common/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,5 +29,3 @@
 include ../Makefile.com
 
 install:	all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT)
-
-include ../../../../Makefile.mapfilegnu
--- a/usr/src/lib/print/libpapi-dynamic/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/print/libpapi-dynamic/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,5 +29,3 @@
 include ../Makefile.com
 
 install:	all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT)
-
-include ../../../../Makefile.mapfilegnu
\ No newline at end of file
--- a/usr/src/lib/print/libpapi-ipp/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/print/libpapi-ipp/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,5 +29,3 @@
 include ../Makefile.com
 
 install:	all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS) $(EXTRALINKS)
-
-include ../../../../Makefile.mapfilegnu
--- a/usr/src/lib/print/libpapi-lpd/Makefile.com	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/print/libpapi-lpd/Makefile.com	Mon Mar 23 14:01:42 2009 -0400
@@ -74,10 +74,7 @@
 PROG_OBJS = $(LPD_PORT_OBJS:%=pics/%)
 OBJS += $(PROG_OBJS)
 
-sparc_LPDMAPS = $(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
-i386_LPDMAPS = $(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
-s390_LPDMAPS = 
-LPDMAPS=$($(MACH)_LPDMAPS)
+LPDMAPS = $(MAPFILE.NES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%)
 
 LDFLAGS.cmd = \
         $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) $(BDIRECT) \
--- a/usr/src/lib/print/libpapi-lpd/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/print/libpapi-lpd/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,7 +30,3 @@
 
 install:	all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS) $(EXTRALINKS) \
 		$(ROOTLIBPRINTPROG)
-
-include ../../../../Makefile.mapfilegnu
-
-LDLIBS += -ldl -lmd -lscf -lmp -luutil -lgen
--- a/usr/src/lib/print/libprint/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/print/libprint/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -29,5 +29,3 @@
 include ../Makefile.com
 
 install:	all $(ROOTLIBS) $(ROOTLINKS) # $(ROOTLINT)
-
-include ../../../../Makefile.mapfilegnu
--- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.engine	Mon Mar 23 14:01:42 2009 -0400
@@ -58,10 +58,7 @@
 DMODLINTTGT = $(DMOD:%=lint_dmod)
 DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln)
 
-sparc_APIMAP = -M../../../../../libscsi/libscsi_api.map
-i386_APIMAP = -M../../../../../libscsi/libscsi_api.map
-s390_APIMAP = 
-APIMAP = $($(MACH)_APIMAP)
+APIMAP = ../../../../../libscsi/libscsi_api.map
 
 C99MODE = $(C99_ENABLE)
 CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
@@ -71,7 +68,11 @@
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 CPPFLAGS += -I../../../../../libscsi/common
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
-LDFLAGS += $(ZTEXT) $(ZIGNORE)
+sparc_ZFLAGS= $(ZTEXT) $(ZIGNORE)
+i386_ZFLAGS= $(ZTEXT) $(ZIGNORE)
+s390_ZFLAGS= $(ZIGNORE)
+ZFLAGS=	$($(MACH)_ZFLAGS)
+LDFLAGS += $(ZFLAGS)
 
 $(PROG) := LDFLAGS += $(ZDEFS) -M$(APIMAP)
 $(PROG) := LDLIBS += -lc
--- a/usr/src/lib/scsi/plugins/ses/Makefile.lib	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/lib/scsi/plugins/ses/Makefile.lib	Mon Mar 23 14:01:42 2009 -0400
@@ -69,10 +69,6 @@
 DMODLINTFILES = $(DMOD_SRCS:%.c=%.ln)
 
 APIMAP = ../../../../libses/libses_api.map
-sparc_APIMAPFLAG = -M
-i386_APIMAPFLAG = -M
-s390_APIMAPFLAG = -_gcc="--version-script="
-APIMAPFLAG = $($(MACH)_APIMAPFLAG)
 
 C99MODE = $(C99_ENABLE)
 CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
@@ -81,9 +77,12 @@
 CFLAGS64 += -G $(XREGSFLAG) 
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
-LDFLAGS += $(ZTEXT) $(ZIGNORE)
+sparc_ZFLAGS=	$(ZTEXT) $(ZIGNORE)
+i386_ZFLAGS=	$(ZTEXT) $(ZIGNORE)
+s390_ZFLAGS=	$(ZIGNORE)
+LDFLAGS += $($(MACH)_ZFLAGS)
 
-$(PROG) := LDFLAGS += $(ZDEFS) $(APIMAPFLAG)$(APIMAP)
+$(PROG) := LDFLAGS += $(ZDEFS) -M$(APIMAP)
 $(PROG) := LDLIBS += -lc -lnvpair
 
 $(DMODPROG) := LDFLAGS += $(ZNODEFS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/PHXext/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# PHXext
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNW0on/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,43 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1994, 1999, 2001 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# source locations relative to the prototype file
+#
+# SUNW0on
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNW1394/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# SUNW1394
+#
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/hci1394 0755 root sys
+d none kernel/misc/s390x 755 root sys
+f none kernel/misc/s390x/s1394 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNW1394h/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,41 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWaac/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# Adaptec AdvanceRaid Controller Driver
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/aac 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWaccr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWaccr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWaccu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWaccu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWafe/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# ADMtek Fast Ethernet driver
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/afe	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWapct/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,44 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWarbel/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWarbel
+#
+d none kernel/drv/s390x 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWarc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,173 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWarc
+#
+d none usr/ccs/lib/s390x 755 root bin
+d none usr/xpg4/lib/s390x 755 root bin
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/crti.o 644 root bin
+f none usr/lib/s390x/crtn.o 644 root bin
+f none usr/lib/s390x/values-Xa.o 644 root bin
+f none usr/lib/s390x/values-Xc.o 644 root bin
+f none usr/lib/s390x/values-Xs.o 644 root bin
+f none usr/lib/s390x/values-Xt.o 644 root bin
+f none usr/lib/s390x/values-xpg4.o 644 root bin
+f none usr/lib/s390x/values-xpg6.o 644 root bin
+s none usr/lib/s390x/llib-ladm.ln=../../../lib/s390x/llib-ladm.ln
+s none usr/lib/s390x/llib-laio.ln=../../../lib/s390x/llib-laio.ln
+f none usr/lib/s390x/llib-lbsdmalloc.ln 644 root bin
+s none usr/lib/s390x/llib-lbsm.ln=../../../lib/s390x/llib-lbsm.ln
+s none usr/lib/s390x/llib-lpam.ln=../../../lib/s390x/llib-lpam.ln
+s none usr/lib/s390x/llib-lc.ln=../../../lib/s390x/llib-lc.ln
+f none usr/lib/s390x/llib-lcfgadm.ln 644 root bin
+f none usr/lib/s390x/llib-lcommputil.ln 644 root bin
+s none usr/lib/s390x/llib-lcontract.ln=../../../lib/s390x/llib-lcontract.ln
+s none usr/lib/s390x/llib-lctf.ln=../../../lib/s390x/llib-lctf.ln
+f none usr/lib/s390x/llib-lcrypt.ln 644 root bin
+s none usr/lib/s390x/llib-lcurses=../../../lib/s390x/llib-lcurses
+s none usr/lib/s390x/llib-lcurses.ln=../../../lib/s390x/llib-lcurses.ln
+s none usr/lib/s390x/llib-ldevice.ln=../../../lib/s390x/llib-ldevice.ln
+s none usr/lib/s390x/llib-ldevid.ln=../../../lib/s390x/llib-ldevid.ln
+s none usr/lib/s390x/llib-ldevinfo.ln=../../../lib/s390x/llib-ldevinfo.ln
+s none usr/lib/s390x/llib-ldl.ln=../../../lib/s390x/llib-ldl.ln
+s none usr/lib/s390x/llib-ldoor.ln=../../../lib/s390x/llib-ldoor.ln
+s none usr/lib/s390x/llib-lefi.ln=../../../lib/s390x/llib-lefi.ln
+s none usr/lib/s390x/llib-lelf.ln=../../../lib/s390x/llib-lelf.ln
+f none usr/lib/s390x/llib-lexacct.ln 644 root bin
+f none usr/lib/s390x/llib-lidmap.ln 644 root bin
+f none usr/lib/s390x/llib-lform.ln 644 root bin
+s none usr/lib/s390x/llib-lgen.ln=../../../lib/s390x/llib-lgen.ln
+f none usr/lib/s390x/llib-lgss.ln 644 root bin
+s none usr/lib/s390x/llib-lintl.ln=../../../lib/s390x/llib-lintl.ln
+f none usr/lib/s390x/llib-lipmi.ln 644 root bin
+f none usr/lib/s390x/llib-lipp.ln 644 root bin
+f none usr/lib/s390x/llib-lkmf.ln 644 root bin
+f none usr/lib/s390x/llib-lkmfberder.ln 644 root bin
+s none usr/lib/s390x/llib-lkstat.ln=../../../lib/s390x/llib-lkstat.ln
+f none usr/lib/s390x/llib-lkvm.ln 644 root bin
+f none usr/lib/s390x/llib-lldap.ln 644 root bin
+f none usr/lib/s390x/llib-llgrp.ln 644 root bin
+f none usr/lib/s390x/llib-lmail.ln 644 root bin
+f none usr/lib/s390x/llib-lmalloc.ln 644 root bin
+f none usr/lib/s390x/llib-lmapmalloc.ln 644 root bin
+s none usr/lib/s390x/llib-lmd5.ln=../../../lib/s390x/llib-lmd5.ln
+f none usr/lib/s390x/llib-lmtmalloc.ln 644 root bin
+f none usr/lib/s390x/llib-lmenu.ln 644 root bin
+f none usr/lib/s390x/llib-lnls.ln 644 root bin
+s none usr/lib/s390x/llib-lnsl.ln=../../../lib/s390x/llib-lnsl.ln
+s none usr/lib/s390x/llib-lnvpair.ln=../../../lib/s390x/llib-lnvpair.ln
+f none usr/lib/s390x/llib-lpanel.ln 644 root bin
+f none usr/lib/s390x/llib-lpkcs11.ln 644 root bin
+f none usr/lib/s390x/llib-lplot.ln 644 root bin
+f none usr/lib/s390x/llib-lproject.ln 644 root bin
+f none usr/lib/s390x/llib-l300.ln 644 root bin
+f none usr/lib/s390x/llib-l300s.ln 644 root bin
+f none usr/lib/s390x/llib-l4014.ln 644 root bin
+f none usr/lib/s390x/llib-l450.ln 644 root bin
+s none usr/lib/s390x/llib-lpthread.ln=../../../lib/s390x/llib-lpthread.ln
+s none usr/lib/s390x/llib-lresolv.ln=../../../lib/s390x/llib-lresolv.ln
+s none usr/lib/s390x/llib-lrpcsvc.ln=../../../lib/s390x/llib-lrpcsvc.ln
+s none usr/lib/s390x/llib-lrt.ln=../../../lib/s390x/llib-lrt.ln
+s none usr/lib/s390x/llib-lrtld_db.ln=../../../lib/s390x/llib-lrtld_db.ln
+s none usr/lib/s390x/llib-lposix4.ln=../../../lib/s390x/llib-lrt.ln
+f none usr/lib/s390x/llib-lsasl.ln 644 root bin
+s none usr/lib/s390x/llib-lscf.ln=../../../lib/s390x/llib-lscf.ln
+f none usr/lib/s390x/llib-lsched.ln 644 root bin
+f none usr/lib/s390x/llib-lsctp.ln 644 root bin
+s none usr/lib/s390x/llib-lsec.ln=../../../lib/s390x/llib-lsec.ln
+s none usr/lib/s390x/llib-lsecdb.ln=../../../lib/s390x/llib-lsecdb.ln
+s none usr/lib/s390x/llib-lsendfile.ln=../../../lib/s390x/llib-lsendfile.ln
+f none usr/lib/s390x/llib-lshare.ln 644 root bin
+f none usr/lib/s390x/llib-lsip.ln 644 root bin
+f none usr/lib/s390x/llib-lsldap.ln 644 root bin
+f none usr/lib/s390x/llib-lsmbios.ln 644 root bin
+s none usr/lib/s390x/llib-lsocket.ln=../../../lib/s390x/llib-lsocket.ln
+f none usr/lib/s390x/llib-lssagent.ln 644 root bin
+f none usr/lib/s390x/llib-lssasnmp.ln 644 root bin
+s none usr/lib/s390x/llib-lsysevent.ln=../../../lib/s390x/llib-lsysevent.ln
+s none usr/lib/s390x/llib-ltermcap=../../../lib/s390x/llib-lcurses
+s none usr/lib/s390x/llib-ltermcap.ln=../../../lib/s390x/llib-lcurses.ln
+s none usr/lib/s390x/llib-ltermlib=../../../lib/s390x/llib-lcurses
+s none usr/lib/s390x/llib-ltermlib.ln=../../../lib/s390x/llib-lcurses.ln
+s none usr/lib/s390x/llib-lthread.ln=../../../lib/s390x/llib-lthread.ln
+s none usr/lib/s390x/llib-lthread_db.ln=../../../lib/s390x/llib-lc_db.ln
+s none usr/lib/s390x/llib-ltsnet.ln=../../../lib/s390x/llib-ltsnet.ln
+s none usr/lib/s390x/llib-ltsol.ln=../../../lib/s390x/llib-ltsol.ln
+s none usr/lib/s390x/llib-lumem.ln=../../../lib/s390x/llib-lumem.ln
+s none usr/lib/s390x/llib-luuid.ln=../../../lib/s390x/llib-luuid.ln
+f none usr/lib/s390x/llib-lvolmgt.ln 644 root bin
+f none usr/lib/s390x/llib-lvt0.ln 644 root bin
+s none usr/lib/s390x/llib-lxnet.ln=../../../lib/s390x/llib-lxnet.ln
+f none usr/xpg4/lib/s390x/llib-lcurses.ln 644 root bin
+s none usr/ccs/lib/s390x/llib-lcurses.ln=../../../../lib/s390x/llib-lcurses.ln
+s none usr/ccs/lib/s390x/llib-lform.ln=../../../lib/s390x/llib-lform.ln
+s none usr/ccs/lib/s390x/llib-lgen.ln=../../../../lib/s390x/llib-lgen.ln
+s none usr/ccs/lib/s390x/llib-lmenu.ln=../../../lib/s390x/llib-lmenu.ln
+s none usr/ccs/lib/s390x/llib-lpanel.ln=../../../lib/s390x/llib-lpanel.ln
+s none usr/ccs/lib/s390x/llib-ltermlib.ln=../../../../lib/s390x/llib-lcurses.ln
+s none usr/ccs/lib/s390x/llib-ltermcap.ln=../../../../lib/s390x/llib-lcurses.ln
+s none usr/ccs/lib/s390x/llib-ll.ln=../../../lib/s390x/llib-ll.ln
+s none usr/ccs/lib/s390x/llib-ly.ln=../../../lib/s390x/llib-ly.ln
+s none usr/ccs/lib/s390x/values-Xa.o=../../../lib/s390x/values-Xa.o
+s none usr/ccs/lib/s390x/values-Xc.o=../../../lib/s390x/values-Xc.o
+s none usr/ccs/lib/s390x/values-Xs.o=../../../lib/s390x/values-Xs.o
+s none usr/ccs/lib/s390x/values-Xt.o=../../../lib/s390x/values-Xt.o
+s none usr/ccs/lib/s390x/values-xpg4.o=../../../lib/s390x/values-xpg4.o
+s none usr/ccs/lib/s390x/values-xpg6.o=../../../lib/s390x/values-xpg6.o
+f none usr/lib/s390x/llib-lpasswdutil.ln 644 root bin
+d none usr/lib/scsi/s390x 755 root bin
+f none usr/lib/scsi/s390x/llib-lscsi.ln 644 root bin
+f none usr/lib/scsi/s390x/llib-lses.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWarcr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,106 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWarcr
+#
+d none lib/s390x 755 root bin
+f none lib/s390x/llib-ladm.ln 644 root bin
+f none lib/s390x/llib-laio.ln 644 root  bin
+f none lib/s390x/llib-lbsm.ln 644 root bin
+f none lib/s390x/llib-lc.ln 644 root bin
+f none lib/s390x/llib-lc_db.ln 644 root bin
+f none lib/s390x/llib-lcontract.ln 644 root bin
+f none lib/s390x/llib-lctf.ln 644 root bin
+f none lib/s390x/llib-lcurses 644 root bin
+f none lib/s390x/llib-lcurses.ln 644 root bin
+f none lib/s390x/llib-ldevice.ln 644 root bin
+f none lib/s390x/llib-ldevid.ln 644 root bin
+f none lib/s390x/llib-ldevinfo.ln 644 root bin
+f none lib/s390x/llib-ldl.ln 644 root bin
+f none lib/s390x/llib-ldlpi.ln 644 root bin
+f none lib/s390x/llib-ldoor.ln 644 root  bin
+f none lib/s390x/llib-lefi.ln 644 root bin
+f none lib/s390x/llib-lelf.ln 644 root bin
+f none lib/s390x/llib-lgen.ln 644 root bin
+f none lib/s390x/llib-lintl.ln 644 root bin
+f none lib/s390x/llib-lkstat.ln 644 root bin
+f none lib/s390x/llib-lmd.ln 644 root bin
+f none lib/s390x/llib-lmd5.ln 644 root bin
+f none lib/s390x/llib-lnsl.ln 644 root bin
+f none lib/s390x/llib-lnvpair.ln 644 root bin
+f none lib/s390x/llib-lpam.ln 644 root bin
+s none lib/s390x/llib-lposix4.ln=./llib-lrt.ln
+f none lib/s390x/llib-lpthread.ln 644 root bin
+f none lib/s390x/llib-lrcm.ln 644 root bin
+f none lib/s390x/llib-lresolv.ln 644 root  bin
+f none lib/s390x/llib-lrpcsvc.ln 644 root  bin
+f none lib/s390x/llib-lrt.ln 644 root  bin
+f none lib/s390x/llib-lrtld_db.ln 644 root  bin
+f none lib/s390x/llib-lscf.ln 0644 root bin
+f none lib/s390x/llib-lsec.ln 644 root bin
+f none lib/s390x/llib-lsecdb.ln 644 root bin
+f none lib/s390x/llib-lsendfile.ln 644 root bin
+f none lib/s390x/llib-lsocket.ln 644 root bin
+f none lib/s390x/llib-lsysevent.ln 644 root bin
+s none lib/s390x/llib-ltermcap.ln=./llib-lcurses.ln
+s none lib/s390x/llib-ltermcap=./llib-lcurses
+s none lib/s390x/llib-ltermlib.ln=./llib-lcurses.ln
+s none lib/s390x/llib-ltermlib=./llib-lcurses
+f none lib/s390x/llib-lthread.ln 644 root bin
+f none lib/s390x/llib-ltsnet.ln 644 root bin
+f none lib/s390x/llib-ltsol.ln 644 root bin
+f none lib/s390x/llib-lumem.ln 0644 root bin
+f none lib/s390x/llib-luuid.ln 644 root bin
+f none lib/s390x/llib-lxnet.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWastdev/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWastdev
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWatfsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1996 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWatfsr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWatfsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1996 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWatfsu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWauda/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999-2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWauda
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWaudd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,62 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# source locations relative to the prototype file
+#
+# SUNWaudd
+#
+f none kernel/drv/audiocs.conf 644 root sys
+f none kernel/drv/audiots.conf 644 root sys
+f none kernel/drv/audio1575.conf 644 root sys
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/audiocs 755 root sys
+f none kernel/drv/s390x/audioens 755 root sys
+f none kernel/drv/s390x/audiots 755 root sys
+f none kernel/drv/s390x/audio1575 755 root sys
+d none kernel/misc/s390x 755 root sys
+f none kernel/misc/s390x/amsrc1 755 root sys
+f none kernel/misc/s390x/amsrc2 755 root sys
+f none kernel/misc/s390x/audiosup 755 root sys
+f none kernel/misc/s390x/mixer 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWaudf/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWaudf
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWaudh/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# source locations relative to the prototype file
+#
+# SUNWaudh
+#
+f none usr/include/sys/audio/audio_4231.h 644 root bin
+f none usr/include/sys/audio/audiots.h 644 root bin
+f none usr/include/sys/audio/audio1575.h 644 root bin
+f none usr/include/sys/audio/am_src2.h 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWaudit/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+
+d none usr/lib/s390x 0755 root bin
+f none usr/lib/s390x/libadt_jni.so.1 755 root bin
+s none usr/lib/s390x/libadt_jni.so=./libadt_jni.so.1
+f none usr/lib/s390x/llib-ladt_jni.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWav1394/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,48 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# SUNWav1394
+#
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/av1394 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbart/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,48 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#  Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+#  Use is subject to license terms.
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# SUNWbart
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbcp/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,57 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1990-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWbcp
+#
+d none usr 755 root sys
+d none usr/4lib 755 root bin
+f none usr/4lib/libc.so.1.9 755 root bin
+f none usr/4lib/libc.so.2.9 755 root bin
+s none usr/4lib/libdl.so.1.0=../../lib/libdl.so.1
+f none usr/4lib/sbcp 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbge/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# Broadcom 57xx GE NIC driver
+d none kernel			0755	root	sys
+d none kernel/drv		0755	root	sys
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/bge	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbip/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWbip
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbipr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWbipr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbnur/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWbnur
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbnuu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWbnuu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWbsr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWbsu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWbtool/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,81 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWbtool
+#
+d none usr/bin/s390x 0755 root bin
+d none usr/ccs/bin/s390x 0755 root bin
+f none usr/bin/s390x/dump 0555 root bin
+s none usr/ccs/bin/s390x/dump=../../../bin/s390x/dump
+f none usr/bin/s390x/elfdump 0555 root bin
+s none usr/ccs/bin/s390x/elfdump=../../../bin/s390x/elfdump
+f none usr/bin/s390x/elfedit 0555 root bin
+f none usr/bin/s390x/mcs 0555 root bin
+s none usr/ccs/bin/s390x/mcs=../../../bin/s390x/mcs
+f none usr/bin/s390x/nm 0555 root bin
+s none usr/ccs/bin/s390x/nm=../../../bin/s390x/nm
+f none usr/bin/s390x/size 0555 root bin
+s none usr/ccs/bin/s390x/size=../../../bin/s390x/size
+l none usr/bin/s390x/strip=../../bin/s390x/mcs
+s none usr/ccs/bin/s390x/strip=../../../bin/s390x/strip
+d none usr/lib/s390x 0755 root bin
+f none usr/lib/s390x/llib-ll.ln 0644 root bin
+f none usr/lib/s390x/llib-ly.ln 0644 root bin
+d none usr/lib/elfedit/s390x 755 root bin
+s none usr/lib/elfedit/64=s390x
+f none usr/lib/elfedit/s390x/cap.so 755 root bin
+f none usr/lib/elfedit/s390x/dyn.so 755 root bin
+f none usr/lib/elfedit/s390x/ehdr.so 755 root bin
+f none usr/lib/elfedit/s390x/phdr.so 755 root bin
+f none usr/lib/elfedit/s390x/shdr.so 755 root bin
+f none usr/lib/elfedit/s390x/str.so 755 root bin
+f none usr/lib/elfedit/s390x/sym.so 755 root bin
+f none usr/lib/elfedit/s390x/syminfo.so 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcakr.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcakr.u
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcakr.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcakr.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcakrnt2000.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcakrnt2000.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcar.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcar.u
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcar.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcar.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcart200.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcart200.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcdrw/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWcdrw
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcg6.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,58 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1990-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcg6.u
+#
+d none platform 755 root sys
+d none platform/sun4u 755 root sys
+d none platform/sun4u/kernel 755 root sys
+d none platform/sun4u/kernel/drv 755 root sys
+d none platform/sun4u/kernel/drv/s390x 755 root sys
+f none platform/sun4u/kernel/drv/s390x/cgsix 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcg6h/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1990-93,1998 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWcg6h
+#
+f none usr/include/sys/cg6reg.h 0644 root bin
+f none usr/include/sys/cg6var.h 0644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWchxge/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+i pkginfo
+i copyright
+i depend
+i postinstall
+i postremove
+
+# Chelsio N110 10G NIC driver
+d none kernel			0755	root	sys
+d none kernel/drv		0755	root	sys
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/chxge	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWckr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,270 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+i i.sdconf
+#
+# source locations relative to the prototype file
+#
+# SUNWckr
+#
+d none kernel/crypto/s390x 755 root sys
+f none kernel/crypto/s390x/aes 755 root sys
+f none kernel/crypto/s390x/arcfour 755 root sys
+f none kernel/crypto/s390x/blowfish 755 root sys
+f none kernel/crypto/s390x/des 755 root sys
+f none kernel/crypto/s390x/ecc 755 root sys
+f none kernel/crypto/s390x/md4 755 root sys
+f none kernel/crypto/s390x/md5 755 root sys
+f none kernel/crypto/s390x/rsa 755 root sys
+f none kernel/crypto/s390x/sha1 755 root sys
+f none kernel/crypto/s390x/sha2 755 root sys
+f none kernel/crypto/s390x/swrand 755 root sys
+d none kernel/dacf/s390x 755 root sys
+f none kernel/dacf/s390x/consconfig_dacf 755 root sys
+f none kernel/dacf/s390x/net_dacf 755 root sys
+f none kernel/drv/dad.conf 644 root sys
+f none kernel/drv/px_pci.conf 644 root sys
+f none kernel/drv/pxb_plx.conf 644 root sys
+e sdconf kernel/drv/sd.conf 644 root sys
+e preserve kernel/drv/uata.conf 644 root sys
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/aggr 755 root sys
+f none kernel/drv/s390x/arp 755 root sys
+f none kernel/drv/s390x/bl 755 root sys
+f none kernel/drv/s390x/bpp 755 root sys
+f none kernel/drv/s390x/clone 755 root sys
+f none kernel/drv/s390x/cn 755 root sys
+f none kernel/drv/s390x/conskbd 755 root sys
+f none kernel/drv/s390x/consms 755 root sys
+f none kernel/drv/s390x/cpuid 755 root sys
+f none kernel/drv/s390x/crypto 755 root sys
+f none kernel/drv/s390x/cryptoadm 755 root sys
+f none kernel/drv/s390x/dad 755 root sys
+f none kernel/drv/s390x/devinfo 755 root sys
+f none kernel/drv/s390x/dld 755 root sys
+f none kernel/drv/s390x/esp 755 root sys
+f none kernel/drv/s390x/i8042 755 root sys
+f none kernel/drv/s390x/icmp 755 root sys
+f none kernel/drv/s390x/icmp6 755 root sys
+f none kernel/drv/s390x/ip 755 root sys
+f none kernel/drv/s390x/ip6 755 root sys
+f none kernel/drv/s390x/ippctl 755 root sys
+f none kernel/drv/s390x/ipsecah 755 root sys
+f none kernel/drv/s390x/ipsecesp 755 root sys
+f none kernel/drv/s390x/isp 755 root sys
+f none kernel/drv/s390x/iwscn 755 root sys
+f none kernel/drv/s390x/kb8042 755 root sys
+f none kernel/drv/s390x/keysock 755 root sys
+f none kernel/drv/s390x/kmdb 755 root sys
+f none kernel/drv/s390x/kssl 755 root sys
+f none kernel/drv/s390x/llc1 755 root sys
+f none kernel/drv/s390x/lofi 755 root sys
+f none kernel/drv/s390x/log 755 root sys
+f none kernel/drv/s390x/mm 755 root sys
+f none kernel/drv/s390x/mouse8042 755 root sys
+f none kernel/drv/s390x/openeepr 755 root sys
+f none kernel/drv/s390x/options 755 root sys
+f none kernel/drv/s390x/pci_pci 755 root sys
+f none kernel/drv/s390x/physmem 755 root sys
+f none kernel/drv/s390x/poll 755 root sys
+f none kernel/drv/s390x/pseudo 755 root sys
+f none kernel/drv/s390x/ptc 755 root sys
+f none kernel/drv/s390x/ptsl 755 root sys
+f none kernel/drv/s390x/px_pci 755 root sys
+f none kernel/drv/s390x/pxb_bcm 755 root sys
+f none kernel/drv/s390x/pxb_plx 755 root sys
+f none kernel/drv/s390x/ramdisk 755 root sys
+f none kernel/drv/s390x/random 755 root sys
+f none kernel/drv/s390x/rts 755 root sys
+f none kernel/drv/s390x/sad 755 root sys
+f none kernel/drv/s390x/scsi_vhci 755 root sys
+f none kernel/drv/s390x/sctp 755 root sys
+f none kernel/drv/s390x/sctp6 755 root sys
+f none kernel/drv/s390x/sd 755 root sys
+f none kernel/drv/s390x/sgen 755 root sys
+f none kernel/drv/s390x/softmac 755 root sys
+f none kernel/drv/s390x/spdsock 755 root sys
+f none kernel/drv/s390x/st 755 root sys
+f none kernel/drv/s390x/sy 755 root sys
+f none kernel/drv/s390x/sysevent 755 root sys
+f none kernel/drv/s390x/sysmsg 755 root sys
+f none kernel/drv/s390x/tcp 755 root sys
+f none kernel/drv/s390x/tcp6 755 root sys
+f none kernel/drv/s390x/tl 755 root sys
+f none kernel/drv/s390x/ttymux 755 root sys
+f none kernel/drv/s390x/uata 755 root sys	
+f none kernel/drv/s390x/udp 755 root sys
+f none kernel/drv/s390x/udp6 755 root sys
+f none kernel/drv/s390x/vni 755 root sys
+f none kernel/drv/s390x/vnic 755 root sys
+f none kernel/drv/s390x/wc 755 root sys
+d none kernel/exec/s390x 755 root sys
+f none kernel/exec/s390x/aoutexec 755 root sys
+f none kernel/exec/s390x/elfexec 755 root sys
+f none kernel/exec/s390x/intpexec 755 root sys
+d none kernel/fs/s390x 755 root sys
+f none kernel/fs/s390x/autofs 755 root sys
+f none kernel/fs/s390x/cachefs 755 root sys
+f none kernel/fs/s390x/ctfs 755 root sys
+f none kernel/fs/s390x/dcfs 755 root sys
+f none kernel/fs/s390x/devfs 755 root sys
+f none kernel/fs/s390x/dev 755 root sys
+f none kernel/fs/s390x/fifofs 755 root sys
+f none kernel/fs/s390x/hsfs 755 root sys
+f none kernel/fs/s390x/lofs 755 root sys
+f none kernel/fs/s390x/mntfs 755 root sys
+f none kernel/fs/s390x/namefs 755 root sys
+f none kernel/fs/s390x/objfs 755 root sys
+f none kernel/fs/s390x/procfs 755 root sys
+f none kernel/fs/s390x/sharefs 755 root sys
+f none kernel/fs/s390x/sockfs 755 root sys
+f none kernel/fs/s390x/specfs 755 root sys
+f none kernel/fs/s390x/tmpfs 755 root sys
+f none kernel/fs/s390x/ufs 755 root sys
+d none kernel/ipp/s390x 755 root sys
+f none kernel/ipp/s390x/ipgpc 755 root sys
+d none kernel/mac/s390x 755 root sys
+f none kernel/mac/s390x/mac_ether 755 root sys
+f none kernel/mac/s390x/mac_wifi 755 root sys
+f none kernel/mac/s390x/mac_ib 755 root sys
+f none kernel/misc/s390x/bignum 755 root sys
+d none kernel/misc/scsi_vhci 755 root sys
+d none kernel/misc/scsi_vhci/s390x 755 root sys
+f none kernel/misc/scsi_vhci/s390x/scsi_vhci_f_asym_emc 755 root sys
+f none kernel/misc/scsi_vhci/s390x/scsi_vhci_f_asym_lsi 755 root sys
+f none kernel/misc/scsi_vhci/s390x/scsi_vhci_f_asym_sun 755 root sys
+f none kernel/misc/scsi_vhci/s390x/scsi_vhci_f_sym 755 root sys
+f none kernel/misc/scsi_vhci/s390x/scsi_vhci_f_sym_emc 755 root sys
+f none kernel/misc/scsi_vhci/s390x/scsi_vhci_f_sym_hds 755 root sys
+f none kernel/misc/scsi_vhci/s390x/scsi_vhci_f_tpgs 755 root sys
+f none kernel/misc/scsi_vhci/s390x/scsi_vhci_f_tape 755 root sys
+f none kernel/misc/scsi_vhci/s390x/scsi_vhci_f_tpgs_tape 755 root sys
+d none kernel/misc/s390x 755 root sys
+f none kernel/misc/s390x/blk2scsa 755 root sys
+f none kernel/misc/s390x/busra 755 root sys
+f none kernel/misc/s390x/cardbus 755 root sys
+f none kernel/misc/s390x/cmlb 755 root sys
+f none kernel/misc/s390x/consconfig 755 root sys
+f none kernel/misc/s390x/ctf 755 root sys
+f none kernel/misc/s390x/dada 755 root sys
+s none kernel/misc/s390x/des=../../../kernel/crypto/s390x/des
+f none kernel/misc/s390x/dls 755 root sys
+f none kernel/misc/s390x/fssnap_if 755 root sys
+f none kernel/misc/s390x/gld 755 root sys
+f none kernel/misc/s390x/hook 755 root sys
+f none kernel/misc/s390x/hpcsvc 755 root sys
+f none kernel/misc/s390x/idmap 755 root sys
+f none kernel/misc/s390x/ipc 755 root sys
+f none kernel/misc/s390x/kbtrans 755 root sys
+f none kernel/misc/s390x/kcf 755 root sys
+f none kernel/misc/s390x/mac 755 root sys
+l none kernel/misc/s390x/md5=../../../kernel/crypto/s390x/md5
+f none kernel/misc/s390x/neti 755 root sys
+f none kernel/misc/s390x/pcie 755 root sys
+f none kernel/misc/s390x/pcihp 755 root sys
+f none kernel/misc/s390x/pciehpc 755 root sys
+f none kernel/misc/s390x/pcishpc 755 root sys
+f none kernel/misc/s390x/pcmcia 755 root sys
+f none kernel/misc/s390x/rpcsec 755 root sys
+f none kernel/misc/s390x/scsi 755 root sys
+l none kernel/misc/s390x/sha1=../../../kernel/crypto/s390x/sha1
+l none kernel/misc/s390x/sha2=../../../kernel/crypto/s390x/sha2
+f none kernel/misc/s390x/strplumb 755 root sys
+f none kernel/misc/s390x/swapgeneric 755 root sys
+f none kernel/misc/s390x/tlimod 755 root sys
+f none kernel/misc/s390x/tem 755 root sys
+d none kernel/sched/s390x 755 root sys
+f none kernel/sched/s390x/TS 755 root sys
+f none kernel/sched/s390x/TS_DPTBL 755 root sys
+d none kernel/strmod/s390x 755 root sys
+f none kernel/strmod/s390x/6to4tun 755 root sys
+l none kernel/strmod/s390x/arp=../../../kernel/drv/s390x/arp
+f none kernel/strmod/s390x/atun 755 root sys
+f none kernel/strmod/s390x/bufmod 755 root sys
+f none kernel/strmod/s390x/connld 755 root sys
+f none kernel/strmod/s390x/dedump 755 root sys
+f none kernel/strmod/s390x/drcompat 755 root sys
+l none kernel/strmod/s390x/icmp=../../../kernel/drv/s390x/icmp
+l none kernel/strmod/s390x/ip=../../../kernel/drv/s390x/ip
+l none kernel/strmod/s390x/ipsecah=../../../kernel/drv/s390x/ipsecah
+l none kernel/strmod/s390x/ipsecesp=../../../kernel/drv/s390x/ipsecesp
+l none kernel/strmod/s390x/keysock=../../../kernel/drv/s390x/keysock
+f none kernel/strmod/s390x/ldterm 755 root sys
+f none kernel/strmod/s390x/ms 755 root sys
+f none kernel/strmod/s390x/pckt 755 root sys
+f none kernel/strmod/s390x/pfmod 755 root sys
+f none kernel/strmod/s390x/pipemod 755 root sys
+f none kernel/strmod/s390x/ptem 755 root sys
+f none kernel/strmod/s390x/redirmod 755 root sys
+f none kernel/strmod/s390x/rpcmod 755 root sys
+l none kernel/strmod/s390x/tcp=../../../kernel/drv/s390x/tcp
+f none kernel/strmod/s390x/timod 755 root sys
+f none kernel/strmod/s390x/tirdwr 755 root sys
+f none kernel/strmod/s390x/ttcompat 755 root sys
+f none kernel/strmod/s390x/tun 755 root sys
+l none kernel/strmod/s390x/udp=../../../kernel/drv/s390x/udp
+f none kernel/strmod/s390x/vuid3ps2 755 root sys
+d none kernel/sys/s390x 755 root sys
+l none kernel/sys/s390x/autofs=../../../kernel/fs/s390x/autofs
+f none kernel/sys/s390x/c2audit 755 root sys
+f none kernel/sys/s390x/doorfs 755 root sys
+f none kernel/sys/s390x/inst_sync 755 root sys
+f none kernel/sys/s390x/kaio 755 root sys
+f none kernel/sys/s390x/msgsys 755 root sys
+f none kernel/sys/s390x/pipe 755 root sys
+f none kernel/sys/s390x/portfs 755 root sys
+f none kernel/sys/s390x/pset 755 root sys
+l none kernel/sys/s390x/rpcmod=../../../kernel/strmod/s390x/rpcmod
+f none kernel/sys/s390x/semsys 755 root sys
+f none kernel/sys/s390x/shmsys 755 root sys
+d none kernel/devname/s390x 755 root sys
+f none kernel/devname/s390x/sdev_nsconfig_mod 755 root sys
+d none kernel/kiconv/s390x 755 root sys
+f none kernel/kiconv/s390x/kiconv_emea 755 root sys
+f none kernel/kiconv/s390x/kiconv_ja 755 root sys
+f none kernel/kiconv/s390x/kiconv_ko 755 root sys
+f none kernel/kiconv/s390x/kiconv_sc 755 root sys
+f none kernel/kiconv/s390x/kiconv_tc 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcnetr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcnetr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcnsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcnsr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcnsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcnsu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcpc.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+# 
+# SUNWcpc.u
+#
+d none platform/sun4u 755 root sys
+d none platform/sun4u/kernel 755 root sys
+d none platform/sun4u/kernel/drv 755 root sys
+f none platform/sun4u/kernel/drv/cpc.conf 644 root sys
+d none platform/sun4u/kernel/drv/s390x 755 root sys
+f none platform/sun4u/kernel/drv/s390x/cpc 755 root sys
+d none platform/sun4u/kernel/sys 755 root sys
+d none platform/sun4u/kernel/sys/s390x 755 root sys
+l none platform/sun4u/kernel/sys/s390x/cpc=../../drv/s390x/cpc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcpc.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,47 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+# 
+# SUNWcpc.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcpcu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# SUNWcpcu
+#
+d none usr/bin/s390x 755 root bin
+f none usr/bin/s390x/cputrack 555 root bin
+d none usr/kernel/pcbe/s390x 755 root sys
+f none usr/kernel/pcbe/s390x/pcbe.4.6 755 root sys
+l none usr/kernel/pcbe/s390x/pcbe.4.7=pcbe.4.6 755 root sys
+f none usr/kernel/pcbe/s390x/pcbe.62 755 root sys
+l none usr/kernel/pcbe/s390x/pcbe.23=pcbe.62 755 root sys
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libcpc.so.1 755 root bin
+s none usr/lib/s390x/libcpc.so=./libcpc.so.1
+f none usr/lib/s390x/llib-lcpc.ln 644 root bin
+f none usr/lib/s390x/libpctx.so.1 755 root bin
+s none usr/lib/s390x/libpctx.so=./libpctx.so.1
+f none usr/lib/s390x/llib-lpctx.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcpr.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1995-2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWcpr.u
+#
+f none platform/sun4u/cprboot 0644 root sys
+d none platform/sun4u/kernel/misc/s390x 0755 root sys
+f none platform/sun4u/kernel/misc/s390x/cpr 0755 root sys
+d none platform/sun4u/kernel/drv/s390x 0755 root sys
+f none platform/sun4u/kernel/drv/tod.conf 0644 root sys
+f none platform/sun4u/kernel/drv/s390x/tod 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcryptoint/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,57 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWcryptoint
+#
+d none kernel/crypto/s390x 755 root sys
+s none kernel/crypto/s390x/dprov=../../../kernel/drv/s390x/dprov
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/dprov 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcsd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# SUNWcsd
+#
+# DO NOT ADD ENTRIES FOR CHARACTER AND BLOCK DEVICES HERE!
+#
+# Entries for character and block devices which must exist prior to running
+# drvconfig on a reconfiguration boot must be added to the postinstall script
+# configuration section.  Refer to the comments there for details.
+# NOTE: If the directory needs to be retained even when empty, update the
+# packaged_dirs global variable in usr/src/cmd/devfsadm/devfsadm.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcsl/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -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 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+
+
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcsl
+#
+d none usr/ccs/lib/s390x 755 root bin
+s none usr/ccs/lib/s390x/libcurses.so=../../../../lib/s390x/libcurses.so.1
+s none usr/ccs/lib/s390x/libform.so=../../../lib/s390x/libform.so.1
+s none usr/ccs/lib/s390x/libgen.so=../../../../lib/s390x/libgen.so.1
+s none usr/ccs/lib/s390x/libmalloc.so=../../../lib/s390x/libmalloc.so.1
+s none usr/ccs/lib/s390x/libmenu.so=../../../lib/s390x/libmenu.so.1
+s none usr/ccs/lib/s390x/libpanel.so=../../../lib/s390x/libpanel.so.1
+s none usr/ccs/lib/s390x/libtermlib.so=../../../../lib/s390x/libcurses.so.1
+s none usr/ccs/lib/s390x/libtermcap.so=../../../../lib/s390x/libcurses.so.1
+s none usr/ccs/lib/s390x/libl.so=../../../lib/s390x/libl.so.1
+s none usr/ccs/lib/s390x/liby.so=../../../lib/s390x/liby.so.1
+d none usr/lib/cfgadm/s390x 755 root bin
+f none usr/lib/cfgadm/s390x/scsi.so.1 755 root bin
+s none usr/lib/cfgadm/s390x/scsi.so=./scsi.so.1
+f none usr/lib/cfgadm/s390x/sdcard.so.1 755 root bin
+s none usr/lib/cfgadm/s390x/sdcard.so=./sdcard.so.1
+f none usr/lib/cfgadm/s390x/pci.so.1 755 root bin
+s none usr/lib/cfgadm/s390x/pci.so=./pci.so.1
+f none usr/lib/cfgadm/s390x/usb.so.1 755 root bin
+s none usr/lib/cfgadm/s390x/usb.so=./usb.so.1
+f none usr/lib/cfgadm/s390x/ib.so.1 755 root bin
+s none usr/lib/cfgadm/s390x/ib.so=./ib.so.1
+d none usr/lib/dns/s390x 755 root bin
+# EXPORT DELETE START
+f none usr/lib/dns/s390x/cylink.so.1 755 root bin
+f none usr/lib/dns/s390x/dnssafe.so.1 755 root bin
+# EXPORT DELETE END
+f none usr/lib/dns/s390x/irs.so.1 755 root bin
+d none usr/lib/fp/libp/s390x 755 root bin
+d none usr/lib/iconv/s390x 755 root bin
+d none usr/lib/lwp/s390x 755 root bin
+s none usr/lib/lwp/64=s390x
+s none usr/lib/lwp/s390x/libthread.so.1=../../s390x/libthread.so.1
+s none usr/lib/lwp/s390x/libthread_db.so.1=../../s390x/libthread_db.so.1
+d none usr/lib/raidcfg/s390x 755 root bin
+f none usr/lib/raidcfg/s390x/mpt.so.1 755 root bin
+d none usr/lib/scsi/s390x 755 root bin
+f none usr/lib/scsi/s390x/libscsi.so.1 755 root bin
+s none usr/lib/scsi/s390x/libscsi.so=./libscsi.so.1
+f none usr/lib/scsi/s390x/libses.so.1 755 root bin
+s none usr/lib/scsi/s390x/libses.so=./libses.so.1
+d none usr/lib/scsi/plugins/scsi/engines/s390x 755 root bin
+f none usr/lib/scsi/plugins/scsi/engines/s390x/uscsi.so 755 root bin
+d none usr/lib/scsi/plugins/ses/framework/s390x 755 root bin
+f none usr/lib/scsi/plugins/ses/framework/s390x/libses.so 755 root bin
+f none usr/lib/scsi/plugins/ses/framework/s390x/ses2.so 755 root bin
+d none usr/lib/scsi/plugins/ses/vendor/s390x 755 root bin
+d none usr/lib/security/s390x 755 root bin
+s none usr/lib/security/64=s390x
+f none usr/lib/security/s390x/crypt_bsdmd5.so.1 755 root bin
+s none usr/lib/security/s390x/crypt_bsdmd5.so=./crypt_bsdmd5.so.1
+f none usr/lib/security/s390x/crypt_bsdbf.so.1 755 root bin
+s none usr/lib/security/s390x/crypt_bsdbf.so=./crypt_bsdbf.so.1
+f none usr/lib/security/s390x/crypt_sha256.so.1 755 root bin
+s none usr/lib/security/s390x/crypt_sha256.so=./crypt_sha256.so.1
+f none usr/lib/security/s390x/crypt_sha512.so.1 755 root bin
+s none usr/lib/security/s390x/crypt_sha512.so=./crypt_sha512.so.1
+f none usr/lib/security/s390x/crypt_sunmd5.so.1 755 root bin
+s none usr/lib/security/s390x/crypt_sunmd5.so=./crypt_sunmd5.so.1
+f none usr/lib/security/s390x/kmf_nss.so.1 755 root bin
+f none usr/lib/security/s390x/kmf_openssl.so.1 755 root bin
+f none usr/lib/security/s390x/kmf_pkcs11.so.1 755 root bin
+f none usr/lib/security/s390x/pam_ldap.so.1 755 root bin
+s none usr/lib/security/s390x/pam_ldap.so=./pam_ldap.so.1
+f none usr/lib/security/s390x/pam_allow.so.1 755 root bin
+s none usr/lib/security/s390x/pam_allow.so=./pam_allow.so.1
+f none usr/lib/security/s390x/pam_authtok_get.so.1 755 root bin
+s none usr/lib/security/s390x/pam_authtok_get.so=./pam_authtok_get.so.1
+f none usr/lib/security/s390x/pam_authtok_check.so.1 755 root bin
+s none usr/lib/security/s390x/pam_authtok_check.so=./pam_authtok_check.so.1
+f none usr/lib/security/s390x/pam_authtok_store.so.1 755 root bin
+s none usr/lib/security/s390x/pam_authtok_store.so=./pam_authtok_store.so.1
+f none usr/lib/security/s390x/pam_deny.so.1 755 root bin
+s none usr/lib/security/s390x/pam_deny.so=./pam_deny.so.1
+f none usr/lib/security/s390x/pam_dhkeys.so.1 755 root bin
+s none usr/lib/security/s390x/pam_dhkeys.so=./pam_dhkeys.so.1
+f none usr/lib/security/s390x/pam_unix_auth.so.1 755 root bin
+s none usr/lib/security/s390x/pam_unix_auth.so=./pam_unix_auth.so.1
+f none usr/lib/security/s390x/pam_unix_cred.so.1 755 root bin
+s none usr/lib/security/s390x/pam_unix_cred.so=./pam_unix_cred.so.1
+f none usr/lib/security/s390x/pam_unix_session.so.1 755 root bin
+s none usr/lib/security/s390x/pam_unix_session.so=./pam_unix_session.so.1
+f none usr/lib/security/s390x/pam_unix_account.so.1 755 root bin
+s none usr/lib/security/s390x/pam_unix_account.so=./pam_unix_account.so.1
+f none usr/lib/security/s390x/pam_rhosts_auth.so.1 755 root bin
+s none usr/lib/security/s390x/pam_rhosts_auth.so=./pam_rhosts_auth.so.1
+f none usr/lib/security/s390x/pam_dial_auth.so.1 755 root bin
+s none usr/lib/security/s390x/pam_dial_auth.so=./pam_dial_auth.so.1
+f none usr/lib/security/s390x/pam_sample.so.1 755 root bin
+s none usr/lib/security/s390x/pam_sample.so=./pam_sample.so.1
+f none usr/lib/security/s390x/pam_roles.so.1 755 root bin
+s none usr/lib/security/s390x/pam_roles.so=./pam_roles.so.1
+f none usr/lib/security/s390x/pam_passwd_auth.so.1 755 root bin
+s none usr/lib/security/s390x/pam_passwd_auth.so=./pam_passwd_auth.so.1
+f none usr/lib/security/s390x/pam_list.so.1 755 root bin
+s none usr/lib/security/s390x/pam_list.so=./pam_list.so.1
+f none usr/lib/security/s390x/pam_tsol_account.so.1 755 root bin
+s none usr/lib/security/s390x/pam_tsol_account.so=./pam_tsol_account.so.1
+f none usr/lib/security/s390x/pkcs11_kernel.so.1 755 root bin
+s none usr/lib/security/s390x/pkcs11_kernel.so=./pkcs11_kernel.so.1
+f none usr/lib/security/s390x/pkcs11_softtoken.so.1 755 root bin
+s none usr/lib/security/s390x/pkcs11_softtoken.so=./pkcs11_softtoken.so.1
+s none usr/lib/64=s390x
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libbsdmalloc.so.1 755 root bin
+s none usr/lib/s390x/libbsdmalloc.so=libbsdmalloc.so.1
+s none usr/lib/s390x/libbsm.so.1=../../../lib/s390x/libbsm.so.1
+s none usr/lib/s390x/libbsm.so=../../../lib/s390x/libbsm.so.1
+f none usr/lib/s390x/libcfgadm.so.1 755 root bin
+s none usr/lib/s390x/libcfgadm.so=libcfgadm.so.1
+f none usr/lib/s390x/libcmd.so.1 755 root bin
+s none usr/lib/s390x/libcmd.so=libcmd.so.1
+s none usr/lib/s390x/libcmdutils.so.1=../../../lib/s390x/libcmdutils.so.1
+f none usr/lib/s390x/libcommputil.so.1 755 root bin
+s none usr/lib/s390x/libcommputil.so=libcommputil.so.1
+f none usr/lib/s390x/libcrle.so.1 755 root bin
+f none usr/lib/s390x/libcryptoutil.so.1 755 root bin
+s none usr/lib/s390x/libcryptoutil.so=libcryptoutil.so.1
+f none usr/lib/s390x/libcrypt.so.1 755 root bin
+s none usr/lib/s390x/libcrypt.so=./libcrypt.so.1
+s none usr/lib/s390x/libcrypt_i.so=./libcrypt.so
+s none usr/lib/s390x/libcrypt_i.so.1=./libcrypt.so.1
+s none usr/lib/s390x/libcrypt_d.so=./libcrypt.so
+s none usr/lib/s390x/libcrypt_d.so.1=./libcrypt.so.1
+s none usr/lib/s390x/libctf.so.1=../../../lib/s390x/libctf.so.1
+s none usr/lib/s390x/libctf.so=../../../lib/s390x/libctf.so.1
+s none usr/lib/s390x/libcurses.so.1=../../../lib/s390x/libcurses.so.1
+s none usr/lib/s390x/libcurses.so=../../../lib/s390x/libcurses.so.1
+f none usr/lib/s390x/libdisasm.so.1 755 root bin
+s none usr/lib/s390x/libdisasm.so=libdisasm.so.1
+f none usr/lib/s390x/libform.so.1 755 root bin
+s none usr/lib/s390x/libform.so=libform.so.1
+s none usr/lib/s390x/libgen.so.1=../../../lib/s390x/libgen.so.1
+s none usr/lib/s390x/libgen.so=../../../lib/s390x/libgen.so.1
+f none usr/lib/s390x/libidmap.so.1 755 root bin
+s none usr/lib/s390x/libidmap.so=./libidmap.so.1
+s none usr/lib/s390x/libinetutil.so.1=../../../lib/s390x/libinetutil.so.1
+f none usr/lib/s390x/libipmi.so.1 755 root bin
+s none usr/lib/s390x/libipmi.so=libipmi.so.1
+f none usr/lib/s390x/libipp.so.1 755 root bin
+s none usr/lib/s390x/libipp.so=libipp.so.1
+f none usr/lib/s390x/libipsecutil.so.1 755 root bin
+f none usr/lib/s390x/libkmf.so.1 755 root bin
+s none usr/lib/s390x/libkmf.so=libkmf.so.1
+f none usr/lib/s390x/libkmfberder.so.1 755 root bin
+s none usr/lib/s390x/libkmfberder.so=libkmfberder.so.1
+f none usr/lib/s390x/libldap.so.4 755 root bin
+f none usr/lib/s390x/libldap.so.5 755 root bin
+s none usr/lib/s390x/libldap.so=libldap.so.5
+s none usr/lib/s390x/liblddbg.so.4=../../../lib/s390x/liblddbg.so.4
+f none usr/lib/s390x/liblgrp.so.1 755 root bin
+s none usr/lib/s390x/liblgrp.so=liblgrp.so.1
+f none usr/lib/s390x/libmalloc.so.1 755 root bin
+s none usr/lib/s390x/libmalloc.so=libmalloc.so.1
+s none usr/lib/s390x/libmd.so.1=../../../lib/s390x/libmd.so.1
+s none usr/lib/s390x/libmd.so=../../../lib/s390x/libmd.so.1
+s none usr/lib/s390x/libmd5.so.1=../../../lib/s390x/libmd5.so.1
+s none usr/lib/s390x/libmd5.so=../../../lib/s390x/libmd5.so.1
+f none usr/lib/s390x/libmenu.so.1 755 root bin
+s none usr/lib/s390x/libmenu.so=libmenu.so.1
+f none usr/lib/s390x/libnls.so.1 755 root bin
+s none usr/lib/s390x/libnls.so=libnls.so.1
+f none usr/lib/s390x/libpanel.so.1 755 root bin
+s none usr/lib/s390x/libpanel.so=libpanel.so.1
+f none usr/lib/s390x/libplot.so.1 755 root bin
+s none usr/lib/s390x/libplot.so=./libplot.so.1
+f none usr/lib/s390x/libproject.so.1 755 root bin
+s none usr/lib/s390x/libproject.so=libproject.so.1
+f none usr/lib/s390x/libpkcs11.so.1 755 root bin
+s none usr/lib/s390x/libpkcs11.so=libpkcs11.so.1
+f none usr/lib/s390x/libraidcfg.so.1 755 root bin
+f none usr/lib/s390x/lib300.so.1 755 root bin
+s none usr/lib/s390x/lib300.so=./lib300.so.1
+f none usr/lib/s390x/lib300s.so.1 755 root bin
+s none usr/lib/s390x/lib300s.so=./lib300s.so.1
+f none usr/lib/s390x/lib4014.so.1 755 root bin
+s none usr/lib/s390x/lib4014.so=./lib4014.so.1
+f none usr/lib/s390x/lib450.so.1 755 root bin
+s none usr/lib/s390x/lib450.so=./lib450.so.1
+s none usr/lib/s390x/libthread_db.so.1=../../../lib/s390x/libc_db.so.1
+s none usr/lib/s390x/libthread_db.so=../../../lib/s390x/libc_db.so.1
+s none usr/lib/s390x/libuuid.so.1=../../../lib/s390x/libuuid.so.1
+s none usr/lib/s390x/libuuid.so=../../../lib/s390x/libuuid.so.1
+f none usr/lib/s390x/libvt0.so.1 755 root bin
+s none usr/lib/s390x/libvt0.so=./libvt0.so.1
+f none usr/lib/s390x/0@0.so.1 755 root bin
+s none usr/lib/s390x/libadm.so.1=../../../lib/s390x/libadm.so.1
+s none usr/lib/s390x/libadm.so=../../../lib/s390x/libadm.so.1
+s none usr/lib/s390x/libaio.so.1=../../../lib/s390x/libaio.so.1
+s none usr/lib/s390x/libaio.so=../../../lib/s390x/libaio.so.1
+f none usr/lib/s390x/libast.so.1 755 root bin
+s none usr/lib/s390x/libavl.so.1=../../../lib/s390x/libavl.so.1
+s none usr/lib/s390x/libc.so.1=../../../lib/s390x/libc.so.1
+s none usr/lib/s390x/libc.so=../../../lib/s390x/libc.so.1
+s none usr/lib/s390x/libc_db.so.1=../../../lib/s390x/libc_db.so.1
+s none usr/lib/s390x/libc_db.so=../../../lib/s390x/libc_db.so.1
+s none usr/lib/s390x/libcontract.so.1=../../../lib/s390x/libcontract.so.1
+s none usr/lib/s390x/libcontract.so=../../../lib/s390x/libcontract.so.1
+s none usr/lib/s390x/libdevice.so.1=../../../lib/s390x/libdevice.so.1
+s none usr/lib/s390x/libdevice.so=../../../lib/s390x/libdevice.so.1
+s none usr/lib/s390x/libdevid.so.1=../../../lib/s390x/libdevid.so.1
+s none usr/lib/s390x/libdevid.so=../../../lib/s390x/libdevid.so.1
+s none usr/lib/s390x/libdevinfo.so.1=../../../lib/s390x/libdevinfo.so.1
+s none usr/lib/s390x/libdevinfo.so=../../../lib/s390x/libdevinfo.so.1
+s none usr/lib/s390x/libdl.so.1=../../../lib/s390x/libdl.so.1
+s none usr/lib/s390x/libdl.so=../../../lib/s390x/libdl.so.1
+f none usr/lib/s390x/libdll.so.1 755 root bin
+s none usr/lib/s390x/libdlpi.so.1=../../../lib/s390x/libdlpi.so.1
+s none usr/lib/s390x/libdlpi.so=../../../lib/s390x/libdlpi.so.1
+s none usr/lib/s390x/libdoor.so.1=../../../lib/s390x/libdoor.so.1
+s none usr/lib/s390x/libdoor.so=../../../lib/s390x/libdoor.so.1
+s none usr/lib/s390x/libefi.so.1=../../../lib/s390x/libefi.so.1
+s none usr/lib/s390x/libefi.so=../../../lib/s390x/libefi.so.1
+s none usr/lib/s390x/libelf.so.1=../../../lib/s390x/libelf.so.1
+s none usr/lib/s390x/libelf.so=../../../lib/s390x/libelf.so.1
+f none usr/lib/s390x/libexacct.so.1 755 root bin
+s none usr/lib/s390x/libexacct.so=libexacct.so.1
+s none usr/lib/s390x/libintl.so.1=../../../lib/s390x/libintl.so.1
+s none usr/lib/s390x/libintl.so=../../../lib/s390x/libintl.so.1
+s none usr/lib/s390x/libkstat.so.1=../../../lib/s390x/libkstat.so.1
+s none usr/lib/s390x/libkstat.so=../../../lib/s390x/libkstat.so.1
+f none usr/lib/s390x/libkvm.so.1 755 root bin
+s none usr/lib/s390x/libkvm.so=libkvm.so.1
+f none usr/lib/s390x/libl.so.1 755 root bin
+s none usr/lib/s390x/libl.so=libl.so.1
+f none usr/lib/s390x/liblm.so.1 755 root bin
+s none usr/lib/s390x/liblm.so=liblm.so.1
+f none usr/lib/s390x/libmail.so.1 755 root bin
+s none usr/lib/s390x/libmail.so=libmail.so.1
+f none usr/lib/s390x/libmapmalloc.so.1 755 root bin
+s none usr/lib/s390x/libmapmalloc.so=libmapmalloc.so.1
+f none usr/lib/s390x/libmtmalloc.so.1 755 root bin
+s none usr/lib/s390x/libmtmalloc.so=libmtmalloc.so.1
+s none usr/lib/s390x/libmp.so=../../../lib/s390x/libmp.so.2
+s none usr/lib/s390x/libmp.so.2=../../../lib/s390x/libmp.so.2
+s none usr/lib/s390x/libnsl.so.1=../../../lib/s390x/libnsl.so.1
+s none usr/lib/s390x/libnsl.so=../../../lib/s390x/libnsl.so.1
+s none usr/lib/s390x/libnvpair.so.1=../../../lib/s390x/libnvpair.so.1
+s none usr/lib/s390x/libnvpair.so=../../../lib/s390x/libnvpair.so.1
+s none usr/lib/s390x/libpam.so.1=../../../lib/s390x/libpam.so.1
+s none usr/lib/s390x/libpam.so=../../../lib/s390x/libpam.so.1
+s none usr/lib/s390x/libproc.so.1=../../../lib/s390x/libproc.so.1
+s none usr/lib/s390x/libproc.so=../../../lib/s390x/libproc.so.1
+s none usr/lib/s390x/libpthread.so.1=../../../lib/s390x/libpthread.so.1
+s none usr/lib/s390x/libpthread.so=../../../lib/s390x/libpthread.so.1
+s none usr/lib/s390x/librcm.so.1=../../../lib/s390x/librcm.so.1
+s none usr/lib/s390x/librcm.so=../../../lib/s390x/librcm.so.1
+s none usr/lib/s390x/libresolv.so.2=../../../lib/s390x/libresolv.so.2
+s none usr/lib/s390x/libresolv.so=../../../lib/s390x/libresolv.so.2
+s none usr/lib/s390x/librestart.so.1=../../../lib/s390x/librestart.so.1
+s none usr/lib/s390x/librpcsvc.so.1=../../../lib/s390x/librpcsvc.so.1
+s none usr/lib/s390x/librpcsvc.so=../../../lib/s390x/librpcsvc.so.1
+s none usr/lib/s390x/librt.so.1=../../../lib/s390x/librt.so.1
+s none usr/lib/s390x/librt.so=../../../lib/s390x/librt.so.1
+s none usr/lib/s390x/libposix4.so=../../../lib/s390x/librt.so.1
+s none usr/lib/s390x/libposix4.so.1=../../../lib/s390x/librt.so.1
+s none usr/lib/s390x/librtld.so.1=../../../lib/s390x/librtld.so.1
+s none usr/lib/s390x/librtld_db.so.1=../../../lib/s390x/librtld_db.so.1
+s none usr/lib/s390x/librtld_db.so=../../../lib/s390x/librtld_db.so.1
+s none usr/lib/s390x/libscf.so=../../../lib/s390x/libscf.so.1
+s none usr/lib/s390x/libscf.so.1=../../../lib/s390x/libscf.so.1
+f none usr/lib/s390x/libsched.so.1 755 root bin
+s none usr/lib/s390x/libsched.so=libsched.so.1
+f none usr/lib/s390x/libsctp.so.1 755 root bin
+s none usr/lib/s390x/libsctp.so=./libsctp.so.1
+s none usr/lib/s390x/libsec.so.1=../../../lib/s390x/libsec.so.1
+s none usr/lib/s390x/libsec.so=../../../lib/s390x/libsec.so.1
+s none usr/lib/s390x/libsecdb.so.1=../../../lib/s390x/libsecdb.so.1
+s none usr/lib/s390x/libsecdb.so=../../../lib/s390x/libsecdb.so.1
+s none usr/lib/s390x/libsendfile.so.1=../../../lib/s390x/libsendfile.so.1
+s none usr/lib/s390x/libsendfile.so=../../../lib/s390x/libsendfile.so.1
+f none usr/lib/s390x/libshell.so.1 755 root bin
+f none usr/lib/s390x/libsip.so.1 755 root bin
+s none usr/lib/s390x/libsip.so=./libsip.so.1
+f none usr/lib/s390x/libsldap.so.1 755 root bin
+s none usr/lib/s390x/libsldap.so=libsldap.so.1
+f none usr/lib/s390x/libsmbios.so.1 755 root bin
+s none usr/lib/s390x/libsmbios.so=libsmbios.so.1
+s none usr/lib/s390x/libsocket.so.1=../../../lib/s390x/libsocket.so.1
+s none usr/lib/s390x/libsocket.so=../../../lib/s390x/libsocket.so.1
+s none usr/lib/s390x/libsysevent.so.1=../../../lib/s390x/libsysevent.so.1
+s none usr/lib/s390x/libsysevent.so=../../../lib/s390x/libsysevent.so.1
+s none usr/lib/s390x/libtermcap.so=../../../lib/s390x/libcurses.so.1
+s none usr/lib/s390x/libtermcap.so.1=../../../lib/s390x/libcurses.so.1
+s none usr/lib/s390x/libtermlib.so=../../../lib/s390x/libcurses.so.1
+s none usr/lib/s390x/libtermlib.so.1=../../../lib/s390x/libcurses.so.1
+s none usr/lib/s390x/libthread.so.1=../../../lib/s390x/libthread.so.1
+s none usr/lib/s390x/libthread.so=../../../lib/s390x/libthread.so.1
+s none usr/lib/s390x/libtsnet.so.1=../../../lib/s390x/libtsnet.so.1
+s none usr/lib/s390x/libtsnet.so=../../../lib/s390x/libtsnet.so.1
+s none usr/lib/s390x/libtsol.so.2=../../../lib/s390x/libtsol.so.2
+s none usr/lib/s390x/libtsol.so=../../../lib/s390x/libtsol.so.2
+s none usr/lib/s390x/libumem.so=../../../lib/s390x/libumem.so.1
+s none usr/lib/s390x/libumem.so.1=../../../lib/s390x/libumem.so.1
+s none usr/lib/s390x/libuutil.so.1=../../../lib/s390x/libuutil.so.1
+f none usr/lib/s390x/libvolmgt.so.1 755 root bin
+s none usr/lib/s390x/libvolmgt.so=libvolmgt.so.1
+s none usr/lib/s390x/libw.so=../../../lib/s390x/libw.so.1
+s none usr/lib/s390x/libw.so.1=../../../lib/s390x/libw.so.1
+s none usr/lib/s390x/libxnet.so=../../../lib/s390x/libxnet.so.1
+s none usr/lib/s390x/libxnet.so.1=../../../lib/s390x/libxnet.so.1
+f none usr/lib/s390x/liby.so.1 755 root bin
+s none usr/lib/s390x/liby.so=liby.so.1
+s none usr/lib/s390x/nss_compat.so.1=../../../lib/s390x/nss_compat.so.1
+s none usr/lib/s390x/nss_dns.so.1=../../../lib/s390x/nss_dns.so.1
+s none usr/lib/s390x/nss_files.so.1=../../../lib/s390x/nss_files.so.1
+f none usr/lib/s390x/nss_ldap.so.1 755 root bin
+s none usr/lib/s390x/nss_nis.so.1=../../../lib/s390x/nss_nis.so.1
+s none usr/lib/s390x/nss_nisplus.so.1=../../../lib/s390x/nss_nisplus.so.1
+s none usr/lib/s390x/nss_user.so.1=../../../lib/s390x/nss_user.so.1
+f none usr/lib/s390x/passwdutil.so.1 755 root bin
+f none usr/lib/s390x/straddr.so.2 755 root bin
+s none usr/lib/s390x/straddr.so=straddr.so.2
+f none usr/lib/s390x/watchmalloc.so.1 755 root bin
+d none usr/xpg4/lib/s390x 755 root bin
+s none usr/xpg4/lib/64=s390x
+f none usr/xpg4/lib/s390x/libcurses.so.1 755 root bin
+f none usr/xpg4/lib/s390x/libcurses.so.2 755 root bin
+s none usr/xpg4/lib/s390x/libcurses.so=libcurses.so.2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcslr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,170 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcslr
+#
+f none lib/libc.so.1 755 root bin
+d none lib/secure/s390x 755 root bin
+s none lib/secure/64=s390x
+d none lib/s390x 755 root bin
+s none lib/64=s390x
+f none lib/s390x/c_synonyms.so.1 755 root bin
+f none lib/s390x/ld.so.1 755 root bin
+s none lib/s390x/libadm.so=libadm.so.1
+f none lib/s390x/libadm.so.1 755 root bin
+s none lib/s390x/libaio.so=libaio.so.1
+f none lib/s390x/libaio.so.1 755 root bin
+f none lib/s390x/libavl.so.1 755 root bin
+s none lib/s390x/libbsm.so=libbsm.so.1
+f none lib/s390x/libbsm.so.1 755 root bin
+s none lib/s390x/libc.so=libc.so.1
+f none lib/s390x/libc.so.1 755 root bin
+s none lib/s390x/libc_db.so=libc_db.so.1
+f none lib/s390x/libc_db.so.1 755 root bin
+s none lib/s390x/libcontract.so=libcontract.so.1
+f none lib/s390x/libcontract.so.1 755 root bin
+f none lib/s390x/libcmdutils.so.1 755 root bin
+f none lib/s390x/libctf.so.1 755 root bin
+s none lib/s390x/libctf.so=libctf.so.1
+s none lib/s390x/libcurses.so=libcurses.so.1
+f none lib/s390x/libcurses.so.1 755 root bin
+s none lib/s390x/libdevice.so=libdevice.so.1
+f none lib/s390x/libdevice.so.1 755 root bin
+s none lib/s390x/libdevid.so=libdevid.so.1
+f none lib/s390x/libdevid.so.1 755 root bin
+s none lib/s390x/libdevinfo.so=libdevinfo.so.1
+f none lib/s390x/libdevinfo.so.1 755 root bin
+s none lib/s390x/libdl.so=libdl.so.1
+f none lib/s390x/libdl.so.1 755 root bin
+f none lib/s390x/libdladm.so.1 755 root bin
+s none lib/s390x/libdlpi.so=libdlpi.so.1
+f none lib/s390x/libdlpi.so.1 755 root bin
+s none lib/s390x/libdoor.so=libdoor.so.1
+f none lib/s390x/libdoor.so.1 755 root bin
+s none lib/s390x/libefi.so=libefi.so.1
+f none lib/s390x/libefi.so.1 755 root bin
+s none lib/s390x/libelf.so=libelf.so.1
+f none lib/s390x/libelf.so.1 755 root bin
+s none lib/s390x/libgen.so=libgen.so.1
+f none lib/s390x/libgen.so.1 755 root bin
+f none lib/s390x/libinetutil.so.1 755 root bin
+s none lib/s390x/libintl.so=libintl.so.1
+f none lib/s390x/libintl.so.1 755 root bin
+s none lib/s390x/libkstat.so=libkstat.so.1
+f none lib/s390x/libkstat.so.1 755 root bin
+f none lib/s390x/libld.so.4 755 root bin
+f none lib/s390x/liblddbg.so.4 755 root bin
+s none lib/s390x/libmd.so=libmd.so.1
+f none lib/s390x/libmd.so.1 755 root bin
+s none lib/s390x/libmd5.so=libmd5.so.1
+f none lib/s390x/libmd5.so.1 755 root bin
+s none lib/s390x/libmp.so=libmp.so.2
+f none lib/s390x/libmp.so.2 755 root bin
+s none lib/s390x/libnsl.so=libnsl.so.1
+f none lib/s390x/libnsl.so.1 755 root bin
+s none lib/s390x/libnvpair.so=libnvpair.so.1
+f none lib/s390x/libnvpair.so.1 755 root bin
+s none lib/s390x/libpam.so=libpam.so.1
+f none lib/s390x/libpam.so.1 755 root bin
+s none lib/s390x/libposix4.so=libposix4.so.1
+s none lib/s390x/libposix4.so.1=librt.so.1
+f none lib/s390x/libproc.so.1 755 root bin
+s none lib/s390x/libproc.so=libproc.so.1
+s none lib/s390x/libpthread.so=libpthread.so.1
+f none lib/s390x/libpthread.so.1 755 root bin
+s none lib/s390x/librcm.so=librcm.so.1
+f none lib/s390x/librcm.so.1 755 root bin
+s none lib/s390x/libresolv.so=libresolv.so.2
+f none lib/s390x/libresolv.so.2 755 root bin
+f none lib/s390x/librestart.so.1 0755 root bin
+s none lib/s390x/librpcsvc.so=librpcsvc.so.1
+f none lib/s390x/librpcsvc.so.1 755 root bin
+s none lib/s390x/librt.so=librt.so.1
+f none lib/s390x/librt.so.1 755 root bin
+f none lib/s390x/librtld.so.1 755 root bin
+s none lib/s390x/librtld_db.so=librtld_db.so.1
+f none lib/s390x/librtld_db.so.1 755 root bin
+s none lib/s390x/libscf.so=libscf.so.1
+f none lib/s390x/libscf.so.1 0755 root bin
+s none lib/s390x/libsec.so=libsec.so.1
+f none lib/s390x/libsec.so.1 755 root bin
+s none lib/s390x/libsecdb.so=libsecdb.so.1
+f none lib/s390x/libsecdb.so.1 755 root bin
+s none lib/s390x/libsendfile.so=libsendfile.so.1
+f none lib/s390x/libsendfile.so.1 755 root bin
+s none lib/s390x/libsocket.so=libsocket.so.1
+f none lib/s390x/libsocket.so.1 755 root bin
+f none lib/s390x/libsysevent.so.1 755 root bin
+s none lib/s390x/libsysevent.so=libsysevent.so.1
+s none lib/s390x/libtermcap.so=libtermcap.so.1
+s none lib/s390x/libtermcap.so.1=libcurses.so.1
+s none lib/s390x/libtermlib.so=libtermlib.so.1
+s none lib/s390x/libtermlib.so.1=libcurses.so.1
+s none lib/s390x/libthread.so=libthread.so.1
+f none lib/s390x/libthread.so.1 755 root bin
+s none lib/s390x/libthread_db.so=libc_db.so.1
+s none lib/s390x/libthread_db.so.1=libc_db.so.1
+s none lib/s390x/libtsnet.so=libtsnet.so.1
+f none lib/s390x/libtsnet.so.1 755 root bin
+s none lib/s390x/libtsol.so=libtsol.so.2
+f none lib/s390x/libtsol.so.2 755 root bin
+s none lib/s390x/libumem.so=libumem.so.1
+f none lib/s390x/libumem.so.1 0755 root bin
+s none lib/s390x/libuuid.so=libuuid.so.1
+f none lib/s390x/libuuid.so.1 755 root bin
+f none lib/s390x/libuutil.so.1 0755 root bin
+s none lib/s390x/libw.so=libw.so.1
+f none lib/s390x/libw.so.1 755 root bin
+s none lib/s390x/libxnet.so=libxnet.so.1
+f none lib/s390x/libxnet.so.1 755 root bin
+f none lib/s390x/nss_compat.so.1 755 root bin
+f none lib/s390x/nss_dns.so.1 755 root bin
+f none lib/s390x/nss_files.so.1 755 root bin
+f none lib/s390x/nss_nis.so.1 755 root bin
+f none lib/s390x/nss_nisplus.so.1 755 root bin
+f none lib/s390x/nss_user.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,62 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcsr
+#
+d none var/ld/s390x 755 root bin
+s none var/ld/64=s390x
+d none var/svc/manifest/platform/sun4u 755 root sys
+f none var/svc/profile/platform_SUNW,S390-Enterprise.xml 444 root sys
+f none var/svc/profile/platform_SUNW,Sun-Fire.xml 444 root sys
+f none var/svc/profile/platform_SUNW,Sun-Fire-880.xml 444 root sys
+l none var/svc/profile/platform_SUNW,Sun-Fire-V890.xml=./platform_SUNW,Sun-Fire-880.xml
+f none var/svc/profile/platform_SUNW,Sun-Fire-15000.xml 444 root sys
+f none var/svc/profile/platform_SUNW,Ultra-Enterprise-10000.xml 444 root sys
+f none var/svc/profile/platform_SUNW,UltraS390-IIi-Netract.xml 444 root sys
+l none var/svc/profile/platform_SUNW,UltraS390-IIe-NetraCT-40.xml=./platform_SUNW,UltraS390-IIi-Netract.xml
+l none var/svc/profile/platform_SUNW,UltraS390-IIe-NetraCT-60.xml=./platform_SUNW,UltraS390-IIi-Netract.xml
+f none var/svc/profile/platform_sun4v.xml 444 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcstl/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,46 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+d none usr/lib/abi/s390x 755 root bin
+f none usr/lib/abi/s390x/apptrace.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,130 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWcsu
+#
+d none usr/bin/s390v7 755 root bin
+f none usr/bin/s390v7/ksh93 555 root bin
+l none usr/bin/s390v7/rksh93=ksh93
+f none usr/bin/s390v7/savecore 555 root bin
+f none usr/bin/s390v7/decrypt 555 root bin
+f none usr/bin/s390v7/digest 555 root bin
+l none usr/bin/s390v7/encrypt=decrypt
+l none usr/bin/s390v7/mac=digest
+d none usr/bin/s390x 755 root bin
+f none usr/bin/s390x/amt 555 root bin
+f none usr/bin/s390x/crle 555 root bin
+f none usr/bin/s390x/decrypt 555 root bin
+f none usr/bin/s390x/digest 555 root bin
+l none usr/bin/s390x/encrypt=decrypt
+f none usr/bin/s390x/ksh93 555 root bin
+f none usr/bin/s390x/ls 555 root bin
+l none usr/bin/s390x/mac=digest
+f none usr/bin/s390x/moe 555 root bin
+f none usr/bin/s390x/newtask 4555 root sys
+f none usr/bin/s390x/nohup 555 root bin
+f none usr/bin/s390x/prctl 555 root bin
+f none usr/bin/s390x/prstat 555 root bin
+f none usr/bin/s390x/ps 555 root bin
+l none usr/bin/s390x/rksh93=ksh93
+f none usr/bin/s390x/savecore 555 root bin
+f none usr/bin/s390x/setuname 555 root bin
+f none usr/bin/s390x/uptime 4555 root bin
+l none usr/bin/s390x/w=uptime
+d none usr/kernel/drv/s390x 755 root sys
+f none usr/kernel/drv/s390x/dump 755 root sys
+f none usr/kernel/drv/s390x/fssnap 755 root sys
+f none usr/kernel/drv/s390x/kstat 755 root sys
+f none usr/kernel/drv/s390x/ksyms 755 root sys
+f none usr/kernel/drv/s390x/logindmux 755 root sys
+f none usr/kernel/drv/s390x/ptm 755 root sys
+f none usr/kernel/drv/s390x/pts 755 root sys
+d none usr/kernel/exec/s390x 755 root sys
+f none usr/kernel/exec/s390x/javaexec 755 root sys
+d none usr/kernel/fs/s390x 755 root sys
+f none usr/kernel/fs/s390x/fdfs 755 root sys
+f none usr/kernel/fs/s390x/pcfs 755 root sys
+d none usr/kernel/pcbe/s390x 755 root sys
+d none usr/kernel/sched/s390x 755 root sys
+f none usr/kernel/sched/s390x/FX 755 root sys
+f none usr/kernel/sched/s390x/FX_DPTBL 755 root sys
+f none usr/kernel/sched/s390x/IA 755 root sys
+f none usr/kernel/sched/s390x/RT 755 root sys
+f none usr/kernel/sched/s390x/RT_DPTBL 755 root sys
+d none usr/kernel/strmod/s390x 755 root sys
+f none usr/kernel/strmod/s390x/rlmod 755 root sys
+f none usr/kernel/strmod/s390x/telmod 755 root sys
+f none usr/kernel/strmod/s390x/cryptmod 755 root sys
+d none usr/kernel/sys/s390x 755 root sys
+f none usr/kernel/sys/s390x/acctctl 755 root sys
+f none usr/kernel/sys/s390x/exacctsys 755 root sys
+f none usr/kernel/sys/s390x/sysacct 755 root sys
+f none usr/lib/ld.so 755 root bin
+f none usr/lib/devfsadm/linkmod/SUNW_ieee1394_link.so 755 root sys
+f none usr/lib/devfsadm/linkmod/SUNW_misc_link_s390.so 755 root sys
+f none usr/lib/rcm/modules/SUNW_ttymux_rcm.so 555 root bin
+d none usr/lib/secure/s390x 755 root bin
+s none usr/lib/secure/64=s390x
+d none usr/lib/s390x 755 root bin
+s none usr/lib/s390x/ld.so.1=../../../lib/s390x/ld.so.1
+f none usr/lib/s390x/libshare.so.1 755 root bin
+d none usr/lib/fs/nfs 755 root sys
+d none usr/lib/fs/nfs/s390x 755 root sys
+l none usr/sbin/prtdiag=../../usr/lib/platexec
+d none usr/sbin/s390x 755 root bin
+f none usr/sbin/s390x/add_drv 555 root sys
+f none usr/sbin/s390x/modinfo 555 root sys
+f none usr/sbin/s390x/modload 555 root sys
+f none usr/sbin/s390x/modunload 555 root sys
+f none usr/sbin/s390x/pbind 555 root sys
+f none usr/sbin/s390x/prtconf 2555 root sys
+f none usr/sbin/s390x/psrset 555 root sys
+f none usr/sbin/s390x/rem_drv 555 root sys
+f none usr/sbin/s390x/swap 2555 root sys
+f none usr/sbin/s390x/sysdef 2555 root sys
+f none usr/sbin/s390x/update_drv 555 root sys
+f none usr/sbin/s390x/whodo 4555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcti2.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,115 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWcti2.u
+#
+
+# Directories for Netra ct 400/800 (CP1500)
+d none platform 0755 root sys
+d none platform/SUNW,UltraS390-IIi-Netract 0755 root sys
+d none platform/SUNW,UltraS390-IIi-Netract/kernel 0755 root sys
+d none platform/SUNW,UltraS390-IIi-Netract/kernel/dacf 755 root sys
+d none platform/SUNW,UltraS390-IIi-Netract/kernel/dacf/s390x 755 root sys
+d none platform/SUNW,UltraS390-IIi-Netract/kernel/drv 0755 root sys
+d none platform/SUNW,UltraS390-IIi-Netract/kernel/drv/s390x 0755 root sys
+#
+# Directories for Netra ct 400/800 Extention (CP2040)
+#
+d none platform/SUNW,UltraS390-IIe-NetraCT-40 0755 root sys
+d none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel 0755 root sys
+d none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/dacf 0755 root sys
+d none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/dacf/s390x 0755 root sys
+d none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/drv 0755 root sys
+d none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/drv/s390x 0755 root sys
+#
+# Directories for Netra ct 400/800 Extention (CP2060)
+#
+d none platform/SUNW,UltraS390-IIe-NetraCT-60 0755 root sys
+d none platform/SUNW,UltraS390-IIe-NetraCT-60/kernel 0755 root sys
+d none platform/SUNW,UltraS390-IIe-NetraCT-60/kernel/dacf 0755 root sys
+d none platform/SUNW,UltraS390-IIe-NetraCT-60/kernel/dacf/s390x 0755 root sys
+d none platform/SUNW,UltraS390-IIe-NetraCT-60/kernel/drv 0755 root sys
+#
+# Directories for Netra ct 820 (CP2300)
+#
+d none platform/SUNW,Netra-CP2300 0755 root sys
+d none platform/SUNW,Netra-CP2300/kernel 0755 root sys
+d none platform/SUNW,Netra-CP2300/kernel/dacf 0755 root sys
+d none platform/SUNW,Netra-CP2300/kernel/dacf/s390x 0755 root sys
+d none platform/SUNW,Netra-CP2300/kernel/drv 0755 root sys
+#
+f none platform/SUNW,UltraS390-IIi-Netract/kernel/dacf/s390x/ttymux_dacf 644 root sys
+# kernel modules
+f none platform/SUNW,UltraS390-IIi-Netract/kernel/drv/s390x/acebus 0755 root sys
+f none platform/SUNW,UltraS390-IIi-Netract/kernel/drv/s390x/pcf8574 0755 root sys
+f none platform/SUNW,UltraS390-IIi-Netract/kernel/drv/s390x/pcf8591 0755 root sys
+f none platform/SUNW,UltraS390-IIi-Netract/kernel/drv/s390x/scsb 0755 root sys
+# conf files
+f none platform/SUNW,UltraS390-IIi-Netract/kernel/drv/se.conf 0644 root sys
+f none platform/SUNW,UltraS390-IIi-Netract/kernel/drv/scsb.conf 0644 root sys
+f none platform/SUNW,UltraS390-IIi-Netract/kernel/drv/ttymux.conf 0644 root sys
+f none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/drv/acebus.conf 0644 root sys
+# kernel modules
+s none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/drv/s390x/acebus=../../../../SUNW,UltraS390-IIi-Netract/kernel/drv/s390x/acebus
+s none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/drv/s390x/pcf8574=../../../../SUNW,UltraS390-IIi-Netract/kernel/drv/s390x/pcf8574
+s none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/drv/s390x/scsb=../../../../SUNW,UltraS390-IIi-Netract/kernel/drv/s390x/scsb
+s none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/dacf/s390x/ttymux_dacf=../../../../SUNW,UltraS390-IIi-Netract/kernel/dacf/s390x/ttymux_dacf
+s none platform/SUNW,UltraS390-IIe-NetraCT-60/kernel/dacf/s390x/ttymux_dacf=../../../../SUNW,UltraS390-IIi-Netract/kernel/dacf/s390x/ttymux_dacf
+s none platform/SUNW,Netra-CP2300/kernel/dacf/s390x/ttymux_dacf=../../../../SUNW,UltraS390-IIi-Netract/kernel/dacf/s390x/ttymux_dacf
+#
+# conf files
+s none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/drv/se.conf=../../../SUNW,UltraS390-IIi-Netract/kernel/drv/se.conf
+s none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/drv/scsb.conf=../../../SUNW,UltraS390-IIi-Netract/kernel/drv/scsb.conf
+s none platform/SUNW,UltraS390-IIe-NetraCT-40/kernel/drv/ttymux.conf=../../../SUNW,UltraS390-IIi-Netract/kernel/drv/ttymux.conf
+s none platform/SUNW,UltraS390-IIe-NetraCT-60/kernel/drv/ttymux.conf=../../../SUNW,UltraS390-IIi-Netract/kernel/drv/ttymux.conf
+s none platform/SUNW,Netra-CP2300/kernel/drv/ttymux.conf=../../../SUNW,UltraS390-IIi-Netract/kernel/drv/ttymux.conf
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcvc.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,70 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 1997,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWcvc.u
+#
+d none platform 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel/drv 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel/drv/s390x 755 root sys
+f none platform/SUNW,Ultra-Enterprise-10000/kernel/drv/cvc.conf 644 root sys
+f none platform/SUNW,Ultra-Enterprise-10000/kernel/drv/s390x/cvc 755 root sys
+f none platform/SUNW,Ultra-Enterprise-10000/kernel/drv/cvcredir.conf 644 root sys
+f none platform/SUNW,Ultra-Enterprise-10000/kernel/drv/s390x/cvcredir 755 root sys
+d none platform/SUNW,Sun-Fire-15000 755 root sys
+d none platform/SUNW,Sun-Fire-15000/kernel 755 root sys
+d none platform/SUNW,Sun-Fire-15000/kernel/drv 755 root sys
+d none platform/SUNW,Sun-Fire-15000/kernel/drv/s390x 755 root sys
+f none platform/SUNW,Sun-Fire-15000/kernel/drv/cvc.conf 644 root sys
+f none platform/SUNW,Sun-Fire-15000/kernel/drv/s390x/cvc 755 root sys
+f none platform/SUNW,Sun-Fire-15000/kernel/drv/cvcredir.conf 644 root sys
+f none platform/SUNW,Sun-Fire-15000/kernel/drv/s390x/cvcredir 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWcvcr.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1997 by Sun Microsystems, Inc.
+#		All rights reserved.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWcvcr.u
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdcaf/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# SUNWdcaf
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdcar/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# SUNWdcar
+#
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/dca 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdcsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdcsr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdcsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdcsu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdfbh/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1990-1993,1998, 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdfbh
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdhcm/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1996 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdhcm
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdhcsb/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 2001 by Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdhcsb
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdhcsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1996 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdhcsr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdhcsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1996 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdhcsu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdmfe/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# Davicom 9102 Fast Ethernet driver
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/dmfe	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdmgtr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWdmgtr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdmgtu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWdmgtu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdoc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdoc
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdpl/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,57 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdpl
+#
+s none usr/lib/libp/64=s390x
+d none usr/lib/libp/s390x 755 root bin
+s none usr/lib/libp/s390x/libc.so.1=../../../../lib/s390x/libc.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdrcr.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdrcr.u
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdrr.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,64 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 1998,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdrr.u
+#
+d none platform 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel/drv 755 root sys
+e preserve platform/SUNW,Ultra-Enterprise-10000/kernel/drv/ngdr.conf 644 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel/drv/s390x 755 root sys
+f none platform/SUNW,Ultra-Enterprise-10000/kernel/drv/s390x/ngdr 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel/misc 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel/misc/s390x 755 root sys
+f none platform/SUNW,Ultra-Enterprise-10000/kernel/misc/s390x/ngdrmach 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdscpr.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdscpr.u
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdscpu.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWdscpu.u
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdsdr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdsdu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+!include prototype_com
+
+#
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libdns_sd.so.1 755 root bin
+s none usr/lib/s390x/libdns_sd.so=libdns_sd.so.1
+f none usr/lib/s390x/libjdns_sd.so.1 755 root bin
+s none usr/lib/s390x/libjdns_sd.so=libjdns_sd.so.1
+f none usr/lib/s390x/llib-ldns_sd.ln 644 root bin
+f none usr/lib/s390x/nss_mdns.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdtrc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+!include prototype_com
+
+d none usr/lib/dtrace/64 755 root bin
+f none usr/lib/dtrace/64/drti.o 644 root bin
+d none usr/lib/mdb/kvm/s390x 755 root sys
+f none usr/lib/mdb/kvm/s390x/dtrace.so 555 root sys
+d none usr/lib/mdb/raw/s390x 755 root sys
+f none usr/lib/mdb/raw/s390x/dof.so 555 root sys
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libdtrace.so.1 755 root bin
+s none usr/lib/s390x/libdtrace.so=libdtrace.so.1
+f none usr/lib/s390x/llib-ldtrace.ln 644 root bin
+d none usr/sbin/s390v7 755 root bin
+f none usr/sbin/s390v7/dtrace 555 root bin
+d none usr/sbin/s390x 755 root bin
+f none usr/sbin/s390x/dtrace 555 root bin
+f none usr/sbin/s390x/intrstat 555 root bin
+f none usr/sbin/s390x/lockstat 555 root bin
+f none usr/sbin/s390x/plockstat 555 root bin
+
+f none usr/lib/s390x/libdtrace_jni.so.1 755 root bin
+s none usr/lib/s390x/libdtrace_jni.so=libdtrace_jni.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdtrp/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,47 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+!include prototype_com
+
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/dtrace 755 root sys
+f none kernel/drv/s390x/fasttrap 755 root sys
+f none kernel/drv/s390x/fbt 755 root sys
+f none kernel/drv/s390x/lockstat 755 root sys
+f none kernel/drv/s390x/profile 755 root sys
+f none kernel/drv/s390x/sdt 755 root sys
+f none kernel/drv/s390x/systrace 755 root sys
+d none kernel/dtrace/s390x 755 root sys
+l none kernel/dtrace/s390x/fasttrap=../../../kernel/drv/s390x/fasttrap
+l none kernel/dtrace/s390x/fbt=../../../kernel/drv/s390x/fbt
+l none kernel/dtrace/s390x/lockstat=../../../kernel/drv/s390x/lockstat
+l none kernel/dtrace/s390x/profile=../../../kernel/drv/s390x/profile
+l none kernel/dtrace/s390x/sdt=../../../kernel/drv/s390x/sdt
+l none kernel/dtrace/s390x/systrace=../../../kernel/drv/s390x/systrace
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWdtrt/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,62 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+!include prototype_com
+
+d none SUNWdtrt/bin/s390v7 0755 root bin
+f none SUNWdtrt/bin/s390v7/chkargs 0555 root bin
+d none SUNWdtrt/bin/s390x 0755 root bin
+f none SUNWdtrt/bin/s390x/chkargs 0555 root bin
+d none SUNWdtrt/tst/s390 0755 root bin
+d none SUNWdtrt/tst/s390/arrays 0755 root bin
+f none SUNWdtrt/tst/s390/arrays/tst.uregsarray.d 0444 root bin
+d none SUNWdtrt/tst/s390/pid 0755 root bin
+f none SUNWdtrt/tst/s390/pid/err.D_PROC_ALIGN.misaligned.d 0444 root bin
+f none SUNWdtrt/tst/s390/pid/err.D_PROC_ALIGN.misaligned.exe 0555 root bin
+f none SUNWdtrt/tst/s390/pid/tst.br.d 0444 root bin
+f none SUNWdtrt/tst/s390/pid/tst.br.d.out 0444 root bin
+f none SUNWdtrt/tst/s390/pid/tst.br.exe 0555 root bin
+f none SUNWdtrt/tst/s390/pid/tst.branch.d 0444 root bin
+f none SUNWdtrt/tst/s390/pid/tst.branch.exe 0555 root bin
+f none SUNWdtrt/tst/s390/pid/tst.embedded.d 0444 root bin
+f none SUNWdtrt/tst/s390/pid/tst.embedded.exe 0555 root bin  
+d none SUNWdtrt/tst/s390/usdt 0755 root bin
+f none SUNWdtrt/tst/s390/usdt/tst.tailcall.ksh 0444 root bin
+d none SUNWdtrt/tst/s390/ustack 0755 root bin
+f none SUNWdtrt/tst/s390/ustack/tst.annotated.d 0444 root bin
+f none SUNWdtrt/tst/s390/ustack/tst.annotated.d.out 0444 root bin
+f none SUNWdtrt/tst/s390/ustack/tst.annotated.exe 0555 root bin
+f none SUNWdtrt/tst/s390/ustack/tst.circstack.d 0444 root bin
+f none SUNWdtrt/tst/s390/ustack/tst.circstack.exe 0555 root bin
+f none SUNWdtrt/tst/s390/ustack/tst.helper.d 0444 root bin
+f none SUNWdtrt/tst/s390/ustack/tst.helper.d.out 0444 root bin
+f none SUNWdtrt/tst/s390/ustack/tst.helper.exe 0555 root bin
+f none SUNWdtrt/tst/s390/ustack/tst.trapstat.ksh 0444 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWefc.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWefc.u
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWefck/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWefck
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWefcl/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,76 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWefcl
+#
+d none usr 755 root sys
+d none usr/lib 755 root bin
+d none usr/lib/efcode 755 root bin
+f none usr/lib/efcode/efcode.sh 555 root bin
+d none usr/lib/efcode/s390x 755 root bin
+f none usr/lib/efcode/s390x/fcdriver.so 755 root bin
+f none usr/lib/efcode/s390x/fcode.so 755 root bin
+f none usr/lib/efcode/s390x/fcpackage.so 755 root bin
+f none usr/lib/efcode/s390x/fcthread.so 755 root bin
+f none usr/lib/efcode/s390x/lfc_upa.so 755 root bin
+s none usr/lib/efcode/s390x/lfc_pci_pci.so=lfc_upa_pci.so
+f none usr/lib/efcode/s390x/lfc_upa_pci.so 755 root bin
+f none usr/lib/efcode/s390x/lfc_gptwo.so 755 root bin
+s none usr/lib/efcode/s390x/lfc_gptwo_gptwo.so=lfc_gptwo.so
+s none usr/lib/efcode/s390x/lfc_gptwo_pci.so=lfc_upa_pci.so
+f none usr/lib/efcode/s390x/lfc_jupiter.so 755 root bin
+s none usr/lib/efcode/s390x/lfc_jupiter_jupiter.so=lfc_jupiter.so
+s none usr/lib/efcode/s390x/lfc_pciex_pciex.so=lfc_upa_pci.so
+s none usr/lib/efcode/s390x/lfc_pciex_pci.so=lfc_upa_pci.so
+s none usr/lib/efcode/s390x/lfc_pci_pciex.so=lfc_upa_pci.so
+s none usr/lib/efcode/s390x/lfc_jupiter_pciex.so=lfc_upa_pci.so
+s none usr/lib/efcode/s390x/lfc_sun4v.so=lfc_upa.so
+s none usr/lib/efcode/s390x/lfc_sun4v_pciex.so=lfc_upa_pci.so
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWefcr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,62 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWefcr
+#
+#
+d none var/svc/manifest/platform/sun4u 755 root sys
+d none var/svc/manifest/platform/sun4v 755 root sys
+f manifest var/svc/manifest/platform/sun4u/efdaemon.xml 444 root sys
+f manifest var/svc/manifest/platform/sun4v/efdaemon.xml 444 root sys
+d none etc 755 root sys
+d none etc/flash 755 root sys
+d none etc/flash/postdeployment 755 root sys
+f none etc/flash/postdeployment/efcode.cleanup 0744 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWefcu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWefcu
+#
+d none usr 755 root sys
+d none usr/lib 755 root bin
+d none usr/lib/efcode 755 root bin
+d none usr/lib/efcode/s390x 755 root bin
+f none usr/lib/efcode/s390x/interpreter 555 root bin
+f none usr/lib/efcode/s390x/efdaemon 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWerid/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1999-2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# The 'pkgmk' command uses this file to identify the contents of a package
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWerid
+#
+d none kernel 755 root sys
+d none kernel/drv 755 root sys
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/eri 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWesu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,81 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWesu
+#
+d none usr/bin/s390x 755 root bin
+f none usr/bin/s390x/pargs 555 root bin
+f none usr/bin/s390x/pcred 555 root bin
+f none usr/bin/s390x/pfiles 555 root bin
+f none usr/bin/s390x/pflags 555 root bin
+f none usr/bin/s390x/pldd 555 root bin
+f none usr/bin/s390x/plgrp 555 root bin
+f none usr/bin/s390x/pmap 555 root bin
+f none usr/bin/s390x/pmadvise 555 root bin
+f none usr/bin/s390x/ppgsz 555 root bin
+f none usr/bin/s390x/ppriv 555 root bin
+f none usr/bin/s390x/preap 555 root bin
+f none usr/bin/s390x/prun 555 root bin
+f none usr/bin/s390x/psig 555 root bin
+f none usr/bin/s390x/pstack 555 root bin
+f none usr/bin/s390x/pstop 555 root bin
+f none usr/bin/s390x/ptime 555 root bin
+f none usr/bin/s390x/ptree 555 root bin
+f none usr/bin/s390x/pwait 555 root bin
+f none usr/bin/s390x/pwdx 555 root bin
+f none usr/bin/s390x/sort 555 root bin
+d none usr/lib/adb/s390x 755 root sys
+f none usr/lib/adb/s390x/adbsub.o 644 root sys
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/madv.so.1 755 root bin
+f none usr/lib/s390x/mpss.so.1 755 root bin
+d none usr/sbin/s390x 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfilebench/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+!include prototype_com
+
+#
+# SUNWfilebench
+#
+d none usr/benchmarks/filebench/bin/s390x 755 root bin
+f none usr/benchmarks/filebench/bin/s390x/go_filebench 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfmd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,292 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+!include prototype_com
+
+f none usr/lib/fm/dict/SCF.dict 444 root bin
+f none usr/lib/fm/dict/SUN4.dict 444 root bin
+f none usr/lib/fm/dict/SUN4U.dict 444 root bin
+f none usr/lib/fm/dict/SUN4V.dict 444 root bin
+f none usr/lib/fm/libmdesc.so.1 755 root bin
+s none usr/lib/fm/libmdesc.so=libmdesc.so.1 755 root bin
+f none usr/lib/fm/llib-lmdesc 644 root bin
+f none usr/lib/fm/llib-lmdesc.ln 644 root bin
+f none usr/lib/fm/libldom.so.1 755 root bin
+s none usr/lib/fm/libldom.so=libldom.so.1 755 root bin
+f none usr/lib/fm/llib-lldom 644 root bin
+f none usr/lib/fm/llib-lldom.ln 644 root bin
+d none usr/lib/fm/fmd/schemes/s390x 755 root bin
+f none usr/lib/fm/fmd/schemes/s390x/cpu.so 555 root bin
+f none usr/lib/fm/fmd/schemes/s390x/dev.so 555 root bin
+f none usr/lib/fm/fmd/schemes/s390x/fmd.so 555 root bin
+f none usr/lib/fm/fmd/schemes/s390x/hc.so 555 root bin
+f none usr/lib/fm/fmd/schemes/s390x/legacy-hc.so 555 root bin
+f none usr/lib/fm/fmd/schemes/s390x/mem.so 555 root bin
+f none usr/lib/fm/fmd/schemes/s390x/mod.so 555 root bin
+f none usr/lib/fm/fmd/schemes/s390x/pkg.so 555 root bin
+f none usr/lib/fm/fmd/schemes/s390x/zfs.so 555 root bin
+d none usr/lib/fm/s390x 755 root bin
+f none usr/lib/fm/s390x/libfmd_agent.so.1 755 root bin
+s none usr/lib/fm/s390x/libfmd_agent.so=libfmd_agent.so.1
+f none usr/lib/fm/s390x/libdiagcode.so.1 755 root bin
+s none usr/lib/fm/s390x/libdiagcode.so=libdiagcode.so.1
+f none usr/lib/fm/s390x/libdiskstatus.so.1 755 root bin
+s none usr/lib/fm/s390x/libdiskstatus.so=libdiskstatus.so.1
+f none usr/lib/fm/s390x/llib-lfmd_agent.ln 644 root bin
+f none usr/lib/fm/s390x/llib-ldiagcode.ln 644 root bin
+f none usr/lib/fm/s390x/llib-ldiskstatus.ln 644 root bin
+f none usr/lib/fm/s390x/libfmd_adm.so.1 755 root bin
+s none usr/lib/fm/s390x/libfmd_adm.so=libfmd_adm.so.1
+f none usr/lib/fm/s390x/llib-lfmd_adm.ln 644 root bin
+f none usr/lib/fm/s390x/libfmd_log.so.1 755 root bin
+s none usr/lib/fm/s390x/libfmd_log.so=libfmd_log.so.1
+f none usr/lib/fm/s390x/llib-lfmd_log.ln 644 root bin
+f none usr/lib/fm/s390x/libfmd_msg.so.1 755 root bin
+s none usr/lib/fm/s390x/libfmd_msg.so=libfmd_msg.so.1
+f none usr/lib/fm/s390x/llib-lfmd_msg.ln 644 root bin
+f none usr/lib/fm/s390x/libmdesc.so.1 755 root bin
+s none usr/lib/fm/s390x/libmdesc.so=libmdesc.so.1 755 root bin
+f none usr/lib/fm/s390x/llib-lmdesc.ln 644 root bin
+f none usr/lib/fm/s390x/libldom.so.1 755 root bin
+s none usr/lib/fm/s390x/libldom.so=libldom.so.1 755 root bin
+f none usr/lib/fm/s390x/llib-lldom.ln 644 root bin
+f none usr/lib/fm/s390x/libfmd_snmp.so.1 755 root bin
+s none usr/lib/fm/s390x/libfmd_snmp.so=libfmd_snmp.so.1
+f none usr/lib/fm/s390x/llib-lfmd_snmp.ln 644 root bin
+f none usr/lib/fm/s390x/libtopo.so.1 755 root bin
+s none usr/lib/fm/s390x/libtopo.so=libtopo.so.1
+f none usr/lib/fm/s390x/llib-ltopo.ln 644 root bin
+f none usr/lib/locale/C/LC_MESSAGES/SCF.mo 444 root bin
+f none usr/lib/locale/C/LC_MESSAGES/SUN4.mo 444 root bin
+f none usr/lib/locale/C/LC_MESSAGES/SUN4U.mo 444 root bin
+f none usr/lib/locale/C/LC_MESSAGES/SUN4V.mo 444 root bin
+d none usr/platform 755 root sys
+d none usr/platform/sun4u 755 root sys
+d none usr/platform/sun4u/lib 755 root bin
+d none usr/platform/sun4u/lib/fm 755 root bin
+d none usr/platform/sun4u/lib/fm/eft 755 root bin
+f none usr/platform/sun4u/lib/fm/eft/fire.eft 444 root bin
+f none usr/platform/sun4u/lib/fm/eft/psycho.eft 444 root bin
+f none usr/platform/sun4u/lib/fm/eft/oberon.eft 444 root bin
+f none usr/platform/sun4u/lib/fm/eft/schizo.eft 444 root bin
+f none usr/platform/sun4u/lib/fm/eft/tomatillo.eft 444 root bin
+f none usr/platform/sun4u/lib/fm/eft/xmits.eft 444 root bin
+d none usr/platform/sun4u/lib/fm/fmd 755 root bin
+d none usr/platform/sun4u/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.so 555 root bin
+f none usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.conf 644 root bin
+f none usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.so 555 root bin
+f none usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.conf 644 root bin
+f none usr/platform/sun4u/lib/fm/fmd/plugins/fps-transport.so 555 root bin
+f none usr/platform/sun4u/lib/fm/fmd/plugins/fps-transport.conf 644 root bin
+f none usr/platform/sun4u/lib/fm/fmd/plugins/USII-io-diagnosis.so 555 root bin
+f none usr/platform/sun4u/lib/fm/fmd/plugins/USII-io-diagnosis.conf 644 root bin
+d none usr/platform/sun4u/lib/fm/topo 755 root bin
+d none usr/platform/sun4u/lib/fm/topo/maps 755 root bin
+f none usr/platform/sun4u/lib/fm/topo/maps/sun4u-hc-topology.xml 444 root bin
+d none usr/platform/sun4u/lib/fm/topo/plugins 755 root bin
+f none usr/platform/sun4u/lib/fm/topo/plugins/chip.so 555 root bin
+f none usr/platform/sun4u/lib/fm/topo/plugins/hostbridge.so 555 root bin
+f none usr/platform/sun4u/lib/fm/topo/plugins/pcibus.so 555 root bin
+d none usr/platform/sun4v 755 root sys
+d none usr/platform/sun4v/include 755 root bin
+d none usr/platform/sun4v/include/sys 755 root bin
+d none usr/platform/sun4v/include/sys/fm 755 root bin
+f none usr/platform/sun4v/include/sys/fm/ldom.h 644 root bin
+d none usr/platform/sun4v/lib 755 root bin
+d none usr/platform/sun4v/lib/fm 755 root bin
+d none usr/platform/sun4v/lib/fm/eft 755 root bin
+f none usr/platform/sun4v/lib/fm/eft/fire.eft 444 root bin
+f none usr/platform/sun4v/lib/fm/eft/n2niu_xaui.eft 444 root bin
+f none usr/platform/sun4v/lib/fm/eft/n2niu_xfp.eft 444 root bin
+f none usr/platform/sun4v/lib/fm/eft/n2piu.eft 444 root bin
+f none usr/platform/sun4v/lib/fm/eft/vfncx.eft 444 root bin
+f none usr/platform/sun4v/lib/fm/eft/zambezi.eft 444 root bin
+d none usr/platform/sun4v/lib/fm/fmd 755 root bin
+d none usr/platform/sun4v/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.so 555 root bin
+f none usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.conf 644 root bin
+f none usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.so 555 root bin
+f none usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.conf 644 root bin
+f none usr/platform/sun4v/lib/fm/fmd/plugins/etm.so 555 root bin
+f none usr/platform/sun4v/lib/fm/fmd/plugins/etm.conf 644 root bin
+d none usr/platform/sun4v/lib/fm/topo 755 root bin
+d none usr/platform/sun4v/lib/fm/topo/maps 755 root bin
+f none usr/platform/sun4v/lib/fm/topo/maps/sun4v-hc-topology.xml 444 root bin
+d none usr/platform/sun4v/lib/fm/topo/plugins 755 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/chip.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/cpuboard.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/dimm.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/hostbridge.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/pcibus.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/platform-cpu.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/platform-mem.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/motherboard.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/niu.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/sun4vpi.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/xaui.so 555 root bin
+f none usr/platform/sun4v/lib/fm/topo/plugins/zambezi.so 555 root bin
+d none usr/platform/SUNW,S390-Enterprise 755 root sys
+d none usr/platform/SUNW,S390-Enterprise/lib 755 root bin
+d none usr/platform/SUNW,S390-Enterprise/lib/fm 755 root bin
+d none usr/platform/SUNW,S390-Enterprise/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,S390-Enterprise/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,S390-Enterprise/lib/fm/fmd/plugins/cpumem-retire.so 555 root bin
+f none usr/platform/SUNW,S390-Enterprise/lib/fm/fmd/plugins/cpumem-retire.conf 644 root bin
+f none usr/platform/SUNW,S390-Enterprise/lib/fm/fmd/plugins/event-transport.so 555 root bin
+f none usr/platform/SUNW,S390-Enterprise/lib/fm/fmd/plugins/event-transport.conf 644 root bin
+d none usr/platform/SUNW,S390-Enterprise/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,S390-Enterprise/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,S390-Enterprise/lib/fm/topo/maps/S390-Enterprise-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,S390-Enterprise/lib/fm/topo/plugins 755 root bin
+f none usr/platform/SUNW,S390-Enterprise/lib/fm/topo/plugins/ioboard.so 555 root bin
+d none usr/platform/SUNW,Sun-Fire 755 root sys
+d none usr/platform/SUNW,Sun-Fire/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire/lib/fm 755 root bin
+d none usr/platform/SUNW,Sun-Fire/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,Sun-Fire/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,Sun-Fire/lib/fm/topo/maps/Sun-Fire-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,Sun-Fire/lib/fm/topo/plugins 755 root bin
+f none usr/platform/SUNW,Sun-Fire/lib/fm/topo/plugins/ioboard.so 555 root bin
+d none usr/platform/SUNW,Sun-Fire-15000 755 root sys
+d none usr/platform/SUNW,Sun-Fire-15000/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-15000/lib/fm 755 root bin
+d none usr/platform/SUNW,Sun-Fire-15000/lib/fm/eft 755 root bin
+f none usr/platform/SUNW,Sun-Fire-15000/lib/fm/eft/SUNW,Sun-Fire-15000.eft 444 root bin
+d none usr/platform/SUNW,Sun-Fire-15000/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,Sun-Fire-15000/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,Sun-Fire-15000/lib/fm/topo/maps/Sun-Fire-15000-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,Sun-Fire-15000/lib/fm/topo/plugins 755 root bin
+f none usr/platform/SUNW,Sun-Fire-15000/lib/fm/topo/plugins/ioboard.so 555 root bin
+d none usr/platform/SUNW,Sun-Fire-T200 755 root sys
+d none usr/platform/SUNW,Sun-Fire-T200/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-T200/lib/fm 755 root bin
+d none usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Sun-Fire-T200-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Sun-Fire-T1000-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/S390-Enterprise-T1000-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/S390-Enterprise-T2000-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Sun-Blade-T6300-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Netra-T2000-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,Sun-Blade-T6300 755 root sys
+d none usr/platform/SUNW,Sun-Blade-T6300/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6300/lib/fm 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,Sun-Blade-T6320 755 root sys
+d none usr/platform/SUNW,Sun-Blade-T6320/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,Sun-Blade-T6320/lib/fm/topo/maps/Sun-Blade-T6320-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,S390-Enterprise-T5120 755 root sys
+d none usr/platform/SUNW,S390-Enterprise-T5120/lib 755 root bin
+d none usr/platform/SUNW,S390-Enterprise-T5120/lib/fm 755 root bin
+d none usr/platform/SUNW,S390-Enterprise-T5120/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,S390-Enterprise-T5120/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,S390-Enterprise-T5120/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,S390-Enterprise-T5120/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,S390-Enterprise-T5120/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,S390-Enterprise-T5120/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,S390-Enterprise-T5120/lib/fm/topo/maps/S390-Enterprise-T5120-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,S390-Enterprise-T5120/lib/fm/topo/maps/S390-Enterprise-T5220-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,T5140 755 root sys
+d none usr/platform/SUNW,T5140/lib 755 root bin
+d none usr/platform/SUNW,T5140/lib/fm 755 root bin
+d none usr/platform/SUNW,T5140/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,T5140/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,T5140/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,T5140/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,T5140/lib/fm/topo/maps/T5140-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,T5140/lib/fm/topo/maps/T5240-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,T5140/lib/fm/topo/maps/T5440-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,T5140/lib/fm/topo/maps/Sun-Blade-T6340-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,Netra-CP3060 755 root sys
+d none usr/platform/SUNW,Netra-CP3060/lib 755 root bin
+d none usr/platform/SUNW,Netra-CP3060/lib/fm 755 root bin
+d none usr/platform/SUNW,Netra-CP3060/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,Netra-CP3060/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,Netra-CP3060/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,Netra-CP3060/lib/fm/topo/maps/Netra-CP3060-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,Netra-CP3260 755 root sys
+d none usr/platform/SUNW,Netra-CP3260/lib 755 root bin
+d none usr/platform/SUNW,Netra-CP3260/lib/fm 755 root bin
+d none usr/platform/SUNW,Netra-CP3260/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,Netra-CP3260/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps/Netra-CP3260-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,USBRDT-5240 755 root sys
+d none usr/platform/SUNW,USBRDT-5240/lib 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib/fm 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,USBRDT-5240/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps/USBRDT-5240-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,Netra-T5220 755 root sys
+d none usr/platform/SUNW,Netra-T5220/lib 755 root bin
+d none usr/platform/SUNW,Netra-T5220/lib/fm 755 root bin
+d none usr/platform/SUNW,Netra-T5220/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,Netra-T5220/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,Netra-T5220/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,Netra-T5220/lib/fm/topo/maps/Netra-T5220-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,Netra-T5440 755 root sys
+d none usr/platform/SUNW,Netra-T5440/lib 755 root bin
+d none usr/platform/SUNW,Netra-T5440/lib/fm 755 root bin
+d none usr/platform/SUNW,Netra-T5440/lib/fm/fmd 755 root bin
+d none usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins 755 root bin
+f none usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.conf 644 root bin
+s none usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.so=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
+d none usr/platform/SUNW,Netra-T5440/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,Netra-T5440/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,Netra-T5440/lib/fm/topo/maps/Netra-T5440-hc-topology.xml 444 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfmdr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+!include prototype_com
+
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/fm 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfruid/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,76 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1999-2001,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWfruid
+#
+d none usr 755 root sys
+d none usr/sbin 755 root bin
+f none usr/sbin/prtfru 755 root bin
+d none usr/lib 755 root bin
+f none usr/lib/libfru.so.1 755 root bin
+s none usr/lib/libfru.so=./libfru.so.1 755 root bin
+f none usr/lib/libfrupicl.so.1 755 root bin
+s none usr/lib/libfrupicl.so=./libfrupicl.so.1 755 root bin
+f none usr/lib/libfrupicltree.so.1 755 root bin
+s none usr/lib/libfrupicltree.so=./libfrupicltree.so.1 755 root bin
+f none usr/lib/libfrureg.so.1 755 root bin
+s none usr/lib/libfrureg.so=./libfrureg.so.1 755 root bin
+f none usr/lib/libfruutils.so.1 755 root bin
+s none usr/lib/libfruutils.so=./libfruutils.so.1 755 root bin
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libfru.so.1 755 root bin
+s none usr/lib/s390x/libfru.so=./libfru.so.1 755 root bin
+f none usr/lib/s390x/libfrupicl.so.1 755 root bin
+s none usr/lib/s390x/libfrupicl.so=./libfrupicl.so.1 755 root bin
+f none usr/lib/s390x/libfrureg.so.1 755 root bin
+s none usr/lib/s390x/libfrureg.so=./libfrureg.so.1 755 root bin
+f none usr/lib/s390x/libfruutils.so.1 755 root bin
+s none usr/lib/s390x/libfruutils.so=./libfruutils.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfruip.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,178 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWfruip.u
+#
+d none usr 755 root sys
+d none usr/platform 755 root sys
+d none usr/platform/SUNW,S390-Enterprise 755 root sys
+d none usr/platform/SUNW,S390-Enterprise/sbin 755 root bin
+s none usr/platform/SUNW,S390-Enterprise/sbin/fruadm=../../sun4u/sbin/fruadm
+d none usr/platform/SUNW,Sun-Blade-1000 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1000/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-1000/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-V240 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V240/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V240/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-V240/sbin 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V240/sbin/fruadm=../../sun4u/sbin/fruadm
+d none usr/platform/SUNW,Sun-Fire-V250 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V250/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V250/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-V250/sbin 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V250/sbin/fruadm=../../sun4u/sbin/fruadm
+d none usr/platform/SUNW,Sun-Fire-V215 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V215/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V215/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-V215/sbin 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V215/sbin/fruadm=../../sun4u/sbin/fruadm
+d none usr/platform/SUNW,Sun-Fire-V440 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V440/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V440/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/libpiclfrudata.conf 644	root sys
+d none usr/platform/SUNW,Sun-Fire-V445 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V445/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V445/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/libpiclfrudata.conf 644	root sys
+d none usr/platform/SUNW,Sun-Fire-V445/sbin 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V445/sbin/fruadm=../../sun4u/sbin/fruadm
+d none usr/platform/SUNW,Sun-Fire-280R 755 root sys
+d none usr/platform/SUNW,Sun-Fire-280R/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-280R/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-480R 755 root sys
+d none usr/platform/SUNW,Sun-Fire-480R/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-480R/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-880 755 root sys
+d none usr/platform/SUNW,Sun-Fire-880/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-880/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-V490 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V490/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V490/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-V890 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V890/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V890/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Blade-1500 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1500/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-1500/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Sun-Blade-2500 755 root sys
+d none usr/platform/SUNW,Sun-Blade-2500/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-2500/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,A70 755 root sys
+d none usr/platform/SUNW,A70/lib 755 root bin
+d none usr/platform/SUNW,A70/lib/picl 755 root sys
+d none usr/platform/SUNW,A70/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,A70/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Serverblade1 755 root sys
+d none usr/platform/SUNW,Serverblade1/lib 755 root bin 
+f none usr/platform/SUNW,Serverblade1/lib/libfruaccess.so.1 755 root sys
+s none usr/platform/SUNW,Serverblade1/lib/libfruaccess.so=libfruaccess.so.1
+f none usr/platform/SUNW,Serverblade1/lib/fru_container.conf 644 root sys
+d none usr/platform/SUNW,Serverblade1/lib/picl 755 root sys
+d none usr/platform/SUNW,Serverblade1/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Serverblade1/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Netra-T4 755 root sys
+d none usr/platform/SUNW,Netra-T4/lib 755 root bin
+d none usr/platform/SUNW,Netra-T4/lib/picl 755 root sys
+d none usr/platform/SUNW,Netra-T4/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Netra-T4/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Netra-T12 755 root sys
+d none usr/platform/SUNW,Netra-T12/lib 755 root bin
+f none usr/platform/SUNW,Netra-T12/lib/libfruaccess.so.1 755 root sys
+s none usr/platform/SUNW,Netra-T12/lib/libfruaccess.so=libfruaccess.so.1
+
+d none usr/platform/SUNW,Netra-CP2300 755 root sys
+d none usr/platform/SUNW,Netra-CP2300/lib 755 root bin
+f none usr/platform/SUNW,Netra-CP2300/lib/libfruaccess.so.1 755 root sys
+s none usr/platform/SUNW,Netra-CP2300/lib/libfruaccess.so=libfruaccess.so.1
+d none usr/platform/SUNW,Netra-CP2300/sbin 755 root bin
+s none usr/platform/SUNW,Netra-CP2300/sbin/fruadm=../../sun4u/sbin/fruadm
+d none usr/platform/SUNW,Netra-CP3010 755 root sys
+d none usr/platform/SUNW,Netra-CP3010/lib 755 root bin
+d none usr/platform/SUNW,Netra-CP3010/lib/picl 755 root sys
+d none usr/platform/SUNW,Netra-CP3010/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Netra-CP3010/lib/picl/plugins/libpiclfrudata.conf 644 root sys
+d none usr/platform/SUNW,Netra-CP3010/sbin 755 root bin
+s none usr/platform/SUNW,Netra-CP3010/sbin/fruadm=../../sun4u/sbin/fruadm
+d none usr/platform/sun4u 755 root sys
+d none usr/platform/sun4u/lib 755 root bin
+f none usr/platform/sun4u/lib/fru_container.conf 644 root sys
+f none usr/platform/sun4u/lib/libfruaccess.so.1 755 root sys
+s none usr/platform/sun4u/lib/libfruaccess.so=./libfruaccess.so.1
+d none usr/platform/sun4u/lib/picl 755 root sys
+d none usr/platform/sun4u/lib/picl/plugins 755 root sys
+f none usr/platform/sun4u/lib/picl/plugins/libpiclfrudata.so.1 755 root sys
+s none usr/platform/sun4u/lib/picl/plugins/libpiclfrudata.so=./libpiclfrudata.so.1
+d none usr/platform/sun4u/sbin 755 root bin
+f none usr/platform/sun4u/sbin/fruadm 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+i i.manifest
+i r.manifest
+#
+# source locations relative to the prototype file
+#
+# SUNWfsr
+#
+d none var 755 root sys
+d none var/svc 755 root sys
+d none var/svc/manifest 755 root sys
+d none var/svc/manifest/system 755 root sys
+f manifest var/svc/manifest/system/fpsd.xml 0444 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfss/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWfss
+#
+d none usr/kernel/sched/s390x 755 root sys
+f none usr/kernel/sched/s390x/FSS 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWftdur/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1998-2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+d none kernel/drv/s390x 755 root sys 
+f none kernel/drv/s390x/bofi 644 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWftduu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1998-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWftduu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWftpr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWftpr
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWftpu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#	Copyright (c) 1990-93, 1997 Sun Microsystems, Inc.
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWftpu
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfwdc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,48 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# SUNWfwdc
+#
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/dcam1394 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfwdcu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,43 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWfwflash/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWgss/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 1997, 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWgss
+#
+d none usr/lib/s390x 0755 root bin
+d none usr/lib/s390x/gss 0755 root bin
+f none usr/lib/s390x/libgss.so.1 0755 root bin
+s none usr/lib/s390x/libgss.so=libgss.so.1
+d none usr/lib/sasl/s390x 0755 root bin
+f none usr/lib/sasl/s390x/gssapi.so.1 0755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWgssc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWgss
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWgssdh/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,62 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1997,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWgssdh
+#
+d none usr/lib/s390x 755 root bin
+d none usr/lib/s390x/gss 755 root bin
+f none usr/lib/s390x/gss/mech_dh.so.1 755 root bin
+s none usr/lib/s390x/gss/mech_dh.so=mech_dh.so.1
+f none usr/lib/s390x/gss/dh640-0.so.1 755 root bin
+s none usr/lib/s390x/gss/dh640-0.so=dh640-0.so.1
+f none usr/lib/s390x/gss/dh1024-0.so.1 755 root bin
+s none usr/lib/s390x/gss/dh1024-0.so=dh1024-0.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWgssk/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,58 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWgssk
+#
+d none kernel/misc/kgss/s390x 755 root sys
+f none kernel/misc/kgss/s390x/kmech_krb5 755 root sys
+d none kernel/misc/s390x 755 root sys
+f none kernel/misc/s390x/kgssapi 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWhal/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWhal
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWhalr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWhalr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWhea/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,335 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWhea
+#
+f none usr/include/asm/flush.h 644 root bin
+f none usr/include/rpc/ib.h 644 root bin
+d none usr/include/sys/av 755 root bin
+f none usr/include/sys/av/iec61883.h 644 root bin
+f none usr/include/sys/bpp_var.h 644 root bin
+f none usr/include/sys/bpp_reg.h 644 root bin
+f none usr/include/sys/cg3var.h 644 root bin
+f none usr/include/sys/cg6fbc.h 644 root bin
+f none usr/include/sys/cg6tec.h 644 root bin
+f none usr/include/sys/cg6thc.h 644 root bin
+f none usr/include/sys/cmpregs.h 644 root bin
+f none usr/include/sys/dkmpio.h 644 root bin
+d none usr/include/sys/dktp 755 root bin
+f none usr/include/sys/dktp/dadkio.h 644 root bin
+f none usr/include/sys/dktp/fdisk.h 644 root bin
+f none usr/include/sys/dmaga.h 644 root bin
+f none usr/include/sys/fdreg.h 644 root bin
+f none usr/include/sys/fdvar.h 644 root bin
+f none usr/include/sys/fm/cpu/UltraS390-II.h 644 root bin
+f none usr/include/sys/fm/cpu/UltraS390-III.h 644 root bin
+f none usr/include/sys/fm/cpu/UltraS390-T1.h 644 root bin
+f none usr/include/sys/fm/cpu/S39064-VI.h 644 root bin
+d none usr/include/sys/fpu 755 root bin
+f none usr/include/sys/fpu/fpu_simulator.h 644 root bin
+f none usr/include/sys/fpu/fpusystm.h 644 root bin
+f none usr/include/sys/fpu/globals.h 644 root bin
+f none usr/include/sys/fpu/ieee.h 644 root bin
+f none usr/include/sys/fsr.h 644 root bin
+f none usr/include/sys/obpdefs.h 644 root bin
+f none usr/include/sys/ramdac.h 644 root bin
+f none usr/include/sys/scsi/adapters/espcmd.h 644 root bin
+f none usr/include/sys/scsi/adapters/espreg.h 644 root bin
+f none usr/include/sys/scsi/adapters/espvar.h 644 root bin
+f none usr/include/sys/scsi/adapters/ispcmd.h 644 root bin
+f none usr/include/sys/scsi/adapters/ispmail.h 644 root bin
+f none usr/include/sys/scsi/adapters/ispreg.h 644 root bin
+f none usr/include/sys/scsi/adapters/ispvar.h 644 root bin
+f none usr/include/sys/scsi/targets/ssddef.h 644 root bin
+f none usr/include/sys/scsi/targets/stdef.h 644 root bin
+f none usr/include/sys/ser_async.h 644 root bin
+f none usr/include/sys/ser_zscc.h 644 root bin
+f none usr/include/sys/spl.h 644 root bin
+f none usr/include/sys/stp4020_reg.h 644 root bin
+f none usr/include/sys/stp4020_var.h 644 root bin
+f none usr/include/sys/zsdev.h 644 root bin
+d none usr/platform 755 root sys
+d none usr/platform/sun4u 755 root sys
+d none usr/platform/sun4u/include 755 root bin
+d none usr/platform/SUNW,S390-Enterprise 755 root sys
+s none usr/platform/SUNW,S390-Enterprise/include=../sun4u/include
+d none usr/platform/SUNW,Ultra-2 755 root sys
+s none usr/platform/SUNW,Ultra-2/include=../sun4u/include
+d none usr/platform/SUNW,Ultra-250 755 root sys
+s none usr/platform/SUNW,Ultra-250/include=../sun4u/include
+d none usr/platform/SUNW,Ultra-4 755 root sys
+s none usr/platform/SUNW,Ultra-4/include=../sun4u/include
+d none usr/platform/SUNW,Ultra-Enterprise 755 root sys
+s none usr/platform/SUNW,Ultra-Enterprise/include=../sun4u/include
+d none usr/platform/SUNW,Ultra-Enterprise-10000 755 root sys
+s none usr/platform/SUNW,Ultra-Enterprise-10000/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Blade-100 755 root sys
+s none usr/platform/SUNW,Sun-Blade-100/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Blade-1000 755 root sys
+s none usr/platform/SUNW,Sun-Blade-1000/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Blade-1500 755 root sys
+s none usr/platform/SUNW,Sun-Blade-1500/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Blade-2500 755 root sys
+s none usr/platform/SUNW,Sun-Blade-2500/include=../sun4u/include
+d none usr/platform/SUNW,A70 755 root sys
+s none usr/platform/SUNW,A70/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-V445 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V445/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-V215 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V215/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire 755 root sys
+s none usr/platform/SUNW,Sun-Fire/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-V240 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V240/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-V250 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V250/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-V440 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V440/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-280R 755 root sys
+s none usr/platform/SUNW,Sun-Fire-280R/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-15000 755 root sys
+s none usr/platform/SUNW,Sun-Fire-15000/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-880 755 root sys
+s none usr/platform/SUNW,Sun-Fire-880/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-480R 755 root sys
+s none usr/platform/SUNW,Sun-Fire-480R/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-V890 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V890/include=../sun4u/include
+d none usr/platform/SUNW,Sun-Fire-V490 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V490/include=../sun4u/include
+d none usr/platform/SUNW,Serverblade1 755 root sys
+s none usr/platform/SUNW,Serverblade1/include=../sun4u/include
+d none usr/platform/SUNW,Netra-T4 755 root sys
+s none usr/platform/SUNW,Netra-T4/include=../sun4u/include
+d none usr/platform/SUNW,Netra-T12 755 root sys
+s none usr/platform/SUNW,Netra-T12/include=../sun4u/include
+d none usr/platform/SUNW,UltraS390-IIi-Netract 755 root sys
+s none usr/platform/SUNW,UltraS390-IIi-Netract/include=../sun4u/include
+d none usr/platform/SUNW,UltraS390-IIe-NetraCT-40 755 root sys
+s none usr/platform/SUNW,UltraS390-IIe-NetraCT-40/include=../sun4u/include
+d none usr/platform/SUNW,UltraS390-IIe-NetraCT-60 755 root sys
+s none usr/platform/SUNW,UltraS390-IIe-NetraCT-60/include=../sun4u/include
+d none usr/platform/SUNW,Netra-CP2300 755 root sys
+d none usr/platform/SUNW,Netra-CP2300/include 755 root bin
+d none usr/platform/SUNW,Netra-CP3010 755 root sys
+d none usr/platform/SUNW,Netra-CP3010/include 755 root bin
+d none usr/platform/TAD,S390LE 755 root sys
+s none usr/platform/TAD,S390LE/include=../sun4u/include
+d none usr/platform/sun4u/include/sys 755 root bin
+f none usr/platform/sun4u/include/sys/ac.h 644 root bin
+f none usr/platform/sun4u/include/sys/async.h 644 root bin
+f none usr/platform/sun4u/include/sys/cheetahregs.h 644 root bin
+f none usr/platform/sun4u/include/sys/cherrystone.h 644 root bin
+f none usr/platform/sun4u/include/sys/clock.h 644 root bin
+f none usr/platform/sun4u/include/sys/cmp.h 644 root bin
+f none usr/platform/sun4u/include/sys/cpc_ultra.h 644 root bin
+f none usr/platform/sun4u/include/sys/cpr_impl.h 644 root bin
+f none usr/platform/sun4u/include/sys/cpu_impl.h 644 root bin
+f none usr/platform/sun4u/include/sys/cpu_sgnblk_defs.h 644 root bin
+f none usr/platform/sun4u/include/sys/daktari.h 644 root bin
+f none usr/platform/sun4u/include/sys/ddi_subrdefs.h 644 root bin
+f none usr/platform/sun4u/include/sys/dvma.h 644 root bin
+f none usr/platform/sun4u/include/sys/ecc_kstat.h 644 root bin
+f none usr/platform/sun4u/include/sys/eeprom.h 644 root bin
+f none usr/platform/sun4u/include/sys/envctrl.h 644 root bin
+f none usr/platform/sun4u/include/sys/envctrl_gen.h 644 root bin
+f none usr/platform/sun4u/include/sys/envctrl_ue250.h 644 root bin
+f none usr/platform/sun4u/include/sys/envctrl_ue450.h 644 root bin
+f none usr/platform/sun4u/include/sys/environ.h 644 root bin
+f none usr/platform/sun4u/include/sys/errclassify.h 644 root bin
+f none usr/platform/sun4u/include/sys/fhc.h 644 root bin
+f none usr/platform/sun4u/include/sys/gpio_87317.h 644 root bin
+f none usr/platform/sun4u/include/sys/hpc3130_events.h 644 root bin
+f none usr/platform/sun4u/include/sys/scsb_led.h 644 root bin
+d none usr/platform/sun4u/include/sys/i2c 755 root bin
+d none usr/platform/sun4u/include/sys/i2c/misc 755 root bin
+d none usr/platform/sun4u/include/sys/i2c/clients 755 root bin
+f none usr/platform/sun4u/include/sys/i2c/misc/i2c_svc.h 644 root bin
+f none usr/platform/sun4u/include/sys/i2c/clients/max1617.h 644 root bin
+f none usr/platform/sun4u/include/sys/i2c/clients/i2c_client.h 644 root bin
+f none usr/platform/sun4u/include/sys/i2c/clients/scmi2c.h 644 root bin
+f none usr/platform/sun4u/include/sys/i2c/clients/hpc3130.h 644 root bin
+f none usr/platform/sun4u/include/sys/i2c/clients/lm75.h 644 root bin
+f none usr/platform/sun4u/include/sys/i2c/clients/pcf8591.h 644 root bin
+f none usr/platform/sun4u/include/sys/i2c/clients/ssc050.h 644 root bin
+f none usr/platform/sun4u/include/sys/idprom.h 644 root bin
+f none usr/platform/sun4u/include/sys/intr.h 644 root bin
+f none usr/platform/sun4u/include/sys/intreg.h 644 root bin
+f none usr/platform/sun4u/include/sys/iocache.h 644 root bin
+f none usr/platform/sun4u/include/sys/iommu.h 644 root bin
+f none usr/platform/sun4u/include/sys/ivintr.h 644 root bin
+f none usr/platform/sun4u/include/sys/machasi.h 644 root bin
+f none usr/platform/sun4u/include/sys/machclock.h 644 root bin
+f none usr/platform/sun4u/include/sys/machcpuvar.h 644 root bin
+f none usr/platform/sun4u/include/sys/machparam.h 644 root bin
+f none usr/platform/sun4u/include/sys/machsystm.h 644 root bin
+f none usr/platform/sun4u/include/sys/machthread.h 644 root bin
+f none usr/platform/sun4u/include/sys/mem_cache.h 644 root bin
+f none usr/platform/sun4u/include/sys/memlist_plat.h 644 root bin
+f none usr/platform/sun4u/include/sys/memnode.h 644 root bin
+f none usr/platform/sun4u/include/sys/mmu.h 644 root bin
+f none usr/platform/sun4u/include/sys/nexusdebug.h 644 root bin
+f none usr/platform/sun4u/include/sys/opl_hwdesc.h 644 root bin
+f none usr/platform/sun4u/include/sys/opl_module.h 644 root bin
+f none usr/platform/sun4u/include/sys/prom_debug.h 644 root bin
+f none usr/platform/sun4u/include/sys/sbd_ioctl.h 644 root bin
+f none usr/platform/sun4u/include/sys/prom_plat.h 644 root bin
+f none usr/platform/sun4u/include/sys/pte.h 644 root bin
+f none usr/platform/sun4u/include/sys/scb.h 644 root bin
+f none usr/platform/sun4u/include/sys/simmstat.h 644 root bin
+f none usr/platform/sun4u/include/sys/spitregs.h 644 root bin
+f none usr/platform/sun4u/include/sys/sram.h 644 root bin
+f none usr/platform/sun4u/include/sys/starfire.h 644 root bin
+f none usr/platform/sun4u/include/sys/sun4asi.h 644 root bin
+f none usr/platform/sun4u/include/sys/sysctrl.h 644 root bin
+f none usr/platform/sun4u/include/sys/sysioerr.h 644 root bin
+f none usr/platform/sun4u/include/sys/sysiosbus.h 644 root bin
+f none usr/platform/sun4u/include/sys/todmostek.h 0644 root bin
+f none usr/platform/sun4u/include/sys/tod.h 0644 root bin
+f none usr/platform/sun4u/include/sys/trapstat.h 0644 root bin
+f none usr/platform/sun4u/include/sys/traptrace.h 644 root bin
+f none usr/platform/sun4u/include/sys/vis.h 0644 root bin
+f none usr/platform/sun4u/include/sys/vm_machparam.h 644 root bin
+f none usr/platform/sun4u/include/sys/xc_impl.h 644 root bin
+f none usr/platform/sun4u/include/sys/x_call.h 644 root bin
+f none usr/platform/sun4u/include/sys/zsmach.h 644 root bin
+f none usr/platform/sun4u/include/sys/cvc.h 644 root bin
+d none usr/platform/sun4u/include/vm 755 root bin
+f none usr/platform/sun4u/include/vm/hat_sfmmu.h 644 root bin
+f none usr/platform/sun4u/include/vm/mach_sfmmu.h 644 root bin
+d none usr/platform/sun4v 755 root sys
+d none usr/platform/sun4v/include 755 root bin
+d none usr/platform/sun4v/include/sys 755 root bin
+f none usr/platform/sun4v/include/sys/clock.h 644 root bin
+f none usr/platform/sun4v/include/sys/cmp.h 644 root bin
+f none usr/platform/sun4v/include/sys/cpc_ultra.h 644 root bin
+f none usr/platform/sun4v/include/sys/cpu_sgnblk_defs.h 644 root bin
+f none usr/platform/sun4v/include/sys/ddi_subrdefs.h 644 root bin
+f none usr/platform/sun4v/include/sys/ds_pri.h 644 root bin
+f none usr/platform/sun4v/include/sys/ds_snmp.h 644 root bin
+f none usr/platform/sun4v/include/sys/dvma.h 644 root bin
+f none usr/platform/sun4v/include/sys/eeprom.h 644 root bin
+f none usr/platform/sun4v/include/sys/fcode.h 644 root bin
+f none usr/platform/sun4v/include/sys/hypervisor_api.h 644 root bin
+f none usr/platform/sun4v/include/sys/hsvc.h 644 root bin
+f none usr/platform/sun4v/include/sys/idprom.h 644 root bin
+f none usr/platform/sun4v/include/sys/intr.h 644 root bin
+f none usr/platform/sun4v/include/sys/intreg.h 644 root bin
+f none usr/platform/sun4v/include/sys/ivintr.h 644 root bin
+f none usr/platform/sun4v/include/sys/machasi.h 644 root bin
+f none usr/platform/sun4v/include/sys/machclock.h 644 root bin
+f none usr/platform/sun4v/include/sys/machcpuvar.h 644 root bin
+f none usr/platform/sun4v/include/sys/machintreg.h 644 root bin
+f none usr/platform/sun4v/include/sys/machparam.h 644 root bin
+f none usr/platform/sun4v/include/sys/machsystm.h 644 root bin
+f none usr/platform/sun4v/include/sys/machthread.h 644 root bin
+f none usr/platform/sun4v/include/sys/memlist_plat.h 644 root bin
+f none usr/platform/sun4v/include/sys/mmu.h 644 root bin
+f none usr/platform/sun4v/include/sys/memnode.h 644 root bin
+f none usr/platform/sun4v/include/sys/nexusdebug.h 644 root bin
+f none usr/platform/sun4v/include/sys/niagaraasi.h 644 root bin
+f none usr/platform/sun4v/include/sys/niagararegs.h 644 root bin
+f none usr/platform/sun4v/include/sys/ntwdt.h 644 root bin
+f none usr/platform/sun4v/include/sys/pri.h 644 root bin
+f none usr/platform/sun4v/include/sys/prom_debug.h 644 root bin
+f none usr/platform/sun4v/include/sys/prom_plat.h 644 root bin
+f none usr/platform/sun4v/include/sys/pte.h 644 root bin
+f none usr/platform/sun4v/include/sys/qcn.h 644 root bin
+f none usr/platform/sun4v/include/sys/scb.h 644 root bin
+f none usr/platform/sun4v/include/sys/soft_state.h 644 root bin
+f none usr/platform/sun4v/include/sys/sun4asi.h 644 root bin
+f none usr/platform/sun4v/include/sys/tod.h 644 root bin
+f none usr/platform/sun4v/include/sys/trapstat.h 644 root bin
+f none usr/platform/sun4v/include/sys/traptrace.h 644 root bin
+f none usr/platform/sun4v/include/sys/vis.h 644 root bin
+f none usr/platform/sun4v/include/sys/vm_machparam.h 644 root bin
+f none usr/platform/sun4v/include/sys/x_call.h 644 root bin
+f none usr/platform/sun4v/include/sys/xc_impl.h 644 root bin
+f none usr/platform/sun4v/include/sys/zsmach.h 644 root bin
+d none usr/platform/sun4v/include/vm 755 root bin
+f none usr/platform/sun4v/include/vm/hat_sfmmu.h 644 root bin
+f none usr/platform/sun4v/include/vm/mach_sfmmu.h 644 root bin
+d none usr/share/src/uts/sun4u 755 root bin
+s none usr/share/src/uts/sun4u/sys=../../../../platform/sun4u/include/sys
+s none usr/share/src/uts/sun4u/vm=../../../../platform/sun4u/include/vm
+d none usr/share/src/uts/sun4v 755 root bin
+s none usr/share/src/uts/sun4v/sys=../../../../platform/sun4v/include/sys
+s none usr/share/src/uts/sun4v/vm=../../../../platform/sun4v/include/vm
+d none usr/include/v7 755 root bin
+d none usr/include/v7/sys 755 root bin
+f none usr/include/v7/sys/machpcb.h 644 root bin
+f none usr/include/v7/sys/machtrap.h 644 root bin
+f none usr/include/v7/sys/mutex_impl.h 644 root bin
+f none usr/include/v7/sys/privregs.h 644 root bin
+f none usr/include/v7/sys/prom_isa.h 644 root bin
+f none usr/include/v7/sys/psr.h 644 root bin
+f none usr/include/v7/sys/traptrace.h 644 root bin
+d none usr/include/v9 755 root bin
+d none usr/include/v9/sys 755 root bin
+f none usr/include/v9/sys/asi.h 644 root bin
+f none usr/include/v9/sys/machpcb.h 644 root bin
+f none usr/include/v9/sys/machtrap.h 644 root bin
+f none usr/include/v9/sys/membar.h 644 root bin
+f none usr/include/v9/sys/mutex_impl.h 644 root bin
+f none usr/include/v9/sys/privregs.h 644 root bin
+f none usr/include/v9/sys/prom_isa.h 644 root bin
+f none usr/include/v9/sys/psr_compat.h 644 root bin
+f none usr/include/v9/sys/vis_simulator.h 644 root bin
+f none usr/include/sys/scsi/adapters/sfvar.h 644 root bin
+f none usr/include/sys/socalvar.h 644 root bin
+f none usr/include/sys/socalio.h 644 root bin
+f none usr/include/sys/socalmap.h 644 root bin
+f none usr/include/sys/socal_cq_defs.h 644 root bin
+f none usr/include/sys/socalreg.h 644 root bin
+f none usr/include/sys/ttymux.h 644 root bin
+f none usr/include/sys/ttymuxuser.h 644 root bin
+f none usr/platform/sun4u/include/sys/lom_io.h 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWhermon/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWhermon
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/hermon 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWhmd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,59 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1990-1993,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWhmd
+#
+d none kernel 755 root sys
+d none kernel/drv 755 root sys
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/fas 755 root sys
+f none kernel/drv/s390x/hme 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWhmdu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,66 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWhmdu
+#
+d none usr 755 root sys
+d none usr/include 755 root bin
+d none usr/include/sys 755 root bin
+f none usr/include/sys/hme.h 644 root bin
+f none usr/include/sys/hme_mac.h 644 root bin
+f none usr/include/sys/hme_phy.h 644 root bin
+d none usr/include/sys/scsi 755 root bin
+d none usr/include/sys/scsi/adapters 755 root bin
+f none usr/include/sys/scsi/adapters/fascmd.h 644 root bin
+f none usr/include/sys/scsi/adapters/fasdma.h 644 root bin
+f none usr/include/sys/scsi/adapters/fasreg.h 644 root bin
+f none usr/include/sys/scsi/adapters/fasvar.h 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWhwdata/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWhwdata
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWhxge/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# SUN 10Gb hxge NIC driver
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/hxge	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWib/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,59 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWib
+#
+d none kernel/misc/s390x 0755 root sys
+f none kernel/misc/s390x/ibtl 0755 root sys
+f none kernel/misc/s390x/ibcm 0755 root sys
+f none kernel/misc/s390x/ibdm 0755 root sys
+f none kernel/misc/s390x/ibmf 0755 root sys
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/ib 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWibsdp/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWibsdp
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/sdp 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWibsdpib/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,36 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWibsdpib
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/sdpib 0755 root sys
+d none kernel/strmod/s390x 0755 root sys
+l none kernel/strmod/s390x/sdpib=../../../kernel/drv/s390x/sdpib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWibsdpu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWibsdpu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWidn.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,61 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1999,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWidn.u
+#
+d none platform 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel 755 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel/drv 755 root sys
+e preserve platform/SUNW,Ultra-Enterprise-10000/kernel/drv/idn.conf 644 root sys
+d none platform/SUNW,Ultra-Enterprise-10000/kernel/drv/s390x 755 root sys
+f none platform/SUNW,Ultra-Enterprise-10000/kernel/drv/s390x/idn 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWifp/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,35 @@
+# Copyright 1998,2001,2003 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWifp
+#
+d none kernel 0755 root sys
+d none kernel/drv 0755 root sys
+f none kernel/drv/ifp.conf 0644 root sys
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/ifp 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWifph/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1997,1998 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+!include prototype_com
+#
+# SUNWifph
+#
+d none usr 755 root sys
+d none usr/include 755 root bin
+d none usr/include/sys 755 root bin
+d none usr/include/sys/scsi 755 root bin
+d none usr/include/sys/scsi/adapters 755 root bin
+f none usr/include/sys/scsi/adapters/ifpcmd.h 644 root bin
+f none usr/include/sys/scsi/adapters/ifpio.h 644 root bin
+f none usr/include/sys/scsi/adapters/ifpmail.h 644 root bin
+f none usr/include/sys/scsi/adapters/ifpreg.h 644 root bin
+f none usr/include/sys/scsi/adapters/ifpvar.h 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWigb/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# Intel 1Gb Ethernet Driver S390 specific files
+#
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/igb	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWintgige/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWintgige
+#
+d none kernel 0755 root sys
+d none kernel/drv 0755 root sys
+e renamenew kernel/drv/e1000g.conf 0644 root sys
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/e1000g 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWiopc.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -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 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+i pkginfo
+i copyright
+i depend
+i postinstall
+i preremove
+
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWiopc.u
+#
+d none platform 755 root sys
+d none platform/SUNW,A70 755 root sys
+d none platform/SUNW,A70/kernel 755 root sys
+d none platform/SUNW,A70/kernel/drv 755 root sys
+d none platform/SUNW,A70/kernel/drv/s390x 755 root sys
+f none platform/SUNW,A70/kernel/drv/fpc.conf 644 root sys
+f none platform/SUNW,A70/kernel/drv/s390x/fpc 755 root sys
+d none platform/SUNW,Sun-Fire-V445 755 root sys
+d none platform/SUNW,Sun-Fire-V445/kernel 755 root sys
+d none platform/SUNW,Sun-Fire-V445/kernel/drv 755 root sys
+d none platform/SUNW,Sun-Fire-V445/kernel/drv/s390x 755 root sys
+s none platform/SUNW,Sun-Fire-V445/kernel/drv/s390x/fpc=../../../../SUNW,A70/kernel/drv/s390x/fpc
+s none platform/SUNW,Sun-Fire-V445/kernel/drv/fpc.conf=../../../SUNW,A70/kernel/drv/fpc.conf
+d none platform/SUNW,Sun-Fire-V215 755 root sys
+d none platform/SUNW,Sun-Fire-V215/kernel 755 root sys
+d none platform/SUNW,Sun-Fire-V215/kernel/drv 755 root sys
+d none platform/SUNW,Sun-Fire-V215/kernel/drv/s390x 755 root sys
+s none platform/SUNW,Sun-Fire-V215/kernel/drv/s390x/fpc=../../../../SUNW,A70/kernel/drv/s390x/fpc
+s none platform/SUNW,Sun-Fire-V215/kernel/drv/fpc.conf=../../../SUNW,A70/kernel/drv/fpc.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWiopc.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,63 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+i pkginfo
+i copyright
+i depend
+i postinstall
+i preremove
+
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWiopc.v
+#
+d none platform 755 root sys
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/drv 755 root sys
+d none platform/sun4v/kernel/drv/s390x 755 root sys
+f none platform/sun4v/kernel/drv/fpc.conf 644 root sys
+f none platform/sun4v/kernel/drv/s390x/fpc 755 root sys
+f none platform/sun4v/kernel/drv/n2piupc.conf 644 root sys
+f none platform/sun4v/kernel/drv/s390x/n2piupc 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWioth/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWioth
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWiotu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,58 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWiotu
+#
+d none usr/kernel/drv/s390x 755 root sys
+f none usr/kernel/drv/s390x/pshot 755 root sys
+f none usr/kernel/drv/s390x/gen_drv 755 root sys
+f none usr/kernel/drv/s390x/tvhci 755 root sys
+f none usr/kernel/drv/s390x/tphci 755 root sys
+f none usr/kernel/drv/s390x/tclient 755 root sys
+f none usr/kernel/drv/s390x/emul64 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWipc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1990-1993,1998-2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWipc
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWipfh/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,23 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWipfr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWipfr
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWipfu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,66 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+d none usr/lib/ipf/s390x 755 root sys
+f none usr/lib/ipf/s390x/ipftest 555 root bin
+d none usr/sbin/s390x 755 root bin
+f none usr/sbin/s390x/ipf 555 root bin
+f none usr/sbin/s390x/ipfs 555 root bin
+f none usr/sbin/s390x/ipfstat 555 root bin
+f none usr/sbin/s390x/ipmon 555 root bin
+f none usr/sbin/s390x/ipnat 555 root bin
+f none usr/sbin/s390x/ippool 555 root bin
+d none usr/kernel/drv/s390x 755 root sys
+f none usr/kernel/drv/s390x/ipf 755 root sys
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWipfu
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWipoib/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/ibd 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWippcore/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWippcore
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWipplr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWipplr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWipplu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWipplu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWiscsitgtr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# Copyright 2006 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWiscsitgtr
+#
+d none lib/s390x 755 root bin
+f none lib/s390x/libiscsitgt.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWiscsitgtu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWiscsitgtu
+#
+d none usr/sbin/s390x 755 root bin
+f none usr/sbin/s390x/iscsitgtd 555 root bin
+d none usr/lib/s390x 755 root bin
+s none usr/lib/s390x/libiscsitgt.so.1=../../../lib/s390x/libiscsitgt.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWixgb/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,35 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWixgb
+#
+d none kernel 0755 root sys
+d none kernel/drv 0755 root sys
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/ixgb 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWixgbe/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# Copyright(c) 2007-2008 Intel Corporation. All rights reserved.
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# Intel 10GbE PCIE NIC Driver S390 specific files
+#
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/ixgbe	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWjcom/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,67 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWjcom
+#
+#
+# javax.comm package
+#
+# javax.comm Native Library Files
+#
+d none usr/lib/smartcard 0755 root bin
+f none usr/lib/smartcard/libSolarisSerialParallel.so.1 0755 root bin
+s none usr/lib/smartcard/libSolarisSerialParallel.so=libSolarisSerialParallel.so.1
+#
+# javax.comm jar Files
+#
+d none usr/share/lib/smartcard 0755 root sys
+f none usr/share/lib/smartcard/comm.jar 0644 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWjib/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWjib
+#
+#
+#
+# Dallas Semiconductor iButton Card Terminal Driver Files
+#
+d none usr/share/lib/smartcard 0755 root sys
+f none usr/share/lib/smartcard/ibutton.jar 0644 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkdcr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWkdcr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkdcu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWkdcu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkey/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,295 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWkey
+#
+d none usr/share/lib/keytables/type_4 755 root bin
+f none usr/share/lib/keytables/type_4/reset 444 root bin
+f none usr/share/lib/keytables/type_4/belgium_france 444 root bin
+f none usr/share/lib/keytables/type_4/canada 444 root bin
+f none usr/share/lib/keytables/type_4/canadian_french_5 444 root bin
+f none usr/share/lib/keytables/type_4/canadian_french_5_tbits5 444 root bin
+f none usr/share/lib/keytables/type_4/canadian_french_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/czech_5 444 root bin
+f none usr/share/lib/keytables/type_4/denmark 444 root bin
+f none usr/share/lib/keytables/type_4/denmark_5 444 root bin
+f none usr/share/lib/keytables/type_4/denmark_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/france_5 444 root bin
+f none usr/share/lib/keytables/type_4/france_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/germany 444 root bin
+f none usr/share/lib/keytables/type_4/germany_5 444 root bin
+f none usr/share/lib/keytables/type_4/germany_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/hungary_5 444 root bin
+f none usr/share/lib/keytables/type_4/italy 444 root bin
+f none usr/share/lib/keytables/type_4/italy_5 444 root bin
+f none usr/share/lib/keytables/type_4/italy_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/japan 444 root bin
+f none usr/share/lib/keytables/type_4/japan_5 444 root bin
+f none usr/share/lib/keytables/type_4/japan_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/korea 444 root bin
+f none usr/share/lib/keytables/type_4/korea_5 444 root bin
+f none usr/share/lib/keytables/type_4/korea_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/netherlands 444 root bin
+f none usr/share/lib/keytables/type_4/netherlands_5 444 root bin
+f none usr/share/lib/keytables/type_4/netherlands_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/norway 444 root bin
+f none usr/share/lib/keytables/type_4/norway_5 444 root bin
+f none usr/share/lib/keytables/type_4/norway_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/poland_5 444 root bin
+f none usr/share/lib/keytables/type_4/portugal 444 root bin
+f none usr/share/lib/keytables/type_4/portugal_5 444 root bin
+f none usr/share/lib/keytables/type_4/portugal_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/russia_5 444 root bin
+f none usr/share/lib/keytables/type_4/spain_5 444 root bin
+f none usr/share/lib/keytables/type_4/spain_latin_america 444 root bin
+f none usr/share/lib/keytables/type_4/spain_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/sweden_5 444 root bin
+f none usr/share/lib/keytables/type_4/sweden_finland 444 root bin
+f none usr/share/lib/keytables/type_4/sweden_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/swiss_french 444 root bin
+f none usr/share/lib/keytables/type_4/swiss_french_5 444 root bin
+f none usr/share/lib/keytables/type_4/swiss_french_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/swiss_german 444 root bin
+f none usr/share/lib/keytables/type_4/swiss_german_5 444 root bin
+f none usr/share/lib/keytables/type_4/swiss_german_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/taiwan 444 root bin
+f none usr/share/lib/keytables/type_4/taiwan_5 444 root bin
+f none usr/share/lib/keytables/type_4/taiwan_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/uk 444 root bin
+f none usr/share/lib/keytables/type_4/uk_5 444 root bin
+f none usr/share/lib/keytables/type_4/uk_hobo 444 root bin
+f none usr/share/lib/keytables/type_4/us 444 root bin
+f none usr/share/lib/keytables/type_4/us101a_pc 444 root bin
+f none usr/share/lib/keytables/type_4/us_5 444 root bin
+f none usr/share/lib/keytables/type_4/us_hobo 444 root bin
+
+l none usr/share/lib/keytables/type_4/layout_00=../../../../../usr/share/lib/keytables/type_4/us
+l none usr/share/lib/keytables/type_4/layout_01=../../../../../usr/share/lib/keytables/type_4/us
+l none usr/share/lib/keytables/type_4/layout_02=../../../../../usr/share/lib/keytables/type_4/belgium_france
+l none usr/share/lib/keytables/type_4/layout_03=../../../../../usr/share/lib/keytables/type_4/canada
+l none usr/share/lib/keytables/type_4/layout_04=../../../../../usr/share/lib/keytables/type_4/denmark
+l none usr/share/lib/keytables/type_4/layout_05=../../../../../usr/share/lib/keytables/type_4/germany
+l none usr/share/lib/keytables/type_4/layout_06=../../../../../usr/share/lib/keytables/type_4/italy
+l none usr/share/lib/keytables/type_4/layout_07=../../../../../usr/share/lib/keytables/type_4/netherlands
+l none usr/share/lib/keytables/type_4/layout_08=../../../../../usr/share/lib/keytables/type_4/norway
+l none usr/share/lib/keytables/type_4/layout_09=../../../../../usr/share/lib/keytables/type_4/portugal
+l none usr/share/lib/keytables/type_4/layout_0a=../../../../../usr/share/lib/keytables/type_4/spain_latin_america
+l none usr/share/lib/keytables/type_4/layout_0b=../../../../../usr/share/lib/keytables/type_4/sweden_finland
+l none usr/share/lib/keytables/type_4/layout_0c=../../../../../usr/share/lib/keytables/type_4/swiss_french
+l none usr/share/lib/keytables/type_4/layout_0d=../../../../../usr/share/lib/keytables/type_4/swiss_german
+l none usr/share/lib/keytables/type_4/layout_0e=../../../../../usr/share/lib/keytables/type_4/uk
+l none usr/share/lib/keytables/type_4/layout_10=../../../../../usr/share/lib/keytables/type_4/korea
+l none usr/share/lib/keytables/type_4/layout_11=../../../../../usr/share/lib/keytables/type_4/taiwan
+l none usr/share/lib/keytables/type_4/layout_13=../../../../../usr/share/lib/keytables/type_4/us101a_pc
+l none usr/share/lib/keytables/type_4/layout_20=../../../../../usr/share/lib/keytables/type_4/japan
+l none usr/share/lib/keytables/type_4/layout_21=../../../../../usr/share/lib/keytables/type_4/us_5
+l none usr/share/lib/keytables/type_4/layout_22=../../../../../usr/share/lib/keytables/type_4/us_5
+l none usr/share/lib/keytables/type_4/layout_23=../../../../../usr/share/lib/keytables/type_4/france_5
+l none usr/share/lib/keytables/type_4/layout_24=../../../../../usr/share/lib/keytables/type_4/denmark_5
+l none usr/share/lib/keytables/type_4/layout_25=../../../../../usr/share/lib/keytables/type_4/germany_5
+l none usr/share/lib/keytables/type_4/layout_26=../../../../../usr/share/lib/keytables/type_4/italy_5
+l none usr/share/lib/keytables/type_4/layout_27=../../../../../usr/share/lib/keytables/type_4/netherlands_5
+l none usr/share/lib/keytables/type_4/layout_28=../../../../../usr/share/lib/keytables/type_4/norway_5
+l none usr/share/lib/keytables/type_4/layout_29=../../../../../usr/share/lib/keytables/type_4/portugal_5
+l none usr/share/lib/keytables/type_4/layout_2a=../../../../../usr/share/lib/keytables/type_4/spain_5
+l none usr/share/lib/keytables/type_4/layout_2b=../../../../../usr/share/lib/keytables/type_4/sweden_5
+l none usr/share/lib/keytables/type_4/layout_2c=../../../../../usr/share/lib/keytables/type_4/swiss_french_5
+l none usr/share/lib/keytables/type_4/layout_2d=../../../../../usr/share/lib/keytables/type_4/swiss_german_5
+l none usr/share/lib/keytables/type_4/layout_2e=../../../../../usr/share/lib/keytables/type_4/uk_5
+l none usr/share/lib/keytables/type_4/layout_2f=../../../../../usr/share/lib/keytables/type_4/korea_5
+l none usr/share/lib/keytables/type_4/layout_30=../../../../../usr/share/lib/keytables/type_4/taiwan_5
+l none usr/share/lib/keytables/type_4/layout_31=../../../../../usr/share/lib/keytables/type_4/japan_5
+l none usr/share/lib/keytables/type_4/layout_32=../../../../../usr/share/lib/keytables/type_4/canadian_french_5
+l none usr/share/lib/keytables/type_4/layout_33=../../../../../usr/share/lib/keytables/type_4/hungary_5
+l none usr/share/lib/keytables/type_4/layout_34=../../../../../usr/share/lib/keytables/type_4/poland_5
+l none usr/share/lib/keytables/type_4/layout_35=../../../../../usr/share/lib/keytables/type_4/czech_5
+l none usr/share/lib/keytables/type_4/layout_36=../../../../../usr/share/lib/keytables/type_4/russia_5
+l none usr/share/lib/keytables/type_4/layout_3f=../../../../../usr/share/lib/keytables/type_4/canadian_french_5_tbits5
+l none usr/share/lib/keytables/type_4/layout_5a=../../../../../usr/share/lib/keytables/type_4/sweden_hobo
+l none usr/share/lib/keytables/type_4/layout_5b=../../../../../usr/share/lib/keytables/type_4/swiss_french_hobo
+l none usr/share/lib/keytables/type_4/layout_5c=../../../../../usr/share/lib/keytables/type_4/swiss_german_hobo
+l none usr/share/lib/keytables/type_4/layout_5e=../../../../../usr/share/lib/keytables/type_4/korea_hobo
+l none usr/share/lib/keytables/type_4/layout_5d=../../../../../usr/share/lib/keytables/type_4/uk_hobo
+l none usr/share/lib/keytables/type_4/layout_5f=../../../../../usr/share/lib/keytables/type_4/taiwan_hobo
+l none usr/share/lib/keytables/type_4/layout_50=../../../../../usr/share/lib/keytables/type_4/us_hobo
+l none usr/share/lib/keytables/type_4/layout_51=../../../../../usr/share/lib/keytables/type_4/us_hobo
+l none usr/share/lib/keytables/type_4/layout_52=../../../../../usr/share/lib/keytables/type_4/france_hobo
+l none usr/share/lib/keytables/type_4/layout_53=../../../../../usr/share/lib/keytables/type_4/denmark_hobo
+l none usr/share/lib/keytables/type_4/layout_54=../../../../../usr/share/lib/keytables/type_4/germany_hobo
+l none usr/share/lib/keytables/type_4/layout_55=../../../../../usr/share/lib/keytables/type_4/italy_hobo
+l none usr/share/lib/keytables/type_4/layout_56=../../../../../usr/share/lib/keytables/type_4/netherlands_hobo
+l none usr/share/lib/keytables/type_4/layout_57=../../../../../usr/share/lib/keytables/type_4/norway_hobo
+l none usr/share/lib/keytables/type_4/layout_58=../../../../../usr/share/lib/keytables/type_4/portugal_hobo
+l none usr/share/lib/keytables/type_4/layout_59=../../../../../usr/share/lib/keytables/type_4/spain_hobo
+l none usr/share/lib/keytables/type_4/layout_60=../../../../../usr/share/lib/keytables/type_4/japan_hobo
+l none usr/share/lib/keytables/type_4/layout_61=../../../../../usr/share/lib/keytables/type_4/canadian_french_hobo
+
+#
+# The following links are there for backwards compatibility.
+#
+l none usr/share/lib/keytables/reset=../../../../usr/share/lib/keytables/type_4/reset
+l none usr/share/lib/keytables/belgium_france=../../../../usr/share/lib/keytables/type_4/belgium_france
+l none usr/share/lib/keytables/canada=../../../../usr/share/lib/keytables/type_4/canada
+l none usr/share/lib/keytables/canadian_french_5=../../../../usr/share/lib/keytables/type_4/canadian_french_5
+l none usr/share/lib/keytables/canadian_french_5_tbits5=../../../../usr/share/lib/keytables/type_4/canadian_french_5_tbits5
+l none usr/share/lib/keytables/canadian_french_hobo=../../../../usr/share/lib/keytables/type_4/canadian_french_hobo
+l none usr/share/lib/keytables/czech_5=../../../../usr/share/lib/keytables/type_4/czech_5
+l none usr/share/lib/keytables/denmark=../../../../usr/share/lib/keytables/type_4/denmark
+l none usr/share/lib/keytables/denmark_5=../../../../usr/share/lib/keytables/type_4/denmark_5
+l none usr/share/lib/keytables/denmark_hobo=../../../../usr/share/lib/keytables/type_4/denmark_hobo
+l none usr/share/lib/keytables/france_5=../../../../usr/share/lib/keytables/type_4/france_5
+l none usr/share/lib/keytables/france_hobo=../../../../usr/share/lib/keytables/type_4/france_hobo
+l none usr/share/lib/keytables/germany=../../../../usr/share/lib/keytables/type_4/germany
+l none usr/share/lib/keytables/germany_5=../../../../usr/share/lib/keytables/type_4/germany_5
+l none usr/share/lib/keytables/germany_hobo=../../../../usr/share/lib/keytables/type_4/germany_hobo
+l none usr/share/lib/keytables/hungary_5=../../../../usr/share/lib/keytables/type_4/hungary_5
+l none usr/share/lib/keytables/italy=../../../../usr/share/lib/keytables/type_4/italy
+l none usr/share/lib/keytables/italy_5=../../../../usr/share/lib/keytables/type_4/italy_5
+l none usr/share/lib/keytables/italy_hobo=../../../../usr/share/lib/keytables/type_4/italy_hobo
+l none usr/share/lib/keytables/japan=../../../../usr/share/lib/keytables/type_4/japan
+l none usr/share/lib/keytables/japan_5=../../../../usr/share/lib/keytables/type_4/japan_5
+l none usr/share/lib/keytables/japan_hobo=../../../../usr/share/lib/keytables/type_4/japan_hobo
+l none usr/share/lib/keytables/korea=../../../../usr/share/lib/keytables/type_4/korea
+l none usr/share/lib/keytables/korea_5=../../../../usr/share/lib/keytables/type_4/korea_5
+l none usr/share/lib/keytables/korea_hobo=../../../../usr/share/lib/keytables/type_4/korea_hobo
+l none usr/share/lib/keytables/netherlands=../../../../usr/share/lib/keytables/type_4/netherlands
+l none usr/share/lib/keytables/netherlands_5=../../../../usr/share/lib/keytables/type_4/netherlands_5
+l none usr/share/lib/keytables/netherlands_hobo=../../../../usr/share/lib/keytables/type_4/netherlands_hobo
+l none usr/share/lib/keytables/norway=../../../../usr/share/lib/keytables/type_4/norway
+l none usr/share/lib/keytables/norway_5=../../../../usr/share/lib/keytables/type_4/norway_5
+l none usr/share/lib/keytables/norway_hobo=../../../../usr/share/lib/keytables/type_4/norway_hobo
+l none usr/share/lib/keytables/poland_5=../../../../usr/share/lib/keytables/type_4/poland_5
+l none usr/share/lib/keytables/portugal=../../../../usr/share/lib/keytables/type_4/portugal
+l none usr/share/lib/keytables/portugal_5=../../../../usr/share/lib/keytables/type_4/portugal_5
+l none usr/share/lib/keytables/portugal_hobo=../../../../usr/share/lib/keytables/type_4/portugal_hobo
+l none usr/share/lib/keytables/russia_5=../../../../usr/share/lib/keytables/type_4/russia_5
+l none usr/share/lib/keytables/spain_5=../../../../usr/share/lib/keytables/type_4/spain_5
+l none usr/share/lib/keytables/spain_latin_america=../../../../usr/share/lib/keytables/type_4/spain_latin_america
+l none usr/share/lib/keytables/spain_hobo=../../../../usr/share/lib/keytables/type_4/spain_hobo
+l none usr/share/lib/keytables/sweden_5=../../../../usr/share/lib/keytables/type_4/sweden_5
+l none usr/share/lib/keytables/sweden_finland=../../../../usr/share/lib/keytables/type_4/sweden_finland
+l none usr/share/lib/keytables/sweden_hobo=../../../../usr/share/lib/keytables/type_4/sweden_hobo
+l none usr/share/lib/keytables/swiss_french=../../../../usr/share/lib/keytables/type_4/swiss_french
+l none usr/share/lib/keytables/swiss_french_5=../../../../usr/share/lib/keytables/type_4/swiss_french_5
+l none usr/share/lib/keytables/swiss_french_hobo=../../../../usr/share/lib/keytables/type_4/swiss_french_hobo
+l none usr/share/lib/keytables/swiss_german=../../../../usr/share/lib/keytables/type_4/swiss_german
+l none usr/share/lib/keytables/swiss_german_5=../../../../usr/share/lib/keytables/type_4/swiss_german_5
+l none usr/share/lib/keytables/swiss_german_hobo=../../../../usr/share/lib/keytables/type_4/swiss_german_hobo
+l none usr/share/lib/keytables/taiwan=../../../../usr/share/lib/keytables/type_4/taiwan
+l none usr/share/lib/keytables/taiwan_5=../../../../usr/share/lib/keytables/type_4/taiwan_5
+l none usr/share/lib/keytables/taiwan_hobo=../../../../usr/share/lib/keytables/type_4/taiwan_hobo
+l none usr/share/lib/keytables/uk=../../../../usr/share/lib/keytables/type_4/uk
+l none usr/share/lib/keytables/uk_5=../../../../usr/share/lib/keytables/type_4/uk_5
+l none usr/share/lib/keytables/uk_hobo=../../../../usr/share/lib/keytables/type_4/uk_hobo
+l none usr/share/lib/keytables/us=../../../../usr/share/lib/keytables/type_4/us
+l none usr/share/lib/keytables/us101a_pc=../../../../usr/share/lib/keytables/type_4/us101a_pc
+l none usr/share/lib/keytables/us_5=../../../../usr/share/lib/keytables/type_4/us_5
+l none usr/share/lib/keytables/us_hobo=../../../../usr/share/lib/keytables/type_4/us_hobo
+
+l none usr/share/lib/keytables/layout_00=../../../../usr/share/lib/keytables/type_4/us
+l none usr/share/lib/keytables/layout_01=../../../../usr/share/lib/keytables/type_4/us
+l none usr/share/lib/keytables/layout_02=../../../../usr/share/lib/keytables/type_4/belgium_france
+l none usr/share/lib/keytables/layout_03=../../../../usr/share/lib/keytables/type_4/canada
+l none usr/share/lib/keytables/layout_04=../../../../usr/share/lib/keytables/type_4/denmark
+l none usr/share/lib/keytables/layout_05=../../../../usr/share/lib/keytables/type_4/germany
+l none usr/share/lib/keytables/layout_06=../../../../usr/share/lib/keytables/type_4/italy
+l none usr/share/lib/keytables/layout_07=../../../../usr/share/lib/keytables/type_4/netherlands
+l none usr/share/lib/keytables/layout_08=../../../../usr/share/lib/keytables/type_4/norway
+l none usr/share/lib/keytables/layout_09=../../../../usr/share/lib/keytables/type_4/portugal
+l none usr/share/lib/keytables/layout_0a=../../../../usr/share/lib/keytables/type_4/spain_latin_america
+l none usr/share/lib/keytables/layout_0b=../../../../usr/share/lib/keytables/type_4/sweden_finland
+l none usr/share/lib/keytables/layout_0c=../../../../usr/share/lib/keytables/type_4/swiss_french
+l none usr/share/lib/keytables/layout_0d=../../../../usr/share/lib/keytables/type_4/swiss_german
+l none usr/share/lib/keytables/layout_0e=../../../../usr/share/lib/keytables/type_4/uk
+l none usr/share/lib/keytables/layout_10=../../../../usr/share/lib/keytables/type_4/korea
+l none usr/share/lib/keytables/layout_11=../../../../usr/share/lib/keytables/type_4/taiwan
+l none usr/share/lib/keytables/layout_13=../../../../usr/share/lib/keytables/type_4/us101a_pc
+l none usr/share/lib/keytables/layout_20=../../../../usr/share/lib/keytables/type_4/japan
+l none usr/share/lib/keytables/layout_21=../../../../usr/share/lib/keytables/type_4/us_5
+l none usr/share/lib/keytables/layout_22=../../../../usr/share/lib/keytables/type_4/us_5
+l none usr/share/lib/keytables/layout_23=../../../../usr/share/lib/keytables/type_4/france_5
+l none usr/share/lib/keytables/layout_24=../../../../usr/share/lib/keytables/type_4/denmark_5
+l none usr/share/lib/keytables/layout_25=../../../../usr/share/lib/keytables/type_4/germany_5
+l none usr/share/lib/keytables/layout_26=../../../../usr/share/lib/keytables/type_4/italy_5
+l none usr/share/lib/keytables/layout_27=../../../../usr/share/lib/keytables/type_4/netherlands_5
+l none usr/share/lib/keytables/layout_28=../../../../usr/share/lib/keytables/type_4/norway_5
+l none usr/share/lib/keytables/layout_29=../../../../usr/share/lib/keytables/type_4/portugal_5
+l none usr/share/lib/keytables/layout_2a=../../../../usr/share/lib/keytables/type_4/spain_5
+l none usr/share/lib/keytables/layout_2b=../../../../usr/share/lib/keytables/type_4/sweden_5
+l none usr/share/lib/keytables/layout_2c=../../../../usr/share/lib/keytables/type_4/swiss_french_5
+l none usr/share/lib/keytables/layout_2d=../../../../usr/share/lib/keytables/type_4/swiss_german_5
+l none usr/share/lib/keytables/layout_2e=../../../../usr/share/lib/keytables/type_4/uk_5
+l none usr/share/lib/keytables/layout_2f=../../../../usr/share/lib/keytables/type_4/korea_5
+l none usr/share/lib/keytables/layout_30=../../../../usr/share/lib/keytables/type_4/taiwan_5
+l none usr/share/lib/keytables/layout_31=../../../../usr/share/lib/keytables/type_4/japan_5
+l none usr/share/lib/keytables/layout_32=../../../../usr/share/lib/keytables/type_4/canadian_french_5
+l none usr/share/lib/keytables/layout_33=../../../../usr/share/lib/keytables/type_4/hungary_5
+l none usr/share/lib/keytables/layout_34=../../../../usr/share/lib/keytables/type_4/poland_5
+l none usr/share/lib/keytables/layout_35=../../../../usr/share/lib/keytables/type_4/czech_5
+l none usr/share/lib/keytables/layout_36=../../../../usr/share/lib/keytables/type_4/russia_5
+l none usr/share/lib/keytables/layout_3f=../../../../usr/share/lib/keytables/type_4/canadian_french_5_tbits5
+l none usr/share/lib/keytables/layout_5a=../../../../usr/share/lib/keytables/type_4/sweden_hobo
+l none usr/share/lib/keytables/layout_5b=../../../../usr/share/lib/keytables/type_4/swiss_french_hobo
+l none usr/share/lib/keytables/layout_5c=../../../../usr/share/lib/keytables/type_4/swiss_german_hobo
+l none usr/share/lib/keytables/layout_5e=../../../../usr/share/lib/keytables/type_4/korea_hobo
+l none usr/share/lib/keytables/layout_5d=../../../../usr/share/lib/keytables/type_4/uk_hobo
+l none usr/share/lib/keytables/layout_5f=../../../../usr/share/lib/keytables/type_4/taiwan_hobo
+l none usr/share/lib/keytables/layout_50=../../../../usr/share/lib/keytables/type_4/us_hobo
+l none usr/share/lib/keytables/layout_51=../../../../usr/share/lib/keytables/type_4/us_hobo
+l none usr/share/lib/keytables/layout_52=../../../../usr/share/lib/keytables/type_4/france_hobo
+l none usr/share/lib/keytables/layout_53=../../../../usr/share/lib/keytables/type_4/denmark_hobo
+l none usr/share/lib/keytables/layout_54=../../../../usr/share/lib/keytables/type_4/germany_hobo
+l none usr/share/lib/keytables/layout_55=../../../../usr/share/lib/keytables/type_4/italy_hobo
+l none usr/share/lib/keytables/layout_56=../../../../usr/share/lib/keytables/type_4/netherlands_hobo
+l none usr/share/lib/keytables/layout_57=../../../../usr/share/lib/keytables/type_4/norway_hobo
+l none usr/share/lib/keytables/layout_58=../../../../usr/share/lib/keytables/type_4/portugal_hobo
+l none usr/share/lib/keytables/layout_59=../../../../usr/share/lib/keytables/type_4/spain_hobo
+l none usr/share/lib/keytables/layout_60=../../../../usr/share/lib/keytables/type_4/japan_hobo
+l none usr/share/lib/keytables/layout_61=../../../../usr/share/lib/keytables/type_4/canadian_french_hobo
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkrbr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWkrbr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkrbu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,64 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWkrbu
+#
+d none usr/lib/s390x 755 root bin
+d none usr/lib/s390x/gss 755 root bin
+f none usr/lib/s390x/gss/mech_krb5.so.1 755 root bin
+s none usr/lib/s390x/gss/mech_krb5.so=./mech_krb5.so.1
+f none usr/lib/s390x/libkrb5.so.1 755 root bin
+s none usr/lib/s390x/libkrb5.so=./libkrb5.so.1
+d none usr/lib/security/s390x 755 root bin
+f none usr/lib/security/s390x/pam_krb5.so.1 755 root bin
+s none usr/lib/security/s390x/pam_krb5.so=./pam_krb5.so.1
+f none usr/lib/security/s390x/pam_krb5_migrate.so.1 755 root bin
+s none usr/lib/security/s390x/pam_krb5_migrate.so=./pam_krb5_migrate.so.1
+d none usr/lib/krb5/s390x 755 root bin
+f none usr/lib/krb5/s390x/libkadm5clnt.so.1 755 root bin
+s none usr/lib/krb5/s390x/libkadm5clnt.so=./libkadm5clnt.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkvm.c/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWkvm.c
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkvm.d/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWkvm.d
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkvm.m/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWkvm.m
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkvm.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWkvm.u
+#
+d none usr/platform/sun4u/lib/cfgadm/s390x 755 root bin
+f none usr/platform/sun4u/lib/cfgadm/s390x/sysctrl.so.1 755 root bin
+s none usr/platform/sun4u/lib/cfgadm/s390x/sysctrl.so=./sysctrl.so.1
+f none usr/platform/sun4u/lib/cfgadm/s390x/ac.so.1 755 root bin
+s none usr/platform/sun4u/lib/cfgadm/s390x/ac.so=./ac.so.1
+f none usr/platform/sun4u/lib/cfgadm/s390x/sbd.so.1 755 root bin
+s none usr/platform/sun4u/lib/cfgadm/s390x/sbd.so=./sbd.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkvm.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWkvm.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWkvmt200.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWkvmt200.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWldomr.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,91 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWldomr.v
+#
+d none lib 755 root bin
+d none lib/svc 0755 root bin
+d none lib/svc/method 0755 root bin
+f none lib/svc/method/svc-drd 0555 root bin
+f none lib/svc/method/svc-vntsd 0555 root bin
+d none platform 755 root sys
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/drv 755 root sys
+f none platform/sun4v/kernel/drv/drctl.conf 0644 root sys
+f none platform/sun4v/kernel/drv/ds_pri.conf 644 root sys
+f none platform/sun4v/kernel/drv/ds_snmp.conf 644 root sys
+d none platform/sun4v/kernel/drv/s390x 755 root sys
+f none platform/sun4v/kernel/drv/s390x/cnex 755 root sys
+f none platform/sun4v/kernel/drv/s390x/drctl 755 root sys
+f none platform/sun4v/kernel/drv/s390x/ds_pri 755 root sys
+f none platform/sun4v/kernel/drv/s390x/ds_snmp 755 root sys
+f none platform/sun4v/kernel/drv/s390x/vlds 755 root sys
+f none platform/sun4v/kernel/drv/s390x/vcc 755 root sys
+f none platform/sun4v/kernel/drv/s390x/vdc 755 root sys
+f none platform/sun4v/kernel/drv/s390x/vds 755 root sys
+f none platform/sun4v/kernel/drv/s390x/vldc 755 root sys
+f none platform/sun4v/kernel/drv/s390x/vnet 755 root sys
+f none platform/sun4v/kernel/drv/s390x/vsw 755 root sys
+d none platform/sun4v/kernel/misc 755 root sys
+d none platform/sun4v/kernel/misc/s390x 755 root sys
+f none platform/sun4v/kernel/misc/s390x/dr_cpu 755 root sys
+f none platform/sun4v/kernel/misc/s390x/dr_io 755 root sys
+f none platform/sun4v/kernel/misc/s390x/ds 755 root sys
+f none platform/sun4v/kernel/misc/s390x/fault_iso 755 root sys
+f none platform/sun4v/kernel/misc/s390x/ldc 755 root sys
+f none platform/sun4v/kernel/misc/s390x/platsvc 755 root sys
+d none var 755 root sys
+d none var/svc 755 root sys
+d none var/svc/manifest 755 root sys
+d none var/svc/manifest/platform 755 root sys
+d none var/svc/manifest/platform/sun4v 755 root sys
+f manifest var/svc/manifest/platform/sun4v/drd.xml 0444 root sys
+f manifest var/svc/manifest/platform/sun4v/vntsd.xml 0444 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWldomu.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWldomu.v
+#
+d none usr 755 root sys
+d none usr/lib 755 root bin
+d none usr/lib/ldoms 755 root bin
+f none usr/lib/ldoms/drd 555 root bin
+f none usr/lib/ldoms/vntsd 555 root bin
+f none usr/lib/libpri.so.1 755 root bin
+f none usr/lib/libds.so.1 755 root bin
+d none usr/lib/rcm 755 root bin
+d none usr/lib/rcm/scripts 755 root bin
+f none usr/lib/rcm/scripts/SUNW,vdevices.pl 555 root bin
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libpri.so.1 755 root bin
+f none usr/lib/s390x/libds.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWldskint/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWldskint
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWlibsasl/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWlibsasl
+#
+d none usr/lib/sasl/s390x 755 root bin
+f none usr/lib/sasl/s390x/crammd5.so.1 755 root bin
+f none usr/lib/sasl/s390x/digestmd5.so.1 755 root bin
+f none usr/lib/sasl/s390x/plain.so.1 755 root bin
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libsasl.so.1 755 root bin
+s none usr/lib/s390x/libsasl.so=libsasl.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWllc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,57 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1990-1993,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWllc
+#
+d none usr/kernel/drv/s390x 755 root sys
+f none usr/kernel/drv/s390x/llc2 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWllcr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWllcr
+#
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWlldap/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWloc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWloc
+#
+d none usr/lib/iconv/s390x 755 root bin
+f none usr/lib/iconv/s390x/geniconvtbl.so 555 root bin
+d none usr/lib/locale/iso_8859_1/s390x 755 root bin
+f none usr/lib/locale/iso_8859_1/s390x/iso_8859_1.so.3 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWlp-cmds/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpapi-lp-cmds
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWlpr-cmds/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpapi-lpr-cmds
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWluxd.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1990-1997,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWluxd.u
+#
+d none platform 0755 root sys
+d none platform/sun4u 0755 root sys
+d none platform/sun4u/kernel 0755 root sys
+d none platform/sun4u/kernel/drv 0755 root sys
+f none platform/sun4u/kernel/drv/sf.conf 0644 root sys
+d none platform/sun4u/kernel/drv/s390x 0755 root sys
+f none platform/sun4u/kernel/drv/s390x/sf 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWluxl/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,57 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1990-1997,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWluxl
+#
+d none kernel 755 root sys
+d none kernel/drv 755 root sys
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/socal 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmdar/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# this file contains files unique to s390 only
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmdau/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# this file contains files unique to s390 only
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmdb/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,104 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+!include prototype_com
+
+d none usr/bin/s390v7 755 root bin
+f none usr/bin/s390v7/mdb 555 root bin
+l none usr/bin/s390v7/adb=../../../usr/bin/s390v7/mdb
+#
+d none usr/platform/sun4u 755 root sys
+d none usr/platform/sun4u/lib 755 root bin
+d none usr/platform/sun4u/lib/mdb 755 root sys
+d none usr/platform/sun4u/lib/mdb/kvm 755 root sys
+d none usr/bin/s390x 755 root bin
+f none usr/bin/s390x/mdb 555 root bin
+l none usr/bin/s390x/adb=../../../usr/bin/s390x/mdb
+d none usr/lib/mdb/kvm/s390x 755 root sys
+f none usr/lib/mdb/kvm/s390x/arp.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/audiosup.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/cpc.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/crypto.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/genunix.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/intr.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/ip.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/hook.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/neti.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/ipc.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/ipp.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/isp.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/krtld.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/lofs.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/logindmux.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/md.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/mdb_ks.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/mpt.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/nca.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/nfs.so 555 root sys
+s none usr/lib/mdb/kvm/s390x/pcisch.so=intr.so
+s none usr/lib/mdb/kvm/s390x/pcipsy.so=intr.so
+f none usr/lib/mdb/kvm/s390x/ptm.so 555 root sys
+s none usr/lib/mdb/kvm/s390x/px.so=intr.so
+f none usr/lib/mdb/kvm/s390x/random.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/sctp.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/s1394.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/scsi_vhci.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/specfs.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/sppp.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/sd.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/ssd.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/ufs.so 555 root sys
+f none usr/lib/mdb/kvm/s390x/usba.so 555 root sys
+d none usr/lib/mdb/proc/s390x 755 root sys
+f none usr/lib/mdb/proc/s390x/libavl.so 555 root sys
+f none usr/lib/mdb/proc/s390x/libc.so 555 root sys
+f none usr/lib/mdb/proc/s390x/libnvpair.so 555 root sys
+f none usr/lib/mdb/proc/s390x/libproc.so 555 root sys
+f none usr/lib/mdb/proc/s390x/libsysevent.so 555 root sys
+f none usr/lib/mdb/proc/s390x/libtopo.so 555 root sys
+f none usr/lib/mdb/proc/s390x/libumem.so 555 root sys
+f none usr/lib/mdb/proc/s390x/libuutil.so 555 root sys
+f none usr/lib/mdb/proc/s390x/mdb_ds.so 555 root sys
+f none usr/lib/mdb/proc/s390x/ld.so 555 root sys
+d none usr/platform/sun4u/lib/mdb/kvm/s390x 755 root sys
+f none usr/platform/sun4u/lib/mdb/kvm/s390x/unix.so 555 root sys
+f none usr/platform/sun4u/lib/mdb/kvm/s390x/sgenv.so 555 root sys
+f none usr/platform/sun4u/lib/mdb/kvm/s390x/sgsbbc.so 555 root sys
+f none usr/platform/sun4u/lib/mdb/kvm/s390x/oplhwd.so 555 root sys
+#
+d none usr/platform/sun4v 755 root sys
+d none usr/platform/sun4v/lib 755 root bin
+d none usr/platform/sun4v/lib/mdb 755 root sys
+d none usr/platform/sun4v/lib/mdb/kvm 755 root sys
+d none usr/platform/sun4v/lib/mdb/kvm/s390x 755 root sys
+f none usr/platform/sun4v/lib/mdb/kvm/s390x/errh.so 555 root sys
+f none usr/platform/sun4v/lib/mdb/kvm/s390x/ldc.so 555 root sys
+f none usr/platform/sun4v/lib/mdb/kvm/s390x/mdesc.so 555 root sys
+f none usr/platform/sun4v/lib/mdb/kvm/s390x/unix.so 555 root sys
+f none usr/platform/sun4v/lib/mdb/kvm/s390x/vdsk.so 555 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmdbdm/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,31 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmdbr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,87 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+!include prototype_com
+#
+d none kernel/kmdb/s390x 755 root sys
+f none kernel/kmdb/s390x/arp 555 root sys
+f none kernel/kmdb/s390x/audiosup 555 root sys
+f none kernel/kmdb/s390x/cpc 555 root sys
+f none kernel/kmdb/s390x/crypto 555 root sys
+f none kernel/kmdb/s390x/genunix 555 root sys
+f none kernel/kmdb/s390x/intr 555 root sys
+f none kernel/kmdb/s390x/ip 555 root sys
+f none kernel/kmdb/s390x/hook 555 root sys
+f none kernel/kmdb/s390x/neti 555 root sys
+f none kernel/kmdb/s390x/ipc 555 root sys
+f none kernel/kmdb/s390x/ipp 555 root sys
+f none kernel/kmdb/s390x/isp 555 root sys
+f none kernel/kmdb/s390x/krtld 555 root sys
+f none kernel/kmdb/s390x/lofs 555 root sys
+f none kernel/kmdb/s390x/logindmux 555 root sys
+f none kernel/kmdb/s390x/md 555 root sys
+f none kernel/kmdb/s390x/mdb_ds 555 root sys
+f none kernel/kmdb/s390x/mpt 555 root sys
+f none kernel/kmdb/s390x/nca 555 root sys
+f none kernel/kmdb/s390x/nfs 555 root sys
+s none kernel/kmdb/s390x/pcisch=intr
+s none kernel/kmdb/s390x/pcipsy=intr
+f none kernel/kmdb/s390x/ptm 555 root sys
+s none kernel/kmdb/s390x/px=intr
+f none kernel/kmdb/s390x/random 555 root sys
+f none kernel/kmdb/s390x/sctp 555 root sys
+f none kernel/kmdb/s390x/s1394 555 root sys
+f none kernel/kmdb/s390x/scsi_vhci 555 root sys
+f none kernel/kmdb/s390x/sd 555 root sys
+f none kernel/kmdb/s390x/specfs 555 root sys
+f none kernel/kmdb/s390x/sppp 555 root sys
+f none kernel/kmdb/s390x/ssd 555 root sys
+f none kernel/kmdb/s390x/ufs 555 root sys
+f none kernel/kmdb/s390x/usba 555 root sys
+#
+d none platform 755 root sys
+d none platform/sun4u 755 root sys
+d none platform/sun4u/kernel 755 root sys
+d none platform/sun4u/kernel/kmdb 755 root sys
+d none platform/sun4u/kernel/kmdb/s390x 755 root sys
+f none platform/sun4u/kernel/kmdb/s390x/sgenv 555 root sys
+f none platform/sun4u/kernel/kmdb/s390x/sgsbbc 555 root sys
+f none platform/sun4u/kernel/kmdb/s390x/unix 555 root sys
+f none platform/sun4u/kernel/kmdb/s390x/oplhwd 555 root sys
+#
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/kmdb 755 root sys
+d none platform/sun4v/kernel/kmdb/s390x 755 root sys
+f none platform/sun4v/kernel/kmdb/s390x/errh 555 root sys
+f none platform/sun4v/kernel/kmdb/s390x/ldc 555 root sys
+f none platform/sun4v/kernel/kmdb/s390x/mdesc 555 root sys
+f none platform/sun4v/kernel/kmdb/s390x/unix 555 root sys
+f none platform/sun4v/kernel/kmdb/s390x/vdsk 555 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmddr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright  2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWmddr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmdr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,44 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1999-2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This file contains files unique to s390 only
+#
+!include prototype_com
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/md 0755 root sys
+d none kernel/misc/s390x 0755 root sys
+f none kernel/misc/s390x/md_stripe 0755 root sys
+f none kernel/misc/s390x/md_mirror 0755 root sys
+f none kernel/misc/s390x/md_raid 0755 root sys
+f none kernel/misc/s390x/md_trans 0755 root sys
+f none kernel/misc/s390x/md_notify 0755 root sys
+f none kernel/misc/s390x/md_hotspares 0755 root sys
+f none kernel/misc/s390x/md_sp 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmdu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,34 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1999-2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# this file contains files unique to s390 only
+#
+!include prototype_com
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmibii/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 1996 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# pkgdefs/SUNWmibii/prototype_s390
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmmsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"@(#)prototype_s390	1.2	08/07/01 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+
+d none kernel 755 root sys
+d none kernel/drv 755 root sys
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/dmd 0755 root sys
+f none kernel/drv/s390x/dda 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmmsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"@(#)prototype_s390	1.1	08/06/25 SMI"
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWmmsu
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmxfe/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# Macronix Fast Ethernet driver
+d none kernel			0755	root	sys
+d none kernel/drv		0755	root	sys
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/mxfe	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cp.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWn2cp.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cpact.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWn2cpact.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWncar/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1991-1999,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWncar
+#
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/nca 755 root sys
+d none kernel/strmod/s390x 755 root sys
+l none kernel/strmod/s390x/nca=../../../kernel/drv/s390x/nca
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWncau/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1991-1999,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+d none usr/lib/s390x 755 root bin
+s none usr/lib/s390x/ncad_addr.so=./ncad_addr.so.1
+f none usr/lib/s390x/ncad_addr.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWndmpr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWndmpu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+!include prototype_com
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libndmp.so.1 755 root bin
+f none usr/lib/s390x/llib-lndmp.ln 644 root bin
+s none usr/lib/s390x/libndmp.so=libndmp.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnetcat/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWnetcat
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnfsckr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWnfsckr
+#
+d none kernel/fs/s390x 755 root sys
+f none kernel/fs/s390x/nfs 755 root sys
+d none kernel/misc/s390x 755 root sys
+f none kernel/misc/s390x/klmmod 755 root sys
+f none kernel/misc/s390x/klmops 755 root sys
+f none kernel/misc/s390x/nfs_dlboot 755 root sys
+d none kernel/sys/s390x 755 root sys
+l none kernel/sys/s390x/nfs=../../../kernel/fs/s390x/nfs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnfscr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWnfscr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnfscu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWnfscu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnfsskr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWnfsskr
+#
+d none kernel/misc/s390x 755 root sys
+f none kernel/misc/s390x/nfssrv 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnfssr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWnfssr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnfssu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWnfssu
+#
+d none usr/lib/fs/nfs/s390x 755 root sys
+f none usr/lib/fs/nfs/s390x/libshare_nfs.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnisr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWnisr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnisu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWnisu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWniumx.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWniumx.v
+#
+d none platform 755 root sys
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/drv 755 root sys
+d none platform/sun4v/kernel/drv/s390x 755 root sys
+f none platform/sun4v/kernel/drv/s390x/niumx 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWntpr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWntpr
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWntpu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWntpu
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnwamintr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWnwamintr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnwamintu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWnwamintu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnxge.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWnxge.u
+#
+d none platform 755 root sys
+d none platform/sun4u 755 root sys
+d none platform/sun4u/kernel 755 root sys
+d none platform/sun4u/kernel/drv 755 root sys
+e renameold platform/sun4u/kernel/drv/nxge.conf 0644 root sys
+d none platform/sun4u/kernel/drv/s390x 755 root sys
+f none platform/sun4u/kernel/drv/s390x/nxge 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnxge.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWnxge.v
+#
+d none platform 755 root sys
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/drv 755 root sys
+e renameold platform/sun4v/kernel/drv/nxge.conf 0644 root sys
+d none platform/sun4v/kernel/drv/s390x 755 root sys
+f none platform/sun4v/kernel/drv/s390x/nxge 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWocf/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWocf
+d none usr/lib/s390x 0755 root bin
+f none usr/lib/s390x/libsmartcard.so.1 0755 root bin
+s none usr/lib/s390x/libsmartcard.so=libsmartcard.so.1
+f none usr/lib/s390x/llib-lsmartcard.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWocfd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,48 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWocfh/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999, 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWocf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWocfr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999, 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWonfmes/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,32 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+!include prototype_com
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWonmtst.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -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 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWonmtst.u
+#
+d none platform/sun4u 755 root sys
+d none platform/sun4u/kernel 755 root sys
+d none platform/sun4u/kernel/drv 755 root sys
+f none platform/sun4u/kernel/drv/memtest.conf 644 root sys
+d none platform/sun4u/kernel/drv/s390x 755 root sys
+f none platform/sun4u/kernel/drv/s390x/memtest 755 root sys
+d none usr/platform/sun4u 755 root sys
+d none usr/platform/sun4u/include 755 root bin
+d none usr/platform/sun4u/include/sys 755 root bin
+f none usr/platform/sun4u/include/sys/memtestio.h 644 root bin
+f none usr/platform/sun4u/include/sys/memtestio_u.h 644 root bin
+f none usr/platform/sun4u/include/sys/memtestio_ch.h 644 root bin
+f none usr/platform/sun4u/include/sys/memtestio_chp.h 644 root bin
+f none usr/platform/sun4u/include/sys/memtestio_ja.h 644 root bin
+f none usr/platform/sun4u/include/sys/memtestio_jg.h 644 root bin
+f none usr/platform/sun4u/include/sys/memtestio_oc.h 644 root bin
+f none usr/platform/sun4u/include/sys/memtestio_pn.h 644 root bin
+f none usr/platform/sun4u/include/sys/memtestio_sf.h 644 root bin
+f none usr/platform/sun4u/include/sys/memtestio_sr.h 644 root bin
+f none usr/bin/mtst 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWonmtst.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,68 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWonmtst.v
+#
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/drv 755 root sys
+f none platform/sun4v/kernel/drv/memtest.conf 644 root sys
+d none platform/sun4v/kernel/drv/s390x 755 root sys
+f none platform/sun4v/kernel/drv/s390x/memtest 755 root sys
+d none usr/platform/sun4v 755 root sys
+d none usr/platform/sun4v/include 755 root bin
+d none usr/platform/sun4v/include/sys 755 root bin
+f none usr/platform/sun4v/include/sys/memtestio.h 644 root bin
+f none usr/platform/sun4v/include/sys/memtestio_v.h 644 root bin
+f none usr/platform/sun4v/include/sys/memtestio_ni.h 644 root bin
+f none usr/platform/sun4v/include/sys/memtestio_n2.h 644 root bin
+f none usr/platform/sun4v/include/sys/memtestio_vf.h 644 root bin
+f none usr/bin/mtst 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWonzfs/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+!include prototype_com
+#
+d none usr/sbin/s390x 755 root bin
+f none usr/sbin/s390x/zinject 555 root bin
+d none usr/bin/s390x 755 root bin
+f none usr/bin/s390x/ztest 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-commands/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWopenssl-commands
+#
+d none usr/sfw/bin/s390x 755 root bin
+f none usr/sfw/bin/s390x/openssl 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-include/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,57 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWopenssl-include
+#
+#
+d none usr/lib/s390x 755 root bin
+d none usr/lib/s390x/pkgconfig 755 root other
+f none usr/lib/s390x/pkgconfig/openssl.pc 644 root other
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-libraries/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWopenssl-libraries
+#
+d none usr/sfw/lib/s390x 755 root bin
+s none usr/sfw/lib/64=s390x
+f none usr/sfw/lib/s390x/libcrypto.so.0.9.8 755 root bin
+s none usr/sfw/lib/s390x/libcrypto.so=./libcrypto.so.0.9.8
+f none usr/sfw/lib/s390x/libssl.so.0.9.8 755 root bin
+s none usr/sfw/lib/s390x/libssl.so=./libssl.so.0.9.8
+f none usr/sfw/lib/s390x/llib-lssl.ln 644 root bin
+f none usr/sfw/lib/s390x/llib-lcrypto.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-man/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWopenssl-man
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopensslr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWopensslu-libraries
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWosdem/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1995 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWosdem
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpamsc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1999,2001,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpamsc
+d none usr/lib/security/s390x 0755 root bin
+f none usr/lib/security/s390x/pam_smartcard.so.1 0755 root bin
+s none usr/lib/security/s390x/pam_smartcard.so=pam_smartcard.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpapi/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpapi
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcan/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#! /usr/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are s390 specific here
+# Wireless Lan driver for Agere/Prism-II chipset
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/pcan 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcelx/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,28 @@
+# Copyright 1999-2001,2003 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are s390 specific here
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/pcelx 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcmci/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpcmci
+#
+f none kernel/drv/stp4020.conf 0644 root sys
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/pem 0755 root sys
+f none kernel/drv/s390x/pcs 0755 root sys
+f none kernel/drv/s390x/stp4020 0755 root sys
+f none kernel/drv/s390x/pcic 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcmcu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#       Copyright (c) 1995 Sun Microsystems, Inc.
+#               All Rights Reserved
+#
+#       ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpcmcu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcmem/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 1999-2001,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are s390 specific here
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/pcmem 0755 root sys
+f none kernel/drv/s390x/pcram 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpcr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcser/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1999-2001,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are s390 specific here
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/pcser 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpcu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcwl/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#! /usr/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are s390 specific here
+# Wireless Lan driver for Agere/Prism-II chipset
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/pcwl 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,64 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+i i.mptconf
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpd
+#
+d none kernel 0755 root sys
+d none kernel/drv 0755 root sys
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/se 0755 root sys
+f none kernel/drv/s390x/glm 0755 root sys
+f none kernel/drv/s390x/mpt 0755 root sys
+e mptconf kernel/drv/mpt.conf 0644 root sys
+f none kernel/drv/ecpp.conf 0644 root sys
+f none kernel/drv/s390x/ecpp 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpdu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,63 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpdu
+#
+d none usr 755 root sys
+d none usr/include 755 root bin
+d none usr/include/sys 755 root bin
+d none usr/include/sys/scsi 755 root bin
+d none usr/include/sys/scsi/adapters 755 root bin
+f none usr/include/sys/scsi/adapters/glmvar.h 644 root bin
+f none usr/include/sys/scsi/adapters/glmreg.h 644 root bin
+f none usr/include/sys/scsi/adapters/mptvar.h 644 root bin
+f none usr/include/sys/scsi/adapters/mptreg.h 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWperl584core/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,415 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are s390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWperl584core
+#
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/attrs.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/attrs 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/attrs/attrs.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/attrs/attrs.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Cwd 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Cwd/Cwd.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Cwd/Cwd.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Data 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Data/Dumper 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Data/Dumper/Dumper.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Data/Dumper/Dumper.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Digest 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Digest/MD5 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Digest/MD5/MD5.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Digest/MD5/MD5.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/DynaLoader 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/DynaLoader/autosplit.ix 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/DynaLoader/dl_expandspec.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/DynaLoader/dl_find_symbol_anywhere.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/DynaLoader/dl_findfile.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/DynaLoader/DynaLoader.a 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/DynaLoader/extralibs.ld 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Fcntl 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Fcntl/Fcntl.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Fcntl/Fcntl.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/File 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/File/Glob 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/File/Glob/Glob.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/File/Glob/Glob.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Filter 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Filter/Util 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Filter/Util/Call 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Filter/Util/Call/Call.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Filter/Util/Call/Call.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IO 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IO/IO.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IO/IO.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IPC 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IPC/SysV 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IPC/SysV/SysV.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IPC/SysV/SysV.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/List 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/List/Util 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/List/Util/Util.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/List/Util/Util.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/MIME 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/MIME/Base64 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/MIME/Base64/Base64.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/MIME/Base64/Base64.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/NDBM_File 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/NDBM_File/NDBM_File.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/NDBM_File/NDBM_File.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/ODBM_File 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/ODBM_File/ODBM_File.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/ODBM_File/ODBM_File.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/encoding 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/encoding/encoding.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/encoding/encoding.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/scalar 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/scalar/scalar.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/scalar/scalar.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/via 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/via/via.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/via/via.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/abs.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/alarm.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/assert.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atan2.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atexit.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atof.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atoi.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atol.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/autosplit.ix 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/bsearch.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/calloc.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/chdir.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/chmod.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/chown.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/clearerr.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/closedir.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/cos.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/creat.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/div.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/errno.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execl.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execle.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execlp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execv.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execve.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execvp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/exit.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/exp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fabs.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fclose.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fcntl.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fdopen.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/feof.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ferror.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fflush.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fgetc.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fgetpos.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fgets.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fileno.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fopen.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fork.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fprintf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fputc.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fputs.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fread.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/free.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/freopen.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fscanf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fseek.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fsetpos.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fstat.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fsync.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ftell.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fwrite.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getc.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getchar.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getegid.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getenv.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/geteuid.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getgid.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getgrgid.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getgrnam.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getgroups.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getlogin.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpgrp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpid.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getppid.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpwnam.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpwuid.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/gets.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getuid.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/gmtime.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/isatty.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/kill.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/labs.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ldiv.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/link.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/load_imports.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/localtime.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/log.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/longjmp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/malloc.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memchr.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memcmp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memcpy.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memmove.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memset.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/mkdir.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/offsetof.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/opendir.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/perror.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/POSIX.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/POSIX.so 0555 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/pow.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/printf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/putc.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/putchar.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/puts.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/qsort.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/raise.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rand.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/readdir.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/realloc.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/redef.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/remove.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rename.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rewind.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rewinddir.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rmdir.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/scanf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/setbuf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/setjmp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/setvbuf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/siglongjmp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sigsetjmp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sin.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sleep.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sprintf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sqrt.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/srand.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sscanf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/stat.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcat.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strchr.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcmp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcpy.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcspn.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strerror.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strlen.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strncat.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strncmp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strncpy.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strpbrk.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strrchr.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strspn.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strstr.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strtok.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/system.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/time.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/tmpfile.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/tolower.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/toupper.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/umask.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ungetc.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/unimpl.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/unlink.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/usage.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/utime.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/vfprintf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/vprintf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/vsprintf.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/wait.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/waitpid.al 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/re 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/re/re.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/re/re.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/sdbm 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/sdbm/extralibs.ld 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/SDBM_File 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/SDBM_File/SDBM_File.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/SDBM_File/SDBM_File.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Socket 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Socket/Socket.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Socket/Socket.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/_freeze.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/_retrieve.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/_store.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/_store_fd.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/autosplit.ix 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/CAN_FLOCK.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/fd_retrieve.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/freeze.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/lock_nstore.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/lock_retrieve.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/lock_store.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/logcarp.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/logcroak.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/nfreeze.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/nstore.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/nstore_fd.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/read_magic.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/retrieve.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/show_file_magic.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/Storable.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/Storable.so 0555 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/store.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/store_fd.al 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/thaw.al 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Catalog 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.so 0555 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/File 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/File/File.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/File/File.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Object 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Intrs 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Kstat 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Lgrp 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Privilege 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Project 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Project/Project.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Project/Project.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Task 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Task/Task.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Task/Task.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Ucred 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Utils 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Utils/Utils.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Utils/Utils.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sys 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sys/Hostname 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sys/Hostname/autosplit.ix 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sys/Hostname/Hostname.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sys/Hostname/Hostname.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sys/Syslog 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sys/Syslog/Syslog.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sys/Syslog/Syslog.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Time 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Time/HiRes 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Time/HiRes/HiRes.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Time/HiRes/HiRes.so 0555 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Config.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/libperl.so.1 0555 root bin
+s none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/libperl.so=./libperl.so.1
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Cwd.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/Data 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Data/Dumper.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/Digest 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Digest/MD5.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/DynaLoader.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Errno.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Fcntl.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/File 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/File/Glob.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/Filter 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/Filter/Util 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Filter/Util/Call.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/I18N 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/I18N/Langinfo.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO/Dir.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO/File.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO/Handle.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO/Pipe.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO/Poll.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO/Seekable.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO/Select.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IO/Socket.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/IPC 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IPC/Msg.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IPC/Semaphore.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/IPC/SysV.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/lib.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/MIME 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/MIME/Base64.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/MIME/QuotedPrint.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/NDBM_File.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/ODBM_File.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/PerlIO 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/PerlIO/encoding.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/PerlIO/scalar.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/PerlIO/via.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/POSIX.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/re.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/SDBM_File.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Socket.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Storable.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/Sys 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Sys/Hostname.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Sys/Syslog.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/Time 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Time/HiRes.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/XSLoader.pm 0444 root bin
+d none usr/perl5/site_perl/5.8.4/sun4-solaris-64int 0755 root bin
+d none usr/perl5/vendor_perl/5.8.4/sun4-solaris-64int 0755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWperl584usr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,226 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are s390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWperl584usr
+#
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/.packlist 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/B 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/B/B.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/B/B.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/B/C 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/B/C/C.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/B/C/C.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/ByteLoader 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/ByteLoader/ByteLoader.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/ByteLoader/ByteLoader.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/DProf 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/DProf/DProf.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/DProf/DProf.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/Peek 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/Peek/Peek.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/Peek/Peek.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/PPPort 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/PPPort/PPPort.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/PPPort/PPPort.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Byte 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Byte/Byte.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Byte/Byte.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/CN 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/CN/CN.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/CN/CN.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/EBCDIC 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/EBCDIC/EBCDIC.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/EBCDIC/EBCDIC.so 0555 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Encode.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Encode.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/JP 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/JP/JP.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/JP/JP.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/KR 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/KR/KR.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/KR/KR.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Symbol 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Symbol/Symbol.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Symbol/Symbol.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/TW 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/TW/TW.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/TW/TW.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Unicode 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Unicode/Unicode.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Unicode/Unicode.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/I18N 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/I18N/Langinfo 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/I18N/Langinfo/autosplit.ix 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/I18N/Langinfo/Langinfo.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/I18N/Langinfo/Langinfo.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Opcode 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Opcode/Opcode.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Opcode/Opcode.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Unicode 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Unicode/Normalize 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Unicode/Normalize/Normalize.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Unicode/Normalize/Normalize.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/XS 0755 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/XS/APItest 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/XS/APItest/APItest.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/XS/APItest/APItest.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/XS/Typemap 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/XS/Typemap/Typemap.bs 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/XS/Typemap/Typemap.so 0555 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/B 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Asmdata.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Assembler.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Bblock.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Bytecode.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/C.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/CC.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Concise.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Debug.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Deparse.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Disassembler.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Lint.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Showlex.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Stackobj.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Stash.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Terse.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Xref.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/ByteLoader.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Config.pod 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/av.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/cc_runtime.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/config.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/cop.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/cv.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/dosish.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/embed.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/embedvar.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/EXTERN.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/fakesdio.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/fakethr.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/form.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/gv.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/handy.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/hv.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/INTERN.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/intrpvar.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/iperlsys.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/keywords.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/malloc_ctl.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/mg.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/nostdio.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/op.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/opcode.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/opnames.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/pad.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/patchlevel.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perl.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perlapi.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perlio.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perliol.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perlsdio.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perlsfio.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perlvars.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perly.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/pp.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/pp_proto.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/proto.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/reentr.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/reentr.inc 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/regcomp.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/regexp.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/regnodes.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/scope.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/sv.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/thrdvar.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/thread.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/uconfig.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/unixish.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/utf8.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/utfebcdic.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/util.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/warnings.h 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/XSUB.h 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/Devel 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Devel/DProf.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Devel/Peek.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Devel/PPPort.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Alias.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Byte.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/CJKConstants.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/CN.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Config.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/EBCDIC.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Encoder.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Encoding.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Guess.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/JP.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/KR.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Symbol.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/TW.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Unicode.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/encoding.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/O.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Opcode.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/ops.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/POSIX.pod 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Safe.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/Unicode 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/Unicode/Normalize.pm 0444 root bin
+d none usr/perl5/5.8.4/lib/sun4-solaris-64int/XS 0755 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/XS/APItest.pm 0444 root bin
+f none usr/perl5/5.8.4/lib/sun4-solaris-64int/XS/Typemap.pm 0444 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWphx/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,35 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2001,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWphx
+#
+d none kernel/misc/s390x 755 root sys
+f none kernel/misc/s390x/phx 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpiclh/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpiclh
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpiclr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpiclr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpiclu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,393 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpiclu
+#
+d none usr/platform 755 root sys
+d none usr/platform/sun4u 755 root sys
+d none usr/platform/sun4u/lib 755 root bin
+f none usr/platform/sun4u/lib/libpsvcobj.so.1 755 root sys
+s none usr/platform/sun4u/lib/libpsvcobj.so=./libpsvcobj.so.1 755 root sys
+f none usr/platform/sun4u/lib/libpsvcpolicy.so.1 755 root sys
+s none usr/platform/sun4u/lib/libpsvcpolicy.so=./libpsvcpolicy.so.1 755 root sys
+d none usr/platform/sun4u/lib/picl 755 root sys
+d none usr/platform/sun4u/lib/picl/plugins 755 root sys
+f none usr/platform/sun4u/lib/picl/plugins/libpiclenvmon.so.1 755 root sys
+s none usr/platform/sun4u/lib/picl/plugins/libpiclenvmon.so=./libpiclenvmon.so.1
+d none usr/platform/sun4v 755 root sys
+d none usr/platform/sun4v/lib 755 root bin
+f none usr/platform/sun4v/lib/libpiclsnmp.so.1 755 root sys
+s none usr/platform/sun4v/lib/libpiclsnmp.so=./libpiclsnmp.so.1 755 root sys
+d none usr/platform/sun4v/lib/picl 755 root sys
+d none usr/platform/sun4v/lib/picl/plugins 755 root sys
+f none usr/platform/sun4v/lib/picl/plugins/libmdescplugin.so.1 755 root sys
+s none usr/platform/sun4v/lib/picl/plugins/libmdescplugin.so=./libmdescplugin.so.1
+f none usr/platform/sun4v/lib/picl/plugins/libpiclsbl.so.1 755 root sys
+s none usr/platform/sun4v/lib/picl/plugins/libpiclsbl.so=./libpiclsbl.so.1
+f none usr/platform/sun4v/lib/picl/plugins/libpriplugin.so.1 755 root sys
+s none usr/platform/sun4v/lib/picl/plugins/libpriplugin.so=./libpriplugin.so.1
+f none usr/platform/sun4v/lib/picl/plugins/libsnmpplugin.so.1 755 root sys
+s none usr/platform/sun4v/lib/picl/plugins/libsnmpplugin.so=./libsnmpplugin.so.1
+d none usr/platform/SUNW,Sun-Blade-100 755 root sys
+d none usr/platform/SUNW,Sun-Blade-100/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-100/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/libpiclenvd.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/libpiclenvd.so=./libpiclenvd.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/libpiclmemcfg.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/libpiclmemcfg.so=./libpiclmemcfg.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/envmodel.conf 644 root sys
+d none usr/platform/SUNW,Sun-Blade-1000 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1000/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-1000/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/libpiclenvd.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/libpiclenvd.so=./libpiclenvd.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/envmodel.conf 644 root sys
+d none usr/platform/SUNW,Sun-Blade-1500 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1500/lib 755 root bin
+s none usr/platform/SUNW,Sun-Blade-1500/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/platform/SUNW,Sun-Blade-1500/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/libpiclenvd.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/libpiclenvd.so=./libpiclenvd.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/envmodel.conf 644 root sys
+f none usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/piclfrutree.conf 644 root sys
+d none usr/platform/SUNW,Sun-Blade-2500 755 root sys
+d none usr/platform/SUNW,Sun-Blade-2500/lib 755 root bin
+s none usr/platform/SUNW,Sun-Blade-2500/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/platform/SUNW,Sun-Blade-2500/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/libpiclenvd.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/libpiclenvd.so=./libpiclenvd.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/envmodel.conf 644 root sys
+f none usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/piclfrutree.conf 644 root sys
+d none usr/platform/SUNW,A70 755 root sys
+d none usr/platform/SUNW,A70/lib 755 root bin
+s none usr/platform/SUNW,A70/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/platform/SUNW,A70/lib/picl 755 root sys
+d none usr/platform/SUNW,A70/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,A70/lib/picl/plugins/libpiclenvd.so.1 755 root sys
+s none usr/platform/SUNW,A70/lib/picl/plugins/libpiclenvd.so=./libpiclenvd.so.1 755 root sys
+f none usr/platform/SUNW,A70/lib/picl/plugins/envmodel.conf 644 root sys
+f none usr/platform/SUNW,A70/lib/picl/plugins/piclfrutree.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-V445 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V445/lib 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V445/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/platform/SUNW,Sun-Fire-V215 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V215/lib 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V215/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+f none usr/platform/SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1 644 root bin
+s none usr/platform/SUNW,Sun-Blade-1000/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+f none usr/platform/SUNW,Netra-T12/lib/libprtdiag_psr.so.1 644 root bin
+s none usr/platform/SUNW,Netra-T4/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/platform/SUNW,Netra-CP2300 755 root sys
+d none usr/platform/SUNW,Netra-CP2300/lib 755 root bin 
+f none usr/platform/SUNW,Netra-CP2300/lib/libctsmc.so.1 755 root sys
+s none usr/platform/SUNW,Netra-CP2300/lib/libctsmc.so=libctsmc.so.1 755 root sys
+f none usr/platform/SUNW,Netra-CP2300/lib/libprtdiag_psr.so.1 644 root bin
+d none usr/platform/SUNW,Sun-Fire-V240 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V240/lib 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V240/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/platform/SUNW,Sun-Fire-V250 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V250/lib 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V250/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/platform/SUNW,Sun-Fire-V440 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V440/lib 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V440/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/platform/SUNW,Sun-Fire-280R 755 root sys
+d none usr/platform/SUNW,Sun-Fire-280R/lib 755 root bin
+f none usr/platform/SUNW,Sun-Fire-280R/lib/libpsvcpolicy_psr.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-280R/lib/libpsvcpolicy_psr.so=./libpsvcpolicy_psr.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Fire-280R/lib/psvcobj.conf 444 root sys
+f none usr/platform/SUNW,Sun-Fire-280R/lib/platsvcd.conf 444 root sys
+d none usr/platform/SUNW,Sun-Fire-280R/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpiclfrutree.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpiclfrutree.so=./libpiclfrutree.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/picldevtree.conf 444 root sys
+f none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so=./libpsvcplugin.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin_psr.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin_psr.so=./libpsvcplugin_psr.so.1 755 root sys
+d none usr/platform/SUNW,Sun-Fire-880 755 root sys
+d none usr/platform/SUNW,Sun-Fire-880/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-880/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so=./libpiclfrutree.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/picldevtree.conf 444 root sys
+f none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so=./libpsvcpolicy_psr.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Fire-880/lib/psvcobj.conf 444 root sys
+f none usr/platform/SUNW,Sun-Fire-880/lib/platsvcd.conf 444 root sys
+s none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin.so.1=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
+s none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin.so=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
+f none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin_psr.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin_psr.so=./libpsvcplugin_psr.so.1 755 root sys
+d none usr/platform/SUNW,Sun-Fire-480R 755 root sys
+d none usr/platform/SUNW,Sun-Fire-480R/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-480R/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so=./libpiclfrutree.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/picldevtree.conf 444 root sys
+f none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so=./libpsvcpolicy_psr.so.1 755 root sys
+f none usr/platform/SUNW,Sun-Fire-480R/lib/psvcobj.conf 444 root sys
+f none usr/platform/SUNW,Sun-Fire-480R/lib/platsvcd.conf 444 root sys
+s none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin.so.1=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
+s none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin.so=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
+f none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin_psr.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin_psr.so=./libpsvcplugin_psr.so.1 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V890 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V890/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V890/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpiclfrutree.so.1=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so.1
+s none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpiclfrutree.so=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so
+f none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/picldevtree.conf 444 root sys
+s none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/piclfrutree.conf=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/piclfrutree.conf
+s none usr/platform/SUNW,Sun-Fire-V890/lib/libpsvcpolicy_psr.so.1=../../SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so.1
+s none usr/platform/SUNW,Sun-Fire-V890/lib/libpsvcpolicy_psr.so=../../SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so
+f none usr/platform/SUNW,Sun-Fire-V890/lib/psvcobj.conf 444 root sys
+f none usr/platform/SUNW,Sun-Fire-V890/lib/platsvcd.conf 444 root sys
+s none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpsvcplugin.so.1=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
+s none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpsvcplugin.so=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
+s none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpsvcplugin_psr.so.1=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin_psr.so.1
+s none usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpsvcplugin_psr.so=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin_psr.so
+d none usr/platform/SUNW,Sun-Fire-V490 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V490/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V490/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpiclfrutree.so.1=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so.1
+s none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpiclfrutree.so=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so
+f none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/picldevtree.conf 444 root sys
+s none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/piclfrutree.conf=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/piclfrutree.conf
+s none usr/platform/SUNW,Sun-Fire-V490/lib/libpsvcpolicy_psr.so.1=../../SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so.1
+s none usr/platform/SUNW,Sun-Fire-V490/lib/libpsvcpolicy_psr.so=../../SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so
+f none usr/platform/SUNW,Sun-Fire-V490/lib/psvcobj.conf 444 root sys
+f none usr/platform/SUNW,Sun-Fire-V490/lib/platsvcd.conf 444 root sys
+s none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpsvcplugin.so.1=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
+s none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpsvcplugin.so=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
+s none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpsvcplugin_psr.so.1=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin_psr.so.1
+s none usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpsvcplugin_psr.so=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin_psr.so
+d none usr/platform/SUNW,Serverblade1 755 root sys
+d none usr/platform/SUNW,Serverblade1/lib 755 root bin 
+d none usr/platform/SUNW,Serverblade1/lib/picl 755 root sys
+d none usr/platform/SUNW,Serverblade1/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Serverblade1/lib/picl/plugins/picldevtree.conf 644 root sys
+f none usr/platform/SUNW,Serverblade1/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Serverblade1/lib/picl/plugins/libpicllom.so.1 755 root sys
+s none usr/platform/SUNW,Serverblade1/lib/picl/plugins/libpicllom.so=libpicllom.so.1
+f none usr/platform/SUNW,Serverblade1/lib/picl/plugins/picllom.conf 644 root sys
+s none usr/platform/SUNW,Serverblade1/lib/picl/plugins/libpiclmemcfg.so.1=../../../../SUNW,Sun-Blade-100/lib/picl/plugins/libpiclmemcfg.so.1
+s none usr/platform/SUNW,Serverblade1/lib/picl/plugins/libpiclmemcfg.so=../../../../SUNW,Sun-Blade-100/lib/picl/plugins/libpiclmemcfg.so.1
+s none usr/platform/SUNW,Serverblade1/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/platform/SUNW,Netra-T4 755 root sys
+d none usr/platform/SUNW,Netra-T4/lib 755 root bin 
+d none usr/platform/SUNW,Netra-T4/lib/picl 755 root sys
+d none usr/platform/SUNW,Netra-T4/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Netra-T4/lib/picl/plugins/fcal_leds.conf 644 root sys
+f none usr/platform/SUNW,Netra-T4/lib/picl/plugins/libfcal_leds.so.1 755 root sys
+s none usr/platform/SUNW,Netra-T4/lib/picl/plugins/libfcal_leds.so=libfcal_leds.so.1
+f none usr/platform/SUNW,Netra-T4/lib/picl/plugins/picldevtree.conf 644 root sys
+f none usr/platform/SUNW,Netra-T4/lib/picl/plugins/piclfrutree.conf 644 root sys
+d none usr/platform/SUNW,Netra-T12 755 root sys
+d none usr/platform/SUNW,Netra-T12/lib 755 root bin 
+d none usr/platform/SUNW,Netra-T12/lib/picl 755 root sys
+d none usr/platform/SUNW,Netra-T12/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Netra-T12/lib/picl/plugins/libpiclfrutree.so.1 755 root sys
+s none usr/platform/SUNW,Netra-T12/lib/picl/plugins/libpiclfrutree.so=libpiclfrutree.so.1
+d none usr/platform/SUNW,Netra-CP2300/lib/picl 755 root sys
+d none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclenvmond.so.1 755 root sys
+s none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclenvmond.so=libpiclenvmond.so.1 755 root sys
+f none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclfrutree.so.1 755 root sys
+s none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclfrutree.so=libpiclfrutree.so.1 755 root sys
+f none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclwd.so.1 755 root sys
+s none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclwd.so=libpiclwd.so.1 755 root sys
+f none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/envmond.conf 644 root sys
+f none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/SUNW,Netra-CP2300.conf 644 root sys
+f none usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/SUNW,Netra-CP2300.RTM.conf 644 root sys
+d none usr/platform/SUNW,Netra-CP3010 755 root sys
+d none usr/platform/SUNW,Netra-CP3010/lib 755 root bin 
+d none usr/platform/SUNW,Netra-CP3010/lib/picl 755 root sys
+d none usr/platform/SUNW,Netra-CP3010/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Netra-CP3010/lib/picl/plugins/piclfrutree.conf 644 root sys
+d none usr/platform/SUNW,Sun-Fire-V240/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/picldevtree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/picl_asr.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/piclenvmon.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_SC.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_PS0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_PS1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_HDD0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_HDD1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_HDD2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_HDD3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_usb-a-1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_usb-a-2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1 755 root sys
+s none usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so=libpiclfrudr.so.1
+d none usr/platform/SUNW,Sun-Fire-V250/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/picldevtree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/picl_asr.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/piclenvmon.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_SC.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_PS0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_PS1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD4.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD5.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD6.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD7.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_usb-a-1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_usb-a-2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_usb-b-1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_usb-b-2.conf 644 root sys
+s none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/libpiclfrudr.so.1=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1 
+s none usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/libpiclfrudr.so=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so
+d none usr/platform/SUNW,Sun-Fire-V215/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/picldevtree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/picl_asr.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/piclenvmon.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_SC.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_PS0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_PS1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_HDD0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_HDD1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_HDD2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_HDD3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_usb-a-1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_usb-a-2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_usb-a-3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_usb-a-4.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT4.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT5.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT6.conf 644 root sys
+s none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/libpiclfrudr.so.1=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1 
+s none usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/libpiclfrudr.so=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so
+d none usr/platform/SUNW,Sun-Fire-V440/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/picldevtree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/piclenvmon.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_SC.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PS0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PS1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PSU0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PSU1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PSU2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PSU3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_HDD0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_HDD1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_HDD2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_HDD3.conf 644 root sys
+s none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/libpiclfrudr.so.1=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1
+s none usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/libpiclfrudr.so=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1
+d none usr/platform/SUNW,Sun-Fire-V445/lib/picl 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins 755 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/picldevtree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/picl_asr.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/piclfrutree.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/piclenvmon.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_SC.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_PS0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_PS1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_PS2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_PS3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD4.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD5.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD6.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD7.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_usb-a-1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_usb-a-2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_usb-a-3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_usb-a-4.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT0.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT1.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT2.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT3.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT4.conf 644 root sys
+f none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT5.conf 644 root sys
+s none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/libpiclfrudr.so.1=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1
+s none usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/libpiclfrudr.so=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so
+d none usr/platform/TAD,S390LE 755 root sys
+d none usr/platform/TAD,S390LE/lib 755 root bin
+s none usr/platform/TAD,S390LE/lib/libprtdiag_psr.so.1=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libpicl.so.1 755 root bin
+s none usr/lib/s390x/libpicl.so=./libpicl.so.1 755 root bin
+f none usr/lib/s390x/llib-lpicl.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpl5p/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWpl5p
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpl5u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,338 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are s390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWpl5u
+#
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/attrs.pm 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/attrs 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/attrs/attrs.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/attrs/attrs.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Data 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Data/Dumper 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Data/Dumper/Dumper.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Data/Dumper/Dumper.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/DynaLoader 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/DynaLoader/autosplit.ix 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/DynaLoader/dl_expandspec.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/DynaLoader/dl_find_symbol_anywhere.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/DynaLoader/dl_findfile.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/DynaLoader/DynaLoader.a 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/DynaLoader/extralibs.ld 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Fcntl 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Fcntl/Fcntl.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Fcntl/Fcntl.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/File 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/File/Glob 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/File/Glob/autosplit.ix 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/File/Glob/Glob.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/File/Glob/Glob.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/IO 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/IO/IO.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/IO/IO.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/IPC 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/IPC/SysV 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/IPC/SysV/SysV.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/IPC/SysV/SysV.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/NDBM_File 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/NDBM_File/NDBM_File.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/NDBM_File/NDBM_File.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/ODBM_File 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/ODBM_File/ODBM_File.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/ODBM_File/ODBM_File.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/abs.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/alarm.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/assert.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/atan2.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/atexit.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/atof.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/atoi.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/atol.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/autosplit.ix 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/bsearch.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/calloc.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/chdir.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/chmod.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/chown.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/clearerr.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/closedir.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/cos.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/creat.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/div.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/errno.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/execl.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/execle.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/execlp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/execv.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/execve.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/execvp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/exit.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/exp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fabs.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fclose.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fcntl.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fdopen.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/feof.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/ferror.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fflush.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fgetc.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fgetpos.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fgets.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fileno.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fopen.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fork.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fprintf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fputc.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fputs.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fread.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/free.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/freopen.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fscanf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fseek.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fsetpos.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fstat.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/ftell.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/fwrite.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getc.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getchar.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getcwd.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getegid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getenv.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/geteuid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getgid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getgrgid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getgrnam.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getgroups.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getlogin.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getpgrp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getpid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getppid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getpwnam.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getpwuid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/gets.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/getuid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/gmtime.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/isatty.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/kill.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/labs.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/ldiv.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/link.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/load_imports.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/localtime.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/log.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/longjmp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/malloc.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/memchr.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/memcmp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/memcpy.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/memmove.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/memset.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/mkdir.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/offsetof.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/opendir.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/perror.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/POSIX.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/POSIX.so 555 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/pow.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/printf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/putc.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/putchar.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/puts.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/qsort.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/raise.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/rand.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/readdir.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/realloc.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/remove.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/rename.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/rewind.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/rewinddir.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/rmdir.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/scanf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/setbuf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/setgid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/setjmp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/setuid.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/setvbuf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/siglongjmp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/sigsetjmp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/sin.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/sleep.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/sprintf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/sqrt.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/srand.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/sscanf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/stat.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strcat.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strchr.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strcmp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strcpy.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strcspn.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strerror.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strlen.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strncat.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strncmp.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strncpy.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strpbrk.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strrchr.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strspn.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strstr.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/strtok.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/system.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/time.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/tmpfile.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/tolower.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/toupper.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/umask.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/ungetc.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/unlink.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/utime.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/vfprintf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/vprintf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/vsprintf.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/wait.al 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/POSIX/waitpid.al 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/re 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/re/re.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/re/re.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/sdbm 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/sdbm/extralibs.ld 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/SDBM_File 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/SDBM_File/SDBM_File.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/SDBM_File/SDBM_File.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Socket 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Socket/Socket.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Socket/Socket.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Catalog 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.so 555 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/File 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/File/File.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/File/File.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Object 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Intrs 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Kstat 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Privilege 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Project 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Project/Project.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Project/Project.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Lgrp 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Task 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Task/Task.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Task/Task.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Ucred 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Utils 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Utils/Utils.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sun/Solaris/Utils/Utils.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sys 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sys/Hostname 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sys/Hostname/autosplit.ix 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sys/Hostname/Hostname.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sys/Hostname/Hostname.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sys/Syslog 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sys/Syslog/Syslog.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Sys/Syslog/Syslog.so 555 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Config.pm 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/libperl.so.1 555 root bin
+s none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/libperl.so=./libperl.so.1
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/Data 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Data/Dumper.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/DynaLoader.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Errno.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Fcntl.pm 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/File 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/File/Glob.pm 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO/Dir.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO/File.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO/Handle.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO/Pipe.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO/Poll.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO/Seekable.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO/Select.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IO/Socket.pm 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/IPC 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IPC/Msg.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IPC/Semaphore.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/IPC/SysV.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/NDBM_File.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/ODBM_File.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/POSIX.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/POSIX.pod 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/re.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/SDBM_File.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Socket.pm 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/Sys 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Sys/Hostname.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Sys/Syslog.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/XSLoader.pm 444 root bin
+d none usr/perl5/site_perl/5.6.1/sun4-solaris-64int 755 root bin
+d none usr/perl5/vendor_perl/5.6.1/sun4-solaris-64int 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpl5v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,145 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are s390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWpl5u
+#
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/.packlist 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/B 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/B/B.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/B/B.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/ByteLoader 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/ByteLoader/ByteLoader.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/ByteLoader/ByteLoader.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Devel 755 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Devel/DProf 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Devel/DProf/DProf.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Devel/DProf/DProf.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Devel/Peek 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Devel/Peek/Peek.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Devel/Peek/Peek.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Opcode 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Opcode/Opcode.bs 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/auto/Opcode/Opcode.so 555 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/B 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Asmdata.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Assembler.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Bblock.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Bytecode.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/C.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/CC.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Concise.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Debug.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Deparse.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Disassembler.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Lint.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Showlex.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Stackobj.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Stash.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Terse.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/B/Xref.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/ByteLoader.pm 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/av.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/cc_runtime.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/config.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/cop.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/cv.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/dosish.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/embed.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/embedvar.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/EXTERN.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/fakethr.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/form.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/gv.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/handy.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/hv.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/INTERN.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/intrpvar.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/iperlsys.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/keywords.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/mg.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/nostdio.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/objXSUB.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/op.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/opcode.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/opnames.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/patchlevel.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/perl.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/perlapi.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/perlio.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/perlsdio.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/perlsfio.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/perlvars.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/perly.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/pp.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/pp_proto.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/proto.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/regcomp.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/regexp.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/regnodes.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/scope.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/sv.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/thrdvar.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/thread.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/unixish.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/utf8.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/util.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/warnings.h 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/CORE/XSUB.h 444 root bin
+d none usr/perl5/5.6.1/lib/sun4-solaris-64int/Devel 755 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Devel/DProf.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Devel/Peek.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/O.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Opcode.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/ops.pm 444 root bin
+f none usr/perl5/5.6.1/lib/sun4-solaris-64int/Safe.pm 444 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpmr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1993 - 1996, by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpmr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpmu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1993-1996,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+d none usr/kernel/drv/s390x 755 root sys
+f none usr/kernel/drv/s390x/pm 755 root sys  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpolkit/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpolkit
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpool/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,59 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWpool
+#
+d none usr/kernel 755 root sys
+d none usr/kernel/drv 755 root sys
+d none usr/kernel/drv/s390x 755 root sys
+f none usr/kernel/drv/s390x/pool 755 root sys
+f none usr/kernel/drv/pool.conf 644 root sys
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libpool.so.1 755 root bin
+s none usr/lib/s390x/libpool.so=libpool.so.1
+f none usr/lib/s390x/llib-lpool.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpoold/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWpoold
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpoolr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWpoolr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpowertop/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpowertop
+#
+d none usr/bin/s390x 755 root bin
+f none usr/bin/s390x/powertop 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWppm/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1999 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWppm
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpppd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,40 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpppd
+#
+d none usr/kernel/drv/s390x 0755 root sys
+f none usr/kernel/drv/s390x/sppp 0755 root sys
+f none usr/kernel/drv/s390x/sppptun 0755 root sys
+d none usr/kernel/strmod/s390x 0755 root sys
+f none usr/kernel/strmod/s390x/spppasyn 0755 root sys
+f none usr/kernel/strmod/s390x/spppcomp 0755 root sys
+l none usr/kernel/strmod/s390x/sppptun=../../drv/s390x/sppptun
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpppdr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpppdr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpppdt/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000-2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpppdt
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpppdu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpppdu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpppg/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpppg
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpppgS/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpppgS
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpsdpr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 1999-2001,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are s390 specific here
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/pcata 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpsf/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpsf
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpsm-ipp/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpsm-ipp
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpsm-lpd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpapi
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpsr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpstl.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,117 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files 
+i pkginfo 
+i copyright 
+i depend 
+
+#
+#  List files which are s390v8plus specific here
+#
+d none usr 755 root sys
+d none usr/platform 755 root sys
+#
+# create other sun4u platform directories
+#
+d none usr/platform/SUNW,Ultra-2 755 root sys
+d none usr/platform/SUNW,Ultra-250 755 root sys
+d none usr/platform/SUNW,Ultra-4 755 root sys
+d none usr/platform/SUNW,Ultra-Enterprise 755 root sys
+d none usr/platform/SUNW,Ultra-Enterprise-10000 755 root sys
+d none usr/platform/SUNW,Sun-Blade-100 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1000 755 root sys
+d none usr/platform/SUNW,Sun-Blade-1500 755 root sys
+d none usr/platform/SUNW,Sun-Blade-2500 755 root sys
+d none usr/platform/SUNW,A70 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V445 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V215 755 root sys
+d none usr/platform/SUNW,Sun-Fire 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V240 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V250 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V440 755 root sys
+d none usr/platform/SUNW,Sun-Fire-280R 755 root sys
+d none usr/platform/SUNW,Sun-Fire-15000 755 root sys
+d none usr/platform/SUNW,Sun-Fire-880 755 root sys
+d none usr/platform/SUNW,Sun-Fire-480R 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V890 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V490 755 root sys
+d none usr/platform/SUNW,Serverblade1 755 root sys
+d none usr/platform/SUNW,Netra-T4 755 root sys
+d none usr/platform/SUNW,Netra-T12 755 root sys
+d none usr/platform/SUNW,UltraS390-IIi-Netract 755 root sys
+d none usr/platform/SUNW,UltraS390-IIe-NetraCT-40 755 root sys
+d none usr/platform/SUNW,UltraS390-IIe-NetraCT-60 755 root sys
+d none usr/platform/SUNW,Netra-CP2300 755 root sys
+d none usr/platform/SUNW,Netra-CP3010 755 root sys
+d none usr/platform/TAD,S390LE 755 root sys
+#
+# create other sun4u platform/lib directories
+#
+d none usr/platform/SUNW,Ultra-2/lib 755 root bin
+d none usr/platform/SUNW,Ultra-250/lib 755 root bin
+d none usr/platform/SUNW,Ultra-4/lib 755 root bin
+d none usr/platform/SUNW,Ultra-Enterprise/lib 755 root bin
+d none usr/platform/SUNW,Ultra-Enterprise-10000/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-100/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-1000/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-1500/lib 755 root bin
+d none usr/platform/SUNW,Sun-Blade-2500/lib 755 root bin
+d none usr/platform/SUNW,A70/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V445/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V215/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V240/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V250/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V440/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-280R/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-15000/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-880/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-480R/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V890/lib 755 root bin
+d none usr/platform/SUNW,Sun-Fire-V490/lib 755 root bin
+d none usr/platform/SUNW,Serverblade1/lib 755 root bin
+d none usr/platform/SUNW,Netra-T4/lib 755 root bin 
+d none usr/platform/SUNW,Netra-T12/lib 755 root bin 
+d none usr/platform/SUNW,UltraS390-IIi-Netract/lib 755 root bin
+d none usr/platform/SUNW,UltraS390-IIe-NetraCT-40/lib 755 root bin
+d none usr/platform/SUNW,UltraS390-IIe-NetraCT-60/lib 755 root bin
+d none usr/platform/SUNW,Netra-CP2300/lib 755 root bin
+d none usr/platform/SUNW,Netra-CP3010/lib 755 root bin
+d none usr/platform/TAD,S390LE/lib 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWpsu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWqfed/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,57 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWqfed
+#
+d none kernel 755 root sys
+d none kernel/drv 755 root sys
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/qfe 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWqos/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,58 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+d none kernel/ipp/s390x 755 root sys
+f none kernel/ipp/s390x/dlcosmk 755 root sys
+f none kernel/ipp/s390x/flowacct 755 root sys
+f none kernel/ipp/s390x/dscpmk 755 root sys
+f none kernel/ipp/s390x/tokenmt 755 root sys
+f none kernel/ipp/s390x/tswtclmt 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWqosu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrcapr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWrcapr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrcapu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWrcapu
+#
+d none usr/lib/rcap/s390v7 755 root bin
+f none usr/lib/rcap/s390v7/rcapd 555 root bin
+d none usr/lib/rcap/s390x 755 root bin
+f none usr/lib/rcap/s390x/rcapd 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrcmdc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWrcmdc
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrcmdr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWrcmdr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrcmds/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWrcmds
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrds/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/rds 0755 root sys
+f none kernel/drv/s390x/rdsib 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrge/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# Realtek Gigabit Ethernet driver
+d none kernel			0755	root	sys
+d none kernel/drv		0755	root	sys
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/rge	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrmvolmgr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWrmvolmgr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrmvolmgrr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWrmvolmgrr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrmwbr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrmwbu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2001,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+d none usr/sadm/lib/wbem/s390v7 0755 root sys
+f none usr/sadm/lib/wbem/s390v7/rds 0555 root bin
+d none usr/sadm/lib/wbem/s390x 0755 root sys
+f none usr/sadm/lib/wbem/s390x/rds 0555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWroute/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,30 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWroute
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWroutr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWroutr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrpcib/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWrpcib
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/rpcib 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrsg/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,57 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 1997, 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWrsg
+#
+d none usr/lib/s390x 0755 root bin
+f none usr/lib/s390x/rpcsec.so.1 0755 root bin
+s none usr/lib/s390x/rpcsec.so=rpcsec.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrsgk/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,57 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 1997, by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWrsgk
+#
+
+d none kernel/misc/s390x 755 root sys
+f none kernel/misc/s390x/rpcsec_gss 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrsm/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,45 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2000-2001,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# RSM (HPC/SC Prototype)
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+d none usr/lib/s390x 0755 root bin
+f none usr/lib/s390x/librsm.so.2 0755 root bin
+s none usr/lib/s390x/librsm.so=librsm.so.2
+d none usr/kernel/drv/s390x 0755 root sys
+f none usr/kernel/drv/s390x/rsm 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrsmo/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,42 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2000-2001,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# rsmops (HPC/SC Prototype)
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+d none kernel/misc/s390x 0755 root sys
+f none kernel/misc/s390x/rsmops 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWrtls/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# RTL fast NIC driver
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/rtls	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsacom/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# pkgdefs/SUNWsacom/prototype_s390
+#
+#              Solstice Enterprise Agents files for root file system
+#
+# This required package information file contains a list of package
+# contents. The 'pkgmk' command uses this file to identify the
+# contents of a package and their location on the development
+# machine when building the package. Can be created via a text
+# editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another prototype file
+#!default <mode> <owner> <group>	# default used if not specified
+#!<param>=<value>			# puts parameter in pkg environs
+#
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsasnm/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# pkgdefs/SUNWsasnm/prototype_s390
+#
+#              Solstice Enterprise Agents Simple Network Management
+#
+# This required package information file contains a list of package
+# contents. The 'pkgmk' command uses this file to identify the
+# contents of a package and their location on the development
+# machine when building the package. Can be created via a text
+# editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another prototype file
+#!default <mode> <owner> <group>	# default used if not specified
+#!<param>=<value>			# puts parameter in pkg environs
+#
+#
+!include prototype_com
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libssagent.so.1 755 root bin
+s none usr/lib/s390x/libssagent.so=./libssagent.so.1
+f none usr/lib/s390x/libssasnmp.so.1 755 root bin
+s none usr/lib/s390x/libssasnmp.so=./libssasnmp.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsbp2/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,47 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# SUNWsbp2
+#
+d none kernel/misc/s390x 755 root sys
+f none kernel/misc/s390x/sbp2 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsckm.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsckm.u
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsckmr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#		Copyright (c) 2000 by Sun Microsystems, Inc.
+#			   All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsckmr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsckmu.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 2000 by Sun Microsystems, Inc.
+#		All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsckmu.u
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWscmhdlr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,61 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWscmhdlr
+#
+#
+# SCM Card Terminal Serial Driver Files
+#
+d none usr/lib/smartcard 0755 root bin
+f none usr/lib/smartcard/ifdh_scmi2c.so.1 0755 root bin
+s none usr/lib/smartcard/ifdh_scmi2c.so=ifdh_scmi2c.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWscplp/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWscplp
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWscpr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWscpr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWscpu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,78 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWscpu
+#
+d none usr/ucb/s390v7 755 root bin
+f none usr/ucb/s390v7/ps 0555 root sys
+d none usr/ucb/s390x 755 root bin
+f none usr/ucb/s390x/ps 0555 root sys
+d none usr/ucblib/s390x 755 root bin
+s none usr/ucblib/64=s390x
+s none usr/ucblib/s390x/libcurses.so=./libcurses.so.1
+f none usr/ucblib/s390x/libcurses.so.1 755 root bin
+s none usr/ucblib/s390x/libdbm.so=./libdbm.so.1
+f none usr/ucblib/s390x/libdbm.so.1 755 root bin
+s none usr/ucblib/s390x/librpcsoc.so=./librpcsoc.so.1
+f none usr/ucblib/s390x/librpcsoc.so.1 755 root bin
+s none usr/ucblib/s390x/libtermcap.so=./libtermcap.so.1
+f none usr/ucblib/s390x/libtermcap.so.1 755 root bin
+s none usr/ucblib/s390x/libucb.so=./libucb.so.1
+f none usr/ucblib/s390x/libucb.so.1 755 root bin
+f none usr/ucblib/s390x/llib-lcurses 644 root bin
+f none usr/ucblib/s390x/llib-lcurses.ln 644 root bin
+f none usr/ucblib/s390x/llib-ldbm 644 root bin
+f none usr/ucblib/s390x/llib-ldbm.ln 644 root bin
+f none usr/ucblib/s390x/llib-lrpcsoc.ln 644 root bin
+f none usr/ucblib/s390x/llib-ltermcap 644 root bin
+f none usr/ucblib/s390x/llib-ltermcap.ln 644 root bin
+f none usr/ucblib/s390x/llib-lucb 644 root bin
+f none usr/ucblib/s390x/llib-lucb.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWscsa1394/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,47 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# SUNWscsa1394
+#
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/scsa1394 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWscsip/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+!include prototype_com
+
+d none usr/lib/scsi/plugins/ses/vendor/s390x 755 root bin
+f none usr/lib/scsi/plugins/ses/vendor/s390x/LSILOGIC-SASX28-A.0.so 755 root bin
+s none usr/lib/scsi/plugins/ses/vendor/s390x/SUN-Storage-J4200.so=SUN-Storage-J4400.so
+f none usr/lib/scsi/plugins/ses/vendor/s390x/SUN-Storage-J4400.so 755 root bin
+f none usr/lib/scsi/plugins/ses/vendor/s390x/SUN-Storage-J4500.so 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsdcard/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# SDcard drivers
+d none kernel/drv/s390x		0755	root	sys
+f none kernel/drv/s390x/sdcard	0755	root	sys
+f none kernel/drv/s390x/sdhost	0755	root	sys
+d none kernel/misc/s390x		0755	root	sys
+f none kernel/misc/s390x/sda		0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWses/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,58 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1990-1997,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWses
+#
+d none kernel 755 root sys
+d none kernel/drv 755 root sys
+f none kernel/drv/ses.conf 0644 root sys
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/ses 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsfdr.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,60 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsfdrd.u
+#
+d none usr 755 root sys
+d none usr/platform 755 root sys
+d none usr/platform/SUNW,Sun-Fire-880 755 root sys
+d none usr/platform/SUNW,Sun-Fire-880/lib 755 root bin
+f none usr/platform/SUNW,Sun-Fire-880/lib/sf880drd 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V890 755 root sys
+d none usr/platform/SUNW,Sun-Fire-V890/lib 755 root bin
+s none usr/platform/SUNW,Sun-Fire-V890/lib/sf880drd=../../SUNW,Sun-Fire-880/lib/sf880drd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsfdrr.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,61 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsfdrr.u
+#
+d none lib 755 root bin
+d none lib/svc 755 root bin
+d none lib/svc/method 755 root bin
+f none lib/svc/method/sf880dr 555 root bin
+d none var 755 root sys
+d none var/svc 755 root sys
+d none var/svc/manifest 755 root sys
+d none var/svc/manifest/platform 755 root sys
+d none var/svc/manifest/platform/sun4u 755 root sys
+f manifest var/svc/manifest/platform/sun4u/sf880drd.xml 0444 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsfe/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# SiS900 Fast Ethernet driver
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/sfe	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWslpr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 1999, by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWslpr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWslpu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,58 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 1999,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWslpu
+#
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libslp.so.1 755 root bin
+s none usr/lib/s390x/libslp.so=libslp.so.1
+f none usr/lib/s390x/llib-lslp.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmapi/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsmapi
+#
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libdiskmgt.so.1 755 root bin
+s none usr/lib/s390x/libdiskmgt.so=./libdiskmgt.so.1
+f none usr/lib/s390x/llib-ldiskmgt.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbfskr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsmbfskr
+#
+d none kernel/kmdb/s390x 755 root sys
+f none kernel/kmdb/s390x/nsmb 555 root sys
+f none kernel/kmdb/s390x/smbfs 555 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbfsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsmbfsr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbfsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,68 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsmbfsu
+#
+
+d none usr/kernel/fs/s390x 755 root sys
+f none usr/kernel/fs/s390x/smbfs 755 root sys
+d none usr/kernel/sys/s390x 755 root sys
+l none usr/kernel/sys/s390x/smbfs=../../../kernel/fs/s390x/smbfs
+d none usr/kernel/drv/s390x 755 root sys
+f none usr/kernel/drv/s390x/nsmb 755 root sys
+
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libsmbfs.so.1 755 root bin
+d none usr/lib/fs/smbfs/s390x 755 root sys
+f none usr/lib/fs/smbfs/s390x/libshare_smbfs.so.1 755 root bin
+d none usr/lib/mdb/kvm/s390x 755 root sys
+f none usr/lib/mdb/kvm/s390x/nsmb.so 555 root bin
+f none usr/lib/mdb/kvm/s390x/smbfs.so 555 root bin
+d none usr/lib/security/s390x 755 root bin
+f none usr/lib/security/s390x/pam_smbfs_login.so.1 755 root bin
+s none usr/lib/security/s390x/pam_smbfs_login.so=pam_smbfs_login.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbskr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+!include prototype_com
+#
+# SUNWsmbskr
+#
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/smbsrv 755 root sys
+d none kernel/kmdb/s390x 755 root sys
+f none kernel/kmdb/s390x/smbsrv 555 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+#
+!include prototype_com
+#
+# List files which are s390 specific here
+# SUNWsmbsr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+!include prototype_com
+d none usr/lib/mdb/kvm/s390x 755 root sys
+f none usr/lib/mdb/kvm/s390x/smbsrv.so 555 root sys
+d none usr/lib/fs/smb/s390x 755 root sys
+f none usr/lib/fs/smb/s390x/libshare_smb.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmedia/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,62 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsmedia
+#
+d none usr/lib/s390x 755 root bin
+s none usr/lib/s390x/libsmedia.so=./libsmedia.so.1
+f none usr/lib/s390x/libsmedia.so.1 755 root bin
+f none usr/lib/s390x/llib-lsmedia.ln 644 root bin
+d none usr/lib/smedia/s390x 755 root bin
+f none usr/lib/smedia/s390x/sm_scsi.so.1 555 root bin
+f none usr/lib/smedia/s390x/sm_pcmem.so.1 555 root bin
+f none usr/lib/smedia/s390x/sm_fd.so.1 555 root bin
+f none usr/lib/smedia/s390x/sm_pcata.so.1 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmediar/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsmediar
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmpd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# Serial SCSI Management Protocol (SMP) Driver
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/smp 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsn1rint/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Fake Solaris N-1 Brand
+#
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+
+# the kernel brand module
+d none platform 0755 root sys
+d none platform/sun4u 0755 root sys
+d none platform/sun4u/kernel 0755 root sys
+d none platform/sun4u/kernel/brand 0755 root sys
+d none platform/sun4u/kernel/brand/s390x 0755 root sys
+f none platform/sun4u/kernel/brand/s390x/sn1_brand 0755 root sys
+d none platform/sun4v 0755 root sys
+d none platform/sun4v/kernel 0755 root sys
+d none platform/sun4v/kernel/brand 0755 root sys
+d none platform/sun4v/kernel/brand/s390x 0755 root sys
+f none platform/sun4v/kernel/brand/s390x/sn1_brand 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsn1uint/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Fake Solaris N-1 Brand
+#
+
+!include prototype_com
+
+# The user library
+f none usr/lib/sn1_brand.so.1 0755 root bin
+d none usr/lib/s390x 0755 root bin
+f none usr/lib/s390x/sn1_brand.so.1 0755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsndmr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1990-1998 Sun Microsystems, Inc.
+# All Rights Reserved
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsndml
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsndmu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1990-1998 Sun Microsystems, Inc.
+# All Rights Reserved
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWsndmu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWspnego/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+
+#
+#  List files which are specific here
+#
+# source locations relative to the prototype file
+#
+d none usr/lib/s390x 755 root bin
+d none usr/lib/s390x/gss 755 root bin
+f none usr/lib/s390x/gss/mech_spnego.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsra/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsra
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsrh/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsrh
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWssad/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,58 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWssadv
+#
+d none kernel 755 root sys
+d none kernel/drv 755 root sys
+d none kernel/drv/s390x 755 root sys
+e ssdconf kernel/drv/ssd.conf 644 root sys
+f none kernel/drv/s390x/ssd 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsshcu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsshcu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsshdr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsshdr
+#
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsshdu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsshdu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsshr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsshr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsshu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsshu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWstatl/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWstatl
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWstc.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,63 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1999-2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWstc
+#
+# I2C Smart Card Device Driver header files
+# scmi2c.h file is installed from SUNWhea package
+#
+# I2C Smartcard Device Driver Files
+#
+d none platform 0755 root sys
+d none platform/sun4u 0755 root sys
+d none platform/sun4u/kernel 0755 root sys
+d none platform/sun4u/kernel/drv 0755 root sys
+d none platform/sun4u/kernel/drv/s390x 0755 root sys
+f none platform/sun4u/kernel/drv/s390x/scmi2c 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsvvs/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,43 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 1990-1993,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsvvs
+#
+d none usr/kernel/drv/s390x 755 root sys  
+f none usr/kernel/drv/s390x/lo 755 root sys  
+f none usr/kernel/drv/s390x/tidg 755 root sys  
+f none usr/kernel/drv/s390x/tivc 755 root sys  
+f none usr/kernel/drv/s390x/tmux 755 root sys  
+d none usr/kernel/strmod/s390x 755 root sys
+f none usr/kernel/strmod/s390x/lmodb 755 root sys  
+f none usr/kernel/strmod/s390x/lmode 755 root sys  
+f none usr/kernel/strmod/s390x/lmodr 755 root sys  
+f none usr/kernel/strmod/s390x/lmodt 755 root sys  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtavor/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,31 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWtavor
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/tavor 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtcpd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,34 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWtcpd
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtcpdS/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,34 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright (c) 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWtcpdS
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtecla/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,36 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWtecla
+#
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libtecla.so.1 755 root bin
+s none usr/lib/s390x/libtecla.so=libtecla.so.1
+f none usr/lib/s390x/llib-ltecla.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWter/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWter
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtftp/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWtftp
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtftpr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWtftpr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtnetc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWtnetc
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtnetd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWtnetd
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtnetr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 2000 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWtnetr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtnfc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWtnfc
+#
+d none usr/bin/s390v7 755 root bin
+f none usr/bin/s390v7/prex 555 root bin
+d none usr/bin/s390x 755 root bin
+f none usr/bin/s390x/tnfxtract 555 root bin
+f none usr/bin/s390x/prex 555 root bin
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libtnfctl.so.1 755 root bin
+s none usr/lib/s390x/libtnfctl.so=libtnfctl.so.1
+f none usr/lib/s390x/libtnfprobe.so.1 755 root bin
+s none usr/lib/s390x/libtnfprobe.so=libtnfprobe.so.1
+d none usr/kernel/drv/s390x 755 root sys
+f none usr/kernel/drv/s390x/tnf 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtnfd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#	ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWtnfd
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtoo/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,80 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWtoo
+#
+d none usr/bin/s390v7 755 root bin
+f none usr/bin/s390v7/gcore 555 root bin
+f none usr/bin/s390v7/strings 555 root bin
+f none usr/bin/s390v7/truss 555 root bin
+d none usr/bin/s390x 755 root bin
+f none usr/bin/s390x/elfwrap 555 root bin
+f none usr/bin/s390x/gcore 555 root bin
+f none usr/bin/s390x/ld 755 root bin
+f none usr/bin/s390x/ldd 555 root bin
+f none usr/bin/s390x/plimit 555 root bin
+f none usr/bin/s390x/pvs 555 root bin
+f none usr/bin/s390x/strings 555 root bin
+f none usr/bin/s390x/truss 555 root bin
+d none usr/ccs/bin/s390x 755 root bin
+s none usr/ccs/bin/s390x/ld=../../../bin/s390x/ld
+d none usr/lib/ld/s390x 755 root bin
+f none usr/lib/ld/s390x/map.above4G 444 root bin
+f none usr/lib/ld/s390x/map.below4G 444 root bin
+s none usr/lib/ld/s390x/map.default=./map.above4G
+d none usr/lib/link_audit/s390x 755 root bin
+s none usr/lib/link_audit/64=s390x
+f none usr/lib/link_audit/s390x/ldprof.so.1 755 root bin
+f none usr/lib/link_audit/s390x/truss.so.1 755 root bin
+f none usr/lib/link_audit/s390x/who.so.1 755 root bin
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libldstab.so.1 755 root bin
+f none usr/lib/s390x/lddstub 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtsg/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWtsg
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWtsr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWtsu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWuacm/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWuacm
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/usbsacm 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWucbt/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,44 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+!include prototype_com
+#
+# Include ISA independent files (prototype_com)
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWudaplr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,40 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Sun uDAPL
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWudapltr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,24 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Sun uDAPL
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# the kernel driver
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/daplt 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWudapltu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,24 @@
+#
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Sun uDAPL for Tavor
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# the library and adb macros for kernel driver
+#
+d none usr/lib/s390x 0755 root bin
+f none usr/lib/s390x/udapl_tavor.so.1 0755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWudaplu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,44 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Sun uDAPL
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+d none usr/lib/s390x 0755 root bin
+f none usr/lib/s390x/libdat.so.1 0755 root bin
+s none usr/lib/s390x/libdat.so=libdat.so.1
+f none usr/lib/s390x/llib-ldat.ln 0644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWudf/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright (c) 1999 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWudf
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWudfr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 1999,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWudfr
+#
+d none kernel/fs/s390x 755 root sys
+f none kernel/fs/s390x/udfs 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWuedg/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWuedg
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/usbser_edge 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWugen/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWugen
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/ugen 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWugenu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWuksp/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWuksp
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/usbsksp 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWukspfw/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWukspfw
+d none kernel/misc/s390x 0755 root sys
+v preserve kernel/misc/s390x/usbs49_fw 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWuprl/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWuprl
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/usbsprl 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWus.u/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,61 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1999-2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWus.u
+#
+d none platform 755 root sys
+d none platform/sun4u 755 root sys
+d none platform/sun4u/kernel 755 root sys
+d none platform/sun4u/kernel/drv 755 root sys
+d none platform/sun4u/kernel/drv/s390x 755 root sys
+f none platform/sun4u/kernel/drv/s390x/us 755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWusat10.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# Include ISA independent files (prototype_com)
+!include prototype_com
+
+# List files which are S390 specific here
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWusb/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,76 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWusb
+#
+d none kernel/dacf/s390x 0755 root sys
+f none kernel/dacf/s390x/usb_ac_dacf 0755 root sys
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/ohci 0755 root sys
+f none kernel/drv/s390x/ehci 0755 root sys
+f none kernel/drv/s390x/uhci 0755 root sys
+f none kernel/drv/s390x/hubd 0755 root sys
+f none kernel/drv/s390x/hid 0755 root sys
+f none kernel/drv/s390x/usb_mid 0755 root sys
+f none kernel/drv/s390x/usb_ia 0755 root sys
+f none kernel/drv/s390x/scsa2usb 0755 root sys
+f none kernel/drv/s390x/usbprn 0755 root sys
+f none kernel/drv/s390x/usb_ac 0755 root sys
+f none kernel/drv/s390x/usb_as 0755 root sys
+d none kernel/misc/s390x 0755 root sys
+f none kernel/misc/s390x/usba 0755 root sys
+f none kernel/misc/s390x/usba10 0755 root sys
+f none kernel/misc/s390x/hidparser 0755 root sys
+d none kernel/strmod/s390x 0755 root sys
+f none kernel/strmod/s390x/usbkbm 0755 root sys
+f none kernel/strmod/s390x/usbms 0755 root sys
+f none kernel/strmod/s390x/usb_ah 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWusbs/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWusbs
+d none kernel/misc/s390x 0755 root sys
+f none kernel/misc/s390x/usbser 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWusbu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1998 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWusbvc/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWusbvc
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/usbvc 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWust1.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,52 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWust1.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWust2.v/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWust2.v
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWvscankr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+!include prototype_com
+#
+# SUNWvscankr
+#
+d none kernel/drv/s390x 0755 root sys
+f none kernel/drv/s390x/vscan 0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWvscanr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWvscanu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWwbint/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWwbsd/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+
+# Winbond SD driver
+d none kernel/drv/s390x		0755	root	sys
+f none kernel/drv/s390x/wbsd		0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWwbsup/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWwlanr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWwlanu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWwpar/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWwpar
+#
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWwpau/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWwpau
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWxcu4/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright (c) 1995-2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWxcu4
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWxcu6/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,54 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWxcu6
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWxge/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>        # where to find pkg objects
+#!include <filename>                    # include another 'prototype' file
+#!default <mode> <owner> <group>        # default used if not specified on entry
+#!<param>=<value>                       # puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+i pkginfo
+i copyright
+i depend
+i postinstall
+i postremove
+
+# Xframe 10G NIC driver
+d none kernel			0755	root	sys
+d none kernel/drv		0755	root	sys
+d none kernel/drv/s390x	0755	root	sys
+f none kernel/drv/s390x/xge	0755	root	sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWxwdv/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 1990-1993,2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWxwdv
+#
+d none usr/kernel/drv/s390x 755 root sys  
+f none usr/kernel/drv/s390x/winlock 755 root sys  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWypr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWypr
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWypu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,53 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#	Copyright (c) 1990-93 Sun Microsystems, Inc.
+#		All Rights Reserved
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWypu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWzfskr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+!include prototype_com
+
+#
+# SUNWzfskr
+#
+d none kernel/drv/s390x 755 root sys
+f none kernel/drv/s390x/zfs 755 root sys
+d none kernel/fs/s390x 755 root sys
+l none kernel/fs/s390x/zfs=../../../kernel/drv/s390x/zfs
+d none kernel/kmdb/s390x 755 root sys
+f none kernel/kmdb/s390x/zfs 555 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWzfsr/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,40 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+!include prototype_com
+
+#
+# SUNWzfsr
+#
+d none lib/s390x 755 root bin
+s none lib/s390x/libzfs.so=libzfs.so.1
+f none lib/s390x/libzfs.so.1 755 root bin
+f none lib/s390x/llib-lzfs.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWzfsu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,50 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+!include prototype_com
+
+#
+# SUNWzfsu
+#
+d none usr/lib/mdb/kvm/s390x 755 root sys
+f none usr/lib/mdb/kvm/s390x/zfs.so 555 root sys
+d none usr/lib/mdb/proc/s390x 755 root sys
+f none usr/lib/mdb/proc/s390x/libzpool.so 555 root sys
+d none usr/lib/s390x 755 root bin
+s none usr/lib/s390x/libzfs.so.1=../../../lib/s390x/libzfs.so.1
+s none usr/lib/s390x/libzfs.so=../../../lib/s390x/libzfs.so.1
+f none usr/lib/s390x/libzfs_jni.so.1 755 root bin
+s none usr/lib/s390x/libzfs_jni.so=libzfs_jni.so.1
+f none usr/lib/s390x/libzpool.so.1 755 root bin
+s none usr/lib/s390x/libzpool.so=libzpool.so.1
+s none usr/lib/s390x/llib-lzfs.ln=../../../lib/s390x/llib-lzfs.ln
+d none usr/sbin/s390x 755 root bin
+f none usr/sbin/s390x/zdb 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWzoneint/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWzoneint
+#
+d none usr/lib/s390x 755 root bin
+s none usr/lib/s390x/libbrand.so=./libbrand.so.1
+f none usr/lib/s390x/llib-lbrand.ln 644 root bin
+s none usr/lib/s390x/libzonecfg.so=./libzonecfg.so.1
+f none usr/lib/s390x/llib-lzonecfg.ln 644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWzoner/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,51 @@
+#
+# 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
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWzoner
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWzoneu/prototype_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are S390 specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWzoneu
+#
+d none usr/kernel/drv/s390x 755 root sys
+f none usr/kernel/drv/s390x/zcons 755 root sys
+d none usr/lib/s390x 755 root bin
+f none usr/lib/s390x/libbrand.so.1 755 root bin
+f none usr/lib/s390x/libzonecfg.so.1 755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/common_files/i.devlinktab_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,146 @@
+#!/bin/sh
+#
+# 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
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+PATH="/usr/bin:/usr/sbin:${PATH}"
+export PATH
+
+while read src dest
+do
+	if [ ! -f $dest ] ; then
+		cp $src $dest
+	else
+		sed -e '/^type=ddi_pseudo;name=app	/d' \
+		    -e '/^type=ddi_pseudo;name=sw	/d' \
+		    -e '/^type=ddi_pseudo;name=consfb;minor=consfb	/d' \
+		    -e '/^type=ddi_pseudo;name=win	/d' \
+		    -e '/^type=ddi_pseudo;name=winlock	/d' \
+		    -e '/^type=ddi_pseudo;name=mm	/d' \
+		    -e '/^type=ddi_pseudo;name=conskbd	/d' \
+		    -e '/^type=ddi_pseudo;name=consms	/d' \
+		    -e '/^type=ddi_pseudo;name=wc	/d' \
+		    -e '/^type=ddi_pseudo;name=dump	/d' \
+		    -e '/^type=ddi_pseudo;name=cn	/d' \
+		    -e '/^type=ddi_pseudo;name=lo	/d' \
+		    -e '/^type=ddi_pseudo;name=ptm	/d' \
+		    -e '/^type=ddi_pseudo;name=ptc	/d' \
+		    -e '/^type=ddi_pseudo;name=pts	/d' \
+		    -e '/^type=ddi_pseudo;name=ptsl	/d' \
+		    -e '/^type=ddi_pseudo;name=log	/d' \
+		    -e '/^type=ddi_pseudo;name=sad	/d' \
+		    -e '/^type=ddi_pseudo;name=sy	/d' \
+		    -e '/^type=ddi_pseudo;name=clone	/d' \
+		    -e '/^type=ddi_network	/d' \
+		    -e '/^type=ddi_pseudo;name=openeepr	/d' \
+		    -e '/^type=ddi_pseudo;name=lockstat	/d' \
+		    -e '/^type=ddi_pseudo;name=kstat	/d' \
+		    -e '/^type=ddi_pseudo;name=ksyms	/d' \
+		    -e '/^type=ddi_display	/d' \
+		    -e '/^type=ddi_pseudo;name=clone;minor=icmp	/d' \
+		    -e '/^type=ddi_pseudo;name=SUNW,bpp	/d' \
+		    -e '/^type=ddi_pseudo;name=eeprom	/d' \
+		    -e '/^type=ddi_pseudo;name=clone;minor=ipdcm	/d' \
+		    -e '/^type=ddi_pseudo;name=vol	/d' \
+		    -e '/^type=ddi_pseudo;name=profile	/d' \
+		    -e '/^type=ddi_parallel;name=mcpp	/d' \
+		    -e '/^type=ddi_pseudo;name=zsh	/d' \
+		    -e '/^type=ddi_pseudo;name=clone;minor=zsh	/d' \
+		    -e '/^type=ddi_pseudo;name=SUNW,sx	/d' \
+		    -e '/^type=ddi_pseudo;name=sx_cmem	/d' \
+		    -e '/^type=ddi_parallel;name=SUNW,spif;minor=stclp	/d' \
+		    -e '/^type=ddi_pseudo;name=SUNW,spif;minor=stc	/d' \
+		    -e '/^type=ddi_pseudo;name=tl;minor=ticots	/d' \
+		    -e '/^type=ddi_pseudo;name=tl;minor=ticotsord	/d' \
+		    -e '/^type=ddi_pseudo;name=tl;minor=ticlts	/d' \
+		    -e '/^type=ddi_pseudo;name=md;minor=admin	/d' \
+		    -e '/^type=ddi_pseudo;name=md;minor2=blk	/d' \
+		    -e '/^type=ddi_pseudo;name=md;minor2=raw	/d' \
+		    -e '/^type=ddi_pseudo;name=tnf	/d' \
+		    -e '/^type=ddi_pseudo;name=pm	/d' \
+		    -e '/^type=ddi_pseudo;name=winlock	/d' \
+		    -e '/^type=ddi_pseudo;name=mm	/d' \
+		    -e '/^type=ddi_pseudo;name=conskbd	/d' \
+		    -e '/^type=ddi_pseudo;name=consms	/d' \
+		    -e '/^type=ddi_pseudo;name=wc	/d' \
+		    -e '/^type=ddi_pseudo;name=dump	/d' \
+		    -e '/^type=ddi_pseudo;name=cn	/d' \
+		    -e '/^type=ddi_pseudo;name=lo	/d' \
+		    -e '/^type=ddi_pseudo;name=ptm	/d' \
+		    -e '/^type=ddi_pseudo;name=ptc	/d' \
+		    -e '/^type=ddi_pseudo;name=pts	/d' \
+		    -e '/^type=ddi_pseudo;name=ptsl	/d' \
+		    -e '/^type=ddi_pseudo;name=log	/d' \
+		    -e '/^type=ddi_pseudo;name=sad	/d' \
+		    -e '/^type=ddi_pseudo;name=sy	/d' \
+		    -e '/^type=ddi_pseudo;name=clone	/d' \
+		    -e '/^type=ddi_network	/d' \
+		    -e '/^type=ddi_pseudo;name=openeepr	/d' \
+		    -e '/^type=ddi_pseudo;name=lockstat	/d' \
+		    -e '/^type=ddi_pseudo;name=kstat	/d' \
+		    -e '/^type=ddi_pseudo;name=ksyms	/d' \
+		    -e '/^type=ddi_display	/d' \
+		    -e '/^type=ddi_pseudo;name=clone;minor=icmp	/d' \
+		    -e '/^type=ddi_pseudo;name=SUNW,bpp	/d' \
+		    -e '/^type=ddi_pseudo;name=eeprom	/d' \
+		    -e '/^type=ddi_pseudo;name=clone;minor=ipdcm	/d' \
+		    -e '/^type=ddi_pseudo;name=vol	/d' \
+		    -e '/^type=ddi_pseudo;name=profile	/d' \
+		    -e '/^type=ddi_parallel;name=mcpp	/d' \
+		    -e '/^type=ddi_pseudo;name=zsh	/d' \
+		    -e '/^type=ddi_pseudo;name=clone;minor=zsh	/d' \
+		    -e '/^type=ddi_pseudo;name=SUNW,sx	/d' \
+		    -e '/^type=ddi_pseudo;name=sx_cmem	/d' \
+		    -e '/^type=ddi_parallel;name=SUNW,spif;minor=stclp	/d' \
+		    -e '/^type=ddi_pseudo;name=SUNW,spif;minor=stc	/d' \
+		    -e '/^type=ddi_pseudo;name=tl;minor=ticots	/d' \
+		    -e '/^type=ddi_pseudo;name=tl;minor=ticotsord	/d' \
+		    -e '/^type=ddi_pseudo;name=tl;minor=ticlts	/d' \
+		    -e '/^type=ddi_pseudo;name=md;minor=admin	/d' \
+		    -e '/^type=ddi_pseudo;name=md;minor2=blk	/d' \
+		    -e '/^type=ddi_pseudo;name=md;minor2=raw	/d' \
+		    -e '/^type=ddi_pseudo;name=tnf	/d' \
+		    -e '/^type=ddi_pseudo;name=pm	/d' \
+		    -e '/^type=ddi_block:diskette;minor=c	/d' \
+		    -e '/^type=ddi_block:diskette;minor=c,raw	/d' \
+		    -e '/^type=ddi_block:diskette;minor=c	/d' \
+		    -e '/^type=ddi_block:diskette;minor=c,raw	/d' \
+		    -e '/^type=ddi_pseudo;name=tod	/d' \
+		    -e '/^type=ddi_other;name=SUNW,pmc	/d' \
+		    -e '/^type=ddi_other;name=SUNW,mic	/d' \
+		    -e '/^type=ddi_pseudo;name=SUNW,envctrl	/d' \
+		    -e '/^type=ddi_other;name=power	/d' \
+		    -e '/^type=ddi_pseudo;name=SUNW,envctrltwo	/d' \
+		    -e '/^type=ddi_nexus;minor=initpcmcia	/d' \
+		    -e '/^type=ddi_pseudo;name=ecpp	/d' \
+		    -e '/^type=ddi_pseudo;name=se	/d' \
+		    -e 's,sys/obpdefs.h,<sys/sunddi.h>,' $dest > /tmp/d.$$
+		cp /tmp/d.$$ $dest
+		rm -f /tmp/d.$$
+	fi
+done
+
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/common_files/i.kclasses_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,107 @@
+#!/bin/sh
+#
+# 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
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+PATH="/usr/bin:/usr/sbin:${PATH}"
+export PATH
+
+obsolete()
+{
+	nawk 'BEGIN {
+		obs["xbox"] = 1;
+		obs["sbi"] = 1;
+	} !($1 in obs) {print $0}'
+}
+while read src dest
+do
+	if [ ! -f $dest ] ; then
+		cp $src $dest
+	else
+		obsolete < $dest > /tmp/odc.$$.tmp
+		cp /tmp/odc.$$.tmp $dest
+		rm -f /dev/odc.$$.tmp
+
+		sed -e '/^\"QLGC,isp\"[	]*scsi$/d' \
+		    -e '/^\"SUNW,isp\"[	]*scsi$/d' \
+		    -e '/^ncr[	]*scsi$/d' \
+		    -e '/^vme[ 	]*vme$/d' \
+		    -e '/^pci[ 	]*pci$/d' \
+		    $dest > /tmp/rest.$$ 2>/dev/null
+		cp /tmp/rest.$$ $dest
+		grep '^isp	scsi' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'isp	scsi' >> $dest
+		fi
+		grep '^pcipsy[ 	].*pci' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'pcipsy	pci' >> $dest
+		fi
+		grep '^pcisch[ 	].*pci' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'pcisch	pci' >> $dest
+		fi
+		grep '^pci_pci[ 	].*pci' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'pci_pci	pci' >> $dest
+		fi
+		grep '^fas[ 	].*scsi' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'fas	scsi' >> $dest
+		fi
+		grep '^ebus	ebus' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'ebus	ebus' >> $dest
+		fi
+		grep '^glm	scsi' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'glm	scsi' >> $dest
+		fi
+		grep '^uata	dada' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'uata	dada' >> $dest
+		fi
+		grep '^uata	scsi' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'uata	scsi' >> $dest
+		fi
+		grep '^simba[ 	]*pci' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'simba	pci' >> $dest
+		fi
+		grep '^mpt[ 	].*scsi' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'mpt	scsi' >> $dest
+		fi
+		grep '^scsi_vhci[ 	].*scsi-self-identifying' $dest > /dev/null 2>&1
+		if [ $? != 0 ] ; then
+			echo 'scsi_vhci	scsi-self-identifying' >> $dest
+		fi
+	fi
+done
+rm -f /tmp/rest.$$
+
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/common_files/i.minorperm_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,629 @@
+#! /bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+#  NOTE:  When a change is made to the source file for
+#  /etc/minor_perm, a corresponding change must be made to
+#  this class-action script.
+#
+#  -	If an existing entry in minor_perm is having its
+#	attributes e.g. permissions, ownership changed,
+#	add it to the list produced by make_chattr_list below.
+#
+#  -	If an existing entry must be deleted, add it to
+#	the list produced by make_delete_list below.
+#
+#  -	If a new entry must be added to the file, add it to the
+#	list produced by make_add_list.
+#
+#  -	If a new entry is being added to minor_perm, but there
+#	may already be devices of that name on the system (e.g.
+#	we used the system default permissions in a previous release),
+#	and those old devices now need to have their attributes changed,
+#	add it to the make_chattr_list AND the make_add_list lists
+#
+
+#
+#  If an entry in /etc/minor_perm needs to have its attributes
+#  changed, identify the entry in the list copied to /etc/chattr.$$
+#  by this function.   The fields are:
+#
+#  <device>:<minor> <old_attrs> <new_attrs> <optional list of logical
+#					      devices whose attributes
+#					      will need to be changed>
+#
+#  where an <attribute list> := <perm> <user> <group>
+#					
+
+make_chattr_list() {
+cat > /tmp/chattr.$$ << EOF
+audio:*				0666 root sys 0600 root sys	/dev/sound/*
+vol:volctl			0600 root sys 0666 root sys	/dev/volctl
+sad:user			0600 root sys 0666 root sys	/dev/sad/user
+se:*				0666 root sys 0600 uucp uucp	/dev/cua/*
+zs:*				0666 root sys 0600 uucp uucp	/dev/cua/*
+su:*				0666 root sys 0600 uucp uucp	/dev/cua/*
+ssd:*			0666 root sys 0640 root sys	/dev/dsk/* /dev/rdsk/*
+dad:*			0600 root sys 0640 root sys	/dev/dsk/* /dev/rdsk/*
+cpc:*			0600 root sys 0666 root sys	/devices/pseudo/cpc*
+log:conslog			0622 root sys 0666 root sys	/dev/conslog
+sy:tty				0666 root sys 0666 root tty	/dev/tty
+cvc:*				0666 root sys 0600 root sys
+cvcredir:*			0666 root sys 0600 root sys
+ssm:*				0600 root sys 0640 root sys	/devices/ssm*:*
+icmp:icmp			0600 root sys 0666 root sys	/dev/rawip
+icmp6:icmp6			0600 root sys 0666 root sys	/dev/rawip6
+ip:ip				0660 root sys 0666 root sys	/dev/ip
+ip6:ip6				0660 root sys 0666 root sys	/dev/ip6
+rts:rts				0660 root sys 0666 root sys	/dev/rts
+keysock:keysock			0600 root sys 0666 root sys	/dev/keysock
+ipsecah:ipsecah			0600 root sys 0666 root sys	/dev/ipsecah
+ipsecesp:ipsecesp		0600 root sys 0666 root sys	/dev/ipsecesp
+spdsock:spdsock			0600 root sys 0666 root sys	/dev/spdsock
+sad:admin			0600 root sys 0666 root sys	/dev/sad/admin
+fssnap:ctl			0600 root sys 0666 root sys	/dev/fssnapctl
+fssnap:*			0600 root sys 0640 root sys	/dev/fssnap/*
+clone:ce			0600 root sys 0666 root sys	/dev/ce
+clone:eri			0600 root sys 0666 root sys	/dev/eri
+clone:ge			0600 root sys 0666 root sys	/dev/ge
+clone:hme			0600 root sys 0666 root sys	/dev/hme
+clone:qfe			0600 root sys 0666 root sys	/dev/qfe
+clone:bge			0600 root sys 0666 root sys	/dev/bge
+clone:igb			0600 root sys 0666 root sys	/dev/igb
+clone:ixgbe			0600 root sys 0666 root sys	/dev/ixgbe
+clone:rge			0600 root sys 0666 root sys	/dev/rge
+clone:xge			0600 root sys 0666 root sys	/dev/xge
+clone:nge			0600 root sys 0666 root sys	/dev/nge
+clone:e1000g			0666 root root 0666 root sys	/dev/e1000g
+clone:chxge			0600 root sys 0666 root sys	/dev/chxge
+clone:vsw			0600 root sys 0666 root sys	/dev/vsw
+clone:vnet			0600 root sys 0666 root sys	/dev/vnet
+clone:pcwl                      0600 root sys 0666 root sys     /dev/pcwl
+clone:pcan			0600 root sys 0666 root sys     /dev/pcan
+clone:afe			0600 root sys 0666 root sys     /dev/afe
+clone:mxfe			0600 root sys 0666 root sys     /dev/mxfe
+clone:rtls			0600 root sys 0666 root sys     /dev/rtls
+bge:*				0600 root sys 0666 root sys	/dev/bge*
+igb:*				0600 root sys 0666 root sys	/dev/igb*
+ixgbe:*				0600 root sys 0666 root sys	/dev/ixgbe*
+rge:*				0600 root sys 0666 root sys	/dev/rge*
+xge:*				0600 root sys 0666 root sys	/dev/xge*
+nge:*				0600 root sys 0666 root sys	/dev/nge*
+e1000g:*			0666 root root 0666 root sys	/dev/e1000g*
+chxge:*				0600 root sys 0666 root sys	/dev/chxge*
+vsw:*				0600 root sys 0666 root sys	/dev/vsw*
+vnet:*				0600 root sys 0666 root sys	/dev/vnet*
+pcwl:*                          0600 root sys 0666 root sys     /dev/pcwl*
+pcan:*                          0600 root sys 0666 root sys     /dev/pcan*
+clone:dmfe			0600 root sys 0666 root sys	/dev/dmfe
+dmfe:*				0600 root sys 0666 root sys	/dev/dmfe*
+clone:pcelx			0600 root sys 0666 root sys	/dev/pcelx
+pcelx:*				0600 root sys 0666 root sys	/dev/pcelx*
+afe:*				0600 root sys 0666 root sys	/dev/afe*
+mxfe:*				0600 root sys 0666 root sys	/dev/mxfe*
+rtls:*				0600 root sys 0666 root sys	/dev/rtls*
+ipf:*				0600 root sys 0666 root sys	/dev/ipf
+pfil:*				0600 root sys 0666 root sys	/dev/pfil
+scsi_vhci:devctl	0600 root sys 0666 root sys /devices/scsi_vhci:devctl
+fbt:fbt			0600 root sys 0644 root sys /dev/dtrace/provider/fbt
+lockstat:*		0600 root sys 0644 root sys /dev/dtrace/provider/lockstat
+profile:profile		0600 root sys 0644 root sys /dev/dtrace/provider/profile
+sdt:sdt			0600 root sys 0644 root sys /dev/dtrace/provider/sdt
+systrace:systrace	0600 root sys 0644 root sys /dev/dtrace/provider/systrace
+EOF
+}
+
+
+#
+#  If an entry in /etc/minor_perm needs to be deleted, identify
+#  the entry in the list copied to /etc/delete.$$ by this function.
+#  The fields are:
+#
+#  <device>:<minor>  <optional list of logical devices to be deleted>
+#					
+
+make_delete_list() {
+cat > /tmp/delete.$$ << EOF
+mm:mbio /dev/mbio /devices/pseudo/mm:mbio
+mm:mbmem /dev/mbmem /devices/pseudo/mm:mbmem
+clone:amd,0,aux,audio
+sw:drum
+rip:rawip
+zs:*
+consfb:consfb
+win:*
+rtvc:*
+gt:*
+mic:*
+cgeight-p4:*
+cgfour:*
+cgtwo:*
+id:*
+xd:*
+xt:*
+xy:*
+ie:*
+be:*
+se:ucm
+se:ucmctl
+clone:arp
+clone:icmp
+clone:ip
+clone:tcp
+clone:udp
+clone:rts
+clone:ipsecah
+clone:ipsecesp
+clone:keysock
+clone:le
+su:*
+profile:profile
+clone:qe
+cgfourteen:*
+cgeight:*
+SUNW,sx:*
+sx_cmem:*
+stc:*
+dbri:*
+SUNW,DBRId:*
+SUNW,DBRIe:*
+SUNW,DBRIf:*
+EOF
+}
+
+#
+#  If an entry needs to be added to /etc/minor_perm, add the first
+#  field of the entry to the list created by this function.  The
+#  remainder of the entry will be extracted from the /etc/minor_perm
+#  in the package being installed, so it is not necessary to supply
+#  it here.
+#
+
+make_add_list() {
+cat > /tmp/add.$$ << EOF
+clone:llc1
+stc:*
+mcpzsa:*
+mcpp:*
+vol:volctl
+tl:*
+tnf:tnfctl
+tnf:tnfmap
+zs:[a-z]
+zs:[a-z],cu
+sad:user
+se:*
+su:[a-z]
+su:[a-z],cu
+su:ssp
+su:sspctl
+fdthree:*
+ssd:*
+dad:*
+pm:*
+tod:*
+SUNW,pmc:*
+SUNW,mic:*
+SUNW,fas:devctl
+cvc:*
+cvcredir:*
+devinfo:devinfo
+envctrltwo:*
+se:[a-h]
+se:[a-h],cu
+se:[0-7],hdlc
+se:ssp
+se:sspctl
+clone:hme
+clone:eri
+wc:*
+arp:arp
+icmp:icmp
+icmp6:icmp6
+ip:ip
+ip6:ip6
+tcp:tcp
+tcp6:tcp6
+udp:udp
+udp6:udp6
+rts:rts
+poll:*
+pool:pool
+pool:poolctl
+cpc:shared
+sysmsg:msglog
+sysmsg:sysmsg
+ipsecah:ipsecah
+ipsecesp:ipsecesp
+keysock:keysock
+spdsock:spdsock
+devinfo:devinfo,ro
+lofi:*
+lofi:ctl
+sgen:*
+fssnap:*
+fssnap:ctl
+pcf8574:*
+pcf8591:*
+gpio_87317:*
+rsm:*
+random:*
+mm:allkmem
+ssm:*
+bscv:*
+clone:bge
+clone:igb
+clone:ixgbe
+clone:rge
+clone:xge
+clone:nge
+clone:e1000g
+clone:chxge
+clone:vsw
+clone:vnet
+clone:pcwl
+clone:pcan
+clone:afe
+clone:mxfe
+clone:rtls
+bge:*
+igb:*
+ixgbe:*
+rge:*
+xge:*
+nge:*
+e1000g:*
+chxge:*
+vsw:*
+vnet:*
+pcwl:*
+pcan:*
+afe:*
+mxfe:*
+rtls:*
+clone:dmfe
+dmfe:*
+clone:pcelx
+pcelx:*
+clone:ibd
+ibd:*
+sysevent:*
+ramdisk:*
+ramdisk:ctl
+cryptoadm:cryptoadm
+crypto:crypto
+dtrace:*
+fasttrap:fasttrap
+ipf:*
+pfil:*
+bl:*
+sctp:*
+sctp6:*
+vni:*
+cpuid:self
+ntwdt:*
+dld:*
+aggr:*
+mdesc:*
+zfs:*
+zfs:zfs
+scsi_vhci:*
+kssl:*
+fbt:fbt
+profile:profile
+sdt:sdt
+softmac:*
+systrace:systrace
+physmem:*
+smbsrv:*
+vscan:*
+nsmb:*
+bmc:bmc
+fm:*
+EOF
+}
+
+PATH="/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin"
+export PATH
+
+# Internal routine to create a sed script which can be used to
+# escape all shell globbing metacharacters in a path.
+
+create_esc_sedscript()
+{
+cat > /tmp/esc.sed.$$ << EOF
+s/\*/\\\\*/g
+s/\?/\\\\?/g
+s/\[/\\\\[/g
+s/\]/\\\\]/g
+EOF
+}
+
+# Internal routine to convert an entry in a /tmp/chwhatever.$$ file to
+# an appropriately escaped pattern which can be used to grep into minor_perm.
+
+entry2pattern()
+{
+	# the first argument is the 'key' field from the change file.
+	# entries can contain shell globbing characters to match
+	# several devices - hence all the palaver below.
+
+	printf '%s' `echo "$1" | sed \
+		-e 's/\*/\\\\*/g'	-e 's/\?/\\\\?/g'	\
+		-e 's/\./\\\\./g'	-e 's/\[/\\\\[/g'	\
+		-e 's/\]/\\\\]/g'`
+	shift
+
+	# the remaining optional arguments are tokens separated by white-space
+
+	if [ $# = 0 ] ; then
+		printf '[ \t]'
+	else
+		while [ -n "$1" ]
+		do
+			printf '[ \t][ \t]*%s' $1
+			shift
+		done
+		printf '[ \t]*$'
+	fi
+}
+
+while read src dest
+do
+	if [ ! -f $dest ] ; then
+		cp $src $dest
+	else
+		rm -f /tmp/*.$$
+		create_esc_sedscript
+		make_chattr_list
+		make_delete_list
+		make_add_list
+
+		#
+		#  Process the list of devices whose attributes are to be
+		#  changed.  Find those that actually need to be
+		#  applied to the file.  For each change that needs
+		#  to be applied, add an entry for it to the sed
+		#  script that will eventually be applied to the
+		#  currently-installed /etc/minor_perm file.  Also,
+		#  add an entry to the /tmp/chdevs.$$ file, which
+		#  contains the list of logical names of devices
+		#  whose permissions need to be changed.
+		#
+
+		cat /tmp/chattr.$$ | \
+		while read key oldp oldu oldg newp newu newg chdevs
+		do
+			do_chdevs=no
+
+			#
+			#  First determine whether the device entry
+			#  is already in the file, but with the old
+			#  permissions.  If so, the entry needs to be
+			#  modified and the devices in the chdevs list
+			#  need to have their permissions and ownerships
+			#  changed.
+			#
+			grepstr=`entry2pattern "${key}" $oldp $oldu $oldg`
+			if grep "$grepstr" $dest > /dev/null 2>&1; then
+				echo "s/${grepstr}/$key $newp $newu $newg/" \
+				    >> /tmp/sedscript.$$
+				do_chdevs=yes
+			fi
+
+			#
+			#  Now determine whether the device entry is
+			#  in the file at all.  If not, it is a new
+			#  entry, but there may already be devices
+			#  on the system whose permissions need to
+			#  be changed.
+			#
+			grepstr=`entry2pattern "${key}"`
+			grep "${grepstr}" $dest > /dev/null 2>&1
+			if [ $? != 0 ] ; then
+				do_chdevs=yes
+			fi
+
+			if [ $do_chdevs = yes -a "$chdevs" != "" ] ; then
+				xchdevs=`echo "$chdevs" | \
+				    sed -f /tmp/esc.sed.$$`
+				for m in $xchdevs ; do
+					echo "$m" $oldp $oldu $oldg \
+					    $newp $newu $newg >> /tmp/chdevs.$$
+				done
+			fi
+		done
+
+		#
+		#  Make sure /dev/volctl gets its permissions corrected.
+		#  (systems upgraded from 2.2 to 2.3 may have a correct
+		#  entry for /dev/volctl in the /etc/minor_perm file
+		#  but the actual /dev/volctl node may have the wrong
+		#  permissions.)
+		#
+
+		echo /dev/volctl 0600 root sys 0666 root sys >> /tmp/chdevs.$$
+
+		if [ -s /tmp/chdevs.$$ ] ; then
+			sort -u /tmp/chdevs.$$ > /tmp/tmp.$$
+			mv /tmp/tmp.$$ /tmp/chdevs.$$
+		fi
+
+		#
+		#  Process the list of devices to be deleted.
+		#  Find those that actually need to be deleted
+		#  from the file.  For each entry to be deleted,
+		#  add an entry for it to the sed script that will
+		#  eventually be applied to the  currently-installed
+		#  /etc/minor_perm file.  Also, add an entry to the
+		#  /tmp/deldevs.$$ file, which contains the list of
+		#  logical names of devices to be deleted.
+		#
+
+		cat /tmp/delete.$$ | while read key deldevs
+		do
+			grepstr=`entry2pattern "${key}"`
+			if grep "$grepstr" $dest > /dev/null 2>&1; then
+				echo "/${grepstr}/d" >> /tmp/sedscript.$$
+				if [ "$deldevs" != "" ] ; then
+					xdeldevs=`echo "$deldevs" | \
+					    sed -f /tmp/esc.sed.$$`
+					for m in $xdeldevs ; do
+						echo "$m" >> /tmp/deldevs.$$
+					done
+				fi
+			fi
+		done
+		if [ -s /tmp/deldevs.$$ ] ; then
+			sort -u /tmp/deldevs.$$ > /tmp/tmp.$$
+			mv /tmp/tmp.$$ /tmp/deldevs.$$
+		fi
+
+		#
+		#  Apply the sed script built above to the
+		#  currently-installed /etc/minor_perm file.
+		#
+
+		if [ -s /tmp/sedscript.$$ ] ; then
+			sed -f /tmp/sedscript.$$ $dest > /tmp/tmp.$$
+			cp /tmp/tmp.$$ $dest
+		fi
+
+		#
+		#  Special case code to handle bug in 2.1, 2.2, and
+		#  early 2.3 releases:  the link from /dev/sound/*
+		#  has one extra set of "../"'s in the link.  This
+		#  doesn't cause problems in normal operation 
+		#  because ".."'s that would take the search path
+		#  higher than the real root are ignored.  However,
+		#  during upgrade, when the system being upgraded is
+		#  mounted at /a, the extra ".." in the link causes
+		#  the link to be unresolvable.  The link must be
+		#  corrected so that the chmod of /dev/sound/*
+		#  works.
+		#
+
+		if [ "$PKG_INSTALL_ROOT" != "" -a "$PKG_INSTALL_ROOT" != "/" ]
+		then
+			for i in $PKG_INSTALL_ROOT/dev/sound/* ; do
+				if [ "$i" = "$PKG_INSTALL_ROOT/dev/sound/*" ]
+				then
+					break;
+				fi
+
+				# if it's not a symlink, continue
+				if [ ! -h $i ] ; then
+					continue
+				fi
+
+				ls -L $i >/dev/null 2>&1
+				if [ $? = 0 ] ; then
+					#  link is already OK
+					continue
+				fi
+
+				# otherwise, link can't be followed
+
+				# build the correct link
+				link=`ls -l $i | sed 's,.* ,,'`
+				link=`expr $link : '\.\.\/\(.*\)'`
+				if [ "$link" = "" ] ; then
+					continue;
+				fi
+
+				# build a test link
+				rm -f $PKG_INSTALL_ROOT/dev/sound/test.$$
+				ln -s $link $PKG_INSTALL_ROOT/dev/sound/test.$$
+
+				# test the link
+				ls -L $PKG_INSTALL_ROOT/dev/sound/test.$$ \
+					>/dev/null 2>&1
+
+				# it worked, so replace old link with new
+				if [ $? = 0 ] ; then
+					rm -f $i
+					ln -s $link $i
+				fi
+				rm -f $PKG_INSTALL_ROOT/dev/sound/test.$$
+			done
+		fi
+
+		#  For all entries in minor_perm whose attributes had
+		#  to be corrected, correct the relevant attributes of the
+		#  already-existing devices that correspond to those
+		#  entries.
+		#
+		if [ -s /tmp/chdevs.$$ -a "$PKG_INSTALL_ROOT" != ""  -a \
+		     "$PKG_INSTALL_ROOT" != "/" ] ; then
+			cat /tmp/chdevs.$$ |\
+			while read device oldp oldu oldg newp newu newg
+			do
+				#
+				# Note that we take pains -only- to change
+				# the permission/ownership of devices that
+				# have kept their original permissions.
+				#
+				for dev in $PKG_INSTALL_ROOT/$device; do
+					find $dev -follow -perm $oldp -exec \
+					    chmod $newp $dev \; >/dev/null 2>&1
+					find $dev -follow -user $oldu -exec \
+					    chown $newu $dev \; >/dev/null 2>&1
+					find $dev -follow -group $oldg -exec \
+					    chgrp $newg $dev \; >/dev/null 2>&1
+				done
+			done
+		fi
+
+		#
+		#  For all entries in minor_perm that were deleted,
+		#  remove the /dev entries that point to device nodes
+		#  that correspond to those entries.
+		#
+		if [ -s /tmp/deldevs.$$ -a "$PKG_INSTALL_ROOT" != ""  -a \
+		     "$PKG_INSTALL_ROOT" != "/" ] ; then
+			cat /tmp/deldevs.$$ | while read device
+			do
+				rm -f $PKG_INSTALL_ROOT/$device
+			done
+		fi
+
+
+		cat /tmp/add.$$ | while read key
+		do
+			grepstr=`entry2pattern "${key}"`
+			grep "$grepstr" $dest > /dev/null 2>&1
+			if [ $? != 0 ] ; then
+				grep "$grepstr" $src >> $dest
+			fi
+		done
+
+		rm -f /tmp/*.$$
+	fi
+done
+
+exit 0
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/common_files/i.sdconf_s390	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+PATH="/usr/bin:/usr/sbin:${PATH}"
+export PATH
+
+add_mpt_entry() {
+cat >> $dest << EOF
+
+#
+# Enable Target 7 for the mpt SCSI/SAS/SATA driver.  Target 7 has
+# traditionally been reserved for legacy SCSI HBAs, but SAS controllers
+# supported by the mpt driver do not use target 7 for that purpose.
+# Enabling Target 7 allows the use of 8 disks on those controllers.
+#
+name="sd" parent="mpt"
+	target=7 lun=0;
+EOF
+}
+
+add_self_identifying_entry() {
+cat >> $dest <<EOF
+
+#
+# The following stub node is needed for pathological bottom-up
+# devid resolution on a self-identifying transport. 
+#
+name="sd" class="scsi-self-identifying";
+EOF
+}
+
+while read src dest; do
+	if [ ! -f $dest ]; then
+		cp $src $dest
+	else
+		line1="name=\"sd\" parent=\"mpt\""
+		line2="target=7 lun=0;"
+		echo `cat $dest` | grep "$line1[# ]*$line2" >/dev/null
+
+		if [ $? -ne 0 ]; then
+			add_mpt_entry
+		fi
+		echo `cat $dest` | grep "scsi-self-identifying" > /dev/null
+
+		if [ $? -ne 0 ]; then
+			add_self_identifying_entry
+		fi	
+	fi
+done
+
+exit 0
--- a/usr/src/psm/stand/bootblks/hsfs/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ /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 2008 Sine Nomine Associates. All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 1994, 2001-2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# psm/stand/bootblks/hsfs/s390x/Makefile
-#
-BASEDIR = ../..
-
-include $(BASEDIR)/hsfs/Makefile.hsfs
-
-SUBDIRS	= unix
-
-all	:=	TARGET= all
-install	:=	TARGET= install
-clean	:=	TARGET= clean
-clobber	:=	TARGET= clobber
-lint	:=	TARGET= lint
-
-.KEEP_STATE:
-
-all install lint clean clobber: $(SUBDIRS)
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
--- a/usr/src/psm/stand/bootblks/hsfs/s390x/unix/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +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 2008 Sine Nomine Associates. All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright (c) 1994, by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# psm/stand/bootblks/hsfs/sparc/unix/Makefile
-#
-
-#
-# Build the "Unix" version of the boot block.
-# Useful solely for testing.  DO NOT INSTALL IT!
-#
-BASEDIR		= ../../..
-PLATFORM	= unix
-PLATFORM_INCS	= ./
-PLATLINKS	=
-
-include $(BASEDIR)/hsfs/Makefile.hsfs
-include $(BASEDIR)/obp-c/Makefile.rules
-
-CPPINCS		+= -I$(SRC)/head
-CPPINCS		+= -I$(SRC)/uts/common
-CPPINCS		+= -I$(SRC)/uts/s390x
-CPPINCS		+= -I$(PLATFORM_INCS)
-
-UNIX_OBJS	= hsfs_small.o unix_devio.o
-
-$(UNIX_OBJS) :=	CFLAGS += -g
-
-.KEEP_STATE:
-
-all:	$(PROG)
-
-$(PROG): $(UNIX_OBJS)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -g -o $@ $(UNIX_OBJS)
-
-lint: FRC
-
-clean:
-	$(RM) $(UNIX_OBJS)
-
-clobber: clean
-	$(RM) $(PROG)
-
-install: FRC
-
-FRC:
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/psm/stand/bootblks/ufs/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,87 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License                  
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sine Nomine Associates. All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# psm/stand/bootblks/ufs/i386/Makefile
+#
+.KEEP_STATE:
+
+BASEDIR = ../..
+
+include $(BASEDIR)/ufs/Makefile.ufs
+
+
+CC		= $(GNU_ROOT)/bin/gcc
+ASFLAGS		= -B$(GNU_ROOT)/bin/ -fno-builtin -nostdinc
+CPPFLAGS	= -m31
+
+LD		= $(GNU_ROOT)/bin/ld
+LDFLAGS		= -nostdlib -N -Ttext 600
+
+OBJCOPY		= $(GNU_ROOT)/bin/objcopy
+
+INSTALL_DIR	= $(USR)/lib/fs/ufs
+INSTALL_TARGETS	= $(PROGS:%=$(INSTALL_DIR)/%)
+
+$(INSTALL_TARGETS) := FILEMODE = 0444
+
+PROGS		= mboot
+
+
+all: $(INSTALLBOOT) $(PROGS)
+
+$(PROGS): $$(@).exec
+	$(OBJCOPY) -O binary $@.exec $@
+
+%.exec: %.o
+	$(LD) $(LDFLAGS) -o $@ $(@:exec=o)
+
+
+install: all $(INSTALL_TARGETS) $(USR_SBIN_INSTALLBOOT)
+
+$(INSTALL_DIR)/%: $(INSTALL_DIR) %
+	$(INS.file)
+
+$(INSTALL_DIR):
+	$(INS.dir)
+
+lint:
+
+clean:
+	$(RM) *.exec *.o
+
+clobber: clean
+	$(RM) $(PROGS) $(INSTALLBOOT)
+
+
+#
+# Pattern matching rules for source in this directory
+#
+%: %.sh
+	$(RM) $@
+	cat $< > $@
+	chmod +x $@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/psm/stand/bootblks/ufs/s390/installboot.sh	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# 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
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"@(#)installboot.sh	1.4	05/06/08 SMI"
+#
+
+away() {
+	echo $2 1>&2
+	exit $1
+}
+
+Error="Error: `basename $0` is obsolete. Use installgrub(1M)"
+Usage="Usage: `basename $0` --force_realmode pboot bootblk raw-device"
+
+test $# -ne 4 && away 1 "$Error"
+test $1 != "--force_realmode" && away 1 "$Error"
+shift 1
+
+PBOOT=$1
+BOOTBLK=$2
+DEVICE=$3
+test ! -f $PBOOT && away 1 "$PBOOT: File not found"
+test ! -f $BOOTBLK && away 1 "$BOOTBLK: File not found"
+test ! -c $DEVICE && away 1 "$DEVICE: Not a character device"
+test ! -w $DEVICE && away 1 "$DEVICE: Not writeable"
+
+# pboot at block 0, label at blocks 1 and 2, bootblk from block 3 on
+stderr=`dd if=$PBOOT of=$DEVICE bs=1b count=1 conv=sync 2>&1`
+err=$? ; test $err -ne 0 && away $err "$stderr"
+stderr=`dd if=$BOOTBLK of=$DEVICE bs=1b oseek=3 conv=sync 2>&1`
+err=$? ; test $err -ne 0 && away $err "$stderr"
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/psm/stand/bootblks/ufs/s390/mboot.S	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,133 @@
+/*
+ * 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
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ *
+ * ident	"@(#)mboot.S	1.20	05/06/08 SMI"
+ */
+
+/*
+ * SOLARIS MASTER BOOT:
+ *
+ * PURPOSE: loads the primary boot from the active fdisk partition.
+ *          in effect, this routine mimics the functionality of INT 0x19.
+ *
+ * resides on the first physical sector of the hard drive media.
+ * loaded by INT 0x19 (ROM bootstrap loader) at address 0x7C00
+ * limited to 512 bytes total, including embedded fdisk table.
+ *
+ * for compatibility with the ROM BIOS, we contain standard DOS structures:
+ *
+ *	the fdisk partition table (at offset 0x1BE-0x1FE)
+ *	boot signature bytes (0x55, 0xAA at 0x1FE, 0x1FF)
+ *
+ * the above two entities are required in order to be compatible with
+ * the manner in which the DOS BIOS has always performed its boot operation.
+ * In the event that our master boot record is inadvertently replaced by
+ * a standard DOS boot sector, the booting operation will still succeed!
+ *
+ * This master boot record uses the relsect/numsect fields of the partition
+ * table entry, to compute the start of the active partition; therefore,
+ * it is geometry independent.  This means that the drive could be "built"
+ * on a system with a disk controller that uses a given disk geometry, but
+ * would run on any other controller.
+ *
+ * SYNOPSIS:
+ *     begins execution at 0:0x7C00
+ *     relocates to 0:0x600 (to get out of the way!)
+ *     reads fdisk table to locate bootable partition
+ *     load boot record from the active fdisk partition at 0x7C00
+ *     verify boot record signature bytes
+ *     jump to/execute the SOLARIS PARTITION PRIMARY BOOT
+ *     error handler - can either reboot, or invoke INT 0x18.
+ *
+ * interface from DOS INT 0x19:  BootDev in DL
+ * (this fails sometimes, so we look for a signature to determine whether
+ *  to rely on DL from the floppy boot, or if we should assume 0x80 from
+ *  the BIOS)
+ *
+ * interface to partition boot: BootDev in DL
+ *
+ *=============================================================================
+ * Master boot record: resides on first physical sector of device
+ */
+
+/*
+ * This file is written in GNU as syntax using Intel assembler syntax.  The
+ * startup label _start will be executed at address PBOOT_ADDR (0x7C00), but
+ * the text section must be set at address RELOC_ADDR (0x600).  With GNU ld
+ * this can be done using the "-Ttext 600" option.
+ */
+
+
+#define	PBOOT_ADDR	0x7C00
+#define	RELOC_ADDR	0x600
+
+#define	FDISK_START	0x1BE
+#define	BOOT_SIG	0x55aa
+#define	N_RETRIES	5
+
+#define	FD_NUMPART	4
+#define	FD_PTESIZE	0x10
+#define	ACTIVE		0x80
+
+/*
+ * A convenience macro for declaring a message string (using .ascii directive--
+ * NOT nul-terminated) surrounded by two labels, which can then be used with
+ * the SIZEOF() macro to get its length.
+ */
+#define	MSG(label, string)	label: .ascii string; label##_end:
+
+/*
+ * Returns the length of some consecutive bytes.  These bytes must be placed
+ * between two labels.  The ending label must be the same as the starting label
+ * but with a suffix "_end".
+ */
+#define	SIZEOF(label)	(offset label##_end - offset label)
+
+
+	.title	"Solaris_Master_Boot"
+
+	.text				/* code segment begins here */
+
+	.global	BootDev
+	.global _start
+
+_start:					/* _start is loaded at PBOOT_ADDR */
+	j	bootrun
+
+Version:
+	.ascii	"M3.0"			/* ident string */
+
+bootrun:
+	j	bootrun			/* don't bother me now! */
+
+/*
+ * For debugging:  Here's a representative FDISK table entry
+ *
+ * .org   0x1BE
+ * .byte  0x80,1,1,0,0x82,0xfe,0x7f,4,0x3f,0,0,0,0x86,0xfa,0x3f,0
+ */
+	.org 	0x1FE
+
+	.word	BOOT_SIG
--- a/usr/src/psm/stand/bootblks/ufs/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +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 2008 Sine Nomine Associates. All rights reserved.
-# Use is subject to license terms.
-#
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# psm/stand/bootblks/ufs/i386/Makefile
-#
-.KEEP_STATE:
-
-BASEDIR = ../..
-
-include $(BASEDIR)/ufs/Makefile.ufs
-
-
-CC		= $(GNU_ROOT)/bin/gcc
-ASFLAGS		= -B$(GNU_ROOT)/bin/ -fno-builtin -nostdinc
-CPPFLAGS	= -m31
-
-LD		= $(GNU_ROOT)/bin/ld
-LDFLAGS		= -nostdlib -N -Ttext 600
-
-OBJCOPY		= $(GNU_ROOT)/bin/objcopy
-
-INSTALL_DIR	= $(USR)/lib/fs/ufs
-INSTALL_TARGETS	= $(PROGS:%=$(INSTALL_DIR)/%)
-
-$(INSTALL_TARGETS) := FILEMODE = 0444
-
-PROGS		= mboot
-
-
-all: $(INSTALLBOOT) $(PROGS)
-
-$(PROGS): $$(@).exec
-	$(OBJCOPY) -O binary $@.exec $@
-
-%.exec: %.o
-	$(LD) $(LDFLAGS) -o $@ $(@:exec=o)
-
-
-install: all $(INSTALL_TARGETS) $(USR_SBIN_INSTALLBOOT)
-
-$(INSTALL_DIR)/%: $(INSTALL_DIR) %
-	$(INS.file)
-
-$(INSTALL_DIR):
-	$(INS.dir)
-
-lint:
-
-clean:
-	$(RM) *.exec *.o
-
-clobber: clean
-	$(RM) $(PROGS) $(INSTALLBOOT)
-
-
-#
-# Pattern matching rules for source in this directory
-#
-%: %.sh
-	$(RM) $@
-	cat $< > $@
-	chmod +x $@
--- a/usr/src/psm/stand/bootblks/ufs/s390x/installboot.sh	Fri Oct 31 13:36:47 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# 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
-#
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)installboot.sh	1.4	05/06/08 SMI"
-#
-
-away() {
-	echo $2 1>&2
-	exit $1
-}
-
-Error="Error: `basename $0` is obsolete. Use installgrub(1M)"
-Usage="Usage: `basename $0` --force_realmode pboot bootblk raw-device"
-
-test $# -ne 4 && away 1 "$Error"
-test $1 != "--force_realmode" && away 1 "$Error"
-shift 1
-
-PBOOT=$1
-BOOTBLK=$2
-DEVICE=$3
-test ! -f $PBOOT && away 1 "$PBOOT: File not found"
-test ! -f $BOOTBLK && away 1 "$BOOTBLK: File not found"
-test ! -c $DEVICE && away 1 "$DEVICE: Not a character device"
-test ! -w $DEVICE && away 1 "$DEVICE: Not writeable"
-
-# pboot at block 0, label at blocks 1 and 2, bootblk from block 3 on
-stderr=`dd if=$PBOOT of=$DEVICE bs=1b count=1 conv=sync 2>&1`
-err=$? ; test $err -ne 0 && away $err "$stderr"
-stderr=`dd if=$BOOTBLK of=$DEVICE bs=1b oseek=3 conv=sync 2>&1`
-err=$? ; test $err -ne 0 && away $err "$stderr"
-exit 0
--- a/usr/src/psm/stand/bootblks/ufs/s390x/mboot.S	Fri Oct 31 13:36:47 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
- * 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
- */
-/*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
- * ident	"@(#)mboot.S	1.20	05/06/08 SMI"
- */
-
-/*
- * SOLARIS MASTER BOOT:
- *
- * PURPOSE: loads the primary boot from the active fdisk partition.
- *          in effect, this routine mimics the functionality of INT 0x19.
- *
- * resides on the first physical sector of the hard drive media.
- * loaded by INT 0x19 (ROM bootstrap loader) at address 0x7C00
- * limited to 512 bytes total, including embedded fdisk table.
- *
- * for compatibility with the ROM BIOS, we contain standard DOS structures:
- *
- *	the fdisk partition table (at offset 0x1BE-0x1FE)
- *	boot signature bytes (0x55, 0xAA at 0x1FE, 0x1FF)
- *
- * the above two entities are required in order to be compatible with
- * the manner in which the DOS BIOS has always performed its boot operation.
- * In the event that our master boot record is inadvertently replaced by
- * a standard DOS boot sector, the booting operation will still succeed!
- *
- * This master boot record uses the relsect/numsect fields of the partition
- * table entry, to compute the start of the active partition; therefore,
- * it is geometry independent.  This means that the drive could be "built"
- * on a system with a disk controller that uses a given disk geometry, but
- * would run on any other controller.
- *
- * SYNOPSIS:
- *     begins execution at 0:0x7C00
- *     relocates to 0:0x600 (to get out of the way!)
- *     reads fdisk table to locate bootable partition
- *     load boot record from the active fdisk partition at 0x7C00
- *     verify boot record signature bytes
- *     jump to/execute the SOLARIS PARTITION PRIMARY BOOT
- *     error handler - can either reboot, or invoke INT 0x18.
- *
- * interface from DOS INT 0x19:  BootDev in DL
- * (this fails sometimes, so we look for a signature to determine whether
- *  to rely on DL from the floppy boot, or if we should assume 0x80 from
- *  the BIOS)
- *
- * interface to partition boot: BootDev in DL
- *
- *=============================================================================
- * Master boot record: resides on first physical sector of device
- */
-
-/*
- * This file is written in GNU as syntax using Intel assembler syntax.  The
- * startup label _start will be executed at address PBOOT_ADDR (0x7C00), but
- * the text section must be set at address RELOC_ADDR (0x600).  With GNU ld
- * this can be done using the "-Ttext 600" option.
- */
-
-
-#define	PBOOT_ADDR	0x7C00
-#define	RELOC_ADDR	0x600
-
-#define	FDISK_START	0x1BE
-#define	BOOT_SIG	0x55aa
-#define	N_RETRIES	5
-
-#define	FD_NUMPART	4
-#define	FD_PTESIZE	0x10
-#define	ACTIVE		0x80
-
-/*
- * A convenience macro for declaring a message string (using .ascii directive--
- * NOT nul-terminated) surrounded by two labels, which can then be used with
- * the SIZEOF() macro to get its length.
- */
-#define	MSG(label, string)	label: .ascii string; label##_end:
-
-/*
- * Returns the length of some consecutive bytes.  These bytes must be placed
- * between two labels.  The ending label must be the same as the starting label
- * but with a suffix "_end".
- */
-#define	SIZEOF(label)	(offset label##_end - offset label)
-
-
-	.title	"Solaris_Master_Boot"
-
-	.text				/* code segment begins here */
-
-	.global	BootDev
-	.global _start
-
-_start:					/* _start is loaded at PBOOT_ADDR */
-	j	bootrun
-
-Version:
-	.ascii	"M3.0"			/* ident string */
-
-bootrun:
-	j	bootrun			/* don't bother me now! */
-
-/*
- * For debugging:  Here's a representative FDISK table entry
- *
- * .org   0x1BE
- * .byte  0x80,1,1,0,0x82,0xfe,0x7f,4,0x3f,0,0,0,0x86,0xfa,0x3f,0
- */
-	.org 	0x1FE
-
-	.word	BOOT_SIG
--- a/usr/src/tools/kipl_cvt/kipl_cvt.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/tools/kipl_cvt/kipl_cvt.c	Mon Mar 23 14:01:42 2009 -0400
@@ -524,6 +524,7 @@
 	Elf64_Ehdr 	*bHdr;
 	Elf64_Phdr 	*pHdr;
 	char		org[9];
+	long		maxPointer = 0;
 
 	tFile = oFile;
 
@@ -554,11 +555,11 @@
 		iPhdr < bHdr->e_phnum; 
 		iPhdr++, pHdr++) {
 		if (pHdr->p_type == PT_LOAD) {
-			sprintf(org,"%08llx",pHdr->p_paddr);
+			sprintf(org,"%08llx",pHdr->p_vaddr);
 			memcpy(&slcRec.org, org, sizeof(slcRec.org));
-			esdRec.org  = pHdr->p_paddr;
-			offset[0]   = pHdr->p_paddr;
-			lastPointer = pHdr->p_paddr;
+			esdRec.org  = pHdr->p_vaddr;
+			offset[0]   = pHdr->p_vaddr;
+			lastPointer = pHdr->p_vaddr;
 			break;
 		}
 	}
@@ -580,17 +581,22 @@
 	for (iPhdr = 0, pHdr = (Elf64_Phdr *) ((void *) bHdr + bHdr->e_phoff); 
 		iPhdr < bHdr->e_phnum; 
 		iPhdr++, pHdr++) {
-		if (pHdr->p_filesz != 0) {
-			lastPointer = pHdr->p_paddr;
+		if ((pHdr->p_vaddr != NULL) &&
+		    (pHdr->p_filesz != 0)) {
+			lastPointer = pHdr->p_vaddr;
 			writeImage(elfBoot+pHdr->p_offset, pHdr->p_filesz);
+			if (maxPointer < lastPointer)
+				maxPointer = lastPointer;
 		}
 	}
+
+	offset[1]   = maxPointer - esdRec.org;
 	lTxt	    = sizeof(offset);
 	lastPointer = entry - sizeof(offset);
 	memcpy(txtBuffer, (void *) &offset, lTxt);
 	output_txt();
 
-	esdRec.modLen = bSize;
+	esdRec.modLen = offset[1];
 	esdRec.epLen  = 1;
 
 	munmap(elfBoot, bSize);
--- a/usr/src/ucbcmd/tr/tr.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucbcmd/tr/tr.c	Mon Mar 23 14:01:42 2009 -0400
@@ -59,10 +59,11 @@
 	int c, d;
 	char *compl;
 	int lastd;
+	char empty = '\0';
 
 	string1.last = string2.last = 0;
 	string1.max = string2.max = 0;
-	string1.p = string2.p = "";
+	string1.p = string2.p = (char *) &empty;
 
 	if(--argc>0) {
 		argv++;
--- a/usr/src/ucblib/libcurses/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucblib/libcurses/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -28,7 +28,7 @@
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
-BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
+BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
 
--- a/usr/src/ucblib/libcurses/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucblib/libcurses/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -30,7 +30,6 @@
 #
 # ucblib/libcurses/s390x/Makefile
 
-MAPDIR=	../spec/s390x
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
 
--- a/usr/src/ucblib/libtermcap/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucblib/libtermcap/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -27,7 +27,7 @@
 
 include ../Makefile.com
 
-BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
+BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
 
--- a/usr/src/ucblib/libucb/s390/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucblib/libucb/s390/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -25,18 +25,20 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-#SYSOBJS=
-NOCTFOBJS=
+SYSOBJS=		\
+	setjmp.o	\
+	signal.o
 
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
+BUILD.s=	$(AS) -D_ASM -I$(ROOT)/usr/ucbinclude -I$(ROOT)/usr/include $< -o $@
 
-MAPFILES =	../port/mapfile-vers
+# s390-specific rule
+pics/%.o: sys/%.s
+	$(BUILD.s)
+	$(POST_PROCESS_O)
 
 .KEEP_STATE:
-# Add build for generated mapfile
-#include ../../../Makefile.mapfilegnu
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
-
--- a/usr/src/ucblib/libucb/s390/sys/setjmp.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucblib/libucb/s390/sys/setjmp.s	Mon Mar 23 14:01:42 2009 -0400
@@ -44,8 +44,6 @@
 
 #include <sys/asm_linkage.h>
 
-	ANSI_PRAGMA_WEAK(longjmp,function)
-
 	ENTRY_NP(setjmp)
 	lhi	%r3,1
 	jg	_sigsetjmp
@@ -59,3 +57,5 @@
 	ENTRY_NP(_longjmp)
 	jg	_siglongjmp
 	SET_SIZE(_longjmp)
+
+	ANSI_PRAGMA_WEAK2(longjmp,_longjmp,function)
--- a/usr/src/ucblib/libucb/s390/sys/signal.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucblib/libucb/s390/sys/signal.c	Mon Mar 23 14:01:42 2009 -0400
@@ -18,6 +18,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * Copyright 2008 Sine Nomine Associates.
+ * All rights reserved.
+ * Use is subject to license terms.
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
@@ -32,8 +36,6 @@
  * under license from the Regents of the University of California.
  */
 
-#pragma ident	"@(#)signal.c	1.22	05/09/27 SMI"
-
 /*LINTLIBRARY*/
 
 /*
--- a/usr/src/ucblib/libucb/s390x/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucblib/libucb/s390x/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -32,8 +32,6 @@
 	setjmp.o	\
 	signal.o
 
-MAPDIR=	../spec/s390x
-
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
@@ -41,7 +39,6 @@
 BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 BUILD.s=	$(AS) -D_ASM -I$(ROOT)/usr/ucbinclude -I$(ROOT)/usr/include $< -o $@
 
-
 # s390x-specific rule
 objs/%.o pics/%.o: sys/%.c
 	$(COMPILE.c) -o $@ $<
--- a/usr/src/ucblib/libucb/s390x/sys/setjmp.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucblib/libucb/s390x/sys/setjmp.s	Mon Mar 23 14:01:42 2009 -0400
@@ -46,8 +46,6 @@
 
 #include <sys/asm_linkage.h>
 
-	ANSI_PRAGMA_WEAK(longjmp,function)
-
 	ENTRY_NP(setjmp)
 	lghi	%r3,1
 	jg	_sigsetjmp
@@ -61,3 +59,5 @@
 	ENTRY_NP(_longjmp)
 	jg	_siglongjmp
 	SET_SIZE(_longjmp)
+
+	ANSI_PRAGMA_WEAK2(longjmp,_longjmp,function)
--- a/usr/src/ucblib/libucb/s390x/sys/signal.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/ucblib/libucb/s390x/sys/signal.c	Mon Mar 23 14:01:42 2009 -0400
@@ -18,10 +18,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
-/*                                                                  */
-/* Copyright 2008 Sine Nomine Associates.                           */
-/* All rights reserved.                                             */
-/* Use is subject to license terms.                                 */
+ *
+ * Copyright 2008 Sine Nomine Associates.
+ * All rights reserved.
+ * Use is subject to license terms.
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
--- a/usr/src/uts/common/conf/param.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/conf/param.c	Mon Mar 23 14:01:42 2009 -0400
@@ -525,7 +525,7 @@
  */
 char architecture[] = "s390x";
 char architecture_32[] = "s390";
-char hw_serial[8] __attribute__((aligned(8)));
+char hw_serial[9];
 char hw_provider[SYS_NMLN] = "IBM Corporation";
 
 #else
--- a/usr/src/uts/common/fs/fsflush.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/fs/fsflush.c	Mon Mar 23 14:01:42 2009 -0400
@@ -139,6 +139,12 @@
 	static pgcnt_t	last_total_pages = 0;
 	static void	*pp_cookie = NULL;
 	static page_t	*pp;
+uint8_t key;
+#define GET_KEY(p,k)                            \
+        __asm__ ("      lgr     1,%1\n"         \
+                 "      lghi    %0,0\n"         \
+                 "      iske    %0,1\n"         \
+                 : "=r" (k) : "r" (p) : "1");
 
 	/*
 	 * Check to see if total_pages has changed.
@@ -289,7 +295,6 @@
 
 			(void) VOP_PUTPAGE(vp, offset, PAGESIZE, B_ASYNC,
 			    kcred, NULL);
-
 			VN_RELE(vp);
 		} else {
 
--- a/usr/src/uts/common/fs/proc/prdata.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/fs/proc/prdata.h	Mon Mar 23 14:01:42 2009 -0400
@@ -122,6 +122,9 @@
 #if defined(__i386) || defined(__amd64)
 	PR_LDT,			/* /proc/<pid>/ldt			*/
 #endif
+#if defined(__s390)
+	PR_STAT,		/* /proc/<pid>/stat			*/
+#endif
 	PR_USAGE,		/* /proc/<pid>/usage			*/
 	PR_LUSAGE,		/* /proc/<pid>/lusage			*/
 	PR_PAGEDATA,		/* /proc/<pid>/pagedata			*/
--- a/usr/src/uts/common/fs/proc/prvnops.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/fs/proc/prvnops.c	Mon Mar 23 14:01:42 2009 -0400
@@ -167,6 +167,10 @@
 	{ PR_LDT,	27 * sizeof (prdirent_t), sizeof (prdirent_t),
 		"ldt" },
 #endif
+#if defined(__s390x)
+	{ PR_STAT,	27 * sizeof (prdirent_t), sizeof (prdirent_t),
+		"stat" },
+#endif
 };
 
 #define	NPIDDIRFILES	(sizeof (piddir) / sizeof (piddir[0]) - 2)
@@ -572,6 +576,9 @@
 #if defined(__x86)
 	pr_read_ldt(),
 #endif
+#if defined(__s390x)
+	pr_read_stat(),
+#endif
 	pr_read_usage(), pr_read_lusage(), pr_read_pagedata(),
 	pr_read_watch(), pr_read_lwpstatus(), pr_read_lwpsinfo(),
 	pr_read_lwpusage(), pr_read_xregs(), pr_read_priv(),
@@ -599,6 +606,9 @@
 #if defined(__x86)
 	pr_read_ldt,		/* /proc/<pid>/ldt			*/
 #endif
+#if defined(__s390x)
+	pr_read_stat,		/* /proc/<pid>/ldt			*/
+#endif
 	pr_read_usage,		/* /proc/<pid>/usage			*/
 	pr_read_lusage,		/* /proc/<pid>/lusage			*/
 	pr_read_pagedata,	/* /proc/<pid>/pagedata			*/
@@ -1087,6 +1097,31 @@
 }
 #endif	/* __x86 */
 
+#if defined(__s390x)
+static int
+pr_read_stat(prnode_t *pnp, uio_t *uiop)
+{
+	proc_t *p;
+	kthread_t *t;
+	char buf[512];
+	int error;
+	size_t size;
+
+	ASSERT(pnp->pr_type == PR_STAT);
+
+	if ((error = prlock(pnp, ZNO)) != 0)
+		return (error);
+	p = pnp->pr_common->prc_proc;
+
+	t = prchoose(p);
+	size = prgetstat(p, t, &buf, sizeof(buf));
+	prunlock(pnp);
+
+	error = pr_uioread(buf, size, uiop);
+	return (error);
+}
+#endif	/* __s390x */
+
 static int
 pr_read_usage(prnode_t *pnp, uio_t *uiop)
 {
@@ -1722,6 +1757,9 @@
 #if defined(__x86)
 	pr_read_ldt,		/* /proc/<pid>/ldt			*/
 #endif
+#if defined(__s390x)
+	pr_read_stat,		/* /proc/<pid>/stat			*/
+#endif
 	pr_read_usage_32,	/* /proc/<pid>/usage			*/
 	pr_read_lusage_32,	/* /proc/<pid>/lusage			*/
 	pr_read_pagedata_32,	/* /proc/<pid>/pagedata			*/
@@ -2979,6 +3017,11 @@
 		mutex_exit(&p->p_ldtlock);
 		break;
 #endif
+#if defined(__s390x)
+	case PR_STAT:
+		vap->va_size = 0;
+		break;
+#endif
 	case PR_USAGE:
 		vap->va_size = PR_OBJSIZE(prusage32_t, prusage_t);
 		break;
@@ -3223,6 +3266,9 @@
 #if defined(__x86)
 	pr_lookup_notdir,	/* /proc/<pid>/ldt			*/
 #endif
+#if defined(__s390x)
+	pr_lookup_notdir,	/* /proc/<pid>/stat			*/
+#endif
 	pr_lookup_notdir,	/* /proc/<pid>/usage			*/
 	pr_lookup_notdir,	/* /proc/<pid>/lusage			*/
 	pr_lookup_notdir,	/* /proc/<pid>/pagedata			*/
@@ -4571,6 +4617,9 @@
 #if defined(__x86)
 	pr_readdir_notdir,	/* /proc/<pid>/ldt			*/
 #endif
+#if defined(__s390x)
+	pr_readdir_notdir,	/* /proc/<pid>/stat			*/
+#endif
 	pr_readdir_notdir,	/* /proc/<pid>/usage			*/
 	pr_readdir_notdir,	/* /proc/<pid>/lusage			*/
 	pr_readdir_notdir,	/* /proc/<pid>/pagedata			*/
--- a/usr/src/uts/common/fs/ufs/ufs_dir.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/fs/ufs/ufs_dir.c	Mon Mar 23 14:01:42 2009 -0400
@@ -2266,6 +2266,10 @@
 		} else
 			ip->i_flag |= IACC;
 		if (vap->va_mask & AT_MTIME) {
+{
+struct vnode *vn = ip->i_vnode;
+msgnoh("ufs_dirmakeinode - file: %s",(vn->v_path != NULL ? vn->v_path : "nil"));
+}
 			ip->i_mtime.tv_sec = vap->va_mtime.tv_sec;
 			ip->i_mtime.tv_usec = vap->va_mtime.tv_nsec / 1000;
 			gethrestime(&now);
--- a/usr/src/uts/common/fs/ufs/ufs_vnops.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/fs/ufs/ufs_vnops.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1,3 +1,8 @@
+#define GET_KEY(p,k)				\
+	__asm__ ("	lgr	1,%1\n"		\
+		 "	lghi	%0,0\n"		\
+		 "	iske	%0,1\n"		\
+		 : "=r" (k) : "r" (p) : "1");
 /*
  * CDDL HEADER START
  *
@@ -5356,6 +5361,7 @@
 	int contig;
 	int dotrans;
 
+uint8_t key;
 	ASSERT(RW_LOCK_HELD(&ip->i_contents));
 
 	if (ufsvfsp == NULL) {
@@ -5364,6 +5370,12 @@
 	}
 
 	fs = ip->i_fs;
+if (fs->fs_ronly != 0) {
+msgnoh("!!! page: %lx",pp->p_pagenum);
+if (vp->v_path != NULL)
+msgnoh("..... %s state: %p page_t: %p",vp->v_path,&pp->p_state,pp);
+for (;;);
+}
 	ASSERT(fs->fs_ronly == 0);
 
 	/*
--- a/usr/src/uts/common/fs/vnode.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/fs/vnode.c	Mon Mar 23 14:01:42 2009 -0400
@@ -217,8 +217,8 @@
 /*                                                                  */
 /* Name		- vopchk_page.                                      */
 /*                                                                  */
-/* Function	- Check if this is the pages for the getpage request*/
-/*                have had I/O done to them already. If not, reset  */
+/* Function	- Check if the pages for this getpage request have  */
+/*                had I/O done to them already. If not, reset  	    */
 /*                the ref and mod bits of both the storage key and  */
 /*                p_nrm field of the page_t entry.                  */
 /*                                                                  */
--- a/usr/src/uts/common/krtld/kobj.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/krtld/kobj.c	Mon Mar 23 14:01:42 2009 -0400
@@ -158,7 +158,7 @@
  *	D_LOADING	- display information about each module as it
  *			  is loaded.
  */
-int kobj_debug = D_LOADING;
+int kobj_debug = 0;
 
 #define	KOBJ_MARK(s)	if (kobj_debug & D_DEBUG)	\
 	(_kobj_printf(ops, "%d", __LINE__), _kobj_printf(ops, ": %s\n", s))
--- a/usr/src/uts/common/sys/elf_s390.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/sys/elf_s390.h	Mon Mar 23 14:01:42 2009 -0400
@@ -69,6 +69,12 @@
 #define R_390_GNU_VTINHERIT 	250
 #define R_390_GNU_VTENTRY 	251
 
+/* 
+ * Maximum page sizes
+ */
+#define ELF_390_MAXPGSZ		0x1000
+#define ELF_390X_MAXPGSZ	0x1000
+
 /*
  * Processor specific section types
  */
--- a/usr/src/uts/common/sys/isa_defs.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/sys/isa_defs.h	Mon Mar 23 14:01:42 2009 -0400
@@ -535,6 +535,9 @@
 #  if defined(_LP64)
 #   undef _LP64
 #  endif
+#  if defined(_KERNEL)
+#   define _ILP32x
+#  endif
 # endif
 
 
--- a/usr/src/uts/common/sys/prsystm.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/sys/prsystm.h	Mon Mar 23 14:01:42 2009 -0400
@@ -120,6 +120,9 @@
 extern	int	prnldt(proc_t *);
 extern	void	prgetldt(proc_t *, struct ssd *);
 #endif	/* __x86 */
+#if defined(__s390x)
+extern	size_t	prgetstat(proc_t *, kthread_t *, char *, size_t);
+#endif
 
 #ifdef _SYSCALL32_IMPL
 // struct prfpregset32;
--- a/usr/src/uts/common/sys/types.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/sys/types.h	Mon Mar 23 14:01:42 2009 -0400
@@ -502,22 +502,27 @@
 typedef	long	pid_t;			/* (historical version) */
 #endif
 
-#if !defined(_SIZE_T) || __cplusplus >= 199711L
-#define	_SIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+#if defined(__GNUC__) && !defined(_SIZE_T)	/* If GNU then use the builtin type */
+typedef __SIZE_TYPE__ size_t;
+# define _SIZE_T
+#else
+# if !defined(_SIZE_T) || __cplusplus >= 199711L
+#  define	_SIZE_T
+#  if defined(_LP64) || defined(_I32LPx)
 typedef	ulong_t	size_t;		/* size of something in bytes */
-#else
+#  else
 typedef	uint_t	size_t;		/* (historical version) */
-#endif
-#endif	/* _SIZE_T */
+#  endif
+# endif	/* _SIZE_T */
+#endif /* GNUC */
 
 #ifndef _SSIZE_T
-#define	_SSIZE_T
-#if defined(_LP64) || defined(_I32LPx)
+# define	_SSIZE_T
+# if defined(_LP64) || defined(_I32LPx)
 typedef long	ssize_t;	/* size of something in bytes or -1 */
-#else
+# else
 typedef int	ssize_t;	/* (historical version) */
-#endif
+# endif
 #endif	/* _SSIZE_T */
 
 #if !defined(_TIME_T) || __cplusplus >= 199711L
--- a/usr/src/uts/common/sys/vfs_opreg.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/sys/vfs_opreg.h	Mon Mar 23 14:01:42 2009 -0400
@@ -107,6 +107,12 @@
 void	vfs_freevfsops(vfsops_t *);
 int	vfs_freevfsops_by_type(int);
 
+#else
+
+typedef struct fs_operation_def {
+	void *filler_field;
+} fs_operations_def_t;
+
 #endif /* _KERNEL */
 
 #ifdef	__cplusplus
--- a/usr/src/uts/common/vm/page.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/vm/page.h	Mon Mar 23 14:01:42 2009 -0400
@@ -915,6 +915,8 @@
  */
 #ifndef __s390x
 # define PP_ISINIT(pp)		(1)
+# define PP_SETINIT(pp)
+# define PP_CLRINIT(pp)
 #else
 # define PP_ISINIT(pp)		((pp)->p_state & P_INITIO)
 # define PP_SETINIT(pp)		((pp)->p_state |= P_INITIO)
--- a/usr/src/uts/common/vm/seg_map.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/vm/seg_map.c	Mon Mar 23 14:01:42 2009 -0400
@@ -1475,8 +1475,10 @@
 			hat_flag = HAT_LOAD_LOCK;
 		}
 
-		if (IS_VMODSORT(pp->p_vnode) && (prot & PROT_WRITE))
+		if (IS_VMODSORT(pp->p_vnode) && (prot & PROT_WRITE)) {
 			hat_setmod(pp);
+			PP_SETINIT(pp);
+		}
 
 		hat_memload(kas.a_hat, addr, pp, prot, hat_flag);
 
--- a/usr/src/uts/common/vm/seg_vn.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/vm/seg_vn.c	Mon Mar 23 14:01:42 2009 -0400
@@ -2800,6 +2800,9 @@
 			if (!(hat_flag & HAT_LOAD_LOCK))
 				page_unlock(pp);
 
+			if (rw == S_WRITE)
+				PP_SETINIT(pp);
+
 			anon_array_exit(&cookie);
 			return (0);
 		}
@@ -2895,9 +2898,10 @@
 			page_migrate(seg, addr, &opp, 1);
 
 		if (IS_VMODSORT(opp->p_vnode) || enable_mbit_wa) {
-			if (rw == S_WRITE)
+			if (rw == S_WRITE) {
 				hat_setmod(opp);
-			else if (rw != S_OTHER && !hat_ismod(opp))
+				PP_SETINIT(opp);
+			} else if (rw != S_OTHER && !hat_ismod(opp))
 				prot &= ~PROT_WRITE;
 		}
 
--- a/usr/src/uts/common/vm/vm_page.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/vm/vm_page.c	Mon Mar 23 14:01:42 2009 -0400
@@ -620,6 +620,7 @@
 		 * initialize other fields in the page_t
 		 */
 		PP_SETFREE(pp);
+		PP_CLRINIT(pp);
 		page_clr_all_props(pp, 0);
 		PP_SETAGED(pp);
 		pp->p_offset = (u_offset_t)-1;
@@ -2233,6 +2234,20 @@
 		ASSERT(!hat_page_is_mapped(pp));
 		PP_CLRFREE(pp);
 		PP_CLRAGED(pp);
+#ifdef __s390x
+		/*
+		 * The reference and change bits of a page are associated
+		 * with the physical page and not part of the PTE like SPARC or
+		 * Intel, so we set the page as clean here
+		 */
+		{
+			uint64_t ra = (pp->p_pagenum << MMU_PAGESHIFT);
+			PP_CLRINIT(pp);
+			__asm__ ("	lghi	1,0\n"
+				 "	sske	1,%0\n"
+				 : : "r" (ra) : "1");
+		}
+#endif
 		if (!page_hashin(pp, vp, off, NULL))
 			panic("page_create_large: hashin failed: page %p",
 			    (void *)pp);
@@ -2523,6 +2538,20 @@
 		 */
 		page_io_lock(pp);
 		page_add(&plist, pp);
+#ifdef __s390x
+		/*
+		 * The reference and change bits of a page are associated
+		 * with the physical page and not part of the PTE like SPARC or
+		 * Intel, so we set the page as clean here
+		 */
+		{
+			uint64_t ra = (pp->p_pagenum << MMU_PAGESHIFT);
+			PP_CLRINIT(pp);
+			__asm__ ("	lghi	1,0\n"
+				 "	sske	1,%0\n"
+				 : : "r" (ra) : "1");
+		}
+#endif
 		plist = plist->p_next;
 		off += PAGESIZE;
 		vaddr += PAGESIZE;
@@ -2537,6 +2566,7 @@
 		 */
 		VM_STAT_ADD(page_create_putbacks);
 		PP_SETFREE(npp);
+		PP_CLRINIT(npp);
 		PP_SETAGED(npp);
 		npp->p_offset = (u_offset_t)-1;
 		page_list_add(npp, PG_FREE_LIST | PG_LIST_TAIL);
@@ -2651,6 +2681,7 @@
 	ASSERT(!hat_page_getshare(pp));
 
 	PP_SETFREE(pp);
+	PP_CLRINIT(pp);
 	ASSERT(pp->p_vnode == NULL || !IS_VMODSORT(pp->p_vnode) ||
 	    !hat_ismod(pp));
 	page_clr_all_props(pp, 0);
@@ -2794,6 +2825,7 @@
 		ASSERT(tpp->p_szc == szc);
 
 		PP_SETFREE(tpp);
+		PP_CLRINIT(tpp);
 		page_clr_all_props(tpp, 0);
 		PP_SETAGED(tpp);
 		tpp->p_offset = (u_offset_t)-1;
@@ -3136,6 +3168,7 @@
 		ASSERT(tpp->p_szc == szc);
 
 		PP_SETFREE(tpp);
+		PP_CLRINIT(tpp);
 		page_clr_all_props(tpp, 0);
 		PP_SETAGED(tpp);
 		ASSERT(tpp->p_next == tpp);
@@ -4941,6 +4974,7 @@
 			ASSERT(!hat_page_is_mapped(tpp));
 			ASSERT(tpp->p_szc == szc);
 			PP_SETFREE(tpp);
+			PP_CLRINIT(tpp);
 			PP_SETAGED(tpp);
 			npgs--;
 		} while ((tpp = tpp->p_next) != *target);
@@ -4969,6 +5003,7 @@
 			page_sub(&pplist, pp);
 			page_clr_all_props(pp, 0);
 			PP_SETFREE(pp);
+			PP_CLRINIT(pp);
 			PP_SETAGED(pp);
 			page_list_add(pp, PG_FREE_LIST | PG_LIST_TAIL);
 			page_unlock(pp);
@@ -4983,6 +5018,7 @@
 				ASSERT(!hat_page_is_mapped(tpp));
 				page_clr_all_props(tpp, 0);
 				PP_SETFREE(tpp);
+				PP_CLRINIT(tpp);
 				PP_SETAGED(tpp);
 			} while ((tpp = tpp->p_next) != pp);
 			page_list_add_pages(pp, 0);
--- a/usr/src/uts/common/vm/vm_pagelist.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/vm/vm_pagelist.c	Mon Mar 23 14:01:42 2009 -0400
@@ -3272,6 +3272,7 @@
 			ASSERT(!PP_ISFREE(targpp));
 			ASSERT(!PP_ISNORELOC(targpp));
 			PP_SETFREE(targpp);
+			PP_CLRINIT(targpp);
 			ASSERT(PP_ISAGED(targpp));
 			ASSERT(targpp->p_szc < szc || (szc == 0 &&
 			    (flags & PGI_PGCPSZC0)));
--- a/usr/src/uts/common/vm/vpm.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/common/vm/vpm.c	Mon Mar 23 14:01:42 2009 -0400
@@ -754,6 +754,18 @@
 			if (newpage != NULL)
 				*newpage = 1;
 
+#ifdef __s390x
+			/*
+			 * For pages created here we need to flag them
+			 * as "initialized for I/O" which tells fop_getpage()
+			 * not to reset the MOD/REF bits. This only needs doing
+			 * on System z because these bits are associated with the
+			 * physical page not the PTE as with SPARC and x86
+			 * See the comments in vnode.c for more details
+			 */
+			PP_SETINIT(pp);
+#endif
+
 			page_io_unlock(pp);
 		}
 
--- a/usr/src/uts/s390x/conf/Mapfile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/conf/Mapfile	Mon Mar 23 14:01:42 2009 -0400
@@ -1,199 +1,55 @@
-/* Default linker script, for normal executables */
-OUTPUT_FORMAT("elf64-s390", "elf64-s390",
-	      "elf64-s390")
-OUTPUT_ARCH(s390:64-bit)
-ENTRY(_start)
-SEARCH_DIR("/usr/local/s390x-ibm-solaris2/lib");
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x100000); 
-  . = 0x100000 + SIZEOF_HEADERS;
-  PROVIDE (_mod_start = .);
-  .interp         : { *(.interp) }
-  .hash           : { *(.hash) }
-  .gnu.hash       : { *(.gnu.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.init       : { *(.rel.init) }
-  .rela.init      : { *(.rela.init) }
-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rel.fini       : { *(.rel.fini) }
-  .rela.fini      : { *(.rela.fini) }
-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rel.data.rel.ro   : { *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*) }
-  .rela.data.rel.ro   : { *(.rela.data.rel.ro* .rela.gnu.linkonce.d.rel.ro.*) }
-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rel.tdata	  : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-  .rela.tdata	  : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rel.tbss	  : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-  .rela.tbss	  : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rel.ctors      : { *(.rel.ctors) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rel.dtors      : { *(.rel.dtors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rel.got        : { *(.rel.got) }
-  .rela.got       : { *(.rela.got) }
-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-  .init           :
-  {
-    KEEP (*(.init))
-  } =0x07070707
-  .plt            : { *(.plt) }
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } =0x07070707
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } =0x07070707
-/*
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-*/
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-  /* Thread Local Storage sections  */
-  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  }
-  .init_array     :
-  {
-     PROVIDE_HIDDEN (__init_array_start = .);
-     KEEP (*(SORT(.init_array.*)))
-     KEEP (*(.init_array))
-     PROVIDE_HIDDEN (__init_array_end = .);
-  }
-  .fini_array     :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  }
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-    /* We don't want to include the .ctor section from
-       the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  }
-  .dtors          :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
-  .dynamic        : { *(.dynamic) }
-  . = DATA_SEGMENT_RELRO_END (0, .);
-  .got            : { *(.got.plt) *(.got) }
-  . = ALIGN(0x1000);
-  PROVIDE (_sdata = .);
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  }
-  .data1          : { *(.data1) }
-/*
-  _edata = .; PROVIDE (edata = .);
-*/
-  __bss_start = .;
-  .bss            :
-  {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.
-      FIXME: Why do we need it? When there is no .bss section, we don't
-      pad the .data section.  */
-   . = ALIGN(. != 0 ? 64 / 8 : 1);
-  }
-  . = ALIGN(64 / 8);
-  _end = .; PROVIDE (end = .);
-  . = DATA_SEGMENT_END (.);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /DISCARD/ : { *(.note.GNU-stack) }
-  PROVIDE (_mod_end = .);
-}
+#
+# Copyright 2007 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
+#
+
+#
+# Some four meg of kernel virtual address space
+# is mapped via a locked 4-meg mapping in the ITLB
+#
+text	= LOAD ?RX V0x0100000;
+text	| .interp;
+text	| .text;
+text	: $PROGBITS ?A!W;
+
+#
+# Another four meg of kernel virtual address space
+# is mapped via a locked 4-meg mapping in the DTLB
+#
+data	= LOAD ?RWX V0x0220000;
+data	| .data;
+data	: $PROGBITS ?AW;
+data	: $NOBITS ?AW;
+
+#
+# put reloc seg in space between text and data
+# it will be freed by the kernel after use
+#
+reloc	= LOAD ?RW V0x02c0000;
+reloc	: $DYNSYM;
+reloc	: $HASH;
+reloc	: .dynstr;
+reloc	: .rela.text;
+reloc	: .rela.data;
+
+note	= NOTE;
+note	: $NOTE;
--- a/usr/src/uts/s390x/kipl/kipl.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/kipl/kipl.s	Mon Mar 23 14:01:42 2009 -0400
@@ -123,27 +123,33 @@
 	.section	".data"
 
 	.global availmem
+	.type	availmem, @object
 availmem:
 	 .quad	0
 	.size	availmem, 8
 
 	.global highmem
+	.type	highmem, @object
 highmem:
 	 .quad	0
 	.size	highmem, 8
 
 	.align	8
 	.global	sysMemory
+	.type	sysMemory, @object
 sysMemory:
 	.quad	memoryChunks
 	.size	sysMemory, .-sysMemory
+
 #define NUM_CHUNKS 10
 	.global memoryChunks
+	.type	memoryChunks, @object
 memoryChunks:
 	.skip	NUM_CHUNKS*3*8
 	.size	memoryChunks, .-memoryChunks
 
 	.global	nMemChunk
+	.type	nMemChunk, @object
 nMemChunk:
 	.word	0
 	.size	nMemChunk, .-nMemChunk
@@ -171,11 +177,13 @@
 
 	.align	8
 	.global	bootScratch
+	.type	bootScratch, @object
 bootScratch:
 	.quad	0
 	.size	bootScratch, .-bootScratch
 
 	.global	bootScratchEnd
+	.type	bootScratchEnd, @object
 bootScratchEnd:
 	.quad	0
 	.size	bootScratch, .-bootScratchEnd
@@ -188,6 +196,7 @@
 
 	.align	4096
 	.global stsiInfo
+	.type	stsiInfo, @object
 stsiInfo:
 	.skip	4096
 	.size	stsiInfo, .-stsiInfo
@@ -212,8 +221,20 @@
 	.text
 /*
  * Boot initialization
+ *
+ * Te fields _unix and _elfsz are filled in by the kipl_cvt command
+ * which converts the elf module into a System z "text deck". Optionally,
+ * it will also set the _ramdk and _eramd fields with the start and end
+ * addresses of a RAMDISK image that was supplied to the command. If these
+ * fields are blank then the bootstrapper will issue DIAG 64 to get the
+ * RAMDISK from a DCSS.
  */
 	.global _boot,_unix,_elfsz,_ramdk,_eramd
+	.type	_boot, @object
+	.type	_unix, @object
+	.type	_elfsz, @object
+	.type	_ramdk, @object
+	.type	_eramd, @object
 _boot:
 _unix: 	.quad	0
 _elfsz: .quad   0
@@ -397,7 +418,7 @@
 	//
 	// Clear bss
 	//
-	larl	%r0,__bss_start		// Get A(Start of BSS)
+	larl	%r0,_END_		// Get A(Start of BSS)
 	larl	%r1,_end		// Get A(End of BSS)
 	sgr	%r1,%r0			// Determine length
 	lghi	%r2,0			// Clear source ptr
--- a/usr/src/uts/s390x/kipl/kipl_mem.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/kipl/kipl_mem.c	Mon Mar 23 14:01:42 2009 -0400
@@ -130,10 +130,10 @@
 static void memlists_print(void);
 caddr_t bkern_alloc(caddr_t, size_t, int);
 void bkern_free(caddr_t, size_t);
-static void updateHtable(void *pRSP, htable_t *ht, int level, 
-			 void *vAddr, htable_t *parent);
+static void updateHtable(void *pRSP, htable_t *ht);
 static void kipl_kpm_init(void);
 static void kipl_mmu_init(void);
+static void makeHtable(void *, htable_t *, int, htable_t *, htable_t *, void *);
 
 /*========================= End of Prototypes ======================*/
 
@@ -182,6 +182,39 @@
 /*		                               		 	    */
 /*------------------------------------------------------------------*/
 
+static void __inline__
+makeHtable(void *pRSP, htable_t *ht, int level, 
+	   htable_t *prev, htable_t *parent, void *vAddr)
+{
+	ht->ht_org       = pRSP;
+	ht->ht_pfn       = (uintptr_t) pRSP >> 12;
+	ht->ht_level     = level;
+	ht->ht_parent    = parent;
+	ht->ht_prev      = prev;
+	ht->ht_valid_cnt = 0;
+	if (prev != NULL) 
+		prev->ht_next = ht;
+	prev	         = ht;
+	ht->ht_next      = NULL;
+	ht->ht_vaddr     = (uintptr_t) vAddr;
+	ht->ht_len       = RSP[level].tLen;
+	ht->ht_num_ptes  = RSP[level].nEnt;
+	ht->ht_flags	 = HTABLE_PRIMAL;
+	RSP[level].init(pRSP, ht->ht_len);
+
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/*                                                                  */
+/* Name		- init_DAT.                                         */
+/*                                                                  */
+/* Function	- Allocate space for nucleus Region, Segment and    */
+/*		  Page Tables.					    */
+/*		                               		 	    */
+/*------------------------------------------------------------------*/
+
 htable_t *
 init_DAT(memoryChunk *sysMem, int nChunk)
 {
@@ -272,7 +305,7 @@
 	if (pRSP == NULL)
 		return (NULL);
 
-	updateHtable(pRSP, pHtable, 4, NULL, NULL);
+	updateHtable(pRSP, pHtable);
 
 	/*----------------------------------------------------------*/
 	/* Create enough Region/Segment/Page tables to map real     */
@@ -344,8 +377,13 @@
 		pageTbl = (pte *) ht->ht_org;
 		pfra    = (uintptr_t) ht->ht_vaddr;
 		for (iPfra = 0; iPfra < PT_SINGLE; iPfra++) {
-			if (pfra >= COREHEAP_BASE) 
-				break;
+			/*
+			 * We leave a hole where the kernel modules
+			 * are to be loaded
+			 */
+			if ((pfra >= COREHEAP_BASE) &&
+			    (pfra <  COREHEAP_END))
+				continue;
 			pageTbl->pfra    = pfra >> 12;
 			pageTbl->invalid = 0;
 			pfra		 = pfra + MMU_PAGESIZE;
@@ -368,43 +406,117 @@
 /*------------------------------------------------------------------*/
 
 static void
-updateHtable(void *pRSP, htable_t *ht, int level, 
-	     void *vAddr, htable_t *parent) 
+updateHtable(void *pRSP, htable_t *ht)
 {
-	htable_t *prev = NULL;	// Previous htable_t
+	htable_t *prev,		// Previous htable_t
+		 *parent,
+		 *cHt;		// Child htable_t
+
+	void	 *vAddr; 	// Starting vAddr;
 
 	size_t iRSP;		// Index through RSP table
 
-	for (iRSP = 0; iRSP < RSP[level].nTables; iRSP++) {
-		if (iRSP == 0) {
-			RSP[level].ht  	= ht;
-			RSPTable[level]	= ht;
-		}
-		ht->ht_org       = pRSP;
-		ht->ht_pfn       = (uintptr_t) pRSP >> 12;
-		ht->ht_level     = level;
-		ht->ht_parent    = parent;
-		ht->ht_prev      = prev;
-		ht->ht_valid_cnt = 0;
-		if (prev != NULL) 
-			prev->ht_next = ht;
-		prev	         = ht;
-		ht->ht_next      = NULL;
-		ht->ht_vaddr     = (uintptr_t) vAddr;
-		ht->ht_len       = RSP[level].tLen;
-		ht->ht_num_ptes  = RSP[level].nEnt;
-		ht->ht_flags	 = HTABLE_PRIMAL;
-		RSP[level].init(pRSP, ht->ht_len);
-		pRSP	        += ht->ht_len;
-		if (level > 0) {
-			ht++;
-			prev->ht_child = ht;
-			updateHtable(pRSP, ht, level-1, vAddr, ht);
-		} else {
-			ht->ht_child = NULL;
-			vAddr       += SEGMSIZE;
-			ht++;
-		}
+	RSP[4].ht  	= ht;
+	RSPTable[4]	= ht;
+	vAddr		= NULL;
+	parent		= NULL;
+	prev		= NULL;
+
+	for (iRSP = 0; iRSP < RSP[4].nTables; iRSP++) {
+		makeHtable(pRSP, ht, 4, prev, parent, vAddr);
+		prev		 = ht;
+		pRSP		+= ht->ht_len;
+		ht++;
+	}
+
+	RSP[3].ht  	= ht;
+	RSPTable[3]	= ht;
+	vAddr		= NULL;
+	parent		= RSP[4].ht;
+	prev		= NULL;
+
+	for (iRSP = 0; iRSP < RSP[3].nTables; iRSP++) {
+		makeHtable(pRSP, ht, 3, prev, parent, vAddr);
+		prev		 = ht;
+		pRSP		+= ht->ht_len;
+		ht++;
+		parent++;
+		prev->ht_child	 = ht;
+		vAddr		+= ASPACE_CHUNK53;
+	}
+
+	RSP[2].ht  	= ht;
+	RSPTable[2]	= ht;
+	vAddr		= NULL;
+	parent		= RSP[3].ht;
+	prev		= NULL;
+
+	for (iRSP = 0; iRSP < RSP[2].nTables; iRSP++) {
+		makeHtable(pRSP, ht, 2, prev, parent, vAddr);
+		prev		 = ht;
+		pRSP		+= ht->ht_len;
+		ht++;
+		parent++;
+		vAddr		+= ASPACE_CHUNK42;
+	}
+
+	RSP[1].ht  	= ht;
+	RSPTable[1]	= ht;
+	vAddr		= NULL;
+	parent		= RSP[2].ht;
+	prev		= NULL;
+
+	for (iRSP = 0; iRSP < RSP[1].nTables; iRSP++) {
+		makeHtable(pRSP, ht, 1, prev, parent, vAddr);
+		prev		 = ht;
+		pRSP		+= ht->ht_len;
+		ht->ht_child	 = NULL;
+		ht++;
+		parent++;
+		vAddr		+= ASPACE_CHUNK31;
+	}
+
+	RSP[0].ht  	= ht;
+	RSPTable[0]	= ht;
+	vAddr		= NULL;
+	parent		= RSP[1].ht;
+	prev		= NULL;
+
+	for (iRSP = 0; iRSP < RSP[0].nTables; iRSP++) {
+		makeHtable(pRSP, ht, 0, prev, parent, vAddr);
+		prev		 = ht;
+		pRSP		+= ht->ht_len;
+		ht++;
+		parent++;
+		vAddr		+= ASPACE_CHUNK20;
+	}
+
+	ht  = RSP[4].ht;
+	cHt = RSP[3].ht;
+	for (iRSP = 0; iRSP < RSP[4].nTables; iRSP++) {
+		ht[iRSP].ht_child = cHt;
+		cHt		  = cHt + RSP[4].nEnt;
+	}
+
+	ht  = RSP[3].ht;
+	cHt = RSP[2].ht;
+	for (iRSP = 0; iRSP < RSP[3].nTables; iRSP++) {
+		ht[iRSP].ht_child = cHt;
+		cHt		  = cHt + RSP[3].nEnt;
+	}
+
+	ht  = RSP[2].ht;
+	cHt = RSP[1].ht;
+	for (iRSP = 0; iRSP < RSP[2].nTables; iRSP++) {
+		ht[iRSP].ht_child = cHt;
+		cHt		  = cHt + RSP[2].nEnt;
+	}
+
+	ht  = RSP[1].ht;
+	cHt = RSP[0].ht;
+	for (iRSP = 0; iRSP < RSP[1].nTables; iRSP++) {
+		ht[iRSP].ht_child = cHt;
+		cHt		  = cHt + RSP[1].nEnt;
 	}
 }
 
@@ -711,11 +823,11 @@
 	RSP[1].nTables = nSegTbls / ST_SINGLE + (nSegTbls % ST_SINGLE != 0);
 	RSP[0].nTables = nPageTbls / PT_SINGLE;
 
-	RSP[4].lTables = roundup(nRegion1  * sizeof(rte), MMU_PAGESIZE);
-	RSP[3].lTables = roundup(nRegion2  * sizeof(rte), MMU_PAGESIZE);
-	RSP[2].lTables = roundup(nRegion3  * sizeof(rte), MMU_PAGESIZE);
-	RSP[1].lTables = roundup(nSegTbls  * sizeof(ste), MMU_PAGESIZE);
-	RSP[0].lTables = roundup(nPageTbls * sizeof(pte), MMU_PAGESIZE);
+	RSP[4].lTables = roundup(RSP[4].nTables * R1_SINGLE * sizeof(rte), MMU_PAGESIZE);
+	RSP[3].lTables = roundup(RSP[3].nTables * R2_SINGLE * sizeof(rte), MMU_PAGESIZE);
+	RSP[2].lTables = roundup(RSP[2].nTables * R3_SINGLE * sizeof(rte), MMU_PAGESIZE);
+	RSP[1].lTables = roundup(RSP[1].nTables * ST_SINGLE * sizeof(ste), MMU_PAGESIZE);
+	RSP[0].lTables = roundup(RSP[0].nTables * PT_SINGLE * sizeof(pte), MMU_PAGESIZE);
 
 	RSP[4].tLen    = R1_SINGLE * sizeof(rte);
 	RSP[3].tLen    = R2_SINGLE * sizeof(rte);
@@ -1058,6 +1170,7 @@
 	}
 	(void) memlist_remove(&pfreelistp, 0, LOMEM);
 	(void) memlist_remove(&pavailistp, 0, LOMEM);
+	(void) memlist_remove(&pfreelistp, COREHEAP_BASE, (COREHEAP_END - COREHEAP_BASE));
 
 	memlist_init = 1;
 
--- a/usr/src/uts/s390x/ml/interrupt.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/ml/interrupt.s	Mon Mar 23 14:01:42 2009 -0400
@@ -602,7 +602,7 @@
 0:
 	brasl	%r14,tod2ticks			// Update lbolt
 #ifdef DEBUG
-	lm	%r0,%r1,__LC_PGM_OLD_PSW	// Get old PSW
+	lmg	%r0,%r1,__LC_PGM_OLD_PSW	// Get old PSW
 	llgh	%r3,__LC_PGM_INTCODE		// Get interrupt code
 	lg	%r4,__LC_XLT_EXCID		// Get translate id
 	tracg	%r0,%r15,__LC_PGM_TRACE		// Add trace table entry
@@ -738,6 +738,10 @@
 	ENTRY_NP(io_flih)
 	KENTER  __LC_IO_OLD_PSW,0,0
 	brasl	%r14,tod2ticks		// Update lbolt
+#ifdef DEBUG
+	lmg	%r0,%r1,__LC_IO_OLD_PSW
+	tracg	%r0,%r15,__LC_IO_TRACE	// Trace this syscall
+#endif
 
 	lghi	%r3,S390_INTR_IO	// Set vector
 	la	%r2,MINFRAME(%r15)	// Copy stack ptr
--- a/usr/src/uts/s390x/ml/mach_locore.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/ml/mach_locore.s	Mon Mar 23 14:01:42 2009 -0400
@@ -201,11 +201,16 @@
 	.size	facilities, 8
 
 	.align	8
-	.global hw_serial
-hw_serial:
-	.quad	0
-	.quad	0
-	.size	hw_serial, 8
+	.global cpu_id
+	.global cpu_model
+	.type	cpu_id, @object
+	.type	cpu_model, @object
+cpu_id:
+	.long	0
+	.size	cpu_id, 4
+cpu_model:
+	.long	0
+	.size	cpu_model, 4
 
 	.global	boottime
 boottime:
@@ -306,7 +311,7 @@
 	//
 	// Save our CPU id
 	//
-	larl	%r1,hw_serial
+	larl	%r1,cpu_id
 	stidp	0(%r1)
 
 	//
--- a/usr/src/uts/s390x/ml/swtch.s	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/ml/swtch.s	Mon Mar 23 14:01:42 2009 -0400
@@ -614,6 +614,9 @@
 	lgf	%r2,CPU_BASE_SPL(%r8)		// Get base spl
 	brasl	%r14,setspl			// Set as our interrupt level
 	aghi	%r15,SA(MINFRAME)		// sp := t->t_sp
+#ifdef DEBUG
+	tracg	%r0,%r15,__LC_RSI_TRACE
+#endif
 	br	%r13
 0:
 	//
@@ -636,6 +639,9 @@
 	// We're a non-interrupt thread and cpu_kprunrun is set. call kpreempt.
 	//
 	lghi	%r2,KPREEMPT_SYNC
+#ifdef DEBUG
+	tracg	%r0,%r15,__LC_PRE_TRACE
+#endif
 	brasl	%r14,kpreempt
 	j	1b
 	SET_SIZE(resume_from_intr)
--- a/usr/src/uts/s390x/os/mlsetup.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/os/mlsetup.c	Mon Mar 23 14:01:42 2009 -0400
@@ -105,6 +105,8 @@
 extern void	cpu_wait(void);
 extern void	cpu_wakeup(struct cpu *, int);
 extern char	traceTbl[];
+extern uint32_t	cpu_id;
+extern char	hw_serial[9];		// Hardware serial number
 
 /*=================== End of External References ===================*/
 
@@ -140,6 +142,7 @@
 mlsetup(void *ksp)
 {
 	unsigned long long pa;
+	uint32_t serial;
 	_pfxPage *pfx = NULL;
 	ctlr12	 cr12;
 
@@ -152,6 +155,12 @@
 	tod2ticks();
 
 	/*
+	 * Set hw_serial
+	 */
+	serial = cpu_id & 0x00ffffff;
+	sprintf(hw_serial, "%08x", serial);
+
+	/*
 	 * initialize cpu_self
 	 */
 	cpu0.cpu_self     = &cpu0;
@@ -221,6 +230,9 @@
 	pfx->__lc_pgm_trace	  = 2 | TRACE_ENABLE;
 	pfx->__lc_hat_trace	  = 3 | TRACE_ENABLE;
 	pfx->__lc_any_trace	  = 4 | TRACE_ENABLE;
+	pfx->__lc_io_trace	  = 5 | TRACE_ENABLE;
+	pfx->__lc_rsi_trace	  = 6 | TRACE_ENABLE;
+	pfx->__lc_pre_trace	  = 7 | TRACE_ENABLE;
 	bzero(&CPU->cpu_ftrace, sizeof(ftrace_data_t));
 	
 	idle_cpu 	= cpu_wait;
--- a/usr/src/uts/s390x/os/pgm_slih.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/os/pgm_slih.c	Mon Mar 23 14:01:42 2009 -0400
@@ -379,7 +379,7 @@
 		}
 	}
 
-	if (res != 0) {
+	if (res > 0) {
 		siginfo.si_addr = addr;
 		if (FC_CODE(res) == FC_OBJERR) {
 			siginfo.si_errno = FC_ERRNO(res);
@@ -395,8 +395,8 @@
 			fault 		 = FLTBOUNDS;
 		}
 #if 1
-msgnoh("program check at %lx code: %x signo: %x si_code: %x addr: %p thr: %p\n",
-ctx->psw.pc, code, siginfo.si_signo, siginfo.si_code, siginfo.si_addr, thr);
+msgnoh("program check at %lx code: %x signo: %x si_code: %x addr: %p thr: %p res: %d\n",
+ctx->psw.pc, code, siginfo.si_signo, siginfo.si_code, siginfo.si_addr, thr, res);
 #endif
 	}
 
@@ -467,7 +467,11 @@
 		ctx->psw.key  = 0;
 		ctx->psw.prob = 0;
 		ctx->gregs[2] = res;
-		res	      = 0;
+
+		/*
+		 * Indicate we don't want to retry instruction that failed 
+		 */
+		res	      = -1;	
 	}
 	return (res);
 }
--- a/usr/src/uts/s390x/os/ppage.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/os/ppage.c	Mon Mar 23 14:01:42 2009 -0400
@@ -132,7 +132,7 @@
 	long  	 key;
 	_pfxPage *pfx = NULL;	
 	
-//	GET_KEY(to, key);
+	GET_KEY(to, key);
 
 	__asm__ ("	lgr	0,%1\n"
 		 "	lgr	1,%2\n"
@@ -140,12 +140,12 @@
 		 "	lgr	2,%3\n"
 		 "	stnsm	%0,0\n"
 		 "	mvcl	0,2\n"
+		 "	sske	%4,%1\n"
 		 "	ssm	%0\n"
 		 : "=m" (pfx->__lc_scratch)
-		 : "r" (to), "r" (MMU_PAGESIZE), "r" (from)
+		 : "r" (to), "r" (MMU_PAGESIZE), "r" (from), "r" (key)
 		 : "0", "1", "2", "3", "memory", "cc");
 
-//	SET_KEY(to, key);
 }
 
 /*========================= End of Function ========================*/
@@ -172,12 +172,12 @@
 		 "	lgr	2,%1\n"
 		 "	stnsm	%0,0\n"
 		 "	mvcl	0,2\n"
+		 "	sske	%3,%1\n"
 		 "	ssm	%0\n"
 		 : "=m" (pfx->__lc_scratch)
-		 : "r" (to), "r" (len)
+		 : "r" (to), "r" (len), "r" (key)
 		 : "0", "1", "2", "3", "memory", "cc");
 
-	SET_KEY(to, key);
 }
 
 /*========================= End of Function ========================*/
--- a/usr/src/uts/s390x/os/sclp.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/os/sclp.c	Mon Mar 23 14:01:42 2009 -0400
@@ -117,8 +117,8 @@
 
 static sclp_req_t sclp_curreq;
 
-static char msgbuf[256];
-static size_t msgpos;
+static char msgnohbuf[256] __attribute__((aligned(8)));
+uint64_t msglock = 0;
 
 /*====================== End of Global Variables ===================*/
 
@@ -136,25 +136,41 @@
 {
 	va_list val;
 	int i;
+	char msgbuild[256];
+	size_t msgpos;
 
 	va_start(val, fmt);
-	strcpy(msgbuf, "MSGNOH * AT * - ");
-	msgpos = strlen(msgbuf);
+	strcpy(msgbuild, "MSGNOH * AT * - ");
+	msgpos = strlen(msgbuild);
 
-	msgpos += vsnprintf(&msgbuf[msgpos],
-			    sizeof(msgbuf) - msgpos,
+	msgpos += vsnprintf(&msgbuild[msgpos],
+			    sizeof(msgbuild) - msgpos,
 			    fmt,
 			    val);
 
-	a2e(msgbuf,  msgpos);
+	a2e(msgbuild,  msgpos);
+
+	__asm__ ("	lghi	1,0\n"
+		 "	stnsm	0(1),0x4\n"
+		 : : : "0");
+
+	while (__sync_lock_test_and_set(&msglock, 1) != 0);
+
+	bcopy(msgbuild, msgnohbuf, msgpos);
 
 	__asm__("	lgr	1,%0\n"
 		"	lgr	3,%1\n"
 		"	lghi	4,0\n"
 		"	diag	1,3,0x8\n"
 		:
-		: "r" (msgbuf), "r" (msgpos)
+		: "r" (msgnohbuf), "r" (msgpos)
 		: "1", "2", "3", "4");
+
+	__sync_lock_release(&msglock);
+
+	__asm__ ("	lghi	1,0\n"
+		 "	ssm	0(1)\n"
+		 : : : "0");
 }
 
 /*========================= End of Function ========================*/
--- a/usr/src/uts/s390x/os/startup.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/os/startup.c	Mon Mar 23 14:01:42 2009 -0400
@@ -82,7 +82,7 @@
 //                       |    segkpm segment     | 
 //                       | (64-bit kernel ONLY)  |
 //                       |                       |
-// 0xFFFFFA00.00000000  -|-----------------------|- 2TB segkpm alignment
+// 0x80000000.00000000  -|-----------------------|- 8EB segkpm alignment
 //                       :                       :
 //                       :                       :
 //                       :                       :		   ^
@@ -511,7 +511,7 @@
  * routine.
  */
 int	kernel_cage_enable = 1,
-	prom_debug = 1,
+	prom_debug = 0,
 	physMemInit = 0;	// page_t has been initialized
 
 int nCPU;			// Number of CPUs on this system
--- a/usr/src/uts/s390x/sys/machparam.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/sys/machparam.h	Mon Mar 23 14:01:42 2009 -0400
@@ -132,7 +132,7 @@
  * Define SEGKPMBASE, start of the segkpm segment.
  */
 
-#define	SEGKPMBASE	ADDRESS_C(0xFFFFFFFF80000000)
+#define	SEGKPMBASE	ADDRESS_C(0x0020000000000000)
 
 /*
  * Define SEGMAPBASE, start of the segmap segment.
--- a/usr/src/uts/s390x/unix/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/unix/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -91,8 +91,9 @@
 #
 #	Overrides
 #
-CLEANFILES	+= $(UNIX_O) $(MODSTUBS_O) $(OBJS_DIR)/vers.c \
-		   $(OBJS_DIR)/vers.o $(CPU_OBJ) $(CPULIB) \
+CLEANFILES	+= $(UNIX_O) $(MODSTUBS_O) $(OBJECTS)	\
+		   $(OBJS_DIR)/vers.c $(OBJS_DIR)/vers.o \
+		   $(CPU_OBJ) $(CPULIB) \
 		   $(DTRACESTUBS_O) $(DTRACESTUBS)
 
 CLOBBERFILES	= $(CLEANFILES) $(UNIX_BIN)
@@ -135,12 +136,10 @@
 
 install: $(INSTALL_DEPS)
 
-$(UNIX_BIN):	$(UNIX_O) $(MODSTUBS_O) $(MAPFILE)		\
-		$(GENLIB) $(DTRACESTUBS) $(KIPL_O)
-	$(LD) -dy -pie -o $@ -e _kipl --script=$(MAPFILE) 	\
-	    -Map $(OBJS_DIR)/unix.map 				\
-	    $(UNIX_O) $(MODSTUBS_O) $(LIBOPTS) 			\
-	    $(DTRACESTUBS)
+$(UNIX_BIN):	$(UNIX_O) $(MODSTUBS_O) $(MAPFILE) $(LIBS)	\
+		$(DTRACESTUBS) $(KIPL_O)
+	$(LD) -dy -b -o $@ -e _kipl -M $(MAPFILE) 		\
+	    $(UNIX_O) $(MODSTUBS_O) $(LIBOPTS) $(DTRACESTUBS)
 	$(CTFMERGE_UNIQUIFY_AGAINST_GENUNIX)
 	kipl_cvt -o $(OBJS_DIR)/sirius.text 			\
 		-u $(OBJS_DIR)/unix
--- a/usr/src/uts/s390x/vm/hat_s390x.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/vm/hat_s390x.c	Mon Mar 23 14:01:42 2009 -0400
@@ -313,7 +313,6 @@
 // Control tracing for DEBUG code
 //
 int hattrace = 0;
-      
 
 //
 // If in case one day s390x supports > 4K page sizes
@@ -377,10 +376,10 @@
 
 		if (flags & HAT_LOAD_NOCONSIST) {
 			PTE_SET(pte, PT_NOCONSIST);
-			key |= SK_REF | SK_MOD;
+//			key |= SK_REF | SK_MOD;
 		} else if (attr & HAT_NOSYNC) {
 			PTE_SET(pte, PT_NOSYNC);
-			key |= SK_REF | SK_MOD;
+//			key |= SK_REF | SK_MOD;
 		}
 
 		if (attr & PROT_WRITE) {
@@ -390,7 +389,7 @@
 			PTE_SET(pte, PG_PROTECT);
 		}
 
-		SET_KEY((pfn << MMU_PAGESHIFT), key);
+//		SET_KEY((pfn << MMU_PAGESHIFT), key);
 
 	}
 
@@ -425,7 +424,7 @@
 	uint_t		is_consist;
 
 	/*
-	 * Is this a consistant (ie. need mapping list lock) mapping?
+	 * Is this a consistent (ie. need mapping list lock) mapping?
 	 */
 	is_consist = (pp != NULL && (flags & HAT_LOAD_NOCONSIST) == 0);
 
@@ -2553,7 +2552,6 @@
 	}
 
 	PP_SETRM(pp, flag);
-
 	if (vphm != NULL) {
 
 		/*
--- a/usr/src/uts/s390x/vm/htable.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/vm/htable.c	Mon Mar 23 14:01:42 2009 -0400
@@ -120,11 +120,12 @@
 /*                   P r o t o t y p e s                            */
 /*------------------------------------------------------------------*/
 
-static void link_ptp(htable_t *higher, htable_t *new, uintptr_t vaddr);
-static void unlink_ptp(htable_t *higher, htable_t *old, uintptr_t vaddr);
-static void htable_free(htable_t *ht);
-static __inline__ s390xpte_t *s390xpte_access_pagetable(htable_t *ht);
-static __inline__ void s390xpte_release_pagetable(htable_t *ht);
+static void link_ptp(htable_t *, htable_t *, uintptr_t);
+static void unlink_ptp(htable_t *, htable_t *, uintptr_t);
+static void htable_free(htable_t *);
+static __inline__ s390xpte_t *s390xpte_access_pagetable(htable_t *);
+static __inline__ void s390xpte_release_pagetable(htable_t *);
+static void htable_reap(void *);
 
 /*========================= End of Prototypes ======================*/
 
@@ -298,25 +299,30 @@
 
 	nPages = MAX((mmu.pte_size * mmu.ptes_per_table[ht->ht_level] / MMU_PAGESIZE),1);
 
-	if (page_resv(nPages, KM_NOSLEEP) == 0)
-		return;
+	while (page_resv(nPages, KM_NOSLEEP) == 0) {
+		kmem_reap();
+		if (curthread != hat_reserves_thread)
+			htable_reap(NULL);
+	}
 
 #ifdef DEBUG
 	pp = page_exists(&kvp, offset);
 	if (pp != NULL)
 		panic("ptable already exists %p", pp);
 #endif
-	if (ht->ht_level == 0)
-		pp = page_create_va(&kvp, offset, MMU_PAGESIZE,
-				    PG_EXCL | PG_NORELOC, &tmpseg, (void *) offset);
-	else 
+	do {
 		pp = page_create_contig(&kvp, offset, (nPages * MMU_PAGESIZE),
 					PG_EXCL | PG_NORELOC, &tmpseg, 0, 0);
 
-	if (pp == NULL) {
+		if (pp == NULL)  {
+			__sync_fetch_and_add(&htable_dont_cache, 1);
 msgnoh("Unable to get a level %d ptable",ht->ht_level);
-		return;
-}
+			kmem_reap();
+			if (curthread != hat_reserves_thread)
+				htable_reap(NULL);
+			__sync_fetch_and_sub(&htable_dont_cache, 1);
+		}
+	} while (pp == NULL);
 
 	npp = pp;
 	do {
--- a/usr/src/uts/s390x/vm/mach_vm_dep.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/vm/mach_vm_dep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -55,6 +55,9 @@
 #define	CONTIG_LOCK()	mutex_enter(&contig_lock);
 #define	CONTIG_UNLOCK()	mutex_exit(&contig_lock);
 
+#define HEAPBASE_PFN	(COREHEAP_BASE >> MMU_PAGESHIFT)
+#define HEAPEND_PFN 	(COREHEAP_END  >> MMU_PAGESHIFT)
+
 /*========================= End of Defines =========================*/
 
 /*------------------------------------------------------------------*/
@@ -208,19 +211,21 @@
 	len += (2 * PAGESIZE);
 
 	/*
-	 * Align virtual addresses on a 4K boundary to ensure
+	 * Align virtual addresses on a boundary to ensure
 	 * that ELF shared libraries are mapped with the appropriate
 	 * alignment constraints by the run-time linker.
-	 */
-	align_amount = MMU_PAGESIZE;
-	if ((flags & MAP_ALIGN) && ((uintptr_t)*addrp != 0) &&
-		((uintptr_t)*addrp < align_amount))
-		align_amount = (uintptr_t)*addrp;
-
-	/*
+	 *
 	 * 64-bit processes require 1024K alignment of ELF shared libraries.
 	 */
-	align_amount = MAX(align_amount, MMU_SEGMSIZE);
+	if (p->p_model == DATAMODEL_LP64)
+		align_amount = MMU_SEGMSIZE;
+	else {
+		align_amount = MMU_PAGESIZE;
+		if ((flags & MAP_ALIGN) && ((uintptr_t)*addrp != 0) &&
+		    ((uintptr_t)*addrp < align_amount))
+			align_amount = (uintptr_t)*addrp;
+	}
+
 #ifdef VAC
 	if (vac && vacalign && (align_amount < shm_alignment))
 		align_amount = shm_alignment;
@@ -254,6 +259,9 @@
 		}
 
 		ASSERT(addr <= (as_addr + align_amount));
+if (((uintptr_t)addr & (align_amount - 1l)) != ((uintptr_t)(off & (align_amount - 1l))))
+msgnoh("addr: %lx align_amount: %lx off: %lx",
+addr,align_amount,off);
 		ASSERT(((uintptr_t)addr & (align_amount - 1l)) ==
 		    ((uintptr_t)(off & (align_amount - 1l))));
 		*addrp = addr;
@@ -454,16 +462,19 @@
 
 	while (pfn + minctg - 1 <= hi) {
 
-		plist = is_contigpage_free(&pfn, pgcnt, minctg, iolock);
-		if (plist) {
-			page_list_concat(&pplist, &plist);
-			/*
-			 * return when contig pages no longer needed
-			 */
-			if (!*pgcnt) {
-				startpfn = pfn;
-				CONTIG_UNLOCK();
-				return (pplist);
+		if ((pfn < HEAPBASE_PFN) ||
+		    (pfn > HEAPEND_PFN)) {
+			plist = is_contigpage_free(&pfn, pgcnt, minctg, iolock);
+			if (plist) {
+				page_list_concat(&pplist, &plist);
+				/*
+				 * return when contig pages no longer needed
+				 */
+				if (!*pgcnt) {
+					startpfn = pfn;
+					CONTIG_UNLOCK();
+					return (pplist);
+				}
 			}
 		}
 		if (bndry > 1)
@@ -484,18 +495,21 @@
 	/* allow search to go above startpfn */
 	while (pfn < startpfn) {
 
-		plist = is_contigpage_free(&pfn, pgcnt, minctg, iolock);
-		if (plist != NULL) {
+		if ((pfn < HEAPBASE_PFN) ||
+		    (pfn > HEAPEND_PFN)) {
+			plist = is_contigpage_free(&pfn, pgcnt, minctg, iolock);
+			if (plist != NULL) {
 
-			page_list_concat(&pplist, &plist);
+				page_list_concat(&pplist, &plist);
 
-			/*
-			 * return when contig pages no longer needed
-			 */
-			if (!*pgcnt) {
-				startpfn = pfn;
-				CONTIG_UNLOCK();
-				return (pplist);
+				/*
+				 * return when contig pages no longer needed
+				 */
+				if (!*pgcnt) {
+					startpfn = pfn;
+					CONTIG_UNLOCK();
+					return (pplist);
+				}
 			}
 		}
 		if (bndry > 1)
--- a/usr/src/uts/s390x/vm/mm_s390x.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/s390x/vm/mm_s390x.h	Mon Mar 23 14:01:42 2009 -0400
@@ -84,9 +84,10 @@
 		 : : "r" (key), "r" (ra) : "cc", "0")	
 
 #define	GET_KEY(ra, key)				\
-	__asm__ ("	lghi	%0,0\n"			\
-		 "	iske	%0,%1\n"		\
-		 : "+r" (key), "+r" (ra))		
+	__asm__ ("	lgr	1,%1\n"			\
+		 "	lghi	%0,0\n"			\
+		 "	iske	%0,1\n"			\
+		 : "=r" (key) : "r" (ra) : "1")		
 
 /*------------------------------------------------------*/
 /* Region entry table (1st, 2nd or 3rd level)		*/
--- a/usr/src/uts/zSeries/6to4tun/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/6to4tun/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,8 +65,7 @@
 #
 #	depends on tun
 #
-MDFLAGS		+= -Nstrmod/tun
-LDFLAGS		+= -dy
+LDFLAGS		+= -dy -Nstrmod/tun
 
 #
 #	Default build targets.
--- a/usr/src/uts/zSeries/Makefile.files	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/Makefile.files	Mon Mar 23 14:01:42 2009 -0400
@@ -160,105 +160,3 @@
 # since only C headers are included when #defined(lint) is true.
 #
 ASSYM_DEPS	+= 
-
-#
-# Modules that require _depends_on to be set as gnu ld doesn't support -N flag
-#
-6TO4TUN_OBJS	+= 6to4tun_depends.o
-AESPROV_OBJS	+= aes_depends.o
-AMSRC2_OBJS	+= amsrc_depends.o
-ARP_OBJS	+= arp_depends.o
-ATUN_OBJS	+= atun_depends.o
-AV1394_OBJS	+= av1394_depends.o
-BGE_OBJS	+= bge_depends.o
-BLOWFISHPROV_OBJS += blowfish_depends.o
-CONSCONFIG_OBJS	+= consconfig_depends.o
-CONSKBD_OBJS	+= conskbd_depends.o
-CRYPTO_OBJS	+= crypto_depends.o
-CRYPTOADM_OBJS  += cryptoadm_depends.o
-CTF_OBJS	+= ctf_depends.o
-DCAM1394_OBJS	+= dcam1394_depends.o
-DES_OBJS	+= des_depends.o
-DEV_OBJS	+= dev_depends.o
-DLCOSMK_OBJS	+= dlcosmk_depends.o
-DLD_OBJS	+= dld_depends.o
-DLS_OBJS	+= dls_depends.o
-DPROV_OBJS	+= dprov_depends.o
-DSCPMK_OBJS	+= dscpmk_depends.o
-EHCI_OBJS	+= ehci_depends.o
-FASTTRAP_OBJS	+= fasttrap_depends.o
-FBT_OBJS	+= fbt_depends.o
-FLOWACCT_OBJS	+= flowacct_depends.o
-FSSNAP_OBJS	+= fssnap_depends.o
-HCI1394_OBJS	+= hci1394_depends.o
-HID_OBJS	+= hid_depends.o
-HIDPARSER_OBJS	+= hidparser_depends.o
-IB_OBJS		+= ib_depends.o
-HUBD_OBJS	+= hubd_depends.o
-IBCM_OBJS	+= ibcm_depends.o
-IBD_OBJS	+= ibd_depends.o
-IBDM_OBJS	+= ibdm_depends.o
-IBMF_OBJS	+= ibmf_depends.o
-ICMP_OBJS	+= icmp_depends.o
-ICMP6_OBJS	+= icmp6_depends.o
-IDMAP_OBJS	+= idmap_depends.o
-IP_OBJS		+= ip_depends.o
-IP6_OBJS	+= ip6_depends.o
-IPCMSG_OBJS	+= msgsys_depends.o
-IPCSEM_OBJS	+= semsys_depends.o
-IPCSHM_OBJS	+= shmsys_depends.o
-IPF_OBJS	+= ipf_depends.o
-IPGPC_OBJS	+= ipgpc_depends.o
-IPSECAH_OBJS	+= ipsecah_depends.o
-IPSECESP_OBJS	+= ipsecesp_depends.o
-KB8042_OBJS	+= kb8042_depends.o
-KEYSOCK_OBJS	+= keysock_depends.o
-KMDB_OBJS	+= kmdb_depends.o
-KSSL_OBJS	+= kssl_depends.o
-LOCKSTAT_OBJS	+= lockstat_depends.o
-MAC_ETHER_OBJS	+= mac_ether_depends.o
-MD5_OBJS	+= md5_depends.o
-MIXER_OBJS	+= mixer_depends.o
-NATTYMOD_OBJS	+= nattymod_depends.o
-NET_DACF_OBJS	+= net_dacf_depends.o
-NETI_OBJS	+= neti_depends.o
-NFS_DLBOOT_OBJS += nfs_dlboot_depends.o
-NFSSRV_OBJS	+= nfssrv_depends.o
-OHCI_OBJS	+= ohci_depends.o
-PROFILE_OBJS	+= profile_depends.o
-PX_PCI_OBJS	+= px_pci_depends.o
-RANDOM_OBJS	+= random_depends.o
-RGE_OBJS	+= rge_depends.o
-RPCIB_OBJS	+= rpcib_depends.o
-RPCMOD_OBJS	+= rpcmod_depends.o
-RSA_OBJS	+= rsa_depends.o
-RSM_OBJS	+= rsm_depends.o
-RTS_OBJS	+= rts_depends.o
-SCSA1394_OBJS	+= scsa1394_depends.o
-SCSA2USB_OBJS	+= scsa2usb_depends.o
-SCTP_OBJS	+= sctp_depends.o
-SCTP6_OBJS	+= sctp6_depends.o
-SDEV_NSCONFIG_MOD += sdev_nsconfig_mod_depends.o
-SDT_OBJS	+= sdt_depends.o
-SMBFS_OBJS	+= smbfs_depends.o
-SMBSRV_OBJS	+= smbsrv_depends.o
-SOCK_OBJS	+= sockfs_depends.o
-SOFTMAC_OBJS	+= softmac_depends.o
-SPDSOCK_OBJS	+= spdsock_depends.o
-STRPLUMB_OBJS	+= strplumb_depends.o
-SWRAND_OBJS	+= swrand_depends.o
-SYSTRACE_OBJS	+= systrace_depends.o
-TCP_OBJS	+= tcp_depends.o
-TCP6_OBJS	+= tcp6_depends.o
-TL_OBJS		+= tl_depends.o
-TOKENMT_OBJS	+= tokenmt_depends.o
-TSWTCLMT_OBJS	+= tswtclmt_depends.o
-TEM_OBJS	+= tem_depends.o
-TUN_OBJS	+= tun_depends.o
-UDP_OBJS	+= udp_depends.o
-UDP6_OBJS	+= udp6_depends.o
-UFS_OBJS	+= ufs_depends.o
-UGEN_OBJS	+= ugen_depends.o
-UHCI_OBJS	+= uhci_depends.o
-WC_OBJS		+= wc_depends.o
-ZFS_OBJS	+= zfs_depends.o
--- a/usr/src/uts/zSeries/Makefile.rules	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/Makefile.rules	Mon Mar 23 14:01:42 2009 -0400
@@ -173,11 +173,6 @@
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-$(OBJS_DIR)/zlib_obj.o:		$(ZLIB_OBJS:%=$(OBJS_DIR)/%)
-	$(LD) -r --script=$(UTSBASE)/s390x/conf/modMapfile -o $@ \
-	    $(ZLIB_OBJS:%=$(OBJS_DIR)/%)
-	$(CTFMERGE) -t -f -L VERSION -o $@ $(ZLIB_OBJS:%=$(OBJS_DIR)/%)
-
 #
 #	Section 1b: Lint `object' build rules.
 #
@@ -253,13 +248,5 @@
 $(OBJS_DIR)/kobj.ln		:= CPPFLAGS += -D_DBOOT
 $(OBJS_DIR)/kobj_bootflags.ln	:= CPPFLAGS += -I$(SRC)/common
 
-$(OBJS_DIR)/$(MODULE)_depends.o:
-		if [ ! -z $(MDFLAGS) ];								\
-		then										\
-			$(UTSBASE)/modDepends.ksh $(MDFLAGS) $(MODULE)_depends.s;		\
-			$(COMPILE.s) $(MODULE)_depends.s -o $(OBJS_DIR)/$(MODULE)_depends.o;	\
-			rm -f $(MODULE)_depends.s;						\
-		fi
-
 # HACK - Workaround for bug in 4.2.3
 $(OBJS_DIR)/utssys.o := COPTIMIZE += -xO0
--- a/usr/src/uts/zSeries/Makefile.zSeries.shared	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/Makefile.zSeries.shared	Mon Mar 23 14:01:42 2009 -0400
@@ -366,9 +366,21 @@
 #	'Dacf' Modules (/kernel/dacf):
 #
 #DACF_KMODS	+= usb_ac_dacf
+
+#
+#	MAC-Type Plugin Modules (/kernel/mac)
+#
+MAC_KMODS	+= mac_ether
+
 GENCONST_SRC     = $(UTSBASE)/s390x/ml/genconst.c
 
 #
 # 'Devname' Modules (kernel/devname)
 #
 DEVNAME_KMODS	+= sdev_nsconfig_mod
+
+#
+#	kiconv modules (/kernel/kiconv):
+#
+KICONV_KMODS	+= kiconv_emea kiconv_ja kiconv_ko kiconv_sc kiconv_tc
+
--- a/usr/src/uts/zSeries/aes/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/aes/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -64,7 +64,7 @@
 # Linkage dependencies
 #
 LDFLAGS += -dy
-MDFLAGS  += -Nmisc/kcf
+LDFLAGS  += -Nmisc/kcf
 
 #
 # lint pass one enforcement
--- a/usr/src/uts/zSeries/amsrc2/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/amsrc2/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -78,7 +78,7 @@
 #
 #	Depends on misc/amsrc2, misc/audiosup, and misc/mixer
 #
-MDFLAGS		+= -Nmisc/audiosup -Nmisc/mixer
+LDFLAGS		+= -Nmisc/audiosup -Nmisc/mixer
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/arp/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/arp/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -74,7 +74,7 @@
 #
 #	depends on ip
 #
-MDFLAGS		+= -Ndrv/ip -Nmisc/neti -Nmisc/hook
+LDFLAGS		+= -Ndrv/ip -Nmisc/neti -Nmisc/hook
 LDFLAGS		+= -dy 
 
 #
--- a/usr/src/uts/zSeries/atun/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/atun/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 #
 #	depends on tun
 #
-MDFLAGS		+= -Nstrmod/tun
+LDFLAGS		+= -Nstrmod/tun
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/av1394/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/av1394/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -69,7 +69,7 @@
 
 #
 # depends on misc/s1394
-MDFLAGS		= -Nmisc/s1394
+LDFLAGS		+= -Nmisc/s1394
 LDFLAGS		+= -dy
 
 #	Default build targets.
--- a/usr/src/uts/zSeries/bge/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/bge/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -69,7 +69,7 @@
 #
 # Driver depends on MAC & IP
 #
-MDFLAGS		+= -Nmisc/mac -Ndrv/ip
+LDFLAGS		+= -Nmisc/mac -Ndrv/ip
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/blowfish/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/blowfish/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -64,7 +64,7 @@
 # Linkage dependencies
 #
 LDFLAGS += -dy
-MDFLAGS = -N/misc/kcf
+LDFLAGS += -N/misc/kcf
 
 #
 # lint pass one enforcement
--- a/usr/src/uts/zSeries/consconfig/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/consconfig/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 $(MODSTUBS_O)	:= AS_CPPFLAGS += -DCONSCONFIG_MODULE
 CLEANFILES	+= $(MODSTUBS_O)
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Ndacf/consconfig_dacf
+LDFLAGS		+= -Ndacf/consconfig_dacf
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/conskbd/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/conskbd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -62,7 +62,7 @@
 #	Overrides.
 #
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS 	 = -Nmisc/kbtrans
+LDFLAGS 	+= -Nmisc/kbtrans
 LDFLAGS 	+= -dy
 
 #
--- a/usr/src/uts/zSeries/crypto/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/crypto/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -62,7 +62,7 @@
 # lint pass one enforcement
 #
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Nmisc/kcf
+LDFLAGS		+= -Nmisc/kcf
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/cryptoadm/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/cryptoadm/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -62,7 +62,7 @@
 # lint pass one enforcement
 #
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Nmisc/kcf
+LDFLAGS		+= -Nmisc/kcf
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/ctf/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ctf/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -41,9 +41,7 @@
 
 CFLAGS		+= $(CCVERBOSE)
 CPPFLAGS	+= -I$(SRC)/common/ctf -DCTF_OLD_VERSIONS
-#LDFLAGS		+= -Breduce -M$(UTSBASE)/common/ctf/mapfile -dy -Nmisc/zmod
-MDFLAGS		+= -Nmisc/zmod
-LDFLAGS		+= -dy
+LDFLAGS		+= -Breduce -M$(UTSBASE)/common/ctf/mapfile -dy -Nmisc/zmod
 
 .KEEP_STATE:
 
--- a/usr/src/uts/zSeries/dcam1394/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/dcam1394/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -66,7 +66,7 @@
 
 #
 # depends on misc/s1394
-MDFLAGS		+= -Nmisc/s1394
+LDFLAGS		+= -Nmisc/s1394
 LDFLAGS		+= -dy
 
 #	Default build targets.
--- a/usr/src/uts/zSeries/des/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/des/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -77,7 +77,7 @@
 # Linkage dependencies
 #
 LDFLAGS += -dy
-MDFLAGS += -Nmisc/kcf
+LDFLAGS += -Nmisc/kcf
 
 #
 # lint pass one enforcement
--- a/usr/src/uts/zSeries/dev/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/dev/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 # $(MODSTUBS_O)	:= AS_CPPFLAGS += -DDEVFS_MODULE
 # CLEANFILES	+= $(MODSTUBS_O)
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Nfs/devfs -Nmisc/dls
+LDFLAGS		+= -Nfs/devfs -Nmisc/dls
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/dlcosmk/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/dlcosmk/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 # lint pass one enforcement
 #
 CFLAGS  += $(CCVERBOSE)
-MDFLAGS += -Ndrv/ip
+LDFLAGS += -Ndrv/ip
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/dld/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/dld/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -59,7 +59,7 @@
 CFLAGS				+= $(CCVERBOSE)
 $(RELEASE_BUILD)CFLAGS		+= -xinline=auto -xcrossfile
 $(RELEASE_BUILD)COPTIMIZE	= -xO5
-MDFLAGS				+= -Nmisc/dls -Nmisc/mac
+LDFLAGS				+= -Nmisc/dls -Nmisc/mac
 LDFLAGS				+= -dy
 
 #
--- a/usr/src/uts/zSeries/dls/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/dls/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -57,7 +57,7 @@
 CFLAGS				+= $(CCVERBOSE)
 $(RELEASE_BUILD)CFLAGS		+= -xinline=auto -xcrossfile
 $(RELEASE_BUILD)COPTIMIZE	= -xO5
-MDFLAGS				+= -N misc/mac
+LDFLAGS				+= -N misc/mac
 LDFLAGS				+= -dy
 
 #
--- a/usr/src/uts/zSeries/dprov/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/dprov/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -71,7 +71,7 @@
 # Note that regular providers do not need to have an explicit dependency
 # on KCF. This is a special case since the test pseudo driver dprov
 # uses private KCF functions.
-MDFLAGS += -Nmisc/kcf
+LDFLAGS += -Nmisc/kcf
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/dscpmk/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/dscpmk/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 # lint pass one enforcement
 #
 CFLAGS  += $(CCVERBOSE)
-MDFLAGS += -Ndrv/ip
+LDFLAGS += -Ndrv/ip
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/ehci/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ehci/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 #
 # depends on misc/usba
 #
-MDFLAGS         += -Nmisc/usba
+LDFLAGS         += -Nmisc/usba
 LDFLAGS         += -dy
 
 #
--- a/usr/src/uts/zSeries/fasttrap/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/fasttrap/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Ndrv/dtrace
+LDFLAGS		+= -Ndrv/dtrace
 LDFLAGS		+= -dy
 
 .KEEP_STATE:
--- a/usr/src/uts/zSeries/fbt/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/fbt/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Ndrv/dtrace -Nmisc/ctf
+LDFLAGS		+= -Ndrv/dtrace -Nmisc/ctf
 LDFLAGS		+= -dy
 
 .KEEP_STATE:
--- a/usr/src/uts/zSeries/flowacct/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/flowacct/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 # lint pass one enforcement
 #
 CFLAGS  += $(CCVERBOSE)
-MDFLAGS += -Ndrv/ip -Ndrv/tcp
+LDFLAGS += -Ndrv/ip -Ndrv/tcp
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/fs/proc/prmachdep.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/fs/proc/prmachdep.c	Mon Mar 23 14:01:42 2009 -0400
@@ -106,6 +106,7 @@
 #include <vm/page.h>
 
 #include <fs/proc/prdata.h>
+#include <sys/session.h>
 
 /*========================= End of Includes ========================*/
 
@@ -995,3 +996,113 @@
 }
 
 /*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/*                                                                  */
+/* Name		- prgetstat.                                        */
+/*                                                                  */
+/* Function	- Return the contents of /proc/<pid>/stat. This     */
+/*		  is for Linux compatibility.			    */
+/*		                               		 	    */
+/*		  Currently doesn't retrieve alarm timeout;         */
+/*		  times are not in jiffies; caught signals not got; */
+/*		  exit code note set.          		 	    */
+/*		                               		 	    */
+/*------------------------------------------------------------------*/
+
+size_t
+prgetstat(proc_t *p, kthread_t *t, char *buf, size_t max)
+{
+	char c;
+	proc_t *cp;
+	struct sess *s = p->p_sessp;
+	struct as *as = p->p_as;
+	klwp_t *lwp; 
+	int	state,
+		cpu = 0;
+	int	niceval = 0,
+		priority = 0;
+	long	mem = 0,
+		rss = 0,
+		lostart = 0x1000,
+		histart = 0;
+	struct regs *rp;
+	uint64_t pc = 0,
+		 sp = 0;
+	uint32_t held[4] = {0, 0, 0, 0};
+	caddr_t wchan   = NULL;
+	size_t	size;
+	uintptr_t stkbase = NULL;
+
+	if (t != NULL) {
+		state = VSTOPPED(t) ? TS_STOPPED : t->t_state;
+		switch (state) {
+		case TS_SLEEP:          c = 'S';        break;
+		case TS_RUN:            c = 'R';        break;
+		case TS_ONPROC:         c = 'O';        break;
+		case TS_ZOMB:           c = 'Z';        break;
+		case TS_STOPPED:        c = 'T';        break;
+		case TS_WAIT:           c = 'W';        break;
+		default:                c = '?';        break;
+		}
+		CL_DONICE(t, NULL, 0, &niceval);
+		priority = t->t_pri;
+		lwp	 = ttolwp(t);
+ 		rp	 = lwptoregs(lwp);
+		pc	 = rp->r_pc;
+		sp	 = rp->r_sp;
+		held[0]	 = t->t_hold.__sigbits[0];
+		held[1]	 = t->t_hold.__sigbits[1];
+		held[2]	 = t->t_hold.__sigbits[2];
+		held[3]	 = t->t_hold.__sigbits[3];
+		wchan	 = t->t_wchan0;
+		cpu	 = (int) t->t_cpu->cpu_id;
+		stkbase	 = lwp->lwp_ustack;
+		thread_unlock(t);
+	} else 
+		c = 'Z';
+
+	if (as != &kas) {	
+		mutex_exit(&p->p_lock);
+		AS_LOCK_ENTER(as, &as->a_lock, RW_READER);
+		mem = btopr(rm_assize(as)) * (PAGESIZE / 1024);
+		rss = rm_asrss(as) * (PAGESIZE / 1024);
+		AS_LOCK_EXIT(as, &as->a_lock);
+		mutex_enter(&p->p_lock);
+	} 
+
+	if (p->p_model == DATAMODEL_ILP32)
+		histart = SYSLIMIT32;
+	else
+		histart = SYSLIMIT;
+
+	size = snprintf(buf, max, 
+		   "%d (%s) %c %d %d"
+		   "%d %d %d %u "
+		   "%ld %ld %ld %ld " 
+		   "%ld %ld %ld %ld "
+		   "%ld %ld 0 0 %llu %lu %ld "
+		   "%lu %lu %lu %lu %lu "
+		   "%u %u "
+		   "%u %u "
+		   "%u %u %u %u "
+		   "%u %u "
+		   "%u %u 0 0 0 0 "
+		   "%lu %llu %llu 0 %d",
+		   p->p_pid, p->p_user.u_comm, c, p->p_ppid, p->p_pgidp->pid_id,
+		   s->s_sid, (int) s->s_dev, s->s_sidp->pid_pglink->p_pid, p->p_proc_flag,
+		   p->p_ru.minflt, p->p_cru.minflt, p->p_ru.majflt, p->p_ru.majflt,
+		   p->p_utime, p->p_stime, p->p_cutime, p->p_cstime,
+		   priority, niceval, (uint64_t) p->p_mstart, mem, rss, 
+		   lostart, histart, stkbase, sp, pc, 
+		   p->p_sig.__sigbits[0], p->p_sig.__sigbits[1],
+		   p->p_sig.__sigbits[2], p->p_sig.__sigbits[3],
+		   held[0], held[1], held[2], held[3],
+		   p->p_ignore.__sigbits[0], p->p_ignore.__sigbits[1],
+		   p->p_ignore.__sigbits[2], p->p_ignore.__sigbits[3],
+		   (uintptr_t) wchan, p->p_ru.nswap, p->p_cru.nswap, cpu);
+
+	return(size);
+}
+
+/*========================= End of Function ========================*/
--- a/usr/src/uts/zSeries/fssnap/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/fssnap/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -26,7 +26,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)Makefile	1.4	05/06/08 SMI"
 
 #
 #	s390x architecture dependent
@@ -63,7 +62,7 @@
 #
 CFLAGS		+= $(CCVERBOSE)
 LDFLAGS		+= -dy 
-MDFLAGS		+= -Nmisc/fssnap_if -Nfs/ufs
+LDFLAGS		+= -Nmisc/fssnap_if -Nfs/ufs
 
 #
 #	Default build targets.
--- a/usr/src/uts/zSeries/hci1394/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/hci1394/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -46,7 +46,7 @@
 LINTS		= $(HCI1394_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/1394/adapters
-MDFLAGS		+= -Nmisc/s1394
+LDFLAGS		+= -Nmisc/s1394
 LDFLAGS		+= -dy
 WARLOCK_OUT     = $(HCI1394_OBJS:%.o=%.ll)
 WARLOCK_OK      = $(MODULE).ok
--- a/usr/src/uts/zSeries/hid/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/hid/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -61,7 +61,7 @@
 #
 # depends on misc/usba
 #
-MDFLAGS         += -Nmisc/usba -Nmisc/hidparser -Ndacf/consconfig_dacf
+LDFLAGS         += -Nmisc/usba -Nmisc/hidparser -Ndacf/consconfig_dacf
 LDFLAGS         += -dy
 
 #
--- a/usr/src/uts/zSeries/hidparser/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/hidparser/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -59,7 +59,7 @@
 #
 # depends on misc/usba
 #
-MDFLAGS         += -Nmisc/usba
+LDFLAGS         += -Nmisc/usba
 LDFLAGS         += -dy
 
 #
--- a/usr/src/uts/zSeries/hubd/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/hubd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -70,7 +70,7 @@
 #
 # depends on misc/usba
 #
-MDFLAGS         += -Nmisc/usba
+LDFLAGS         += -Nmisc/usba
 LDFLAGS         += -dy
 
 #
--- a/usr/src/uts/zSeries/ib/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ib/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -77,7 +77,7 @@
 #
 #	depends on misc/ibtl
 #
-MDFLAGS	+= -Nmisc/ibdm -Nmisc/ibtl
+LDFLAGS	+= -Nmisc/ibdm -Nmisc/ibtl
 LDFLAGS	+= -dy
 
 #
--- a/usr/src/uts/zSeries/ibcm/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ibcm/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -73,7 +73,7 @@
 #
 #	depends on misc/ibtl and misc/ibmf
 #
-MDFLAGS	+= -Nmisc/ibtl -Nmisc/ibmf
+LDFLAGS	+= -Nmisc/ibtl -Nmisc/ibmf
 LDFLAGS	+= -dy
 
 #
--- a/usr/src/uts/zSeries/ibd/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ibd/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -40,7 +40,7 @@
 OBJECTS		= $(IBD_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-MDFLAGS		+= -Nmisc/gld -Nmisc/ibtl -Nmisc/ibcm -Nmisc/ibmf
+LDFLAGS		+= -Nmisc/gld -Nmisc/ibtl -Nmisc/ibcm -Nmisc/ibmf
 LDFLAGS		+= -dy
 WARLOCK_OUT     = $(IBD_OBJS:%.o=%.ll)
 WARLOCK_OK	= $(MODULE).ok
--- a/usr/src/uts/zSeries/ibdm/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ibdm/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -75,7 +75,7 @@
 #
 #	depends on misc/ibtl, and misc/ibmf
 #
-MDFLAGS	+= -Nmisc/ibtl -Nmisc/ibmf
+LDFLAGS	+= -Nmisc/ibtl -Nmisc/ibmf
 LDFLAGS	+= -dy
 
 #
--- a/usr/src/uts/zSeries/ibmf/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ibmf/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -43,7 +43,7 @@
 OBJECTS		= $(IBMF_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(IBMF_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
-MDFLAGS		+= -Nmisc/ibtl
+LDFLAGS		+= -Nmisc/ibtl
 LDFLAGS		+= -dy
 WARLOCK_OUT     = $(IBMF_OBJS:%.o=%.ll)
 WARLOCK_OK      = $(MODULE).ok
--- a/usr/src/uts/zSeries/icmp/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/icmp/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -74,7 +74,7 @@
 #
 #	depends on ip
 #
-MDFLAGS		+= -Ndrv/ip
+LDFLAGS		+= -Ndrv/ip
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/icmp6/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/icmp6/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 #
 #	depends on ip ip6 and icmp
 #
-MDFLAGS		+= -Ndrv/ip -Ndrv/ip6 -Ndrv/icmp
+LDFLAGS		+= -Ndrv/ip -Ndrv/ip6 -Ndrv/icmp
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/idmap/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/idmap/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -55,7 +55,7 @@
 #	Module dependencies
 #
 LDFLAGS += -dy
-MDFLAGS += -Nsys/doorfs -Nstrmod/rpcmod
+LDFLAGS += -Nsys/doorfs -Nstrmod/rpcmod
 
 #
 #	Include dependencies
--- a/usr/src/uts/zSeries/io/ccw/diag250_hl.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/io/ccw/diag250_hl.c	Mon Mar 23 14:01:42 2009 -0400
@@ -481,8 +481,6 @@
 
 	cd = ccw_device_register(dip);
 	if (cd == NULL) {
-		prom_printf("NULL device ptr in diag250 %d instance\n",
-			instance);
 		return (DDI_FAILURE);
 	}
 
@@ -514,9 +512,6 @@
 
 	rc = diag250_get_label(cd, dp);
 	if (rc != DDI_SUCCESS) {
-		cmn_err(CE_WARN,
-			"Disk %d is not valid for I/O\n",
-			instance);
 		goto error;
 	}
 
@@ -1428,6 +1423,7 @@
 
 /*========================= End of Function ========================*/
 
+#if 0
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name		- diag250_get_label.                                */
@@ -1502,7 +1498,7 @@
 
 	if (cc != 0) {
 		cmn_err(CE_WARN,
-			"Cannot read label of 0x%x\n",
+			"Cannot read label of 0x%x - ignoring\n",
 			dvc->rdc.vrdcdvno);
 		return (DDI_FAILURE);
 	}
@@ -1510,7 +1506,7 @@
 	e2a((char *)&label.id, sizeof(label.id));
 	if (label.ident != CMS1) {
 		cmn_err(CE_WARN,
-			"Volume %s is not of correct format\n",
+			"Volume %s is not of correct format - ignoring\n",
 			label.id);
 		return (DDI_FAILURE);
 	}
@@ -1524,14 +1520,14 @@
 		break;
 	default:
 		cmn_err(CE_WARN,
-			"Blocksize %d not 512, 1024, 2048, or 4096!\n",
+			"Blocksize %d not 512, 1024, 2048, or 4096 - ignoring!\n",
 			label.blocksize);
 		return (DDI_FAILURE);
 	}
 	
 	if (label.offset <= 0) {
 		cmn_err(CE_WARN,
-			"Volume %s has not been reserved\n",
+			"Volume %s has not been reserved - ignoring\n",
 			label.id);
 		return (DDI_FAILURE);
 	}
@@ -1552,6 +1548,122 @@
 
 /*========================= End of Function ========================*/
 
+#else
+/*------------------------------------------------------------------*/
+/*                                                                  */
+/* Name		- diag250_get_label.                                */
+/*                                                                  */
+/* Function	- Get and validate label information.               */
+/*		                               		 	    */
+/*------------------------------------------------------------------*/
+
+static int 
+diag250_get_label(ccw_device *dvc, diag250_dev_t *dp)
+{
+	dsklabel_t   label;
+	defExtEckd_t eckdDef;
+	locateRec_t  eckdLoc;
+	sgiop_t	     sgio;
+	int	     cc;
+	int	     rc;
+
+	static struct ccw1 eckd[4] = {
+		{.op = CCW_CMD_DEFEXT, .flags = CCW_FLAG_CC,
+		 .count = sizeof(eckdDef) },
+		{.op = CCW_CMD_LOCATE_REC, .flags = CCW_FLAG_CC,
+		 .count = sizeof(eckdLoc) },
+		{.op = CCW_CMD_READ_ECKD, .flags = CCW_FLAG_SLI,
+		 .count = sizeof(label) }
+	};
+
+	if (dvc->rdc.vrdcvcla == DC_DASD) {
+		memset(&sgio, 0, sizeof(sgio));
+		sgio.devno = dvc->rdc.vrdcdvno;
+		sgio.flags = F1CCW;
+
+		sgio.cpa	    = va_to_pa(&eckd);
+		eckd[0].data	    = va_to_pa(&eckdDef);
+		eckd[1].data	    = va_to_pa(&eckdLoc);
+		eckd[2].data	    = va_to_pa(&label);
+		memset(&eckdDef, 0, sizeof(eckdDef));
+		eckdDef.mask.perm   = DFXE_NORM;
+		eckdDef.attr.mode   = DFX_ECKD;
+		eckdDef.endExt.head = 1;
+		memset(&eckdLoc, 0, sizeof(eckdLoc));
+		eckdLoc.count	    = 1;
+		eckdLoc.search.rec  = 3;
+		eckdLoc.sector	    = 0x29;
+		eckdLoc.op.code	    = LRDOCRD;
+
+		cc = diag_a8(&sgio, &rc);
+
+		if (cc != 0) {
+			cmn_err(CE_WARN,
+				"Cannot read label of 0x%x - ignoring",
+				dvc->rdc.vrdcdvno);
+			return (DDI_FAILURE);
+		}
+
+		e2a((char *)&label.id, sizeof(label.id));
+		if (label.ident != CMS1) {
+			cmn_err(CE_WARN,
+				"Volume %s is not of correct format - ignoring",
+				label.id);
+			return (DDI_FAILURE);
+		}
+
+		switch(label.blocksize)
+		{
+		case 512:
+		case 1024:
+		case 2048:
+		case 4096:
+			break;
+		default:
+			cmn_err(CE_WARN,
+				"Blocksize %d not 512, 1024, 2048, or 4096 - ignoring",
+				label.blocksize);
+			return (DDI_FAILURE);
+		}
+		
+		if (label.offset <= 0) {
+			cmn_err(CE_WARN,
+				"Volume %s has not been reserved - ignoring",
+				label.id);
+			return (DDI_FAILURE);
+		}
+
+		dp->blksize = label.blocksize;
+		dp->blkmask = dp->blksize - 1;
+		dp->lpp	    = dp->blksize / DEV_BSIZE;
+		dp->lppmask = dp->lpp - 1;
+		dp->offset  = label.offset + 1;
+
+		cmn_err(CE_NOTE, "Volume %s discovered at "
+			"0%x with blockize %d and offset %ld",
+			label.id, dvc->rdc.vrdcdvno, 
+			dp->blksize, dp->offset);
+
+	} else {
+		dp->blksize = 512;
+		dp->blkmask = dp->blksize - 1;
+		dp->lpp	    = dp->blksize / DEV_BSIZE;
+		dp->lppmask = dp->lpp - 1;
+		dp->offset  = 1;
+
+		cmn_err(CE_NOTE, "FBA Volume discovered at "
+			"0%x with blockize %d and offset %ld",
+			dvc->rdc.vrdcdvno, dp->blksize, dp->offset);
+
+	}
+
+	return (DDI_SUCCESS);
+}
+
+/*========================= End of Function ========================*/
+
+#endif
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name		- diag250_fake_geometry                             */
--- a/usr/src/uts/zSeries/io/ccw/diag250_ll.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/io/ccw/diag250_ll.c	Mon Mar 23 14:01:42 2009 -0400
@@ -104,6 +104,7 @@
 static boolean_t diag250_ll_flushio(diag250_dev_t *dp);
 static boolean_t diag250_ll_startio(diag250_io_t *io);
 static void diag250_ll_checkio(diag250_io_t *io);
+static void diag250_ll_chkpage(struct buf *, uint64_t);
 
 static void diag250_showdev(char *,diag250_dev_t *);
 static void diag250_showio(char *,bioplrw_t *,blkent_t *);
@@ -154,21 +155,17 @@
 		
 		hdr = (bioplhd_t *) biopl;
 		bpl = (bioplrw_t *) biopl;
-if (hdr->biodevn == 0x201) {
 		bio = (blkent_t *) bpl->bioladdr;
 		if (((diag250_debug & D_D250WRIT) && (bio[0].belrqtyp == BELWRITE)) ||
 		    ((diag250_debug & D_D250READ) && (bio[0].belrqtyp != BELWRITE))) {
-msgnoh("DIAG250 request - op: %d dev: %x cc: %d rc: %d\n",
-				    opcode, hdr->biodevn, cc, *rc);
 			if (diag250_debug & D_D250DATA) {
 				for (i = 0; i < bpl->biolentn; i++) {
-msgnoh("     op: %s blk: %06d buf: %lx\n",
+					msgnoh("     op: %s blk: %06d buf: %lx\n",
 						    (bio[i].belrqtyp == BELWRITE ? "write" : "read "),
 						    bio[i].belbknum, bio[i].belbufad);
 				}	
 			}
 		}
-}
 	}	
 #endif
  
@@ -179,6 +176,61 @@
 
 /*------------------------------------------------------------------*/
 /*                                                                  */
+/* Name		- diag250_ll_chkpage.                               */
+/*                                                                  */
+/* Function	- Check if a page that a read has just been done    */
+/*		  into has already had activity in it. If not then  */
+/*		  we have to reset the page's modified bit so as    */
+/*		  not to have it seen as "dirty" by the rest of the */
+/*		  system.                      		 	    */
+/*		                               		 	    */
+/*------------------------------------------------------------------*/
+
+static __inline__ void
+diag250_ll_chkpage(struct buf *bp, uint64_t buf)
+{
+	struct vnode *vp = bp->b_file;
+	page_t *pp, *npp, **pplist;
+	uint64_t pfn = buf >> MMU_PAGESHIFT;
+
+	if (bp->b_flags & B_PAGEIO) {
+		pp  = NULL;
+		npp = bp->b_pages;
+		do {
+			if (npp->p_pagenum == pfn) {
+				pp = npp;
+				break;
+			}
+			npp = npp->p_next;
+		} while (npp != bp->b_pages);
+	} else if (bp->b_flags & B_SHADOW) {
+		pp     = NULL;
+		pplist = bp->b_shadow;
+		npp    = *pplist;
+		do {
+			if (npp->p_pagenum == pfn) {
+				pp = npp;
+				break;	
+			}
+			npp = npp->p_next;
+		} while (npp != *pplist);
+	} else
+		pp = NULL;
+
+	if (pp != NULL) {
+		if (!PP_ISINIT(pp)) {
+			PP_SETINIT(pp);
+			__asm__("	lghi	1,0\n"
+				"	sske	1,%0\n"
+				: : "r" (buf) : "1");
+		}
+	}
+}
+
+/*========================= End of Function ========================*/
+
+/*------------------------------------------------------------------*/
+/*                                                                  */
 /* Name		- diag250_ll_initio                                 */
 /*                                                                  */
 /* Function	- Initializes a device to allow I/O via DIAG250.    */
@@ -349,6 +401,8 @@
 
 			/* Get first entry */
 			bp = dp->ahead;
+bp->b_obs1 = 0;
+bp->b_obs3 = 0;
 	
 			/* Remove from queue */
 			dp->ahead = bp->av_forw;
@@ -800,6 +854,7 @@
 
 	/* Get current index and bump for next time round */
 	ndx = io->bcnt++;
+__sync_fetch_and_add(&bp->b_obs3, 1);
 
 	/* Remember buf pointer */
 	io->bufs[ndx] = bp;
@@ -984,6 +1039,8 @@
 			if (be->belrqtyp == BELREAD) {
 				KSTAT_IO_PTR(dp->iostat)->reads++;
 				KSTAT_IO_PTR(dp->iostat)->nread += len;
+				if ((bp->b_file != NULL) && (bp->b_private == NULL))
+					diag250_ll_chkpage(bp, be->belbufad);
 			}
 			else {
 				KSTAT_IO_PTR(dp->iostat)->writes++;
@@ -998,45 +1055,61 @@
 				KSTAT_IO_PTR(dp->iostat)->writes++;
 			}
 		}
+__sync_fetch_and_sub(&bp->b_obs3, 1);
 
 		mutex_exit(&dp->statex);
 
 		/* We've hit the end */
-		if (be->belbknum == eblk) {
-			size_t soff = sblk * dp->blksize;
-			size_t eoff = (eblk + 1) * dp->blksize;
+		if (be->belbknum == eblk) 
+			bp->b_obs1 = 1;
+	}
 
-			/* Done with the bounce buffer */
-			if (bp->b_private) {
-				diag250_bbuf_t *bbuf = (diag250_bbuf_t *) bp->b_private;
+	/* We've hit the end */
+	if (bp->b_obs1 && bp->b_obs3 == 0) {
+		size_t soff = sblk * dp->blksize;
+		size_t eoff = (eblk + 1) * dp->blksize;
+
+		/* Done with the bounce buffer */
+		if (bp->b_private) {
+			diag250_bbuf_t *bbuf = (diag250_bbuf_t *) bp->b_private;
 
-				if (be->belrqtyp == BELREAD) {
-					bcopy(&bbuf->buf[offset - soff],
-					      bp->b_un.b_addr,
-					      bp->b_bcount);
+			if (be->belrqtyp == BELREAD) {
+				void *buf, *ebuf;
+
+				bcopy(&bbuf->buf[offset - soff],
+				      bp->b_un.b_addr,
+				      bp->b_bcount);
+				ebuf = (void *) bp->b_un.b_addr + bp->b_bcount;
+				for (buf = bp->b_un.b_addr;
+				     buf < ebuf;
+				     buf += MMU_PAGESIZE) {
+					uintptr_t pa;
+
+					pa = va_to_pa(buf);
+					diag250_ll_chkpage(bp, pa);
 				}
-
-				diag250_ll_push(&dp->bbufq, &bbuf->link);
-
-				bp->b_private = NULL;
 			}
 
-			bp->av_forw = NULL;
-			bp->av_back = NULL;
+			diag250_ll_push(&dp->bbufq, &bbuf->link);
+
+			bp->b_private = NULL;
+		}
+
+		bp->av_forw = NULL;
+		bp->av_back = NULL;
 
-			if (bp->b_resid != 0) {
-				bioerror(bp, EIO);
-			}
-			else {
-				bioerror(bp, 0);
-			}
+		if (bp->b_resid != 0) {
+			bioerror(bp, EIO);
+		}
+		else {
+			bioerror(bp, 0);
+		}
 
-			biodone(bp);
+		biodone(bp);
 
-			mutex_enter(&dp->statex);
-			kstat_runq_exit(KSTAT_IO_PTR(dp->iostat));
-			mutex_exit(&dp->statex);
-		}
+		mutex_enter(&dp->statex);
+		kstat_runq_exit(KSTAT_IO_PTR(dp->iostat));
+		mutex_exit(&dp->statex);
 	}
 
 	/* Put the IO request back on the free queue */
--- a/usr/src/uts/zSeries/io/ccw/osa.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/io/ccw/osa.c	Mon Mar 23 14:01:42 2009 -0400
@@ -195,8 +195,6 @@
 /*                 G l o b a l   V a r i a b l e s                  */
 /*------------------------------------------------------------------*/
 
-char _depends_on[] = "misc/mac misc/mac_ether drv/ccwnex";
-
 /*
  * Declarations and Module Linkage
  */
@@ -581,6 +579,7 @@
 		return(EIO);
 	}
 
+	mac_link_update(os->mh, LINK_STATE_UP);
 	/* Drop any pending packets */
 	OSA_clear(os);
 
@@ -637,6 +636,8 @@
 		os->active = NULL;
 	}
 
+	mac_link_update(os->mh, LINK_STATE_DOWN);
+
 	/* Unblock */
 	mutex_exit(&os->activelock);
 
@@ -897,7 +898,7 @@
 		*val = 0;
 		break;
 	case ETHER_STAT_LINK_DUPLEX:
-		*val = 1;
+		*val = LINK_DUPLEX_FULL;
 		break;
 	case ETHER_STAT_TOOLONG_ERRORS:
 		*val = 0;
--- a/usr/src/uts/zSeries/ip/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ip/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -70,7 +70,7 @@
 # swrand as it needs random numbers early on during boot before
 # kCF subsystem can load swrand.
 #
-MDFLAGS		+= -Nmisc/md5 -Ncrypto/swrand -Nmisc/hook -Nmisc/neti
+LDFLAGS		+= -Nmisc/md5 -Ncrypto/swrand -Nmisc/hook -Nmisc/neti
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/ip6/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ip6/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -66,7 +66,7 @@
 #
 #	depends on ip
 #
-MDFLAGS		+= -Ndrv/ip
+LDFLAGS		+= -Ndrv/ip
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/ipf/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ipf/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -66,7 +66,7 @@
 CFLAGS   += $(CCVERBOSE)
 CPPFLAGS += -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP 
 CPPFLAGS += -DSUNDDI -DSOLARIS2=$(MINOR:sh) -DIRE_ILL_CN -DUSE_INET6
-MDFLAGS  += -Ndrv/ip -Nmisc/md5 -Nmisc/neti -Nmisc/hook -Nmisc/kcf
+LDFLAGS  += -Ndrv/ip -Nmisc/md5 -Nmisc/neti -Nmisc/hook -Nmisc/kcf
 LDFLAGS  += -dy
 
 INC_PATH += -I$(UTSBASE)/common/inet/ipf
--- a/usr/src/uts/zSeries/ipgpc/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ipgpc/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -68,7 +68,7 @@
 #
 CFLAGS += $(CCVERBOSE)
 
-MDFLAGS += -Ndrv/ip 
+LDFLAGS += -Ndrv/ip 
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/ipsecah/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ipsecah/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -62,7 +62,7 @@
 #
 # Linkage dependencies
 #
-MDFLAGS += -Ndrv/ip -Ndrv/tcp -Nmisc/kcf
+LDFLAGS += -Ndrv/ip -Ndrv/tcp -Nmisc/kcf
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/ipsecesp/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ipsecesp/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -62,7 +62,7 @@
 #
 # Linkage dependencies
 #
-MDFLAGS += -Ndrv/ip -Ndrv/ipsecah -Nmisc/kcf
+LDFLAGS += -Ndrv/ip -Ndrv/ipsecah -Nmisc/kcf
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/kb8042/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/kb8042/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -51,7 +51,7 @@
 #
 include $(UTSBASE)/zSeries/Makefile.zSeries
 
-MDFLAGS		+= -Nmisc/kbtrans
+LDFLAGS		+= -Nmisc/kbtrans
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/keysock/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/keysock/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 #
 # Linkage dependencies
 #
-MDFLAGS += -Ndrv/ip
+LDFLAGS += -Ndrv/ip
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/kmdb/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/kmdb/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Nmisc/kmdbmod
+LDFLAGS		+= -Nmisc/kmdbmod
 LDFLAGS		+= -dy
 
 .KEEP_STATE:
--- a/usr/src/uts/zSeries/krtld/doreloc.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/krtld/doreloc.c	Mon Mar 23 14:01:42 2009 -0400
@@ -162,18 +162,19 @@
 const Rel_entry	reloc_table[R_390_NUM] = {
 /* R_390_NONE */	{0x0, FLG_RE_NOTREL, 0, 0, 0},
 /* R_390_8 */		{0x0, FLG_RE_VERIFY, 1, 0, 0},
-/* R_390_12 */		{0xfff, FLG_RE_VERIFY, 2, 0, 0},
-/* R_390_16 */		{0x0, FLG_RE_VERIFY, 2, 0, 0},
-/* R_390_32 */		{0x0, FLG_RE_VERIFY, 4, 0, 0},
+/* R_390_12 */		{0xfff, FLG_RE_VERIFY | FLG_RE_UNALIGN, 2, 0, 0},
+/* R_390_16 */		{0x0, FLG_RE_VERIFY | FLG_RE_UNALIGN, 2, 0, 0},
+/* R_390_32 */		{0x0, FLG_RE_VERIFY | FLG_RE_UNALIGN, 4, 0, 0},
 /* R_390_PC32 */	{0x0, FLG_RE_PCREL | FLG_RE_VERIFY | FLG_RE_SIGN |
 				FLG_RE_LOCLBND, 4, 0, 32},
 /* R_390_GOT12 */	{0xfff, FLG_RE_GOTADD, 2, 0, 12},
 /* R_390_GOT32 */	{0x0, FLG_RE_GOTADD | FLG_RE_SIGN, 4, 0, 32},
 /* R_390_PLT32 */	{0x0, FLG_RE_PLTREL | FLG_RE_PCREL, 4, 0, 0},
+#ifdef _ELF64
 /* R_390_COPY */	{0x0, FLG_RE_NOTREL, 8, 0, 0},		/* SPECIAL */
-#ifdef _ELF64
 /* R_390_GLOB_DAT */	{0x0, FLG_RE_NOTREL, 8, 0, 0},
 #else
+/* R_390_COPY */	{0x0, FLG_RE_NOTREL, 4, 0, 0},		/* SPECIAL */
 /* R_390_GLOB_DAT */	{0x0, FLG_RE_NOTREL, 4, 0, 0},
 #endif
 /* R_390_JMP_SLOT */	{0x0, FLG_RE_NOTREL, 4, 0, 0},		/* SPECIAL */
@@ -189,19 +190,19 @@
 				2, 0, 16},
 /* R_390_PC16DBL */	{0x0, FLG_RE_PCREL | FLG_RE_SIGN | FLG_RE_LOCLBND,
 				2, 1, 16},
-/* R_390_PLT16DBL */	{0x0, FLG_RE_PLTREL | FLG_RE_PCREL, 2, 1, 16},
+/* R_390_PLT16DBL */	{0x0, FLG_RE_PLTREL | FLG_RE_PCREL, 4, 1, 16},
 /* R_390_PC32DBL */	{0x0, FLG_RE_PCREL | FLG_RE_ADDRELATIVE | FLG_RE_UNALIGN,
 				4, 1, 32},
-/* R_390_PLT32DBL */	{0x0, FLG_RE_PLTREL | FLG_RE_PCREL, 2, 0, 0},
-/* R_390_GOTPCDBL */	{0x0, FLG_RE_PCREL | FLG_RE_GOTPC | FLG_RE_LOCLBND,
-				2, 1, 16},
-/* R_390_64 */		{0x0, FLG_RE_VERIFY, 8, 0, 0},
+/* R_390_PLT32DBL */	{0x0, FLG_RE_PLTREL | FLG_RE_PCREL, 4, 0, 0},
+/* R_390_GOTPCDBL */	{0x0, FLG_RE_PCREL | FLG_RE_GOTPC | FLG_RE_LOCLBND | FLG_RE_UNALIGN,
+				4, 1, 16},
+/* R_390_64 */		{0x0, FLG_RE_VERIFY | FLG_RE_UNALIGN, 8, 0, 0},
 /* R_390_PC64 */	{0x0, FLG_RE_PCREL | FLG_RE_VERIFY | FLG_RE_SIGN | 
 				FLG_RE_LOCLBND, 8, 0, 64},
 /* R_390_GOT64 */	{0x0, FLG_RE_GOTADD | FLG_RE_SIGN, 4, 0, 32},
 /* R_390_PLT64 */	{0x0, FLG_RE_PLTREL | FLG_RE_VERIFY |
 				FLG_RE_ADDRELATIVE, 4, 0, 0},
-/* R_390_GOTENT */	{0x0, FLG_RE_GOTPC | FLG_RE_PCREL | FLG_RE_UNALIGN | FLG_RE_SIGN, 4, 1, 32},
+/* R_390_GOTENT */	{0x0, FLG_RE_GOTPC | FLG_RE_PCREL | FLG_RE_UNALIGN | FLG_RE_SIGN | FLG_RE_GOTADD, 4, 1, 32},
 /* R_390_GOTOFF16 */	{0x0, FLG_RE_NOTREL | FLG_RE_GOTADD | FLG_RE_SIGN, 2, 0, 0},
 /* R_390_GOTOFF64 */	{0x0, FLG_RE_NOTREL | FLG_RE_GOTADD | FLG_RE_SIGN, 8, 0, 0},
 /* R_390_GOTPLT12 */	{0xfff, FLG_RE_NOTREL | FLG_RE_GOTADD | FLG_RE_SIGN, 2, 0, 0},
@@ -211,9 +212,10 @@
 /* R_390_GOTPLTENT */	{0x0, FLG_RE_PCREL | FLG_RE_GOTADD | FLG_RE_SIGN, 8, 0, 0},
 /* R_390_PLTOFF16 */	{0x0, FLG_RE_PLTREL | FLG_RE_SIGN, 2, 0, 0},
 /* R_390_PLTOFF32 */	{0x0, FLG_RE_PLTREL | FLG_RE_SIGN, 4, 0, 0},
+/* R_390_PLTOFF64 */	{0x0, FLG_RE_PLTREL | FLG_RE_SIGN, 8, 0, 0},
 /* R_390_TLS_LOAD */	{0x0, 0, 0, 0, 0},
-/* R_390_TLS_GDCALL */	{0x0, FLG_RE_TLSGD, 0, 0, 0},
-/* R_390_TLS_LDCALL */	{0x0, 0, 0, 0, 0},
+/* R_390_TLS_GDCALL */	{0x0, FLG_RE_PLTREL | FLG_RE_PCREL | FLG_RE_TLSGD, 4, 0, 0},
+/* R_390_TLS_LDCALL */	{0x0, FLG_RE_PLTREL | FLG_RE_PCREL | FLG_RE_TLSLD, 4, 0, 0},
 /* R_390_TLS_GD32 */	{0x0, FLG_RE_GOTADD | FLG_RE_TLSGD, 4, 0, 0},
 /* R_390_TLS_GD64 */	{0x0, FLG_RE_GOTADD | FLG_RE_TLSGD, 8, 0, 0},
 /* R_390_TLS_GOTIE12 */	{0xfff, 0, 2, 0, 0},
@@ -228,14 +230,20 @@
 /* R_390_TLS_LE64 */	{0x0, FLG_RE_GOTADD | FLG_RE_TLSLE, 8, 0, 0},
 /* R_390_TLS_LDO32 */	{0x0, FLG_RE_GOTADD | FLG_RE_TLSLD, 4, 0, 0},
 /* R_390_TLS_LDO64 */	{0x0, FLG_RE_GOTADD | FLG_RE_TLSLD, 8, 0, 0},
-/* R_390_TLS_DTPMOD */	{0x0, 0, 0, 0, 0},
-/* R_390_TLS_DTPOFF */	{0x0, 0, 0, 0, 0},
-/* R_390_TLS_DTPOFF */	{0x0, 0, 0, 0, 0},
-/* R_390_20 */		{0xfffff, FLG_RE_VERIFY | FLG_RE_DISP20 | FLG_RE_SIGN, 4, 0, 20},
-/* R_390_GOT20 */	{0xfffff, FLG_RE_GOTADD | FLG_RE_DISP20 | FLG_RE_SIGN, 4, 0, 20},
+#ifdef _ELF64
+/* R_390_TLS_DTPMOD */	{0x0, FLG_RE_NOTREL, 8, 0, 0},
+/* R_390_TLS_DTPOFF */	{0x0, FLG_RE_NOTREL, 8, 0, 0},
+/* R_390_TLS_TPOFF */	{0x0, FLG_RE_NOTREL, 8, 0, 0},
+#else
+/* R_390_TLS_DTPMOD */	{0x0, FLG_RE_NOTREL, 4, 0, 0},
+/* R_390_TLS_DTPOFF */	{0x0, FLG_RE_NOTREL, 4, 0, 0},
+/* R_390_TLS_TPOFF */	{0x0, FLG_RE_NOTREL, 4, 0, 0},
+#endif
+/* R_390_20 */		{0xfffff, FLG_RE_VERIFY | FLG_RE_DISP20 | FLG_RE_SIGN, 2, 0, 20},
+/* R_390_GOT20 */	{0xfffff, FLG_RE_GOTADD | FLG_RE_DISP20 | FLG_RE_SIGN, 2, 0, 20},
 /* R_390_GOTPLT20 */	{0xfffff, FLG_RE_NOTREL | FLG_RE_GOTADD | FLG_RE_DISP20 | FLG_RE_SIGN, 
-				4, 0, 20},
-/* R_390_TLS_GOTIE20 */	{0xfffff, FLG_RE_DISP20 | FLG_RE_SIGN, 4, 0, 20},
+				2, 0, 20},
+/* R_390_TLS_GOTIE20 */	{0xfffff, FLG_RE_DISP20 | FLG_RE_SIGN, 2, 0, 20},
 
 };
 
@@ -317,6 +325,9 @@
  * R_390_GOT64 		24 	quad64 		O + A
  * R_390_PLT64 		25 	quad64 		L + A
  * R_390_GOTENT 	26 	pc32 		(G + O + A - P) >> 1
+ * R_390_TLS_DTPOFF	54	word32/quad64	@dtpmod(S + A)
+ * R_390_TLS_DTPMOD	55	word32/quad64	@dtpoff(S + A)
+ * R_390_TLS_TPOFF	56	word32/quad64	@tpoff(S + A)
  *
  */
 
@@ -423,7 +434,8 @@
 	// (L + A - P) >> 1
 	case R_390_PLT16DBL :
 	case R_390_PLT32DBL :
-		uvalue = basevalue + *value;
+//		uvalue = basevalue + *value;
+		uvalue = *value;
 		uvalue = ((Sxword) uvalue >> 1);
 		break;
 	
@@ -437,7 +449,7 @@
 
 	// (G + O + A - P) >> 1
 	case R_390_GOTENT :
-		uvalue = basevalue + *value;
+		uvalue = basevalue + *value + 2;
 		uvalue = ((Sxword) uvalue >> 1);
 		break;
 
@@ -447,6 +459,16 @@
 		// Do nothing?
 		break;
 
+	case R_390_TLS_GD32:
+	case R_390_TLS_GD64:
+		uvalue = basevalue + *value;
+		break;
+
+	case R_390_TLS_DTPMOD:
+	case R_390_TLS_DTPOFF:
+	case R_390_TLS_TPOFF:
+		uvalue = basevalue + *value;
+		break;
 	default :
 		REL_ERR_UNIMPL(lml, file, sym, rtype);
 		break;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/zSeries/krtld/mapfile	Mon Mar 23 14:01:42 2009 -0400
@@ -0,0 +1,72 @@
+#
+# Copyright 2007 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
+#
+
+{
+	global:
+		kobj_addrcheck;
+		kobj_alloc;
+		kobj_boot_mod_lookup;
+		kobj_close;
+		kobj_close_file;
+		kobj_export_module;
+		kobj_filbuf;
+		kobj_free;
+		kobj_fstat;
+		kobj_get_filesize;
+		kobj_getelfsym;
+		kobj_getmodinfo;
+		kobj_getpagesize;
+		kobj_getsymname;
+		kobj_getsymvalue;
+		kobj_load_module;
+		kobj_load_primary_module;
+		kobj_lookup;
+		kobj_lookup_all;
+		kobj_module_path;
+		kobj_notify_add;
+		kobj_notify_remove;
+		kobj_open;
+		kobj_open_file;
+		kobj_path_exists;
+		kobj_open_path;
+		kobj_read;
+		kobj_read_file;
+		kobj_searchsym;
+		kobj_set_ctf;
+		kobj_stat_get;
+		kobj_sync;
+		kobj_sync_instruction_memory;
+		kobj_textwin_alloc;
+		kobj_textwin_free;
+		kobj_unload_module;
+		kobj_zalloc;
+		kobj_kdi;
+		kobj_linkmaps;
+		__tnf_tag_list_head;
+		__tnf_probe_list_head;
+		tnf_changed_probe_list;
+		boot_cpu_compatible_list;
+	local:
+		*;
+};
--- a/usr/src/uts/zSeries/kssl/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/kssl/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 #
 CFLAGS		+= $(CCVERBOSE)
 
-MDFLAGS		+= -Nmisc/md5 -Nmisc/kcf
+LDFLAGS		+= -Nmisc/md5 -Nmisc/kcf
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/lockstat/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/lockstat/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 include $(UTSBASE)/zSeries/Makefile.zSeries
 
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Ndrv/dtrace
+LDFLAGS		+= -Ndrv/dtrace
 LDFLAGS		+= -dy
 
 .KEEP_STATE:
--- a/usr/src/uts/zSeries/md5/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/md5/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -72,7 +72,7 @@
 #
 # md5 depends on the kcf framework
 #
-MDFLAGS		+= -Nmisc/kcf
+LDFLAGS		+= -Nmisc/kcf
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/mixer/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/mixer/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -73,7 +73,7 @@
 #
 #	Depends on misc/audiosup
 #
-MDFLAGS		+= -Nmisc/audiosup
+LDFLAGS		+= -Nmisc/audiosup
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/msgsys/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/msgsys/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -60,7 +60,7 @@
 #	Overrides.
 #
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Nmisc/ipc
+LDFLAGS		+= -Nmisc/ipc
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/nattymod/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/nattymod/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -61,7 +61,7 @@
 #
 # Linkage dependencies
 #
-MDFLAGS += -Ndrv/ip -Ndrv/udp -Ndrv/ipsecah -Ndrv/ipsecesp
+LDFLAGS += -Ndrv/ip -Ndrv/udp -Ndrv/ipsecah -Ndrv/ipsecesp
 LDFLAGS += -dy
 
 # 
--- a/usr/src/uts/zSeries/neti/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/neti/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 CFLAGS += $(CCVERBOSE)
 
 LDFLAGS		+= -dy 
-MDFLAGS		+= -Nmisc/hook
+LDFLAGS		+= -Nmisc/hook
 
 #
 #	Default build targets.
--- a/usr/src/uts/zSeries/nfs_dlboot/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/nfs_dlboot/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 #
 CFLAGS		+= $(CCVERBOSE) -I$(COM_DIR)
 LINTFLAGS	+= -I$(COM_DIR)
-MDFLAGS		+= -Nmisc/strplumb -Nstrmod/rpcmod
+LDFLAGS		+= -Nmisc/strplumb -Nstrmod/rpcmod
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/nfssrv/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/nfssrv/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 #
 CLEANFILES	+= nfs_auth_xdr.c
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS         += -Nstrmod/rpcmod -Nfs/nfs -Nmisc/rpcsec
+LDFLAGS         += -Nstrmod/rpcmod -Nfs/nfs -Nmisc/rpcsec
 LDFLAGS         += -dy
 
 #
--- a/usr/src/uts/zSeries/ohci/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ohci/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 #
 # depends on misc/usba
 #
-MDFLAGS         += -Nmisc/usba
+LDFLAGS         += -Nmisc/usba
 LDFLAGS         += -dy
 
 #
--- a/usr/src/uts/zSeries/osa/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/osa/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -56,7 +56,7 @@
 #
 #       Overrides.
 #
-LDFLAGS         += -dy
+LDFLAGS         += -dy -Nmisc/mac -Nmac/mac_ether -Ndrv/ccwnex
 
 #
 #       Default build targets.
--- a/usr/src/uts/zSeries/profile/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/profile/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS         += -Ndrv/dtrace
+LDFLAGS         += -Ndrv/dtrace
 LDFLAGS         += -dy
 
 .KEEP_STATE:
--- a/usr/src/uts/zSeries/px_pci/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/px_pci/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -76,7 +76,7 @@
 #
 #	Dependency
 #
-MDFLAGS += -Nmisc/pcie
+LDFLAGS += -Nmisc/pcie
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/random/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/random/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -61,7 +61,7 @@
 #
 # Linkage dependencies
 #
-MDFLAGS += -Nmisc/kcf
+LDFLAGS += -Nmisc/kcf
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/rge/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/rge/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -68,7 +68,7 @@
 #
 # Driver depends on MAC & IP
 #
-MDFLAGS		+= -Nmisc/mac -Ndrv/ip
+LDFLAGS		+= -Nmisc/mac -Ndrv/ip
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/rpcib/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/rpcib/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -67,7 +67,7 @@
 #
 # depends on misc/ibtl and misc/ibcm
 #
-MDFLAGS	+= -Nmisc/ibtl -Nmisc/ibcm
+LDFLAGS	+= -Nmisc/ibtl -Nmisc/ibcm
 LDFLAGS	+= -dy
 
 #
--- a/usr/src/uts/zSeries/rpcmod/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/rpcmod/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -68,7 +68,7 @@
 #
 #	depends_on
 #
-MDFLAGS		+= -Nmisc/tlimod
+LDFLAGS		+= -Nmisc/tlimod
 LDFLAGS		+= -dy -Nmisc/tlimod
 
 # 
--- a/usr/src/uts/zSeries/rsa/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/rsa/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -64,7 +64,7 @@
 #
 # Linkage dependencies
 #
-MDFLAGS += -Ncrypto/md5 -Ncrypto/sha2
+LDFLAGS += -Ncrypto/md5 -Ncrypto/sha2
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/rsm/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/rsm/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -70,7 +70,7 @@
 #
 #	depends on rsmops
 #
-MDFLAGS		+= -Nmisc/rsmops
+LDFLAGS		+= -Nmisc/rsmops
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/rts/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/rts/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -74,7 +74,7 @@
 #
 #	depends on tun
 #
-MDFLAGS		+= -Ndrv/ip
+LDFLAGS		+= -Ndrv/ip
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/scsa1394/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/scsa1394/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -69,7 +69,7 @@
 #
 # depends on
 #
-MDFLAGS		+= -Nmisc/scsi -Nmisc/s1394 -Nmisc/sbp2
+LDFLAGS		+= -Nmisc/scsi -Nmisc/s1394 -Nmisc/sbp2
 LDFLAGS		+= -dy
 
 #	Default build targets.
--- a/usr/src/uts/zSeries/scsa2usb/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/scsa2usb/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -60,7 +60,7 @@
 
 # depends on misc/usba misc/scsi
 #
-MDFLAGS		+= -Nmisc/usba -Nmisc/scsi
+LDFLAGS		+= -Nmisc/usba -Nmisc/scsi
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/sctp/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/sctp/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -72,7 +72,7 @@
 #
 #	depends on IP
 #
-MDFLAGS		+= -Ndrv/ip
+LDFLAGS		+= -Ndrv/ip
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/sctp6/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/sctp6/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -61,7 +61,7 @@
 # lint pass one enforcement
 #
 CFLAGS		+= -v
-MDFLAGS		+= -Ndrv/sctp -Ndrv/ip
+LDFLAGS		+= -Ndrv/sctp -Ndrv/ip
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/sdev_nsconfig_mod/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/sdev_nsconfig_mod/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -56,7 +56,7 @@
 # 
 # Dependencies
 #
-MDFLAGS += -Nfs/dev 
+LDFLAGS += -Nfs/dev 
 LDFLAGS += -dy 
 
 #
--- a/usr/src/uts/zSeries/sdt/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/sdt/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Ndrv/dtrace -Nmisc/ctf
+LDFLAGS		+= -Ndrv/dtrace -Nmisc/ctf
 LDFLAGS		+= -dy
 
 .KEEP_STATE:
--- a/usr/src/uts/zSeries/semsys/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/semsys/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 $(MODSTUBS_O)	:= AS_CPPFLAGS += -DSEMSYS_MODULE
 CLEANFILES	+= $(MODSTUBS_O)
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Nmisc/ipc
+LDFLAGS		+= -Nmisc/ipc
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/shmsys/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/shmsys/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 $(MODSTUBS_O)	:= AS_CPPFLAGS += -DSHMSYS_MODULE
 CLEANFILES	+= $(MODSTUBS_O)
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Nmisc/ipc
+LDFLAGS		+= -Nmisc/ipc
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/smbfs/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/smbfs/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -68,7 +68,7 @@
 C99MODE		= $(C99_ENABLE)
 INC_PATH	+= -I$(UTSBASE)/common/fs/smbclnt
 LDFLAGS         += -dy
-MDFLAGS         = -Ndrv/nsmb
+LDFLAGS         += -Ndrv/nsmb
 
 #
 #	Default build targets.
--- a/usr/src/uts/zSeries/smbsrv/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/smbsrv/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -54,7 +54,7 @@
 #	Module dependencies
 #
 LDFLAGS += -dy
-MDFLAGS = -Nfs/sockfs -Ndrv/ip -Nstrmod/rpcmod -Nsys/doorfs -Nmisc/kcf
+LDFLAGS += -Nfs/sockfs -Ndrv/ip -Nstrmod/rpcmod -Nsys/doorfs -Nmisc/kcf
 
 #
 #	Define targets
--- a/usr/src/uts/zSeries/sockfs/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/sockfs/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -66,7 +66,7 @@
 $(MODSTUBS_O)	:= AS_CPPFLAGS += -DSOCK_MODULE
 CLEANFILES	+= $(MODSTUBS_O)
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS         += -Ndrv/ip
+LDFLAGS         += -Ndrv/ip
 LDFLAGS         += -dy
 
 #
--- a/usr/src/uts/zSeries/softmac/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/softmac/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -57,7 +57,7 @@
 #
 CFLAGS 		+= $(CCVERBOSE)
 LDFLAGS 	+= -dy
-MDFLAGS 	+= -Ndrv/dld -Nmisc/mac -Nmisc/strplumb -Nmisc/dls
+LDFLAGS 	+= -Ndrv/dld -Nmisc/mac -Nmisc/strplumb -Nmisc/dls
 
 #
 # For now, disable these lint checks as it is a generic STREAMS problem;
--- a/usr/src/uts/zSeries/spdsock/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/spdsock/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -62,7 +62,7 @@
 #
 # Linkage dependencies
 #
-MDFLAGS += -Ndrv/ip -Nsys/c2audit
+LDFLAGS += -Ndrv/ip -Nsys/c2audit
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/strplumb/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/strplumb/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -63,7 +63,7 @@
 #
 CFLAGS  += $(CCVERBOSE)
 LDFLAGS += -dy 
-MDFLAGS += -Nmisc/mac
+LDFLAGS += -Nmisc/mac
 
 #
 #	Default build targets.
--- a/usr/src/uts/zSeries/swrand/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/swrand/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -64,7 +64,7 @@
 #
 # Linkage dependencies
 #
-MDFLAGS += -Nmisc/kcf
+LDFLAGS += -Nmisc/kcf
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/sys/fasttrap_isa.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/sys/fasttrap_isa.h	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
  */
 #define	FASTTRAP_INSTR			0x91d02038
 
-#define	FASTTRAP_SUNWDTRACE_SIZE	128
+#define	FASTTRAP_SUNWDTRACE_SIZE	64
 
 typedef uint32_t	fasttrap_instr_t;
 
--- a/usr/src/uts/zSeries/sys/machs390x.h	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/sys/machs390x.h	Mon Mar 23 14:01:42 2009 -0400
@@ -474,7 +474,10 @@
 	uint32_t __lc_pgm_trace;		/* 0x0358 */
 	uint32_t __lc_hat_trace;		/* 0x035c */
 	uint32_t __lc_any_trace;		/* 0x0360 */
-	char	 fill_13[0x400-0x364];		/* 0x0364 */
+	uint32_t __lc_io_trace;			/* 0x0364 */
+	uint32_t __lc_rsi_trace;		/* 0x0368 */
+	uint32_t __lc_pre_trace;		/* 0x036c */
+	char	 fill_13[0x400-0x370];		/* 0x0370 */
 	void	 *__lc_kstack;			/* 0x0400 */
 	uint64_t __lc_syn_save_area;		/* 0x0408 */
 	uint64_t __lc_asy_save_area;		/* 0x0410 */
@@ -671,7 +674,10 @@
 #define __LC_SVC_TRACE		0x354
 #define __LC_PGM_TRACE		0x358
 #define __LC_HAT_TRACE		0x35c
-#define __LC_ANY_TRACE		0x364
+#define __LC_ANY_TRACE		0x360
+#define __LC_IO_TRACE		0x364
+#define __LC_RSI_TRACE		0x368
+#define __LC_PRE_TRACE		0x36c
 #define	__LC_KSTACK		0x400
 #define	__LC_SYN_SAVE_AREA	0x408
 #define	__LC_ASY_SAVE_AREA	0x410
--- a/usr/src/uts/zSeries/syscall/cpcmd.c	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/syscall/cpcmd.c	Mon Mar 23 14:01:42 2009 -0400
@@ -141,7 +141,8 @@
 		 "0:\n"
 		 "	lgfr	%2,3\n"
 		 : "=m" (resBuf), "=r" (status), "=r" (lResult)
-		 : "r" (cmdBuf), "r" (cmdLen), "r" (resize));
+		 : "r" (cmdBuf), "r" (cmdLen), "r" (resize)
+		 : "0", "1", "2", "3", "cc");
 
 	if (lResult > 0) {
 		e2a(resBuf, lResult);
--- a/usr/src/uts/zSeries/systrace/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/systrace/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -42,7 +42,7 @@
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Ndrv/dtrace
+LDFLAGS		+= -Ndrv/dtrace
 LDFLAGS		+= -dy
 
 .KEEP_STATE:
--- a/usr/src/uts/zSeries/tcp/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/tcp/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -80,7 +80,7 @@
 #
 #	depends on ip and md5
 #
-MDFLAGS		+= -Ndrv/ip -Ncrypto/md5
+LDFLAGS		+= -Ndrv/ip -Ncrypto/md5
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/tcp6/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/tcp6/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -61,7 +61,7 @@
 # lint pass one enforcement
 #
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Ndrv/tcp -Ndrv/ip -Ndrv/ip6
+LDFLAGS		+= -Ndrv/tcp -Ndrv/ip -Ndrv/ip6
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/tem/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/tem/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -59,7 +59,7 @@
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 CFLAGS  += $(CCVERBOSE)
-MDFLAGS += -Ndacf/consconfig_dacf
+LDFLAGS += -Ndacf/consconfig_dacf
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/tl/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/tl/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -68,7 +68,7 @@
 # which happens to live in "ip" kernel module only.  Needed to do
 # AF_UNIX socket options.
 #
-MDFLAGS += -Ndrv/ip
+LDFLAGS += -Ndrv/ip
 LDFLAGS += -dy 
 
 #
--- a/usr/src/uts/zSeries/tokenmt/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/tokenmt/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 # lint pass one enforcement
 #
 CFLAGS  += $(CCVERBOSE)
-MDFLAGS += -Ndrv/ip
+LDFLAGS += -Ndrv/ip
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/tswtclmt/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/tswtclmt/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 # lint pass one enforcement
 #
 CFLAGS  += $(CCVERBOSE)
-MDFLAGS += -Ndrv/ip
+LDFLAGS += -Ndrv/ip
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/tun/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/tun/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -73,7 +73,7 @@
 #
 #	depends on ip and ip6
 #
-MDFLAGS		+= -Ndrv/ip -Ndrv/ip6
+LDFLAGS		+= -Ndrv/ip -Ndrv/ip6
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/udp/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/udp/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -74,7 +74,7 @@
 #
 #	depends on ip
 #
-MDFLAGS		+= -Ndrv/ip
+LDFLAGS		+= -Ndrv/ip
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/udp6/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/udp6/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 #
 #	depends on udp ip and ip6
 #
-MDFLAGS		+= -Ndrv/udp -Ndrv/ip -Ndrv/ip6
+LDFLAGS		+= -Ndrv/udp -Ndrv/ip -Ndrv/ip6
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/ufs/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ufs/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -65,7 +65,7 @@
 $(MODSTUBS_O)	:= AS_CPPFLAGS += -DUFS_MODULE
 CLEANFILES	+= $(MODSTUBS_O)
 CFLAGS		+= $(CCVERBOSE)
-MDFLAGS		+= -Nfs/specfs -Nmisc/fssnap_if
+LDFLAGS		+= -Nfs/specfs -Nmisc/fssnap_if
 LDFLAGS		+= -dy
 
 #
--- a/usr/src/uts/zSeries/ugen/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/ugen/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -61,7 +61,7 @@
 #
 # depends on misc/usba
 #
-MDFLAGS         += -Nmisc/usba
+LDFLAGS         += -Nmisc/usba
 LDFLAGS         += -dy
 
 #
--- a/usr/src/uts/zSeries/uhci/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/uhci/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -62,7 +62,7 @@
 #
 # depends on misc/usba
 #
-MDFLAGS         += -Nmisc/usba
+LDFLAGS         += -Nmisc/usba
 LDFLAGS         += -dy
 
 #
--- a/usr/src/uts/zSeries/wc/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/wc/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -69,7 +69,7 @@
 # lint pass one enforcement
 #
 CFLAGS  += $(CCVERBOSE)
-MDFLAGS += -Nmisc/tem -Ndacf/consconfig_dacf
+LDFLAGS += -Nmisc/tem -Ndacf/consconfig_dacf
 LDFLAGS += -dy
 
 #
--- a/usr/src/uts/zSeries/zfs/Makefile	Fri Oct 31 13:36:47 2008 -0400
+++ b/usr/src/uts/zSeries/zfs/Makefile	Mon Mar 23 14:01:42 2009 -0400
@@ -62,7 +62,7 @@
 #	Overrides and depends_on
 #
 MODSTUBS_DIR	 = $(OBJS_DIR)
-MDFLAGS		+= -Nfs/specfs -Ndrv/random
+LDFLAGS		+= -Nfs/specfs -Ndrv/random
 LDFLAGS		+= -dy
 
 INC_PATH	+= -I$(UTSBASE)/common/fs/zfs