 @@ -1,14 +1,14 @@
-#	$NetBSD: sets.subr,v 1.109 2009/12/11 12:07:58 he Exp $
+#	$NetBSD: sets.subr,v 1.110 2009/12/11 12:57:39 uebayasi Exp $
+#
+#
 # The following variables contain defaults for sets.subr functions and callers:
 #	setsdir			path to src/distrib/sets
 #	nlists			list of base sets
 #	xlists			list of x11 sets
 #	extlists		list of extsrc sets
 #	obsolete		controls if obsolete files are selected instead
 #	module			if != "no", enable MODULE sets
 #	shlib			shared library format (a.out, elf, or "")
 #	stlib			static library format (a.out, elf)
+#
 @@ -168,27 +168,27 @@ extlists="extbase extcomp extetc"
 OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
 MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
 SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
 SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
 SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
+#
 # list_set_files setfile [...]
+#
 # Produce a packing list for setfile(s).
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
+#
-# 	# $NetBSD: sets.subr,v 1.109 2009/12/11 12:07:58 he Exp $
+# 	# $NetBSD: sets.subr,v 1.110 2009/12/11 12:57:39 uebayasi Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
 # 	./bin/[			base-util-root
 # 	./bin/cat		base-util-root
 #		[...]
+#
 # A # in the first column marks a comment.
+#
 # If ${obsolete} != 0, only entries with an "obsolete" keyword will
 # be printed.  All other keywords must be present.
+#
 # The third field is an optional comma separated list of keywords to
 @@ -376,118 +376,93 @@ list_set_files()
 #	rescue.ad.${MACHINE_ARCH}
 # (or)	rescue.ad.${MACHINE_CPU}
 # 	rescue.ad.${MACHINE_CPU}.shl
+#
 # Environment:
 # 	shlib
 # 	stlib
+#
 list_set_lists()
