6491439 warlock support on x86

--HG--
rename : usr/src/uts/sparc/audio1575/audio1575.wlcmd => usr/src/uts/common/io/warlock/audio1575.wlcmd
rename : usr/src/uts/sparc/audio1575/audio1575_with_sada.wlcmd => usr/src/uts/common/io/warlock/audio1575_with_sada.wlcmd
rename : usr/src/uts/sparc/audio810/audio810.wlcmd => usr/src/uts/common/io/warlock/audio810.wlcmd
rename : usr/src/uts/sparc/audio810/audio810_with_sada.wlcmd => usr/src/uts/common/io/warlock/audio810_with_sada.wlcmd
rename : usr/src/uts/sparc/audiocs/audiocs.wlcmd => usr/src/uts/common/io/warlock/audiocs.wlcmd
rename : usr/src/uts/sparc/audiocs/audiocs_with_sada.wlcmd => usr/src/uts/common/io/warlock/audiocs_with_sada.wlcmd
rename : usr/src/uts/sparc/audiohd/audiohd.wlcmd => usr/src/uts/common/io/warlock/audiohd.wlcmd
rename : usr/src/uts/sparc/audiohd/audiohd_with_sada.wlcmd => usr/src/uts/common/io/warlock/audiohd_with_sada.wlcmd
rename : usr/src/uts/sparc/audioixp/audioixp.wlcmd => usr/src/uts/common/io/warlock/audioixp.wlcmd
rename : usr/src/uts/sparc/audioixp/audioixp_with_sada.wlcmd => usr/src/uts/common/io/warlock/audioixp_with_sada.wlcmd
rename : usr/src/uts/sparc/audiosup/audiosup.wlcmd => usr/src/uts/common/io/warlock/audiosup.wlcmd
rename : usr/src/uts/sparc/audiots/audiots.wlcmd => usr/src/uts/common/io/warlock/audiots.wlcmd
rename : usr/src/uts/sparc/audiots/audiots_with_sada.wlcmd => usr/src/uts/common/io/warlock/audiots_with_sada.wlcmd
rename : usr/src/uts/sparc/av1394/av1394.wlcmd => usr/src/uts/common/io/warlock/av1394.wlcmd
rename : usr/src/uts/sparc/ecpp/ecpp.wlcmd => usr/src/uts/common/io/warlock/ecpp.wlcmd
rename : usr/src/uts/sparc/ehci/ehci.wlcmd => usr/src/uts/common/io/warlock/ehci.wlcmd
rename : usr/src/uts/sparc/esp/esp.wlcmd => usr/src/uts/common/io/warlock/esp.wlcmd
rename : usr/src/uts/sparc/fas/fas.wlcmd => usr/src/uts/common/io/warlock/fas.wlcmd
rename : usr/src/uts/sparc/hci1394/hci1394.wlcmd => usr/src/uts/common/io/warlock/hci1394.wlcmd
rename : usr/src/uts/sparc/hid/hid.wlcmd => usr/src/uts/common/io/warlock/hid.wlcmd
rename : usr/src/uts/sparc/hid/hid_with_usba.wlcmd => usr/src/uts/common/io/warlock/hid_with_usba.wlcmd
rename : usr/src/uts/sparc/ib/ib.wlcmd => usr/src/uts/common/io/warlock/ib.wlcmd
rename : usr/src/uts/sparc/ibcm/ibcm.wlcmd => usr/src/uts/common/io/warlock/ibcm.wlcmd
rename : usr/src/uts/sparc/ibd/ibd.wlcmd => usr/src/uts/common/io/warlock/ibd.wlcmd
rename : usr/src/uts/sparc/ibmf/ibmf.wlcmd => usr/src/uts/common/io/warlock/ibmf.wlcmd
rename : usr/src/uts/sparc/ibtl/ibtl.wlcmd => usr/src/uts/common/io/warlock/ibtl.wlcmd
rename : usr/src/uts/sparc/mixer/mixer.wlcmd => usr/src/uts/common/io/warlock/mixer.wlcmd
rename : usr/src/uts/sparc/mixer/mixer_with_audiosup.wlcmd => usr/src/uts/common/io/warlock/mixer_with_audiosup.wlcmd
rename : usr/src/uts/sparc/ohci/ohci.wlcmd => usr/src/uts/common/io/warlock/ohci.wlcmd
rename : usr/src/uts/sparc/sbp2/sbp2.wlcmd => usr/src/uts/common/io/warlock/sbp2.wlcmd
rename : usr/src/uts/sparc/scsa1394/scsa1394.wlcmd => usr/src/uts/common/io/warlock/scsa1394.wlcmd
rename : usr/src/uts/sparc/scsa2usb/scsa2usb.wlcmd => usr/src/uts/common/io/warlock/scsa2usb.wlcmd
rename : usr/src/uts/sparc/scsa2usb/scsa2usb_with_usba.wlcmd => usr/src/uts/common/io/warlock/scsa2usb_with_usba.wlcmd
rename : usr/src/uts/sparc/sd/sd.wlcmd => usr/src/uts/common/io/warlock/sd.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_esp.wlcmd => usr/src/uts/common/io/warlock/sd_with_esp.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_fas.wlcmd => usr/src/uts/common/io/warlock/sd_with_fas.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_glm.wlcmd => usr/src/uts/common/io/warlock/sd_with_glm.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_isp.wlcmd => usr/src/uts/common/io/warlock/sd_with_isp.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_mpt.wlcmd => usr/src/uts/common/io/warlock/sd_with_mpt.wlcmd
rename : usr/src/uts/sparc/sd/sd_with_uata.wlcmd => usr/src/uts/common/io/warlock/sd_with_uata.wlcmd
rename : usr/src/uts/sparc/ses/ses.wlcmd => usr/src/uts/common/io/warlock/ses.wlcmd
rename : usr/src/uts/sparc/ses/ses_with_esp.wlcmd => usr/src/uts/common/io/warlock/ses_with_esp.wlcmd
rename : usr/src/uts/sparc/ses/ses_with_fas.wlcmd => usr/src/uts/common/io/warlock/ses_with_fas.wlcmd
rename : usr/src/uts/sparc/ses/ses_with_glm.wlcmd => usr/src/uts/common/io/warlock/ses_with_glm.wlcmd
rename : usr/src/uts/sparc/ses/ses_with_isp.wlcmd => usr/src/uts/common/io/warlock/ses_with_isp.wlcmd
rename : usr/src/uts/sparc/si3124/si3124.wlcmd => usr/src/uts/common/io/warlock/si3124.wlcmd
rename : usr/src/uts/sparc/ssd/ssd.wlcmd => usr/src/uts/common/io/warlock/ssd.wlcmd
rename : usr/src/uts/sparc/st/st.wlcmd => usr/src/uts/common/io/warlock/st.wlcmd
rename : usr/src/uts/sparc/st/st_with_esp.wlcmd => usr/src/uts/common/io/warlock/st_with_esp.wlcmd
rename : usr/src/uts/sparc/st/st_with_fas.wlcmd => usr/src/uts/common/io/warlock/st_with_fas.wlcmd
rename : usr/src/uts/sparc/st/st_with_glm.wlcmd => usr/src/uts/common/io/warlock/st_with_glm.wlcmd
rename : usr/src/uts/sparc/st/st_with_isp.wlcmd => usr/src/uts/common/io/warlock/st_with_isp.wlcmd
rename : usr/src/uts/sparc/ugen/ugen.wlcmd => usr/src/uts/common/io/warlock/ugen.wlcmd
rename : usr/src/uts/sparc/ugen/ugen_with_usba.wlcmd => usr/src/uts/common/io/warlock/ugen_with_usba.wlcmd
rename : usr/src/uts/sparc/uhci/uhci.wlcmd => usr/src/uts/common/io/warlock/uhci.wlcmd
rename : usr/src/uts/sparc/usb_ac/usb_ac.wlcmd => usr/src/uts/common/io/warlock/usb_ac.wlcmd
rename : usr/src/uts/sparc/usb_ac/usb_ac_with_sada.wlcmd => usr/src/uts/common/io/warlock/usb_ac_with_sada.wlcmd
rename : usr/src/uts/sparc/usb_ac/usb_ac_with_usba.wlcmd => usr/src/uts/common/io/warlock/usb_ac_with_usba.wlcmd
rename : usr/src/uts/sparc/usb_ah/usb_ah.wlcmd => usr/src/uts/common/io/warlock/usb_ah.wlcmd
rename : usr/src/uts/sparc/usb_as/usb_as.wlcmd => usr/src/uts/common/io/warlock/usb_as.wlcmd
rename : usr/src/uts/sparc/usb_as/usb_as_with_sada.wlcmd => usr/src/uts/common/io/warlock/usb_as_with_sada.wlcmd
rename : usr/src/uts/sparc/usb_as/usb_as_with_usba.wlcmd => usr/src/uts/common/io/warlock/usb_as_with_usba.wlcmd
rename : usr/src/uts/sparc/usb_mid/usb_mid.wlcmd => usr/src/uts/common/io/warlock/usb_mid.wlcmd
rename : usr/src/uts/sparc/usb_mid/usb_mid_with_usba.wlcmd => usr/src/uts/common/io/warlock/usb_mid_with_usba.wlcmd
rename : usr/src/uts/sparc/usbprn/usbprn.wlcmd => usr/src/uts/common/io/warlock/usbprn.wlcmd
rename : usr/src/uts/sparc/usbprn/usbprn_with_usba.wlcmd => usr/src/uts/common/io/warlock/usbprn_with_usba.wlcmd
rename : usr/src/uts/sparc/usbser/usbser.wlcmd => usr/src/uts/common/io/warlock/usbser.wlcmd
rename : usr/src/uts/sparc/usbsksp/usbser_keyspan.wlcmd => usr/src/uts/common/io/warlock/usbser_keyspan.wlcmd
rename : usr/src/uts/sparc/usbsksp/usbser_keyspan_with_usba.wlcmd => usr/src/uts/common/io/warlock/usbser_keyspan_with_usba.wlcmd
rename : usr/src/uts/sparc/usbskel/usbskel.wlcmd => usr/src/uts/common/io/warlock/usbskel.wlcmd
rename : usr/src/uts/sparc/usbskel/usbskel_with_usba.wlcmd => usr/src/uts/common/io/warlock/usbskel_with_usba.wlcmd
rename : usr/src/uts/sparc/usbsprl/usbsprl.wlcmd => usr/src/uts/common/io/warlock/usbsprl.wlcmd
rename : usr/src/uts/sparc/usbsprl/usbsprl_with_usba.wlcmd => usr/src/uts/common/io/warlock/usbsprl_with_usba.wlcmd

