config.gcc (arm*-*-rtems*, [...]): Include various CPU headers via tm_file.

2001-11-16  David O'Brien  <obrien@FreeBSD.org>
	* config.gcc (arm*-*-rtems*, arm-*-coff*, armel-*-coff*,
	arm-*-vxworks*, arm-*-riscix1.[01]*, arm-*-riscix*,
	arm-semi-aout, armel-semi-aout, arm-semi-aof, armel-semi-aof,
	arm*-*-netbsd*, arm*-*-linux*, arm*-*-uclinux*, arm*-*-aout,
	arm*-*-ecos-elf, arm*-*-elf, arm*-*-conix*, arm*-*-oabi,
	arm-*-pe*, strongarm-*-elf*, strongarm-*-coff*, strongarm-*-pe,
	xscale-*-elf, xscale-*-coff: Include various CPU headers via tm_file.
	* config/arm/aof.h: Don't include arm.h.
	* config/arm/aout.h: Likewise.
	* config/arm/coff.h: Don't include semi.h and aout.h.
	* config/arm/elf.h: Don't include aout.h.
	* config/arm/netbsd.h: Don't include netbsd.h and aout.h.
	(TARGET_VERSION): Undef before defining.
	(ARM_OS_NAME): Likewise
	(TARGET_DEFAULT): Likewise
	(TARGET_MEM_FUNCTIONS): Do not need to undefine now.
	* config/arm/pe.h: Don't include arm/coff.h.
	* config/arm/riscix.h (CPP_SPEC, SUBTARGET_CPP_SPEC): Use
	SUBTARGET_CPP_SPEC rather than overiding the arm.h CPP_SPEC definition.
	* config/arm/riscix1-1.h: Likewise.
	* config/arm/rix-gas.h: Don't include riscix.h.
	(DBX_CONTIN_LENGTH): Undef before defining.
	* config/arm/semi.h: Don't include aout.h.
	* config/arm/semiaof.h: Don't include aof.h.
	* config/arm/strongarm-coff.h: Don't include coff.h.
	* config/arm/strongarm-pe.h: Don't include strongarm-coff.h and pe.h.
	* config/arm/vxarm.h: Don't include arm/coff.h.
	* config/arm/xscale-coff.h: Don't include coff.h.

Approved by:  Nick Clifton <nickc@cambridge.redhat.com>
              <m3ofm2c27q.fsf@north-pole.nickc.cambridge.redhat.com>

From-SVN: r47105
This commit is contained in:
David O'Brien 2001-11-16 21:23:16 +00:00 committed by David O'Brien
parent 9c8e9f6296
commit f910b1bb5f
17 changed files with 51 additions and 56 deletions

View File

@ -1,3 +1,34 @@
2001-11-16 David O'Brien <obrien@FreeBSD.org>
* config.gcc (arm*-*-rtems*, arm-*-coff*, armel-*-coff*,
arm-*-vxworks*, arm-*-riscix1.[01]*, arm-*-riscix*,
arm-semi-aout, armel-semi-aout, arm-semi-aof, armel-semi-aof,
arm*-*-netbsd*, arm*-*-linux*, arm*-*-uclinux*, arm*-*-aout,
arm*-*-ecos-elf, arm*-*-elf, arm*-*-conix*, arm*-*-oabi,
arm-*-pe*, strongarm-*-elf*, strongarm-*-coff*, strongarm-*-pe,
xscale-*-elf, xscale-*-coff: Include various CPU headers via tm_file.
* config/arm/aof.h: Don't include arm.h.
* config/arm/aout.h: Likewise.
* config/arm/coff.h: Don't include semi.h and aout.h.
* config/arm/elf.h: Don't include aout.h.
* config/arm/netbsd.h: Don't include netbsd.h and aout.h.
(TARGET_VERSION): Undef before defining.
(ARM_OS_NAME): Likewise
(TARGET_DEFAULT): Likewise
(TARGET_MEM_FUNCTIONS): Do not need to undefine now.
* config/arm/pe.h: Don't include arm/coff.h.
* config/arm/riscix.h (CPP_SPEC, SUBTARGET_CPP_SPEC): Use
SUBTARGET_CPP_SPEC rather than overiding the arm.h CPP_SPEC definition.
* config/arm/riscix1-1.h: Likewise.
* config/arm/rix-gas.h: Don't include riscix.h.
(DBX_CONTIN_LENGTH): Undef before defining.
* config/arm/semi.h: Don't include aout.h.
* config/arm/semiaof.h: Don't include aof.h.
* config/arm/strongarm-coff.h: Don't include coff.h.
* config/arm/strongarm-pe.h: Don't include strongarm-coff.h and pe.h.
* config/arm/vxarm.h: Don't include arm/coff.h.
* config/arm/xscale-coff.h: Don't include coff.h.
Fri Nov 16 15:22:35 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* config/pa/pa.c: Reflect changes in calling sequences of alter_reg and

View File

@ -593,31 +593,31 @@ arm*-*-linux*) # ARM GNU/Linux with ELF
esac
;;
arm*-*-uclinux*) # ARM ucLinux
tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/linux-elf.h arm/uclinux-elf.h"
tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h arm/uclinux-elf.h"
tmake_file=arm/t-arm-elf
;;
arm*-*-aout)
tm_file=arm/aout.h
tm_file="arm/aout.h arm/arm.h"
tmake_file=arm/t-arm-aout
;;
arm*-*-ecos-elf)
tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/ecos-elf.h"
tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/ecos-elf.h"
tmake_file=arm/t-arm-elf
;;
arm*-*-elf)
tm_file="elfos.h arm/unknown-elf.h arm/elf.h"
tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
tmake_file=arm/t-arm-elf
;;
arm*-*-conix*)
tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/conix-elf.h"
tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/conix-elf.h arm/aout.h arm/arm.h"
tmake_file=arm/t-arm-elf
;;
arm*-*-oabi)
tm_file="arm/unknown-elf-oabi.h elfos.h arm/unknown-elf.h arm/elf.h"
tm_file="arm/unknown-elf-oabi.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
tmake_file=arm/t-arm-elf
;;
arm-*-pe*)
tm_file=arm/pe.h
tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h arm/pe.h"
tmake_file=arm/t-pe
extra_objs="pe.o"
;;
@ -3133,19 +3133,19 @@ sparc64-*-linux*) # 64-bit Sparc's running GNU/Linux
float_format=sparc
;;
strongarm-*-elf*)
tm_file="arm/strongarm-elf.h elfos.h arm/unknown-elf.h arm/elf.h"
tm_file="arm/strongarm-elf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
tmake_file=arm/t-strongarm-elf
out_file=arm/arm.c
md_file=arm/arm.md
;;
strongarm-*-coff*)
tm_file=arm/strongarm-coff.h
tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h"
tmake_file=arm/t-strongarm-coff
out_file=arm/arm.c
md_file=arm/arm.md
;;
strongarm-*-pe)
tm_file=arm/strongarm-pe.h
tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
tmake_file=arm/t-strongarm-pe
out_file=arm/arm.c
md_file=arm/arm.md
@ -3217,13 +3217,13 @@ we32k-att-sysv*)
use_collect2=yes
;;
xscale-*-elf)
tm_file="arm/xscale-elf.h elfos.h arm/unknown-elf.h arm/elf.h"
tm_file="arm/xscale-elf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
tmake_file=arm/t-xscale-elf
out_file=arm/arm.c
md_file=arm/arm.md
;;
xscale-*-coff)
tm_file=arm/xscale-coff.h
tm_file="coff.h arm/xscale-coff.h"
tmake_file=arm/t-xscale-coff
out_file=arm/arm.c
md_file=arm/arm.md

