From: hainque Date: Fri, 19 Sep 2014 08:19:04 +0000 (+0000) Subject: 2014-09-19 Olivier Hainque X-Git-Tag: upstream/5.3.0~5463 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef90f3f383cae943e66103de3e5d11f4057530b6;p=platform%2Fupstream%2Flinaro-gcc.git 2014-09-19 Olivier Hainque * config/i386/vxworksae.h: Remove obsolete definitions. (STACK_CHECK_PROTECT): Define. * config/i386/vx-common.h: Remove. Merge contents within config/i386/vxworks.h. * config.gcc (i?86-vxworks*): Use i386/vxworks.h instead of i386/vx-common.h. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215378 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8892f64..827e5d2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,14 @@ 2014-09-19 Olivier Hainque + * config/i386/vxworksae.h: Remove obsolete definitions. + (STACK_CHECK_PROTECT): Define. + * config/i386/vx-common.h: Remove. Merge contents within + config/i386/vxworks.h. + * config.gcc (i?86-vxworks*): Use i386/vxworks.h instead of + i386/vx-common.h. + +2014-09-19 Olivier Hainque + * config.gcc (powerpc-wrs-vxworksmils): New configuration. * config/rs6000/t-vxworksmils: New file. * config/rs6000/vxworksmils.h: New file. diff --git a/gcc/config.gcc b/gcc/config.gcc index 0b8d771..0e50e9a 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1556,11 +1556,11 @@ i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae) tm_file="${tm_file} i386/unix.h i386/att.h elfos.h vx-common.h" case ${target} in *-vxworksae*) - tm_file="${tm_file} vxworksae.h i386/vx-common.h i386/vxworksae.h" + tm_file="${tm_file} vxworksae.h i386/vxworks.h i386/vxworksae.h" tmake_file="${tmake_file} i386/t-vxworks i386/t-vxworksae" ;; *) - tm_file="${tm_file} vxworks.h i386/vx-common.h i386/vxworks.h" + tm_file="${tm_file} vxworks.h i386/vxworks.h" tmake_file="${tmake_file} i386/t-vxworks" ;; esac diff --git a/gcc/config/i386/vx-common.h b/gcc/config/i386/vx-common.h deleted file mode 100644 index dd096f1..0000000 --- a/gcc/config/i386/vx-common.h +++ /dev/null @@ -1,35 +0,0 @@ -/* IA32 VxWorks and VxWorks AE target definitions. - Copyright (C) 2007-2014 Free Software Foundation, Inc. - -This file is part of GCC. - -GCC 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 3, or (at your option) -any later version. - -GCC 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 GCC; see the file COPYING3. If not see -. */ - -#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ - asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) - -/* VxWorks uses the same ABI as Solaris 2, so use i386/sol2.h version. */ - -#undef TARGET_SUBTARGET_DEFAULT -#define TARGET_SUBTARGET_DEFAULT \ - (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_VECT8_RETURNS) - -/* Provide our target specific DBX_REGISTER_NUMBER. VxWorks relies on - the SVR4 numbering. */ - -#undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(n) svr4_dbx_register_map[n] - -#define IX86_MAYBE_NO_LIBGCC_TFMODE diff --git a/gcc/config/i386/vxworks.h b/gcc/config/i386/vxworks.h index 49206e0..9b29306 100644 --- a/gcc/config/i386/vxworks.h +++ b/gcc/config/i386/vxworks.h @@ -21,6 +21,21 @@ along with GCC; see the file COPYING3. If not see #undef ASM_SPEC #define ASM_SPEC "" +#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ + asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) + +/* VxWorks uses the same ABI as Solaris 2, so use i386/sol2.h version. */ + +#undef TARGET_SUBTARGET_DEFAULT +#define TARGET_SUBTARGET_DEFAULT \ + (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_VECT8_RETURNS) + +/* Provide our target specific DBX_REGISTER_NUMBER. VxWorks relies on + the SVR4 numbering. */ + +#undef DBX_REGISTER_NUMBER +#define DBX_REGISTER_NUMBER(n) svr4_dbx_register_map[n] + #define TARGET_OS_CPP_BUILTINS() \ do \ { \ @@ -71,3 +86,5 @@ along with GCC; see the file COPYING3. If not see /* We cannot use PC-relative accesses for VxWorks PIC because there is no fixed gap between segments. */ #undef ASM_PREFERRED_EH_DATA_FORMAT + +#define IX86_MAYBE_NO_LIBGCC_TFMODE diff --git a/gcc/config/i386/vxworksae.h b/gcc/config/i386/vxworksae.h index bb63c07..7b0e42e 100644 --- a/gcc/config/i386/vxworksae.h +++ b/gcc/config/i386/vxworksae.h @@ -18,18 +18,7 @@ You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see . */ -/* On VxWorks AE, we only want SIMNT. */ -#undef VXWORKS_CPU_DEFINE -#define VXWORKS_CPU_DEFINE() \ - do \ - builtin_define ("CPU=SIMNT"); \ - while (0) - -#undef ASM_SPEC -#define ASM_SPEC "" - -#undef SIZE_TYPE -#define SIZE_TYPE "unsigned int" - -#undef PTRDIFF_TYPE -#define PTRDIFF_TYPE "int" +/* This platform supports the probing method of stack checking and + requires 4K of space for executing a possible last chance handler. */ +#undef STACK_CHECK_PROTECT +#define STACK_CHECK_PROTECT 4096