PR23648, Symbols based on MEMORY regions confuse --gc-sections

Running lang_do_memory_regions earlier seems a reasonable solution to
gaining better values for symbols prior to lang_gc_sections.

	PR ld/23648
	* ldlang.c (lang_process): Move lang_do_memory_regions earlier.
	Comment on lang_do_assignments call.
	* ldgram.y (origin_exp): Don't assign region->current.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index bf5441f6954b6198f2f5e863ffd5f17bce09d129..a31c3f3b4ddba6d4655bf2eb9ca38322dc1fc084 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2018-09-19  Alan Modra  <amodra@gmail.com>
+
+       PR ld/23648
+       * ldlang.c (lang_process): Move lang_do_memory_regions earlier.
+       Comment on lang_do_assignments call.
+       * ldgram.y (origin_exp): Don't assign region->current.
+
 2018-09-19  Alan Modra  <amodra@gmail.com>
 
        * ldmain.c (add_archive_element): Handle auto-inport symbols

diff --git a/ld/ldgram.y b/ld/ldgram.y
index cba0486259d2fbd353c691925cb5d8759314d094..81ed85e9a02c62ec7e167b628d21215ff1b4d306 100644 (file)
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -819,7 +819,6 @@ origin_spec:
        ORIGIN '=' mustbe_exp
                {
                  region->origin_exp = $3;
-                 region->current = region->origin;
                }
        ;
 

diff --git a/ld/ldlang.c b/ld/ldlang.c
index d644b568120197d485a01a7869e03aab027604ac..1ac5eb1ee2d9f9ceafa09cb5855b4263589992a1 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -7180,6 +7180,9 @@ lang_process (void)
   current_target = default_target;
   lang_statement_iteration++;
   open_input_bfds (statement_list.head, OPEN_BFD_NORMAL);
+  /* open_input_bfds also handles assignments, so we can give values
+     to symbolic origin/length now.  */
+  lang_do_memory_regions ();
 
 #ifdef ENABLE_PLUGINS
   if (link_info.lto_plugin_active)
@@ -7322,8 +7325,6 @@ lang_process (void)
   /* PR 13683: We must rerun the assignments prior to running garbage
      collection in order to make sure that all symbol aliases are resolved.  */
   lang_do_assignments (lang_mark_phase_enum);
-
-  lang_do_memory_regions();
   expld.phase = lang_first_phase_enum;
 
   /* Size up the common data.  */
@@ -7408,8 +7409,11 @@ lang_process (void)
   /* Fix any __start, __stop, .startof. or .sizeof. symbols.  */
   lang_finalize_start_stop ();
 
-  /* Do all the assignments, now that we know the final resting places
-     of all the symbols.  */
+  /* Do all the assignments again, to report errors.  Assignment
+     statements are processed multiple times, updating symbols; In
+     open_input_bfds, lang_do_assignments, and lang_size_sections.
+     Since lang_relax_sections calls lang_do_assignments, symbols are
+     also updated in ldemul_after_allocation.  */
   lang_do_assignments (lang_final_phase_enum);
 
   ldemul_finish ();