lib/46001: Use the correct MACHINE_ARCH for amd64.

[henning.petersen%t-online.de@localhost]

>Number:         46001
>Category:       lib
>Synopsis:       Use the correct MACHINE_ARCH for amd64.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    lib-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Feb 12 11:50:01 +0000 2012
>Originator:     Henning Petersen
>Release:        NetBSD-current
>Organization:
>Environment:
>Description:
Use the correct MACHINE_ARCH for amd64.
Remove hack also.
>How-To-Repeat:

>Fix:
diff -u -p -r1.5 Makefile
--- external/cddl/osnet/lib/libdtrace/Makefile  3 Apr 2010 18:34:19 -0000       
1.5
+++ external/cddl/osnet/lib/libdtrace/Makefile  5 Feb 2012 11:42:00 -0000
@@ -82,13 +82,10 @@ COPTS.dt_program.c  += -Wno-stack-protect
 COPTS.dt_provider.c    += -Wno-stack-protector
 COPTS.dt_subr.c                += -Wno-stack-protector
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 
 CPPFLAGS+=     -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .elif ${MACHINE_ARCH} == "sparc64"
 CPPFLAGS+=     -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
-.else
-# temporary hack
-CPPFLAGS+=     -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .endif
 
 LFLAGS+=-l