diff options
| author | Nick Clifton <nickc@cygnus.com> | 2000-07-26 21:39:42 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@gcc.gnu.org> | 2000-07-26 21:39:42 +0000 |
| commit | 5d7a9c0a28b74d055c5177f533ff5cd1595cb5ba (patch) | |
| tree | 17f4c90f10487097c89c0ba404395a41ab9384da | |
| parent | 421173e6d334fe5b5d1701b8e730b19b5e132ad5 (diff) | |
| download | gcc-5d7a9c0a28b74d055c5177f533ff5cd1595cb5ba.zip gcc-5d7a9c0a28b74d055c5177f533ff5cd1595cb5ba.tar.gz gcc-5d7a9c0a28b74d055c5177f533ff5cd1595cb5ba.tar.bz2 | |
Remove definition of __arm__ from CPP_PREDEFINES
From-SVN: r35270
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/config/arm/vxarm.h | 53 |
2 files changed, 29 insertions, 27 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b82d67d..6e49eaa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2000-07-26 Nick Clifton <nickc@cygnus.com> + * config/arm/vxarm.h (CPP_PREDEFINES): Remove definition of + __arm__. Allow it to be defined by CPP_ISA_SPEC in arm.h + * dwarf2out.c (dwarf2out_frame_debug_expr): Accept SEQUENCE as well as PARALLEL blocks in FRAME_RELATED_EXPR notes. diff --git a/gcc/config/arm/vxarm.h b/gcc/config/arm/vxarm.h index 53381b93..1a5aad9 100644 --- a/gcc/config/arm/vxarm.h +++ b/gcc/config/arm/vxarm.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler, for ARM with targetting the VXWorks run time environment. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2000 Free Software Foundation, Inc. Contributed by: Mike Stump <mrs@wrs.com> @@ -26,47 +26,46 @@ Boston, MA 02111-1307, USA. */ #include "arm/coff.h" #undef SUBTARGET_CPP_SPEC -#define SUBTARGET_CPP_SPEC \ -"%{march=arm710:-DCPU=ARM710A} \ - %{march=arm7tdmi:-DCPU=ARM7TDMI} \ - %{march=arm810:-DCPU=ARM810} \ - %{march=strongarm110:-DCPU=ARMSA110} \ - %{!march=*: \ - %{mcpu=arm710:-DCPU=ARM710A} \ - %{mcpu=arm7tdmi:-DCPU=ARM7TDMI} \ - %{mcpu=arm810:-DCPU=ARM810} \ - %{mcpu=strongarm110:-DCPU=ARMSA110}} \ - %{!mcpu*:%{!march=*:-DCPU=ARM710A}} \ +#define SUBTARGET_CPP_SPEC \ +"%{march=arm710:-DCPU=ARM710A} \ + %{march=arm7tdmi:-DCPU=ARM7TDMI} \ + %{march=arm810:-DCPU=ARM810} \ + %{march=strongarm110:-DCPU=ARMSA110} \ + %{!march=*: \ + %{mcpu=arm710:-DCPU=ARM710A} \ + %{mcpu=arm7tdmi:-DCPU=ARM7TDMI} \ + %{mcpu=arm810:-DCPU=ARM810} \ + %{mcpu=strongarm110:-DCPU=ARMSA110}} \ + %{!mcpu*:%{!march=*:-DCPU=ARM710A}} \ " + #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-D__vxworks -D__arm__ -Acpu(arm) -Amachine(arm)" +#define CPP_PREDEFINES "-D__vxworks -Acpu(arm) -Amachine(arm)" /* VxWorks does all the library stuff itself. */ - #undef LIB_SPEC -#define LIB_SPEC "" +#define LIB_SPEC "" /* VxWorks uses object files, not loadable images. make linker just combine objects. */ - #undef LINK_SPEC -#define LINK_SPEC "-r" +#define LINK_SPEC "-r" /* VxWorks provides the functionality of crt0.o and friends itself. */ - #undef STARTFILE_SPEC -#define STARTFILE_SPEC "" +#define STARTFILE_SPEC "" #undef ENDFILE_SPEC -#define ENDFILE_SPEC "" +#define ENDFILE_SPEC "" #undef TARGET_VERSION -#define TARGET_VERSION fputs (" (ARM/VxWorks)", stderr); +#define TARGET_VERSION fputs (" (ARM/VxWorks)", stderr); #undef ASM_FILE_START -#define ASM_FILE_START(STREAM) \ -do \ -{ \ - fprintf (STREAM, "%s Generated by gcc %s for ARM/VxWorks\n", \ - ASM_COMMENT_START, version_string); \ -} while (0) +#define ASM_FILE_START(STREAM) \ + do \ + { \ + fprintf (STREAM, "%s Generated by gcc %s for ARM/VxWorks\n", \ + ASM_COMMENT_START, version_string); \ + } \ + while (0) |