propagate from branch 'com.redhat.elfutils.roland.pending' (head c44dcfac5b545aecb173fede31f34cb003be0173)

            to branch 'com.redhat.elfutils' (head 4196d4e01486bdeb0c0632291881d1c6d7163fab)

3 files changed, 18 insertions, 3 deletions

diff --git a/backends/ChangeLog b/backends/ChangeLog
index 86ac44b9..57f33608 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-11  Roland McGrath  <roland@redhat.com>
+
+	* ia64_symbol.c (ia64_machine_section_flag_check): New function.
+	* ia64_init.c (ia64_init): Use it.
+
+	* ia64_symbol.c (ia64_section_type_name): Typo fix in string.
+
 2006-10-09  Roland McGrath  <roland@redhat.com>
 
 	* ia64_symbol.c (ia64_reloc_simple_type): Treat SECREL types as simple.
diff --git a/backends/ia64_init.c b/backends/ia64_init.c
index acae2346..290c192c 100644
--- a/backends/ia64_init.c
+++ b/backends/ia64_init.c
@@ -1,5 +1,5 @@
 /* Initialization of IA-64 specific backend library.
-   Copyright (C) 2002, 2003, 2005, 2006 Red Hat, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006, 2007 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -55,6 +55,7 @@ ia64_init (elf, machine, eh, ehlen)
   HOOK (eh, dynamic_tag_name);
   HOOK (eh, dynamic_tag_check);
   HOOK (eh, machine_flag_check);
+  HOOK (eh, machine_section_flag_check);
   HOOK (eh, register_info);
   HOOK (eh, return_value_location);
 
diff --git a/backends/ia64_symbol.c b/backends/ia64_symbol.c
index 4faec0c9..2609db0f 100644
--- a/backends/ia64_symbol.c
+++ b/backends/ia64_symbol.c
@@ -1,5 +1,5 @@
 /* IA-64 specific symbolic name handling.
-   Copyright (C) 2002, 2003, 2005, 2006 Red Hat, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006, 2007 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -86,6 +86,13 @@ ia64_machine_flag_check (GElf_Word flags)
   return ((flags &~ EF_IA_64_ABI64) == 0);
 }
 
+/* Check whether SHF_MASKPROC flags are valid.  */
+bool
+ia64_machine_section_flag_check (GElf_Xword sh_flags)
+{
+  return (sh_flags &~ (SHF_IA_64_SHORT | SHF_IA_64_NORECOV)) == 0;
+}
+
 /* Return symbolic representation of section type.  */
 const char *
 ia64_section_type_name (int type,
@@ -97,7 +104,7 @@ ia64_section_type_name (int type,
     case SHT_IA_64_EXT:
       return "SHT_IA_64_EXT";
     case SHT_IA_64_UNWIND:
-      return "HT_IA_64_UNWIND";
+      return "SHT_IA_64_UNWIND";
     }
 
   return NULL;