+{
 	setname=$1
 	setdir=$setsdir/lists/$setname
 	echo $setdir/mi
 	for _extsrc_pkg in ${EXTSRCS}; do
 		if [ -f $setdir/mi.ext.${_extsrc_pkg} ]; then
 			echo $setdir/mi.ext.${_extsrc_pkg}
 		fi
 	done
 	if [ "${MACHINE}" != "${MACHINE_ARCH}" ]; then
 		# Prefer an ad.${MACHINE_ARCH} over an ad.${MACHINE_CPU},
 		# since the arch-specific one will be more specific than
 		# the cpu-specific one.
-		if [ -f $setdir/ad.${MACHINE_ARCH} ]; then
+		echo_if_exist $setdir/ad.${MACHINE_ARCH} || \
-			echo $setdir/ad.${MACHINE_ARCH}
+		echo_if_exist $setdir/ad.${MACHINE_CPU}
-		elif [ -f $setdir/ad.${MACHINE_CPU} ]; then
+		if [ "$shlib" != "no" ]; then
-			echo $setdir/ad.${MACHINE_CPU}
+			echo_if_exist $setdir/ad.${MACHINE_CPU}.shl
 		fi
 		if [ "$shlib" != "no" -a \
 		     -f $setdir/ad.${MACHINE_CPU}.shl ]; then
 			echo $setdir/ad.${MACHINE_CPU}.shl
 		fi
 	fi
 	if [ -f $setdir/md.${MACHINE}.${MACHINE_ARCH} ]; then
 		echo $setdir/md.${MACHINE}.${MACHINE_ARCH}
 	elif [ -f $setdir/md.${MACHINE} ]; then
 		echo $setdir/md.${MACHINE}
 	fi
 	if [ -f $setdir/stl.mi ]; then
 		echo $setdir/stl.mi
 	fi
 	if [ -f $setdir/stl.${stlib} ]; then
 		echo $setdir/stl.${stlib}
 	fi
 	echo_if_exist $setdir/md.${MACHINE}.${MACHINE_ARCH} || \
 	echo_if_exist $setdir/md.${MACHINE}
 	echo_if_exist $setdir/stl.mi
 	echo_if_exist $setdir/stl.${stlib}
 	if [ "$shlib" != "no" ]; then
-		if [ -f $setdir/shl.mi ]; then
+		echo_if_exist $setdir/shl.mi
-			echo $setdir/shl.mi
+		echo_if_exist $setdir/shl.${shlib}
 		fi
 		for _extsrc_pkg in ${EXTSRCS}; do
 			if [ -f $setdir/shl.mi.ext.${_extsrc_pkg} ]; then
 				echo $setdir/shl.mi.ext.${_extsrc_pkg}
 			fi
 		done
 		if [ -f $setdir/shl.${shlib} ]; then
 			echo $setdir/shl.${shlib}
 		fi
 		for _extsrc_pkg in ${EXTSRCS}; do
 			if [ -f $setdir/shl.${shlib}.ext.${_extsrc_pkg} ]; then
 				echo $setdir/shl.${shlib}.ext.${_extsrc_pkg}
 			fi
 		done
 	fi
 	if [ "$module" != "no" ]; then
-		if [ -f $setdir/module.mi ]; then
+		echo_if_exist $setdir/module.mi
-			echo $setdir/module.mi
+		echo_if_exist $setdir/module.${MACHINE}
 		fi
 		if [ -f $setdir/module.${MACHINE} ]; then
 			echo $setdir/module.${MACHINE}
 		fi
 		if [ "${MACHINE}" != "${MACHINE_ARCH}" ]; then
 			# Prefer a module.ad.${MACHINE_ARCH} over a
 			# module.ad.${MACHINE_CPU}, since the arch-
 			# specific one will be more specific than the
 			# cpu-specific one.
-			if [ -f $setdir/module.ad.${MACHINE_ARCH} ]; then
+			echo_if_exist $setdir/module.ad.${MACHINE_ARCH} || \
-				echo $setdir/module.ad.${MACHINE_ARCH}
+			echo_if_exist $setdir/module.ad.${MACHINE_CPU}
 			elif [ -f $setdir/module.ad.${MACHINE_CPU} ]; then
 				echo $setdir/module.ad.${MACHINE_CPU}
 			fi
 		fi
 	fi
-	if [ -f $setdir/rescue.mi ]; then
+	echo_if_exist $setdir/rescue.mi
-		echo $setdir/rescue.mi
+	echo_if_exist $setdir/rescue.${MACHINE}
 	fi
 	if [ -f $setdir/rescue.${MACHINE} ]; then
 		echo $setdir/rescue.${MACHINE}
 	fi
 	if [ "${MACHINE}" != "${MACHINE_ARCH}" ]; then
 		# Prefer a rescue.ad.${MACHINE_ARCH} over a
 		# rescue.ad.${MACHINE_CPU}, since the arch-
 		# specific one will be more specific than the
 		# cpu-specific one.
-		if [ -f $setdir/rescue.ad.${MACHINE_ARCH} ]; then
+		echo_if_exist $setdir/rescue.ad.${MACHINE_ARCH} || \
-			echo $setdir/rescue.ad.${MACHINE_ARCH}
+		echo_if_exist $setdir/rescue.ad.${MACHINE_CPU}
-		elif [ -f $setdir/rescue.ad.${MACHINE_CPU} ]; then
+		if [ "$shlib" != "no" ]; then
-			echo $setdir/rescue.ad.${MACHINE_CPU}
+			echo_if_exist $setdir/rescue.ad.${MACHINE_CPU}.shl
 		fi
 		if [ "$shlib" != "no" -a \
 		     -f $setdir/rescue.ad.${MACHINE_CPU}.shl ]; then
 			echo $setdir/rescue.ad.${MACHINE_CPU}.shl
 		fi
 	fi
+}
 echo_if_exist()
+{
 	[ -f $1 ] && echo $1
 	return $?
+}
 echo_if_exist_foreach()
+{
 	local _list=$1; shift
 	for _suffix in $@; do
 		echo_if_exist ${_list}.${_suffix}
 	done
+}
 # arch_to_cpu mach
+#
 # Print the ${MACHINE_CPU} for ${MACHINE_ARCH}=mach,
 # as determined by <bsd.own.mk>.
+#
 arch_to_cpu()
+{
 	MACHINE_ARCH=${1} ${MAKE} -B -f- all <<EOMAKE
 .include <bsd.own.mk>
 all:
 	@echo \${MACHINE_CPU}
 EOMAKE
+}