From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by sourceware.org (Postfix) with ESMTPS id ED2193858415 for ; Tue, 8 Feb 2022 01:09:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ED2193858415 Received: by mail-pj1-x1036.google.com with SMTP id m7so14648547pjk.0 for ; Mon, 07 Feb 2022 17:09:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wkXbwz4uK/rhEARw85qVxSdJ/KPQYKDoZWZA2OT1XFU=; b=PpHd4tPcMcpAtQ6RcOMOYSzls8G5qst5raf+/PkMC/CoXLt1Tvzw9oo+qeG4mtYzvt 2DmSJK3k2jvr0U+gLlYQRzd1fVdveu9zutNQt+BBnQcYVs7jxmDuRP7Q3MEnRJsOZaJo 7bxOMMm+MSYf+I2mqvrH2a7dPu8FYK/x8yS6HfMCwPXDcfZu3BKF02ePeuIx2r4PBLfO EdPZOSPDBgs4Pk+lC3oWBmMiH/LQr04aDMor+Q7nNQ945ALSKNIMub2QyjgtrBimW/5x 50+Eeaz97k+iSRuz0bZbu/PROj+OnL9vVz83cBuIBBs9u9XyT/Rj/Lcj7JgBWF9iVquW VEbA== X-Gm-Message-State: AOAM530X0XJAjVvEo9Uj+nSlXb9HwcyZsqMZ0G3RvKoaFr2fmdgWTAq8 xhyvwXqcSX4J/4cK9lwsSr+H7rIw7G4= X-Google-Smtp-Source: ABdhPJwdaNEOby87BtnPFEPNpS6KX0ew6mM3q2IRsnUOa7N/hVodlhsupoK4V0ApnHeiIW90RHx6zw== X-Received: by 2002:a17:90a:2e03:: with SMTP id q3mr1737887pjd.184.1644282546716; Mon, 07 Feb 2022 17:09:06 -0800 (PST) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:3644:1eae:5601:d29]) by smtp.gmail.com with ESMTPSA id s42sm14111864pfg.146.2022.02.07.17.09.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 17:09:06 -0800 (PST) From: Alan Modra To: binutils@sourceware.org Subject: [PATCH 4/4] Don't pass around expld.dataseg pointer Date: Tue, 8 Feb 2022 11:38:33 +1030 Message-Id: <20220208010833.2103874-5-amodra@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220208010833.2103874-1-amodra@gmail.com> References: <20220208010833.2103874-1-amodra@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3036.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2022 01:09:10 -0000 The better to see any code that accesses expld.dataseg. * ldexp.c (fold_segment_end): Remove seg parameter. Adjust calls. (fold_segment_align, fold_segment_relro_end): Likewise. * ldlang.c (lang_size_segment): Likewise. (lang_size_relro_segment_1, lang_find_relro_sections_1): Likewise. diff --git a/ld/ldexp.c b/ld/ldexp.c index ab724074732..90760e0a8ca 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -340,8 +340,10 @@ update_definedness (const char *name, struct bfd_link_hash_entry *h) } static void -fold_segment_end (seg_align_type *seg) +fold_segment_end (void) { + seg_align_type *seg = &expld.dataseg; + if (expld.phase == lang_first_phase_enum || expld.section != bfd_abs_section_ptr) { @@ -410,7 +412,7 @@ fold_unary (etree_type *tree) break; case DATA_SEGMENT_END: - fold_segment_end (&expld.dataseg); + fold_segment_end (); break; default: @@ -447,8 +449,10 @@ arith_result_section (const etree_value_type *lhs) } static void -fold_segment_align (seg_align_type *seg, etree_value_type *lhs) +fold_segment_align (etree_value_type *lhs) { + seg_align_type *seg = &expld.dataseg; + seg->relro = exp_seg_relro_start; if (expld.phase == lang_first_phase_enum || expld.section != bfd_abs_section_ptr) @@ -494,8 +498,10 @@ fold_segment_align (seg_align_type *seg, etree_value_type *lhs) } static void -fold_segment_relro_end (seg_align_type *seg, etree_value_type *lhs) +fold_segment_relro_end (etree_value_type *lhs) { + seg_align_type *seg = &expld.dataseg; + /* Operands swapped! XXX_SEGMENT_RELRO_END(offset,exp) has offset in expld.result and exp in lhs. */ seg->relro = exp_seg_relro_end; @@ -662,11 +668,11 @@ fold_binary (etree_type *tree) break; case DATA_SEGMENT_ALIGN: - fold_segment_align (&expld.dataseg, &lhs); + fold_segment_align (&lhs); break; case DATA_SEGMENT_RELRO_END: - fold_segment_relro_end (&expld.dataseg, &lhs); + fold_segment_relro_end (&lhs); break; default: diff --git a/ld/ldlang.c b/ld/ldlang.c index f481586a7ba..474784c874a 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -5665,9 +5665,10 @@ os_region_check (lang_output_section_statement_type *os, } static void -ldlang_check_relro_region (lang_statement_union_type *s, - seg_align_type *seg) +ldlang_check_relro_region (lang_statement_union_type *s) { + seg_align_type *seg = &expld.dataseg; + if (seg->relro == exp_seg_relro_start) { if (!seg->relro_start_stat) @@ -6166,7 +6167,7 @@ lang_size_sections_1 output_section_statement->bfd_section, &newdot); - ldlang_check_relro_region (s, &expld.dataseg); + ldlang_check_relro_region (s); expld.dataseg.relro = exp_seg_relro_none; @@ -6346,10 +6347,11 @@ one_lang_size_sections_pass (bool *relax, bool check_regions) } static bool -lang_size_segment (seg_align_type *seg) +lang_size_segment (void) { /* If XXX_SEGMENT_ALIGN XXX_SEGMENT_END pair was seen, check whether a page could be saved in the data segment. */ + seg_align_type *seg = &expld.dataseg; bfd_vma first, last; first = -seg->base & (seg->commonpagesize - 1); @@ -6368,8 +6370,9 @@ lang_size_segment (seg_align_type *seg) } static bfd_vma -lang_size_relro_segment_1 (seg_align_type *seg) +lang_size_relro_segment_1 (void) { + seg_align_type *seg = &expld.dataseg; bfd_vma relro_end, desired_end; asection *sec; @@ -6415,7 +6418,7 @@ lang_size_relro_segment (bool *relax, bool check_regions) if (link_info.relro && expld.dataseg.relro_end) { bfd_vma data_initial_base = expld.dataseg.base; - bfd_vma data_relro_end = lang_size_relro_segment_1 (&expld.dataseg); + bfd_vma data_relro_end = lang_size_relro_segment_1 (); lang_reset_memory_regions (); one_lang_size_sections_pass (relax, check_regions); @@ -6424,11 +6427,11 @@ lang_size_relro_segment (bool *relax, bool check_regions) script have increased padding over the original. Revert. */ if (expld.dataseg.relro_end > data_relro_end) { - expld.dataseg.base = data_initial_base;; + expld.dataseg.base = data_initial_base; do_reset = true; } } - else if (lang_size_segment (&expld.dataseg)) + else if (lang_size_segment ()) do_reset = true; return do_reset; @@ -7679,7 +7682,6 @@ find_relro_section_callback (lang_wild_statement_type *ptr ATTRIBUTE_UNUSED, static void lang_find_relro_sections_1 (lang_statement_union_type *s, - seg_align_type *seg, bool *has_relro_section) { if (*has_relro_section) @@ -7687,7 +7689,7 @@ lang_find_relro_sections_1 (lang_statement_union_type *s, for (; s != NULL; s = s->header.next) { - if (s == seg->relro_end_stat) + if (s == expld.dataseg.relro_end_stat) break; switch (s->header.type) @@ -7699,15 +7701,15 @@ lang_find_relro_sections_1 (lang_statement_union_type *s, break; case lang_constructors_statement_enum: lang_find_relro_sections_1 (constructor_list.head, - seg, has_relro_section); + has_relro_section); break; case lang_output_section_statement_enum: lang_find_relro_sections_1 (s->output_section_statement.children.head, - seg, has_relro_section); + has_relro_section); break; case lang_group_statement_enum: lang_find_relro_sections_1 (s->group_statement.children.head, - seg, has_relro_section); + has_relro_section); break; default: break; @@ -7723,7 +7725,7 @@ lang_find_relro_sections (void) /* Check all sections in the link script. */ lang_find_relro_sections_1 (expld.dataseg.relro_start_stat, - &expld.dataseg, &has_relro_section); + &has_relro_section); if (!has_relro_section) link_info.relro = false;