--- lang/gcc48/Makefile	(revision 457655)
+++ lang/gcc48/Makefile	(working copy)
@@ -120,6 +120,11 @@ SUB_LIST+=	TARGLIB=${TARGLIB}
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
+post-patch:
+	@${FIND} ${WRKSRC} -type f -name '*.[ch]' | \
+	    ${XARGS} ${EGREP} -l '"(HOST_WIDE|PLUGIN_COND)' | \
+	    ${XARGS} ${REINPLACE_CMD} -E -e 's/"(HOST_WIDE|PLUGIN_COND)/" \1/g'
+
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
--- lang/gcc49/Makefile	(revision 457655)
+++ lang/gcc49/Makefile	(working copy)
@@ -120,6 +120,11 @@ SUB_LIST+=	TARGLIB=${TARGLIB}
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
+post-patch:
+	@${FIND} ${WRKSRC} -type f -name '*.[ch]' | \
+	    ${XARGS} ${EGREP} -l '"(HOST_WIDE|PLUGIN_COND)' | \
+	    ${XARGS} ${REINPLACE_CMD} -E -e 's/"(HOST_WIDE|PLUGIN_COND)/" \1/g'
+
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
--- lang/gcc5/Makefile	(revision 457655)
+++ lang/gcc5/Makefile	(working copy)
@@ -117,6 +117,11 @@ CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
+post-patch:
+	@${FIND} ${WRKSRC} -type f \( -name '*.[ch]' -o -name '*.cc' \) | \
+	    ${XARGS} ${EGREP} -l '"(HOST_WIDE|PLUGIN_COND|PRId64)' | \
+	    ${XARGS} ${REINPLACE_CMD} -E -e 's/"(HOST_WIDE|PLUGIN_COND|PRId64)/" \1/g'
+
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
 	@${RM} ${WRKSRC}/gcc/*/*.info*
--- lang/gcc5/files/patch-gcc_toplev.c	(nonexistent)
+++ lang/gcc5/files/patch-gcc_toplev.c	(working copy)
@@ -0,0 +1,11 @@ 
+--- gcc/toplev.c.orig	2018-01-04 15:22:21 UTC
++++ gcc/toplev.c
+@@ -1386,7 +1386,7 @@ process_options (void)
+ 
+       if (flag_sanitize & SANITIZE_THREAD)
+ 	{
+-	  error (UNKNOWN_LOCATION,
++	  error_at (UNKNOWN_LOCATION,
+ 		 "%<-fcheck-pointer-bounds%> is not supported with "
+ 		 "Thread Sanitizer");
+