plan9port

commit 10ff532fdcff507f0bc55be5faef3782cd2e595f
parent 0f172593a39f8bea3c73c415ffe4600ad61e0bf2
Author: wkj <devnull@localhost>
Date:   Tue, 22 Feb 2005 16:58:04 +0000

Fix up OBJTYPE on 64-bit x86 FreeBSD machines.

Diffstat:
M
src/Makefile
 | 
2
+-
M
src/mkhdr
 | 
1
+
M
unix/make/Makefile.TOP
 | 
2
+-

3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
@@ -1,6 +1,6 @@
 ../bin/mk: mkmk.sh
 	SYSNAME=`uname` export SYSNAME; \
-	OBJTYPE=`uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g; s/PowerMacintosh/power/; s/ppc64/power/g; s/ppc/power/g'` export OBJTYPE; \
+	OBJTYPE=`uname -m | sed 's;i.86;386;; s;amd64;x86_64;; s;/.*;;; s; ;;g; s/PowerMacintosh/power/; s/ppc64/power/g; s/ppc/power/g'` export OBJTYPE; \
 	PATH=`pwd`/../bin:$$PATH export PATH; \
 	PLAN9=`pwd`/.. export PLAN9; \
 	sh -x mkmk.sh
diff --git a/src/mkhdr b/src/mkhdr
@@ -1,6 +1,7 @@
 SYSNAME=`uname`
 OBJTYPE=`uname -m | sed '
 	s;i.86;386;;
+	s;amd64;x86_64;;
 	s;/.*;;;
 	s; ;;g;
 	s;PowerMacintosh;power;g;
diff --git a/unix/make/Makefile.TOP b/unix/make/Makefile.TOP
@@ -5,7 +5,7 @@ OBJTYPE:=${shell uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'}
 
 # this works in bsd make
 SYSNAME!=uname
-OBJTYPE!=uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'
+OBJTYPE!=uname -m | sed 's;i.86;386;; s;amd64;x864_64;; s;/.*;;; s; ;;g'
 
 # the gnu rules will mess up bsd but not vice versa,
 # hence the gnu rules come first.