From e677f70c666cf42d5c87d14c15511823695f9d49 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Tue, 1 Jul 2003 00:14:33 +0000 Subject: xtensa-config.h: New file imported from binutils. include/ChangeLog: * xtensa-config.h: New file imported from binutils. gcc/ChangeLog: * config/xtensa/lib1funcs.asm: Use "xtensa-config.h" from top-level include directory. * config/xtensa/lib2funcs.S: Likewise. * config/xtensa/xtensa.h: Likewise. * config/xtensa/xtensa-config.h: Remove. * doc/install.texi: Update location of "xtensa-config.h" header. From-SVN: r68747 --- gcc/ChangeLog | 9 ++++++ gcc/config/xtensa/lib1funcs.asm | 2 +- gcc/config/xtensa/lib2funcs.S | 2 +- gcc/config/xtensa/xtensa-config.h | 59 --------------------------------- gcc/config/xtensa/xtensa.h | 2 +- gcc/doc/install.texi | 2 +- include/ChangeLog | 4 +++ include/xtensa-config.h | 68 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 85 insertions(+), 63 deletions(-) delete mode 100644 gcc/config/xtensa/xtensa-config.h create mode 100644 include/xtensa-config.h diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 47da29f..b5b90cd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2003-06-30 Bob Wilson + + * config/xtensa/lib1funcs.asm: Use "xtensa-config.h" from + top-level include directory. + * config/xtensa/lib2funcs.S: Likewise. + * config/xtensa/xtensa.h: Likewise. + * config/xtensa/xtensa-config.h: Remove. + * doc/install.texi: Update location of "xtensa-config.h" header. + 2003-06-30 Ulrich Weigand * config/s390/s390.c (s390_extra_constraint): New function. diff --git a/gcc/config/xtensa/lib1funcs.asm b/gcc/config/xtensa/lib1funcs.asm index 384b207..72cd958 100644 --- a/gcc/config/xtensa/lib1funcs.asm +++ b/gcc/config/xtensa/lib1funcs.asm @@ -28,7 +28,7 @@ along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "xtensa/xtensa-config.h" +#include "xtensa-config.h" # Define macros for the ABS and ADDX* instructions to handle cases # where they are not included in the Xtensa processor configuration. diff --git a/gcc/config/xtensa/lib2funcs.S b/gcc/config/xtensa/lib2funcs.S index b424d76..d06e122 100644 --- a/gcc/config/xtensa/lib2funcs.S +++ b/gcc/config/xtensa/lib2funcs.S @@ -28,7 +28,7 @@ along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "xtensa/xtensa-config.h" +#include "xtensa-config.h" /* __xtensa_libgcc_window_spill: This function flushes out all but the current register window. This is used to set up the stack so that diff --git a/gcc/config/xtensa/xtensa-config.h b/gcc/config/xtensa/xtensa-config.h deleted file mode 100644 index 6782568..0000000 --- a/gcc/config/xtensa/xtensa-config.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Xtensa configuration settings. - Copyright (C) 2001,2002,2003 Free Software Foundation, Inc. - Contributed by Bob Wilson (bwilson@tensilica.com) at Tensilica. - - This program 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. - - This program 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 this program; if not, write to the Free Software - Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#ifndef XTENSA_CONFIG_H -#define XTENSA_CONFIG_H - -/* The macros defined here match those with the same names in the Xtensa - compile-time HAL (Hardware Abstraction Layer). Please refer to the - Xtensa System Software Reference Manual for documentation of these - macros. */ - -#define XCHAL_HAVE_BE 1 -#define XCHAL_HAVE_DENSITY 1 -#define XCHAL_HAVE_CONST16 0 -#define XCHAL_HAVE_ABS 1 -#define XCHAL_HAVE_ADDX 1 -#define XCHAL_HAVE_L32R 1 -#define XCHAL_HAVE_MAC16 0 -#define XCHAL_HAVE_MUL16 0 -#define XCHAL_HAVE_MUL32 0 -#define XCHAL_HAVE_DIV32 0 -#define XCHAL_HAVE_NSA 1 -#define XCHAL_HAVE_MINMAX 0 -#define XCHAL_HAVE_SEXT 0 -#define XCHAL_HAVE_LOOPS 1 -#define XCHAL_HAVE_BOOLEANS 0 -#define XCHAL_HAVE_FP 0 -#define XCHAL_HAVE_FP_DIV 0 -#define XCHAL_HAVE_FP_RECIP 0 -#define XCHAL_HAVE_FP_SQRT 0 -#define XCHAL_HAVE_FP_RSQRT 0 - -#define XCHAL_ICACHE_SIZE 8192 -#define XCHAL_DCACHE_SIZE 8192 -#define XCHAL_ICACHE_LINESIZE 16 -#define XCHAL_DCACHE_LINESIZE 16 -#define XCHAL_ICACHE_LINEWIDTH 4 -#define XCHAL_DCACHE_LINEWIDTH 4 -#define XCHAL_DCACHE_IS_WRITEBACK 0 - -#define XCHAL_HAVE_MMU 1 -#define XCHAL_MMU_MIN_PTE_PAGE_SIZE 12 - -#endif /* !XTENSA_CONFIG_H */ diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h index b2ac445..5f5e112 100644 --- a/gcc/config/xtensa/xtensa.h +++ b/gcc/config/xtensa/xtensa.h @@ -20,7 +20,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Get Xtensa configuration settings */ -#include "xtensa/xtensa-config.h" +#include "xtensa-config.h" /* Standard GCC variables that we reference. */ extern int current_function_calls_alloca; diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 0bbe1d0..b19993c 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -3324,7 +3324,7 @@ Tensilica Instruction Extension (TIE) language are only supported through inline assembly. The Xtensa configuration information must be specified prior to -building GCC@. The @file{gcc/config/xtensa/xtensa-config.h} header +building GCC@. The @file{include/xtensa-config.h} header file contains the configuration information. If you created your own Xtensa configuration with the Xtensa Processor Generator, the downloaded files include a customized copy of this header file, diff --git a/include/ChangeLog b/include/ChangeLog index a76344b..98ea724 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2003-06-30 Bob Wilson + + * xtensa-config.h: New file imported from binutils. + 2003-06-22 Zack Weinberg * safe-ctype.h (HC_UNKNOWN, HC_ASCII, HC_EBCDIC): Rename to diff --git a/include/xtensa-config.h b/include/xtensa-config.h new file mode 100644 index 0000000..f643489 --- /dev/null +++ b/include/xtensa-config.h @@ -0,0 +1,68 @@ +/* Xtensa configuration settings. + Copyright (C) 2001,2002,2003 Free Software Foundation, Inc. + Contributed by Bob Wilson (bwilson@tensilica.com) at Tensilica. + + This program 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. + + This program 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 this program; if not, write to the Free Software + Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef XTENSA_CONFIG_H +#define XTENSA_CONFIG_H + +/* The macros defined here match those with the same names in the Xtensa + compile-time HAL (Hardware Abstraction Layer). Please refer to the + Xtensa System Software Reference Manual for documentation of these + macros. */ + +#define XCHAL_HAVE_BE 1 +#define XCHAL_HAVE_DENSITY 1 +#define XCHAL_HAVE_CONST16 0 +#define XCHAL_HAVE_ABS 1 +#define XCHAL_HAVE_ADDX 1 +#define XCHAL_HAVE_L32R 1 +#define XCHAL_HAVE_MAC16 0 +#define XCHAL_HAVE_MUL16 0 +#define XCHAL_HAVE_MUL32 0 +#define XCHAL_HAVE_DIV32 0 +#define XCHAL_HAVE_NSA 1 +#define XCHAL_HAVE_MINMAX 0 +#define XCHAL_HAVE_SEXT 0 +#define XCHAL_HAVE_LOOPS 1 +#define XCHAL_HAVE_BOOLEANS 0 +#define XCHAL_HAVE_FP 0 +#define XCHAL_HAVE_FP_DIV 0 +#define XCHAL_HAVE_FP_RECIP 0 +#define XCHAL_HAVE_FP_SQRT 0 +#define XCHAL_HAVE_FP_RSQRT 0 +#define XCHAL_HAVE_WINDOWED 1 + +#define XCHAL_ICACHE_SIZE 8192 +#define XCHAL_DCACHE_SIZE 8192 +#define XCHAL_ICACHE_LINESIZE 16 +#define XCHAL_DCACHE_LINESIZE 16 +#define XCHAL_ICACHE_LINEWIDTH 4 +#define XCHAL_DCACHE_LINEWIDTH 4 +#define XCHAL_DCACHE_IS_WRITEBACK 0 + +#define XCHAL_HAVE_MMU 1 +#define XCHAL_MMU_MIN_PTE_PAGE_SIZE 12 + +#define XCHAL_HAVE_DEBUG 1 +#define XCHAL_NUM_IBREAK 2 +#define XCHAL_NUM_DBREAK 2 +#define XCHAL_DEBUGLEVEL 4 + +#define XCHAL_EXTRA_SA_SIZE 0 +#define XCHAL_EXTRA_SA_ALIGN 1 + +#endif /* !XTENSA_CONFIG_H */ -- cgit v1.1