From be47c99e5db92daaa988aad8ee4105af8a2c1ee7 Mon Sep 17 00:00:00 2001 From: jsm28 Date: Mon, 13 Dec 2010 23:59:50 +0000 Subject: [PATCH] * config/xtensa/elf.h (SIZE_TYPE, PTRDIFF_TYPE): Define. (DBX_REGISTER_NUMBER): Undefine. * config/xtensa/linux.h (SIZE_TYPE, PTRDIFF_TYPE): Define. (DBX_REGISTER_NUMBER): Undefine. * config.gcc (xtensa*-*-elf*, xtensa*-*-linux*): Don't use svr4.h. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167774 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/config.gcc | 4 ++-- gcc/config/xtensa/elf.h | 8 ++++++++ gcc/config/xtensa/linux.h | 8 ++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3c6ba19afc3..c832c343c3d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-12-13 Joseph Myers + + * config/xtensa/elf.h (SIZE_TYPE, PTRDIFF_TYPE): Define. + (DBX_REGISTER_NUMBER): Undefine. + * config/xtensa/linux.h (SIZE_TYPE, PTRDIFF_TYPE): Define. + (DBX_REGISTER_NUMBER): Undefine. + * config.gcc (xtensa*-*-elf*, xtensa*-*-linux*): Don't use svr4.h. + 2010-12-13 Jack Howarth Joseph Myers diff --git a/gcc/config.gcc b/gcc/config.gcc index 88aa40878b8..ceecc242aab 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2660,11 +2660,11 @@ xstormy16-*-elf) extra_parts="crtbegin.o crtend.o" ;; xtensa*-*-elf*) - tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h xtensa/elf.h" + tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h xtensa/elf.h" tmake_file="xtensa/t-xtensa xtensa/t-elf" ;; xtensa*-*-linux*) - tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h xtensa/linux.h" + tm_file="${tm_file} dbxelf.h elfos.h linux.h glibc-stdint.h xtensa/linux.h" tmake_file="${tmake_file} xtensa/t-xtensa xtensa/t-linux" ;; am33_2.0-*-linux*) diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h index 9188f309fb8..54a9c8f19a5 100644 --- a/gcc/config/xtensa/elf.h +++ b/gcc/config/xtensa/elf.h @@ -32,6 +32,12 @@ along with GCC; see the file COPYING3. If not see #undef TARGET_VERSION #define TARGET_VERSION fputs (" (Xtensa/ELF)", stderr); +#undef SIZE_TYPE +#define SIZE_TYPE "unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "int" + #undef WCHAR_TYPE #define WCHAR_TYPE "short unsigned int" @@ -75,6 +81,8 @@ along with GCC; see the file COPYING3. If not see /* Do not force "-fpic" for this target. */ #define XTENSA_ALWAYS_PIC 0 +#undef DBX_REGISTER_NUMBER + /* Search for headers in $tooldir/arch/include and for libraries and startfiles in $tooldir/arch/lib. */ #define GCC_DRIVER_HOST_INITIALIZATION \ diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h index fb9f4539ebd..46ec3437130 100644 --- a/gcc/config/xtensa/linux.h +++ b/gcc/config/xtensa/linux.h @@ -27,6 +27,12 @@ along with GCC; see the file COPYING3. If not see #undef TARGET_VERSION #define TARGET_VERSION fputs (" (Xtensa GNU/Linux with ELF)", stderr); +#undef SIZE_TYPE +#define SIZE_TYPE "unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "int" + #undef WCHAR_TYPE #define WCHAR_TYPE "long int" @@ -60,5 +66,7 @@ along with GCC; see the file COPYING3. If not see /* Always enable "-fpic" for Xtensa Linux. */ #define XTENSA_ALWAYS_PIC 1 +#undef DBX_REGISTER_NUMBER + #define MD_UNWIND_SUPPORT "config/xtensa/linux-unwind.h" -- 2.11.0