From 10c459437e4444fc5a111d1c3bdb96022e23716f Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Mon, 4 Feb 2002 03:03:44 +0000 Subject: output.h (SECTION_OVERRIDE): Define. 2002-02-04 Anthony Green * output.h (SECTION_OVERRIDE): Define. * varasm.c (named_section): Obey SECTION_OVERRIDE. java: 2002-02-04 Anthony Green * class.c (build_utf8_ref): Put UTF-8 constants into merged sections if available. From-SVN: r49469 --- gcc/varasm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gcc/varasm.c') diff --git a/gcc/varasm.c b/gcc/varasm.c index 955a98e..8bd5807 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -445,11 +445,15 @@ named_section (decl, name, reloc) flags = (* targetm.section_type_flags) (decl, name, reloc); /* Sanity check user variables for flag changes. Non-user - section flag changes will abort in named_section_flags. */ + section flag changes will abort in named_section_flags. + However, don't complain if SECTION_OVERRIDE is set. + We trust that the setter knows that it is safe to ignore + the default flags for this decl. */ if (decl && ! set_named_section_flags (name, flags)) { - error_with_decl (decl, "%s causes a section type conflict"); flags = get_named_section_flags (name); + if ((flags & SECTION_OVERRIDE) == 0) + error_with_decl (decl, "%s causes a section type conflict"); } named_section_flags (name, flags); -- cgit v1.1