View File

@ -389,6 +389,4 @@ do { \
fprintf ((STREAM), "\tALIGN %d\n", amount); \
} while (0)
#include "arm/arm.h"
#undef DBX_DEBUGGING_INFO

View File

@ -333,5 +333,3 @@ Boston, MA 02111-1307, USA. */
/* This works for GAS and some other assemblers. */
#define SET_ASM_OP "\t.set\t"
#include "arm.h"

View File

@ -21,8 +21,6 @@ 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. */
#include "semi.h"
#include "aout.h"
/* Note - it is important that this definition matches the one in tcoff.h */
#undef USER_LABEL_PREFIX

View File

@ -193,5 +193,3 @@ Boston, MA 02111-1307, USA. */
fprintf (STREAM, "\t.align\t%d\n", POWER); \
} \
while (0)
#include "aout.h"

View File

@ -20,9 +20,11 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* Run-time Target Specification. */
#undef TARGET_VERSION
#define TARGET_VERSION fputs (" (ARM/NetBSD)", stderr);
/* This is used in ASM_FILE_START. */
#undef ARM_OS_NAME
#define ARM_OS_NAME "NetBSD"
/* Unsigned chars produces much better code than signed. */
@ -37,15 +39,9 @@ Boston, MA 02111-1307, USA. */
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
/* Default is to use APCS-32 mode. */
#undef TARGET_DEFAULT
#define TARGET_DEFAULT (ARM_FLAG_APCS_32 | ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_FRAME)
#include "arm/aout.h"
/* This gets redefined in config/netbsd.h. */
#undef TARGET_MEM_FUNCTIONS
#include <netbsd.h>
/* Some defines for CPP.
arm32 is the NetBSD port name, so we always define arm32 and __arm32__. */
#undef CPP_PREDEFINES

