[PATCH] add FreeBSD/StrongARM target

["David O'Brien" <obrien at FreeBSD dot org>]

This patch adds support for FreeBSD/StrongARM.  I had to move the
placement of "-Acpu=arm -Amachine=arm" from CPP_PREDEFINES so that those
could be used by the OS.  I feel they fit nicely in CPP_CPU_ARCH_SPEC so
I hope this will be acceptable.


-- 
-- David  (obrien@FreeBSD.org)


2001-12-10  David O'Brien  <obrien@FreeBSD.org>

	* config.gcc (arm-*-freebsd*): Add target.
	* config/arm/freebsd.h: New file.
	* config/arm/arm.h (CPP_PREDEFINES): Use null definition.
	(CPP_SPEC): #undef before defining.
	(CPP_CPU_ARCH_SPEC): Add -Acpu=arm -Amachine=arm.
	* arm/conix-elf.h (CPP_PREDEFINES): Remove -Acpu=arm -Amachine=arm.
	* config/arm/linux-elf.h: Likewise.
	* config/arm/netbsd.h: Likewise.
	* config/arm/riscix.h: Likewise.
	* config/arm/riscix1-1.h: Likewise.
	* config/arm/semiaof.h: Likewise.


Index: config.gcc
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config.gcc,v
retrieving revision 1.125
diff -u -r1.125 config.gcc
--- config.gcc	2001/12/06 17:34:55	1.125
+++ config.gcc	2001/12/10 04:08:25
@@ -573,6 +573,10 @@
 	tmake_file="t-netbsd arm/t-netbsd"
 	use_collect2=yes
 	;;
+arm*-*-freebsd*|strongarm*-*-freebsd*)
+	tm_file="dbxelf.h elfos.h ${fbsd_tm_file} arm/elf.h arm/aout.h arm/freebsd.h arm/arm.h"
+	tmake_file="${tmake_file} arm/t-strongarm-elf"
+	;;
 arm*-*-linux*)			# ARM GNU/Linux with ELF
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h"
 	tmake_file="t-slibgcc-elf-ver t-linux arm/t-linux"
Index: config/arm/arm.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/arm/arm.h,v
retrieving revision 1.126
diff -u -r1.126 arm.h
--- arm.h	2001/12/09 20:13:06	1.126
+++ arm.h	2001/12/10 04:08:26
@@ -128,9 +128,10 @@
 #endif
 
 #ifndef CPP_PREDEFINES
-#define CPP_PREDEFINES  "-Acpu=arm -Amachine=arm"
+#define CPP_PREDEFINES  ""
 #endif
 
+#undef  CPP_SPEC
 #define CPP_SPEC "\
 %(cpp_cpu_arch) %(cpp_apcs_pc) %(cpp_float) \
 %(cpp_endian) %(subtarget_cpp_spec) %(cpp_isa) %(cpp_interwork)"
@@ -140,6 +141,7 @@
 /* Set the architecture define -- if -march= is set, then it overrides
    the -mcpu= setting.  */
 #define CPP_CPU_ARCH_SPEC "\
+-Acpu=arm -Amachine=arm \
 %{march=arm2:-D__ARM_ARCH_2__} \
 %{march=arm250:-D__ARM_ARCH_2__} \
 %{march=arm3:-D__ARM_ARCH_2__} \
Index: config/arm/conix-elf.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/arm/conix-elf.h,v
retrieving revision 1.9
diff -u -r1.9 conix-elf.h
--- conix-elf.h	2001/09/14 10:19:30	1.9
+++ conix-elf.h	2001/12/10 04:08:26
@@ -41,4 +41,4 @@
      
 #undef  CPP_PREDEFINES
 #define CPP_PREDEFINES \
-  "-D__arm__ -D__CONIX__ -Acpu=arm -Amachine=arm -D__ELF__"
+  "-D__arm__ -D__CONIX__ -D__ELF__"
Index: config/arm/linux-elf.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/arm/linux-elf.h,v
retrieving revision 1.29
diff -u -r1.29 linux-elf.h
--- linux-elf.h	2001/09/14 10:19:30	1.29
+++ linux-elf.h	2001/12/10 04:08:26
@@ -88,7 +88,7 @@
 #undef  CPP_PREDEFINES
 #define CPP_PREDEFINES \
 "-Dunix -Dlinux -D__ELF__ \
--Asystem=unix -Asystem=posix -Acpu=arm -Amachine=arm"
+-Asystem=unix -Asystem=posix"
 
 /* Allow #sccs in preprocessor.  */
 #define SCCS_DIRECTIVE
