From 58e6cc77b7605e26cbf3fccc166089c01ceee95f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 13 Nov 2017 08:19:10 -0800 Subject: [PATCH] ld: Replace exp_dataseg_none with exp_seg_none * emultempl/ppc32elf.em (ppc_before_allocation): Replace exp_dataseg_none with exp_seg_none. * emultempl/ppc64elf.em (prelim_size_sections): Likewise. * emultempl/spuelf.em (spu_before_allocation): Likewise. --- ld/ChangeLog | 7 +++++++ ld/emultempl/ppc32elf.em | 2 +- ld/emultempl/ppc64elf.em | 2 +- ld/emultempl/spuelf.em | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index a619491..16786d7 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2017-11-13 H.J. Lu + + * emultempl/ppc32elf.em (ppc_before_allocation): Replace + exp_dataseg_none with exp_seg_none. + * emultempl/ppc64elf.em (prelim_size_sections): Likewise. + * emultempl/spuelf.em (spu_before_allocation): Likewise. + 2017-11-12 H.J. Lu * ldlang.c (lang_size_sections_1): Extract GNU_RELRO region check diff --git a/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em index b1ea04d..f78a117 100644 --- a/ld/emultempl/ppc32elf.em +++ b/ld/emultempl/ppc32elf.em @@ -149,7 +149,7 @@ ppc_before_allocation (void) if (expld.phase != lang_mark_phase_enum) { expld.phase = lang_mark_phase_enum; - expld.dataseg.phase = exp_dataseg_none; + expld.dataseg.phase = exp_seg_none; one_lang_size_sections_pass (NULL, FALSE); lang_reset_memory_regions (); } diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em index ac30664..d6d5b0a 100644 --- a/ld/emultempl/ppc64elf.em +++ b/ld/emultempl/ppc64elf.em @@ -266,7 +266,7 @@ prelim_size_sections (void) if (expld.phase != lang_mark_phase_enum) { expld.phase = lang_mark_phase_enum; - expld.dataseg.phase = exp_dataseg_none; + expld.dataseg.phase = exp_seg_none; one_lang_size_sections_pass (NULL, FALSE); /* We must not cache anything from the preliminary sizing. */ lang_reset_memory_regions (); diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em index f8650a5..8d8aa25 100644 --- a/ld/emultempl/spuelf.em +++ b/ld/emultempl/spuelf.em @@ -272,7 +272,7 @@ spu_before_allocation (void) /* Size the sections. This is premature, but we need to know the rough layout so that overlays can be found. */ expld.phase = lang_mark_phase_enum; - expld.dataseg.phase = exp_dataseg_none; + expld.dataseg.phase = exp_seg_none; one_lang_size_sections_pass (NULL, TRUE); /* Find overlays by inspecting section vmas. */ -- 2.7.4