* object.cc (Sized_relobj::do_layout): Change to call layout_gnu_stack

	in the first pass of do_layout.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index c6d0c160d7882d6d0dd9ddd604989f945b9f238e..09c516b500080a8a948a0e8e2d38fd39eaaf58a2 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Sriraman Tallam  <tmsriram@google.com>
+
+       * object.cc (Sized_relobj::do_layout): Change to call layout_gnu_stack
+       in the first pass of do_layout.
+
 2010-01-13  Doug Kwan  <dougkwan@google.com>
 
        * arm.cc (Arm_relobj::section_needs_reloc_stub_scanning,

diff --git a/gold/object.cc b/gold/object.cc
index 1b903368f308bd83e7c157cd5aea1710983c4b09..7d505147cc03da4f1e7d162f3d923a58fad647e5 100644 (file)
--- a/gold/object.cc
+++ b/gold/object.cc
@@ -1321,7 +1321,7 @@ Sized_relobj<size, big_endian>::do_layout(Symbol_table* symtab,
         }
     }
 
-  if (!is_gc_pass_one)
+  if (!is_gc_pass_two)
     layout->layout_gnu_stack(seen_gnu_stack, gnu_stack_flags);
 
   // When doing a relocatable link handle the reloc sections at the