This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Put .gnu.linkonce.t.* owned jumptables into .gnu.linkonce.r.* instead of .rodata (take 2)
- From: Jakub Jelinek <jakub at redhat dot com>
- To: Richard Henderson <rth at redhat dot com>
- Cc: gcc-patches at gcc dot gnu dot org, hjl at lucon dot org
- Date: Wed, 11 Aug 2004 18:04:08 -0400
- Subject: [PATCH] Put .gnu.linkonce.t.* owned jumptables into .gnu.linkonce.r.* instead of .rodata (take 2)
- References: <20040811170254.GA22252@devserv.devel.redhat.com> <20040811175617.GE25821@redhat.com>
- Reply-to: Jakub Jelinek <jakub at redhat dot com>
On Wed, Aug 11, 2004 at 10:56:17AM -0700, Richard Henderson wrote:
> On Wed, Aug 11, 2004 at 01:02:59PM -0400, Jakub Jelinek wrote:
> > Is it enough like this or should function_readonly_data_section call
> > a target hook, whose default implementation would do what is in ATM
> > and targets whcih don't use default_unique_section_1 would override it
> > to simple readonly_data_section () call (or something else if they prefer)?
>
> Looks as if Darwin will need the target hook. I *think* it
> should just call readonly_data_section, but I'm not sure.
Ok, here is the patch reworked into a target hook.
Ok to commit?
2004-08-11 Jakub Jelinek <jakub@redhat.com>
PR c++/16276
* output.h (default_function_rodata_section,
default_no_function_rodata_section): New prototypes.
* target.h (struct gcc_target): Add asm_out.function_rodata_section.
* target-def.h (TARGET_ASM_FUNCTION_RODATA_SECTION): Define.
(TARGET_ASM_OUT): Add it.
* varasm.c (default_function_rodata_section,
default_no_function_rodata_section): New functions.
* final.c (final_scan_insn): Call
targetm.asm_out.function_rodata_section instead of
readonly_data_section.
* config/darwin.h (TARGET_ASM_FUNCTION_RODATA_SECTION): Define.
* config/mcore/mcore.c (TARGET_ASM_FUNCTION_RODATA_SECTION): Likewise.
* config/ip2k/ip2k.c (TARGET_ASM_FUNCTION_RODATA_SECTION): Likewise.
* config/rs6000/xcoff.h (TARGET_ASM_FUNCTION_RODATA_SECTION):
Likewise.
* config/alpha/alpha.c (TARGET_ASM_FUNCTION_RODATA_SECTION): Likewise.
* config/i386/cygming.h (TARGET_ASM_FUNCTION_RODATA_SECTION):
Likewise.
* config/i386/i386-interix.h (TARGET_ASM_FUNCTION_RODATA_SECTION):
Likewise.
* config/arm/pe.h (TARGET_ASM_FUNCTION_RODATA_SECTION): Likewise.
* config/avr/avr.c (TARGET_ASM_FUNCTION_RODATA_SECTION): Likewise.
* g++.old-deja/g++.other/comdat4.C: New test.
* g++.old-deja/g++.other/comdat4-aux.cc: New.
--- gcc/config/darwin.h.jj 2004-08-02 21:22:57.000000000 +0200
+++ gcc/config/darwin.h 2004-08-11 23:47:29.200575748 +0200
@@ -754,7 +754,8 @@ objc_section_init (void) \
#define TARGET_ASM_SELECT_RTX_SECTION machopic_select_rtx_section
#undef TARGET_ASM_UNIQUE_SECTION
#define TARGET_ASM_UNIQUE_SECTION darwin_unique_section
-
+#undef TARGET_ASM_FUNCTION_RODATA_SECTION
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
#define ASM_DECLARE_UNRESOLVED_REFERENCE(FILE,NAME) \
--- gcc/config/mcore/mcore.c.jj 2004-08-10 15:16:55.000000000 +0200
+++ gcc/config/mcore/mcore.c 2004-08-11 23:47:17.126675612 +0200
@@ -172,6 +172,8 @@ static bool mcore_return_in_memory
#define TARGET_ATTRIBUTE_TABLE mcore_attribute_table
#undef TARGET_ASM_UNIQUE_SECTION
#define TARGET_ASM_UNIQUE_SECTION mcore_unique_section
+#undef TARGET_ASM_FUNCTION_RODATA_SECTION
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
#undef TARGET_ENCODE_SECTION_INFO
#define TARGET_ENCODE_SECTION_INFO mcore_encode_section_info
#undef TARGET_STRIP_NAME_ENCODING
--- gcc/config/ip2k/ip2k.c.jj 2004-05-22 18:11:52.000000000 +0200
+++ gcc/config/ip2k/ip2k.c 2004-08-11 23:46:55.276475285 +0200
@@ -101,6 +101,9 @@ const struct attribute_spec ip2k_attribu
#undef TARGET_ASM_UNIQUE_SECTION
#define TARGET_ASM_UNIQUE_SECTION unique_section
+#undef TARGET_ASM_FUNCTION_RODATA_SECTION
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+
#undef TARGET_ATTRIBUTE_TABLE
#define TARGET_ATTRIBUTE_TABLE ip2k_attribute_table
--- gcc/config/rs6000/xcoff.h.jj 2004-02-19 00:04:03.000000000 +0100
+++ gcc/config/rs6000/xcoff.h 2004-08-11 23:52:52.411405665 +0200
@@ -172,6 +172,7 @@ toc_section (void) \
#define TARGET_ASM_SELECT_SECTION rs6000_xcoff_select_section
#define TARGET_ASM_SELECT_RTX_SECTION rs6000_xcoff_select_rtx_section
#define TARGET_ASM_UNIQUE_SECTION rs6000_xcoff_unique_section
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
#define TARGET_STRIP_NAME_ENCODING rs6000_xcoff_strip_name_encoding
#define TARGET_SECTION_TYPE_FLAGS rs6000_xcoff_section_type_flags
--- gcc/config/alpha/alpha.c.jj 2004-08-02 21:22:58.000000000 +0200
+++ gcc/config/alpha/alpha.c 2004-08-11 23:49:01.745505940 +0200
@@ -10086,6 +10086,8 @@ alpha_init_libfuncs (void)
# define TARGET_SECTION_TYPE_FLAGS unicosmk_section_type_flags
# undef TARGET_ASM_UNIQUE_SECTION
# define TARGET_ASM_UNIQUE_SECTION unicosmk_unique_section
+#undef TARGET_ASM_FUNCTION_RODATA_SECTION
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
# undef TARGET_ASM_GLOBALIZE_LABEL
# define TARGET_ASM_GLOBALIZE_LABEL hook_void_FILEptr_constcharptr
# undef TARGET_MUST_PASS_IN_STACK
--- gcc/config/i386/cygming.h.jj 2004-08-08 20:30:59.000000000 +0200
+++ gcc/config/i386/cygming.h 2004-08-11 23:49:51.035943051 +0200
@@ -265,6 +265,7 @@ do { \
extern void i386_pe_unique_section (TREE, int);
#define TARGET_ASM_UNIQUE_SECTION i386_pe_unique_section
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
#define SUPPORTS_ONE_ONLY 1
--- gcc/config/i386/i386-interix.h.jj 2004-08-05 12:06:09.000000000 +0200
+++ gcc/config/i386/i386-interix.h 2004-08-11 23:49:31.907266586 +0200
@@ -345,6 +345,7 @@ while (0)
extern void i386_pe_unique_section (tree, int);
#define TARGET_ASM_UNIQUE_SECTION i386_pe_unique_section
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
#define SUPPORTS_ONE_ONLY 1
#endif /* 0 */
--- gcc/config/arm/pe.h.jj 2004-08-10 15:16:51.000000000 +0200
+++ gcc/config/arm/pe.h 2004-08-11 23:50:56.931489959 +0200
@@ -85,6 +85,7 @@
#define MULTIPLE_SYMBOL_SPACES
#define TARGET_ASM_UNIQUE_SECTION arm_pe_unique_section
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
#define SUPPORTS_ONE_ONLY 1
--- gcc/config/avr/avr.c.jj 2004-04-01 18:43:55.000000000 +0200
+++ gcc/config/avr/avr.c 2004-08-11 23:51:23.337898734 +0200
@@ -233,6 +233,8 @@ int avr_case_values_threshold = 30000;
#define TARGET_ATTRIBUTE_TABLE avr_attribute_table
#undef TARGET_ASM_UNIQUE_SECTION
#define TARGET_ASM_UNIQUE_SECTION avr_unique_section
+#undef TARGET_ASM_FUNCTION_RODATA_SECTION
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
#undef TARGET_INSERT_ATTRIBUTES
#define TARGET_INSERT_ATTRIBUTES avr_insert_attributes
#undef TARGET_SECTION_TYPE_FLAGS
--- gcc/target.h.jj 2004-08-05 12:06:05.000000000 +0200
+++ gcc/target.h 2004-08-11 23:37:01.697770667 +0200
@@ -132,6 +132,10 @@ struct gcc_target
for SELECT_SECTION. */
void (* unique_section) (tree, int);
+ /* Tell assembler to switch to the readonly data section associated
+ with function DECL. */
+ void (* function_rodata_section) (tree);
+
/* Output a constructor for a symbol with a given priority. */
void (* constructor) (rtx, int);
--- gcc/final.c.jj 2004-08-10 15:16:22.000000000 +0200
+++ gcc/final.c 2004-08-11 23:40:35.841437894 +0200
@@ -1966,7 +1966,7 @@ final_scan_insn (rtx insn, FILE *file, i
{
int log_align;
- readonly_data_section ();
+ targetm.asm_out.function_rodata_section (current_function_decl);
#ifdef ADDR_VEC_ALIGN
log_align = ADDR_VEC_ALIGN (NEXT_INSN (insn));
--- gcc/target-def.h.jj 2004-08-05 12:06:05.000000000 +0200
+++ gcc/target-def.h 2004-08-11 23:35:36.767600743 +0200
@@ -87,6 +87,10 @@ Foundation, 59 Temple Place - Suite 330,
#define TARGET_ASM_UNIQUE_SECTION default_unique_section
#endif
+#ifndef TARGET_ASM_FUNCTION_RODATA_SECTION
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_function_rodata_section
+#endif
+
#ifndef TARGET_ASM_SELECT_RTX_SECTION
#define TARGET_ASM_SELECT_RTX_SECTION default_select_rtx_section
#endif
@@ -212,6 +216,7 @@ Foundation, 59 Temple Place - Suite 330,
TARGET_ASM_SELECT_SECTION, \
TARGET_ASM_SELECT_RTX_SECTION, \
TARGET_ASM_UNIQUE_SECTION, \
+ TARGET_ASM_FUNCTION_RODATA_SECTION, \
TARGET_ASM_CONSTRUCTOR, \
TARGET_ASM_DESTRUCTOR, \
TARGET_ASM_OUTPUT_MI_THUNK, \
--- gcc/varasm.c.jj 2004-08-05 12:06:06.000000000 +0200
+++ gcc/varasm.c 2004-08-11 23:43:51.811352192 +0200
@@ -541,6 +541,53 @@ function_section (tree decl)
}
}
+/* Switch to read-only data section associated with function DECL. */
+
+void
+default_function_rodata_section (tree decl)
+{
+ if (decl != NULL_TREE && DECL_SECTION_NAME (decl))
+ {
+ const char *name = TREE_STRING_POINTER (DECL_SECTION_NAME (decl));
+
+ /* For .gnu.linkonce.t.foo we want to use .gnu.linkonce.r.foo. */
+ if (DECL_ONE_ONLY (decl) && strncmp (name, ".gnu.linkonce.t.", 16) == 0)
+ {
+ size_t len = strlen (name) + 1;
+ char *rname = alloca (len);
+
+ memcpy (rname, name, len);
+ rname[14] = 'r';
+ named_section_flags (rname, SECTION_LINKONCE);
+ return;
+ }
+ /* For .text.foo we want to use .rodata.foo. */
+ else if (flag_function_sections && flag_data_sections
+ && strncmp (name, ".text.", 6) == 0)
+ {
+ size_t len = strlen (name) + 1;
+ char *rname = alloca (len + 2);
+
+ memcpy (rname, ".rodata", 7);
+ memcpy (rname + 7, name + 5, len - 5);
+ named_section_flags (rname, 0);
+ return;
+ }
+ }
+
+ readonly_data_section ();
+}
+
+/* Switch to read-only data section associated with function DECL
+ for targets where that section should be always the single
+ readonly data section. */
+
+void
+default_no_function_rodata_section (tree decl ATTRIBUTE_UNUSED)
+{
+ readonly_data_section ();
+}
+
/* Switch to section for variable DECL. RELOC is the same as the
argument to SELECT_SECTION. */
--- gcc/output.h.jj 2004-07-09 13:50:55.000000000 +0200
+++ gcc/output.h 2004-08-11 23:44:10.201159438 +0200
@@ -501,6 +501,8 @@ extern void default_elf_select_section_1
unsigned HOST_WIDE_INT, int);
extern void default_unique_section (tree, int);
extern void default_unique_section_1 (tree, int, int);
+extern void default_function_rodata_section (tree);
+extern void default_no_function_rodata_section (tree);
extern void default_select_rtx_section (enum machine_mode, rtx,
unsigned HOST_WIDE_INT);
extern void default_elf_select_rtx_section (enum machine_mode, rtx,
--- gcc/testsuite/g++.old-deja/g++.other/comdat4.C.jj 2004-08-11 11:56:16.000000000 +0200
+++ gcc/testsuite/g++.old-deja/g++.other/comdat4.C 2004-08-11 18:47:45.770243910 +0200
@@ -0,0 +1,57 @@
+// PR c++/16276
+// { dg-do link }
+// { dg-additional-sources " comdat4-aux.cc" }
+// { dg-options "-O2" }
+
+extern void
+bar (int x);
+
+inline void
+foo (int i)
+{
+ switch (i)
+ {
+ case 3:
+ case 5:
+ case 6:
+ case 9:
+ case 15:
+ bar (1);
+ break;
+ case 2:
+ case 4:
+ case 7:
+ case 10:
+ case 11:
+ case 12:
+ bar (2);
+ break;
+ case 0:
+ case 1:
+ case 8:
+ case 13:
+ case 16:
+ bar (3);
+ break;
+ case 14:
+ bar (4);
+ break;
+ default:
+ bar (5);
+ break;
+ }
+}
+
+void *fooaddr = (void *) foo;
+
+void
+bar (int x)
+{
+ __asm __volatile ("" : : "r" (x));
+}
+
+int
+main (void)
+{
+ return 0;
+}
--- gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc.jj 2004-08-11 11:56:19.000000000 +0200
+++ gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc 2004-08-11 11:56:47.000000000 +0200
@@ -0,0 +1,40 @@
+extern void
+bar (int x);
+
+inline void
+foo (int i)
+{
+ switch (i)
+ {
+ case 3:
+ case 5:
+ case 6:
+ case 9:
+ case 15:
+ bar (1);
+ break;
+ case 2:
+ case 4:
+ case 7:
+ case 10:
+ case 11:
+ case 12:
+ bar (2);
+ break;
+ case 0:
+ case 1:
+ case 8:
+ case 13:
+ case 16:
+ bar (3);
+ break;
+ case 14:
+ bar (4);
+ break;
+ default:
+ bar (5);
+ break;
+ }
+}
+
+void *fooaddr2 = (void *) foo;
Jakub