View File

@ -29,8 +29,6 @@ Boston, MA 02111-1307, USA. */
#define SUBTARGET_NAME_ENCODING_LENGTHS \
case ARM_PE_FLAG_CHAR: return 3;
#include "arm/coff.h"
#undef USER_LABEL_PREFIX
#define USER_LABEL_PREFIX "_"

View File

@ -127,11 +127,9 @@ Boston, MA 02111-1307, USA. */
/* The RISCiX assembler does not understand .set */
#undef SET_ASM_OP
/* Override CPP_SPEC, there's no point handling endianness (and probably
not much point handling apcs_pc), and we want to add the right #defines
when using the include files. */
#undef CPP_SPEC
#define CPP_SPEC "%(cpp_cpu_arch) %(cpp_apcs_pc) %(cpp_float) \
/* Add to CPP_SPEC, we want to add the right #defines when using the include
files. */
#define SUBTARGET_CPP_SPEC "\
%{mbsd:%{pedantic:%e-mbsd and -pedantic incompatible} -D_BSD_C} \
%{mxopen:%{mbsd:%e-mbsd and -mxopen incompatible} \
%{pedantic:%e-mxopen and -pedantic incompatible} -D_XOPEN_C} \

View File

@ -91,10 +91,7 @@ Boston, MA 02111-1307, USA. */
#include "arm/aout.h"
#undef CPP_SPEC
#define CPP_SPEC "\
%(cpp_cpu_arch) %(cpp_apcs_pc) %(cpp_float) %{!ansi: -D_BSD_C} \
"
#define SUBTARGET_CPP_SPEC "%{!ansi: -D_BSD_C}"
/* The native RISCiX assembler does not support stabs of any kind; because

View File

@ -22,10 +22,9 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* Limit the length of a stabs entry (for the broken Acorn assembler) */
#undef DBX_CONTIN_LENGTH
#define DBX_CONTIN_LENGTH 80
#include "arm/riscix.h"
/* The native RISCiX assembler does not support stabs of any kind; because
the native assembler is not used by the compiler, Acorn didn't feel it was
necessary to put them in!

View File

@ -69,7 +69,5 @@ Boston, MA 02111-1307, USA. */
%(subtarget_extra_asm_spec)"
#endif
#include "arm/aout.h"
#undef CPP_APCS_PC_DEFAULT_SPEC
#define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__"

View File

@ -35,9 +35,5 @@ Boston, MA 02111-1307, USA. */
/* The Norcroft C library defines size_t as "unsigned int" */
#define SIZE_TYPE "unsigned int"
#include "arm/aof.h"
#undef CPP_APCS_PC_DEFAULT_SPEC
#define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__"

View File

@ -24,8 +24,5 @@ Boston, MA 02111-1307, USA. */
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_strongarm
#endif
#include "coff.h"
#undef TARGET_VERSION
#define TARGET_VERSION fputs (" (StrongARM/COFF)", stderr);

View File

@ -19,8 +19,5 @@ 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. */
#include "arm/strongarm-coff.h"
#include "arm/pe.h"
#undef TARGET_VERSION
#define TARGET_VERSION fputs (" (StrongARM/PE)", stderr);

View File

@ -23,8 +23,6 @@ Boston, MA 02111-1307, USA. */
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm710
#include "arm/coff.h"
#undef SUBTARGET_CPP_SPEC
#define SUBTARGET_CPP_SPEC \
"%{march=arm710:-DCPU=ARM710A} \

View File

@ -29,7 +29,5 @@ Boston, MA 02111-1307, USA. */
#define MULTILIB_DEFAULTS \
{ "mlittle-endian", "mno-thumb-interwork", "marm" }
#include "coff.h"
#undef TARGET_VERSION
#define TARGET_VERSION fputs (" (XScale/COFF)", stderr);