1 files changed, 61 insertions, 0 deletions

diff --git a/usr/src/uts/intel/ses/Makefile b/usr/src/uts/intel/ses/Makefile
index effcf1edbb..7bb902425e 100644
--- a/usr/src/uts/intel/ses/Makefile
+++ b/usr/src/uts/intel/ses/Makefile
@@ -45,6 +45,9 @@ OBJECTS		= $(SES_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(SES_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/intel/io/scsi/targets
+WARLOCK_OUT     = $(SES_OBJS:%.o=%.ll)
+WARLOCK_OK      = $(MODULE).ok
+WLCMD_DIR	= $(UTSBASE)/common/io/warlock
 
 #
 #	Include common rules.
@@ -57,6 +60,7 @@ include $(UTSBASE)/intel/Makefile.intel
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+CLEANFILES	+= $(WARLOCK_TARGETS)
 
 #
 # For now, disable these lint checks; maintainers should endeavor
@@ -76,8 +80,10 @@ def:		$(DEF_DEPS)
 all:		$(ALL_DEPS)
 
 clean:		$(CLEAN_DEPS)
+		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 clobber:	$(CLOBBER_DEPS)
+		$(RM) $(WARLOCK_OUT) $(WARLOCK_OK)
 
 lint:		$(LINT_DEPS)
 
@@ -91,3 +97,58 @@ install:	$(INSTALL_DEPS)
 #	Include common targets.
 #
 include $(UTSBASE)/intel/Makefile.targ
+
+
+#
+# Defines for local commands.
+#
+WARLOCK		= warlock
+WLCC		= wlcc
+TOUCH		= touch
+SCCS		= sccs
+TEST		= test
+
+#
+# Warlock targets
+#
+SCSI_FILES	= $(SCSI_OBJS:%.o=-l ../scsi/%.ll)
+
+%.wlcmd:
+	cd $(WLCMD_DIR); $(TEST) -f $@  || $(SCCS) get $@
+
+WARLOCK_TARGETS	= $(WARLOCK_OK) warlock_with_glm
+
+warlock: $(WARLOCK_TARGETS)
+
+# XXX FIX ME: why only ses.ll?
+
+$(WARLOCK_OK): $(MODULE).wlcmd $(WARLOCK_OUT)
+	@cd ../warlock; $(MAKE) warlock
+	@cd ../scsi; $(MAKE) warlock
+	$(WARLOCK) -c $(WLCMD_DIR)/$(MODULE).wlcmd ses.ll \
+		../warlock/scsi.ll \
+	        -l ../warlock/ddi_dki_impl.ll  \
+	        $(SCSI_FILES)
+	@ $(TOUCH) $@
+
+%.ll: $(UTSBASE)/common/io/scsi/targets/%.c
+	$(WLCC) $(CPPFLAGS) -o $@ $<
+
+warlock_with_glm: ses_with_glm.wlcmd $(WARLOCK_OUT) glm_files
+	@cd ../warlock; $(MAKE) warlock
+	@cd ../scsi; $(MAKE) warlock
+	@cd $(CLOSED)/uts/intel/glm; $(MAKE) warlock;
+	$(WARLOCK) -c $(WLCMD_DIR)/ses_with_glm.wlcmd ses.ll \
+		$(CLOSED)/uts/intel/glm/*.ll \
+	        $(SCSI_FILES) \
+		../warlock/scsi.ll \
+		-l ../warlock/ddi_dki_impl.ll 
+	@ $(TOUCH) $@
+
+glm_files:
+	@cd $(CLOSED)/uts/intel/glm; pwd; $(MAKE) warlock
+
+warlock_ddi.files:
+	@cd ../warlock; pwd; $(MAKE) warlock
+
+