X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=gcc%2Fdwarf2asm.c;h=488e54b72ec659790591a30137a5577b290e07cc;hb=ac71c66c0f8f737601d34ee7eb813cdfacf83455;hp=1bbadc52b61e4a9154cbdd9a9a6156229b9c617c;hpb=67ce556b47830dd825524e8370969b814c355216;p=thirdparty%2Fgcc.git diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c index 1bbadc52b61e..488e54b72ec6 100644 --- a/gcc/dwarf2asm.c +++ b/gcc/dwarf2asm.c @@ -1,11 +1,11 @@ /* Dwarf2 assembler output helper routines. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001-2019 Free Software Foundation, Inc. This file is part of GCC. 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 +Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, but WITHOUT ANY @@ -14,30 +14,29 @@ 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 GCC; see the file COPYING. If not, write to the Free -Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301, USA. */ +along with GCC; see the file COPYING3. If not see +. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "flags.h" -#include "tree.h" +#include "target.h" #include "rtl.h" +#include "tree.h" +#include "memmodel.h" +#include "tm_p.h" +#include "stringpool.h" +#include "varasm.h" #include "output.h" -#include "target.h" #include "dwarf2asm.h" #include "dwarf2.h" -#include "splay-tree.h" -#include "ggc.h" -#include "tm_p.h" - +#include "function.h" +#include "emit-rtl.h" +#include "fold-const.h" -/* How to start an assembler comment. */ -#ifndef ASM_COMMENT_START -#define ASM_COMMENT_START ";#" +#ifndef XCOFF_DEBUGGING_INFO +#define XCOFF_DEBUGGING_INFO 0 #endif @@ -52,8 +51,8 @@ dw2_assemble_integer (int size, rtx x) if (op) { fputs (op, asm_out_file); - if (GET_CODE (x) == CONST_INT) - fprintf (asm_out_file, HOST_WIDE_INT_PRINT_HEX, INTVAL (x)); + if (CONST_INT_P (x)) + fprint_whex (asm_out_file, (unsigned HOST_WIDE_INT) INTVAL (x)); else output_addr_const (asm_out_file, x); } @@ -62,27 +61,62 @@ dw2_assemble_integer (int size, rtx x) } -/* Output an immediate constant in a given size. */ +/* Output a value of a given size in target byte order. */ + +void +dw2_asm_output_data_raw (int size, unsigned HOST_WIDE_INT value) +{ + unsigned char bytes[8]; + int i; + + for (i = 0; i < 8; ++i) + { + bytes[i] = value & 0xff; + value >>= 8; + } + + if (BYTES_BIG_ENDIAN) + { + for (i = size - 1; i > 0; --i) + fprintf (asm_out_file, "%#x,", bytes[i]); + fprintf (asm_out_file, "%#x", bytes[0]); + } + else + { + for (i = 0; i < size - 1; ++i) + fprintf (asm_out_file, "%#x,", bytes[i]); + fprintf (asm_out_file, "%#x", bytes[i]); + } +} + +/* Output an immediate constant in a given SIZE in bytes. */ void dw2_asm_output_data (int size, unsigned HOST_WIDE_INT value, const char *comment, ...) { va_list ap; + const char *op = integer_asm_op (size, FALSE); va_start (ap, comment); if (size * 8 < HOST_BITS_PER_WIDE_INT) - value &= ~(~(unsigned HOST_WIDE_INT) 0 << (size * 8)); + value &= ~(HOST_WIDE_INT_M1U << (size * 8)); - dw2_assemble_integer (size, GEN_INT (value)); + if (op) + { + fputs (op, asm_out_file); + fprint_whex (asm_out_file, value); + } + else + assemble_integer (GEN_INT (value), size, BITS_PER_UNIT, 1); if (flag_debug_asm && comment) { - fprintf (asm_out_file, "\t%s ", ASM_COMMENT_START); + fputs ("\t" ASM_COMMENT_START " ", asm_out_file); vfprintf (asm_out_file, comment, ap); } - fputc ('\n', asm_out_file); + putc ('\n', asm_out_file); va_end (ap); } @@ -119,14 +153,41 @@ dw2_asm_output_delta (int size, const char *lab1, const char *lab2, 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. */ +#ifdef ASM_OUTPUT_DWARF_VMS_DELTA +/* Output the difference between two symbols in instruction units + in a given size. */ + +void +dw2_asm_output_vms_delta (int size ATTRIBUTE_UNUSED, + const char *lab1, const char *lab2, + const char *comment, ...) +{ + va_list ap; + + va_start (ap, comment); + + ASM_OUTPUT_DWARF_VMS_DELTA (asm_out_file, size, lab1, lab2); + 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); +} +#endif + +/* Output a section-relative reference to a LABEL, which was placed in + BASE. 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_offset (int size, const char *label, + section *base ATTRIBUTE_UNUSED, const char *comment, ...) { va_list ap; @@ -134,7 +195,7 @@ dw2_asm_output_offset (int size, const char *label, va_start (ap, comment); #ifdef ASM_OUTPUT_DWARF_OFFSET - ASM_OUTPUT_DWARF_OFFSET (asm_out_file, size, label); + ASM_OUTPUT_DWARF_OFFSET (asm_out_file, size, label, 0, base); #else dw2_assemble_integer (size, gen_rtx_SYMBOL_REF (Pmode, label)); #endif @@ -149,6 +210,33 @@ dw2_asm_output_offset (int size, const char *label, va_end (ap); } +void +dw2_asm_output_offset (int size, const char *label, HOST_WIDE_INT offset, + section *base ATTRIBUTE_UNUSED, + const char *comment, ...) +{ + va_list ap; + + va_start (ap, comment); + +#ifdef ASM_OUTPUT_DWARF_OFFSET + ASM_OUTPUT_DWARF_OFFSET (asm_out_file, size, label, offset, base); +#else + dw2_assemble_integer (size, gen_rtx_PLUS (Pmode, + gen_rtx_SYMBOL_REF (Pmode, label), + gen_int_mode (offset, Pmode))); +#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); +} + #if 0 /* Output a self-relative reference to a label, possibly in a @@ -233,7 +321,7 @@ dw2_asm_output_addr_rtx (int size, rtx addr, 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 (const char *str, size_t orig_len, const char *comment, ...) @@ -250,13 +338,19 @@ dw2_asm_output_nstring (const char *str, size_t orig_len, if (flag_debug_asm && comment) { - fputs ("\t.ascii \"", asm_out_file); + if (XCOFF_DEBUGGING_INFO) + fputs ("\t.byte \"", asm_out_file); + else + fputs ("\t.ascii \"", asm_out_file); + for (i = 0; i < len; i++) { int c = str[i]; - if (c == '\"' || c == '\\') + if (c == '\"') + fputc (XCOFF_DEBUGGING_INFO ? '\"' : '\\', asm_out_file); + else if (c == '\\') fputc ('\\', asm_out_file); - if (ISPRINT(c)) + if (ISPRINT (c)) fputc (c, asm_out_file); else fprintf (asm_out_file, "\\%o", c); @@ -329,7 +423,7 @@ size_of_encoded_value (int encoding) switch (encoding & 0x07) { case DW_EH_PE_absptr: - return POINTER_SIZE / BITS_PER_UNIT; + return POINTER_SIZE_UNITS; case DW_EH_PE_udata2: return 2; case DW_EH_PE_udata4: @@ -411,6 +505,8 @@ eh_data_format_name (int format) 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, "indirect absolute") + 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, @@ -491,7 +587,7 @@ eh_data_format_name (int format) }; gcc_assert (format >= 0 && format < 0x100 && format_names[format]); - + return format_names[format]; #else } @@ -499,6 +595,26 @@ eh_data_format_name (int format) #endif } +/* Output an unsigned LEB128 quantity, but only the byte values. */ + +void +dw2_asm_output_data_uleb128_raw (unsigned HOST_WIDE_INT value) +{ + while (1) + { + int byte = (value & 0x7f); + value >>= 7; + if (value != 0) + /* More bytes to follow. */ + byte |= 0x80; + + fprintf (asm_out_file, "%#x", byte); + if (value == 0) + break; + fputc (',', asm_out_file); + } +} + /* Output an unsigned LEB128 quantity. */ void @@ -509,57 +625,83 @@ dw2_asm_output_data_uleb128 (unsigned HOST_WIDE_INT value, va_start (ap, comment); -#ifdef HAVE_AS_LEB128 - fprintf (asm_out_file, "\t.uleb128 " HOST_WIDE_INT_PRINT_HEX , value); - - if (flag_debug_asm && comment) + if (HAVE_AS_LEB128) { - fprintf (asm_out_file, "\t%s ", ASM_COMMENT_START); - vfprintf (asm_out_file, comment, ap); - } -#else - { - unsigned HOST_WIDE_INT work = value; - const char *byte_op = targetm.asm_out.byte_op; - - if (byte_op) - fputs (byte_op, asm_out_file); - do - { - int byte = (work & 0x7f); - work >>= 7; - if (work != 0) - /* More bytes to follow. */ - byte |= 0x80; - - 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 " HOST_WIDE_INT_PRINT_HEX, - ASM_COMMENT_START, value); - if (comment) + fputs ("\t.uleb128 ", asm_out_file); + fprint_whex (asm_out_file, value); + + if (flag_debug_asm && comment) { - fputs ("; ", asm_out_file); + fprintf (asm_out_file, "\t%s ", ASM_COMMENT_START); vfprintf (asm_out_file, comment, ap); } } - } -#endif - fputc ('\n', asm_out_file); + else + { + unsigned HOST_WIDE_INT work = value; + const char *byte_op = targetm.asm_out.byte_op; + + if (byte_op) + fputs (byte_op, asm_out_file); + do + { + int byte = (work & 0x7f); + work >>= 7; + if (work != 0) + /* More bytes to follow. */ + byte |= 0x80; + + if (byte_op) + { + fprintf (asm_out_file, "%#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 " HOST_WIDE_INT_PRINT_HEX, + ASM_COMMENT_START, value); + if (comment) + { + fputs ("; ", asm_out_file); + vfprintf (asm_out_file, comment, ap); + } + } + } + + putc ('\n', asm_out_file); va_end (ap); } +/* Output an signed LEB128 quantity, but only the byte values. */ + +void +dw2_asm_output_data_sleb128_raw (HOST_WIDE_INT value) +{ + int byte, more; + + while (1) + { + byte = (value & 0x7f); + value >>= 7; + more = !((value == 0 && (byte & 0x40) == 0) + || (value == -1 && (byte & 0x40) != 0)); + if (more) + byte |= 0x80; + + fprintf (asm_out_file, "%#x", byte); + if (!more) + break; + fputc (',', asm_out_file); + } +} + /* Output a signed LEB128 quantity. */ void @@ -570,55 +712,86 @@ dw2_asm_output_data_sleb128 (HOST_WIDE_INT value, va_start (ap, comment); + if (HAVE_AS_LEB128) + { + fprintf (asm_out_file, "\t.sleb128 " HOST_WIDE_INT_PRINT_DEC, value); + + if (flag_debug_asm && comment) + { + fprintf (asm_out_file, "\t%s ", ASM_COMMENT_START); + vfprintf (asm_out_file, comment, ap); + } + } + else + { + HOST_WIDE_INT work = value; + int more, byte; + const char *byte_op = targetm.asm_out.byte_op; + + if (byte_op) + fputs (byte_op, asm_out_file); + do + { + byte = (work & 0x7f); + /* arithmetic shift */ + work >>= 7; + more = !((work == 0 && (byte & 0x40) == 0) + || (work == -1 && (byte & 0x40) != 0)); + if (more) + byte |= 0x80; + + if (byte_op) + { + fprintf (asm_out_file, "%#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 " HOST_WIDE_INT_PRINT_DEC, + ASM_COMMENT_START, value); + if (comment) + { + fputs ("; ", asm_out_file); + vfprintf (asm_out_file, comment, ap); + } + } + } + + fputc ('\n', asm_out_file); + + va_end (ap); +} + +/* Output symbol LAB1 as an unsigned LEB128 quantity. LAB1 should be + an assembler-computed constant, e.g. a view number, because we + can't have relocations in LEB128 quantities. */ + +void +dw2_asm_output_symname_uleb128 (const char *lab1 ATTRIBUTE_UNUSED, + const char *comment, ...) +{ + va_list ap; + + va_start (ap, comment); + #ifdef HAVE_AS_LEB128 - fprintf (asm_out_file, "\t.sleb128 " HOST_WIDE_INT_PRINT_DEC, value); + fputs ("\t.uleb128 ", asm_out_file); + assemble_name (asm_out_file, lab1); +#else + gcc_unreachable (); +#endif if (flag_debug_asm && comment) { fprintf (asm_out_file, "\t%s ", ASM_COMMENT_START); vfprintf (asm_out_file, comment, ap); } -#else - { - HOST_WIDE_INT work = value; - int more, byte; - const char *byte_op = targetm.asm_out.byte_op; - - if (byte_op) - fputs (byte_op, asm_out_file); - do - { - byte = (work & 0x7f); - /* arithmetic shift */ - work >>= 7; - more = !((work == 0 && (byte & 0x40) == 0) - || (work == -1 && (byte & 0x40) != 0)); - if (more) - byte |= 0x80; - - 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 " HOST_WIDE_INT_PRINT_DEC, - ASM_COMMENT_START, value); - if (comment) - { - fputs ("; ", asm_out_file); - vfprintf (asm_out_file, comment, ap); - } - } - } -#endif fputc ('\n', asm_out_file); va_end (ap); @@ -633,14 +806,22 @@ dw2_asm_output_delta_uleb128 (const char *lab1 ATTRIBUTE_UNUSED, va_start (ap, comment); -#ifdef HAVE_AS_LEB128 + gcc_assert (HAVE_AS_LEB128); + fputs ("\t.uleb128 ", asm_out_file); assemble_name (asm_out_file, lab1); - fputc ('-', asm_out_file); - assemble_name (asm_out_file, lab2); -#else - gcc_unreachable (); -#endif + putc ('-', asm_out_file); + /* dwarf2out.c might give us a label expression (e.g. .LVL548-1) + as second argument. If so, make it a subexpression, to make + sure the substraction is done in the right order. */ + if (strchr (lab2, '-') != NULL) + { + putc ('(', asm_out_file); + assemble_name (asm_out_file, lab2); + putc (')', asm_out_file); + } + else + assemble_name (asm_out_file, lab2); if (flag_debug_asm && comment) { @@ -663,14 +844,12 @@ dw2_asm_output_delta_sleb128 (const char *lab1 ATTRIBUTE_UNUSED, va_start (ap, comment); -#ifdef HAVE_AS_LEB128 + gcc_assert (HAVE_AS_LEB128); + fputs ("\t.sleb128 ", asm_out_file); assemble_name (asm_out_file, lab1); - fputc ('-', asm_out_file); + putc ('-', asm_out_file); assemble_name (asm_out_file, lab2); -#else - gcc_unreachable (); -#endif if (flag_debug_asm && comment) { @@ -683,56 +862,75 @@ dw2_asm_output_delta_sleb128 (const char *lab1 ATTRIBUTE_UNUSED, } #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(()) hash_map *indirect_pool; static GTY(()) int dw2_const_labelno; -#if defined(HAVE_GAS_HIDDEN) && defined(SUPPORTS_ONE_ONLY) -# define USE_LINKONCE_INDIRECT 1 +#if defined(HAVE_GAS_HIDDEN) +# define USE_LINKONCE_INDIRECT (SUPPORTS_ONE_ONLY && !XCOFF_DEBUGGING_INFO) #else # define USE_LINKONCE_INDIRECT 0 #endif +/* Compare two std::pair by their first element. + Returns <0, 0, or + >0 to indicate whether K1 is less than, equal to, or greater than + K2, respectively. */ + +static int +compare_strings (const void *a, const void *b) +{ + const char *s1 = ((const std::pair *) a)->first; + const char *s2 = ((const std::pair *) b)->first; + int ret; + + if (s1 == s2) + return 0; + + ret = strcmp (s1, s2); + + /* The strings are always those from IDENTIFIER_NODEs, and, + therefore, we should never have two copies of the same + string. */ + gcc_assert (ret); + + return ret; +} + /* 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. */ + "near" the function in any interesting sense. IS_PUBLIC controls whether + the symbol can be shared across the entire application (or DSO). */ -static rtx -dw2_force_const_mem (rtx x) +rtx +dw2_force_const_mem (rtx x, bool is_public) { - splay_tree_node node; - const char *str; - tree decl; + const char *key; + tree decl_id; if (! indirect_pool) - indirect_pool = splay_tree_new_ggc (splay_tree_compare_pointers); + indirect_pool = hash_map::create_ggc (64); 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; + key = XSTR (x, 0); + tree *slot = indirect_pool->get (key); + if (slot) + decl_id = *slot; else { tree id; + const char *str = targetm.strip_name_encoding (key); - if (USE_LINKONCE_INDIRECT) + if (is_public && USE_LINKONCE_INDIRECT) { - char *ref_name = alloca (strlen (str) + sizeof "DW.ref."); + char *ref_name = XALLOCAVEC (char, 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); + gcc_assert (!maybe_get_identifier (ref_name)); + decl_id = get_identifier (ref_name); + TREE_PUBLIC (decl_id) = 1; } else { @@ -740,41 +938,63 @@ dw2_force_const_mem (rtx x) 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; + gcc_assert (!maybe_get_identifier (label)); + decl_id = get_identifier (label); } 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); + indirect_pool->put (key, decl_id); } - return XEXP (DECL_RTL (decl), 0); + return gen_rtx_SYMBOL_REF (Pmode, IDENTIFIER_POINTER (decl_id)); } -/* A helper function for dw2_output_indirect_constants called through - splay_tree_foreach. Emit one queued constant to memory. */ +/* A helper function for dw2_output_indirect_constants. Emit one queued + constant to memory. */ static int -dw2_output_indirect_constant_1 (splay_tree_node node, - void *data ATTRIBUTE_UNUSED) +dw2_output_indirect_constant_1 (const char *sym, tree id) { - const char *sym; rtx sym_ref; + tree decl; + + decl = build_decl (UNKNOWN_LOCATION, VAR_DECL, id, ptr_type_node); + SET_DECL_ASSEMBLER_NAME (decl, id); + DECL_ARTIFICIAL (decl) = 1; + DECL_IGNORED_P (decl) = 1; + DECL_INITIAL (decl) = build_fold_addr_expr (decl); + TREE_READONLY (decl) = 1; + TREE_STATIC (decl) = 1; + + if (TREE_PUBLIC (id)) + { + TREE_PUBLIC (decl) = 1; + make_decl_one_only (decl, DECL_ASSEMBLER_NAME (decl)); + if (USE_LINKONCE_INDIRECT) + DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN; + } - 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); + /* Disable ASan for decl because redzones cause ABI breakage between GCC and + libstdc++ for `.LDFCM*' variables. See PR 78651 for details. */ + unsigned int save_flag_sanitize = flag_sanitize; + flag_sanitize &= ~(SANITIZE_ADDRESS | SANITIZE_USER_ADDRESS + | SANITIZE_KERNEL_ADDRESS); + /* And also temporarily disable -fsection-anchors. These indirect constants + are never referenced from code, so it doesn't make any sense to aggregate + them in blocks. */ + int save_flag_section_anchors = flag_section_anchors; + flag_section_anchors = 0; + assemble_variable (decl, 1, 1, 1); + flag_section_anchors = save_flag_section_anchors; + flag_sanitize = save_flag_sanitize; + assemble_integer (sym_ref, POINTER_SIZE_UNITS, POINTER_SIZE, 1); + /* The following is a hack recognized by use_blocks_for_decl_p to disable + section anchor handling of the decl. */ + DECL_INITIAL (decl) = decl; return 0; } @@ -784,14 +1004,26 @@ dw2_output_indirect_constant_1 (splay_tree_node node, void dw2_output_indirect_constants (void) { - if (indirect_pool) - splay_tree_foreach (indirect_pool, dw2_output_indirect_constant_1, NULL); + if (!indirect_pool) + return; + + auto_vec > temp (indirect_pool->elements ()); + for (hash_map::iterator iter = indirect_pool->begin (); + iter != indirect_pool->end (); ++iter) + temp.quick_push (*iter); + + temp.qsort (compare_strings); + + for (unsigned int i = 0; i < temp.length (); i++) + dw2_output_indirect_constant_1 (temp[i].first, temp[i].second); } -/* Like dw2_asm_output_addr_rtx, but encode the pointer as directed. */ +/* Like dw2_asm_output_addr_rtx, but encode the pointer as directed. + If PUBLIC is set and the encoding is DW_EH_PE_indirect, the indirect + reference is shared across the entire application (or DSO). */ void -dw2_asm_output_encoded_addr_rtx (int encoding, rtx addr, +dw2_asm_output_encoded_addr_rtx (int encoding, rtx addr, bool is_public, const char *comment, ...) { int size; @@ -805,6 +1037,7 @@ dw2_asm_output_encoded_addr_rtx (int encoding, rtx addr, { assemble_align (POINTER_SIZE); assemble_integer (addr, size, POINTER_SIZE, 1); + va_end (ap); return; } @@ -830,9 +1063,9 @@ dw2_asm_output_encoded_addr_rtx (int encoding, rtx addr, /* 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); + share these constants across the entire unit of translation and + even, if possible, across the entire application (or DSO). */ + addr = dw2_force_const_mem (addr, is_public); encoding &= ~DW_EH_PE_indirect; goto restart; } @@ -843,6 +1076,13 @@ dw2_asm_output_encoded_addr_rtx (int encoding, rtx addr, dw2_assemble_integer (size, addr); break; +#ifdef ASM_OUTPUT_DWARF_DATAREL + case DW_EH_PE_datarel: + gcc_assert (GET_CODE (addr) == SYMBOL_REF); + ASM_OUTPUT_DWARF_DATAREL (asm_out_file, size, XSTR (addr, 0)); + break; +#endif + case DW_EH_PE_pcrel: gcc_assert (GET_CODE (addr) == SYMBOL_REF); #ifdef ASM_OUTPUT_DWARF_PCREL