X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fdwarf2asm.c;h=1bbadc52b61e4a9154cbdd9a9a6156229b9c617c;hp=ca1efb547b7ed241192cd8d2e969020c7cde6861;hb=67ce556b47830dd825524e8370969b814c355216;hpb=e8a71c59392cf4b655a03bc0831a529f1b515c31

diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c
index ca1efb547b7..1bbadc52b61 100644
--- a/gcc/dwarf2asm.c
+++ b/gcc/dwarf2asm.c
@@ -1,30 +1,37 @@
 /* Dwarf2 assembler output helper routines.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "flags.h"
+#include "tree.h"
 #include "rtl.h"
 #include "output.h"
+#include "target.h"
 #include "dwarf2asm.h"
+#include "dwarf2.h"
+#include "splay-tree.h"
+#include "ggc.h"
 #include "tm_p.h"
 
 
@@ -33,90 +40,75 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_COMMENT_START ";#"
 #endif
 
-/* Definitions of defaults for assembler-dependent names of various
-   pseudo-ops and section names.  These may be overridden in the tm.h
-   file (if necessary) for a particular assembler.  */
+
+/* Output an unaligned integer with the given value and size.  Prefer not
+   to print a newline, since the caller may want to add a comment.  */
 
-#ifdef OBJECT_FORMAT_ELF
-#ifndef UNALIGNED_SHORT_ASM_OP
-#define UNALIGNED_SHORT_ASM_OP		"\t.2byte\t"
-#endif
-#ifndef UNALIGNED_INT_ASM_OP
-#define UNALIGNED_INT_ASM_OP		"\t.4byte\t"
-#endif
-#ifndef UNALIGNED_DOUBLE_INT_ASM_OP
-#define UNALIGNED_DOUBLE_INT_ASM_OP	"\t.8byte\t"
-#endif
-#endif /* OBJECT_FORMAT_ELF */
+void
+dw2_assemble_integer (int size, rtx x)
+{
+  const char *op = integer_asm_op (size, FALSE);
 
-#ifndef ASM_BYTE_OP
-#define ASM_BYTE_OP			"\t.byte\t"
-#endif
+  if (op)
+    {
+      fputs (op, asm_out_file);
+      if (GET_CODE (x) == CONST_INT)
+	fprintf (asm_out_file, HOST_WIDE_INT_PRINT_HEX, INTVAL (x));
+      else
+	output_addr_const (asm_out_file, x);
+    }
+  else
+    assemble_integer (x, size, BITS_PER_UNIT, 1);
+}
 
-/* We don't have unaligned support, let's hope the normal output works for
-   .debug_frame.  But we know it won't work for .debug_info.  */
-#if !defined(UNALIGNED_INT_ASM_OP) && defined(DWARF2_DEBUGGING_INFO)
- #error DWARF2_DEBUGGING_INFO requires UNALIGNED_INT_ASM_OP.
-#endif
 
-
-#ifdef UNALIGNED_INT_ASM_OP
-static const char * unaligned_integer_asm_op  PARAMS ((int));
+/* Output an immediate constant in a given size.  */
 
-static inline const char *
-unaligned_integer_asm_op (size)
-     int size;
+void
+dw2_asm_output_data (int size, unsigned HOST_WIDE_INT value,
+		     const char *comment, ...)
 {
-  const char *op;
-  switch (size)
+  va_list ap;
+
+  va_start (ap, comment);
+
+  if (size * 8 < HOST_BITS_PER_WIDE_INT)
+    value &= ~(~(unsigned HOST_WIDE_INT) 0 << (size * 8));
+
+  dw2_assemble_integer (size, GEN_INT (value));
+
+  if (flag_debug_asm && comment)
     {
-    case 1:
-      op = ASM_BYTE_OP;
-      break;
-    case 2:
-      op = UNALIGNED_SHORT_ASM_OP;
-      break;
-    case 4:
-      op = UNALIGNED_INT_ASM_OP;
-      break;
-    case 8:
-#ifdef UNALIGNED_DOUBLE_INT_ASM_OP
-      op = UNALIGNED_DOUBLE_INT_ASM_OP;
-      break;
-#endif
-    default:
-      abort ();
+      fprintf (asm_out_file, "\t%s ", ASM_COMMENT_START);
+      vfprintf (asm_out_file, comment, ap);
     }
-  return op;
+  fputc ('\n', asm_out_file);
+
+  va_end (ap);
 }
-#endif /* UNALIGNED_INT_ASM_OP */
+
+/* Output the difference between two symbols in a given size.  */
+/* ??? There appear to be assemblers that do not like such
+   subtraction, but do support ASM_SET_OP.  It's unfortunately
+   impossible to do here, since the ASM_SET_OP for the difference
+   symbol must appear after both symbols are defined.  */
 
 void
