From 59e11e1703f3bfa36b768403e19b4266f27c4426 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 3 Jan 2011 21:05:58 +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 +- libdecnumber/Makefile.in | 3 ++- libdecnumber/dconfig.h | 2 +- libiberty/ChangeLog | 4 ---- libiberty/cp-demangle.h | 3 ++- libiberty/cplus-dem.c | 2 +- libiberty/floatformat.c | 2 +- libiberty/lbasename.c | 2 +- libiberty/maint-tool | 2 +- libiberty/make-temp-file.c | 3 ++- libiberty/pex-common.c | 2 +- libiberty/pex-unix.c | 4 ++-- 16 files changed, 19 insertions(+), 20 deletions(-) diff --git a/include/demangle.h b/include/demangle.h index 8ad073de532..c0624559ee2 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 0fc8e75dc8b..b5951644ea5 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 f54ca18caa3..1cc7250bf3c 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 9d58fef400d..956df001a1f 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 . This file is part of binutils. diff --git a/include/xtensa-config.h b/include/xtensa-config.h index 05ca5e5c429..30f4f41a2ac 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. diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in index d2a697c08f7..c64f22c984e 100644 --- a/libdecnumber/Makefile.in +++ b/libdecnumber/Makefile.in @@ -1,7 +1,8 @@ # @configure_input@ # Makefile for libdecnumber. Run 'configure' to generate Makefile from Makefile.in -# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. #This file is part of GCC. diff --git a/libdecnumber/dconfig.h b/libdecnumber/dconfig.h index 503cb61e02d..975f9a1c891 100644 --- a/libdecnumber/dconfig.h +++ b/libdecnumber/dconfig.h @@ -1,5 +1,5 @@ /* Configure decNumber for either host or target. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index e4412d6aa2f..bc02da4a2bd 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,7 +1,3 @@ -2010-12-09 Mike Frysinger - - * .gitignore: New file. - 2010-12-08 Doug Evans * splay-tree.c (splay_tree_foreach_helper): Remove arg `sp', diff --git a/libiberty/cp-demangle.h b/libiberty/cp-demangle.h index eac054ed1e2..ae635beb4cc 100644 --- a/libiberty/cp-demangle.h +++ b/libiberty/cp-demangle.h @@ -1,5 +1,6 @@ /* Internal demangler interface for g++ V3 ABI. - Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010 + Free Software Foundation, Inc. Written by Ian Lance Taylor . This file is part of the libiberty library, which is part of GCC. diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index 0d812d5ef83..84f94b6a8de 100644 --- a/libiberty/cplus-dem.c +++ b/libiberty/cplus-dem.c @@ -1,6 +1,6 @@ /* Demangler for GNU C++ Copyright 1989, 1991, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + 2000, 2001, 2002, 2003, 2004, 2010 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.uucp) Rewritten by Fred Fish (fnf@cygnus.com) for ARM and Lucid demangling Modified by Satish Pai (pai@apollo.hp.com) for HP demangling diff --git a/libiberty/floatformat.c b/libiberty/floatformat.c index 4819507cbdd..1116c63117d 100644 --- a/libiberty/floatformat.c +++ b/libiberty/floatformat.c @@ -1,5 +1,5 @@ /* IEEE floating point support routines, for GDB, the GNU Debugger. - Copyright 1991, 1994, 1999, 2000, 2003, 2005, 2006 + Copyright 1991, 1994, 1999, 2000, 2003, 2005, 2006, 2010 Free Software Foundation, Inc. This file is part of GDB. diff --git a/libiberty/lbasename.c b/libiberty/lbasename.c index ed1dd1fdee8..87c50faad40 100644 --- a/libiberty/lbasename.c +++ b/libiberty/lbasename.c @@ -1,6 +1,6 @@ /* Libiberty basename. Like basename, but is not overridden by the system C library. - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc. This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or diff --git a/libiberty/maint-tool b/libiberty/maint-tool index 2c687941049..36b92034f33 100644 --- a/libiberty/maint-tool +++ b/libiberty/maint-tool @@ -1,7 +1,7 @@ #!/usr/bin/perl # -*- perl -*- -# Copyright (C) 2001, 2007 +# Copyright (C) 2001, 2007, 2010 # Free Software Foundation # # This file is part of the libiberty library. diff --git a/libiberty/make-temp-file.c b/libiberty/make-temp-file.c index 4e3876676e2..7b74f8179b1 100644 --- a/libiberty/make-temp-file.c +++ b/libiberty/make-temp-file.c @@ -1,5 +1,6 @@ /* Utility to pick a temporary filename prefix. - Copyright (C) 1996, 1997, 1998, 2001, 2009 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2001, 2009, 2010 + Free Software Foundation, Inc. This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or diff --git a/libiberty/pex-common.c b/libiberty/pex-common.c index b32c54cc683..55b63ae33fe 100644 --- a/libiberty/pex-common.c +++ b/libiberty/pex-common.c @@ -1,5 +1,5 @@ /* Common code for executing a program in a sub-process. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2010 Free Software Foundation, Inc. Written by Ian Lance Taylor . This file is part of the libiberty library. diff --git a/libiberty/pex-unix.c b/libiberty/pex-unix.c index c4a69ad07c0..8d5145c523e 100644 --- a/libiberty/pex-unix.c +++ b/libiberty/pex-unix.c @@ -1,8 +1,8 @@ /* Utilities to execute a program in a subprocess (possibly linked by pipes with other subprocesses), and wait for it. Generic Unix version (also used for UWIN and VMS). - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2009 - Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2009, + 2010 Free Software Foundation, Inc. This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or -- 2.30.2