[illumos-gate merge]

commit 95cb2e31c87e3febe7315833e075c1b16451e44c
    8685 uts and mdb: do not build 32bit kernel
commit 141fdc8db8933e5c2d4fe6a0f5ee25c59f0a0231
    8987 bootadm: add bootfile fallback to unix
commit 9aa2d72c0b7ffd836b0f633a523c698cfa854256
    8986 loader: try_multiple_kernels does not try multiple kernels

	Conflicts:
	usr/src/uts/intel/Makefile.intel

6 files changed, 18 insertions, 30 deletions

diff --git a/usr/src/uts/i86xpv/xdb/Makefile b/usr/src/uts/i86xpv/xdb/Makefile
index d221748e1c..f8f78d01df 100644
--- a/usr/src/uts/i86xpv/xdb/Makefile
+++ b/usr/src/uts/i86xpv/xdb/Makefile
@@ -72,15 +72,13 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-# This build only 64-bit, but the lint32 below
-# needs corresponding clean/clobber deps.
-clean:		$(CLEAN_DEPS) clean.debug32
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(CLOBBER_DEPS) clobber.debug32
+clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-modlintlib:	$(MODLINTLIB_DEPS) lint32
+modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xnb/Makefile b/usr/src/uts/i86xpv/xnb/Makefile
index 22e11b44cd..132ede9860 100644
--- a/usr/src/uts/i86xpv/xnb/Makefile
+++ b/usr/src/uts/i86xpv/xnb/Makefile
@@ -87,15 +87,13 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-# This build only 64-bit, but the lint32 below
-# needs corresponding clean/clobber deps.
-clean:		$(CLEAN_DEPS) clean.debug32
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(CLOBBER_DEPS) clobber.debug32
+clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-modlintlib:	$(MODLINTLIB_DEPS) lint32
+modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xnbe/Makefile b/usr/src/uts/i86xpv/xnbe/Makefile
index c45af07dd8..b9701c2323 100644
--- a/usr/src/uts/i86xpv/xnbe/Makefile
+++ b/usr/src/uts/i86xpv/xnbe/Makefile
@@ -81,15 +81,13 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-# This build only 64-bit, but the lint32 below
-# needs corresponding clean/clobber deps.
-clean:		$(CLEAN_DEPS) clean.debug32
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(CLOBBER_DEPS) clobber.debug32
+clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-modlintlib:	$(MODLINTLIB_DEPS) lint32
+modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xnbo/Makefile b/usr/src/uts/i86xpv/xnbo/Makefile
index 43c53b275e..c127edfc82 100644
--- a/usr/src/uts/i86xpv/xnbo/Makefile
+++ b/usr/src/uts/i86xpv/xnbo/Makefile
@@ -81,15 +81,13 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-# This build only 64-bit, but the lint32 below
-# needs corresponding clean/clobber deps.
-clean:		$(CLEAN_DEPS) clean.debug32
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(CLOBBER_DEPS) clobber.debug32
+clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-modlintlib:	$(MODLINTLIB_DEPS) lint32
+modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xnbu/Makefile b/usr/src/uts/i86xpv/xnbu/Makefile
index e60f05db23..9ffa2b7a8d 100644
--- a/usr/src/uts/i86xpv/xnbu/Makefile
+++ b/usr/src/uts/i86xpv/xnbu/Makefile
@@ -81,15 +81,13 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-# This build only 64-bit, but the lint32 below
-# needs corresponding clean/clobber deps.
-clean:		$(CLEAN_DEPS) clean.debug32
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(CLOBBER_DEPS) clobber.debug32
+clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-modlintlib:	$(MODLINTLIB_DEPS) lint32
+modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)
 
diff --git a/usr/src/uts/i86xpv/xpvtap/Makefile b/usr/src/uts/i86xpv/xpvtap/Makefile
index a921762700..d231d9c3db 100644
--- a/usr/src/uts/i86xpv/xpvtap/Makefile
+++ b/usr/src/uts/i86xpv/xpvtap/Makefile
@@ -86,15 +86,13 @@ def:		$(DEF_DEPS)
 
 all:		$(ALL_DEPS)
 
-# This build only 64-bit, but the lint32 below
-# needs corresponding clean/clobber deps.
-clean:		$(CLEAN_DEPS) clean.debug32
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(CLOBBER_DEPS) clobber.debug32
+clobber:	$(CLOBBER_DEPS)
 
 lint:		$(LINT_DEPS)
 
-modlintlib:	$(MODLINTLIB_DEPS) lint32
+modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)