Index: binutils/gas/config/tc-arm.c
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/gas/config/tc-arm.c,v
retrieving revision 1.1.1.10
diff -u -p -r1.1.1.10 tc-arm.c
--- binutils/gas/config/tc-arm.c	11 Oct 2002 06:00:19 -0000	1.1.1.10
+++ binutils/gas/config/tc-arm.c	19 Apr 2004 23:02:53 -0000
@@ -2095,7 +2095,7 @@ const pseudo_typeS md_pseudo_table[] =
 #ifdef OBJ_ELF
   { "word",        s_arm_elf_cons, 4 },
   { "long",        s_arm_elf_cons, 4 },
-  { "file",        dwarf2_directive_file, 0 },
+  { "file",        (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
   { "loc",         dwarf2_directive_loc,  0 },
 #else
   { "word",        cons, 4},
Index: binutils/ld/emulparams/armelf_fbsd.sh
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/ld/emulparams/armelf_fbsd.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 armelf_fbsd.sh
--- binutils/ld/emulparams/armelf_fbsd.sh	22 Feb 2002 04:18:15 -0000	1.1.1.1
+++ binutils/ld/emulparams/armelf_fbsd.sh	19 Apr 2004 23:02:53 -0000
@@ -1,2 +1,5 @@
 . ${srcdir}/emulparams/armelf.sh
 . ${srcdir}/emulparams/elf_fbsd.sh
+MAXPAGESIZE=0x8000
+
+unset EMBEDDED
Index: gcc/config/arm/freebsd.h
===================================================================
RCS file: /home/ncvs/src/contrib/gcc/config/arm/freebsd.h,v
retrieving revision 1.1.1.2
diff -u -p -r1.1.1.2 freebsd.h
--- gcc/config/arm/freebsd.h	11 Jul 2003 03:40:52 -0000	1.1.1.2
+++ gcc/config/arm/freebsd.h	9 May 2004 23:45:51 -0000
@@ -52,3 +52,58 @@ Boston, MA 02111-1307, USA.  */
 
 #undef  TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (FreeBSD/StrongARM ELF)");
+
+/* Provide a LINK_SPEC appropriate for FreeBSD.  Here we provide support
+   for the special GCC options -static and -shared, which allow us to
+   link things in one of these three modes by applying the appropriate
+   combinations of options at link-time. We like to support here for
+   as many of the other GNU linker options as possible. But I don't
+   have the time to search for those flags. I am sure how to add
+   support for -soname shared_object_name. H.J.
+
+   When the -shared link option is used a final link is not being
+   done.  */
+
+#undef	LINK_SPEC
+#define LINK_SPEC "\
+ %{p:%nconsider using `-pg' instead of `-p' with gprof(1) } \
+    %{Wl,*:%*} \
+    %{v:-V} \
+    %{assert*} %{R*} %{rpath*} %{defsym*} \
+    %{shared:-Bshareable %{h*} %{soname*}} \
+    %{!shared: \
+      %{!static: \
+	%{rdynamic: -export-dynamic} \
+	%{!dynamic-linker: -dynamic-linker /libexec/ld-elf.so.1}} \
+      %{static:-Bstatic}} \
+    %{symbolic:-Bsymbolic}"
+
+#undef TARGET_DEFAULT
+#define TARGET_DEFAULT			\
+  (ARM_FLAG_APCS_32			\
+   | ARM_FLAG_SOFT_FLOAT		\
+   | ARM_FLAG_APCS_FRAME		\
+   | ARM_FLAG_ATPCS			\
+   | ARM_FLAG_VFP			\
+   | ARM_FLAG_MMU_TRAPS)
+
+#undef TYPE_OPERAND_FMT
+#define TYPE_OPERAND_FMT "%%%s"
+
+#undef SUBTARGET_EXTRA_ASM_SPEC
+#define SUBTARGET_EXTRA_ASM_SPEC	\
+  "-matpcs %{fpic:-k} %{fPIC:-k}"
+
+/* Default floating point model is soft-VFP.
+ *    FIXME: -mhard-float currently implies FPA.  */
+#undef SUBTARGET_ASM_FLOAT_SPEC
+#define SUBTARGET_ASM_FLOAT_SPEC	\
+  "%{mhard-float:-mfpu=fpa} \
+   %{msoft-float:-mfpu=softvfp} \
+   %{!mhard-float: \
+     %{!msoft-float:-mfpu=softvfp}}"
+
+#undef SUBTARGET_EXTRA_SPECS
+#define SUBTARGET_EXTRA_SPECS				\
+  { "subtarget_extra_asm_spec",	SUBTARGET_EXTRA_ASM_SPEC }, \
+  { "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC },