aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/ChangeLog4
-rw-r--r--include/gdb/gdb-index.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 972572f..68dc5bb 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-22 Sterling Augustine <saugustine@google.com>
+
+ * gdb/gdb-index.h: Merge from gdb tree.
+
2013-10-10 Sean Keys <skeys@ipdatasys.com>
* xgate.h : Cleanup after opcode
diff --git a/include/gdb/gdb-index.h b/include/gdb/gdb-index.h
index c197c9d..b43c68f 100644
--- a/include/gdb/gdb-index.h
+++ b/include/gdb/gdb-index.h
@@ -1,5 +1,5 @@
/* Public attributes of the .gdb_index section.
- Copyright 2012-2013 Free Software Foundation, Inc.
+ Copyright 2012 Free Software Foundation, Inc.
This file is part of GDB.
@@ -68,7 +68,7 @@ typedef enum {
Give the unused bits a value so gdb will print them sensibly. */
GDB_INDEX_SYMBOL_KIND_UNUSED5 = 5,
GDB_INDEX_SYMBOL_KIND_UNUSED6 = 6,
- GDB_INDEX_SYMBOL_KIND_UNUSED7 = 7,
+ GDB_INDEX_SYMBOL_KIND_UNUSED7 = 7
} gdb_index_symbol_kind;
#define GDB_INDEX_SYMBOL_KIND_SHIFT 28