diff --git a/include/ChangeLog b/include/ChangeLog
index f0610f4e5a7bd1f29941f1a78960850208b3b973..2f256aec7638fceccf4024699e98ff90dee35d8e 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-07  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XSHAL_USE_ABSOLUTE_LITERALS,
+	XCHAL_HAVE_PREDICTED_BRANCHES, XCHAL_INST_FETCH_WIDTH): New.
+	(XCHAL_EXTRA_SA_SIZE, XCHAL_EXTRA_SA_ALIGN): Delete.
+
 2004-09-13  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>
 
 	* libiberty.h (basename): Prototype for __MINGW32__.
diff --git a/include/xtensa-config.h b/include/xtensa-config.h
index 4191c3685758f2b2fc37eb6591950d85895163ef..4ef5d64270f81e65b8b6e213398b0a0216aa6611 100644
--- a/include/xtensa-config.h
+++ b/include/xtensa-config.h
@@ -1,5 +1,5 @@
 /* Xtensa configuration settings.
-   Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004 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
@@ -42,6 +42,9 @@
 #undef XCHAL_HAVE_L32R
 #define XCHAL_HAVE_L32R			1
 
+#undef XSHAL_USE_ABSOLUTE_LITERALS
+#define XSHAL_USE_ABSOLUTE_LITERALS	0
+
 #undef XCHAL_HAVE_MAC16
 #define XCHAL_HAVE_MAC16		0
 
@@ -87,6 +90,9 @@
 #undef XCHAL_HAVE_WINDOWED
 #define XCHAL_HAVE_WINDOWED		1
 
+#undef XCHAL_HAVE_PREDICTED_BRANCHES
+#define XCHAL_HAVE_PREDICTED_BRANCHES	0
+
 
 #undef XCHAL_ICACHE_SIZE
 #define XCHAL_ICACHE_SIZE		8192
@@ -130,10 +136,7 @@
 #define XCHAL_DEBUGLEVEL		4
 
 
-#undef XCHAL_EXTRA_SA_SIZE
-#define XCHAL_EXTRA_SA_SIZE		0
-
-#undef XCHAL_EXTRA_SA_ALIGN
-#define XCHAL_EXTRA_SA_ALIGN		1
+#undef XCHAL_INST_FETCH_WIDTH
+#define XCHAL_INST_FETCH_WIDTH		4
 
 #endif /* !XTENSA_CONFIG_H */