-dw2_asm_output_data VPARAMS ((int size, unsigned HOST_WIDE_INT value,
-			      const char *comment, ...))
+dw2_asm_output_delta (int size, const char *lab1, const char *lab2,
+		      const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  int size;
-  unsigned HOST_WIDE_INT value;
-  const char *comment;
-#endif
   va_list ap;
 
-  VA_START (ap, comment);
+  va_start (ap, comment);
 
-#ifndef ANSI_PROTOTYPES
-  size = va_arg (ap, int);
-  value = va_arg (ap, unsigned HOST_WIDE_INT);
-  comment = va_arg (ap, const char *);
-#endif
-
-#ifdef UNALIGNED_INT_ASM_OP
-  fputs (unaligned_integer_asm_op (size), asm_out_file);
-  fprintf (asm_out_file, HOST_WIDE_INT_PRINT_HEX, value);
+#ifdef ASM_OUTPUT_DWARF_DELTA
+  ASM_OUTPUT_DWARF_DELTA (asm_out_file, size, lab1, lab2);
 #else
-  assemble_integer (GEN_INT (value), size, 1);
+  dw2_assemble_integer (size,
+			gen_rtx_MINUS (Pmode,
+				       gen_rtx_SYMBOL_REF (Pmode, lab1),
+				       gen_rtx_SYMBOL_REF (Pmode, lab2)));
 #endif
-
   if (flag_debug_asm && comment)
     {
       fprintf (asm_out_file, "\t%s ", ASM_COMMENT_START);
@@ -127,36 +119,24 @@ dw2_asm_output_data VPARAMS ((int size, unsigned HOST_WIDE_INT value,
   va_end (ap);
 }
 
+/* Output a section-relative reference to a label.  In general this
+   can only be done for debugging symbols.  E.g. on most targets with
+   the GNU linker, this is accomplished with a direct reference and
+   the knowledge that the debugging section will be placed at VMA 0.
+   Some targets have special relocations for this that we must use.  */
+
 void
-dw2_asm_output_delta VPARAMS ((int size, const char *lab1, const char *lab2,
-			       const char *comment, ...))
+dw2_asm_output_offset (int size, const char *label,
+		       const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  int size;
-  const char *lab1, *lab2;
-  const char *comment;
-#endif
   va_list ap;
 
-  VA_START (ap, comment);
+  va_start (ap, comment);
 
-#ifndef ANSI_PROTOTYPES
-  size = va_arg (ap, int);
-  lab1 = va_arg (ap, const char *);
-  lab2 = va_arg (ap, const char *);
-  comment = va_arg (ap, const char *);
-#endif
-
-#ifdef UNALIGNED_INT_ASM_OP
-  fputs (unaligned_integer_asm_op (size), asm_out_file);
-  assemble_name (asm_out_file, lab1);
-  fputc ('-', asm_out_file);
-  assemble_name (asm_out_file, lab2);
+#ifdef ASM_OUTPUT_DWARF_OFFSET
+  ASM_OUTPUT_DWARF_OFFSET (asm_out_file, size, label);
 #else
-  assemble_integer (gen_rtx_MINUS (smallest_mode_for_size (size, MODE_INT),
-				   gen_rtx_SYMBOL_REF (Pmode, lab1),
-				   gen_rtx_SYMBOL_REF (Pmode, lab2)),
-		    size, 1);
+  dw2_assemble_integer (size, gen_rtx_SYMBOL_REF (Pmode, label));
 #endif
 
   if (flag_debug_asm && comment)
@@ -169,30 +149,27 @@ dw2_asm_output_delta VPARAMS ((int size, const char *lab1, const char *lab2,
   va_end (ap);
 }
 
+#if 0
+
+/* Output a self-relative reference to a label, possibly in a
+   different section or object file.  */
+
 void
-dw2_asm_output_offset VPARAMS ((int size, const char *label,
-			       const char *comment, ...))
+dw2_asm_output_pcrel (int size ATTRIBUTE_UNUSED,
+		      const char *label ATTRIBUTE_UNUSED,
+		      const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  int size;
-  const char *label;
-  const char *comment;
-#endif
   va_list ap;
 
-  VA_START (ap, comment);
-
-#ifndef ANSI_PROTOTYPES
-  size = va_arg (ap, int);
-  label = va_arg (ap, const char *);
-  comment = va_arg (ap, const char *);
-#endif
+  va_start (ap, comment);
 
-#ifdef UNALIGNED_INT_ASM_OP
-  fputs (unaligned_integer_asm_op (size), asm_out_file);
-  assemble_name (asm_out_file, label);
+#ifdef ASM_OUTPUT_DWARF_PCREL
+  ASM_OUTPUT_DWARF_PCREL (asm_out_file, size, label);
 #else
-  assemble_integer (gen_rtx_SYMBOL_REF (Pmode, label), size, 1);
+  dw2_assemble_integer (size,
+			gen_rtx_MINUS (Pmode,
+				       gen_rtx_SYMBOL_REF (Pmode, label),
+				       pc_rtx));
 #endif
 
   if (flag_debug_asm && comment)
@@ -204,38 +181,19 @@ dw2_asm_output_offset VPARAMS ((int size, const char *label,
 
   va_end (ap);
 }
+#endif /* 0 */
+
+/* Output an absolute reference to a label.  */
 
 void
-dw2_asm_output_pcrel VPARAMS ((int size, const char *label,
-			       const char *comment, ...))
+dw2_asm_output_addr (int size, const char *label,
+		     const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  int size;
-  const char *label;
-  const char *comment;
-#endif
   va_list ap;
 
-  VA_START (ap, comment);
+  va_start (ap, comment);
 
-#ifndef ANSI_PROTOTYPES
-  size = va_arg (ap, int);
-  label = va_arg (ap, const char *);
-  comment = va_arg (ap, const char *);
-#endif
-
-#ifdef UNALIGNED_INT_ASM_OP
-  fputs (unaligned_integer_asm_op (size), asm_out_file);
-
-  /* ??? This needs target conditionalization.  E.g. the solaris
-     assembler uses %r_disp32(label).  Others don't like "." and
-     we need to generate a temporary label here.  */
-  assemble_name (asm_out_file, label);
-  fputc ('-', asm_out_file);
-  fputc ('.', asm_out_file);
-#else
-  abort ();
-#endif
+  dw2_assemble_integer (size, gen_rtx_SYMBOL_REF (Pmode, label));
 
   if (flag_debug_asm && comment)
     {
@@ -247,31 +205,17 @@ dw2_asm_output_pcrel VPARAMS ((int size, const char *label,
   va_end (ap);
 }
 
+/* Similar, but use an RTX expression instead of a text label.  */
+
 void
-dw2_asm_output_addr_rtx VPARAMS ((int size, rtx addr,
-				  const char *comment, ...))
+dw2_asm_output_addr_rtx (int size, rtx addr,
+			 const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  int size;
-  rtx addr;
-  const char *comment;
-#endif
   va_list ap;
 
-  VA_START (ap, comment);
+  va_start (ap, comment);
 
-#ifndef ANSI_PROTOTYPES
-  size = va_arg (ap, int);
-  addr = va_arg (ap, rtx);
-  comment = va_arg (ap, const char *);
-#endif
-
-#ifdef UNALIGNED_INT_ASM_OP
-  fputs (unaligned_integer_asm_op (size), asm_out_file);
-  output_addr_const (asm_out_file, addr);
-#else
-  assemble_integer (addr, size, 1);
-#endif
+  dw2_assemble_integer (size, addr);
 
   if (flag_debug_asm && comment)
     {
@@ -283,25 +227,23 @@ dw2_asm_output_addr_rtx VPARAMS ((int size, rtx addr,
   va_end (ap);
 }
 
+/* Output the first ORIG_LEN characters of STR as a string.
+   If ORIG_LEN is equal to -1, ignore this parameter and output
+   the entire STR instead.
+   If COMMENT is not NULL and comments in the debug information
+   have been requested by the user, append the given COMMENT
+   to the generated output.  */
+   
 void
-dw2_asm_output_nstring VPARAMS ((const char *str, size_t orig_len,
-				 const char *comment, ...))
+dw2_asm_output_nstring (const char *str, size_t orig_len,
+			const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  const char *str;
-  size_t orig_len;
-  const char *comment;
-#endif
+  size_t i, len;
   va_list ap;
-  size_t i, len = orig_len;
 
-  VA_START (ap, comment);
+  va_start (ap, comment);
 
-#ifndef ANSI_PROTOTYPES
-  str = va_arg (ap, const char *);
-  len = va_arg (ap, size_t);
-  comment = va_arg (ap, const char *);
-#endif
+  len = orig_len;
 
   if (len == (size_t) -1)
     len = strlen (str);
@@ -331,7 +273,7 @@ dw2_asm_output_nstring VPARAMS ((const char *str, size_t orig_len,
 	len += 1;
       ASM_OUTPUT_ASCII (asm_out_file, str, len);
       if (orig_len != (size_t) -1)
-	fprintf (asm_out_file, "%s0\n", ASM_BYTE_OP);
+	assemble_integer (const0_rtx, 1, BITS_PER_UNIT, 1);
     }
 
   va_end (ap);
@@ -341,14 +283,12 @@ dw2_asm_output_nstring VPARAMS ((const char *str, size_t orig_len,
 /* Return the size of an unsigned LEB128 quantity.  */
 
 int
-size_of_uleb128 (value)
-     unsigned HOST_WIDE_INT value;
+size_of_uleb128 (unsigned HOST_WIDE_INT value)
 {
-  int size = 0, byte;
+  int size = 0;
 
   do
     {
-      byte = (value & 0x7f);
       value >>= 7;
       size += 1;
     }
@@ -360,8 +300,7 @@ size_of_uleb128 (value)
 /* Return the size of a signed LEB128 quantity.  */
 
 int
-size_of_sleb128 (value)
-     HOST_WIDE_INT value;
+size_of_sleb128 (HOST_WIDE_INT value)
 {
   int size = 0, byte;
 
@@ -377,28 +316,201 @@ size_of_sleb128 (value)
   return size;
 }
 
+/* Given an encoding, return the number of bytes the format occupies.
+   This is only defined for fixed-size encodings, and so does not
+   include leb128.  */
+
+int
+size_of_encoded_value (int encoding)
+{
+  if (encoding == DW_EH_PE_omit)
+    return 0;
+
+  switch (encoding & 0x07)
+    {
+    case DW_EH_PE_absptr:
+      return POINTER_SIZE / BITS_PER_UNIT;
+    case DW_EH_PE_udata2:
+      return 2;
+    case DW_EH_PE_udata4:
+      return 4;
+    case DW_EH_PE_udata8:
+      return 8;
+    default:
+      gcc_unreachable ();
+    }
+}
+
+/* Yield a name for a given pointer encoding.  */
+
+const char *
+eh_data_format_name (int format)
+{
+#if HAVE_DESIGNATED_INITIALIZERS
+#define S(p, v)		[p] = v,
+#else
+#define S(p, v)		case p: return v;
+#endif
+
+#if HAVE_DESIGNATED_INITIALIZERS
+  __extension__ static const char * const format_names[256] = {
+#else
+  switch (format) {
+#endif
+
+  S(DW_EH_PE_absptr, "absolute")
+  S(DW_EH_PE_omit, "omit")
+  S(DW_EH_PE_aligned, "aligned absolute")
+
+  S(DW_EH_PE_uleb128, "uleb128")
+  S(DW_EH_PE_udata2, "udata2")
+  S(DW_EH_PE_udata4, "udata4")
+  S(DW_EH_PE_udata8, "udata8")
+  S(DW_EH_PE_sleb128, "sleb128")
+  S(DW_EH_PE_sdata2, "sdata2")
+  S(DW_EH_PE_sdata4, "sdata4")
+  S(DW_EH_PE_sdata8, "sdata8")
+
+  S(DW_EH_PE_absptr | DW_EH_PE_pcrel, "pcrel")
+  S(DW_EH_PE_uleb128 | DW_EH_PE_pcrel, "pcrel uleb128")
+  S(DW_EH_PE_udata2 | DW_EH_PE_pcrel, "pcrel udata2")
+  S(DW_EH_PE_udata4 | DW_EH_PE_pcrel, "pcrel udata4")
+  S(DW_EH_PE_udata8 | DW_EH_PE_pcrel, "pcrel udata8")
+  S(DW_EH_PE_sleb128 | DW_EH_PE_pcrel, "pcrel sleb128")
+  S(DW_EH_PE_sdata2 | DW_EH_PE_pcrel, "pcrel sdata2")
+  S(DW_EH_PE_sdata4 | DW_EH_PE_pcrel, "pcrel sdata4")
+  S(DW_EH_PE_sdata8 | DW_EH_PE_pcrel, "pcrel sdata8")
+
+  S(DW_EH_PE_absptr | DW_EH_PE_textrel, "textrel")
+  S(DW_EH_PE_uleb128 | DW_EH_PE_textrel, "textrel uleb128")
+  S(DW_EH_PE_udata2 | DW_EH_PE_textrel, "textrel udata2")
+  S(DW_EH_PE_udata4 | DW_EH_PE_textrel, "textrel udata4")
+  S(DW_EH_PE_udata8 | DW_EH_PE_textrel, "textrel udata8")
+  S(DW_EH_PE_sleb128 | DW_EH_PE_textrel, "textrel sleb128")
+  S(DW_EH_PE_sdata2 | DW_EH_PE_textrel, "textrel sdata2")
+  S(DW_EH_PE_sdata4 | DW_EH_PE_textrel, "textrel sdata4")
+  S(DW_EH_PE_sdata8 | DW_EH_PE_textrel, "textrel sdata8")
+
+  S(DW_EH_PE_absptr | DW_EH_PE_datarel, "datarel")
+  S(DW_EH_PE_uleb128 | DW_EH_PE_datarel, "datarel uleb128")
+  S(DW_EH_PE_udata2 | DW_EH_PE_datarel, "datarel udata2")
+  S(DW_EH_PE_udata4 | DW_EH_PE_datarel, "datarel udata4")
+  S(DW_EH_PE_udata8 | DW_EH_PE_datarel, "datarel udata8")
+  S(DW_EH_PE_sleb128 | DW_EH_PE_datarel, "datarel sleb128")
+  S(DW_EH_PE_sdata2 | DW_EH_PE_datarel, "datarel sdata2")
+  S(DW_EH_PE_sdata4 | DW_EH_PE_datarel, "datarel sdata4")
+  S(DW_EH_PE_sdata8 | DW_EH_PE_datarel, "datarel sdata8")
+
+  S(DW_EH_PE_absptr | DW_EH_PE_funcrel, "funcrel")
+  S(DW_EH_PE_uleb128 | DW_EH_PE_funcrel, "funcrel uleb128")
+  S(DW_EH_PE_udata2 | DW_EH_PE_funcrel, "funcrel udata2")
+  S(DW_EH_PE_udata4 | DW_EH_PE_funcrel, "funcrel udata4")
+  S(DW_EH_PE_udata8 | DW_EH_PE_funcrel, "funcrel udata8")
+  S(DW_EH_PE_sleb128 | DW_EH_PE_funcrel, "funcrel sleb128")
+  S(DW_EH_PE_sdata2 | DW_EH_PE_funcrel, "funcrel sdata2")
+  S(DW_EH_PE_sdata4 | DW_EH_PE_funcrel, "funcrel sdata4")
+  S(DW_EH_PE_sdata8 | DW_EH_PE_funcrel, "funcrel sdata8")
+
+  S(DW_EH_PE_indirect | DW_EH_PE_absptr | DW_EH_PE_pcrel,
+    "indirect pcrel")
+  S(DW_EH_PE_indirect | DW_EH_PE_uleb128 | DW_EH_PE_pcrel,
+    "indirect pcrel uleb128")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata2 | DW_EH_PE_pcrel,
+    "indirect pcrel udata2")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata4 | DW_EH_PE_pcrel,
+    "indirect pcrel udata4")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata8 | DW_EH_PE_pcrel,
+    "indirect pcrel udata8")
+  S(DW_EH_PE_indirect | DW_EH_PE_sleb128 | DW_EH_PE_pcrel,
+    "indirect pcrel sleb128")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata2 | DW_EH_PE_pcrel,
+    "indirect pcrel sdata2")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata4 | DW_EH_PE_pcrel,
+    "indirect pcrel sdata4")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata8 | DW_EH_PE_pcrel,
+    "indirect pcrel sdata8")
+
+  S(DW_EH_PE_indirect | DW_EH_PE_absptr | DW_EH_PE_textrel,
+    "indirect textrel")
+  S(DW_EH_PE_indirect | DW_EH_PE_uleb128 | DW_EH_PE_textrel,
+    "indirect textrel uleb128")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata2 | DW_EH_PE_textrel,
+    "indirect textrel udata2")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata4 | DW_EH_PE_textrel,
+    "indirect textrel udata4")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata8 | DW_EH_PE_textrel,
+    "indirect textrel udata8")
+  S(DW_EH_PE_indirect | DW_EH_PE_sleb128 | DW_EH_PE_textrel,
+    "indirect textrel sleb128")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata2 | DW_EH_PE_textrel,
+    "indirect textrel sdata2")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata4 | DW_EH_PE_textrel,
+    "indirect textrel sdata4")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata8 | DW_EH_PE_textrel,
+    "indirect textrel sdata8")
+
+  S(DW_EH_PE_indirect | DW_EH_PE_absptr | DW_EH_PE_datarel,
+    "indirect datarel")
+  S(DW_EH_PE_indirect | DW_EH_PE_uleb128 | DW_EH_PE_datarel,
+    "indirect datarel uleb128")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata2 | DW_EH_PE_datarel,
+    "indirect datarel udata2")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata4 | DW_EH_PE_datarel,
+    "indirect datarel udata4")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata8 | DW_EH_PE_datarel,
+    "indirect datarel udata8")
+  S(DW_EH_PE_indirect | DW_EH_PE_sleb128 | DW_EH_PE_datarel,
+    "indirect datarel sleb128")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata2 | DW_EH_PE_datarel,
+    "indirect datarel sdata2")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata4 | DW_EH_PE_datarel,
+    "indirect datarel sdata4")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata8 | DW_EH_PE_datarel,
+    "indirect datarel sdata8")
+
+  S(DW_EH_PE_indirect | DW_EH_PE_absptr | DW_EH_PE_funcrel,
+    "indirect funcrel")
+  S(DW_EH_PE_indirect | DW_EH_PE_uleb128 | DW_EH_PE_funcrel,
+    "indirect funcrel uleb128")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata2 | DW_EH_PE_funcrel,
+    "indirect funcrel udata2")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata4 | DW_EH_PE_funcrel,
+    "indirect funcrel udata4")
+  S(DW_EH_PE_indirect | DW_EH_PE_udata8 | DW_EH_PE_funcrel,
+    "indirect funcrel udata8")
+  S(DW_EH_PE_indirect | DW_EH_PE_sleb128 | DW_EH_PE_funcrel,
+    "indirect funcrel sleb128")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata2 | DW_EH_PE_funcrel,
+    "indirect funcrel sdata2")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata4 | DW_EH_PE_funcrel,
+    "indirect funcrel sdata4")
+  S(DW_EH_PE_indirect | DW_EH_PE_sdata8 | DW_EH_PE_funcrel,
+    "indirect funcrel sdata8")
+
+#if HAVE_DESIGNATED_INITIALIZERS
+  };
+
+  gcc_assert (format >= 0 && format < 0x100 && format_names[format]);
+  
+  return format_names[format];
+#else
+  }
+  gcc_unreachable ();
+#endif
+}
+
 /* Output an unsigned LEB128 quantity.  */
 
 void
