From: David O'Brien <obrien@FreeBSD.org>
Date: Thu, 13 Dec 2001 00:27:30 +0000 (+0000)
Subject: config.gcc (arm-*-freebsd*): Add target.
X-Git-Tag: prereleases/libstdc++-3.0.95~207
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5742588d23cb1e1409c780e71e2b4b2ac8093190;p=thirdparty%2Fgcc.git

config.gcc (arm-*-freebsd*): Add target.

2001-12-12  David O'Brien  <obrien@FreeBSD.org>
	* config.gcc (arm-*-freebsd*): Add target.
	* config/arm/freebsd.h: New file.
	* config/arm/arm.h (CPP_PREDEFINES): Do not define.
	(CPP_SPEC): #undef before defining.
	(CPP_CPU_ARCH_SPEC): Add -Acpu=arm -Amachine=arm.
	* config/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.

Approved by:  Richard Earnshaw <rearnsha@arm.com> (in private email)
              Message-Id: <200112121046.KAA09097@cam-mail2.cambridge.arm.com>

From-SVN: r47957
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a5f9e29abab..a718917e3b17 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,18 @@
+2001-12-12  David O'Brien  <obrien@FreeBSD.org>
+
+	* config.gcc (arm-*-freebsd*): Add target.
+	* config/arm/freebsd.h: New file.
+	* config/arm/arm.h (CPP_PREDEFINES): Do not define.
+	(CPP_SPEC): #undef before defining.
+	(CPP_CPU_ARCH_SPEC): Add -Acpu=arm -Amachine=arm.
+	* config/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.
+
 2001-12-12  Richard Henderson  <rth@redhat.com>
 
 	* regrename.c (copyprop_hardreg_forward): New optimization.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 5144c162e25d..0522dde8bcf5 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -578,6 +578,10 @@ arm-semi-aof | armel-semi-aof)
 	tm_file="arm/semiaof.h arm/aof.h arm/arm.h"
 	tmake_file=arm/t-semi
 	;;
+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*-*-netbsd*)
 	tm_file="arm/aout.h arm/arm.h netbsd.h arm/netbsd.h"
 	tmake_file="t-netbsd arm/t-netbsd"
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index b27192e9d217..eefa198150da 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -127,10 +127,7 @@ Unrecognized value in TARGET_CPU_DEFAULT.
 #endif
 #endif
 
-#ifndef CPP_PREDEFINES
-#define CPP_PREDEFINES  "-Acpu=arm -Amachine=arm"
-#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 +137,7 @@ Unrecognized value in TARGET_CPU_DEFAULT.
 /* 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__} \
diff --git a/gcc/config/arm/conix-elf.h b/gcc/config/arm/conix-elf.h
index 6cde16f574af..b74afdfc006d 100644
--- a/gcc/config/arm/conix-elf.h
+++ b/gcc/config/arm/conix-elf.h
@@ -41,4 +41,4 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
      
 #undef  CPP_PREDEFINES
 #define CPP_PREDEFINES \
-  "-D__arm__ -D__CONIX__ -Acpu=arm -Amachine=arm -D__ELF__"
+  "-D__arm__ -D__CONIX__ -D__ELF__"
diff --git a/gcc/config/arm/freebsd.h b/gcc/config/arm/freebsd.h
new file mode 100644
index 000000000000..a9b268c0a48e
--- /dev/null
+++ b/gcc/config/arm/freebsd.h
@@ -0,0 +1,57 @@
+/* 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, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+
+#undef  SUBTARGET_CPP_SPEC
+#define SUBTARGET_CPP_SPEC FBSD_CPP_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  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
+
+#undef  ARM_OS_NAME
+#define ARM_OS_NAME "FreeBSD"
+
+#undef  TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (FreeBSD/StrongARM ELF)");
diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
index f6b91973c4b2..74f7e7ef9999 100644
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -88,7 +88,7 @@ Boston, MA 02111-1307, USA.  */
 #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
diff --git a/gcc/config/arm/netbsd.h b/gcc/config/arm/netbsd.h
index 554460d918cc..9684fdbada35 100644
--- a/gcc/config/arm/netbsd.h
+++ b/gcc/config/arm/netbsd.h
@@ -47,7 +47,7 @@ Boston, MA 02111-1307, USA.  */
 #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
diff --git a/gcc/config/arm/riscix.h b/gcc/config/arm/riscix.h
index faa99ba9787e..35fc23258d2e 100644
--- a/gcc/config/arm/riscix.h
+++ b/gcc/config/arm/riscix.h
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.  */
 
 #ifndef CPP_PREDEFINES
 #define CPP_PREDEFINES  \
-    "-Darm -Driscix -Dunix -Asystem=unix -Acpu=arm -Amachine=arm"
+    "-Darm -Driscix -Dunix -Asystem=unix"
 #endif
 
 
diff --git a/gcc/config/arm/riscix1-1.h b/gcc/config/arm/riscix1-1.h
index ccaf964cb67f..fd93d40f05ea 100644
--- a/gcc/config/arm/riscix1-1.h
+++ b/gcc/config/arm/riscix1-1.h
@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA.  */
   "%{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
diff --git a/gcc/config/arm/semiaof.h b/gcc/config/arm/semiaof.h
index 242c35a29159..7ca68bc95c25 100644
--- a/gcc/config/arm/semiaof.h
+++ b/gcc/config/arm/semiaof.h
@@ -21,7 +21,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 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}}"