From 17b0a565b0930da0791926edfdd4310934521288 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 23 Oct 2013 22:37:24 +0000 Subject: merge from gcc --- include/ChangeLog | 4 ++++ include/gdb/gdb-index.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index 972572fda..68dc5bbdf 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2013-10-22 Sterling Augustine + + * gdb/gdb-index.h: Merge from gdb tree. + 2013-10-10 Sean Keys * xgate.h : Cleanup after opcode diff --git a/include/gdb/gdb-index.h b/include/gdb/gdb-index.h index c197c9d37..b43c68f9e 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 -- cgit v1.2.3