From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 434633829BE0; Sun, 29 May 2022 19:09:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 434633829BE0 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 r10-10788] Darwin : Mark the mod init/term section starts with a linker-visible sym. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 8d16d15d7efcd8f65dd0d289aad26b7ee3b0b2b2 X-Git-Newrev: 3b7661d48293fa7bb4376394007bd47cfa867db2 Message-Id: <20220529190917.434633829BE0@sourceware.org> Date: Sun, 29 May 2022 19:09:17 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 May 2022 19:09:17 -0000 https://gcc.gnu.org/g:3b7661d48293fa7bb4376394007bd47cfa867db2 commit r10-10788-g3b7661d48293fa7bb4376394007bd47cfa867db2 Author: Iain Sandoe Date: Sat Aug 29 22:05:30 2020 +0100 Darwin : Mark the mod init/term section starts with a linker-visible sym. Some newer assemblers emit section start temp symbols for mod init and term sections if there is no suitable symbol present already. The temp symbols are linker visible and therefore appear in the symbol tables. Since the temp symbol number can vary when debug is enabled, that causes compare-debug fails. The solution is to provide a stable linker-visible symbol. Signed-off-by: Iain Sandoe gcc/ChangeLog: * config/darwin.c (finalize_ctors): Add a section-start linker- visible symbol. (finalize_dtors): Likewise. * config/darwin.h (MIN_LD64_INIT_TERM_START_LABELS): New. (cherry picked from commit 66526c6a1c01b6110eaeda94ecc885177c636605) Diff: --- gcc/config/darwin.c | 37 ++++++++++++++++++++++++++++++++----- gcc/config/darwin.h | 3 +++ 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 3ce3a04f43a..bd7ec282a20 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -108,6 +108,9 @@ static bool ld_uses_coal_sects = false; each FDE. */ static bool ld_needs_eh_markers = false; +/* Emit a section-start symbol for mod init and term sections. */ +static bool ld_init_term_start_labels = false; + /* Section names. */ section * darwin_sections[NUM_DARWIN_SECTIONS]; @@ -1843,6 +1846,11 @@ finalize_ctors () else switch_to_section (darwin_sections[constructor_section]); + /* Where needed, provide a linker-visible section-start symbol so that we + have stable output between debug and non-debug. */ + if (ld_init_term_start_labels) + fputs (MACHOPIC_INDIRECT ? "_Mod.init:\n" : "_CTOR.sect:\n", asm_out_file); + if (vec_safe_length (ctors) > 1) ctors->qsort (sort_cdtor_records); FOR_EACH_VEC_SAFE_ELT (ctors, i, elt) @@ -1863,6 +1871,11 @@ finalize_dtors () else switch_to_section (darwin_sections[destructor_section]); + /* Where needed, provide a linker-visible section-start symbol so that we + have stable output between debug and non-debug. */ + if (ld_init_term_start_labels) + fputs (MACHOPIC_INDIRECT ? "_Mod.term:\n" : "_DTOR.sect:\n", asm_out_file); + if (vec_safe_length (dtors) > 1) dtors->qsort (sort_cdtor_records); FOR_EACH_VEC_SAFE_ELT (dtors, i, elt) @@ -3223,11 +3236,25 @@ darwin_override_options (void) /* Earlier versions are not specifically accounted, until required. */ } - /* Older Darwin ld could not coalesce weak entities without them being - placed in special sections. */ - if (darwin_target_linker - && (strverscmp (darwin_target_linker, MIN_LD64_NO_COAL_SECTS) < 0)) - ld_uses_coal_sects = true; + /* Some codegen needs to account for the capabilities of the target + linker. */ + if (darwin_target_linker) + { + /* Older Darwin ld could not coalesce weak entities without them being + placed in special sections. */ + if (strverscmp (darwin_target_linker, MIN_LD64_NO_COAL_SECTS) < 0) + ld_uses_coal_sects = true; + + /* Some newer assemblers emit section start temp symbols for mod init + and term sections if there is no suitable symbol present already. + The temp symbols are linker visible and therefore appear in the + symbol tables. Since the temp symbol number can vary when debug is + enabled, that causes compare-debug fails. The solution is to provide + a stable linker-visible symbol. */ + if (strverscmp (darwin_target_linker, + MIN_LD64_INIT_TERM_START_LABELS) >= 0) + ld_init_term_start_labels = true; + } /* In principle, this should be c-family only. However, we really need to set sensible defaults for LTO as well, since the section selection stuff diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index d3ed5ca072a..050ae00db1b 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -1100,6 +1100,9 @@ extern void darwin_driver_init (unsigned int *,struct cl_decoded_option **); needed, and there is no need for the compiler to emit them. */ #define MIN_LD64_OMIT_STUBS "62.1" +/* Emit start labels for init and term sections from this version. */ +#define MIN_LD64_INIT_TERM_START_LABELS "136.0" + /* If we have no definition for the linker version, pick the minimum version that will bootstrap the compiler. */ #ifndef LD64_VERSION