PR c++/40566

[pf3gnuchains/gcc-fork.git] / gcc / dwarf2asm.c

diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c
index 7e3fc82..4e2c998 100644 (file)
--- a/gcc/dwarf2asm.c
+++ b/gcc/dwarf2asm.c
@@ -29,7 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "output.h"
 #include "target.h"
 #include "dwarf2asm.h"
-#include "dwarf2.h"
+#include "elf/dwarf2.h"
 #include "splay-tree.h"
 #include "ggc.h"
 #include "tm_p.h"
@@ -52,7 +52,7 @@ dw2_assemble_integer (int size, rtx x)
   if (op)
     {
       fputs (op, asm_out_file);
-      if (GET_CODE (x) == CONST_INT)
+      if (CONST_INT_P (x))
        fprintf (asm_out_file, HOST_WIDE_INT_PRINT_HEX,
                 (unsigned HOST_WIDE_INT) INTVAL (x));
       else
@@ -871,7 +871,7 @@ dw2_output_indirect_constant_1 (splay_tree_node node,
   sym = (const char *) node->key;
   id = (tree) node->value;
 
-  decl = build_decl (VAR_DECL, id, ptr_type_node);
+  decl = build_decl (UNKNOWN_LOCATION, VAR_DECL, id, ptr_type_node);
   DECL_ARTIFICIAL (decl) = 1;
   DECL_IGNORED_P (decl) = 1;
   DECL_INITIAL (decl) = decl;
@@ -879,7 +879,7 @@ dw2_output_indirect_constant_1 (splay_tree_node node,
   if (TREE_PUBLIC (id))
     {
       TREE_PUBLIC (decl) = 1;
-      make_decl_one_only (decl);
+      make_decl_one_only (decl, DECL_ASSEMBLER_NAME (decl));
     }
   else
     TREE_STATIC (decl) = 1;