public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/marxin/heads/casm-refactoring-v3)] Come up with casm global state.
@ 2021-10-21 7:51 Martin Liska
0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2021-10-21 7:51 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:0e7184584d23c29be113e9f62cd5a4255cc0c3bb
commit 0e7184584d23c29be113e9f62cd5a4255cc0c3bb
Author: Martin Liska <mliska@suse.cz>
Date: Tue Sep 7 13:32:57 2021 +0200
Come up with casm global state.
gcc/ChangeLog:
* output.h (struct asm_out_state): New struct that replaces a
couple of global variables.
* ggc-common.c (gt_pch_restore): Skip overwrite of
casm->out_file as it may be overwritten by PCH.
* doc/tm.texi: Document new usage of casm.
* doc/tm.texi.in: Likewise.
* varasm.c: Delete unused global variables.
(handle_vtv_comdat_section): Use new casm.
(struct section_hasher): Likewise.
(GTY): Likewise.
(get_section): Likewise.
(asm_output_aligned_bss): Likewise.
(hot_function_section): Likewise.
(current_function_section): Likewise.
(switch_to_other_text_partition): Likewise.
(default_function_rodata_section): Likewise.
(default_no_function_rodata_section): Likewise.
(mergeable_string_section): Likewise.
(mergeable_constant_section): Likewise.
(get_variable_section): Likewise.
(default_dtor_section_asm_out_destructor): Likewise.
(default_ctor_section_asm_out_constructor): Likewise.
(decide_function_section): Likewise.
(assemble_start_function): Likewise.
(assemble_end_function): Likewise.
(assemble_string): Likewise.
(output_constant_pool_1): Likewise.
(init_varasm_once): Likewise.
(have_global_bss_p): Likewise.
(default_select_section): Likewise.
(default_elf_select_section): Likewise.
(default_select_rtx_section): Likewise.
(switch_to_section): Likewise.
(get_section_anchor): Likewise.
* cgraphunit.c (symbol_table::compile): Likewise.
* config/aarch64/aarch64.c (aarch64_sls_emit_blr_function_thunks): Likewise.
* config/aarch64/aarch64.h (TRAMPOLINE_SECTION): Likewise.
* config/alpha/alpha.c (alpha_elf_select_rtx_section): Likewise.
(alpha_write_linkage): Likewise.
(vms_asm_out_constructor): Likewise.
(vms_asm_out_destructor): Likewise.
* config/alpha/elf.h: Likewise.
* config/arc/arc.c (arc_asm_output_aligned_decl_local): Likewise.
* config/arm/aout.h (ASM_OUTPUT_ALIGNED_LOCAL): Likewise.
* config/arm/arm.c (get_jump_table_size): Likewise.
(arm_elf_asm_cdtor): Likewise.
(thumb_call_via_reg): Likewise.
(arm_file_end): Likewise.
* config/arm/arm.h (ARM_GE_BITS_READ): Likewise.
* config/arm/unknown-elf.h: Likewise.
* config/avr/avr.c (avr_asm_asm_output_aligned_bss): Likewise.
(avr_output_data_section_asm_op): Likewise.
(avr_output_addr_vec): Likewise.
* config/bfin/bfin.h: Likewise.
* config/c6x/c6x.c (c6x_select_rtx_section): Likewise.
(c6x_asm_init_sections): Likewise.
* config/c6x/c6x.h: Likewise.
* config/csky/csky.c (get_csky_jump_table_size): Likewise.
* config/darwin.c (output_objc_section_asm_op): Likewise.
(DEF_SECTION): Likewise.
(machopic_output_data_section_indirection): Likewise.
(darwin_mergeable_string_section): Likewise.
(darwin_mergeable_constant_section): Likewise.
(darwin_objc2_section): Likewise.
(machopic_select_section): Likewise.
(fprintf): Likewise.
(darwin_asm_declare_constant_name): Likewise.
(darwin_emit_weak_or_comdat): Likewise.
(darwin_emit_objc_zeroed): Likewise.
(darwin_emit_local_bss): Likewise.
(darwin_emit_common): Likewise.
* config/frv/frv.c (frv_asm_out_constructor): Likewise.
(frv_asm_out_destructor): Likewise.
* config/frv/frv.h: Likewise.
* config/ft32/ft32.h (ASM_OUTPUT_SYMBOL_REF): Likewise.
* config/i386/cygming.h (drectve_section): Likewise.
* config/i386/darwin.h: Likewise.
* config/i386/i386.c (x86_output_aligned_bss): Likewise.
(output_indirect_thunk_function): Likewise.
(ix86_code_end): Likewise.
* config/i386/sol2.h: Likewise.
* config/i386/winnt.c (i386_pe_seh_init_sections): Likewise.
* config/ia64/ia64.c (ia64_asm_init_sections): Likewise.
(ia64_select_rtx_section): Likewise.
* config/ia64/sysv4.h: Likewise.
* config/lm32/lm32.h: Likewise.
* config/m32r/m32r.h: Likewise.
* config/mcore/mcore-elf.h: Likewise.
* config/microblaze/microblaze.c (microblaze_elf_asm_cdtor): Likewise.
(microblaze_select_section): Likewise.
* config/microblaze/microblaze.h: Likewise.
* config/mips/mips.c (mips_output_aligned_decl_common): Likewise.
* config/mmix/mmix.c (mmix_file_start): Likewise.
(mmix_file_end): Likewise.
(mmix_asm_output_aligned_local): Likewise.
* config/msp430/msp430.c (msp430_select_section): Likewise.
* config/nios2/nios2.h: Likewise.
* config/pa/pa.c (pa_output_function_epilogue): Likewise.
(output_deferred_profile_counters): Likewise.
(output_deferred_plabels): Likewise.
(pa_asm_output_mi_thunk): Likewise.
(pa_asm_output_aligned_bss): Likewise.
(pa_asm_output_aligned_common): Likewise.
(pa_asm_output_aligned_local): Likewise.
(som_output_text_section_asm_op): Likewise.
(som_output_comdat_data_section_asm_op): Likewise.
(pa_som_asm_init_sections): Likewise.
(pa_select_section): Likewise.
(pa_function_section): Likewise.
* config/pdp11/pdp11.c (pdp11_asm_output_var): Likewise.
(pdp11_asm_init_sections): Likewise.
* config/pru/pru.h: Likewise.
* config/riscv/riscv.c (riscv_elf_select_rtx_section): Likewise.
* config/rl78/rl78.c (rl78_select_section): Likewise.
(rl78_asm_ctor_dtor): Likewise.
* config/rs6000/rs6000.c (rs6000_assemble_integer): Likewise.
(rs6000_elf_file_end): Likewise.
(rs6000_xcoff_asm_init_sections): Likewise.
(rs6000_xcoff_select_section): Likewise.
(rs6000_xcoff_file_start): Likewise.
(rs6000_xcoff_file_end): Likewise.
(rs6000_xcoff_visibility): Likewise.
(rs6000_xcoff_declare_function_name): Likewise.
(rs6000_xcoff_asm_output_aligned_decl_common): Likewise.
* config/rs6000/sysv4.h: Likewise.
* config/rx/rx.c (rx_select_rtx_section): Likewise.
(rx_select_section): Likewise.
(rx_elf_asm_cdtor): Likewise.
* config/s390/s390.c (s390_output_indirect_thunk_function): Likewise.
* config/sh/sh.c (sh_file_start): Likewise.
* config/sparc/sol2.h (host_detect_local_cpu): Likewise.
* config/sparc/sparc.c (sparc_file_end): Likewise.
* config/tilegx/tilegx.h (TRAMPOLINE_SECTION): Likewise.
* config/tilepro/tilepro.h (TRAMPOLINE_SECTION): Likewise.
* config/v850/v850.c (v850_output_aligned_bss): Likewise.
(v850_select_section): Likewise.
* config/visium/visium.h: Likewise.
* dbxout.c (dbxout_function_end): Likewise.
(dbxout_init): Likewise.
(dbxout_source_file): Likewise.
(dbxout_switch_text_section): Likewise.
(dbxout_block): Likewise.
* dwarf2out.c (switch_to_eh_frame_section): Likewise.
(dwarf2out_begin_prologue): Likewise.
(dwarf2out_switch_text_section): Likewise.
(secname_for_decl): Likewise.
(dw_loc_list): Likewise.
(set_cur_line_info_table): Likewise.
(dwarf2out_begin_function): Likewise.
(dwarf2out_assembly_start): Likewise.
(dwarf2out_finish): Likewise.
(dwarf2out_early_finish): Likewise.
* dwarf2out.h (struct dw_fde_node): Likewise.
* except.c (switch_to_exception_section): Likewise.
* final.c (shorten_branches): Likewise.
(profile_function): Likewise.
(final_scan_insn_1): Likewise.
* langhooks.c (lhd_begin_section): Likewise.
* vmsdbgout.c (vmsdbgout_finish): Likewise.
* run-rtl-passes.c (run_rtl_passes): Likewise.
* targhooks.c (default_print_patchable_function_entry_1): Likewise.
* toplev.c (init_asm_output): Likewise.
(general_init): Likewise.
(finalize): Likewise.
Diff:
---
gcc/cgraphunit.c | 2 +-
gcc/config/aarch64/aarch64.c | 2 +-
gcc/config/aarch64/aarch64.h | 2 +-
gcc/config/alpha/alpha.c | 12 +--
gcc/config/alpha/elf.h | 4 +-
gcc/config/arc/arc.c | 2 +-
gcc/config/arm/aout.h | 2 +-
gcc/config/arm/arm.c | 14 +--
gcc/config/arm/arm.h | 2 +-
gcc/config/arm/unknown-elf.h | 4 +-
gcc/config/avr/avr.c | 12 +--
gcc/config/bfin/bfin.h | 2 +-
gcc/config/c6x/c6x.c | 4 +-
gcc/config/c6x/c6x.h | 4 +-
gcc/config/csky/csky.c | 2 +-
gcc/config/darwin.c | 66 ++++++------
gcc/config/frv/frv.c | 4 +-
gcc/config/frv/frv.h | 2 +-
gcc/config/ft32/ft32.h | 6 +-
gcc/config/i386/cygming.h | 2 +-
gcc/config/i386/darwin.h | 2 +-
gcc/config/i386/i386.c | 6 +-
gcc/config/i386/sol2.h | 6 +-
gcc/config/i386/winnt.c | 2 +-
gcc/config/ia64/ia64.c | 4 +-
gcc/config/ia64/sysv4.h | 4 +-
gcc/config/lm32/lm32.h | 8 +-
gcc/config/m32r/m32r.h | 2 +-
gcc/config/mcore/mcore-elf.h | 4 +-
gcc/config/microblaze/microblaze.c | 6 +-
gcc/config/microblaze/microblaze.h | 8 +-
gcc/config/mips/mips.c | 2 +-
gcc/config/mmix/mmix.c | 6 +-
gcc/config/msp430/msp430.c | 8 +-
gcc/config/nios2/nios2.h | 4 +-
gcc/config/pa/pa.c | 34 +++----
gcc/config/pdp11/pdp11.c | 6 +-
gcc/config/pru/pru.h | 2 +-
gcc/config/riscv/riscv.c | 4 +-
gcc/config/rl78/rl78.c | 12 +--
gcc/config/rs6000/rs6000.c | 24 ++---
gcc/config/rs6000/sysv4.h | 2 +-
gcc/config/rx/rx.c | 12 +--
gcc/config/s390/s390.c | 2 +-
gcc/config/sh/sh.c | 2 +-
gcc/config/sparc/sol2.h | 6 +-
gcc/config/sparc/sparc.c | 2 +-
gcc/config/tilegx/tilegx.h | 2 +-
gcc/config/tilepro/tilepro.h | 2 +-
gcc/config/v850/v850.c | 10 +-
gcc/config/visium/visium.h | 4 +-
gcc/dbxout.c | 20 ++--
gcc/doc/tm.texi | 14 +--
gcc/doc/tm.texi.in | 14 +--
gcc/dwarf2out.c | 56 +++++------
gcc/dwarf2out.h | 4 +-
gcc/except.c | 12 +--
gcc/final.c | 24 ++---
gcc/ggc-common.c | 7 ++
gcc/langhooks.c | 4 +-
gcc/output.h | 93 +++++++++++++----
gcc/run-rtl-passes.c | 2 +-
gcc/targhooks.c | 2 +-
gcc/toplev.c | 38 +++----
gcc/varasm.c | 199 ++++++++++++++-----------------------
gcc/vmsdbgout.c | 2 +-
66 files changed, 425 insertions(+), 414 deletions(-)
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 55cb0347149..773ca4fb27d 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -2309,7 +2309,7 @@ symbol_table::compile (void)
timevar_pop (TV_CGRAPHOPT);
/* Output everything. */
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
(*debug_hooks->assembly_start) ();
if (!quiet_flag)
fprintf (stderr, "Assembling functions:\n");
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 699c105a42a..b5bccdcfb88 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -25753,7 +25753,7 @@ aarch64_sls_emit_blr_function_thunks (FILE *out_file)
would happen in a different section -- leaving an unmatched
`.cfi_startproc` in the cold text section and an unmatched `.cfi_endproc`
in the standard text section. */
- section *save_text_section = in_section;
+ section *save_text_section = casm->in_section;
switch_to_section (function_section (current_function_decl));
for (int regnum = 0; regnum < 30; ++regnum)
{
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
index 2792bb29adb..8cb6a184bdc 100644
--- a/gcc/config/aarch64/aarch64.h
+++ b/gcc/config/aarch64/aarch64.h
@@ -1138,7 +1138,7 @@ typedef struct
/* Put trampolines in the text section so that mapping symbols work
correctly. */
-#define TRAMPOLINE_SECTION text_section
+#define TRAMPOLINE_SECTION casm->sec.text
/* To start with. */
#define BRANCH_COST(SPEED_P, PREDICTABLE_P) \
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index fced7ceefe2..cdf32ae37f4 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -8055,13 +8055,13 @@ alpha_start_function (FILE *file, const char *fnname,
#ifdef TARGET_VMS_CRASH_DEBUG
/* Support of minimal traceback info. */
- switch_to_section (readonly_data_section);
+ switch_to_section (casm->sec.readonly_data);
fprintf (file, "\t.align 3\n");
assemble_name (file, fnname); fputs ("..na:\n", file);
fputs ("\t.ascii \"", file);
assemble_name (file, fnname);
fputs ("\\0\"\n", file);
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
#endif
#endif /* TARGET_ABI_OPEN_VMS */
}
@@ -9446,7 +9446,7 @@ alpha_elf_select_rtx_section (machine_mode mode, rtx x,
{
if (TARGET_SMALL_DATA && GET_MODE_SIZE (mode) <= g_switch_value)
/* ??? Consider using mergeable sdata sections. */
- return sdata_section;
+ return casm->sec.sdata;
else
return default_elf_select_rtx_section (mode, x, align);
}
@@ -9613,7 +9613,7 @@ alpha_write_linkage (FILE *stream, const char *funname)
{
fprintf (stream, "\t.link\n");
fprintf (stream, "\t.align 3\n");
- in_section = NULL;
+ casm->in_section = NULL;
#ifdef TARGET_VMS_CRASH_DEBUG
fputs ("\t.name ", stream);
@@ -9665,7 +9665,7 @@ vms_asm_named_section (const char *name, unsigned int flags,
static void
vms_asm_out_constructor (rtx symbol, int priority ATTRIBUTE_UNUSED)
{
- switch_to_section (ctors_section);
+ switch_to_section (casm->sec.ctors);
assemble_align (BITS_PER_WORD);
assemble_integer (symbol, UNITS_PER_WORD, BITS_PER_WORD, 1);
}
@@ -9673,7 +9673,7 @@ vms_asm_out_constructor (rtx symbol, int priority ATTRIBUTE_UNUSED)
static void
vms_asm_out_destructor (rtx symbol, int priority ATTRIBUTE_UNUSED)
{
- switch_to_section (dtors_section);
+ switch_to_section (casm->sec.dtors);
assemble_align (BITS_PER_WORD);
assemble_integer (symbol, UNITS_PER_WORD, BITS_PER_WORD, 1);
}
diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
index b735f279b30..5a34bccccad 100644
--- a/gcc/config/alpha/elf.h
+++ b/gcc/config/alpha/elf.h
@@ -46,9 +46,9 @@ along with GCC; see the file COPYING3. If not see
#define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN) \
do { \
if ((SIZE) <= (unsigned HOST_WIDE_INT) g_switch_value) \
- switch_to_section (sbss_section); \
+ switch_to_section (casm->sec.sbss); \
else \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
if (!flag_inhibit_size_directive) \
ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, SIZE); \
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index 8244f37bf03..9b3a55ca40d 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -8832,7 +8832,7 @@ arc_asm_output_aligned_decl_local (FILE * stream, tree decl, const char * name,
switch_to_section (get_named_section (NULL, ".sbss", 0));
/* named_section (0,".sbss",0); */
else
- switch_to_section (bss_section);
+ switch_to_section (casm->sec.bss);
if (globalize_p)
(*targetm.asm_out.globalize_label) (stream, name);
diff --git a/gcc/config/arm/aout.h b/gcc/config/arm/aout.h
index 25a2812a663..01743bb040e 100644
--- a/gcc/config/arm/aout.h
+++ b/gcc/config/arm/aout.h
@@ -288,7 +288,7 @@
#define ASM_OUTPUT_ALIGNED_LOCAL(STREAM, NAME, SIZE, ALIGN) \
do \
{ \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
ASM_OUTPUT_ALIGN (STREAM, floor_log2 (ALIGN / BITS_PER_UNIT)); \
ASM_OUTPUT_LABEL (STREAM, NAME); \
fprintf (STREAM, "\t.space\t%d\n", (int)(SIZE)); \
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index c4ff06b087e..38c53e69b9a 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -17210,7 +17210,7 @@ get_jump_table_size (rtx_jump_table_data *insn)
{
/* ADDR_VECs only take room if read-only data does into the text
section. */
- if (JUMP_TABLES_IN_TEXT_SECTION || readonly_data_section == text_section)
+ if (JUMP_TABLES_IN_TEXT_SECTION || casm->sec.readonly_data == casm->sec.text)
{
rtx body = PATTERN (insn);
int elt = GET_CODE (body) == ADDR_DIFF_VEC ? 1 : 0;
@@ -24618,9 +24618,9 @@ arm_elf_asm_cdtor (rtx symbol, int priority, bool is_ctor)
s = get_section (buf, SECTION_WRITE | SECTION_NOTYPE, NULL_TREE);
}
else if (is_ctor)
- s = ctors_section;
+ s = casm->sec.ctors;
else
- s = dtors_section;
+ s = casm->sec.dtors;
switch_to_section (s);
assemble_align (POINTER_SIZE);
@@ -27886,7 +27886,7 @@ thumb_call_via_reg (rtx reg)
/* If we are in the normal text section we can use a single instance
per compilation unit. If we are doing function sections, then we need
an entry per section, since we can't rely on reachability. */
- if (in_section == text_section)
+ if (casm->in_section == casm->sec.text)
{
thumb_call_reg_needed = 1;
@@ -28278,7 +28278,7 @@ arm_file_end (void)
if (! thumb_call_reg_needed)
return;
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
asm_fprintf (asm_out_file, "\t.code 16\n");
ASM_OUTPUT_ALIGN (asm_out_file, 1);
@@ -29728,13 +29728,13 @@ static void
arm_asm_init_sections (void)
{
#if ARM_UNWIND_INFO
- exception_section = get_unnamed_section (0, output_section_asm_op,
+ casm->sec.exception = get_unnamed_section (0, output_section_asm_op,
"\t.handlerdata");
#endif /* ARM_UNWIND_INFO */
#ifdef OBJECT_FORMAT_ELF
if (target_pure_code)
- text_section->unnamed.data = "\t.section .text,\"0x20000006\",%progbits";
+ casm->sec.text->unnamed.data = "\t.section .text,\"0x20000006\",%progbits";
#endif
}
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 015299c1534..845b965f75f 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -1613,7 +1613,7 @@ machine_function;
#define ARM_GE_BITS_READ (arm_ge_bits_access ())
/* As in the machine_function, a global set of call-via labels, for code
- that is in text_section. */
+ that is in casm->sec.text. */
extern GTY(()) rtx thumb_call_via_label[14];
/* The number of potential ways of assigning to a co-processor. */
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
index cca6f0ece54..6aba52284c3 100644
--- a/gcc/config/arm/unknown-elf.h
+++ b/gcc/config/arm/unknown-elf.h
@@ -61,7 +61,7 @@
if (IN_NAMED_SECTION_P (DECL)) \
switch_to_section (get_named_section (DECL, NULL, 0)); \
else \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
\
ASM_OUTPUT_ALIGN (FILE, floor_log2 (ALIGN / BITS_PER_UNIT)); \
\
@@ -78,7 +78,7 @@
if ((DECL) != NULL && IN_NAMED_SECTION_P (DECL)) \
switch_to_section (get_named_section (DECL, NULL, 0)); \
else \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
\
ASM_OUTPUT_ALIGN (FILE, floor_log2 (ALIGN / BITS_PER_UNIT)); \
ASM_OUTPUT_LABEL (FILE, NAME); \
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 200701a583c..c89e7b610ea 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -10085,7 +10085,7 @@ avr_asm_asm_output_aligned_bss (FILE *file, tree decl, const char *name,
}
-/* Unnamed section callback for data_section
+/* Unnamed section callback for casm->sec.data
to track need of __do_copy_data. */
static void
@@ -10098,7 +10098,7 @@ avr_output_data_section_asm_op (const void *data)
}
-/* Unnamed section callback for bss_section
+/* Unnamed section callback for casm->sec.bss
to track need of __do_clear_bss. */
static void
@@ -10133,9 +10133,9 @@ avr_asm_init_sections (void)
#if defined HAVE_LD_AVR_AVRXMEGA3_RODATA_IN_FLASH
if (avr_arch->flash_pm_offset == 0)
#endif
- readonly_data_section->unnamed.callback = avr_output_data_section_asm_op;
- data_section->unnamed.callback = avr_output_data_section_asm_op;
- bss_section->unnamed.callback = avr_output_bss_section_asm_op;
+ casm->sec.readonly_data->unnamed.callback = avr_output_data_section_asm_op;
+ casm->sec.data->unnamed.callback = avr_output_data_section_asm_op;
+ casm->sec.bss->unnamed.callback = avr_output_bss_section_asm_op;
}
@@ -12567,7 +12567,7 @@ avr_output_addr_vec (rtx_insn *labl, rtx table)
// Switch back to original section. As we clobbered the section above,
// forget the current section before switching back.
- in_section = NULL;
+ casm->in_section = NULL;
switch_to_section (current_function_section ());
}
diff --git a/gcc/config/bfin/bfin.h b/gcc/config/bfin/bfin.h
index 823ca2d7124..4aaee42e0e6 100644
--- a/gcc/config/bfin/bfin.h
+++ b/gcc/config/bfin/bfin.h
@@ -1053,7 +1053,7 @@ do { char __buf[256]; \
#define ASM_OUTPUT_LOCAL(FILE, NAME, SIZE, ROUNDED) \
do { \
- switch_to_section (data_section); \
+ switch_to_section (casm->sec.data); \
if ((SIZE) >= (unsigned int) 4 ) ASM_OUTPUT_ALIGN(FILE,2); \
ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, SIZE); \
ASM_OUTPUT_LABEL (FILE, NAME); \
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index 4854371ee13..33bb40f51aa 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -891,7 +891,7 @@ c6x_select_rtx_section (machine_mode mode, rtx x,
if (c6x_sdata_mode == C6X_SDATA_ALL
|| (c6x_sdata_mode != C6X_SDATA_NONE && GET_MODE_SIZE (mode) <= 8))
/* ??? Consider using mergeable sdata sections. */
- return sdata_section;
+ return casm->sec.sdata;
else
return default_elf_select_rtx_section (mode, x, align);
}
@@ -5474,7 +5474,7 @@ c6x_asm_emit_except_personality (rtx personality)
static void
c6x_asm_init_sections (void)
{
- exception_section = get_unnamed_section (0, output_section_asm_op,
+ casm->sec.exception = get_unnamed_section (0, output_section_asm_op,
"\t.handlerdata");
}
diff --git a/gcc/config/c6x/c6x.h b/gcc/config/c6x/c6x.h
index 9e0a20d20cb..4b9ec51bd72 100644
--- a/gcc/config/c6x/c6x.h
+++ b/gcc/config/c6x/c6x.h
@@ -557,9 +557,9 @@ do { char __buf[256]; \
#define ASM_OUTPUT_ALIGNED_DECL_LOCAL(FILE, DECL, NAME, SIZE, ALIGN) \
do { \
if (PLACE_IN_SDATA_P (DECL)) \
- switch_to_section (sbss_section); \
+ switch_to_section (casm->sec.sbss); \
else \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
if (!flag_inhibit_size_directive) \
ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, SIZE); \
diff --git a/gcc/config/csky/csky.c b/gcc/config/csky/csky.c
index 487288b3292..24c97a5e830 100644
--- a/gcc/config/csky/csky.c
+++ b/gcc/config/csky/csky.c
@@ -959,7 +959,7 @@ get_csky_jump_table_size (rtx insn)
{
/* ADDR_VECs only take room if read-only data does into the text
section. */
- if (JUMP_TABLES_IN_TEXT_SECTION || readonly_data_section == text_section)
+ if (JUMP_TABLES_IN_TEXT_SECTION || casm->sec.readonly_data == casm->sec.text)
{
rtx body = PATTERN (insn);
int elt = GET_CODE (body) == ADDR_DIFF_VEC ? 1 : 0;
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 204114c96a2..90ce237cfa5 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -144,7 +144,7 @@ output_objc_section_asm_op (const void *directive)
section is requested. */
if (darwin_symbol_stubs && ! been_here)
{
- section *saved_in_section = in_section;
+ section *saved_in_section = casm->in_section;
static const enum darwin_section_enum tomark[] =
{
/* written, cold -> hot */
@@ -237,14 +237,14 @@ darwin_init_sections (void)
#include "config/darwin-sections.def"
#undef DEF_SECTION
- readonly_data_section = darwin_sections[const_section];
- exception_section = darwin_sections[darwin_exception_section];
- eh_frame_section = darwin_sections[darwin_eh_frame_section];
+ casm->sec.readonly_data = darwin_sections[const_section];
+ casm->sec.exception = darwin_sections[darwin_exception_section];
+ casm->sec.eh_frame = darwin_sections[darwin_eh_frame_section];
/* If our linker is new enough to coalesce weak symbols, then we
can just put picbase_thunks into the text section. */
if (! ld_uses_coal_sects )
- darwin_sections[picbase_thunk_section] = text_section;
+ darwin_sections[picbase_thunk_section] = casm->sec.text;
}
int
@@ -1072,7 +1072,7 @@ machopic_output_data_section_indirection (machopic_indirection **slot,
/* The name of the indirection symbol. */
const char *ptr_name = p->ptr_name;
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
assemble_align (GET_MODE_ALIGNMENT (Pmode));
assemble_label (out_file, ptr_name);
assemble_integer (gen_rtx_SYMBOL_REF (Pmode, sym_name),
@@ -1341,7 +1341,7 @@ darwin_mergeable_string_section (tree exp,
&& TREE_STRING_LENGTH (exp) == 0)
return darwin_sections[zobj_const_section];
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
#ifndef HAVE_GAS_LITERAL16
@@ -1363,7 +1363,7 @@ darwin_mergeable_constant_section (tree exp,
|| align < 8
|| align > 256
|| (align & (align -1)) != 0)
- return readonly_data_section;
+ return casm->sec.readonly_data;
/* This will ICE if the mode is not a constant size, but that is reasonable,
since one cannot put a variable-sized thing into a constant section, we
@@ -1371,12 +1371,12 @@ darwin_mergeable_constant_section (tree exp,
const unsigned int modesize = GET_MODE_BITSIZE (mode).to_constant ();
if (modesize > align)
- return readonly_data_section;
+ return casm->sec.readonly_data;
tree size = TYPE_SIZE_UNIT (TREE_TYPE (exp));
if (TREE_CODE (size) != INTEGER_CST)
- return readonly_data_section;
+ return casm->sec.readonly_data;
unsigned isize = TREE_INT_CST_LOW (size);
if (isize == 4)
@@ -1388,7 +1388,7 @@ darwin_mergeable_constant_section (tree exp,
&& isize == 16)
return darwin_sections[literal16_section];
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
section *
@@ -1444,7 +1444,7 @@ darwin_objc2_section (tree decl ATTRIBUTE_UNUSED, tree meta, section * base)
objc_metadata_seen = 1;
- if (base == data_section)
+ if (base == casm->sec.data)
base = darwin_sections[objc2_metadata_section];
/* Most of the OBJC2 META-data end up in the base section, so check it
@@ -1495,7 +1495,7 @@ darwin_objc2_section (tree decl ATTRIBUTE_UNUSED, tree meta, section * base)
else if (startswith (p, "V2_EHTY"))
return ld_uses_coal_sects ? darwin_sections[data_coal_section]
- : data_section;
+ : casm->sec.data;
else if (startswith (p, "V2_CSTR"))
return darwin_sections[objc2_constant_string_object_section];
@@ -1681,7 +1681,7 @@ machopic_select_section (tree decl,
else if (ro)
base_section = darwin_sections[const_data_section];
else
- base_section = data_section;
+ base_section = casm->sec.data;
break;
case SECCAT_BSS:
case SECCAT_SBSS:
@@ -1691,11 +1691,11 @@ machopic_select_section (tree decl,
else
{
if (!TREE_PUBLIC (decl))
- base_section = lcomm_section;
- else if (bss_noswitch_section)
- base_section = bss_noswitch_section;
+ base_section = casm->sec.lcomm;
+ else if (casm->sec.bss_noswitch)
+ base_section = casm->sec.bss_noswitch;
else
- base_section = data_section;
+ base_section = casm->sec.data;
}
break;
@@ -2366,8 +2366,8 @@ fprintf (file, "# dadon: %s %s (%llu, %u) local %d weak %d"
/* Check that we've correctly picked up the zero-sized item and placed it
properly. */
gcc_assert ((!DARWIN_SECTION_ANCHORS || !flag_section_anchors)
- || (in_section
- && (in_section->common.flags & SECTION_NO_ANCHOR)));
+ || (casm->in_section
+ && (casm->in_section->common.flags & SECTION_NO_ANCHOR)));
}
else
ASM_OUTPUT_LABEL (file, xname);
@@ -2387,8 +2387,8 @@ darwin_asm_declare_constant_name (FILE *file, const char *name,
/* Check that we've correctly picked up the zero-sized item and placed it
properly. */
gcc_assert ((!DARWIN_SECTION_ANCHORS || !flag_section_anchors)
- || (in_section
- && (in_section->common.flags & SECTION_NO_ANCHOR)));
+ || (casm->in_section
+ && (casm->in_section->common.flags & SECTION_NO_ANCHOR)));
}
}
@@ -2425,7 +2425,7 @@ darwin_emit_weak_or_comdat (FILE *fp, tree decl, const char *name,
: darwin_sections[const_data_section]);
else
switch_to_section (use_coal ? darwin_sections[data_coal_section]
- : data_section);
+ : casm->sec.data);
/* To be consistent, we'll allow darwin_asm_declare_object_name to assemble
the align info for zero-sized items... but do it here otherwise. */
@@ -2447,7 +2447,7 @@ darwin_emit_objc_zeroed (FILE *fp, tree decl, const char *name,
unsigned HOST_WIDE_INT size,
unsigned int align, tree meta)
{
- section *ocs = data_section;
+ section *ocs = casm->sec.data;
if (TREE_PURPOSE (meta) == get_identifier("OBJC2META"))
ocs = darwin_objc2_section (decl, meta, ocs);
@@ -2489,13 +2489,13 @@ darwin_emit_local_bss (FILE *fp, tree decl, const char *name,
if (!size)
{
fputs ("\t.section\t__DATA,__zobj_bss\n", fp);
- in_section = darwin_sections[zobj_bss_section];
+ casm->in_section = darwin_sections[zobj_bss_section];
size = 1;
}
else
{
fputs ("\t.static_data\n", fp);
- in_section = darwin_sections[static_data_section];
+ casm->in_section = darwin_sections[static_data_section];
}
if (l2align)
@@ -2513,7 +2513,7 @@ darwin_emit_local_bss (FILE *fp, tree decl, const char *name,
char secnam[64];
snprintf (secnam, 64, "__DATA,__bss");
unsigned int flags = SECTION_BSS|SECTION_WRITE|SECTION_NO_ANCHOR;
- in_section = get_section (secnam, flags, NULL);
+ casm->in_section = get_section (secnam, flags, NULL);
fprintf (fp, "\t.zerofill %s,", secnam);
assemble_name (fp, name);
if (!size)
@@ -2560,7 +2560,7 @@ darwin_emit_common (FILE *fp, const char *name,
l2align = floor_log2 (align);
gcc_assert (l2align <= L2_MAX_OFILE_ALIGNMENT);
- in_section = comm_section;
+ casm->in_section = casm->sec.comm;
/* We mustn't allow multiple public symbols to share an address when using
the normal OSX toolchain. */
if (!size)
@@ -2568,7 +2568,7 @@ darwin_emit_common (FILE *fp, const char *name,
/* Put at least one byte. */
size = 1;
/* This section can no longer participate in section anchoring. */
- comm_section->common.flags |= SECTION_NO_ANCHOR;
+ casm->sec.comm->common.flags |= SECTION_NO_ANCHOR;
}
fputs ("\t.comm\t", fp);
@@ -2657,13 +2657,13 @@ fprintf (fp, "# albss: %s (%lld,%d) ro %d cst %d stat %d com %d"
if (!size)
{
fputs ("\t.section\t__DATA,__zobj_data\n", fp);
- in_section = darwin_sections[zobj_data_section];
+ casm->in_section = darwin_sections[zobj_data_section];
size = 1;
}
else
{
fputs ("\t.data\n", fp);
- in_section = data_section;
+ casm->in_section = casm->sec.data;
}
if (l2align)
@@ -2678,7 +2678,7 @@ fprintf (fp, "# albss: %s (%lld,%d) ro %d cst %d stat %d com %d"
unsigned int flags = SECTION_BSS|SECTION_WRITE|SECTION_NO_ANCHOR;
char secnam[64];
snprintf (secnam, 64, "__DATA,__common");
- in_section = get_section (secnam, flags, NULL);
+ casm->in_section = get_section (secnam, flags, NULL);
fprintf (fp, "\t.zerofill %s,", secnam);
assemble_name (fp, name);
if (!size)
@@ -3894,7 +3894,7 @@ darwin_function_section (tree decl, enum node_frequency freq,
/* Otherwise, default to the 'normal' non-reordered sections. */
default_function_sections:
return (use_coal) ? darwin_sections[text_coal_section]
- : text_section;
+ : casm->sec.text;
}
#include "gt-darwin.h"
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 02cd07c09bc..af459c0e5b4 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -9396,7 +9396,7 @@ frv_rtx_costs (rtx x,
static void
frv_asm_out_constructor (rtx symbol, int priority ATTRIBUTE_UNUSED)
{
- switch_to_section (ctors_section);
+ switch_to_section (casm->sec.ctors);
assemble_align (POINTER_SIZE);
if (TARGET_FDPIC)
{
@@ -9411,7 +9411,7 @@ frv_asm_out_constructor (rtx symbol, int priority ATTRIBUTE_UNUSED)
static void
frv_asm_out_destructor (rtx symbol, int priority ATTRIBUTE_UNUSED)
{
- switch_to_section (dtors_section);
+ switch_to_section (casm->sec.dtors);
assemble_align (POINTER_SIZE);
if (TARGET_FDPIC)
{
diff --git a/gcc/config/frv/frv.h b/gcc/config/frv/frv.h
index 65091952ebd..6fd072c25d8 100644
--- a/gcc/config/frv/frv.h
+++ b/gcc/config/frv/frv.h
@@ -1540,7 +1540,7 @@ do { \
if ((SIZE) > 0 && (SIZE) <= (unsigned HOST_WIDE_INT) g_switch_value) \
switch_to_section (get_named_section (NULL, ".sbss", 0)); \
else \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
ASM_OUTPUT_ALIGN (STREAM, floor_log2 ((ALIGN) / BITS_PER_UNIT)); \
ASM_DECLARE_OBJECT_NAME (STREAM, NAME, DECL); \
ASM_OUTPUT_SKIP (STREAM, (SIZE) ? (SIZE) : 1); \
diff --git a/gcc/config/ft32/ft32.h b/gcc/config/ft32/ft32.h
index f8d0763e394..8e2b0667b64 100644
--- a/gcc/config/ft32/ft32.h
+++ b/gcc/config/ft32/ft32.h
@@ -478,9 +478,9 @@ extern int ft32_is_mem_pm(rtx o);
#define ASM_OUTPUT_SYMBOL_REF(stream, sym) \
do { \
assemble_name (stream, XSTR (sym, 0)); \
- int section_debug = in_section && \
- (SECTION_STYLE (in_section) == SECTION_NAMED) && \
- (in_section->named.common.flags & SECTION_DEBUG); \
+ int section_debug = casm->in_section && \
+ (SECTION_STYLE (casm->in_section) == SECTION_NAMED) && \
+ (casm->in_section->named.common.flags & SECTION_DEBUG); \
if (!section_debug && SYMBOL_REF_FLAGS (sym) & 0x1000) \
asm_fprintf (stream, "-0x800000"); \
} while (0)
diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h
index da872d10cd3..2826d2c35c6 100644
--- a/gcc/config/i386/cygming.h
+++ b/gcc/config/i386/cygming.h
@@ -187,7 +187,7 @@ along with GCC; see the file COPYING3. If not see
\f
#define drectve_section() \
(fprintf (asm_out_file, "\t.section .drectve\n"), \
- in_section = NULL)
+ casm->in_section = NULL)
/* Older versions of gas don't handle 'r' as data.
Explicitly set data flag with 'd'. */
diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h
index 741f29aa962..82addaa6e8d 100644
--- a/gcc/config/i386/darwin.h
+++ b/gcc/config/i386/darwin.h
@@ -217,7 +217,7 @@ along with GCC; see the file COPYING3. If not see
do { \
if ((LOG) != 0) \
{ \
- if (in_section == text_section) \
+ if (casm->in_section == casm->sec.text) \
fprintf (FILE, "\t%s %d,0x90\n", ALIGN_ASM_OP, (LOG)); \
else \
fprintf (FILE, "\t%s %d\n", ALIGN_ASM_OP, (LOG)); \
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e3988f82b56..2ab4c70d9d0 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -869,7 +869,7 @@ x86_output_aligned_bss (FILE *file, tree decl, const char *name,
&& size > (unsigned int)ix86_section_threshold)
switch_to_section (get_named_section (decl, ".lbss", 0));
else
- switch_to_section (bss_section);
+ switch_to_section (casm->sec.bss);
ASM_OUTPUT_ALIGN (file, floor_log2 (align / BITS_PER_UNIT));
#ifdef ASM_DECLARE_OBJECT_NAME
last_assemble_variable_decl = decl;
@@ -5959,7 +5959,7 @@ output_indirect_thunk_function (enum indirect_thunk_prefix need_prefix,
}
else
{
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
ASM_OUTPUT_LABEL (asm_out_file, name);
}
@@ -6079,7 +6079,7 @@ ix86_code_end (void)
}
else
{
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
ASM_OUTPUT_LABEL (asm_out_file, name);
}
diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h
index 29b37a143f5..7297db2bb70 100644
--- a/gcc/config/i386/sol2.h
+++ b/gcc/config/i386/sol2.h
@@ -195,9 +195,9 @@ along with GCC; see the file COPYING3. If not see
do \
{ \
if (TARGET_SUN_TLS \
- && in_section \
- && ((in_section->common.flags & SECTION_TLS) == SECTION_TLS)) \
- switch_to_section (bss_section); \
+ && casm->in_section \
+ && ((casm->in_section->common.flags & SECTION_TLS) == SECTION_TLS)) \
+ switch_to_section (casm->sec.bss); \
x86_elf_aligned_decl_common (FILE, DECL, NAME, SIZE, ALIGN); \
} \
while (0)
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index 7c0ea4f731c..a25412ddf30 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -1347,7 +1347,7 @@ void
i386_pe_seh_init_sections (void)
{
if (TARGET_SEH)
- exception_section = get_unnamed_section (0, output_section_asm_op,
+ casm->sec.exception = get_unnamed_section (0, output_section_asm_op,
"\t.seh_handlerdata");
}
\f
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 96c0efb4afd..0d8166be256 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -10406,7 +10406,7 @@ ia64_asm_emit_except_personality (rtx personality)
static void
ia64_asm_init_sections (void)
{
- exception_section = get_unnamed_section (0, output_section_asm_op,
+ casm->sec.exception = get_unnamed_section (0, output_section_asm_op,
"\t.handlerdata");
}
@@ -10858,7 +10858,7 @@ ia64_select_rtx_section (machine_mode mode, rtx x,
if (GET_MODE_SIZE (mode) > 0
&& GET_MODE_SIZE (mode) <= ia64_section_threshold
&& !TARGET_NO_SDATA)
- return sdata_section;
+ return casm->sec.sdata;
else
return default_elf_select_rtx_section (mode, x, align);
}
diff --git a/gcc/config/ia64/sysv4.h b/gcc/config/ia64/sysv4.h
index a4133d3beab..a68f28074fb 100644
--- a/gcc/config/ia64/sysv4.h
+++ b/gcc/config/ia64/sysv4.h
@@ -69,9 +69,9 @@ extern int size_directive_output;
#define ASM_OUTPUT_ALIGNED_DECL_LOCAL(FILE, DECL, NAME, SIZE, ALIGN) \
do { \
if ((DECL) && sdata_symbolic_operand (XEXP (DECL_RTL (DECL), 0), Pmode)) \
- switch_to_section (sbss_section); \
+ switch_to_section (casm->sec.sbss); \
else \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
ASM_OUTPUT_ALIGN (FILE, floor_log2 ((ALIGN) / BITS_PER_UNIT)); \
ASM_DECLARE_OBJECT_NAME (FILE, NAME, DECL); \
ASM_OUTPUT_SKIP (FILE, SIZE ? SIZE : 1); \
diff --git a/gcc/config/lm32/lm32.h b/gcc/config/lm32/lm32.h
index a13c0c50ee1..d665c38f0e3 100644
--- a/gcc/config/lm32/lm32.h
+++ b/gcc/config/lm32/lm32.h
@@ -385,9 +385,9 @@ enum reg_class
#define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN) \
do { \
if ((SIZE) <= (unsigned HOST_WIDE_INT) g_switch_value) \
- switch_to_section (sbss_section); \
+ switch_to_section (casm->sec.sbss); \
else \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
if (!flag_inhibit_size_directive) \
ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, SIZE); \
@@ -403,7 +403,7 @@ do \
{ \
if ((SIZE) <= (unsigned HOST_WIDE_INT) g_switch_value) \
{ \
- switch_to_section (sbss_section); \
+ switch_to_section (casm->sec.sbss); \
(*targetm.asm_out.globalize_label) (FILE, NAME); \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
if (!flag_inhibit_size_directive) \
@@ -414,7 +414,7 @@ do \
} \
else \
{ \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
fprintf ((FILE), "%s", COMMON_ASM_OP); \
assemble_name ((FILE), (NAME)); \
fprintf ((FILE), "," HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \
diff --git a/gcc/config/m32r/m32r.h b/gcc/config/m32r/m32r.h
index 047805fd808..64b5f69f3a7 100644
--- a/gcc/config/m32r/m32r.h
+++ b/gcc/config/m32r/m32r.h
@@ -897,7 +897,7 @@ L2: .word STATIC
&& (SIZE) <= (unsigned HOST_WIDE_INT) g_switch_value) \
switch_to_section (get_named_section (NULL, ".sbss", 0)); \
else \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
ASM_OUTPUT_ALIGN (FILE, floor_log2 (ALIGN / BITS_PER_UNIT)); \
last_assemble_variable_decl = DECL; \
ASM_DECLARE_OBJECT_NAME (FILE, NAME, DECL); \
diff --git a/gcc/config/mcore/mcore-elf.h b/gcc/config/mcore/mcore-elf.h
index d50f578c3dd..02278eec3c3 100644
--- a/gcc/config/mcore/mcore-elf.h
+++ b/gcc/config/mcore/mcore-elf.h
@@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. If not see
fprintf (STREAM, "\t.section .exports\n"); \
fprintf (STREAM, "\t.ascii \" -export:%s\"\n", \
(* targetm.strip_name_encoding) (NAME)); \
- in_section = NULL; \
+ casm->in_section = NULL; \
} \
while (0)
@@ -63,7 +63,7 @@ along with GCC; see the file COPYING3. If not see
HOST_WIDE_INT size; \
if (mcore_dllexport_name_p (NAME)) \
{ \
- section *save_section = in_section; \
+ section *save_section = casm->in_section; \
MCORE_EXPORT_NAME (FILE, NAME); \
switch_to_section (save_section); \
} \
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index 4813f7a7921..1e148c0b30a 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -2837,9 +2837,9 @@ microblaze_elf_asm_cdtor (rtx symbol, int priority, bool is_ctor)
s = get_section (buf, SECTION_WRITE, NULL_TREE);
}
else if (is_ctor)
- s = ctors_section;
+ s = casm->sec.ctors;
else
- s = dtors_section;
+ s = casm->sec.dtors;
switch_to_section (s);
assemble_align (POINTER_SIZE);
@@ -3262,7 +3262,7 @@ microblaze_select_section (tree decl, int reloc, unsigned HOST_WIDE_INT align)
relaxation/relocation. Currently, turning mergeable sections
into regular readonly sections. */
- return readonly_data_section;
+ return casm->sec.readonly_data;
default:
return default_elf_select_section (decl, reloc, align);
}
diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h
index 2ecec750526..3f1368d0884 100644
--- a/gcc/config/microblaze/microblaze.h
+++ b/gcc/config/microblaze/microblaze.h
@@ -623,11 +623,11 @@ do { \
&& (int) (SIZE) <= microblaze_section_threshold \
&& TARGET_XLGPOPT) \
{ \
- switch_to_section (sbss_section); \
+ switch_to_section (casm->sec.sbss); \
} \
else \
{ \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
} \
fprintf (FILE, "%s", COMMON_ASM_OP); \
assemble_name ((FILE), (NAME)); \
@@ -643,11 +643,11 @@ do { \
&& (int) (SIZE) <= microblaze_section_threshold \
&& TARGET_XLGPOPT) \
{ \
- switch_to_section (sbss_section); \
+ switch_to_section (casm->sec.sbss); \
} \
else \
{ \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
} \
fprintf (FILE, "%s", LCOMMON_ASM_OP); \
assemble_name ((FILE), (NAME)); \
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 807bf1a78d4..f119bcfbe87 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -9719,7 +9719,7 @@ mips_output_aligned_decl_common (FILE *stream, tree decl, const char *name,
if (TREE_PUBLIC (decl) && DECL_NAME (decl))
targetm.asm_out.globalize_label (stream, name);
- switch_to_section (readonly_data_section);
+ switch_to_section (casm->sec.readonly_data);
ASM_OUTPUT_ALIGN (stream, floor_log2 (align / BITS_PER_UNIT));
mips_declare_object (stream, name, "",
":\n\t.space\t" HOST_WIDE_INT_PRINT_UNSIGNED "\n",
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index 010cd4773ea..4ea07819983 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -1321,7 +1321,7 @@ mmix_file_start (void)
fputs ("! mmixal:= 8H LOC Data_Section\n", asm_out_file);
/* Make sure each file starts with the text section. */
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
}
/* TARGET_ASM_FILE_END. */
@@ -1330,7 +1330,7 @@ static void
mmix_file_end (void)
{
/* Make sure each file ends with the data section. */
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
}
/* TARGET_ASM_OUTPUT_SOURCE_FILENAME. */
@@ -1510,7 +1510,7 @@ mmix_asm_output_aligned_local (FILE *stream,
int size,
int align)
{
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
ASM_OUTPUT_ALIGN (stream, exact_log2 (align/BITS_PER_UNIT));
assemble_name (stream, name);
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 1cdacb7f480..ba41ce1f54a 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -2398,22 +2398,22 @@ msp430_select_section (tree decl, int reloc, unsigned HOST_WIDE_INT align)
{
case SECCAT_TEXT:
if (!prefix)
- return text_section;
+ return casm->sec.text;
base_sec_name = ".text";
break;
case SECCAT_DATA:
if (!prefix)
- return data_section;
+ return casm->sec.data;
base_sec_name = ".data";
break;
case SECCAT_BSS:
if (!prefix)
- return bss_section;
+ return casm->sec.bss;
base_sec_name = ".bss";
break;
case SECCAT_RODATA:
if (!prefix)
- return readonly_data_section;
+ return casm->sec.readonly_data;
base_sec_name = ".rodata";
break;
diff --git a/gcc/config/nios2/nios2.h b/gcc/config/nios2/nios2.h
index dfca12cc525..c2da347062b 100644
--- a/gcc/config/nios2/nios2.h
+++ b/gcc/config/nios2/nios2.h
@@ -470,9 +470,9 @@ while (0)
#define ASM_OUTPUT_ALIGNED_DECL_LOCAL(FILE, DECL, NAME, SIZE, ALIGN) \
do { \
if (targetm.in_small_data_p (DECL)) \
- switch_to_section (sbss_section); \
+ switch_to_section (casm->sec.sbss); \
else \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
if (!flag_inhibit_size_directive) \
ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, SIZE); \
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index d13021ad94a..472ff6e5bc4 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -4454,7 +4454,7 @@ pa_output_function_epilogue (FILE *file)
/* We are done with this subspace except possibly for some additional
debug information. Forget that we are in this subspace to ensure
that the next function is output in its own subspace. */
- in_section = NULL;
+ casm->in_section = NULL;
cfun->machine->in_nsubspa = 2;
}
@@ -4703,7 +4703,7 @@ output_deferred_profile_counters (void)
if (funcdef_nos.is_empty ())
return;
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
align = MIN (BIGGEST_ALIGNMENT, LONG_TYPE_SIZE);
ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
@@ -5873,7 +5873,7 @@ output_deferred_plabels (void)
before outputting the deferred plabels. */
if (n_deferred_plabels)
{
- switch_to_section (flag_pic ? data_section : readonly_data_section);
+ switch_to_section (flag_pic ? casm->sec.data : casm->sec.readonly_data);
ASM_OUTPUT_ALIGN (asm_out_file, TARGET_64BIT ? 3 : 2);
}
@@ -8882,7 +8882,7 @@ pa_asm_output_mi_thunk (FILE *file, tree thunk_fndecl, HOST_WIDE_INT delta,
if (TARGET_SOM && flag_pic && TREE_PUBLIC (function))
{
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
output_asm_insn (".align 4", xoperands);
ASM_OUTPUT_LABEL (file, label);
output_asm_insn (".word P'%0", xoperands);
@@ -9057,7 +9057,7 @@ pa_asm_output_aligned_bss (FILE *stream,
unsigned HOST_WIDE_INT size,
unsigned int align)
{
- switch_to_section (bss_section);
+ switch_to_section (casm->sec.bss);
#ifdef ASM_OUTPUT_TYPE_DIRECTIVE
ASM_OUTPUT_TYPE_DIRECTIVE (stream, name, "object");
@@ -9094,7 +9094,7 @@ pa_asm_output_aligned_common (FILE *stream,
align = max_common_align;
}
- switch_to_section (bss_section);
+ switch_to_section (casm->sec.bss);
assemble_name (stream, name);
fprintf (stream, "\t.comm " HOST_WIDE_INT_PRINT_UNSIGNED"\n",
@@ -9114,7 +9114,7 @@ pa_asm_output_aligned_local (FILE *stream,
unsigned HOST_WIDE_INT size,
unsigned int align)
{
- switch_to_section (bss_section);
+ switch_to_section (casm->sec.bss);
fprintf (stream, "\t.align %u\n", align / BITS_PER_UNIT);
#ifdef LOCAL_ASM_OP
@@ -10040,10 +10040,10 @@ som_output_text_section_asm_op (const void *data ATTRIBUTE_UNUSED)
function has been completed. So, we are changing to the
text section to output debugging information. Thus, we
need to forget that we are in the text section so that
- varasm.c will call us when text_section is selected again. */
+ varasm.c will call us when casm->sec.text is selected again. */
gcc_assert (!cfun || !cfun->machine
|| cfun->machine->in_nsubspa == 2);
- in_section = NULL;
+ casm->in_section = NULL;
}
output_section_asm_op ("\t.SPACE $TEXT$\n\t.NSUBSPA $CODE$");
return;
@@ -10057,7 +10057,7 @@ som_output_text_section_asm_op (const void *data ATTRIBUTE_UNUSED)
static void
som_output_comdat_data_section_asm_op (const void *data)
{
- in_section = NULL;
+ casm->in_section = NULL;
output_section_asm_op (data);
}
@@ -10066,7 +10066,7 @@ som_output_comdat_data_section_asm_op (const void *data)
static void
pa_som_asm_init_sections (void)
{
- text_section
+ casm->sec.text
= get_unnamed_section (0, som_output_text_section_asm_op, NULL);
/* SOM puts readonly data in the default $LIT$ subspace when PIC code
@@ -10114,14 +10114,14 @@ pa_som_asm_init_sections (void)
when generating PIC code. This reduces sharing, but it works
correctly. Now we rely on pa_reloc_rw_mask() for section selection.
This puts constant data not needing relocation into the $TEXT$ space. */
- readonly_data_section = som_readonly_data_section;
+ casm->sec.readonly_data = som_readonly_data_section;
/* We must not have a reference to an external symbol defined in a
shared library in a readonly section, else the SOM linker will
complain.
So, we force exception information into the data section. */
- exception_section = data_section;
+ casm->sec.exception = casm->sec.data;
}
/* Implement TARGET_ASM_TM_CLONE_TABLE_SECTION. */
@@ -10154,18 +10154,18 @@ pa_select_section (tree exp, int reloc,
&& !DECL_WEAK (exp))
return som_one_only_readonly_data_section;
else
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
else if (CONSTANT_CLASS_P (exp)
&& !(reloc & pa_reloc_rw_mask ()))
- return readonly_data_section;
+ return casm->sec.readonly_data;
else if (TARGET_SOM
&& TREE_CODE (exp) == VAR_DECL
&& DECL_ONE_ONLY (exp)
&& !DECL_WEAK (exp))
return som_one_only_data_section;
else
- return data_section;
+ return casm->sec.data;
}
/* Implement pa_elf_select_rtx_section. If X is a function label operand
@@ -10658,7 +10658,7 @@ pa_function_section (tree decl, enum node_frequency freq,
{
/* Put functions in text section if target doesn't have named sections. */
if (!targetm_common.have_named_sections)
- return text_section;
+ return casm->sec.text;
/* Force nested functions into the same section as the containing
function. */
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index ced653116a4..11b123c0586 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -743,7 +743,7 @@ void
pdp11_asm_output_var (FILE *file, const char *name, int size,
int align, bool global)
{
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
if (align > 8)
fprintf (file, "\t.even\n");
if (TARGET_DEC_ASM)
@@ -2323,11 +2323,11 @@ pdp11_asm_init_sections (void)
{
if (TARGET_DEC_ASM)
{
- bss_section = data_section;
+ casm->sec.bss = casm->sec.data;
}
else if (TARGET_GNU_ASM)
{
- bss_section = get_unnamed_section (SECTION_WRITE | SECTION_BSS,
+ casm->sec.bss = get_unnamed_section (SECTION_WRITE | SECTION_BSS,
output_section_asm_op,
".bss");
}
diff --git a/gcc/config/pru/pru.h b/gcc/config/pru/pru.h
index 03f08b1720f..a9c73dc5149 100644
--- a/gcc/config/pru/pru.h
+++ b/gcc/config/pru/pru.h
@@ -547,7 +547,7 @@ while (0)
#undef ASM_OUTPUT_ALIGNED_LOCAL
#define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN) \
do { \
- switch_to_section (bss_section); \
+ switch_to_section (casm->sec.bss); \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
if (!flag_inhibit_size_directive) \
ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, SIZE); \
diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
index 126572c6243..90bcb6de3cd 100644
--- a/gcc/config/riscv/riscv.c
+++ b/gcc/config/riscv/riscv.c
@@ -3616,8 +3616,8 @@ riscv_elf_select_rtx_section (machine_mode mode, rtx x,
return get_section (name, s->named.common.flags, NULL);
}
- if (s == data_section)
- return sdata_section;
+ if (s == casm->sec.data)
+ return casm->sec.sdata;
}
return s;
diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c
index 4c34949a97f..0129929c821 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -4644,14 +4644,14 @@ rl78_select_section (tree decl,
}
if (readonly)
- return TARGET_ES0 ? frodata_section : readonly_data_section;
+ return TARGET_ES0 ? frodata_section : casm->sec.readonly_data;
switch (categorize_decl_for_section (decl, reloc))
{
- case SECCAT_TEXT: return text_section;
- case SECCAT_DATA: return data_section;
- case SECCAT_BSS: return bss_section;
- case SECCAT_RODATA: return TARGET_ES0 ? frodata_section : readonly_data_section;
+ case SECCAT_TEXT: return casm->sec.text;
+ case SECCAT_DATA: return casm->sec.data;
+ case SECCAT_BSS: return casm->sec.bss;
+ case SECCAT_RODATA: return TARGET_ES0 ? frodata_section : casm->sec.readonly_data;
default:
return default_select_section (decl, reloc, align);
}
@@ -4786,7 +4786,7 @@ rl78_asm_ctor_dtor (rtx symbol, int priority, bool is_ctor)
sec = get_section (buf, 0, NULL);
}
else
- sec = is_ctor ? ctors_section : dtors_section;
+ sec = is_ctor ? casm->sec.ctors : casm->sec.dtors;
assemble_addr_to_section (symbol, sec);
}
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index bac959f4ef4..a601eb6728a 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -14747,7 +14747,7 @@ rs6000_assemble_integer (rtx x, unsigned int size, int aligned_p)
section. */
if (DEFAULT_ABI == ABI_V4
&& (TARGET_RELOCATABLE || flag_pic > 1)
- && in_section != toc_section
+ && casm->in_section != toc_section
&& !recurse
&& !CONST_SCALAR_INT_P (x)
&& CONSTANT_P (x))
@@ -21296,7 +21296,7 @@ rs6000_elf_file_end (void)
/* We have expanded a CPU builtin, so we need to emit a reference to
the special symbol that LIBC uses to declare it supports the
AT_PLATFORM and AT_HWCAP/AT_HWCAP2 in the TCB feature. */
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
fprintf (asm_out_file, "\t.align %u\n", TARGET_32BIT ? 2 : 3);
fprintf (asm_out_file, "\t%s %s\n",
TARGET_32BIT ? ".long" : ".quad", tcb_verification_symbol);
@@ -21421,7 +21421,7 @@ rs6000_xcoff_asm_init_sections (void)
toc_section
= get_unnamed_section (0, rs6000_xcoff_output_toc_section_asm_op, NULL);
- readonly_data_section = read_only_data_section;
+ casm->sec.readonly_data = read_only_data_section;
}
static int
@@ -21499,7 +21499,7 @@ rs6000_xcoff_select_section (tree decl, int reloc,
if (TREE_CODE (decl) == VAR_DECL && DECL_THREAD_LOCAL_P (decl))
{
if (bss_initializer_p (decl))
- return tls_comm_section;
+ return casm->sec.tls_comm;
else if (TREE_PUBLIC (decl))
return tls_data_section;
else
@@ -21508,7 +21508,7 @@ rs6000_xcoff_select_section (tree decl, int reloc,
else
#endif
if (TREE_PUBLIC (decl))
- return data_section;
+ return casm->sec.data;
else
return private_data_section;
}
@@ -21613,7 +21613,7 @@ rs6000_xcoff_file_start (void)
if (write_symbols != NO_DEBUG)
switch_to_section (private_data_section);
switch_to_section (toc_section);
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
if (profile_flag)
fprintf (asm_out_file, "\t.extern %s\n", RS6000_MCOUNT);
rs6000_file_start ();
@@ -21625,14 +21625,14 @@ rs6000_xcoff_file_start (void)
static void
rs6000_xcoff_file_end (void)
{
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
if (xcoff_tls_exec_model_detected)
{
/* Add a .ref to __tls_get_addr to force libpthread dependency. */
fputs ("\t.extern __tls_get_addr\n\t.ref __tls_get_addr\n", asm_out_file);
}
fputs ("_section_.text:\n", asm_out_file);
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
fputs (TARGET_32BIT
? "\t.long _section_.text\n" : "\t.llong _section_.text\n",
asm_out_file);
@@ -21747,7 +21747,7 @@ rs6000_xcoff_visibility (tree decl)
Dollar signs are converted to underscores.
The csect for the function will have already been created when
- text_section was selected. We do have to go back to that csect, however.
+ casm->sec.text was selected. We do have to go back to that csect, however.
The third and fourth parameters to the .function pseudo-op (16 and 044)
are placeholders which no longer have any use.
@@ -21809,7 +21809,7 @@ rs6000_xcoff_declare_function_name (FILE *file, const char *name, tree decl)
RS6000_OUTPUT_BASENAME (file, buffer);
fputs (", TOC[tc0], 0\n", file);
- in_section = NULL;
+ casm->in_section = NULL;
switch_to_section (function_section (decl));
putc ('.', file);
ASM_OUTPUT_LABEL (file, buffer);
@@ -21869,7 +21869,7 @@ rs6000_xcoff_asm_output_aligned_decl_common (FILE *stream,
if (! DECL_COMMON (decl))
{
/* Forget section. */
- in_section = NULL;
+ casm->in_section = NULL;
/* Globalize TLS BSS. */
if (TREE_PUBLIC (decl) && DECL_THREAD_LOCAL_P (decl))
@@ -26866,7 +26866,7 @@ rs6000_code_end (void)
else
#endif
{
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
ASM_OUTPUT_LABEL (asm_out_file, name);
}
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 96ee5524224..00af78c964f 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -427,7 +427,7 @@ do { \
do { \
if ((DECL) && rs6000_elf_in_small_data_p (DECL)) \
{ \
- switch_to_section (sbss_section); \
+ switch_to_section (casm->sec.sbss); \
ASM_OUTPUT_ALIGN (FILE, exact_log2 (ALIGN / BITS_PER_UNIT)); \
ASM_OUTPUT_LABEL (FILE, NAME); \
ASM_OUTPUT_SKIP (FILE, SIZE); \
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index af54ccc2588..c45aface21d 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -2305,7 +2305,7 @@ rx_select_rtx_section (machine_mode mode,
if (rx_small_data_limit > 0
&& GET_MODE_SIZE (mode) <= rx_small_data_limit
&& align <= (unsigned HOST_WIDE_INT) rx_small_data_limit * BITS_PER_UNIT)
- return sdata_section;
+ return casm->sec.sdata;
return default_elf_select_rtx_section (mode, x, align);
}
@@ -2319,8 +2319,8 @@ rx_select_section (tree decl,
{
switch (categorize_decl_for_section (decl, reloc))
{
- case SECCAT_SDATA: return sdata_section;
- case SECCAT_SBSS: return sbss_section;
+ case SECCAT_SDATA: return casm->sec.sdata;
+ case SECCAT_SBSS: return casm->sec.sbss;
case SECCAT_SRODATA:
/* Fall through. We do not put small, read only
data into the C_2 section because we are not
@@ -2342,7 +2342,7 @@ rx_select_section (tree decl,
case SECCAT_RODATA_MERGE_CONST:
case SECCAT_RODATA_MERGE_STR_INIT:
case SECCAT_RODATA_MERGE_STR:
- return readonly_data_section;
+ return casm->sec.readonly_data;
default:
break;
@@ -2690,9 +2690,9 @@ rx_elf_asm_cdtor (rtx symbol, int priority, bool is_ctor)
s = get_section (buf, SECTION_WRITE, NULL_TREE);
}
else if (is_ctor)
- s = ctors_section;
+ s = casm->sec.ctors;
else
- s = dtors_section;
+ s = casm->sec.dtors;
switch_to_section (s);
assemble_align (POINTER_SIZE);
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index b2f2f6417b3..367d58c28d0 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -16691,7 +16691,7 @@ s390_output_indirect_thunk_function (unsigned int regno, bool z10_p)
}
else
{
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
ASM_OUTPUT_LABEL (asm_out_file, thunk_label);
}
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 0628f059ca2..5bce20ef2e4 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -2828,7 +2828,7 @@ sh_file_start (void)
else
/* Switch to the data section so that the coffsem symbol
isn't in the text section. */
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
if (TARGET_LITTLE_ENDIAN)
fputs ("\t.little\n", asm_out_file);
diff --git a/gcc/config/sparc/sol2.h b/gcc/config/sparc/sol2.h
index 1b4aa28bd21..1dd33daa447 100644
--- a/gcc/config/sparc/sol2.h
+++ b/gcc/config/sparc/sol2.h
@@ -399,9 +399,9 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
do \
{ \
if (TARGET_SUN_TLS \
- && in_section \
- && ((in_section->common.flags & SECTION_TLS) == SECTION_TLS)) \
- switch_to_section (bss_section); \
+ && casm->in_section \
+ && ((casm->in_section->common.flags & SECTION_TLS) == SECTION_TLS)) \
+ switch_to_section (casm->sec.bss); \
fprintf ((FILE), "%s", COMMON_ASM_OP); \
assemble_name ((FILE), (NAME)); \
fprintf ((FILE), "," HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index ca91be4c8e9..c48fda6cca2 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -12638,7 +12638,7 @@ sparc_file_end (void)
else
{
const int align = floor_log2 (FUNCTION_BOUNDARY / BITS_PER_UNIT);
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
if (align > 0)
ASM_OUTPUT_ALIGN (asm_out_file, align);
ASM_OUTPUT_LABEL (asm_out_file, name);
diff --git a/gcc/config/tilegx/tilegx.h b/gcc/config/tilegx/tilegx.h
index b0dcccfa3aa..931d900002b 100644
--- a/gcc/config/tilegx/tilegx.h
+++ b/gcc/config/tilegx/tilegx.h
@@ -290,7 +290,7 @@ enum reg_class
#define TRAMPOLINE_SIZE (TARGET_32BIT ? 48 : 56)
#define TRAMPOLINE_ALIGNMENT 64
-#define TRAMPOLINE_SECTION text_section
+#define TRAMPOLINE_SECTION casm->sec.text
\f
/* Call frame debugging information. */
diff --git a/gcc/config/tilepro/tilepro.h b/gcc/config/tilepro/tilepro.h
index 1986f80084c..3f9720c582a 100644
--- a/gcc/config/tilepro/tilepro.h
+++ b/gcc/config/tilepro/tilepro.h
@@ -253,7 +253,7 @@ enum reg_class
#define TRAMPOLINE_SIZE 48
#define TRAMPOLINE_ALIGNMENT 64
-#define TRAMPOLINE_SECTION text_section
+#define TRAMPOLINE_SECTION casm->sec.text
\f
/* Call frame debugging information. */
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 4978faf9318..9dafa3d1a76 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -2398,7 +2398,7 @@ v850_output_aligned_bss (FILE * file,
break;
case DATA_AREA_SDA:
- switch_to_section (sbss_section);
+ switch_to_section (casm->sec.sbss);
break;
case DATA_AREA_TDA:
@@ -2406,7 +2406,7 @@ v850_output_aligned_bss (FILE * file,
break;
default:
- switch_to_section (bss_section);
+ switch_to_section (casm->sec.bss);
break;
}
@@ -2882,13 +2882,13 @@ v850_select_section (tree exp,
return tdata_section;
case DATA_AREA_SDA:
- return is_const ? rosdata_section : sdata_section;
+ return is_const ? rosdata_section : casm->sec.sdata;
default:
- return is_const ? readonly_data_section : data_section;
+ return is_const ? casm->sec.readonly_data : casm->sec.data;
}
}
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
\f
/* Worker function for TARGET_FUNCTION_VALUE_REGNO_P. */
diff --git a/gcc/config/visium/visium.h b/gcc/config/visium/visium.h
index 66e3decd0cc..dbe65766d09 100644
--- a/gcc/config/visium/visium.h
+++ b/gcc/config/visium/visium.h
@@ -1235,8 +1235,8 @@ do \
`EXTRA_SECTION_FUNCTIONS'
One or more functions to be defined in `varasm.c'. These functions
- should do jobs analogous to those of `text_section' and
- `data_section', for your additional sections. Do not define this
+ should do jobs analogous to those of `casm->sec.text' and
+ `casm->sec.data', for your additional sections. Do not define this
macro if you do not define `EXTRA_SECTIONS'.
`JUMP_TABLES_IN_TEXT_SECTION' Define this macro if jump tables (for
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 6be282714cf..d8c91d07ca7 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -934,7 +934,7 @@ dbxout_function_end (tree decl ATTRIBUTE_UNUSED)
if (crtl->has_bb_partition)
{
dbxout_begin_empty_stabs (N_FUN);
- if (in_cold_section_p)
+ if (casm->in_cold_section_p)
dbxout_stab_value_label_diff (crtl->subsections.cold_section_end_label,
crtl->subsections.cold_section_label);
else
@@ -1042,7 +1042,7 @@ dbxout_init (const char *input_file_name)
if (used_ltext_label_name)
{
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
targetm.asm_out.internal_label (asm_out_file, "Ltext", 0);
}
@@ -1244,7 +1244,7 @@ dbxout_source_file (const char *filename)
{
/* Don't change section amid function. */
if (current_function_decl == NULL_TREE)
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
dbxout_begin_simple_stabs (remap_debug_filename (filename), N_SOL);
dbxout_stab_value_internal_label ("Ltext", &source_label_number);
@@ -1314,12 +1314,12 @@ dbxout_switch_text_section (void)
/* The N_FUN tag at the end of the function is a GNU extension,
which may be undesirable, and is unnecessary if we do not have
named sections. */
- in_cold_section_p = !in_cold_section_p;
+ casm->in_cold_section_p = !casm->in_cold_section_p;
switch_to_section (current_function_section ());
dbxout_block (DECL_INITIAL (current_function_decl), 0,
DECL_ARGUMENTS (current_function_decl), -1);
dbxout_function_end (current_function_decl);
- in_cold_section_p = !in_cold_section_p;
+ casm->in_cold_section_p = !casm->in_cold_section_p;
switch_to_section (current_function_section ());
@@ -1432,7 +1432,7 @@ dbxout_finish (const char *filename ATTRIBUTE_UNUSED)
DBX_OUTPUT_MAIN_SOURCE_FILE_END (asm_out_file, filename);
#elif defined DBX_OUTPUT_NULL_N_SO_AT_MAIN_SOURCE_FILE_END
{
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
dbxout_begin_empty_stabs (N_SO);
dbxout_stab_value_internal_label ("Letext", 0);
}
@@ -3114,7 +3114,7 @@ dbxout_symbol_location (tree decl, tree type, const char *suffix, rtx home)
{
/* Ultrix `as' seems to need this. */
#ifdef DBX_STATIC_STAB_DATA_SECTION
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
#endif
code = N_STSYM;
}
@@ -3776,7 +3776,7 @@ dbxout_block (tree block, int depth, tree args, int parent_blocknum)
/* If called for the second partition, ignore blocks that don't have
any children in the second partition. */
- if (crtl->has_bb_partition && in_cold_section_p && depth == 0)
+ if (crtl->has_bb_partition && casm->in_cold_section_p && depth == 0)
dbx_block_with_cold_children (block);
for (; block; block = BLOCK_CHAIN (block))
@@ -3801,7 +3801,7 @@ dbxout_block (tree block, int depth, tree args, int parent_blocknum)
the assembler symbols LBBn and LBEn
that final will define around the code in this block. */
if (did_output
- && BLOCK_IN_COLD_SECTION_P (block) == in_cold_section_p)
+ && BLOCK_IN_COLD_SECTION_P (block) == casm->in_cold_section_p)
{
char buf[20];
const char *scope_start;
@@ -3829,7 +3829,7 @@ dbxout_block (tree block, int depth, tree args, int parent_blocknum)
/* Refer to the marker for the end of the block. */
if (did_output
- && BLOCK_IN_COLD_SECTION_P (block) == in_cold_section_p)
+ && BLOCK_IN_COLD_SECTION_P (block) == casm->in_cold_section_p)
{
char buf[100];
if (depth == 0)
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 990152f5b15..73ea9a3d920 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -5525,7 +5525,7 @@ to generate it on the spot.
@defmac TRAMPOLINE_SECTION
Return the section into which the trampoline template is to be placed
-(@pxref{Sections}). The default value is @code{readonly_data_section}.
+(@pxref{Sections}). The default value is @code{casm->sec.readonly_data}.
@end defmac
@defmac TRAMPOLINE_SIZE
@@ -7593,7 +7593,7 @@ section}, which holds uninitialized data. Some systems have other kinds
of sections.
@file{varasm.c} provides several well-known sections, such as
-@code{text_section}, @code{data_section} and @code{bss_section}.
+@code{casm->sec.text}, @code{casm->sec.data} and @code{casm->sec.bss}.
The normal way of controlling a @code{@var{foo}_section} variable
is to define the associated @code{@var{FOO}_SECTION_ASM_OP} macro,
as described below. The macros are only read once, when @file{varasm.c}
@@ -7609,12 +7609,12 @@ section is selected. If your assembler falls into this category, you
should define the @code{TARGET_ASM_INIT_SECTIONS} hook and use
@code{get_unnamed_section} to set up the sections.
-You must always create a @code{text_section}, either by defining
-@code{TEXT_SECTION_ASM_OP} or by initializing @code{text_section}
+You must always create a @code{casm->sec.text}, either by defining
+@code{TEXT_SECTION_ASM_OP} or by initializing @code{casm->sec.text}
in @code{TARGET_ASM_INIT_SECTIONS}. The same is true of
-@code{data_section} and @code{DATA_SECTION_ASM_OP}. If you do not
-create a distinct @code{readonly_data_section}, the default is to
-reuse @code{text_section}.
+@code{casm->sec.data} and @code{DATA_SECTION_ASM_OP}. If you do not
+create a distinct @code{casm->sec.readonly_data}, the default is to
+reuse @code{casm->sec.text}.
All the other @file{varasm.c} sections are optional, and are null
if the target does not provide them.
diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
index 193c9bdd853..2ef3977839c 100644
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -3854,7 +3854,7 @@ separately.
@defmac TRAMPOLINE_SECTION
Return the section into which the trampoline template is to be placed
-(@pxref{Sections}). The default value is @code{readonly_data_section}.
+(@pxref{Sections}). The default value is @code{casm->sec.readonly_data}.
@end defmac
@defmac TRAMPOLINE_SIZE
@@ -4752,7 +4752,7 @@ section}, which holds uninitialized data. Some systems have other kinds
of sections.
@file{varasm.c} provides several well-known sections, such as
-@code{text_section}, @code{data_section} and @code{bss_section}.
+@code{casm->sec.text}, @code{casm->sec.data} and @code{casm->sec.bss}.
The normal way of controlling a @code{@var{foo}_section} variable
is to define the associated @code{@var{FOO}_SECTION_ASM_OP} macro,
as described below. The macros are only read once, when @file{varasm.c}
@@ -4768,12 +4768,12 @@ section is selected. If your assembler falls into this category, you
should define the @code{TARGET_ASM_INIT_SECTIONS} hook and use
@code{get_unnamed_section} to set up the sections.
-You must always create a @code{text_section}, either by defining
-@code{TEXT_SECTION_ASM_OP} or by initializing @code{text_section}
+You must always create a @code{casm->sec.text}, either by defining
+@code{TEXT_SECTION_ASM_OP} or by initializing @code{casm->sec.text}
in @code{TARGET_ASM_INIT_SECTIONS}. The same is true of
-@code{data_section} and @code{DATA_SECTION_ASM_OP}. If you do not
-create a distinct @code{readonly_data_section}, the default is to
-reuse @code{text_section}.
+@code{casm->sec.data} and @code{DATA_SECTION_ASM_OP}. If you do not
+create a distinct @code{casm->sec.readonly_data}, the default is to
+reuse @code{casm->sec.text}.
All the other @file{varasm.c} sections are optional, and are null
if the target does not provide them.
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 20f2c5da023..fd0c5366437 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -438,14 +438,14 @@ should_emit_struct_debug (tree type, enum debug_info_usage usage)
return DUMP_GSTRUCT (type, usage, criterion, generic, false, false);
}
\f
-/* Switch [BACK] to eh_frame_section. If we don't have an eh_frame_section,
+/* Switch [BACK] to casm->sec.eh_frame. If we don't have an casm->sec.eh_frame,
switch to the data section instead, and write out a synthetic start label
for collect2 the first time around. */
static void
switch_to_eh_frame_section (bool back ATTRIBUTE_UNUSED)
{
- if (eh_frame_section == 0)
+ if (casm->sec.eh_frame == 0)
{
int flags;
@@ -474,14 +474,14 @@ switch_to_eh_frame_section (bool back ATTRIBUTE_UNUSED)
flags = SECTION_WRITE;
#ifdef EH_FRAME_SECTION_NAME
- eh_frame_section = get_section (EH_FRAME_SECTION_NAME, flags, NULL);
+ casm->sec.eh_frame = get_section (EH_FRAME_SECTION_NAME, flags, NULL);
#else
- eh_frame_section = ((flags == SECTION_WRITE)
- ? data_section : readonly_data_section);
+ casm->sec.eh_frame = ((flags == SECTION_WRITE)
+ ? casm->sec.data : casm->sec.readonly_data);
#endif /* EH_FRAME_SECTION_NAME */
}
- switch_to_section (eh_frame_section);
+ switch_to_section (casm->sec.eh_frame);
#ifdef EH_FRAME_THROUGH_COLLECT2
/* We have no special eh_frame section. Emit special labels to guide
@@ -1113,10 +1113,10 @@ dwarf2out_begin_prologue (unsigned int line ATTRIBUTE_UNUSED,
/* Initialize the bits of CURRENT_FDE that were not available earlier. */
fde->dw_fde_begin = dup_label;
fde->dw_fde_current_label = dup_label;
- fde->in_std_section = (fnsec == text_section
+ fde->in_std_section = (fnsec == casm->sec.text
|| (cold_text_section && fnsec == cold_text_section));
fde->ignored_debug = DECL_IGNORED_P (current_function_decl);
- in_text_section_p = fnsec == text_section;
+ in_text_section_p = fnsec == casm->sec.text;
/* We only want to output line number information for the genuine dwarf2
prologue case, not the eh frame case. */
@@ -1295,7 +1295,7 @@ dwarf2out_switch_text_section (void)
current_function_funcdef_no);
fde->dw_fde_second_begin = ggc_strdup (label);
- if (!in_cold_section_p)
+ if (!casm->in_cold_section_p)
{
fde->dw_fde_end = crtl->subsections.cold_section_end_label;
fde->dw_fde_second_end = crtl->subsections.hot_section_end_label;
@@ -1317,9 +1317,9 @@ dwarf2out_switch_text_section (void)
switch_to_section (sect);
fde->second_in_std_section
- = (sect == text_section
+ = (sect == casm->sec.text
|| (cold_text_section && sect == cold_text_section));
- in_text_section_p = sect == text_section;
+ in_text_section_p = sect == casm->sec.text;
if (dwarf2out_do_cfi_asm ())
dwarf2out_do_cfi_startproc (true);
@@ -17270,7 +17270,7 @@ secname_for_decl (const_tree decl)
secname = DECL_SECTION_NAME (decl);
else if (current_function_decl && DECL_SECTION_NAME (current_function_decl))
{
- if (in_cold_section_p)
+ if (casm->in_cold_section_p)
{
section *sec = current_function_section ();
if (sec->common.flags & SECTION_NAMED)
@@ -17278,7 +17278,7 @@ secname_for_decl (const_tree decl)
}
secname = DECL_SECTION_NAME (current_function_decl);
}
- else if (cfun && in_cold_section_p)
+ else if (cfun && casm->in_cold_section_p)
secname = crtl->subsections.cold_section_label;
else
secname = text_section_label;
@@ -17599,12 +17599,12 @@ dw_loc_list (var_loc_list *loc_list, tree decl, int want_address)
if (cfun && crtl->has_bb_partition)
{
- bool save_in_cold_section_p = in_cold_section_p;
- in_cold_section_p = first_function_block_is_cold;
+ bool save_in_cold_section_p = casm->in_cold_section_p;
+ casm->in_cold_section_p = first_function_block_is_cold;
if (loc_list->last_before_switch == NULL)
- in_cold_section_p = !in_cold_section_p;
+ casm->in_cold_section_p = !casm->in_cold_section_p;
secname = secname_for_decl (decl);
- in_cold_section_p = save_in_cold_section_p;
+ casm->in_cold_section_p = save_in_cold_section_p;
}
else
secname = secname_for_decl (decl);
@@ -17682,10 +17682,10 @@ dw_loc_list (var_loc_list *loc_list, tree decl, int want_address)
&& crtl->has_bb_partition
&& node == loc_list->last_before_switch)
{
- bool save_in_cold_section_p = in_cold_section_p;
- in_cold_section_p = !first_function_block_is_cold;
+ bool save_in_cold_section_p = casm->in_cold_section_p;
+ casm->in_cold_section_p = !first_function_block_is_cold;
secname = secname_for_decl (decl);
- in_cold_section_p = save_in_cold_section_p;
+ casm->in_cold_section_p = save_in_cold_section_p;
}
if (range_across_switch)
@@ -27853,7 +27853,7 @@ create_label:
last_{,postcall_}label so that they are not reused this time. */
if (last_var_location_insn == NULL_RTX
|| last_var_location_insn != next_real
- || last_in_cold_section_p != in_cold_section_p)
+ || last_in_cold_section_p != casm->in_cold_section_p)
{
last_label = NULL;
last_postcall_label = NULL;
@@ -28024,7 +28024,7 @@ create_label:
}
last_var_location_insn = next_real;
- last_in_cold_section_p = in_cold_section_p;
+ last_in_cold_section_p = casm->in_cold_section_p;
}
/* Check whether BLOCK, a lexical block, is nested within OUTER, or is
@@ -28192,7 +28192,7 @@ set_cur_line_info_table (section *sec)
{
dw_line_info_table *table;
- if (sec == text_section)
+ if (sec == casm->sec.text)
table = text_section_line_info;
else if (sec == cold_text_section)
{
@@ -28209,7 +28209,7 @@ set_cur_line_info_table (section *sec)
if (crtl->has_bb_partition)
{
- if (in_cold_section_p)
+ if (casm->in_cold_section_p)
end_label = crtl->subsections.cold_section_end_label;
else
end_label = crtl->subsections.hot_section_end_label;
@@ -28246,7 +28246,7 @@ dwarf2out_begin_function (tree fun)
{
section *sec = function_section (fun);
- if (sec != text_section)
+ if (sec != casm->sec.text)
have_multiple_function_sections = true;
if (crtl->has_bb_partition && !cold_text_section)
@@ -29375,7 +29375,7 @@ dwarf2out_assembly_start (void)
COLD_TEXT_SECTION_LABEL, 0);
ASM_GENERATE_INTERNAL_LABEL (cold_end_label, COLD_END_LABEL, 0);
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
ASM_OUTPUT_LABEL (asm_out_file, text_section_label);
#endif
@@ -32082,7 +32082,7 @@ dwarf2out_finish (const char *filename)
main_comp_unit_die = comp_unit_die ();
/* Output a terminator label for the .text section. */
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
targetm.asm_out.internal_label (asm_out_file, TEXT_END_LABEL, 0);
if (cold_text_section)
{
@@ -32998,7 +32998,7 @@ dwarf2out_early_finish (const char *filename)
}
/* Switch back to the text section. */
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
}
/* Reset all state within dwarf2out.c so that we can rerun the compiler
diff --git a/gcc/dwarf2out.h b/gcc/dwarf2out.h
index 312a9909784..6491b44da95 100644
--- a/gcc/dwarf2out.h
+++ b/gcc/dwarf2out.h
@@ -103,9 +103,9 @@ struct GTY(()) dw_fde_node {
unsigned stack_realign : 1;
/* Whether dynamic realign argument pointer register has been saved. */
unsigned drap_reg_saved: 1;
- /* True iff dw_fde_begin label is in text_section or cold_text_section. */
+ /* True iff dw_fde_begin label is in casm->sec.text or cold_text_section. */
unsigned in_std_section : 1;
- /* True iff dw_fde_second_begin label is in text_section or
+ /* True iff dw_fde_second_begin label is in casm->sec.text or
cold_text_section. */
unsigned second_in_std_section : 1;
/* True if Rule 18 described in dwarf2cfi.c is in action, i.e. for dynamic
diff --git a/gcc/except.c b/gcc/except.c
index 8e905a30939..ce38a57ed2f 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -2906,8 +2906,8 @@ switch_to_exception_section (const char * ARG_UNUSED (fnname))
{
section *s;
- if (exception_section)
- s = exception_section;
+ if (casm->sec.exception)
+ s = casm->sec.exception;
else
{
int flags;
@@ -2924,7 +2924,7 @@ switch_to_exception_section (const char * ARG_UNUSED (fnname))
else
flags = SECTION_WRITE;
- /* Compute the section and cache it into exception_section,
+ /* Compute the section and cache it into casm->sec.exception,
unless it depends on the function name. */
if (targetm_common.have_named_sections)
{
@@ -2943,12 +2943,12 @@ switch_to_exception_section (const char * ARG_UNUSED (fnname))
}
else
#endif
- exception_section
+ casm->sec.exception
= s = get_section (".gcc_except_table", flags, NULL);
}
else
- exception_section
- = s = flags == SECTION_WRITE ? data_section : readonly_data_section;
+ casm->sec.exception
+ = s = flags == SECTION_WRITE ? casm->sec.data: casm->sec.readonly_data;
}
switch_to_section (s);
diff --git a/gcc/final.c b/gcc/final.c
index ac6892d041c..03c8533e92b 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -885,7 +885,7 @@ shorten_branches (rtx_insn *first)
/* ADDR_VECs only take room if read-only data goes into the text
section. */
if ((JUMP_TABLES_IN_TEXT_SECTION
- || readonly_data_section == text_section)
+ || casm->sec.readonly_data == casm->sec.text)
&& table)
{
align_flags alignment = align_flags (ADDR_VEC_ALIGN (table));
@@ -1051,7 +1051,7 @@ shorten_branches (rtx_insn *first)
/* This only takes room if read-only data goes into the text
section. */
if (JUMP_TABLES_IN_TEXT_SECTION
- || readonly_data_section == text_section)
+ || casm->sec.readonly_data == casm->sec.text)
insn_lengths[uid] = (XVECLEN (body,
GET_CODE (body) == ADDR_DIFF_VEC)
* GET_MODE_SIZE (table->get_data_mode ()));
@@ -1143,7 +1143,7 @@ shorten_branches (rtx_insn *first)
may need to update the alignment of this label. */
if (JUMP_TABLES_IN_TEXT_SECTION
- || readonly_data_section == text_section)
+ || casm->sec.readonly_data == casm->sec.text)
{
rtx_jump_table_data *table = jump_table_for_label (label);
if (table)
@@ -1284,7 +1284,7 @@ shorten_branches (rtx_insn *first)
>= GET_MODE_SIZE (table->get_data_mode ())))
PUT_MODE (body, vec_mode);
if (JUMP_TABLES_IN_TEXT_SECTION
- || readonly_data_section == text_section)
+ || casm->sec.readonly_data == casm->sec.text)
{
insn_lengths[uid]
= (XVECLEN (body, 1)
@@ -1836,7 +1836,7 @@ profile_function (FILE *file ATTRIBUTE_UNUSED)
if (! NO_PROFILE_COUNTERS)
{
int align = MIN (BIGGEST_ALIGNMENT, LONG_TYPE_SIZE);
- switch_to_section (data_section);
+ switch_to_section (casm->sec.data);
ASM_OUTPUT_ALIGN (file, floor_log2 (align / BITS_PER_UNIT));
targetm.asm_out.internal_label (file, "LP", current_function_funcdef_no);
assemble_integer (const0_rtx, LONG_TYPE_SIZE / BITS_PER_UNIT, align, 1);
@@ -2189,10 +2189,10 @@ final_scan_insn_1 (rtx_insn *insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED,
if (targetm.asm_out.unwind_emit)
targetm.asm_out.unwind_emit (asm_out_file, insn);
- in_cold_section_p = !in_cold_section_p;
+ casm->in_cold_section_p = !casm->in_cold_section_p;
- gcc_checking_assert (in_cold_section_p);
- if (in_cold_section_p)
+ gcc_checking_assert (casm->in_cold_section_p);
+ if (casm->in_cold_section_p)
cold_function_name
= clone_function_name (current_function_decl, "cold");
@@ -2213,10 +2213,10 @@ final_scan_insn_1 (rtx_insn *insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED,
switch_to_section (current_function_section ());
targetm.asm_out.function_switched_text_sections (asm_out_file,
current_function_decl,
- in_cold_section_p);
+ casm->in_cold_section_p);
/* Emit a label for the split cold section. Form label name by
suffixing "cold" to the original function's name. */
- if (in_cold_section_p)
+ if (casm->in_cold_section_p)
{
#ifdef ASM_DECLARE_COLD_FUNCTION_NAME
ASM_DECLARE_COLD_FUNCTION_NAME (asm_out_file,
@@ -2323,7 +2323,7 @@ final_scan_insn_1 (rtx_insn *insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED,
/* Mark this block as output. */
TREE_ASM_WRITTEN (NOTE_BLOCK (insn)) = 1;
- BLOCK_IN_COLD_SECTION_P (NOTE_BLOCK (insn)) = in_cold_section_p;
+ BLOCK_IN_COLD_SECTION_P (NOTE_BLOCK (insn)) = casm->in_cold_section_p;
}
if (write_symbols == DBX_DEBUG)
{
@@ -2358,7 +2358,7 @@ final_scan_insn_1 (rtx_insn *insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED,
if (!DECL_IGNORED_P (current_function_decl))
debug_hooks->end_block (high_block_linenum, n);
gcc_assert (BLOCK_IN_COLD_SECTION_P (NOTE_BLOCK (insn))
- == in_cold_section_p);
+ == casm->in_cold_section_p);
}
if (write_symbols == DBX_DEBUG)
{
diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c
index 32ba5be42b2..d90a8570dba 100644
--- a/gcc/ggc-common.c
+++ b/gcc/ggc-common.c
@@ -30,6 +30,7 @@ along with GCC; see the file COPYING3. If not see
#include "hosthooks.h"
#include "plugin.h"
#include "options.h"
+#include "output.h"
/* When true, protect the contents of the identifier hash table. */
bool ggc_protect_identifiers = true;
@@ -589,6 +590,9 @@ gt_pch_restore (FILE *f)
struct mmap_info mmi;
int result;
+ /* Hide ASM state object as we don't want it to be streamed. */
+ FILE *saved_casm_out_file = casm != NULL ? casm->out_file : NULL;
+
/* Delete any deletable objects. This makes ggc_pch_read much
faster, as it can be sure that no GCable objects remain other
than the ones just read in. */
@@ -629,6 +633,9 @@ gt_pch_restore (FILE *f)
ggc_pch_read (f, mmi.preferred_base);
gt_pch_restore_stringpool ();
+
+ if (casm != NULL)
+ casm->out_file = saved_casm_out_file;
}
/* Default version of HOST_HOOKS_GT_PCH_GET_ADDRESS when mmap is not present.
diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index 48c72377778..cd1ed0655e5 100644
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -803,9 +803,9 @@ lhd_begin_section (const char *name)
/* Save the old section so we can restore it in lto_end_asm_section. */
gcc_assert (!saved_section);
- saved_section = in_section;
+ saved_section = casm->in_section;
if (!saved_section)
- saved_section = text_section;
+ saved_section = casm->sec.text;
/* Create a new section and switch to it. */
section = get_section (name, SECTION_DEBUG | SECTION_EXCLUDE, NULL, true);
diff --git a/gcc/output.h b/gcc/output.h
index 8f6f15308f4..2c6ddb1a32e 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -313,9 +313,78 @@ extern rtx_sequence *final_sequence;
/* File in which assembler code is being written. */
-#ifdef BUFSIZ
-extern FILE *asm_out_file;
-#endif
+struct section_hasher : ggc_ptr_hash<section>
+{
+ typedef const char *compare_type;
+
+ static hashval_t hash (section *);
+ static bool equal (section *, const char *);
+};
+
+/* Assembly output state. */
+
+struct GTY(()) asm_out_state
+{
+ asm_out_state (): out_file (NULL), in_section (NULL),
+ sec ({}), anchor_labelno (0), in_cold_section_p (false)
+ {
+ section_htab = hash_table<section_hasher>::create_ggc (31);
+ }
+
+ /* Assembly output stream. */
+ FILE * GTY((skip)) out_file;
+
+ /* Hash table of named sections. */
+ hash_table<section_hasher> *section_htab;
+
+ /* asm_out_file's current section. This is NULL if no section has yet
+ been selected or if we lose track of what the current section is. */
+ section *in_section;
+
+ /* Well-known sections, each one associated with some sort of *_ASM_OP. */
+ struct
+ {
+ section *text;
+ section *data;
+ section *readonly_data;
+ section *sdata;
+ section *ctors;
+ section *dtors;
+ section *bss;
+ section *sbss;
+
+ /* Various forms of common section. All are guaranteed to be nonnull. */
+ section *tls_comm;
+ section *comm;
+ section *lcomm;
+
+ /* A SECTION_NOSWITCH section used for declaring global BSS variables.
+ May be null. */
+ section *bss_noswitch;
+
+ /* The section that holds the main exception table, when known. The section
+ is set either by the target's init_sections hook or by the first call to
+ switch_to_exception_section. */
+ section *exception;
+
+ /* The section that holds the DWARF2 frame unwind information, when known.
+ The section is set either by the target's init_sections hook or by the
+ first call to switch_to_eh_frame_section. */
+ section *eh_frame;
+ } sec;
+
+ /* The next number to use for internal anchor labels. */
+ int anchor_labelno;
+
+ /* True if code for the current function is currently being directed
+ at the cold section. */
+ bool in_cold_section_p;
+};
+
+extern GTY(()) asm_out_state *casm;
+
+/* Helper macro for commonly used accesses. */
+#define asm_out_file casm->out_file
/* The first global object in the file. */
extern const char *first_global_object_name;
@@ -520,24 +589,6 @@ union GTY ((desc ("SECTION_STYLE (&(%h))"), for_user)) section {
struct object_block;
/* Special well-known sections. */
-extern GTY(()) section *text_section;
-extern GTY(()) section *data_section;
-extern GTY(()) section *readonly_data_section;
-extern GTY(()) section *sdata_section;
-extern GTY(()) section *ctors_section;
-extern GTY(()) section *dtors_section;
-extern GTY(()) section *bss_section;
-extern GTY(()) section *sbss_section;
-extern GTY(()) section *exception_section;
-extern GTY(()) section *eh_frame_section;
-extern GTY(()) section *tls_comm_section;
-extern GTY(()) section *comm_section;
-extern GTY(()) section *lcomm_section;
-extern GTY(()) section *bss_noswitch_section;
-
-extern GTY(()) section *in_section;
-extern GTY(()) bool in_cold_section_p;
-
extern section *get_unnamed_section (unsigned int, void (*) (const void *),
const void *);
extern section *get_section (const char *, unsigned int, tree,
diff --git a/gcc/run-rtl-passes.c b/gcc/run-rtl-passes.c
index 37a02813f22..e6976bf9070 100644
--- a/gcc/run-rtl-passes.c
+++ b/gcc/run-rtl-passes.c
@@ -46,7 +46,7 @@ run_rtl_passes (char *initial_pass_name)
max_regno = max_reg_num ();
/* cgraphunit.c normally handles this. */
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
(*debug_hooks->assembly_start) ();
if (initial_pass_name)
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 0b525bb4606..03102e38b33 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -1962,7 +1962,7 @@ default_print_patchable_function_entry_1 (FILE *file,
{
char buf[256];
static int patch_area_number;
- section *previous_section = in_section;
+ section *previous_section = casm->in_section;
const char *asm_op = integer_asm_op (POINTER_SIZE_UNITS, false);
gcc_assert (asm_op != NULL);
diff --git a/gcc/toplev.c b/gcc/toplev.c
index cb4f8c470f0..cb1ded54c82 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -166,7 +166,8 @@ const char *user_label_prefix;
/* Output files for assembler code (real compiler output)
and debugging dumps. */
-FILE *asm_out_file;
+asm_out_state *casm;
+
FILE *aux_info_file;
FILE *callgraph_info_file = NULL;
static bitmap callgraph_info_external_printed;
@@ -546,13 +547,13 @@ compile_file (void)
if (flag_generate_lto && !flag_fat_lto_objects)
{
#if defined ASM_OUTPUT_ALIGNED_DECL_COMMON
- ASM_OUTPUT_ALIGNED_DECL_COMMON (asm_out_file, NULL_TREE, "__gnu_lto_slim",
+ ASM_OUTPUT_ALIGNED_DECL_COMMON (casm->out_file, NULL_TREE, "__gnu_lto_slim",
HOST_WIDE_INT_1U, 8);
#elif defined ASM_OUTPUT_ALIGNED_COMMON
- ASM_OUTPUT_ALIGNED_COMMON (asm_out_file, "__gnu_lto_slim",
+ ASM_OUTPUT_ALIGNED_COMMON (casm->out_file, "__gnu_lto_slim",
HOST_WIDE_INT_1U, 8);
#else
- ASM_OUTPUT_COMMON (asm_out_file, "__gnu_lto_slim",
+ ASM_OUTPUT_COMMON (casm->out_file, "__gnu_lto_slim",
HOST_WIDE_INT_1U,
HOST_WIDE_INT_1U);
#endif
@@ -690,7 +691,7 @@ static void
init_asm_output (const char *name)
{
if (name == NULL && asm_file_name == 0)
- asm_out_file = stdout;
+ casm->out_file = stdout;
else
{
if (asm_file_name == 0)
@@ -704,17 +705,17 @@ init_asm_output (const char *name)
asm_file_name = dumpname;
}
if (!strcmp (asm_file_name, "-"))
- asm_out_file = stdout;
+ casm->out_file = stdout;
else if (!canonical_filename_eq (asm_file_name, name)
|| !strcmp (asm_file_name, HOST_BIT_BUCKET))
- asm_out_file = fopen (asm_file_name, "w");
+ casm->out_file = fopen (asm_file_name, "w");
else
/* Use UNKOWN_LOCATION to prevent gcc from printing the first
line in the current file. */
fatal_error (UNKNOWN_LOCATION,
"input file %qs is the same as output file",
asm_file_name);
- if (asm_out_file == 0)
+ if (casm->out_file == 0)
fatal_error (UNKNOWN_LOCATION,
"cannot open %qs for writing: %m", asm_file_name);
}
@@ -741,14 +742,14 @@ init_asm_output (const char *name)
if (flag_verbose_asm)
{
- print_version (asm_out_file, ASM_COMMENT_START, true);
- fputs (ASM_COMMENT_START, asm_out_file);
- fputs (" options passed: ", asm_out_file);
+ print_version (casm->out_file, ASM_COMMENT_START, true);
+ fputs (ASM_COMMENT_START, casm->out_file);
+ fputs (" options passed: ", casm->out_file);
char *cmdline = gen_command_line_string (save_decoded_options,
save_decoded_options_count);
- fputs (cmdline, asm_out_file);
+ fputs (cmdline, casm->out_file);
free (cmdline);
- fputc ('\n', asm_out_file);
+ fputc ('\n', casm->out_file);
}
}
}
@@ -1895,7 +1896,8 @@ lang_dependent_init (const char *name)
if (!flag_wpa)
{
- init_asm_output (name);
+ if (!flag_syntax_only)
+ init_asm_output (name);
if (!flag_generate_lto && !flag_compare_debug)
{
@@ -2054,13 +2056,13 @@ finalize (bool no_backend)
whether fclose returns an error, since the pages might still be on the
buffer chain while the file is open. */
- if (asm_out_file)
+ if (casm != NULL && casm->out_file)
{
- if (ferror (asm_out_file) != 0)
+ if (ferror (casm->out_file) != 0)
fatal_error (input_location, "error writing to %s: %m", asm_file_name);
- if (fclose (asm_out_file) != 0)
+ if (fclose (casm->out_file) != 0)
fatal_error (input_location, "error closing %s: %m", asm_file_name);
- asm_out_file = NULL;
+ casm->out_file = NULL;
}
if (stack_usage_file)
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 09316c62050..f0253383344 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -130,43 +130,6 @@ static void mark_weak (tree);
static void output_constant_pool (const char *, tree);
static void handle_vtv_comdat_section (section *, const_tree);
\f
-/* Well-known sections, each one associated with some sort of *_ASM_OP. */
-section *text_section;
-section *data_section;
-section *readonly_data_section;
-section *sdata_section;
-section *ctors_section;
-section *dtors_section;
-section *bss_section;
-section *sbss_section;
-
-/* Various forms of common section. All are guaranteed to be nonnull. */
-section *tls_comm_section;
-section *comm_section;
-section *lcomm_section;
-
-/* A SECTION_NOSWITCH section used for declaring global BSS variables.
- May be null. */
-section *bss_noswitch_section;
-
-/* The section that holds the main exception table, when known. The section
- is set either by the target's init_sections hook or by the first call to
- switch_to_exception_section. */
-section *exception_section;
-
-/* The section that holds the DWARF2 frame unwind information, when known.
- The section is set either by the target's init_sections hook or by the
- first call to switch_to_eh_frame_section. */
-section *eh_frame_section;
-
-/* asm_out_file's current section. This is NULL if no section has yet
- been selected or if we lose track of what the current section is. */
-section *in_section;
-
-/* True if code for the current function is currently being directed
- at the cold section. */
-bool in_cold_section_p;
-
/* The following global holds the "function name" for the code in the
cold section of a function, if hot/cold function splitting is enabled
and there was actually code that went into the cold section. A
@@ -181,17 +144,6 @@ static GTY(()) section *unnamed_sections;
#define IN_NAMED_SECTION(DECL) \
(VAR_OR_FUNCTION_DECL_P (DECL) && DECL_SECTION_NAME (DECL) != NULL)
-struct section_hasher : ggc_ptr_hash<section>
-{
- typedef const char *compare_type;
-
- static hashval_t hash (section *);
- static bool equal (section *, const char *);
-};
-
-/* Hash table of named sections. */
-static GTY(()) hash_table<section_hasher> *section_htab;
-
struct object_block_hasher : ggc_ptr_hash<object_block>
{
typedef const section *compare_type;
@@ -203,9 +155,6 @@ struct object_block_hasher : ggc_ptr_hash<object_block>
/* A table of object_blocks, indexed by section. */
static GTY(()) hash_table<object_block_hasher> *object_block_htab;
-/* The next number to use for internal anchor labels. */
-static GTY(()) int anchor_labelno;
-
/* A pool of constants that can be shared between functions. */
static GTY(()) struct rtx_constant_pool *shared_constant_pool;
@@ -294,8 +243,8 @@ get_section (const char *name, unsigned int flags, tree decl,
{
section *sect, **slot;
- slot = section_htab->find_slot_with_hash (name, htab_hash_string (name),
- INSERT);
+ slot = casm->section_htab->find_slot_with_hash (name, htab_hash_string (name),
+ INSERT);
flags |= SECTION_NAMED;
if (decl != nullptr
&& DECL_P (decl)
@@ -510,7 +459,7 @@ asm_output_aligned_bss (FILE *file, tree decl ATTRIBUTE_UNUSED,
const char *name, unsigned HOST_WIDE_INT size,
int align)
{
- switch_to_section (bss_section);
+ switch_to_section (casm->sec.bss);
ASM_OUTPUT_ALIGN (file, floor_log2 (align / BITS_PER_UNIT));
#ifdef ASM_DECLARE_OBJECT_NAME
last_assemble_variable_decl = decl;
@@ -527,7 +476,7 @@ asm_output_aligned_bss (FILE *file, tree decl ATTRIBUTE_UNUSED,
#endif /* BSS_SECTION_ASM_OP */
#ifndef USE_SELECT_SECTION_FOR_FUNCTIONS
-/* Return the hot section for function DECL. Return text_section for
+/* Return the hot section for function DECL. Return casm->sec.text for
null DECLs. */
static section *
@@ -538,7 +487,7 @@ hot_function_section (tree decl)
&& targetm_common.have_named_sections)
return get_named_section (decl, NULL, 0);
else
- return text_section;
+ return casm->sec.text;
}
#endif
@@ -718,7 +667,7 @@ function_section (tree decl)
section *
current_function_section (void)
{
- return function_section_1 (current_function_decl, in_cold_section_p);
+ return function_section_1 (current_function_decl, casm->in_cold_section_p);
}
/* Tell assembler to switch to unlikely-to-be-executed text section. */
@@ -746,7 +695,7 @@ unlikely_text_section_p (section *sect)
void
switch_to_other_text_partition (void)
{
- in_cold_section_p = !in_cold_section_p;
+ casm->in_cold_section_p = !casm->in_cold_section_p;
switch_to_section (current_function_section ());
}
@@ -831,7 +780,7 @@ default_function_rodata_section (tree decl, bool relocatable)
if (relocatable)
return get_section (sname, flags, decl);
else
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
/* Return the read-only data section associated with function DECL
@@ -841,7 +790,7 @@ default_function_rodata_section (tree decl, bool relocatable)
section *
default_no_function_rodata_section (tree, bool)
{
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
/* A subroutine of mergeable_string_section and mergeable_constant_section. */
@@ -890,7 +839,7 @@ mergeable_string_section (tree decl ATTRIBUTE_UNUSED,
align = modesize;
if (!HAVE_LD_ALIGNED_SHF_MERGE && align > 8)
- return readonly_data_section;
+ return casm->sec.readonly_data;
str = TREE_STRING_POINTER (decl);
unit = GET_MODE_SIZE (mode);
@@ -914,7 +863,7 @@ mergeable_string_section (tree decl ATTRIBUTE_UNUSED,
}
}
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
/* Return the section to use for constant merging. */
@@ -940,7 +889,7 @@ mergeable_constant_section (machine_mode mode ATTRIBUTE_UNUSED,
flags |= (align / 8) | SECTION_MERGE;
return get_section (name, flags, NULL);
}
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
\f
/* Given NAME, a putative register name, discard any customary prefixes. */
@@ -1253,9 +1202,9 @@ get_variable_section (tree decl, bool prefer_noswitch_p)
gcc_assert (DECL_SECTION_NAME (decl) == NULL
&& ADDR_SPACE_GENERIC_P (as));
if (DECL_THREAD_LOCAL_P (decl))
- return tls_comm_section;
+ return casm->sec.tls_comm;
else if (TREE_PUBLIC (decl) && bss_initializer_p (decl))
- return comm_section;
+ return casm->sec.comm;
}
reloc = compute_reloc_for_var (decl);
@@ -1285,9 +1234,9 @@ get_variable_section (tree decl, bool prefer_noswitch_p)
if (!TREE_PUBLIC (decl)
&& !((flag_sanitize & SANITIZE_ADDRESS)
&& asan_protect_global (decl)))
- return lcomm_section;
- if (bss_noswitch_section)
- return bss_noswitch_section;
+ return casm->sec.lcomm;
+ if (casm->sec.bss_noswitch)
+ return casm->sec.bss_noswitch;
}
return targetm.asm_out.select_section (decl, reloc,
@@ -1733,7 +1682,7 @@ void
default_dtor_section_asm_out_destructor (rtx symbol,
int priority ATTRIBUTE_UNUSED)
{
- assemble_addr_to_section (symbol, dtors_section);
+ assemble_addr_to_section (symbol, casm->sec.dtors);
}
#endif
@@ -1756,7 +1705,7 @@ void
default_ctor_section_asm_out_constructor (rtx symbol,
int priority ATTRIBUTE_UNUSED)
{
- assemble_addr_to_section (symbol, ctors_section);
+ assemble_addr_to_section (symbol, casm->sec.ctors);
}
#endif
\f
@@ -1824,7 +1773,7 @@ decide_function_section (tree decl)
== NODE_FREQUENCY_UNLIKELY_EXECUTED);
}
- in_cold_section_p = first_function_block_is_cold;
+ casm->in_cold_section_p = first_function_block_is_cold;
}
/* Get the function's name, as described by its RTL. This may be
@@ -1900,13 +1849,13 @@ assemble_start_function (tree decl, const char *fnname)
if (!cfun->is_thunk
&& BB_PARTITION (ENTRY_BLOCK_PTR_FOR_FN (cfun)->next_bb) == BB_COLD_PARTITION)
{
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
assemble_align (align);
ASM_OUTPUT_LABEL (asm_out_file, crtl->subsections.hot_section_label);
hot_label_written = true;
first_function_block_is_cold = true;
}
- in_cold_section_p = first_function_block_is_cold;
+ casm->in_cold_section_p = first_function_block_is_cold;
}
@@ -2020,7 +1969,7 @@ assemble_end_function (tree decl, const char *fnname ATTRIBUTE_UNUSED)
{
section *save_text_section;
- save_text_section = in_section;
+ save_text_section = casm->in_section;
switch_to_section (unlikely_text_section ());
#ifdef ASM_DECLARE_COLD_FUNCTION_SIZE
if (cold_function_name != NULL_TREE)
@@ -2030,7 +1979,7 @@ assemble_end_function (tree decl, const char *fnname ATTRIBUTE_UNUSED)
#endif
ASM_OUTPUT_LABEL (asm_out_file, crtl->subsections.cold_section_end_label);
if (first_function_block_is_cold)
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
else
switch_to_section (function_section (decl));
ASM_OUTPUT_LABEL (asm_out_file, crtl->subsections.hot_section_end_label);
@@ -2050,7 +1999,7 @@ assemble_zeros (unsigned HOST_WIDE_INT size)
#ifdef ASM_NO_SKIP_IN_TEXT
/* The `space' pseudo in the text section outputs nop insns rather than 0s,
so we must output 0s explicitly in the text section. */
- if (ASM_NO_SKIP_IN_TEXT && (in_section->common.flags & SECTION_CODE) != 0)
+ if (ASM_NO_SKIP_IN_TEXT && (casm->in_section->common.flags & SECTION_CODE) != 0)
{
unsigned HOST_WIDE_INT i;
for (i = 0; i < size; i++)
@@ -2097,7 +2046,7 @@ assemble_string (const char *p, int size)
}
\f
-/* A noswitch_section_callback for lcomm_section. */
+/* A noswitch_section_callback for casm->sec.lcomm. */
static bool
emit_local (tree decl ATTRIBUTE_UNUSED,
@@ -2120,7 +2069,7 @@ emit_local (tree decl ATTRIBUTE_UNUSED,
#endif
}
-/* A noswitch_section_callback for bss_noswitch_section. */
+/* A noswitch_section_callback for casm->sec.bss_noswitch. */
#if defined ASM_OUTPUT_ALIGNED_BSS
static bool
@@ -2135,7 +2084,7 @@ emit_bss (tree decl ATTRIBUTE_UNUSED,
}
#endif
-/* A noswitch_section_callback for comm_section. */
+/* A noswitch_section_callback for casm->sec.comm. */
static bool
emit_common (tree decl ATTRIBUTE_UNUSED,
@@ -2157,7 +2106,7 @@ emit_common (tree decl ATTRIBUTE_UNUSED,
#endif
}
-/* A noswitch_section_callback for tls_comm_section. */
+/* A noswitch_section_callback for casm->sec.tls_comm. */
static bool
emit_tls_common (tree decl ATTRIBUTE_UNUSED,
@@ -2774,7 +2723,7 @@ assemble_trampoline_template (void)
#ifdef TRAMPOLINE_SECTION
switch_to_section (TRAMPOLINE_SECTION);
#else
- switch_to_section (readonly_data_section);
+ switch_to_section (casm->sec.readonly_data);
#endif
/* Write the assembler code to define one. */
@@ -4192,8 +4141,8 @@ output_constant_pool_1 (class constant_descriptor_rtx *desc,
/* Make sure all constants in SECTION_MERGE and not SECTION_STRINGS
sections have proper size. */
if (align > GET_MODE_BITSIZE (desc->mode)
- && in_section
- && (in_section->common.flags & SECTION_MERGE))
+ && casm->in_section
+ && (casm->in_section->common.flags & SECTION_MERGE))
assemble_align (align);
#ifdef ASM_OUTPUT_SPECIAL_POOL_ENTRY
@@ -6602,70 +6551,72 @@ make_decl_one_only (tree decl, tree comdat_group)
void
init_varasm_once (void)
{
- section_htab = hash_table<section_hasher>::create_ggc (31);
+ /* Initialize ASM out state. */
+ casm = new (ggc_alloc<asm_out_state> ()) asm_out_state ();
+
object_block_htab = hash_table<object_block_hasher>::create_ggc (31);
const_desc_htab = hash_table<tree_descriptor_hasher>::create_ggc (1009);
shared_constant_pool = create_constant_pool ();
#ifdef TEXT_SECTION_ASM_OP
- text_section = get_unnamed_section (SECTION_CODE, output_section_asm_op,
+ casm->sec.text = get_unnamed_section (SECTION_CODE, output_section_asm_op,
TEXT_SECTION_ASM_OP);
#endif
#ifdef DATA_SECTION_ASM_OP
- data_section = get_unnamed_section (SECTION_WRITE, output_section_asm_op,
- DATA_SECTION_ASM_OP);
+ casm->sec.data = get_unnamed_section (SECTION_WRITE, output_section_asm_op,
+ DATA_SECTION_ASM_OP);
#endif
#ifdef SDATA_SECTION_ASM_OP
- sdata_section = get_unnamed_section (SECTION_WRITE, output_section_asm_op,
+ casm->sec.sdata = get_unnamed_section (SECTION_WRITE, output_section_asm_op,
SDATA_SECTION_ASM_OP);
#endif
#ifdef READONLY_DATA_SECTION_ASM_OP
- readonly_data_section = get_unnamed_section (0, output_section_asm_op,
- READONLY_DATA_SECTION_ASM_OP);
+ casm->sec.readonly_data = get_unnamed_section (0, output_section_asm_op,
+ READONLY_DATA_SECTION_ASM_OP);
#endif
#ifdef CTORS_SECTION_ASM_OP
- ctors_section = get_unnamed_section (0, output_section_asm_op,
+ casm->sec.ctors = get_unnamed_section (0, output_section_asm_op,
CTORS_SECTION_ASM_OP);
#endif
#ifdef DTORS_SECTION_ASM_OP
- dtors_section = get_unnamed_section (0, output_section_asm_op,
+ casm->sec.dtors = get_unnamed_section (0, output_section_asm_op,
DTORS_SECTION_ASM_OP);
#endif
#ifdef BSS_SECTION_ASM_OP
- bss_section = get_unnamed_section (SECTION_WRITE | SECTION_BSS,
- output_section_asm_op,
- BSS_SECTION_ASM_OP);
+ casm->sec.bss = get_unnamed_section (SECTION_WRITE | SECTION_BSS,
+ output_section_asm_op,
+ BSS_SECTION_ASM_OP);
#endif
#ifdef SBSS_SECTION_ASM_OP
- sbss_section = get_unnamed_section (SECTION_WRITE | SECTION_BSS,
+ casm->sec.sbss = get_unnamed_section (SECTION_WRITE | SECTION_BSS,
output_section_asm_op,
SBSS_SECTION_ASM_OP);
#endif
- tls_comm_section = get_noswitch_section (SECTION_WRITE | SECTION_BSS
- | SECTION_COMMON, emit_tls_common);
- lcomm_section = get_noswitch_section (SECTION_WRITE | SECTION_BSS
- | SECTION_COMMON, emit_local);
- comm_section = get_noswitch_section (SECTION_WRITE | SECTION_BSS
- | SECTION_COMMON, emit_common);
+ casm->sec.tls_comm = get_noswitch_section (SECTION_WRITE | SECTION_BSS
+ | SECTION_COMMON, emit_tls_common);
+ casm->sec.lcomm = get_noswitch_section (SECTION_WRITE | SECTION_BSS
+ | SECTION_COMMON, emit_local);
+ casm->sec.comm = get_noswitch_section (SECTION_WRITE | SECTION_BSS
+ | SECTION_COMMON, emit_common);
#if defined ASM_OUTPUT_ALIGNED_BSS
- bss_noswitch_section = get_noswitch_section (SECTION_WRITE | SECTION_BSS,
- emit_bss);
+ casm->sec.bss_noswitch = get_noswitch_section (SECTION_WRITE | SECTION_BSS,
+ emit_bss);
#endif
targetm.asm_out.init_sections ();
- if (readonly_data_section == NULL)
- readonly_data_section = text_section;
+ if (casm->sec.readonly_data == NULL)
+ casm->sec.readonly_data = casm->sec.text;
#ifdef ASM_OUTPUT_EXTERNAL
pending_assemble_externals_set = new hash_set<tree>;
@@ -6790,13 +6741,13 @@ default_section_type_flags (tree decl, const char *name, int reloc)
}
/* Return true if the target supports some form of global BSS,
- either through bss_noswitch_section, or by selecting a BSS
+ either through casm->sec.bss_noswitch, or by selecting a BSS
section in TARGET_ASM_SELECT_SECTION. */
bool
have_global_bss_p (void)
{
- return bss_noswitch_section || targetm.have_switchable_bss_sections;
+ return casm->sec.bss_noswitch || targetm.have_switchable_bss_sections;
}
/* Output assembly to switch to section NAME with attribute FLAGS.
@@ -6958,7 +6909,7 @@ default_select_section (tree decl, int reloc,
if (DECL_P (decl))
{
if (decl_readonly_section (decl, reloc))
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
else if (TREE_CODE (decl) == CONSTRUCTOR)
{
@@ -6966,14 +6917,14 @@ default_select_section (tree decl, int reloc,
|| !TREE_READONLY (decl)
|| TREE_SIDE_EFFECTS (decl)
|| !TREE_CONSTANT (decl)))
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
else if (TREE_CODE (decl) == STRING_CST)
- return readonly_data_section;
+ return casm->sec.readonly_data;
else if (! (flag_pic && reloc))
- return readonly_data_section;
+ return casm->sec.readonly_data;
- return data_section;
+ return casm->sec.data;
}
enum section_category
@@ -7112,7 +7063,7 @@ default_elf_select_section (tree decl, int reloc,
/* We're not supposed to be called on FUNCTION_DECLs. */
gcc_unreachable ();
case SECCAT_RODATA:
- return readonly_data_section;
+ return casm->sec.readonly_data;
case SECCAT_RODATA_MERGE_STR:
return mergeable_string_section (decl, align, 0);
case SECCAT_RODATA_MERGE_STR_INIT:
@@ -7128,7 +7079,7 @@ default_elf_select_section (tree decl, int reloc,
sname = ".persistent";
break;
}
- return data_section;
+ return casm->sec.data;
case SECCAT_DATA_REL:
sname = ".data.rel";
break;
@@ -7153,8 +7104,8 @@ default_elf_select_section (tree decl, int reloc,
sname = ".noinit";
break;
}
- if (bss_section)
- return bss_section;
+ if (casm->sec.bss)
+ return casm->sec.bss;
sname = ".bss";
break;
case SECCAT_SBSS:
@@ -7304,9 +7255,9 @@ default_select_rtx_section (machine_mode mode ATTRIBUTE_UNUSED,
unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED)
{
if (compute_reloc_for_rtx (x) & targetm.asm_out.reloc_rw_mask ())
- return data_section;
+ return casm->sec.data;
else
- return readonly_data_section;
+ return casm->sec.readonly_data;
}
section *
@@ -7824,10 +7775,10 @@ switch_to_section (section *new_section, tree decl)
"%qD was declared here", used_decl);
}
}
- else if (in_section == new_section)
+ else if (casm->in_section == new_section)
return;
- in_section = new_section;
+ casm->in_section = new_section;
switch (SECTION_STYLE (new_section))
{
@@ -8003,7 +7954,7 @@ get_section_anchor (struct object_block *block, HOST_WIDE_INT offset,
}
/* Create a new anchor with a unique label. */
- ASM_GENERATE_INTERNAL_LABEL (label, "LANCHOR", anchor_labelno++);
+ ASM_GENERATE_INTERNAL_LABEL (label, "LANCHOR", casm->anchor_labelno++);
anchor = create_block_symbol (ggc_strdup (label), block, offset);
SYMBOL_REF_FLAGS (anchor) |= SYMBOL_FLAG_LOCAL | SYMBOL_FLAG_ANCHOR;
SYMBOL_REF_FLAGS (anchor) |= model << SYMBOL_FLAG_TLS_SHIFT;
@@ -8472,7 +8423,7 @@ handle_vtv_comdat_section (section *sect, const_tree decl ATTRIBUTE_UNUSED)
sect->named.common.flags
| SECTION_LINKONCE,
DECL_NAME (decl));
- in_section = sect;
+ casm->in_section = sect;
#else
/* Neither OBJECT_FORMAT_PE, nor OBJECT_FORMAT_COFF is set here.
Therefore the following check is used.
@@ -8498,7 +8449,7 @@ handle_vtv_comdat_section (section *sect, const_tree decl ATTRIBUTE_UNUSED)
sect->named.common.flags
| SECTION_LINKONCE,
DECL_NAME (decl));
- in_section = sect;
+ casm->in_section = sect;
}
else
switch_to_section (sect);
diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c
index 05fadce075e..eab52c62307 100644
--- a/gcc/vmsdbgout.c
+++ b/gcc/vmsdbgout.c
@@ -1583,7 +1583,7 @@ vmsdbgout_finish (const char *filename ATTRIBUTE_UNUSED)
return;
/* Output a terminator label for the .text section. */
- switch_to_section (text_section);
+ switch_to_section (casm->sec.text);
targetm.asm_out.internal_label (asm_out_file, TEXT_END_LABEL, 0);
/* Output debugging information.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-10-21 7:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-21 7:51 [gcc(refs/users/marxin/heads/casm-refactoring-v3)] Come up with casm global state Martin Liska
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).