* script.cc (Script_options::finalize_symbols): Finalize SECTIONS

	symbols before other symbols.
	* testsuite/script_test_2.cc (test_addr): Declare.
	(test_addr_alias): Declare.
	(main): Check that test_addr and test_addr_alias have the right
	values.
	* testsuite/script_test_2.t: Define test_addr_alias and
	test_addr.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 853984950e84acbb8bf99bfcc2b6bd2fb43f7199..48508a9f29da7739a5f2aeff8ef1a7bf58dbd5f9 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-29  Ian Lance Taylor  <iant@google.com>
+
+       * script.cc (Script_options::finalize_symbols): Finalize SECTIONS
+       symbols before other symbols.
+       * testsuite/script_test_2.cc (test_addr): Declare.
+       (test_addr_alias): Declare.
+       (main): Check that test_addr and test_addr_alias have the right
+       values. 
+       * testsuite/script_test_2.t: Define test_addr_alias and
+       test_addr.
+
 2008-07-24  Ian Lance Taylor  <iant@google.com>
 
        PR 5990

diff --git a/gold/script.cc b/gold/script.cc
index 4bfe33c898c927178071aca1a3594d8541e60278..f6e4a396f2c3142597d72d90c13b1f89a979cd82 100644 (file)
--- a/gold/script.cc
+++ b/gold/script.cc
@@ -1109,6 +1109,12 @@ Script_options::add_symbols_to_table(Symbol_table* symtab)
 void
 Script_options::finalize_symbols(Symbol_table* symtab, const Layout* layout)
 {
+  // We finalize the symbols defined in SECTIONS first, because they
+  // are the ones which may have changed.  This way if symbol outside
+  // SECTIONS are defined in terms of symbols inside SECTIONS, they
+  // will get the right value.
+  this->script_sections_.finalize_symbols(symtab, layout);
+
   for (Symbol_assignments::iterator p = this->symbol_assignments_.begin();
        p != this->symbol_assignments_.end();
        ++p)
@@ -1118,8 +1124,6 @@ Script_options::finalize_symbols(Symbol_table* symtab, const Layout* layout)
        p != this->assertions_.end();
        ++p)
     (*p)->check(symtab, layout);
-
-  this->script_sections_.finalize_symbols(symtab, layout);
 }
 
 // Set section addresses.  We set all the symbols which have absolute

diff --git a/gold/testsuite/script_test_2.cc b/gold/testsuite/script_test_2.cc
index 9ba3aad74d20f6b36391531622956d5ab89c09a9..71045516920aa98a7196375f9159b82efed4c581 100644 (file)
--- a/gold/testsuite/script_test_2.cc
+++ b/gold/testsuite/script_test_2.cc
@@ -35,6 +35,8 @@ extern char end_data[];
 extern char start_fill[];
 extern char end_fill[];
 extern char end_test_area[];
+extern char test_addr[];
+extern char test_addr_alias[];
 
 int
 main(int, char**)
@@ -66,4 +68,7 @@ main(int, char**)
   assert(end_fill == start_fill + 8);
 
   assert(end_test_area == end_fill);
+
+  assert(test_addr == start_test_area_1);
+  assert(test_addr_alias == test_addr);
 }

diff --git a/gold/testsuite/script_test_2.t b/gold/testsuite/script_test_2.t
index 41a87213768c664018ac3c87eee7fac4f9f31654..73d39df530ba75c7766d5d4b82a6c72ff924154b 100644 (file)
--- a/gold/testsuite/script_test_2.t
+++ b/gold/testsuite/script_test_2.t
@@ -20,6 +20,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+test_addr_alias = test_addr;
+
 SECTIONS
 {
   /* With luck this will work everywhere.  */
@@ -62,4 +64,5 @@ SECTIONS
     end_fill = .;
   }
   end_test_area = .;
+  test_addr = ADDR(.gold_test);
 }