Index: stable/4/gnu/usr.bin/cc/Makefile.inc
===================================================================
--- stable/4/gnu/usr.bin/cc/Makefile.inc	(revision 62557)
+++ stable/4/gnu/usr.bin/cc/Makefile.inc	(revision 62558)
@@ -1,66 +1,64 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
 # Sometimes this is .include'd several times...
 .if !defined(GCCDIR)
 GCCDIR=		${.CURDIR}/../../../../contrib/gcc
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 
 .if ${TARGET_ARCH} == "mipsel" || ${TARGET_ARCH} == "mipseb"
 GCC_ARCH=	mips
 .else
 GCC_ARCH=	${TARGET_ARCH}
 .endif
 
 # Machine description.
 MD_FILE=	${GCCDIR}/config/${GCC_ARCH}/${GCC_ARCH}.md
 OUT_FILE=	${GCC_ARCH}.c
 OUT_OBJ=	${GCC_ARCH}
 target=		${TARGET_ARCH}-unknown-freebsd
 
 # These architectures are Cygnus's default for enabling Haifa.
-.if ${GCC_ARCH} == "alpha" || ${GCC_ARCH} == "sparc"
+.if ${GCC_ARCH} == "alpha" || ${GCC_ARCH} == "sparc" || ${GCC_ARCH} == "sparc64"
 USE_EGCS_HAIFA=	1
 .endif
 
 version!=	sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c
 
 CFLAGS+=	-DFREEBSD_NATIVE -DIN_GCC -DHAVE_CONFIG_H
-CFLAGS+=	-DDEFAULT_TARGET_VERSION=\"$(version)\"
-CFLAGS+=	-DDEFAULT_TARGET_MACHINE=\"$(target)\"
 CFLAGS+=	-DPREFIX=\"${TOOLS_PREFIX}/usr\"
 .if defined(LONG_TYPE_SIZE)
 CFLAGS+=	-DLONG_TYPE_SIZE=${LONG_TYPE_SIZE}
 .endif
 
 .if defined(USE_EGCS_HAIFA)
 CFLAGS+=	-DHAIFA
 .endif
 
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 CFLAGS+=	-DCROSS_COMPILE
 .endif
 
 .if exists(${.OBJDIR}/../cc_tools)
 CFLAGS+=	-I${.OBJDIR}/../cc_tools
 .endif
 CFLAGS+=	-I${.CURDIR}/../cc_tools
 # This must go after the -I for cc_tools to resolve ambiguities for hash.h
 # correctly.
 CFLAGS+=	-I${GCCDIR} -I${GCCDIR}/config
 
 .if exists(${.OBJDIR}/../cc_fbsd)
 LIBCC_FBSD=	${.OBJDIR}/../cc_fbsd/libcc_fbsd.a
 .else
 LIBCC_FBSD=	${.CURDIR}/../cc_fbsd/libcc_fbsd.a
 .endif
 
 .if exists(${.OBJDIR}/../cc_int)
 LIBCC_INT=	${.OBJDIR}/../cc_int/libcc_int.a
 .else
 LIBCC_INT=	${.CURDIR}/../cc_int/libcc_int.a
 .endif
 
 .endif # !GCCDIR
Index: stable/4/gnu/usr.bin/cc/c++/Makefile
===================================================================
--- stable/4/gnu/usr.bin/cc/c++/Makefile	(revision 62557)
+++ stable/4/gnu/usr.bin/cc/c++/Makefile	(revision 62558)
@@ -1,16 +1,19 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
 .PATH: ${GCCDIR}/cp ${GCCDIR}
 
 PROG=	c++
 SRCS=	gcc.c g++spec.c
 LINKS=	${BINDIR}/c++ ${BINDIR}/g++
 LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
 NOMAN=	1
 
+CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
+CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
+
 DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
 .include <bsd.prog.mk>
Index: stable/4/gnu/usr.bin/cc/cc/Makefile
===================================================================
--- stable/4/gnu/usr.bin/cc/cc/Makefile	(revision 62557)
+++ stable/4/gnu/usr.bin/cc/cc/Makefile	(revision 62558)
@@ -1,17 +1,20 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
 .PATH: ${GCCDIR}
 
 PROG=	cc
 MAN1=	gcc.1
 SRCS=	gcc.c gccspec.c
 
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
 MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
 
+CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
+CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
+
 DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
 .include <bsd.prog.mk>
Index: stable/4/gnu/usr.bin/cc/cpp/Makefile
===================================================================
--- stable/4/gnu/usr.bin/cc/cpp/Makefile	(revision 62557)
+++ stable/4/gnu/usr.bin/cc/cpp/Makefile	(revision 62558)
@@ -1,14 +1,17 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
 .PATH: ${GCCDIR}
 
 PROG=	cpp
 SRCS=	gcc.c cppspec.c
 NOMAN=	1
 
+CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
+CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
+
 DPADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 LDADD+=	${LIBCC_INT} ${LIBCC_FBSD}
 
 .include <bsd.prog.mk>