Index: config/arm/netbsd.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/arm/netbsd.h,v
retrieving revision 1.13
diff -u -r1.13 netbsd.h
--- netbsd.h	2001/11/16 21:23:16	1.13
+++ netbsd.h	2001/12/10 04:08:26
@@ -47,7 +47,7 @@
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "\
 -Dunix -Driscbsd -Darm32 -D__arm32__ -D__arm__ -D__NetBSD__ \
--Asystem=unix -Asystem=NetBSD -Acpu=arm -Amachine=arm"
+-Asystem=unix -Asystem=NetBSD"
 
 /* Define _POSIX_SOURCE if necessary.  */
 #undef CPP_SPEC
Index: config/arm/riscix.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/arm/riscix.h,v
retrieving revision 1.9
diff -u -r1.9 riscix.h
--- riscix.h	2001/11/16 21:23:16	1.9
+++ riscix.h	2001/12/10 04:08:26
@@ -49,7 +49,7 @@
 
 #ifndef CPP_PREDEFINES
 #define CPP_PREDEFINES  \
-    "-Darm -Driscix -Dunix -Asystem=unix -Acpu=arm -Amachine=arm"
+    "-Darm -Driscix -Dunix -Asystem=unix"
 #endif
 
 
Index: config/arm/riscix1-1.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/arm/riscix1-1.h,v
retrieving revision 1.7
diff -u -r1.7 riscix1-1.h
--- riscix1-1.h	2001/11/16 21:23:16	1.7
+++ riscix1-1.h	2001/12/10 04:08:26
@@ -30,7 +30,7 @@
   "%{pg:/usr/lib/gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}"
 
 #ifndef CPP_PREDEFINES
-#define CPP_PREDEFINES  "-Darm -Driscix -Dunix -Asystem=unix -Acpu=arm -Amachine=arm"
+#define CPP_PREDEFINES  "-Darm -Driscix -Dunix -Asystem=unix"
 #endif
 
 /* Riscix 1.1 doesn't have X/OPEN support, so only accept -mbsd (but ignore
Index: config/arm/semiaof.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/arm/semiaof.h,v
retrieving revision 1.4
diff -u -r1.4 semiaof.h
--- semiaof.h	2001/11/16 21:23:16	1.4
+++ semiaof.h	2001/12/10 04:08:26
@@ -21,7 +21,7 @@
 Boston, MA 02111-1307, USA.  */
 
 #define CPP_PREDEFINES \
-    "-Darm -Dsemi -Acpu=arm -Amachine=arm"
+    "-Darm -Dsemi"
 
 #define ASM_SPEC "%{g -g} -arch 4 \
 -apcs 3%{mapcs-32:/32bit}%{mapcs-26:/26bit}%{!mapcs-26:%{!macps-32:/32bit}}"
--- /dev/null	Sun Dec  9 20:08:16 2001
+++ config/arm/freebsd.h	Thu Dec  6 13:11:03 2001
@@ -0,0 +1,66 @@
+/* Definitions for StrongARM running FreeBSD using the ELF format
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   Contributed by David E. O'Brien <obrien@FreeBSD.org> and BSDi.
+
+This file is part of GNU CC.
+
+GNU CC 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,
+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
+the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#undef  SUBTARGET_CPP_SPEC
+#define SUBTARGET_CPP_SPEC FBSD_CPP_SPEC
+
+/* XXX This can go away once the pollution in elfos.h is fixed.  */
+#undef  STARTFILE_SPEC
+#define STARTFILE_SPEC FBSD_STARTFILE_SPEC
+
+/* XXX This can go away once the pollution in elfos.h is fixed.  */
+#undef  ENDFILE_SPEC
+#define ENDFILE_SPEC FBSD_ENDFILE_SPEC
+
+
+/************************[  Target stuff  ]***********************************/
+
+/* Define the actual types of some ANSI-mandated types.  
+   Needs to agree with <machine/ansi.h>.  GCC defaults come from c-decl.c,
+   c-common.c, and config/<arch>/<arch>.h.  */
+
+/* arm.h gets this wrong for FreeBSD.  We use the GCC defaults instead.  */
+
+#undef  DEFAULT_SIGNED_CHAR
+#define DEFAULT_SIGNED_CHAR	1
+
+#undef  SIZE_TYPE
+#define SIZE_TYPE	"unsigned int"
+
+#undef  PTRDIFF_TYPE
+#define PTRDIFF_TYPE	"int"
+
+/* We use the GCC defaults here.  */
+#undef WCHAR_TYPE
+
+#undef  WCHAR_UNSIGNED
+#define WCHAR_UNSIGNED 0
+
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 32
+
+#undef  SUBTARGET_CPU_DEFAULT
+#define SUBTARGET_CPU_DEFAULT	TARGET_CPU_strongarm /*TARGET_CPU_arm710*/
+
+#undef  ARM_OS_NAME
+#define ARM_OS_NAME "FreeBSD"
+
+#undef  TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (FreeBSD/StrongARM ELF)");