Index: head/devel/amd64-gcc/Makefile
===================================================================
--- head/devel/amd64-gcc/Makefile
+++ head/devel/amd64-gcc/Makefile
@@ -4,9 +4,6 @@
 PLIST=	${.CURDIR}/pkg-plist
 
 MASTERDIR=	${.CURDIR}/../powerpc64-gcc
-GCC_TARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
-BU_PREFIX=	x86_64-unknown-${OPSYS:tl}${OSREL}
-FREEBSD_EXTENSION=	yes
 
 BROKEN_aarch64=		invalid output constraint '=a' in assembler
 BROKEN_armv6=		invalid output constraint '=a' in assembler
Index: head/devel/powerpc64-gcc/Makefile
===================================================================
--- head/devel/powerpc64-gcc/Makefile
+++ head/devel/powerpc64-gcc/Makefile
@@ -25,19 +25,14 @@
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
+TARGETARCH=	${PKGNAMEPREFIX:C/-//g:S/amd64/x86_64/}
+
 .if empty(GCC_TARGET)
 # We are building for a FreeBSD target
-GCC_TARGET?=	${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}
-BU_PREFIX?=	${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}
+GCC_TARGET=	${PKGNAMEPREFIX:S/amd64/x86_64/}unknown-${OPSYS:tl}${OSREL}
 EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions
-.else
-BU_PREFIX?=	${GCC_TARGET}
-.if defined(FREEBSD_EXTENSION)
-EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions
 .endif
-.endif
-
-TARGETARCH=${PKGNAMEPREFIX:C/-//g}
+BU_PREFIX?=	${GCC_TARGET}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes