===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.95
retrieving revision 1.98
diff -u -r1.95 -r1.98
--- src/Makefile	2003/12/14 10:02:57	1.95
+++ src/Makefile	2004/01/28 02:24:28	1.98
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.95 2003/12/14 10:02:57 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.98 2004/01/28 02:24:28 mickey Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -128,16 +128,18 @@
 ${CROSSDIRS}:
 	@-mkdir -p ${CROSSDIR}
 	@case ${TARGET} in \
-		sparc|i386|m68k|alpha|hppa|powerpc|sparc64|m88k|vax) \
+		alpha|i386|m68k|hppa|powerpc|sparc|sparc64|m88k|vax) \
 			echo ${TARGET} ;;\
 		amiga|sun3|mac68k|hp300|mvme68k) \
 			echo m68k ;;\
 		mvme88k) \
 			echo m88k ;;\
-		mvmeppc|macppc) \
+		mvmeppc|macppc|pegasos) \
 			echo powerpc ;;\
 		sgi) \
 			echo mips ;;\
+		amd64) \
+			echo x86_64 ;;\
 		*) \
 			(echo Unknown arch ${TARGET} >&2) ; exit 1;; \
 	esac > ${CROSSDIR}/TARGET_ARCH
@@ -176,12 +178,12 @@
 
 .if ${TARGET} == "alpha" || ${TARGET} == "hppa" || ${TARGET} == "i386" || \
     ${TARGET} == "macppc" || ${TARGET} == "mvmeppc" || ${TARGET} == "sgi" || \
-    ${TARGET} == "sparc" || ${TARGET} == "sparc64"
+    ${TARGET} == "sparc" || ${TARGET} == "sparc64" || ${TARGET} == "amd64"
 BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
 		strings strip
 NEW_BINUTILS?=	Yes
 .else
-BINUTILS=	ar as ld nm ranlib objcopy objdump size strings strip
+BINUTILS=	ar as ld nm ranlib objcopy objdump strings strip
 NEW_BINUTILS?=	No
 .endif
 
@@ -239,15 +241,6 @@
 	    NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/strip \
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
-	(cd ${.CURDIR}/usr.bin/size; \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
-	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
-	    NOMAN= depend all; \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN= install)
-	ln -sf ${CROSSDIR}/usr/bin/size \
-	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/size
 	(cd ${.CURDIR}/usr.bin/nm; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
@@ -256,6 +249,8 @@
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/nm \
+	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
+	ln -sf ${CROSSDIR}/usr/bin/size \
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
 .endif
 	@for cmd in ${BINUTILS}; do \