From 9aa60a9f1579692652904333fe5bfdb181897307 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Sat, 10 Aug 2002 02:01:00 +0000
Subject: [PATCH] If ad.${machine_arch} exists, perfer it over
 ad.${machine_cpu}, because it will have more specific information.

---
 distrib/sets/makeflist | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/distrib/sets/makeflist b/distrib/sets/makeflist
index c0acb8583543..29bd36261627 100755
--- a/distrib/sets/makeflist
+++ b/distrib/sets/makeflist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.49 2002/07/23 09:02:45 lukem Exp $
+# $NetBSD: makeflist,v 1.50 2002/08/10 02:01:00 thorpej Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -100,7 +100,12 @@ unset _lists
 for setname in $lists; do
 	cat $setd/lists/$setname/mi
 	if [ "$machine" != "$machine_arch" ]; then
-		if [ -f $setd/lists/$setname/ad.${machine_cpu} ]; 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 $setd/lists/$setname/ad.${machine_arch} ]; then
+			cat $setd/lists/$setname/ad.${machine_arch}
+		elif [ -f $setd/lists/$setname/ad.${machine_cpu} ]; then
 			cat $setd/lists/$setname/ad.${machine_cpu}
 		fi
 		if [ "$shlib" != "no" -a \