Recognize GNU .note.ABI-tag values 5 (syllable) and 6 (nacl)

gdb/
	* defs.h (enum gdb_osabi): Add GDB_OSABI_SYLLABLE and GDB_OSABI_NACL.
	* osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Recognize
	GNU_ABI_TAG_SYLLABLE and GNU_ABI_TAG_NACL.
	* configure.tgt (*-*-nacl*): Set gdb_osabi=GDB_OSABI_NACL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 48dbcd3c9a175891ef6570acac593ff02135abab..459d65f79b534c9caadeb91e6b7c2ab9923f1ad6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-29  Roland McGrath  <mcgrathr@google.com>
+
+       * defs.h (enum gdb_osabi): Add GDB_OSABI_SYLLABLE and GDB_OSABI_NACL.
+       * osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Recognize
+       GNU_ABI_TAG_SYLLABLE and GNU_ABI_TAG_NACL.
+       * configure.tgt (*-*-nacl*): Set gdb_osabi=GDB_OSABI_NACL.
+
 2015-05-29  Roland McGrath  <mcgrathr@google.com>
 
        PR gdb/18464

diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 4e4d6a90684154b5bc97775bbe5289c1f4ef2f8c..d7f083df666194fdef1f91454eac51213d10494f 100644 (file)
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -702,6 +702,7 @@ case "${targ}" in
                gdb_osabi=GDB_OSABI_FREEBSD_ELF ;;
 *-*-linux* | *-*-uclinux*)
                gdb_osabi=GDB_OSABI_LINUX ;;
+*-*-nacl*)     gdb_osabi=GDB_OSABI_NACL ;;
 *-*-nto*)      gdb_osabi=GDB_OSABI_QNXNTO ;;
 m68*-*-openbsd* | m88*-*-openbsd* | vax-*-openbsd*) ;;
 *-*-openbsd*)  gdb_osabi=GDB_OSABI_OPENBSD_ELF ;;

diff --git a/gdb/defs.h b/gdb/defs.h
index 44702eaff9c3500a331be31f9638fc909718f4dd..20d9eaf0de51a9a2c9f022008856e1671d129110 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -93,7 +93,7 @@ enum compile_i_scope_types
 /* The O_BINARY flag is defined in fcntl.h on some non-Posix platforms.
    It is used as an access modifier in calls to open(), where it acts
    similarly to the "b" character in fopen()'s MODE argument.  On Posix
-   platforms it should be a no-op, so it is defined as 0 here.  This 
+   platforms it should be a no-op, so it is defined as 0 here.  This
    ensures that the symbol may be used freely elsewhere in gdb.  */
 
 #ifndef O_BINARY
@@ -303,11 +303,11 @@ extern int print_address_symbolic (struct gdbarch *, CORE_ADDR,
 
 extern int build_address_symbolic (struct gdbarch *,
                                   CORE_ADDR addr,
-                                  int do_demangle, 
-                                  char **name, 
-                                  int *offset, 
-                                  char **filename, 
-                                  int *line,   
+                                  int do_demangle,
+                                  char **name,
+                                  int *offset,
+                                  char **filename,
+                                  int *line,
                                   int *unmapped);
 
 extern void print_address (struct gdbarch *, CORE_ADDR, struct ui_file *);
@@ -569,6 +569,8 @@ enum gdb_osabi
   GDB_OSABI_LYNXOS178,
   GDB_OSABI_NEWLIB,
   GDB_OSABI_SDE,
+  GDB_OSABI_SYLLABLE,
+  GDB_OSABI_NACL,
 
   GDB_OSABI_INVALID            /* keep this last */
 };
@@ -651,9 +653,9 @@ extern void (*deprecated_post_add_symbol_hook) (void);
 extern void (*selected_frame_level_changed_hook) (int);
 extern int (*deprecated_ui_loop_hook) (int signo);
 extern void (*deprecated_show_load_progress) (const char *section,
-                                             unsigned long section_sent, 
-                                             unsigned long section_size, 
-                                             unsigned long total_sent, 
+                                             unsigned long section_sent,
+                                             unsigned long section_size,
+                                             unsigned long total_sent,
                                              unsigned long total_size);
 extern void (*deprecated_print_frame_info_listing_hook) (struct symtab * s,
                                                         int line,

diff --git a/gdb/osabi.c b/gdb/osabi.c
index 3581eb334c4efcc1e5747a76de09de26c4c03d83..15035843810b1a074a45a3bf14b2cb31f8fd4a63 100644 (file)
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -492,6 +492,14 @@ generic_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, void *obj)
              *osabi = GDB_OSABI_NETBSD_ELF;
              break;
 
+           case GNU_ABI_TAG_SYLLABLE:
+             *osabi = GDB_OSABI_SYLLABLE;
+             break;
+
+           case GNU_ABI_TAG_NACL:
+             *osabi = GDB_OSABI_NACL;
+             break;
+
            default:
              warning (_("GNU ABI tag value %u unrecognized."), abi_tag);
              break;