Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/binutils Resolve conflicts.
details: https://anonhg.NetBSD.org/src/rev/1ca212183cb8
branches: trunk
changeset: 587737:1ca212183cb8
user: skrll <skrll%NetBSD.org@localhost>
date: Thu Feb 02 22:03:53 2006 +0000
description:
Resolve conflicts.
diffstat:
gnu/dist/binutils/.cvsignore | 32 -
gnu/dist/binutils/COPYING.LIBGLOSS | 297 -
gnu/dist/binutils/COPYING.NEWLIB | 760 -
gnu/dist/binutils/ChangeLog | 9597 -----
gnu/dist/binutils/MAINTAINERS | 117 -
gnu/dist/binutils/Makefile.in | 50479 ++++++++++++++++----------
gnu/dist/binutils/README-maintainer-mode | 14 -
gnu/dist/binutils/bfd/ChangeLog | 5684 ++-
gnu/dist/binutils/bfd/aout-encap.c | 239 -
gnu/dist/binutils/bfd/archive.c | 98 +-
gnu/dist/binutils/bfd/bfd.c | 248 +-
gnu/dist/binutils/bfd/coff-alpha.c | 51 +-
gnu/dist/binutils/bfd/config.bfd | 158 +-
gnu/dist/binutils/bfd/configure | 15494 +++++--
gnu/dist/binutils/bfd/configure.in | 68 +-
gnu/dist/binutils/bfd/doc/Makefile.am | 138 +-
gnu/dist/binutils/bfd/doc/Makefile.in | 706 +-
gnu/dist/binutils/bfd/elf.c | 1699 +-
gnu/dist/binutils/bfd/elf32-arm.h | 4108 --
gnu/dist/binutils/bfd/elf32-hppa.c | 352 +-
gnu/dist/binutils/bfd/elf32-sh.c | 736 +-
gnu/dist/binutils/bfd/elf32-vax.c | 172 +-
gnu/dist/binutils/bfd/elf64-alpha.c | 399 +-
gnu/dist/binutils/bfd/elf64-sparc.c | 342 +-
gnu/dist/binutils/bfd/elfarm-nabi.c | 752 -
gnu/dist/binutils/bfd/elfarm-oabi.c | 426 -
gnu/dist/binutils/bfd/elflink.c | 2217 +-
gnu/dist/binutils/bfd/format.c | 14 +-
gnu/dist/binutils/bfd/libbfd.h | 250 +-
gnu/dist/binutils/bfd/mpw-config.in | 86 -
gnu/dist/binutils/bfd/mpw-make.sed | 81 -
gnu/dist/binutils/bfd/po/.cvsignore | 1 -
gnu/dist/binutils/bfd/reloc.c | 429 +-
gnu/dist/binutils/bfd/targets.c | 58 +-
gnu/dist/binutils/binutils/doc/Makefile.am | 1 +
gnu/dist/binutils/binutils/doc/Makefile.in | 12 +
gnu/dist/binutils/binutils/doc/addr2line.1 | 6 +-
gnu/dist/binutils/binutils/doc/dlltool.1 | 50 +-
gnu/dist/binutils/binutils/doc/nlmconv.1 | 6 +-
gnu/dist/binutils/binutils/doc/nm.1 | 20 +-
gnu/dist/binutils/binutils/doc/objcopy.1 | 24 +-
gnu/dist/binutils/binutils/doc/objdump.1 | 30 +-
gnu/dist/binutils/binutils/doc/ranlib.1 | 6 +-
gnu/dist/binutils/binutils/doc/readelf.1 | 37 +-
gnu/dist/binutils/binutils/doc/size.1 | 10 +-
gnu/dist/binutils/binutils/doc/strings.1 | 6 +-
gnu/dist/binutils/binutils/doc/strip.1 | 8 +-
gnu/dist/binutils/binutils/doc/windres.1 | 6 +-
gnu/dist/binutils/binutils/mac-binutils.r | 42 -
gnu/dist/binutils/binutils/mpw-config.in | 27 -
gnu/dist/binutils/binutils/mpw-make.sed | 115 -
gnu/dist/binutils/binutils/objcopy.c | 85 +-
gnu/dist/binutils/binutils/po/.cvsignore | 1 -
gnu/dist/binutils/binutils/strings.c | 32 +-
gnu/dist/binutils/config.if | 37 -
gnu/dist/binutils/config.sub | 67 +-
gnu/dist/binutils/config/mt-linux | 1 -
gnu/dist/binutils/configure | 2813 +-
gnu/dist/binutils/configure.in | 1655 +-
gnu/dist/binutils/contrib/ChangeLog | 7 -
gnu/dist/binutils/contrib/texi2pod.pl | 431 -
gnu/dist/binutils/etc/ChangeLog | 561 -
gnu/dist/binutils/etc/add-log.el | 573 -
gnu/dist/binutils/etc/add-log.vi | 11 -
gnu/dist/binutils/gas/config/tc-arm.c | 20701 +++++-----
gnu/dist/binutils/gas/configure | 956 +-
gnu/dist/binutils/gas/configure.in | 444 +-
gnu/dist/binutils/gas/mac-as.r | 42 -
gnu/dist/binutils/gas/mpw-config.in | 115 -
gnu/dist/binutils/gas/mpw-make.sed | 96 -
gnu/dist/binutils/md5.sum | 6523 +++
71 files changed, 73371 insertions(+), 58488 deletions(-)
diffs (truncated from 148049 to 300 lines):
diff -r c78d94cdc85c -r 1ca212183cb8 gnu/dist/binutils/.cvsignore
--- a/gnu/dist/binutils/.cvsignore Thu Feb 02 21:58:40 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-*-all
-*-co
-*-dirs
-*-done
-*-install-info
-*-src
-*-stamp-*
-*-tagged
-blockit
-cfg-paper.info
-config.status
-configure.aux
-configure.cp
-configure.cps
-configure.dvi
-configure.fn
-configure.fns
-configure.ky
-configure.kys
-configure.log
-configure.pg
-configure.pgs
-configure.toc
-configure.tp
-configure.tps
-configure.vr
-configure.vrs
-dir.info
-Makefile
-lost+found
-update.out
-update.sourceware
diff -r c78d94cdc85c -r 1ca212183cb8 gnu/dist/binutils/COPYING.LIBGLOSS
--- a/gnu/dist/binutils/COPYING.LIBGLOSS Thu Feb 02 21:58:40 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-The libgloss subdirectory is a collection of software from several sources.
-Each have their own copyrights embedded in each file that they concern.
-
-(1) University of California, Berkeley
-
-[1a]
-
-Copyright (c) 1990 The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms are permitted
-provided that the above copyright notice and this paragraph are
-duplicated in all such forms and that any documentation,
-and other materials related to such distribution and use
-acknowledge that the software was developed
-by the University of California, Berkeley. The name of the
-University may not be used to endorse or promote products derived
-from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-[1b]
-
-Copyright (c) 1991, 2000 The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by the University of
- California, Berkeley and its contributors.
-4. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-[1c]
-
-Copyright (c) 1991, 1998, 2001 The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. [rescinded 22 July 1999]
-4. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
--------------------------------------------------------------
- Please note that in some of the above alternate licenses, there is a
- statement regarding that acknowledgement must be made in any
- advertising materials for products using the code. This restriction
- no longer applies due to the following license change:
-
- ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
-
- In some cases the defunct clause has been removed in modified newlib code and
- in some cases, the clause has been left as-is.
--------------------------------------------------------------
-
-(2) DJ Delorie
-
-Copyright (C) 1993 DJ Delorie
-All rights reserved.
-
-Redistribution and use in source and binary forms is permitted
-provided that the above copyright notice and following paragraph are
-duplicated in all such forms.
-
-This file is distributed WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-(3) GPL (fr30 directory only)
-
-Copyright (C) 1998 Free Software Foundation, Inc.
-Contributed by Cygnus Solutions.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
-(4) Advanced Micro Devices
-
-Copyright 1989, 1990 Advanced Micro Devices, Inc.
-
-This software is the property of Advanced Micro Devices, Inc (AMD) which
-specifically grants the user the right to modify, use and distribute this
-software provided this notice is not removed or altered. All other rights
-are reserved by AMD.
-
-AMD MAKES NO WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, WITH REGARD TO THIS
-SOFTWARE. IN NO EVENT SHALL AMD BE LIABLE FOR INCIDENTAL OR CONSEQUENTIAL
-DAMAGES IN CONNECTION WITH OR ARISING FROM THE FURNISHING, PERFORMANCE, OR
-USE OF THIS SOFTWARE.
-
-So that all may benefit from your experience, please report any problems
-or suggestions about this software to the 29K Technical Support Center at
-800-29-29-AMD (800-292-9263) in the USA, or 0800-89-1131 in the UK, or
-0031-11-1129 in Japan, toll free. The direct dial number is 512-462-4118.
-
-Advanced Micro Devices, Inc.
-29K Support Products
-Mail Stop 573
-5900 E. Ben White Blvd.
-Austin, TX 78741
-800-292-9263
-
-(5) Array Technology Corporation and MIPS (mips/lsi33k-stub.h)
-
-COPYRIGHT (C) 1991, 1992 ARRAY TECHNOLOGY CORPORATION
- All Rights Reserved
-
-This software is confidential information which is proprietary to and
-a trade secret of ARRAY Technology Corporation. Use, duplication, or
-disclosure is subject to the terms of a separate license agreement.
-
-Copyright 1985 by MIPS Computer Systems, Inc.
-
-(6) University of Utah and the Computer Systems Laboratory (CSL)
- [applies only to hppa*-*-pro* targets]
-
-Copyright (c) 1990,1994 The University of Utah and
-the Computer Systems Laboratory (CSL). All rights reserved.
-
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation, and (3) all advertising
-materials mentioning features or use of this software display the following
-acknowledgement: ``This product includes software developed by the
-Computer Systems Laboratory at the University of Utah.''
-
-THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
-IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF
-ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-
-CSL requests users of this software to return to csl-dist%cs.utah.edu@localhost any
-improvements that they make and grant CSL redistribution rights.
-
-(7) Sun Microsystems
-
-Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-
-Developed at SunPro, a Sun Microsystems, Inc. business.
-Permission to use, copy, modify, and distribute this
-software is freely granted, provided that this notice
-is preserved.
-
-(8) Hewlett Packard
-
-(c) Copyright 1986 HEWLETT-PACKARD COMPANY
-
-To anyone who acknowledges that this file is provided "AS IS"
-without any express or implied warranty:
- permission to use, copy, modify, and distribute this file
-for any purpose is hereby granted without fee, provided that
-the above copyright notice and this notice appears in all
-copies, and that the name of Hewlett-Packard Company not be
-used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-Hewlett-Packard Company makes no representations about the
-suitability of this software for any purpose.
-
-(9) Hans-Peter Nilsson
-
-Copyright (C) 2001 Hans-Peter Nilsson
-
-Permission to use, copy, modify, and distribute this software is
-freely granted, provided that the above copyright notice, this notice
-and the following disclaimer are preserved with no changes.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.
-
-(10) No Copyright
-
-THIS SOFTWARE IS NOT COPYRIGHTED
-
-(11) Cygnus Support / Cygnus Solutions
-
-Copyright (c) 1995, 1996, 1997, 1998, 1999 Cygnus Support
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
----------------------------------------------------------------
- Please note that the copyright above may be used with the name
- Cygnus Solutions instead of Cygnus Support. Both names should
- be considered interchangeable. These copyrights are now owned
- by Red Hat Incorporated.
----------------------------------------------------------------
-
-(12) Red Hat Incorporated
-
-Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
Home |
Main Index |
Thread Index |
Old Index