diff --git a/contrib/gcc/config/i386/freebsd.h b/contrib/gcc/config/i386/freebsd.h
index 3cdfdb29a2c0..5c7c759db40d 100644
--- a/contrib/gcc/config/i386/freebsd.h
+++ b/contrib/gcc/config/i386/freebsd.h
@@ -5,20 +5,20 @@
    Adapted from GNU/Linux version by John Polstra.
    Continued development by David O'Brien <obrien@freebsd.org>
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
+along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
@@ -54,7 +54,7 @@ Boston, MA 02111-1307, USA.  */
     %{!shared: \
       %{!static: \
 	%{rdynamic: -export-dynamic} \
-	%{!dynamic-linker: -dynamic-linker /libexec/ld-elf.so.1}} \
+	%{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \
       %{static:-Bstatic}} \
     %{symbolic:-Bsymbolic}"
 
@@ -85,6 +85,10 @@ Boston, MA 02111-1307, USA.  */
 #undef  WCHAR_TYPE_SIZE
 #define WCHAR_TYPE_SIZE	(TARGET_64BIT ? 32 : BITS_PER_WORD)
 
+#undef  SUBTARGET_EXTRA_SPECS  /* i386.h bogusly defines it.  */
+#define SUBTARGET_EXTRA_SPECS \
+  { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER }
+
 #define TARGET_VERSION	fprintf (stderr, " (i386 FreeBSD/ELF)");
 
 #define MASK_PROFILER_EPILOGUE	010000000000
@@ -115,9 +119,9 @@ Boston, MA 02111-1307, USA.  */
 #define SUBTARGET_OVERRIDE_OPTIONS			\
   do {							\
     if (!TARGET_64BIT) {				\
-      real_format_for_mode[XFmode - QFmode]		\
+      REAL_MODE_FORMAT (XFmode)				\
 	= &ieee_extended_intel_96_round_53_format;	\
-      real_format_for_mode[TFmode - QFmode]		\
+      REAL_MODE_FORMAT (TFmode)				\
 	= &ieee_extended_intel_96_round_53_format;	\
     }							\
   } while (0)
@@ -201,6 +205,7 @@ Boston, MA 02111-1307, USA.  */
    but it is easier to fix in an MD way.  */
 
 #ifdef HAVE_GAS_MAX_SKIP_P2ALIGN
+#undef  ASM_OUTPUT_MAX_SKIP_ALIGN
 #define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE, LOG, MAX_SKIP)			\
   do {									\
     if ((LOG) != 0) {							\