8 files changed, 23 insertions, 5 deletions
diff --git a/contrib/gcc/config/arm/freebsd.h b/contrib/gcc/config/arm/freebsd.h
index 7106e6f3ac3f..da7ffabe2153 100644
--- a/contrib/gcc/config/arm/freebsd.h
+++ b/contrib/gcc/config/arm/freebsd.h
@@ -50,13 +50,12 @@
       %{rdynamic:-export-dynamic}					\
       %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }}	\
     %{static:-Bstatic}}							\
+  %{!static:--hash-style=both --enable-new-dtags}			\
   %{symbolic:-Bsymbolic}						\
   -X %{mbig-endian:-EB} %{mlittle-endian:-EL}"
 
 /************************[  Target stuff  ]***********************************/
 
-#undef  TARGET_VERSION
-#define TARGET_VERSION fprintf (stderr, " (FreeBSD/StrongARM ELF)");
 
 #ifndef TARGET_ENDIAN_DEFAULT
 #define TARGET_ENDIAN_DEFAULT 0
@@ -86,8 +85,22 @@
 /* We use the GCC defaults here.  */
 #undef WCHAR_TYPE
 
+#if defined(FREEBSD_ARCH_armv6)
+#undef  SUBTARGET_CPU_DEFAULT
+#define SUBTARGET_CPU_DEFAULT	TARGET_CPU_arm1176jzs
+#undef FBSD_TARGET_CPU_CPP_BUILTINS
+#define FBSD_TARGET_CPU_CPP_BUILTINS()		\
+  do {						\
+    builtin_define ("__FreeBSD_ARCH_armv6__");	\
+  } while (0)
+#undef  TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (FreeBSD/armv6 ELF)");
+#else
 #undef  SUBTARGET_CPU_DEFAULT
 #define SUBTARGET_CPU_DEFAULT	TARGET_CPU_strongarm
+#undef  TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (FreeBSD/StrongARM ELF)");
+#endif
 
 /* FreeBSD does its profiling differently to the Acorn compiler. We
    don't need a word following the mcount call; and to skip it
diff --git a/contrib/gcc/config/i386/freebsd.h b/contrib/gcc/config/i386/freebsd.h
index 3faa4f22fed6..8f89d2aed365 100644
--- a/contrib/gcc/config/i386/freebsd.h
+++ b/contrib/gcc/config/i386/freebsd.h
@@ -49,7 +49,7 @@ Boston, MA 02110-1301, USA.  */
 	%{rdynamic: -export-dynamic} \
 	%{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \
       %{static:-Bstatic}} \
-    %{!static:--hash-style=both} \
+    %{!static:--hash-style=both --enable-new-dtags} \
     %{symbolic:-Bsymbolic}"
 
 /* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h
diff --git a/contrib/gcc/config/i386/freebsd64.h b/contrib/gcc/config/i386/freebsd64.h
index 297af7c0ac39..9e47d5fc30ee 100644
--- a/contrib/gcc/config/i386/freebsd64.h
+++ b/contrib/gcc/config/i386/freebsd64.h
@@ -54,5 +54,5 @@ Boston, MA 02110-1301, USA.  */
         %{rdynamic:-export-dynamic} \
 	%{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \
     %{static:-Bstatic}} \
-  %{!static:--hash-style=both} \
+  %{!static:--hash-style=both --enable-new-dtags} \
   %{symbolic:-Bsymbolic}"
diff --git a/contrib/gcc/config/i386/xmmintrin.h b/contrib/gcc/config/i386/xmmintrin.h
index 35417ec9b6c3..3eea743c68c6 100644
--- a/contrib/gcc/config/i386/xmmintrin.h
+++ b/contrib/gcc/config/i386/xmmintrin.h
@@ -39,7 +39,9 @@
 #include <mmintrin.h>
 
 /* Get _mm_malloc () and _mm_free ().  */
+#if __STDC_HOSTED__
 #include <mm_malloc.h>
+#endif
 
 /* The Intel API is flexible enough that we must allow aliasing with other
    vector types, and their scalar components.  */
diff --git a/contrib/gcc/config/ia64/freebsd.h b/contrib/gcc/config/ia64/freebsd.h
index 23739105d50a..b0c35b5afb7a 100644
--- a/contrib/gcc/config/ia64/freebsd.h
+++ b/contrib/gcc/config/ia64/freebsd.h
@@ -27,6 +27,7 @@ Boston, MA 02110-1301, USA.  */
   %{p:%nconsider using `-pg' instead of `-p' with gprof(1)}		\
   %{assert*} %{R*} %{rpath*} %{defsym*}					\
   %{shared:-Bshareable %{h*} %{soname*}}				\
+  %{!static:--enable-new-dtags}						\
   %{symbolic:-Bsymbolic}						\
   %{!shared:								\
     %{!static:								\
diff --git a/contrib/gcc/config/mips/freebsd.h b/contrib/gcc/config/mips/freebsd.h
index 712acd7a7e4e..d8960aa5c8f0 100644
--- a/contrib/gcc/config/mips/freebsd.h
+++ b/contrib/gcc/config/mips/freebsd.h
@@ -56,6 +56,7 @@ Boston, MA 02110-1301, USA.  */
     %{v:-V} \
     %{assert*} %{R*} %{rpath*} %{defsym*} \
     %{shared:-Bshareable %{h*} %{soname*}} \
+    %{!static:--enable-new-dtags} \
     %{!shared: \
       %{!static: \
 	%{rdynamic: -export-dynamic} \
diff --git a/contrib/gcc/config/rs6000/freebsd.h b/contrib/gcc/config/rs6000/freebsd.h
index 56907a380996..78c8f45bbe2c 100644
--- a/contrib/gcc/config/rs6000/freebsd.h
+++ b/contrib/gcc/config/rs6000/freebsd.h
@@ -180,6 +180,7 @@ extern int dot_symbols;
   %{v:-V} \
   %{assert*} %{R*} %{rpath*} %{defsym*} \
   %{shared:-Bshareable %{h*} %{soname*}} \
+  %{!static:--enable-new-dtags}	\
   %{!shared: \
     %{!static: \
       %{rdynamic: -export-dynamic} \
diff --git a/contrib/gcc/config/sparc/freebsd.h b/contrib/gcc/config/sparc/freebsd.h
index 305840f1ff23..698986881550 100644
--- a/contrib/gcc/config/sparc/freebsd.h
+++ b/contrib/gcc/config/sparc/freebsd.h
@@ -53,7 +53,7 @@ Boston, MA 02110-1301, USA.  */
       %{rdynamic:-export-dynamic}					\
       %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }}	\
     %{static:-Bstatic}}							\
-  %{!static:--hash-style=both}						\
+  %{!static:--hash-style=both --enable-new-dtags}			\
   %{symbolic:-Bsymbolic}"