2010-03-15 Thomas Schwinge <thomas@codesourcery.com>

* dw2gencfi.c (output_cie): Make it more explicit which code paths
	belong to .eh_frame only.

gas/ChangeLog

@@ -1,3 +1,8 @@
+2010-03-15  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* dw2gencfi.c (output_cie): Make it more explicit which code paths
+	belong to .eh_frame only.
+
 2010-03-13  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	* config/tc-v850.c (v850_insert_operand): Handle out-of-range

gas/dw2gencfi.c

@@ -1,5 +1,5 @@
 /* dw2gencfi.c - Support for generating Dwarf2 CFI information.
-   Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
    Contributed by Michal Ludvig <mludvig@suse.cz>
 
@@ -1319,7 +1319,7 @@ output_cie (struct cie_entry *cie, bfd_boolean eh_frame, int align)
       if (cie->per_encoding != DW_EH_PE_omit)
 	augmentation_size += 1 + encoding_size (cie->per_encoding);
       out_uleb128 (augmentation_size);		/* Augmentation size.  */
-    }
+
       if (cie->per_encoding != DW_EH_PE_omit)
 	{
 	  offsetT size = encoding_size (cie->per_encoding);
@@ -1340,8 +1340,10 @@ output_cie (struct cie_entry *cie, bfd_boolean eh_frame, int align)
 	  else
 	    emit_expr (&exp, size);
 	}
+
       if (cie->lsda_encoding != DW_EH_PE_omit)
 	out_one (cie->lsda_encoding);
+    }
 
   switch (DWARF2_FDE_RELOC_SIZE)
     {