From e7c3f7aa6eb61ec1d32f3dd24126ec6806e90b80 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Mon, 3 Jan 2011 21:05:50 +0000
Subject: [PATCH] merge from gcc

---
 include/demangle.h      | 2 +-
 include/floatformat.h   | 2 +-
 include/libiberty.h     | 2 +-
 include/plugin-api.h    | 2 +-
 include/xtensa-config.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/demangle.h b/include/demangle.h
index 8ad073de5..c0624559e 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -1,6 +1,6 @@
 /* Defs for interface to demanglers.
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
-   2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
    
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License
diff --git a/include/floatformat.h b/include/floatformat.h
index 0fc8e75dc..b5951644e 100644
--- a/include/floatformat.h
+++ b/include/floatformat.h
@@ -1,5 +1,5 @@
 /* IEEE floating point support declarations, for GDB, the GNU Debugger.
-   Copyright 1991, 1994, 1995, 1997, 2000, 2003, 2005
+   Copyright 1991, 1994, 1995, 1997, 2000, 2003, 2005, 2010
    Free Software Foundation, Inc.
 
 This file is part of GDB.
diff --git a/include/libiberty.h b/include/libiberty.h
index f54ca18ca..1cc7250bf 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -1,7 +1,7 @@
 /* Function declarations for libiberty.
 
    Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
    
    Note - certain prototypes declared in this header file are for
    functions whoes implementation copyright does not belong to the
diff --git a/include/plugin-api.h b/include/plugin-api.h
index 9d58fef40..956df001a 100644
--- a/include/plugin-api.h
+++ b/include/plugin-api.h
@@ -1,6 +1,6 @@
 /* plugin-api.h -- External linker plugin API.  */
 
-/* Copyright 2009 Free Software Foundation, Inc.
+/* Copyright 2009, 2010 Free Software Foundation, Inc.
    Written by Cary Coutant <ccoutant@google.com>.
 
    This file is part of binutils.
diff --git a/include/xtensa-config.h b/include/xtensa-config.h
index 05ca5e5c4..30f4f41a2 100644
--- a/include/xtensa-config.h
+++ b/include/xtensa-config.h
@@ -1,5 +1,5 @@
 /* Xtensa configuration settings.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010
    Free Software Foundation, Inc.
    Contributed by Bob Wilson (bob.wilson@acm.org) at Tensilica.