merge from gcc

crazii · Oct 23, 2013 · 17b0a56 · 17b0a56
1 parent 1585080
commit 17b0a56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/include/ChangeLog b/include/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-22  Sterling Augustine  <[email protected]>
+
+	* gdb/gdb-index.h: Merge from gdb tree.
+
 2013-10-10  Sean Keys <[email protected]>
 
 	* xgate.h : Cleanup after opcode

diff --git 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