diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1750ea36b7d..41879a3222d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-30  Bob Wilson  <bob.wilson@acm.org>
+	
+	* config/tc-xtensa.h (md_allow_eh_opt): Define.
+
 2007-11-29  Mark Shinwell  <shinwell@codesourcery.com>
 
 	* config/tc-mips.c (mips_cpu_info_table): Add loongson2e
diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
index d3ae0241ee3..c9ae94d4f12 100644
--- a/gas/config/tc-xtensa.h
+++ b/gas/config/tc-xtensa.h
@@ -374,6 +374,10 @@ extern char *xtensa_section_rename (char *);
 #define md_relax_frag(segment, fragP, stretch) \
   xtensa_relax_frag (fragP, stretch, &stretched)
 
+/* Only allow call frame debug info optimization when linker relaxation is
+   not enabled as otherwise we could generate the DWARF directives without
+   the relocs necessary to patch them up.  */
+#define md_allow_eh_opt (linkrelax == 0)
 
 #define LOCAL_LABELS_FB 1
 #define WORKING_DOT_WORD 1
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 266c88dcc71..3f06e0eeda6 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-30  Bob Wilson  <bob.wilson@acm.org>
+
+	* gas/elf/elf.exp: Disable ehopt test for Xtensa.
+
 2007-11-29  Mark Shinwell  <shinwell@codesourcery.com>
 
 	* config/tc-mips.c (mips_cpu_info_table): Add loongson2e
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index 07d2cb1a694..2af7e38b377 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -74,9 +74,12 @@ if { ([istarget "*-*-*elf*"]
 	}
     }
 
-    # The MN10300 port disables the assembler's call frame optimization
-    # because it interfers with link time relaxation of function prologues.
-    if {![istarget "mn10300-*-*"] && ![istarget "am3*-*-*"]} then {    
+    # The MN10300 and Xtensa ports disable the assembler's call frame
+    # optimization because it interfers with link-time relaxation of
+    # function prologues.
+    if {![istarget "mn10300-*-*"]
+	&& ![istarget "xtensa*-*-*"]
+	&& ![istarget "am3*-*-*"]} then {    
       run_dump_test "ehopt0"
     }
     run_dump_test "group0a"