* dwarf2dbg.c (get_frag_fix): Revert 2001-11-15 change.

	(generic_dwarf2_emit_offset): Don't define function when
	TC__DWARF2_EMIT_OFFSET is defined.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b61caa5..90a8f80 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-16  Alan Modra  <amodra@bigpond.net.au>
+
+       * dwarf2dbg.c (get_frag_fix): Revert 2001-11-15 change.
+       (generic_dwarf2_emit_offset): Don't define function when
+       TC__DWARF2_EMIT_OFFSET is defined.
+
 2003-07-15  Richard Sandiford  <rsandifo@redhat.com>
 
        * config/tc-mips.c (hilo_interlocks): True for CPU_RM7000.

diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 69d4731..d1b3cf8 100644 (file)
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -52,10 +52,6 @@
 # define DWARF2_ADDR_SIZE(bfd) (bfd_arch_bits_per_address (bfd) / 8);
 #endif
 
-#ifndef TC_DWARF2_EMIT_OFFSET
-# define TC_DWARF2_EMIT_OFFSET  generic_dwarf2_emit_offset
-#endif
-
 #ifdef BFD_ASSEMBLER
 
 #include "subsegs.h"
@@ -160,7 +156,6 @@ static struct dwarf2_line_info current;
 /* The size of an address on the target.  */
 static unsigned int sizeof_address;
 \f
-static void generic_dwarf2_emit_offset PARAMS((symbolS *, unsigned int));
 static struct line_subseg *get_line_subseg PARAMS ((segT, subsegT));
 static unsigned int get_filenum PARAMS ((const char *, unsigned int));
 static struct frag *first_frag_for_seg PARAMS ((segT));
@@ -185,6 +180,10 @@ static void out_debug_aranges PARAMS ((segT, segT));
 static void out_debug_abbrev PARAMS ((segT));
 static void out_debug_info PARAMS ((segT, segT, segT));
 \f
+#ifndef TC_DWARF2_EMIT_OFFSET
+# define TC_DWARF2_EMIT_OFFSET  generic_dwarf2_emit_offset
+static void generic_dwarf2_emit_offset PARAMS ((symbolS *, unsigned int));
+
 /* Create an offset to .dwarf2_*.  */
 
 static void
@@ -199,6 +198,7 @@ generic_dwarf2_emit_offset (symbol, size)
   expr.X_add_number = 0;
   emit_expr (&expr, size);
 }
+#endif
 
 /* Find or create an entry for SEG+SUBSEG in ALL_SEGS.  */
 
@@ -632,11 +632,7 @@ get_frag_fix (frag)
      on some subsegment chain.  */
   for (fr = frchain_root; fr; fr = fr->frch_next)
     if (fr->frch_last == frag)
-      {
-       long align_mask = -1 << get_recorded_alignment (fr->frch_seg);
-       return (((char *) obstack_next_free (&fr->frch_obstack)
-                - frag->fr_literal) + ~align_mask) & align_mask;
-      }
+      return (char *) obstack_next_free (&fr->frch_obstack) - frag->fr_literal;
 
   abort ();
 }