-dw2_asm_output_data_uleb128 VPARAMS ((unsigned HOST_WIDE_INT value,
-				      const char *comment, ...))
+dw2_asm_output_data_uleb128 (unsigned HOST_WIDE_INT value,
+			     const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  unsigned HOST_WIDE_INT value;
-  const char *comment;
-#endif
   va_list ap;
 
-  VA_START (ap, comment);
-
-#ifndef ANSI_PROTOTYPES
-  value = va_arg (ap, unsigned HOST_WIDE_INT);
-  comment = va_arg (ap, const char *);
-#endif
+  va_start (ap, comment);
 
 #ifdef HAVE_AS_LEB128
-  fputs ("\t.uleb128\t", asm_out_file);
-  fprintf (asm_out_file, HOST_WIDE_INT_PRINT_HEX, value);
+  fprintf (asm_out_file, "\t.uleb128 " HOST_WIDE_INT_PRINT_HEX , value);
 
   if (flag_debug_asm && comment)
     {
@@ -408,8 +520,10 @@ dw2_asm_output_data_uleb128 VPARAMS ((unsigned HOST_WIDE_INT value,
 #else
   {
     unsigned HOST_WIDE_INT work = value;
+    const char *byte_op = targetm.asm_out.byte_op;
 
-    fputs (ASM_BYTE_OP, asm_out_file);
+    if (byte_op)
+      fputs (byte_op, asm_out_file);
     do
       {
 	int byte = (work & 0x7f);
@@ -418,16 +532,21 @@ dw2_asm_output_data_uleb128 VPARAMS ((unsigned HOST_WIDE_INT value,
 	  /* More bytes to follow.  */
 	  byte |= 0x80;
 
-	fprintf (asm_out_file, "0x%x", byte);
-	if (work != 0)
-	  fputc (',', asm_out_file);
+	if (byte_op)
+	  {
+	    fprintf (asm_out_file, "0x%x", byte);
+	    if (work != 0)
+	      fputc (',', asm_out_file);
+	  }
+	else
+	  assemble_integer (GEN_INT (byte), 1, BITS_PER_UNIT, 1);
       }
     while (work != 0);
 
   if (flag_debug_asm)
     {
-      fprintf (asm_out_file, "\t%s uleb128 ", ASM_COMMENT_START);
-      fprintf (asm_out_file, HOST_WIDE_INT_PRINT_HEX, value);
+      fprintf (asm_out_file, "\t%s uleb128 " HOST_WIDE_INT_PRINT_HEX,
+	       ASM_COMMENT_START, value);
       if (comment)
 	{
 	  fputs ("; ", asm_out_file);
@@ -441,28 +560,18 @@ dw2_asm_output_data_uleb128 VPARAMS ((unsigned HOST_WIDE_INT value,
   va_end (ap);
 }
 
-/* Output an signed LEB128 quantity.  */
+/* Output a signed LEB128 quantity.  */
 
 void
-dw2_asm_output_data_sleb128 VPARAMS ((HOST_WIDE_INT value,
-				      const char *comment, ...))
+dw2_asm_output_data_sleb128 (HOST_WIDE_INT value,
+			     const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  HOST_WIDE_INT value;
-  const char *comment;
-#endif
   va_list ap;
 
-  VA_START (ap, comment);
-
-#ifndef ANSI_PROTOTYPES
-  value = va_arg (ap, HOST_WIDE_INT);
-  comment = va_arg (ap, const char *);
-#endif
+  va_start (ap, comment);
 
 #ifdef HAVE_AS_LEB128
-  fputs ("\t.sleb128\t", asm_out_file);
-  fprintf (asm_out_file, HOST_WIDE_INT_PRINT_HEX, value);
+  fprintf (asm_out_file, "\t.sleb128 " HOST_WIDE_INT_PRINT_DEC, value);
 
   if (flag_debug_asm && comment)
     {
@@ -473,8 +582,10 @@ dw2_asm_output_data_sleb128 VPARAMS ((HOST_WIDE_INT value,
   {
     HOST_WIDE_INT work = value;
     int more, byte;
+    const char *byte_op = targetm.asm_out.byte_op;
 
-    fputs (ASM_BYTE_OP, asm_out_file);
+    if (byte_op)
+      fputs (byte_op, asm_out_file);
     do
       {
 	byte = (work & 0x7f);
@@ -485,16 +596,21 @@ dw2_asm_output_data_sleb128 VPARAMS ((HOST_WIDE_INT value,
 	if (more)
 	  byte |= 0x80;
 
-	fprintf (asm_out_file, "0x%x", byte);
-	if (more)
-	  fputc (',', asm_out_file);
+	if (byte_op)
+	  {
+	    fprintf (asm_out_file, "0x%x", byte);
+	    if (more)
+	      fputc (',', asm_out_file);
+	  }
+	else
+	  assemble_integer (GEN_INT (byte), 1, BITS_PER_UNIT, 1);
       }
     while (more);
 
   if (flag_debug_asm)
     {
-      fprintf (asm_out_file, "\t%s sleb128 ", ASM_COMMENT_START);
-      fprintf (asm_out_file, HOST_WIDE_INT_PRINT_DEC, value);
+      fprintf (asm_out_file, "\t%s sleb128 " HOST_WIDE_INT_PRINT_DEC,
+	       ASM_COMMENT_START, value);
       if (comment)
 	{
 	  fputs ("; ", asm_out_file);
@@ -509,31 +625,21 @@ dw2_asm_output_data_sleb128 VPARAMS ((HOST_WIDE_INT value,
 }
 
 void
-dw2_asm_output_delta_uleb128 VPARAMS ((const char *lab1 ATTRIBUTE_UNUSED,
-				       const char *lab2 ATTRIBUTE_UNUSED,
-				       const char *comment, ...))
+dw2_asm_output_delta_uleb128 (const char *lab1 ATTRIBUTE_UNUSED,
+			      const char *lab2 ATTRIBUTE_UNUSED,
+			      const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  const char *lab1, *lab2;
-  const char *comment;
-#endif
   va_list ap;
 
-  VA_START (ap, comment);
-
-#ifndef ANSI_PROTOTYPES
-  lab1 = va_arg (ap, const char *);
-  lab2 = va_arg (ap, const char *);
-  comment = va_arg (ap, const char *);
-#endif
+  va_start (ap, comment);
 
 #ifdef HAVE_AS_LEB128
-  fputs ("\t.uleb128\t", asm_out_file);
+  fputs ("\t.uleb128 ", asm_out_file);
   assemble_name (asm_out_file, lab1);
   fputc ('-', asm_out_file);
   assemble_name (asm_out_file, lab2);
 #else
-  abort ();
+  gcc_unreachable ();
 #endif
 
   if (flag_debug_asm && comment)
@@ -546,32 +652,24 @@ dw2_asm_output_delta_uleb128 VPARAMS ((const char *lab1 ATTRIBUTE_UNUSED,
   va_end (ap);
 }
 
+#if 0
+
 void
-dw2_asm_output_delta_sleb128 VPARAMS ((const char *lab1 ATTRIBUTE_UNUSED,
-				       const char *lab2 ATTRIBUTE_UNUSED,
-				       const char *comment, ...))
+dw2_asm_output_delta_sleb128 (const char *lab1 ATTRIBUTE_UNUSED,
+			      const char *lab2 ATTRIBUTE_UNUSED,
+			      const char *comment, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  const char *lab1, *lab2;
-  const char *comment;
-#endif
   va_list ap;
 
-  VA_START (ap, comment);
-
-#ifndef ANSI_PROTOTYPES
-  lab1 = va_arg (ap, const char *);
-  lab2 = va_arg (ap, const char *);
-  comment = va_arg (ap, const char *);
-#endif
+  va_start (ap, comment);
 
 #ifdef HAVE_AS_LEB128
-  fputs ("\t.sleb128\t", asm_out_file);
+  fputs ("\t.sleb128 ", asm_out_file);
   assemble_name (asm_out_file, lab1);
   fputc ('-', asm_out_file);
   assemble_name (asm_out_file, lab2);
 #else
-  abort ();
+  gcc_unreachable ();
 #endif
 
   if (flag_debug_asm && comment)
@@ -583,3 +681,196 @@ dw2_asm_output_delta_sleb128 VPARAMS ((const char *lab1 ATTRIBUTE_UNUSED,
 
   va_end (ap);
 }
+#endif /* 0 */
+
+static rtx dw2_force_const_mem (rtx);
+static int dw2_output_indirect_constant_1 (splay_tree_node, void *);
+
+static GTY((param1_is (char *), param2_is (tree))) splay_tree indirect_pool;
+
+static GTY(()) int dw2_const_labelno;
+
+#if defined(HAVE_GAS_HIDDEN) && defined(SUPPORTS_ONE_ONLY)
+# define USE_LINKONCE_INDIRECT 1
+#else
+# define USE_LINKONCE_INDIRECT 0
+#endif
+
+/* Put X, a SYMBOL_REF, in memory.  Return a SYMBOL_REF to the allocated
+   memory.  Differs from force_const_mem in that a single pool is used for
+   the entire unit of translation, and the memory is not guaranteed to be
+   "near" the function in any interesting sense.  */
+
+static rtx
+dw2_force_const_mem (rtx x)
+{
+  splay_tree_node node;
+  const char *str;
+  tree decl;
+
+  if (! indirect_pool)
+    indirect_pool = splay_tree_new_ggc (splay_tree_compare_pointers);
+
+  gcc_assert (GET_CODE (x) == SYMBOL_REF);
+
+  str = targetm.strip_name_encoding (XSTR (x, 0));
+  node = splay_tree_lookup (indirect_pool, (splay_tree_key) str);
+  if (node)
+    decl = (tree) node->value;
+  else
+    {
+      tree id;
+
+      if (USE_LINKONCE_INDIRECT)
+	{
+	  char *ref_name = alloca (strlen (str) + sizeof "DW.ref.");
+
+	  sprintf (ref_name, "DW.ref.%s", str);
+	  id = get_identifier (ref_name);
+	  decl = build_decl (VAR_DECL, id, ptr_type_node);
+	  DECL_ARTIFICIAL (decl) = 1;
+	  DECL_IGNORED_P (decl) = 1;
+	  TREE_PUBLIC (decl) = 1;
+	  DECL_INITIAL (decl) = decl;
+	  make_decl_one_only (decl);
+	}
+      else
+	{
+	  char label[32];
+
+	  ASM_GENERATE_INTERNAL_LABEL (label, "LDFCM", dw2_const_labelno);
+	  ++dw2_const_labelno;
+	  id = get_identifier (label);
+	  decl = build_decl (VAR_DECL, id, ptr_type_node);
+	  DECL_ARTIFICIAL (decl) = 1;
+	  DECL_IGNORED_P (decl) = 1;
+	  TREE_STATIC (decl) = 1;
+	  DECL_INITIAL (decl) = decl;
+	}
+
+      id = maybe_get_identifier (str);
+      if (id)
+	TREE_SYMBOL_REFERENCED (id) = 1;
+
+      splay_tree_insert (indirect_pool, (splay_tree_key) str,
+			 (splay_tree_value) decl);
+    }
+
+  return XEXP (DECL_RTL (decl), 0);
+}
+
+/* A helper function for dw2_output_indirect_constants called through
+   splay_tree_foreach.  Emit one queued constant to memory.  */
+
+static int
+dw2_output_indirect_constant_1 (splay_tree_node node,
+				void *data ATTRIBUTE_UNUSED)
+{
+  const char *sym;
+  rtx sym_ref;
+
+  sym = (const char *) node->key;
+  sym_ref = gen_rtx_SYMBOL_REF (Pmode, sym);
+  if (USE_LINKONCE_INDIRECT)
+    fprintf (asm_out_file, "\t.hidden %sDW.ref.%s\n", user_label_prefix, sym);
+  assemble_variable ((tree) node->value, 1, 1, 1);
+  assemble_integer (sym_ref, POINTER_SIZE / BITS_PER_UNIT, POINTER_SIZE, 1);
+
+  return 0;
+}
+
+/* Emit the constants queued through dw2_force_const_mem.  */
+
+void
+dw2_output_indirect_constants (void)
+{
+  if (indirect_pool)
+    splay_tree_foreach (indirect_pool, dw2_output_indirect_constant_1, NULL);
+}
+
+/* Like dw2_asm_output_addr_rtx, but encode the pointer as directed.  */
+
+void
+dw2_asm_output_encoded_addr_rtx (int encoding, rtx addr,
+				 const char *comment, ...)
+{
+  int size;
+  va_list ap;
+
+  va_start (ap, comment);
+
+  size = size_of_encoded_value (encoding);
+
+  if (encoding == DW_EH_PE_aligned)
+    {
+      assemble_align (POINTER_SIZE);
+      assemble_integer (addr, size, POINTER_SIZE, 1);
+      return;
+    }
+
+  /* NULL is _always_ represented as a plain zero, as is 1 for Ada's
+     "all others".  */
+  if (addr == const0_rtx || addr == const1_rtx)
+    assemble_integer (addr, size, BITS_PER_UNIT, 1);
+  else
+    {
+    restart:
+      /* Allow the target first crack at emitting this.  Some of the
+	 special relocations require special directives instead of
+	 just ".4byte" or whatever.  */
+#ifdef ASM_MAYBE_OUTPUT_ENCODED_ADDR_RTX
+      ASM_MAYBE_OUTPUT_ENCODED_ADDR_RTX (asm_out_file, encoding, size,
+					 addr, done);
+#endif
+
+      /* Indirection is used to get dynamic relocations out of a
+	 read-only section.  */
+      if (encoding & DW_EH_PE_indirect)
+	{
+	  /* It is very tempting to use force_const_mem so that we share data
+	     with the normal constant pool.  However, we've already emitted
+	     the constant pool for this function.  Moreover, we'd like to
+	     share these constants across the entire unit of translation,
+	     or better, across the entire application (or DSO).  */
+	  addr = dw2_force_const_mem (addr);
+	  encoding &= ~DW_EH_PE_indirect;
+	  goto restart;
+	}
+
+      switch (encoding & 0xF0)
+	{
+	case DW_EH_PE_absptr:
+	  dw2_assemble_integer (size, addr);
+	  break;
+
+	case DW_EH_PE_pcrel:
+	  gcc_assert (GET_CODE (addr) == SYMBOL_REF);
+#ifdef ASM_OUTPUT_DWARF_PCREL
+	  ASM_OUTPUT_DWARF_PCREL (asm_out_file, size, XSTR (addr, 0));
+#else
+	  dw2_assemble_integer (size, gen_rtx_MINUS (Pmode, addr, pc_rtx));
+#endif
+	  break;
+
+	default:
+	  /* Other encodings should have been handled by
+	     ASM_MAYBE_OUTPUT_ENCODED_ADDR_RTX.  */
+	  gcc_unreachable ();
+	}
+
+#ifdef ASM_MAYBE_OUTPUT_ENCODED_ADDR_RTX
+    done:;
+#endif
+    }
+
+  if (flag_debug_asm && comment)
+    {
+      fprintf (asm_out_file, "\t%s ", ASM_COMMENT_START);
+      vfprintf (asm_out_file, comment, ap);
+    }
+  fputc ('\n', asm_out_file);
+
+  va_end (ap);
+}
+
+#include "gt-dwarf2asm.h"