From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 5A9483858C66; Thu, 25 Apr 2024 19:21:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5A9483858C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1714072883; bh=qYY6bj1etC14T1IoBJRVNU2CLAwjSdkwgncs7HWg7FY=; h=From:To:Subject:Date:From; b=gB6aikt2cpONAndfAQzbTofoxGmMTmGYYxepoil1ya8DYSJeG6+/4b18HTI2N/4oR NUyjzuruwq0UnFW1u3ASq0OfgIoAHjdF1UE8TA/D1Y2tG0DRS1th5vR7b14YveHcSA vPrsd03xrdM5vS6D08pFBQkinsD4UbCaQm01HJ5E= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain D Sandoe To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-11367] Darwin: Partial reversion of r14-3648 (Inits Section). X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 084d0c427433d592e29247164b199c1f232f5c68 X-Git-Newrev: 960ca4144ebb61d125f28fab17b57cd3b09b49fd Message-Id: <20240425192123.5A9483858C66@sourceware.org> Date: Thu, 25 Apr 2024 19:21:23 +0000 (GMT) List-Id: https://gcc.gnu.org/g:960ca4144ebb61d125f28fab17b57cd3b09b49fd commit r11-11367-g960ca4144ebb61d125f28fab17b57cd3b09b49fd Author: Iain Sandoe Date: Sun Sep 10 14:48:42 2023 +0100 Darwin: Partial reversion of r14-3648 (Inits Section). Although the Darwin ABI places both hot and cold partitions in the same section (the linker can partition by name), this does not work with the current dwarf2out implementation. Since we do see global initialization code getting hot/cold splits, this patch places the cold parts into text_cold, and keeps the hot part in the correct Init section per ABI. TODO: figure out a way to allow us to match the ABI fully. gcc/ChangeLog: * config/darwin.c (darwin_function_section): Place unlikely executed global init code into the standard cold section. Signed-off-by: Iain Sandoe (cherry picked from commit 5b33b364652866165431aef1810af1e890229c5e) Diff: --- gcc/config/darwin.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index a3a7c509e36..db0e80889ab 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -3848,19 +3848,22 @@ darwin_function_section (tree decl, enum node_frequency freq, if (decl && DECL_SECTION_NAME (decl) != NULL) return get_named_section (decl, NULL, 0); + /* We always put unlikely executed stuff in the cold section; we have to put + this ahead of the global init section, since partitioning within a section + breaks some assumptions made in the DWARF handling. */ + if (freq == NODE_FREQUENCY_UNLIKELY_EXECUTED) + return (use_coal) ? darwin_sections[text_cold_coal_section] + : darwin_sections[text_cold_section]; + /* Intercept functions in global init; these are placed in separate sections. - FIXME: there should be some neater way to do this. */ + FIXME: there should be some neater way to do this, FIXME we should be able + to partition within a section. */ if (DECL_NAME (decl) && (strncmp (IDENTIFIER_POINTER (DECL_NAME (decl)), "_GLOBAL__sub_I", 14) == 0 || strncmp (IDENTIFIER_POINTER (DECL_NAME (decl)), "__static_initialization_and_destruction", 39) == 0)) 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] - : darwin_sections[text_cold_section]; - /* If we have LTO *and* feedback information, then let LTO handle the function ordering, it makes a better job (for normal, hot, startup and exit - hence the bailout for cold above). */