[gcc r12-10341] Darwin: Place global inits in the correct section.

Iain D Sandoe iains@gcc.gnu.org
Thu Apr 18 14:46:43 GMT 2024


https://gcc.gnu.org/g:11d379f5ff8a5d3ce3ec4bc2f66471cab15c9ff7

commit r12-10341-g11d379f5ff8a5d3ce3ec4bc2f66471cab15c9ff7
Author: Iain Sandoe <iain@sandoe.co.uk>
Date:   Fri Sep 1 09:04:13 2023 +0100

    Darwin: Place global inits in the correct section.
    
    This handles placement of global initializers into __TEXT,__StaticInit as used
    by other platform toolchains.
    
    Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
    
    gcc/ChangeLog:
    
            * config/darwin-sections.def (static_init_section): Add the
            __TEXT,__StaticInit section.
            * config/darwin.cc (darwin_function_section): Use the static init
            section for global initializers, to match other platform toolchains.
    
    (cherry picked from commit 68dc3e94fd6bd395a8b343533485616dff3fc796)

Diff:
---
 gcc/config/darwin-sections.def | 2 ++
 gcc/config/darwin.cc           | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/gcc/config/darwin-sections.def b/gcc/config/darwin-sections.def
index cdd5985cc36..af7bb404688 100644
--- a/gcc/config/darwin-sections.def
+++ b/gcc/config/darwin-sections.def
@@ -98,6 +98,8 @@ DEF_SECTION (mod_init_section, 0, ".mod_init_func", 0)
 DEF_SECTION (mod_term_section, 0, ".mod_term_func", 0)
 DEF_SECTION (constructor_section, 0, ".constructor", 0)
 DEF_SECTION (destructor_section, 0, ".destructor", 0)
+DEF_SECTION (static_init_section, SECTION_CODE,
+	     ".section\t__TEXT,__StaticInit,regular,pure_instructions", 0)
 
 /* Objective-C ABI=0 (Original version) sections.  */
 DEF_SECTION (objc_class_section, 0, ".objc_class", 1)
diff --git a/gcc/config/darwin.cc b/gcc/config/darwin.cc
index 8aa10153cde..68a692dc74e 100644
--- a/gcc/config/darwin.cc
+++ b/gcc/config/darwin.cc
@@ -3879,6 +3879,14 @@ darwin_function_section (tree decl, enum node_frequency freq,
   if (decl && DECL_SECTION_NAME (decl) != NULL)
     return get_named_section (decl, NULL, 0);
 
+  /* Intercept functions in global init; these are placed in separate sections.
+     FIXME: there should be some neater way to do this.  */
+  if (DECL_NAME (decl)
+      && (startswith (IDENTIFIER_POINTER (DECL_NAME (decl)), "_GLOBAL__sub_I")
+	  || startswith (IDENTIFIER_POINTER (DECL_NAME (decl)),
+			 "__static_initialization_and_destruction")))
+    return  darwin_sections[static_init_section];
+
   /* We always put unlikely executed stuff in the cold section.  */
   if (freq == NODE_FREQUENCY_UNLIKELY_EXECUTED)
     return (use_coal) ? darwin_sections[text_cold_coal_section]


More information about the Gcc-cvs mailing list