diff --git a/ld/ChangeLog b/ld/ChangeLog
index cf809f179f3..e8159d00922 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-08  Markos Chandras  <markos.chandras@imgtec.com>
+
+	* emultempl/metagelf.em (build_section_lists): Use sec_info_type
+	rather than userdata->flags.just_syms.
+
 2013-02-06  Sandra Loosemore  <sandra@codesourcery.com>
             Andrew Jenner <andrew@codesourcery.com>
 
diff --git a/ld/emultempl/metagelf.em b/ld/emultempl/metagelf.em
index 8ab12729af0..21e3e942edf 100644
--- a/ld/emultempl/metagelf.em
+++ b/ld/emultempl/metagelf.em
@@ -205,7 +205,7 @@ build_section_lists (lang_statement_union_type *statement)
     {
       asection *i = statement->input_section.section;
 
-      if (!((lang_input_statement_type *) i->owner->usrdata)->flags.just_syms
+      if (i->sec_info_type != SEC_INFO_TYPE_JUST_SYMS
 	  && (i->flags & SEC_EXCLUDE) == 0
 	  && i->output_section != NULL
 	  && i->output_section->owner == link_info.output_bfd)