This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] SHF_MERGE support for gcc (take 5)
- To: rth at redhat dot com
- Subject: [PATCH] SHF_MERGE support for gcc (take 5)
- From: Jakub Jelinek <jakub at redhat dot com>
- Date: Tue, 11 Sep 2001 16:51:40 +0200
- Cc: gcc-patches at gcc dot gnu dot org
- Reply-To: Jakub Jelinek <jakub at redhat dot com>
Hi!
Below is updated SHF_MERGE patch:
a) the invoke.texi fixes should be in
b) uses "M" and "MS" instead of "m" and "ms" for section attributes,
as IA-64 wants to use "s" for SHF_IA_64_SMALL_DATA
c) passed i386-redhat-linux bootstrap and created no regressions
(ie. 20000801-4.c is fixed)
d) moves the big functions into varasm.c so that they don't have to be
duplicated accross config headers
e) uses named_section_flags to take care about outputing .section directives
and printing the right attributes
I haven't done anything about CONSTANT_ALIGNMENT for -Os, I think it should
be done by a separate patch (CONSTANT_ALIGNMENT is used in multiple
places)).
Ok to commit?
2001-09-11 Jakub Jelinek <jakub@redhat.com>
* configure.in: Check whether assembler supports section merging.
* config.in: Rebuilt.
* configure: Rebuilt.
* varasm.c (variable_section, output_constant_pool): Pass alignment
to SELECT_SECTION and SELECT_RTX_SECTION.
(mergeable_string_section): New.
(mergeable_constant_section): New.
(default_elf_asm_named_section): Output SECTION_MERGE and
SECTION_STRINGS flags plus SECTION_ENTSIZE entity size.
* output.h (mergeable_string_section): New.
(mergeable_constant_section): New.
(SECTION_MERGE, SECTION_STRINGS, SECTION_ENTSIZE): Define.
* toplev.c (flag_merge_constants): New.
(f_options): Add -fmerge-constants and -fmerge-all-constants
options.
(toplev_main): Default to -fno-merge-constants if not optimizing.
* flags.h (flag_merge_constants): Add extern.
* invoke.texi (-fmerge-constants, -fmerge-all-constants): Document.
* tm.texi (SELECT_SECTION, SELECT_RTX_SECTION): Document added third
argument.
* config/elfos.h (ASM_SECTION_START_OP, ASM_OUTPUT_SECTION_START):
Define if assembler has working .subsection -1 support.
(SELECT_RTX_SECTION, SELECT_SECTION): Add third macro argument.
Put constant into special SHF_MERGE sections if the linker should
attempt to merge duplicates.
* config/ia64/sysv4.h (SELECT_RTX_SECTION, SELECT_SECTION): Add third
macro argument.
Put constant into special SHF_MERGE sections if the linker should
attempt to merge duplicates.
* config/alpha/elf.h: Likewise.
(ASM_SECTION_START_OP, ASM_OUTPUT_SECTION_START): Define if assembler
has working .subsection -1 support.
* config/nextstep.h: Add third argument to SELECT_RTX_SECTION and
SELECT_SECTION.
* config/svr3.h: Likewise.
* config/darwin.h: Likewise.
* config/arm/aof.h: Likewise.
* config/arm/linux-elf.h: Likewise.
* config/avr/avr.h: Likewise.
* config/c4x/c4x.h: Likewise.
* config/d30v/d30v.h: Likewise.
* config/i386/dgux.h: Likewise.
* config/i386/osfrose.h: Likewise.
* config/i386/sco5.h: Likewise.
* config/i386/svr3gas.h: Likewise.
* config/ia64/aix.h: Likewise.
* config/m32r/m32r.h: Likewise.
* config/m68k/m68k.h: Likewise.
* config/m88k/dgux.h: Likewise.
* config/m88k/m88k.h: Likewise.
* config/mcore/mcore-pe.h: Likewise.
* config/mips/mips.h: Likewise.
* config/pa/pa.h: Likewise.
* config/pa/pa-linux.h: Likewise.
* config/romp/romp.h: Likewise.
* config/rs6000/sysv4.h: Likewise.
* config/rs6000/xcoff.h: Likewise.
* config/s390/linux.h: Likewise.
* config/sparc/sparc.h: Likewise.
* config/sparc/sysv4.h: Likewise.
* config/stormy16/stormy16.h: Likewise.
* config/v850/v850.h: Likewise.
* config/vax/vms.h: Likewise.
* config/arm/arm.c (arm_elf_asm_named_section): Output SECTION_MERGE
and SECTION_STRINGS flags plus SECTION_ENTSIZE entity size.
* config/sparc/sparc.c (sparc_elf_asm_named_section): Use
default_elf_asm_named_section for SHF_MERGE sections.
* com.c (ffe_init_options): Default to -fmerge-all-constants
if optimizing.
--- gcc/varasm.c.jj Mon Sep 3 19:53:52 2001
+++ gcc/varasm.c Tue Sep 11 14:09:35 2001
@@ -560,7 +560,7 @@ variable_section (decl, reloc)
for them. */
#ifdef SELECT_SECTION
- SELECT_SECTION (decl, reloc);
+ SELECT_SECTION (decl, reloc, DECL_ALIGN (decl));
#else
if (DECL_READONLY_SECTION (decl, reloc))
readonly_data_section ();
@@ -587,6 +587,111 @@ exception_section ()
readonly_data_section ();
#endif
}
+
+/* Tell assembler to switch to the section for string merging. */
+
+void
+mergeable_string_section (decl, align, flags)
+ tree decl ATTRIBUTE_UNUSED;
+ unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED;
+ unsigned int flags ATTRIBUTE_UNUSED;
+{
+#ifdef HAVE_GAS_SHF_MERGE
+ if (flag_merge_constants
+ && TREE_CODE (decl) == STRING_CST
+ && TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE
+ && align <= 256
+ && TREE_STRING_LENGTH (decl) >= int_size_in_bytes (TREE_TYPE (decl)))
+ {
+ enum machine_mode mode;
+ unsigned int modesize;
+ const char *str;
+ int i, j, len, unit;
+ char name[30];
+
+ mode = TYPE_MODE (TREE_TYPE (TREE_TYPE (decl)));
+ modesize = GET_MODE_BITSIZE (mode);
+ if (modesize >= 8 && modesize <= 256
+ && (modesize & (modesize - 1)) == 0)
+ {
+ if (align < modesize)
+ align = modesize;
+
+ str = TREE_STRING_POINTER (decl);
+ len = TREE_STRING_LENGTH (decl);
+ unit = GET_MODE_SIZE (mode);
+
+ /* Check for embedded NUL characters. */
+ for (i = 0; i < len; i += unit)
+ {
+ for (j = 0; j < unit; j++)
+ if (str [i + j] != '\0')
+ break;
+ if (j == unit)
+ break;
+ }
+ if (i == len - unit)
+ {
+ sprintf (name, ".rodata.str%d.%d", modesize / 8,
+ (int) (align / 8));
+ flags |= (modesize / 8) | SECTION_MERGE | SECTION_STRINGS;
+ if (!i && modesize < align)
+ {
+ /* A "" string with requested alignment greater than
+ character size might cause a problem:
+ if some other string required even bigger
+ alignment than "", then linker might think the
+ "" is just part of padding after some other string
+ and not put it into the hash table initially.
+ But this means "" could have smaller alignment
+ than requested. */
+#ifdef ASM_OUTPUT_SECTION_START
+ named_section_flags (name, flags);
+ ASM_OUTPUT_SECTION_START (asm_out_file);
+#else
+ readonly_data_section ();
+#endif
+ return;
+ }
+
+ named_section_flags (name, flags);
+ return;
+ }
+ }
+ }
+#endif
+ readonly_data_section ();
+}
+
+/* Tell assembler to switch to the section for constant merging. */
+
+void
+mergeable_constant_section (mode, align, flags)
+ enum machine_mode mode ATTRIBUTE_UNUSED;
+ unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED;
+ unsigned int flags ATTRIBUTE_UNUSED;
+{
+#ifdef HAVE_GAS_SHF_MERGE
+ unsigned int modesize = GET_MODE_BITSIZE (mode);
+
+ if (flag_merge_constants
+ && mode != VOIDmode
+ && mode != BLKmode
+ && modesize <= align
+ && align >= 8
+ && align <= 256
+ && (align & (align - 1)) == 0)
+ {
+ char name[24];
+
+ sprintf (name, ".rodata.cst%d", (int) (align / 8));
+ flags |= (align / 8) | SECTION_MERGE;
+ named_section_flags (name, flags);
+ return;
+ }
+#endif
+ readonly_data_section ();
+}
/* Given NAME, a putative register name, discard any customary prefixes. */
@@ -3305,13 +3410,19 @@ output_constant_def_contents (exp, reloc
{
int align;
+ /* Align the location counter as required by EXP's data type. */
+ align = TYPE_ALIGN (TREE_TYPE (exp));
+#ifdef CONSTANT_ALIGNMENT
+ align = CONSTANT_ALIGNMENT (exp, align);
+#endif
+
if (IN_NAMED_SECTION (exp))
named_section (exp, NULL, reloc);
else
{
/* First switch to text section, except for writable strings. */
#ifdef SELECT_SECTION
- SELECT_SECTION (exp, reloc);
+ SELECT_SECTION (exp, reloc, align);
#else
if (((TREE_CODE (exp) == STRING_CST) && flag_writable_strings)
|| (flag_pic && reloc))
@@ -3321,12 +3432,6 @@ output_constant_def_contents (exp, reloc
#endif
}
- /* Align the location counter as required by EXP's data type. */
- align = TYPE_ALIGN (TREE_TYPE (exp));
-#ifdef CONSTANT_ALIGNMENT
- align = CONSTANT_ALIGNMENT (exp, align);
-#endif
-
if (align > BITS_PER_UNIT)
ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
@@ -3877,7 +3982,7 @@ output_constant_pool (fnname, fndecl)
/* First switch to correct section. */
#ifdef SELECT_RTX_SECTION
- SELECT_RTX_SECTION (pool->mode, x);
+ SELECT_RTX_SECTION (pool->mode, x, pool->align);
#else
readonly_data_section ();
#endif
@@ -5060,7 +5165,7 @@ default_elf_asm_named_section (name, fla
const char *name;
unsigned int flags;
{
- char flagchars[8], *f = flagchars;
+ char flagchars[10], *f = flagchars;
const char *type;
if (!(flags & SECTION_DEBUG))
@@ -5071,6 +5176,10 @@ default_elf_asm_named_section (name, fla
*f++ = 'x';
if (flags & SECTION_SMALL)
*f++ = 's';
+ if (flags & SECTION_MERGE)
+ *f++ = 'M';
+ if (flags & SECTION_STRINGS)
+ *f++ = 'S';
*f = '\0';
if (flags & SECTION_BSS)
@@ -5078,8 +5187,12 @@ default_elf_asm_named_section (name, fla
else
type = "progbits";
- fprintf (asm_out_file, "\t.section\t%s,\"%s\",@%s\n",
- name, flagchars, type);
+ if (flags & SECTION_ENTSIZE)
+ fprintf (asm_out_file, "\t.section\t%s,\"%s\",@%s,%d\n",
+ name, flagchars, type, flags & SECTION_ENTSIZE);
+ else
+ fprintf (asm_out_file, "\t.section\t%s,\"%s\",@%s\n",
+ name, flagchars, type);
}
void
--- gcc/doc/tm.texi.jj Mon Sep 3 19:53:59 2001
+++ gcc/doc/tm.texi Mon Sep 10 14:05:33 2001
@@ -5650,25 +5650,26 @@ If these items should be placed in the t
not be defined.
@findex SELECT_SECTION
-@item SELECT_SECTION (@var{exp}, @var{reloc})
+@item SELECT_SECTION (@var{exp}, @var{reloc}, @var{align})
A C statement or statements to switch to the appropriate section for
output of @var{exp}. You can assume that @var{exp} is either a
@code{VAR_DECL} node or a constant of some sort. @var{reloc}
indicates whether the initial value of @var{exp} requires link-time
relocations. Select the section by calling @code{text_section} or one
-of the alternatives for other sections.
+of the alternatives for other sections. @var{align} is the constant
+alignment in bits.
Do not define this macro if you put all read-only variables and
constants in the read-only data section (usually the text section).
@findex SELECT_RTX_SECTION
-@item SELECT_RTX_SECTION (@var{mode}, @var{rtx})
+@item SELECT_RTX_SECTION (@var{mode}, @var{rtx}, @var{align})
A C statement or statements to switch to the appropriate section for
output of @var{rtx} in mode @var{mode}. You can assume that @var{rtx}
is some kind of constant in RTL@. The argument @var{mode} is redundant
except in the case of a @code{const_int} rtx. Select the section by
calling @code{text_section} or one of the alternatives for other
-sections.
+sections. @var{align} is the constant alignment in bits.
Do not define this macro if you put all constants in the read-only
data section.
--- gcc/doc/invoke.texi.jj Mon Sep 10 10:34:56 2001
+++ gcc/doc/invoke.texi Tue Sep 11 13:35:43 2001
@@ -262,8 +262,8 @@ in the following sections.
-fforce-addr -fforce-mem -ffunction-sections @gol
-fgcse -fgcse-lm -fgcse-sm @gol
-finline-functions -finline-limit=@var{n} -fkeep-inline-functions @gol
--fkeep-static-consts -fmove-all-movables @gol
--fno-default-inline -fno-defer-pop @gol
+-fkeep-static-consts -fmerge-constants -fmerge-all-constants @gol
+-fmove-all-movables -fno-default-inline -fno-defer-pop @gol
-fno-function-cse -fno-guess-branch-probability @gol
-fno-inline -fno-math-errno -fno-peephole -fno-peephole2 @gol
-funsafe-math-optimizations -fno-trapping-math @gol
@@ -3320,6 +3320,23 @@ on, even if the variables aren't referen
GCC enables this option by default. If you want to force the compiler to
check if the variable was referenced, regardless of whether or not
optimization is turned on, use the @option{-fno-keep-static-consts} option.
+
+@item -fmerge-constants
+Attempt to merge identical constants (string constants and floating point
+constants) accross compilation units.
+
+This option is default for optimized compilation if assembler and linker
+support it. Use @option{-fno-merge-constants} to inhibit this behaviour.
+
+@item -fmerge-all-constants
+Attempt to merge identical constants and identical variables.
+
+This option implies @option{-fmerge-constants}. In addition to
+@option{-fmerge-constants} this considers e.g. even constant initialized
+arrays or initialized constant variables with integral or floating point
+types. Languages like C or C++ require each non-automatic variable to
+have distinct location, so using this option will result in non-conforming
+behaviour.
@item -fno-function-cse
@opindex fno-function-cse
--- gcc/config.in.jj Sun Jul 22 21:33:44 2001
+++ gcc/config.in Mon Sep 10 14:05:33 2001
@@ -475,6 +475,9 @@
/* Define if your assembler mis-optimizes .eh_frame data. */
#undef USE_AS_TRADITIONAL_FORMAT
+/* Define if your assembler supports marking sections with SHF_MERGE flag. */
+#undef HAVE_GAS_SHF_MERGE
+
/* Define if your assembler supports .register. */
#undef HAVE_AS_REGISTER_PSEUDO_OP
--- gcc/configure.in.jj Mon Sep 3 19:53:23 2001
+++ gcc/configure.in Mon Sep 10 14:05:33 2001
@@ -1484,6 +1484,26 @@ EOF
fi
AC_MSG_RESULT($gcc_cv_as_eh_frame)
+AC_MSG_CHECKING(assembler section merging support)
+gcc_cv_as_shf_merge=no
+if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+ if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+ gcc_cv_as_subsections="working SHF_MERGE support"
+ fi
+elif test x$gcc_cv_as != x; then
+ # Check if we support SHF_MERGE sections
+ echo '.section .rodata.str, "aMS", @progbits, 1' > conftest.s
+ if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+ gcc_cv_as_shf_merge=yes
+ fi
+ rm -f conftest.s conftest.o
+fi
+if test x"$gcc_cv_as_shf_merge" = xyes; then
+ AC_DEFINE(HAVE_GAS_SHF_MERGE, 1,
+[Define if your assembler supports marking sections with SHF_MERGE flag.])
+fi
+AC_MSG_RESULT($gcc_cv_as_shf_merge)
+
case "$target" in
sparc*-*-*)
AC_CACHE_CHECK([assembler .register pseudo-op support],
--- gcc/configure.jj Sat Aug 18 22:10:27 2001
+++ gcc/configure Mon Sep 10 14:05:33 2001
@@ -7164,6 +7164,29 @@ EOF
fi
echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6
+echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6
+echo "configure:6569: checking assembler section merging support" >&5
+gcc_cv_as_shf_merge=no
+if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+ if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+ gcc_cv_as_subsections="working SHF_MERGE support"
+ fi
+elif test x$gcc_cv_as != x; then
+ # Check if we support SHF_MERGE sections
+ echo '.section .rodata.str, "aMS", @progbits, 1' > conftest.s
+ if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+ gcc_cv_as_shf_merge=yes
+ fi
+ rm -f conftest.s conftest.o
+fi
+if test x"$gcc_cv_as_shf_merge" = xyes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_GAS_SHF_MERGE 1
+EOF
+
+fi
+echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6
+
case "$target" in
sparc*-*-*)
echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
--- gcc/toplev.c.jj Mon Sep 10 10:34:47 2001
+++ gcc/toplev.c Mon Sep 10 14:05:33 2001
@@ -898,6 +898,11 @@ int flag_bounded_pointers = 0;
For CHILL: defaults to off. */
int flag_bounds_check = 0;
+/* This will attempt to merge constant section constants, if 1 only
+ string constants and constants from constant pool, if 2 also constant
+ variables. */
+int flag_merge_constants = 1;
+
/* If one, renumber instruction UIDs to reduce the number of
unused UIDs if there are a lot of instructions. If greater than
one, unconditionally renumber instruction UIDs. */
@@ -1139,6 +1144,10 @@ lang_independent_options f_options[] =
N_("Align all labels") },
{"align-functions", &align_functions, 0,
N_("Align the start of functions") },
+ {"merge-constants", &flag_merge_constants, 1,
+ N_("Attempt to merge identical constants accross compilation units") },
+ {"merge-all-constants", &flag_merge_constants, 2,
+ N_("Attempt to merge identical constants and constant variables") },
{"check-memory-usage", &flag_check_memory_usage, 1,
N_("Generate code to check every memory access") },
{"prefix-function-name", &flag_prefix_function_name, 1,
@@ -4678,6 +4687,11 @@ toplev_main (argc, argv)
}
}
}
+ }
+
+ if (!optimize)
+ {
+ flag_merge_constants = 0;
}
if (optimize >= 1)
--- gcc/flags.h.jj Mon Sep 3 19:53:31 2001
+++ gcc/flags.h Mon Sep 10 14:05:33 2001
@@ -544,6 +544,11 @@ extern int flag_bounded_pointers;
For CHILL: defaults to off. */
extern int flag_bounds_check;
+/* This will attempt to merge constant section constants, if 1 only
+ string constants and constants from constant pool, if 2 also constant
+ variables. */
+extern int flag_merge_constants;
+
/* If one, renumber instruction UIDs to reduce the number of
unused UIDs if there are a lot of instructions. If greater than
one, unconditionally renumber instruction UIDs. */
--- gcc/output.h.jj Mon Sep 3 19:53:44 2001
+++ gcc/output.h Tue Sep 11 13:10:44 2001
@@ -207,6 +207,15 @@ extern void function_section PARAMS ((t
/* Tell assembler to switch to the section for the exception table. */
extern void exception_section PARAMS ((void));
+/* Tell assembler to switch to the section for string merging. */
+extern void mergeable_string_section PARAMS ((tree, unsigned HOST_WIDE_INT,
+ unsigned int));
+
+/* Tell assembler to switch to the section for constant merging. */
+extern void mergeable_constant_section PARAMS ((enum machine_mode,
+ unsigned HOST_WIDE_INT,
+ unsigned int));
+
/* Declare DECL to be a weak symbol. */
extern void declare_weak PARAMS ((tree));
#endif /* TREE_CODE */
@@ -450,14 +459,18 @@ extern void default_function_pro_epilogu
extern void no_asm_to_stream PARAMS ((FILE *));
/* Flags controling properties of a section. */
-#define SECTION_CODE 1 /* contains code */
-#define SECTION_WRITE 2 /* data is writable */
-#define SECTION_DEBUG 4 /* contains debug data */
-#define SECTION_LINKONCE 8 /* is linkonce */
-#define SECTION_SMALL 16 /* contains "small data" */
-#define SECTION_BSS 32 /* contains zeros only */
-#define SECTION_FORGET 64 /* forget that we've entered the section */
-#define SECTION_MACH_DEP 128 /* subsequent bits reserved for target */
+#define SECTION_ENTSIZE 0x000ff /* entity size in section */
+#define SECTION_CODE 0x00100 /* contains code */
+#define SECTION_WRITE 0x00200 /* data is writable */
+#define SECTION_DEBUG 0x00400 /* contains debug data */
+#define SECTION_LINKONCE 0x00800 /* is linkonce */
+#define SECTION_SMALL 0x01000 /* contains "small data" */
+#define SECTION_BSS 0x02000 /* contains zeros only */
+#define SECTION_FORGET 0x04000 /* forget that we've entered the section */
+#define SECTION_MERGE 0x08000 /* contains mergeable data */
+#define SECTION_STRINGS 0x10000 /* contains zero terminated strings without
+ embedded zeros */
+#define SECTION_MACH_DEP 0x20000 /* subsequent bits reserved for target */
extern unsigned int get_named_section_flags PARAMS ((const char *));
extern bool set_named_section_flags PARAMS ((const char *, unsigned int));
--- gcc/config/elfos.h.jj Sat Aug 18 22:10:35 2001
+++ gcc/config/elfos.h Tue Sep 11 13:47:29 2001
@@ -262,6 +262,16 @@ Boston, MA 02111-1307, USA. */
#define INIT_SECTION_ASM_OP "\t.section\t.init"
#define FINI_SECTION_ASM_OP "\t.section\t.fini"
+#ifdef HAVE_GAS_SUBSECTION_ORDERING
+
+#define ASM_SECTION_START_OP "\t.subsection\t-1"
+
+/* Output assembly directive to move to the beginning of current section. */
+#define ASM_OUTPUT_SECTION_START(FILE) \
+ fprintf ((FILE), "%s\n", ASM_SECTION_START_OP)
+
+#endif
+
/* A default list of other sections which we might be "in" at any given
time. For targets that use additional sections (e.g. .tdesc) you
should override this definition in the target-specific file which
@@ -340,11 +350,14 @@ const_section () \
/* A C statement or statements to switch to the appropriate
section for output of RTX in mode MODE. RTX is some kind
of constant in RTL. The argument MODE is redundant except
- in the case of a `const_int' rtx. Currently, these always
- go into the const section. */
+ in the case of a `const_int' rtx.
+ If assembler supports SHF_MERGE sections, put it into
+ a .rodata.cstN section where N is size of the constant,
+ otherwise into const section. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE, RTX) const_section ()
+#define SELECT_RTX_SECTION(MODE, RTX, ALIGN) \
+ mergeable_constant_section ((MODE), (ALIGN), 0)
/* A C statement or statements to switch to the appropriate
section for output of DECL. DECL is either a `VAR_DECL' node
@@ -352,12 +365,12 @@ const_section () \
the initial value of DECL requires link-time relocations. */
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL, RELOC) \
+#define SELECT_SECTION(DECL, RELOC, ALIGN) \
{ \
if (TREE_CODE (DECL) == STRING_CST) \
{ \
if (! flag_writable_strings) \
- const_section (); \
+ mergeable_string_section ((DECL), (ALIGN), 0); \
else \
data_section (); \
} \
@@ -369,8 +382,17 @@ const_section () \
|| (DECL_INITIAL (DECL) != error_mark_node \
&& !TREE_CONSTANT (DECL_INITIAL (DECL)))) \
data_section (); \
- else \
+ else if (flag_merge_constants < 2) \
+ /* C and C++ don't allow different variables to share \
+ the same location. -fmerge-all-constants allows \
+ even that (at the expense of not conforming). */ \
const_section (); \
+ else if (TREE_CODE (DECL_INITIAL (DECL)) == STRING_CST) \
+ mergeable_string_section (DECL_INITIAL (DECL), (ALIGN), \
+ 0); \
+ else \
+ mergeable_constant_section (DECL_MODE (DECL), (ALIGN), \
+ 0); \
} \
else if (TREE_CODE (DECL) == CONSTRUCTOR) \
{ \
--- gcc/config/s390/linux.h.jj Sat Aug 18 22:10:45 2001
+++ gcc/config/s390/linux.h Mon Sep 10 14:05:33 2001
@@ -295,7 +295,7 @@ do {
*/
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE, X)
+#define SELECT_RTX_SECTION(MODE, X, ALIGN)
/* Output code to add DELTA to the first argument, and then jump to FUNCTION.
--- gcc/config/alpha/elf.h.jj Mon Sep 10 10:34:48 2001
+++ gcc/config/alpha/elf.h Tue Sep 11 13:48:10 2001
@@ -1,5 +1,6 @@
/* Definitions of target machine for GNU compiler, for DEC Alpha w/ELF.
- Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
Contributed by Richard Henderson (rth@tamu.edu).
This file is part of GNU CC.
@@ -222,6 +223,16 @@ do { \
#undef FINI_SECTION_ASM_OP
#define FINI_SECTION_ASM_OP "\t.section\t.fini"
+#ifdef HAVE_GAS_SUBSECTION_ORDERING
+
+#define ASM_SECTION_START_OP "\t.subsection\t-1"
+
+/* Output assembly directive to move to the beginning of current section. */
+#define ASM_OUTPUT_SECTION_START(FILE) \
+ fprintf ((FILE), "%s\n", ASM_SECTION_START_OP)
+
+#endif
+
/* A default list of other sections which we might be "in" at any given
time. For targets that use additional sections (e.g. .tdesc) you
should override this definition in the target-specific file which
@@ -240,8 +251,6 @@ do { \
SECTION_FUNCTION_TEMPLATE(sbss_section, in_sbss, SBSS_SECTION_ASM_OP) \
SECTION_FUNCTION_TEMPLATE(sdata_section, in_sdata, SDATA_SECTION_ASM_OP)
-extern void ctors_section PARAMS ((void));
-extern void dtors_section PARAMS ((void));
extern void sbss_section PARAMS ((void));
extern void sdata_section PARAMS ((void));
@@ -300,6 +309,8 @@ void FN () \
{ \
if (flag_writable_strings) \
SECNUM = 2; \
+ else \
+ SECNUM = 0x101; \
} \
else if (TREE_CODE (DECL) == VAR_DECL) \
{ \
@@ -311,6 +322,17 @@ void FN () \
|| TREE_SIDE_EFFECTS (DECL) \
|| ! TREE_CONSTANT (DECL_INITIAL (DECL))) \
SECNUM = 2; \
+ else if (flag_merge_constants >= 2) \
+ { \
+ /* C and C++ don't allow different variables to \
+ share the same location. -fmerge-all-constants\
+ allows even that (at the expense of not \
+ conforming). */ \
+ if (TREE_CODE (DECL_INITIAL (DECL)) == STRING_CST)\
+ SECNUM = 0x201; \
+ else \
+ SECNUM = 0x301; \
+ } \
} \
else if (TREE_CODE (DECL) == CONSTRUCTOR) \
{ \
@@ -322,7 +344,7 @@ void FN () \
} \
\
/* Select small data sections based on size. */ \
- if (SECNUM >= 2) \
+ if ((SECNUM & 0xff) >= 2) \
{ \
int size = int_size_in_bytes (TREE_TYPE (DECL)); \
if (size >= 0 && size <= g_switch_value) \
@@ -332,26 +354,42 @@ void FN () \
while (0)
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL, RELOC) \
- do \
- { \
- typedef void (*sec_fn) PARAMS ((void)); \
- static sec_fn const sec_functions[6] = \
- { \
- text_section, \
- const_section, \
- data_section, \
- sdata_section, \
- bss_section, \
- sbss_section \
- }; \
- \
- int sec; \
- \
- DO_SELECT_SECTION (sec, DECL, RELOC); \
- \
- (*sec_functions[sec]) (); \
- } \
+#define SELECT_SECTION(DECL, RELOC, ALIGN) \
+ do \
+ { \
+ typedef void (*sec_fn) PARAMS ((void)); \
+ static sec_fn const sec_functions[6] = \
+ { \
+ text_section, \
+ const_section, \
+ data_section, \
+ sdata_section, \
+ bss_section, \
+ sbss_section \
+ }; \
+ \
+ int sec; \
+ \
+ DO_SELECT_SECTION (sec, DECL, RELOC); \
+ \
+ switch (sec) \
+ { \
+ case 0x101: \
+ mergeable_string_section (DECL, ALIGN, 0); \
+ break; \
+ case 0x201: \
+ mergeable_string_section (DECL_INITIAL (DECL),\
+ ALIGN, 0); \
+ break; \
+ case 0x301: \
+ mergeable_constant_section (DECL_MODE (DECL), \
+ ALIGN, 0); \
+ break; \
+ default: \
+ (*sec_functions[sec]) (); \
+ break; \
+ } \
+ } \
while (0)
#define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1)
@@ -380,7 +418,7 @@ void FN () \
STRIP_NAME_ENCODING (name, name); \
nlen = strlen (name); \
\
- prefix = prefixes[sec][DECL_ONE_ONLY(DECL)]; \
+ prefix = prefixes[sec & 0xff][DECL_ONE_ONLY(DECL)]; \
plen = strlen (prefix); \
\
string = alloca (nlen + plen + 1); \
@@ -399,8 +437,8 @@ void FN () \
go into the const section. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE, RTX) \
- const_section()
+#define SELECT_RTX_SECTION(MODE, RTX, ALIGN) \
+ mergeable_constant_section((MODE), (ALIGN), 0)
/* Define the strings used for the special svr4 .type and .size directives.
These strings generally do not vary from one system running svr4 to
--- gcc/config/arm/aof.h.jj Sat Aug 18 22:10:36 2001
+++ gcc/config/arm/aof.h Mon Sep 10 14:05:33 2001
@@ -55,7 +55,7 @@ Boston, MA 02111-1307, USA. */
char *aof_text_section ();
#define TEXT_SECTION_ASM_OP aof_text_section ()
-#define SELECT_RTX_SECTION(MODE,RTX) text_section ();
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) text_section ();
char *aof_data_section ();
#define DATA_SECTION_ASM_OP aof_data_section ()
--- gcc/config/arm/linux-elf.h.jj Sat Aug 18 22:10:37 2001
+++ gcc/config/arm/linux-elf.h Mon Sep 10 14:05:33 2001
@@ -139,7 +139,7 @@ const_section () \
section for output of DECL. DECL is either a `VAR_DECL' node
or a constant of some sort. RELOC indicates whether forming
the initial value of DECL requires link-time relocations. */
-#define SELECT_SECTION(DECL,RELOC) \
+#define SELECT_SECTION(DECL,RELOC,ALIGN) \
{ \
if (TREE_CODE (DECL) == STRING_CST) \
{ \
@@ -204,7 +204,7 @@ const_section () \
of constant in RTL. The argument MODE is redundant except
in the case of a `const_int' rtx. Currently, these always
go into the const section. */
-#define SELECT_RTX_SECTION(MODE,RTX) const_section ()
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) const_section ()
/* On svr4, we *do* have support for the .init and .fini sections, and we
can put stuff in there to be executed before and after `main'. We let
--- gcc/config/arm/arm.c.jj Mon Sep 3 19:53:52 2001
+++ gcc/config/arm/arm.c Tue Sep 11 13:54:36 2001
@@ -10860,6 +10860,10 @@ arm_elf_asm_named_section (name, flags)
*f++ = 'x';
if (flags & SECTION_SMALL)
*f++ = 's';
+ if (flags & SECTION_MERGE)
+ *f++ = 'M';
+ if (flags & SECTION_STRINGS)
+ *f++ = 'S';
*f = '\0';
if (flags & SECTION_BSS)
@@ -10867,6 +10871,10 @@ arm_elf_asm_named_section (name, flags)
else
type = "progbits";
- fprintf (asm_out_file, "\t.section\t%s,\"%s\",%%%s\n",
- name, flagchars, type);
+ if (flags & SECTION_ENTSIZE)
+ fprintf (asm_out_file, "\t.section\t%s,\"%s\",%%%s,%d\n",
+ name, flagchars, type, flags & SECTION_ENTSIZE);
+ else
+ fprintf (asm_out_file, "\t.section\t%s,\"%s\",%%%s\n",
+ name, flagchars, type);
}
--- gcc/config/avr/avr.h.jj Mon Sep 3 19:53:52 2001
+++ gcc/config/avr/avr.h Mon Sep 10 14:05:33 2001
@@ -1890,7 +1890,7 @@ progmem_section (void) \
If these items should be placed in the text section, this macro
should not be defined. */
-/* `SELECT_SECTION (EXP, RELOC)'
+/* `SELECT_SECTION (EXP, RELOC, ALIGN)'
A C statement or statements to switch to the appropriate section
for output of EXP. You can assume that EXP is either a `VAR_DECL'
node or a constant of some sort. RELOC indicates whether the
@@ -1901,7 +1901,7 @@ progmem_section (void) \
Do not define this macro if you put all read-only variables and
constants in the read-only data section (usually the text section). */
-/* `SELECT_RTX_SECTION (MODE, RTX)'
+/* `SELECT_RTX_SECTION (MODE, RTX, ALIGN)'
A C statement or statements to switch to the appropriate section
for output of RTX in mode MODE. You can assume that RTX is some
kind of constant in RTL. The argument MODE is redundant except in
--- gcc/config/c4x/c4x.h.jj Mon Sep 3 19:53:53 2001
+++ gcc/config/c4x/c4x.h Mon Sep 10 14:05:33 2001
@@ -2030,7 +2030,7 @@ const_section () \
or a constant of some sort. RELOC indicates whether forming
the initial value of DECL requires link-time relocations. */
-#define SELECT_SECTION(DECL, RELOC) \
+#define SELECT_SECTION(DECL, RELOC, ALIGN) \
{ \
if (TREE_CODE (DECL) == STRING_CST) \
{ \
@@ -2075,7 +2075,7 @@ const_section () \
in the case of a `const_int' rtx. Currently, these always
go into the const section. */
-#define SELECT_RTX_SECTION(MODE, RTX) const_section()
+#define SELECT_RTX_SECTION(MODE, RTX, ALIGN) const_section()
/* Overall Framework of an Assembler File. */
--- gcc/config/d30v/d30v.h.jj Mon Sep 3 19:53:53 2001
+++ gcc/config/d30v/d30v.h Mon Sep 10 14:05:33 2001
@@ -3698,7 +3698,7 @@ extern const char *d30v_branch_cost_stri
the read-only data section (usually the text section).
Defined in svr4.h. */
-/* #define SELECT_SECTION(EXP, RELOC) */
+/* #define SELECT_SECTION(EXP, RELOC, ALIGN) */
/* A C statement or statements to switch to the appropriate section for output
of RTX in mode MODE. You can assume that RTX is some kind of constant in
@@ -3710,7 +3710,7 @@ extern const char *d30v_branch_cost_stri
section.
Defined in svr4.h. */
-/* #define SELECT_RTX_SECTION(MODE, RTX) */
+/* #define SELECT_RTX_SECTION(MODE, RTX, ALIGN) */
/* Define this macro if jump tables (for `tablejump' insns) should be output in
the text section, along with the assembler instructions. Otherwise, the
--- gcc/config/i386/dgux.h.jj Thu May 3 20:07:30 2001
+++ gcc/config/i386/dgux.h Mon Sep 10 14:05:33 2001
@@ -232,7 +232,7 @@ Boston, MA 02111-1307, USA. */
/* Must use data section for relocatable constants when pic. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE,RTX) \
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) \
{ \
if (flag_pic && symbolic_operand (RTX, VOIDmode)) \
data_section (); \
--- gcc/config/i386/osfrose.h.jj Sun Jul 22 21:34:29 2001
+++ gcc/config/i386/osfrose.h Mon Sep 10 14:05:33 2001
@@ -506,7 +506,7 @@ while (0)
and select that section. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE, RTX) \
+#define SELECT_RTX_SECTION(MODE, RTX, ALIGN) \
do \
{ \
if (MODE == Pmode && HALF_PIC_P () && HALF_PIC_ADDRESS_P (RTX)) \
@@ -517,7 +517,7 @@ do \
while (0)
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL, RELOC) \
+#define SELECT_SECTION(DECL, RELOC, ALIGN) \
{ \
if (RELOC && HALF_PIC_P ()) \
data_section (); \
--- gcc/config/i386/sco5.h.jj Sat Aug 18 22:10:41 2001
+++ gcc/config/i386/sco5.h Mon Sep 10 14:05:33 2001
@@ -371,7 +371,7 @@ do { \
/* Must use data section for relocatable constants when pic. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE,RTX) \
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) \
{ \
if (TARGET_ELF) { \
if (flag_pic && symbolic_operand (RTX, VOIDmode)) \
@@ -565,7 +565,7 @@ init_section () \
: 0))
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL,RELOC) \
+#define SELECT_SECTION(DECL,RELOC,ALIGN) \
{ \
if (TARGET_ELF && flag_pic && RELOC) \
data_section (); \
--- gcc/config/i386/svr3gas.h.jj Sat Aug 18 22:10:41 2001
+++ gcc/config/i386/svr3gas.h Mon Sep 10 14:05:33 2001
@@ -177,7 +177,7 @@ const_section () \
or a constant of some sort. RELOC indicates whether forming
the initial value of DECL requires link-time relocations. */
-#define SELECT_SECTION(DECL,RELOC) \
+#define SELECT_SECTION(DECL,RELOC,ALIGN) \
{ \
if (TREE_CODE (DECL) == STRING_CST) \
{ \
@@ -207,4 +207,4 @@ const_section () \
in the case of a `const_int' rtx. Currently, these always
go into the const section. */
-#define SELECT_RTX_SECTION(MODE,RTX) const_section()
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) const_section()
--- gcc/config/ia64/sysv4.h.jj Mon Sep 3 19:53:55 2001
+++ gcc/config/ia64/sysv4.h Tue Sep 11 13:32:03 2001
@@ -138,12 +138,12 @@ do { \
/* We override svr4.h so that we can support the sdata section. */
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL,RELOC) \
+#define SELECT_SECTION(DECL,RELOC,ALIGN) \
{ \
if (TREE_CODE (DECL) == STRING_CST) \
{ \
if (! flag_writable_strings) \
- const_section (); \
+ mergeable_string_section ((DECL), (ALIGN), 0); \
else \
data_section (); \
} \
@@ -152,13 +152,20 @@ do { \
if (XSTR (XEXP (DECL_RTL (DECL), 0), 0)[0] \
== SDATA_NAME_FLAG_CHAR) \
sdata_section (); \
- /* ??? We need the extra ! RELOC check, because the default is to \
+ /* ??? We need the extra RELOC check, because the default is to \
only check RELOC if flag_pic is set, and we don't set flag_pic \
(yet?). */ \
- else if (DECL_READONLY_SECTION (DECL, RELOC) && ! (RELOC)) \
+ else if (!DECL_READONLY_SECTION (DECL, RELOC) || (RELOC)) \
+ data_section (); \
+ else if (flag_merge_constants < 2) \
+ /* C and C++ don't allow different variables to share \
+ the same location. -fmerge-all-constants allows \
+ even that (at the expense of not conforming). */ \
const_section (); \
+ else if (TREE_CODE (DECL_INITIAL (DECL)) == STRING_CST) \
+ mergeable_string_section (DECL_INITIAL (DECL), (ALIGN), 0); \
else \
- data_section (); \
+ mergeable_constant_section (DECL_MODE (DECL), (ALIGN), 0); \
} \
/* This could be a CONSTRUCTOR containing ADDR_EXPR of a VAR_DECL, \
in which case we can't put it in a shared library rodata. */ \
@@ -172,7 +179,7 @@ do { \
extern unsigned int ia64_section_threshold;
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE, RTX) \
+#define SELECT_RTX_SECTION(MODE, RTX, ALIGN) \
{ \
if (GET_MODE_SIZE (MODE) > 0 \
&& GET_MODE_SIZE (MODE) <= ia64_section_threshold) \
@@ -180,7 +187,7 @@ extern unsigned int ia64_section_thresho
else if (flag_pic && symbolic_operand ((RTX), (MODE))) \
data_section (); \
else \
- const_section (); \
+ mergeable_constant_section ((MODE), (ALIGN), 0); \
}
#undef EXTRA_SECTIONS
--- gcc/config/ia64/aix.h.jj Sat Jul 21 11:42:20 2001
+++ gcc/config/ia64/aix.h Mon Sep 10 14:05:34 2001
@@ -150,7 +150,7 @@ do { \
the initial value of DECL requires link-time relocations. */
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL,RELOC) \
+#define SELECT_SECTION(DECL,RELOC,ALIGN) \
{ \
if (TREE_CODE (DECL) == STRING_CST) \
{ \
@@ -184,7 +184,7 @@ do { \
extern unsigned int ia64_section_threshold;
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE, RTX) \
+#define SELECT_RTX_SECTION(MODE, RTX, ALIGN) \
{ \
if (GET_MODE_SIZE (MODE) > 0 \
&& GET_MODE_SIZE (MODE) <= ia64_section_threshold) \
--- gcc/config/m32r/m32r.h.jj Mon Sep 3 19:53:55 2001
+++ gcc/config/m32r/m32r.h Mon Sep 10 14:05:34 2001
@@ -1534,7 +1534,8 @@ sbss_section () \
or a constant of some sort. RELOC indicates whether the initial value
of EXP requires link-time relocations. */
#undef SELECT_SECTION
-#define SELECT_SECTION(EXP, RELOC) m32r_select_section ((EXP), (RELOC))
+#define SELECT_SECTION(EXP, RELOC, ALIGN) \
+ m32r_select_section ((EXP), (RELOC))
/* A C statement or statements to switch to the appropriate section for
output of RTX in mode MODE. You can assume that RTX
--- gcc/config/m68k/m68k.h.jj Sat Aug 18 22:10:42 2001
+++ gcc/config/m68k/m68k.h Mon Sep 10 14:05:34 2001
@@ -359,7 +359,7 @@ extern int target_flags;
/* This is how to align an instruction for optimal branching. */
#define LABEL_ALIGN_AFTER_BARRIER(LABEL) (m68k_align_jumps)
-#define SELECT_RTX_SECTION(MODE, X) \
+#define SELECT_RTX_SECTION(MODE, X, ALIGN) \
{ \
if (!flag_pic) \
readonly_data_section(); \
--- gcc/config/m88k/dgux.h.jj Thu May 3 20:07:32 2001
+++ gcc/config/m88k/dgux.h Mon Sep 10 14:05:34 2001
@@ -294,7 +294,7 @@ func_ptr __DTOR_END__[1] = { (func_ptr)
/* Must use data section for relocatable constants when pic. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE,RTX) \
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) \
{ \
if (flag_pic && symbolic_operand (RTX)) \
data_section (); \
--- gcc/config/m88k/m88k.h.jj Mon Sep 3 19:53:55 2001
+++ gcc/config/m88k/m88k.h Mon Sep 10 14:05:34 2001
@@ -2480,7 +2480,7 @@ sdata_section () \
For strings, the section is selected before the segment info is encoded. */
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL,RELOC) \
+#define SELECT_SECTION(DECL,RELOC,ALIGN) \
{ \
if (TREE_CODE (DECL) == STRING_CST) \
{ \
--- gcc/config/mcore/mcore-pe.h.jj Sat Aug 18 22:10:43 2001
+++ gcc/config/mcore/mcore-pe.h Mon Sep 10 14:05:34 2001
@@ -81,7 +81,7 @@ rdata_section () \
or a constant of some sort. RELOC indicates whether forming
the initial value of DECL requires link-time relocations. */
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL, RELOC) \
+#define SELECT_SECTION(DECL, RELOC, ALIGN) \
{ \
if (TREE_CODE (DECL) == STRING_CST) \
{ \
@@ -111,7 +111,7 @@ rdata_section () \
in the case of a `const_int' rtx. Currently, these always
go into the const section. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE, RTX) rdata_section ()
+#define SELECT_RTX_SECTION(MODE, RTX, ALIGN) rdata_section ()
#define MCORE_EXPORT_NAME(STREAM, NAME) \
do \
--- gcc/config/mips/mips.h.jj Mon Sep 3 19:53:55 2001
+++ gcc/config/mips/mips.h Mon Sep 10 14:05:34 2001
@@ -4462,10 +4462,12 @@ rdata_section () \
and select that section. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE,RTX) mips_select_rtx_section (MODE, RTX)
+#define SELECT_RTX_SECTION(MODE, RTX, ALIGN) \
+ mips_select_rtx_section (MODE, RTX)
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL, RELOC) mips_select_section (DECL, RELOC)
+#define SELECT_SECTION(DECL, RELOC, ALIGN) \
+ mips_select_section (DECL, RELOC)
/* Store in OUTPUT a string (made with alloca) containing
--- gcc/config/pa/pa.h.jj Mon Sep 10 10:34:52 2001
+++ gcc/config/pa/pa.h Mon Sep 10 14:05:34 2001
@@ -1403,7 +1403,7 @@ do { \
library. Since we can't know at compile time if a symbol will be
satisfied by a shared library or main program we put any symbolic
constant into the normal data section. */
-#define SELECT_RTX_SECTION(MODE,RTX) \
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) \
if (symbolic_operand (RTX, MODE)) \
data_section (); \
else \
@@ -1413,7 +1413,7 @@ do { \
in the read-only data section to a symbol defined in a shared
library. Therefore, expressions that might require a reloc can
not be placed in the read-only data section. */
-#define SELECT_SECTION(EXP,RELOC) \
+#define SELECT_SECTION(EXP,RELOC,ALIGN) \
if (TREE_CODE (EXP) == VAR_DECL \
&& TREE_READONLY (EXP) \
&& !TREE_THIS_VOLATILE (EXP) \
--- gcc/config/pa/pa-linux.h.jj Fri Jun 8 11:37:16 2001
+++ gcc/config/pa/pa-linux.h Mon Sep 10 14:05:34 2001
@@ -55,7 +55,7 @@ Boston, MA 02111-1307, USA. */
/* Put plabels into the data section so we can relocate them. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE,RTX) \
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) \
if (flag_pic && function_label_operand (RTX, MODE)) \
data_section (); \
else \
--- gcc/config/romp/romp.h.jj Sun Jul 22 21:34:36 2001
+++ gcc/config/romp/romp.h Mon Sep 10 14:05:34 2001
@@ -717,7 +717,7 @@ struct rt_cargs {int gregs, fregs; };
On ROMP, all constants are in the data area. */
-#define SELECT_RTX_SECTION(MODE, X) data_section ()
+#define SELECT_RTX_SECTION(MODE, X, ALIGN) data_section ()
/* Output assembler code to FILE to increment profiler label # LABELNO
for profiling a function entry. */
--- gcc/config/rs6000/xcoff.h.jj Mon Aug 13 23:14:01 2001
+++ gcc/config/rs6000/xcoff.h Mon Sep 10 14:05:34 2001
@@ -144,7 +144,7 @@ toc_section () \
On the RS/6000, we have a special section for all variables except those
that are static. */
-#define SELECT_SECTION(EXP,RELOC) \
+#define SELECT_SECTION(EXP,RELOC,ALIGN) \
{ \
if ((TREE_CODE (EXP) == STRING_CST \
&& ! flag_writable_strings) \
@@ -199,7 +199,7 @@ toc_section () \
However, if this is being placed in the TOC it must be output as a
toc entry. */
-#define SELECT_RTX_SECTION(MODE, X) \
+#define SELECT_RTX_SECTION(MODE, X, ALIGN) \
{ if (ASM_OUTPUT_SPECIAL_POOL_ENTRY_P (X, MODE)) \
toc_section (); \
else \
--- gcc/config/rs6000/sysv4.h.jj Sat Aug 18 22:20:38 2001
+++ gcc/config/rs6000/sysv4.h Mon Sep 10 14:05:34 2001
@@ -566,7 +566,7 @@ fini_section () \
/* Override elfos.h definition. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE, X) rs6000_select_rtx_section (MODE, X)
+#define SELECT_RTX_SECTION(MODE, X, ALIGN) rs6000_select_rtx_section (MODE, X)
/* A C statement or statements to switch to the appropriate
section for output of DECL. DECL is either a `VAR_DECL' node
@@ -575,7 +575,7 @@ fini_section () \
/* Override elfos.h definition. */
#undef SELECT_SECTION
-#define SELECT_SECTION(DECL, RELOC) rs6000_select_section (DECL, RELOC)
+#define SELECT_SECTION(DECL, RELOC, ALIGN) rs6000_select_section (DECL, RELOC)
/* A C statement to build up a unique section name, expressed as a
STRING_CST node, and assign it to DECL_SECTION_NAME (decl).
--- gcc/config/sparc/sparc.h.jj Mon Sep 3 19:53:56 2001
+++ gcc/config/sparc/sparc.h Mon Sep 10 14:05:34 2001
@@ -912,7 +912,7 @@ if (TARGET_ARCH64 \
#endif
/* This is defined differently for v9 in a cover file. */
-#define SELECT_SECTION(T,RELOC) \
+#define SELECT_SECTION(T,RELOC,ALIGN) \
{ \
if (TREE_CODE (T) == VAR_DECL) \
{ \
@@ -945,7 +945,7 @@ if (TARGET_ARCH64 \
/* Use text section for a constant
unless we need more alignment than that offers. */
/* This is defined differently for v9 in a cover file. */
-#define SELECT_RTX_SECTION(MODE, X) \
+#define SELECT_RTX_SECTION(MODE, X, ALIGN) \
{ \
if (GET_MODE_BITSIZE (MODE) <= MAX_TEXT_ALIGN \
&& ! (flag_pic && (symbolic_operand ((X), (MODE)) || SUNOS4_SHARED_LIBRARIES))) \
--- gcc/config/sparc/sysv4.h.jj Sat Aug 18 22:10:46 2001
+++ gcc/config/sparc/sysv4.h Mon Sep 10 14:05:34 2001
@@ -79,7 +79,7 @@ Boston, MA 02111-1307, USA. */
/* Must use data section for relocatable constants when pic. */
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE,RTX) \
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) \
{ \
if (flag_pic && symbolic_operand ((RTX), (MODE))) \
data_section (); \
--- gcc/config/sparc/sparc.c.jj Mon Sep 10 10:34:52 2001
+++ gcc/config/sparc/sparc.c Tue Sep 11 14:01:52 2001
@@ -8765,6 +8765,14 @@ sparc_elf_asm_named_section (name, flags
const char *name;
unsigned int flags;
{
+ if (flags & SECTION_MERGE)
+ {
+ /* entsize cannot be expressed in this section attributes
+ encoding style. */
+ default_elf_asm_named_section (name, flags);
+ return;
+ }
+
fprintf (asm_out_file, "\t.section\t\"%s\"", name);
if (!(flags & SECTION_DEBUG))
--- gcc/config/v850/v850.h.jj Mon Sep 3 19:53:56 2001
+++ gcc/config/v850/v850.h Mon Sep 10 14:05:34 2001
@@ -1164,7 +1164,7 @@ zbss_section () \
Do not define this macro if you put all read-only variables and
constants in the read-only data section (usually the text section). */
#undef SELECT_SECTION
-#define SELECT_SECTION(EXP, RELOC) \
+#define SELECT_SECTION(EXP, RELOC, ALIGN) \
do { \
if (TREE_CODE (EXP) == VAR_DECL) \
{ \
@@ -1227,7 +1227,7 @@ do { \
Do not define this macro if you put all constants in the read-only
data section. */
-/* #define SELECT_RTX_SECTION(MODE, RTX) */
+/* #define SELECT_RTX_SECTION(MODE, RTX, ALIGN) */
/* Output at beginning/end of assembler file. */
#undef ASM_FILE_START
--- gcc/config/vax/vms.h.jj Sat Aug 18 22:10:47 2001
+++ gcc/config/vax/vms.h Mon Sep 10 14:05:34 2001
@@ -218,7 +218,7 @@ const_section () \
Since this macro is used in a number of places, we must also be able
to decide where to place string constants. */
-#define SELECT_SECTION(T,RELOC) \
+#define SELECT_SECTION(T,RELOC,ALIGN) \
{ \
if (TREE_CODE (T) == VAR_DECL) \
{ \
--- gcc/config/stormy16/stormy16.h.jj Sat Sep 1 20:31:46 2001
+++ gcc/config/stormy16/stormy16.h Mon Sep 10 14:05:34 2001
@@ -3470,7 +3470,7 @@ do { \
the read-only data section (usually the text section).
Defined in svr4.h. */
-/* #define SELECT_SECTION(EXP, RELOC) */
+/* #define SELECT_SECTION(EXP, RELOC, ALIGN) */
/* A C statement or statements to switch to the appropriate section for output
of RTX in mode MODE. You can assume that RTX is some kind of constant in
@@ -3482,7 +3482,7 @@ do { \
section.
Defined in svr4.h. */
-/* #define SELECT_RTX_SECTION(MODE, RTX) */
+/* #define SELECT_RTX_SECTION(MODE, RTX, ALIGN) */
/* Define this macro if jump tables (for `tablejump' insns) should be output in
the text section, along with the assembler instructions. Otherwise, the
--- gcc/config/darwin.h.jj Mon Sep 10 10:34:48 2001
+++ gcc/config/darwin.h Mon Sep 10 14:05:34 2001
@@ -509,7 +509,7 @@ void alias_section (name, alias) \
#define READONLY_DATA_SECTION const_section
#undef SELECT_SECTION
-#define SELECT_SECTION(exp,reloc) \
+#define SELECT_SECTION(exp,reloc,align) \
do \
{ \
if (TREE_CODE (exp) == STRING_CST) \
@@ -633,7 +633,7 @@ void alias_section (name, alias) \
while (0)
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(mode, rtx) \
+#define SELECT_RTX_SECTION(mode, rtx, align) \
do \
{ \
if (GET_MODE_SIZE (mode) == 8) \
--- gcc/config/nextstep.h.jj Sat Aug 18 22:10:35 2001
+++ gcc/config/nextstep.h Mon Sep 10 14:05:34 2001
@@ -445,7 +445,7 @@ objc_section_init () \
#define READONLY_DATA_SECTION const_section
#undef SELECT_SECTION
-#define SELECT_SECTION(exp,reloc) \
+#define SELECT_SECTION(exp,reloc,align) \
do \
{ \
if (TREE_CODE (exp) == STRING_CST) \
@@ -563,7 +563,7 @@ objc_section_init () \
while (0)
#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(mode, rtx) \
+#define SELECT_RTX_SECTION(mode, rtx, align) \
do \
{ \
if (GET_MODE_SIZE(mode) == 8) \
--- gcc/config/svr3.h.jj Sat Aug 18 22:10:35 2001
+++ gcc/config/svr3.h Mon Sep 10 14:05:34 2001
@@ -301,7 +301,7 @@ const_section () \
or a constant of some sort. RELOC indicates whether forming
the initial value of DECL requires link-time relocations. */
-#define SELECT_SECTION(DECL,RELOC) \
+#define SELECT_SECTION(DECL,RELOC,ALIGN) \
{ \
if (TREE_CODE (DECL) == STRING_CST) \
{ \
@@ -331,4 +331,4 @@ const_section () \
in the case of a `const_int' rtx. Currently, these always
go into the const section. */
-#define SELECT_RTX_SECTION(MODE,RTX) const_section()
+#define SELECT_RTX_SECTION(MODE,RTX,ALIGN) const_section()
--- gcc/f/com.c.jj Sun Jul 22 21:34:54 2001
+++ gcc/f/com.c Mon Sep 10 14:05:35 2001
@@ -14657,6 +14657,7 @@ ffe_init_options ()
flag_move_all_movables = 1;
flag_reduce_all_givs = 1;
flag_argument_noalias = 2;
+ flag_merge_constants = 2;
flag_errno_math = 0;
flag_complex_divide_method = 1;
}
Jakub