diff --git a/include/ChangeLog b/include/ChangeLog
index d062490ac33539073c38d7e7b32a370a1048a642..c7fce38fb2ba8833d37eddb4f18f7b3a0e16334c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-27  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XSHAL_ABI): New.
+	(XTHAL_ABI_WINDOWED, XTHAL_ABI_CALL0): New.
+
 2006-04-11  Jim Blandy  <jimb@codesourcery.com>
 
 	* libiberty.h (pex_input_file, pex_input_pipe): New declarations.
diff --git a/include/xtensa-config.h b/include/xtensa-config.h
index 5c0315d6198dcfca8716219cf24d4d7484f9604b..36f9719fe33dc5c7d6bb3875ac52e817033030b6 100644
--- a/include/xtensa-config.h
+++ b/include/xtensa-config.h
@@ -1,5 +1,6 @@
 /* Xtensa configuration settings.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+   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
@@ -145,4 +146,12 @@
 #undef XCHAL_INST_FETCH_WIDTH
 #define XCHAL_INST_FETCH_WIDTH		4
 
+
+#undef XSHAL_ABI
+#undef XTHAL_ABI_WINDOWED
+#undef XTHAL_ABI_CALL0
+#define XSHAL_ABI			XTHAL_ABI_WINDOWED
+#define XTHAL_ABI_WINDOWED		0
+#define XTHAL_ABI_CALL0			1
+
 #endif /* !XTENSA_CONFIG_H */