diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 47da29f788ccf1380645bc66f500092fc6cb56d7..b5b90cd53303584cab4698bd4af6e9f56d4bd6cc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-30  Bob Wilson  <bob.wilson@acm.org>
+	
+	* 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  <uweigand@de.ibm.com>
 
 	* config/s390/s390.c (s390_extra_constraint): New function.
diff --git a/gcc/config/xtensa/lib1funcs.asm b/gcc/config/xtensa/lib1funcs.asm
index 384b2079e48cbe67d6d3edaed5eff37968f2c6c9..72cd958841b28b7e8a03c7d5b5e13c4d493eb86c 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 b424d7611e439aaebfb7553a29a56bc10506df8c..d06e1222ae88e69ede70049544a0a0c02a7497fa 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.h b/gcc/config/xtensa/xtensa.h
index b2ac4454406b6515f2500a66e3734d8f60cca2ef..5f5e112cd851e72760be262a7c32655061d98cb9 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 0bbe1d01e525c65ffb72078e75faff96d24caf82..b19993cbcecb9ba43d63c366fccfd26d59331aca 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 a76344b3a964bdd6208cd0d137b22886de8da8de..98ea724a578805ec7daedeb41720bac627f83afe 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-30  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h: New file imported from binutils.
+
 2003-06-22  Zack Weinberg  <zack@codesourcery.com>
 
 	* safe-ctype.h (HC_UNKNOWN, HC_ASCII, HC_EBCDIC): Rename to
diff --git a/gcc/config/xtensa/xtensa-config.h b/include/xtensa-config.h
similarity index 89%
rename from gcc/config/xtensa/xtensa-config.h
rename to include/xtensa-config.h
index 6782568b1167ecebc0dc2a44480de5bca5088fcd..f643489aceec51e60b85e4b9b5d0105d4787fe29 100644
--- a/gcc/config/xtensa/xtensa-config.h
+++ b/include/xtensa-config.h
@@ -44,6 +44,7 @@
 #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
@@ -56,4 +57,12 @@
 #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 */