Re: introduce OBJMACHINE_ARCH

[christos%astron.com@localhost (Christos Zoulas)]

And the change is now simply this:

Index: usr.bin/make/main.c
===================================================================
RCS file: /cvsroot/src/usr.bin/make/main.c,v
retrieving revision 1.252
diff -u -u -r1.252 main.c
--- usr.bin/make/main.c	7 Dec 2016 15:00:46 -0000	1.252
+++ usr.bin/make/main.c	7 Dec 2016 15:03:11 -0000
@@ -1122,6 +1122,7 @@
 
 	if (!Main_SetVarObjdir("MAKEOBJDIRPREFIX") &&
 	    !Main_SetVarObjdir("MAKEOBJDIR") &&
+	    !Main_SetObjdir("%s.%s-%s", _PATH_OBJDIR, machine, machine_arch) &&
 	    !Main_SetObjdir("%s.%s", _PATH_OBJDIR, machine) &&
 	    !Main_SetObjdir("%s", _PATH_OBJDIR))
 		(void)Main_SetObjdir("%s%s", _PATH_OBJDIRPREFIX, curdir);
Index: share/mk/bsd.obj.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.obj.mk,v
retrieving revision 1.49
diff -u -u -r1.49 bsd.obj.mk
--- share/mk/bsd.obj.mk	25 Jan 2010 00:43:00 -0000	1.49
+++ share/mk/bsd.obj.mk	7 Dec 2016 15:03:11 -0000
@@ -37,10 +37,11 @@
 .else
 PAWD?=		/bin/pwd
 
-__objdir=	obj${OBJMACHINE:D.${MACHINE}}
+__objdirsuffix=${OBJMACHINE:D.${MACHINE}${OBJMACHINE_ARCH:D-${MACHINE_ARCH}}}
+__objdir=	obj${__objdirsuffix}
 
-__usrobjdir=	${BSDOBJDIR}${USR_OBJMACHINE:D.${MACHINE}}
-__usrobjdirpf=	${USR_OBJMACHINE:D:U${OBJMACHINE:D.${MACHINE}}}
+__usrobjdir=	${BSDOBJDIR}${USR_OBJMACHINE:D${__objdirsuffix}}
+__usrobjdirpf=	${USR_OBJMACHINE:D:U${OBJMACHINE:D${_objdirsuffix}}}
 
 .if defined(BUILDID)
 __objdir:=	${__objdir}.${BUILDID}