Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/toolchain Resolve conflicts from binutils 2.11 import.
details: https://anonhg.NetBSD.org/src/rev/4259fbedabcf
branches: trunk
changeset: 508970:4259fbedabcf
user: tv <tv%NetBSD.org@localhost>
date: Mon Apr 23 14:16:30 2001 +0000
description:
Resolve conflicts from binutils 2.11 import.
diffstat:
gnu/dist/toolchain/bfd/Makefile.am | 1036 +++--
gnu/dist/toolchain/bfd/Makefile.in | 1414 +++----
gnu/dist/toolchain/bfd/aout-target.h | 17 +-
gnu/dist/toolchain/bfd/aoutx.h | 136 +-
gnu/dist/toolchain/bfd/archive.c | 310 +-
gnu/dist/toolchain/bfd/bfd-in.h | 61 +-
gnu/dist/toolchain/bfd/bfd-in2.h | 1464 ++++---
gnu/dist/toolchain/bfd/coffcode.h | 429 +-
gnu/dist/toolchain/bfd/config.bfd | 154 +-
gnu/dist/toolchain/bfd/configure | 2037 +++++++--
gnu/dist/toolchain/bfd/configure.host | 6 +
gnu/dist/toolchain/bfd/configure.in | 101 +-
gnu/dist/toolchain/bfd/ecofflink.c | 52 +-
gnu/dist/toolchain/bfd/elf.c | 1089 +++--
gnu/dist/toolchain/bfd/elf32-mips.c | 1340 ++++--
gnu/dist/toolchain/bfd/elf32-sh.c | 2385 +++++++++++-
gnu/dist/toolchain/bfd/elf64-alpha.c | 188 +-
gnu/dist/toolchain/bfd/elflink.h | 484 +-
gnu/dist/toolchain/bfd/hppa_stubs.h | 23 -
gnu/dist/toolchain/bfd/libaout.h | 3 +-
gnu/dist/toolchain/bfd/libbfd-in.h | 19 +-
gnu/dist/toolchain/bfd/libbfd.c | 183 +-
gnu/dist/toolchain/bfd/libbfd.h | 186 +-
gnu/dist/toolchain/bfd/netbsd.h | 11 +-
gnu/dist/toolchain/bfd/sparcnetbsd.c | 2 +-
gnu/dist/toolchain/bfd/sunos.c | 56 +-
gnu/dist/toolchain/bfd/targets.c | 206 +-
gnu/dist/toolchain/bfd/vaxnetbsd.c | 2 +-
gnu/dist/toolchain/binutils/bucomm.c | 2 +-
gnu/dist/toolchain/binutils/objcopy.c | 52 +-
gnu/dist/toolchain/binutils/objdump.c | 46 +-
gnu/dist/toolchain/binutils/size.1 | 392 +-
gnu/dist/toolchain/binutils/size.c | 18 +-
gnu/dist/toolchain/binutils/strip.1 | 392 +-
gnu/dist/toolchain/config.guess | 519 +-
gnu/dist/toolchain/config.sub | 129 +-
gnu/dist/toolchain/configure.in | 351 +-
gnu/dist/toolchain/gas/config/aout_gnu.h | 7 -
gnu/dist/toolchain/gas/config/obj-aout.c | 142 +-
gnu/dist/toolchain/gas/config/obj-aout.h | 8 +-
gnu/dist/toolchain/gas/config/tc-alpha.c | 932 ++--
gnu/dist/toolchain/gas/config/tc-arm.c | 3862 +++++++++++++------
gnu/dist/toolchain/gas/config/tc-arm.h | 23 +-
gnu/dist/toolchain/gas/config/tc-i386.c | 3610 ++++++++++++------
gnu/dist/toolchain/gas/config/tc-i386.h | 328 +-
gnu/dist/toolchain/gas/config/tc-m68k.c | 800 ++--
gnu/dist/toolchain/gas/config/tc-ns32k.c | 1005 ++--
gnu/dist/toolchain/gas/config/tc-ns32k.h | 8 +-
gnu/dist/toolchain/gas/config/tc-sh.h | 54 +-
gnu/dist/toolchain/gas/config/tc-sparc.c | 818 ++-
gnu/dist/toolchain/gas/config/tc-vax.c | 268 +-
gnu/dist/toolchain/gas/config/tc-vax.h | 7 +-
gnu/dist/toolchain/gas/configure | 1510 +++++-
gnu/dist/toolchain/gas/configure.in | 134 +-
gnu/dist/toolchain/gas/struc-symbol.h | 17 +-
gnu/dist/toolchain/gprof/corefile.c | 301 +-
gnu/dist/toolchain/gprof/gmon_io.c | 123 +-
gnu/dist/toolchain/include/aout/aout64.h | 16 +
gnu/dist/toolchain/include/elf/arm-oabi.h | 88 -
gnu/dist/toolchain/include/libiberty.h | 27 +-
gnu/dist/toolchain/ld/Makefile.am | 185 +-
gnu/dist/toolchain/ld/Makefile.in | 217 +-
gnu/dist/toolchain/ld/configure.host | 43 +-
gnu/dist/toolchain/ld/configure.tgt | 83 +-
gnu/dist/toolchain/ld/emulparams/armelf_linux26.sh | 20 -
gnu/dist/toolchain/ld/emulparams/m68kelf.sh | 1 +
gnu/dist/toolchain/ld/genscripts.sh | 31 +-
gnu/dist/toolchain/ld/ld.h | 49 +-
gnu/dist/toolchain/ld/ldgram.c | 271 +-
gnu/dist/toolchain/ld/ldgram.y | 7 +-
gnu/dist/toolchain/ld/ldlex.c | 1688 ++++----
gnu/dist/toolchain/ld/ldmain.c | 79 +-
gnu/dist/toolchain/ld/lexsup.c | 236 +-
gnu/dist/toolchain/ld/scripttempl/elfppc.sc | 288 -
gnu/dist/toolchain/libiberty/acconfig.h | 11 -
gnu/dist/toolchain/libiberty/pexecute.c | 53 +-
gnu/dist/toolchain/opcodes/ppc-opc.c | 1097 +++-
77 files changed, 22046 insertions(+), 11696 deletions(-)
diffs (truncated from 60265 to 300 lines):
diff -r af267d3f022f -r 4259fbedabcf gnu/dist/toolchain/bfd/Makefile.am
--- a/gnu/dist/toolchain/bfd/Makefile.am Mon Apr 23 12:27:01 2001 +0000
+++ b/gnu/dist/toolchain/bfd/Makefile.am Mon Apr 23 14:16:30 2001 +0000
@@ -12,6 +12,9 @@
lib_LTLIBRARIES = libbfd.la
+WARN_CFLAGS = @WARN_CFLAGS@
+AM_CFLAGS = $(WARN_CFLAGS)
+
# bfd.h goes here, for now
BFD_H = bfd.h
@@ -26,13 +29,15 @@
archive.lo archures.lo bfd.lo cache.lo coffgen.lo corefile.lo \
format.lo init.lo libbfd.lo opncls.lo reloc.lo \
section.lo syms.lo targets.lo hash.lo linker.lo \
- srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo
+ srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo \
+ dwarf2.lo
BFD_LIBS_CFILES = \
archive.c archures.c bfd.c cache.c coffgen.c corefile.c \
format.c init.c libbfd.c opncls.c reloc.c \
section.c syms.c targets.c hash.c linker.c \
- srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c
+ srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \
+ dwarf2.c
# This list is alphabetized to make it easier to keep in sync
# with the decls and initializer in archures.c.
@@ -42,17 +47,21 @@
cpu-arc.lo \
cpu-arm.lo \
cpu-avr.lo \
+ cpu-cris.lo \
cpu-d10v.lo \
cpu-d30v.lo \
cpu-fr30.lo \
cpu-h8300.lo \
cpu-h8500.lo \
cpu-hppa.lo \
+ cpu-ia64.lo \
cpu-i370.lo \
cpu-i386.lo \
cpu-i860.lo \
cpu-i960.lo \
cpu-m32r.lo \
+ cpu-m68hc11.lo \
+ cpu-m68hc12.lo \
cpu-m68k.lo \
cpu-m88k.lo \
cpu-m10200.lo \
@@ -66,6 +75,7 @@
cpu-sh.lo \
cpu-sparc.lo \
cpu-tic30.lo \
+ cpu-tic54x.lo \
cpu-tic80.lo \
cpu-v850.lo \
cpu-vax.lo \
@@ -79,17 +89,21 @@
cpu-arc.c \
cpu-arm.c \
cpu-avr.c \
+ cpu-cris.c \
cpu-d10v.c \
cpu-d30v.c \
cpu-fr30.c \
cpu-h8300.c \
cpu-h8500.c \
cpu-hppa.c \
+ cpu-ia64.c \
cpu-i370.c \
cpu-i386.c \
cpu-i860.c \
cpu-i960.c \
cpu-m32r.c \
+ cpu-m68hc11.c \
+ cpu-m68hc12.c \
cpu-m68k.c \
cpu-m88k.c \
cpu-m10200.c \
@@ -103,6 +117,7 @@
cpu-sh.c \
cpu-sparc.c \
cpu-tic30.c \
+ cpu-tic54x.c \
cpu-tic80.c \
cpu-v850.c \
cpu-vax.c \
@@ -116,6 +131,7 @@
aout-adobe.lo \
aout-arm.lo \
aout-arm32.lo \
+ aout-cris.lo \
aout-ns32k.lo \
aout-sparcle.lo \
aout-tic30.lo \
@@ -146,6 +162,7 @@
coff-stgo32.lo \
coff-svm68k.lo \
coff-tic30.lo \
+ coff-tic54x.lo \
coff-tic80.lo \
coff-u68k.lo \
coff-we32k.lo \
@@ -153,23 +170,28 @@
coff-z8k.lo \
cofflink.lo \
dwarf1.lo \
- dwarf2.lo \
ecoff.lo \
ecofflink.lo \
+ efi-app-ia32.lo \
elf.lo \
elf32-arc.lo \
elfarm-oabi.lo \
elfarm-nabi.lo \
elf32-avr.lo \
+ elf32-cris.lo \
elf32-d10v.lo \
elf32-d30v.lo \
elf32-fr30.lo \
elf32-gen.lo \
+ elf32-hppa.lo \
elf32-i370.lo \
elf32-i386.lo \
elf32-i860.lo \
elf32-i960.lo \
+ elf32-ia64.lo \
elf32-m32r.lo \
+ elf32-m68hc11.lo \
+ elf32-m68hc12.lo \
elf32-m68k.lo \
elf32-m88k.lo \
elf-m10200.lo \
@@ -179,6 +201,7 @@
elf32-pj.lo \
elf32-ppc.lo \
elf32-sh.lo \
+ elf32-sh-lin.lo \
elf32-sparc.lo \
elf32-v850.lo \
elf32.lo \
@@ -247,6 +270,7 @@
aout-adobe.c \
aout-arm.c \
aout-arm32.c \
+ aout-cris.c \
aout-ns32k.c \
aout-sparcle.c \
aout-tic30.c \
@@ -277,6 +301,7 @@
coff-stgo32.c \
coff-svm68k.c \
coff-tic30.c \
+ coff-tic54x.c \
coff-tic80.c \
coff-u68k.c \
coff-we32k.c \
@@ -284,24 +309,28 @@
coff-z8k.c \
cofflink.c \
dwarf1.c \
- dwarf2.c \
ecoff.c \
ecofflink.c \
+ efi-app-ia32.c \
elf.c \
elf32-arc.c \
elfarm-oabi.c \
elfarm-nabi.c \
elf32-avr.c \
+ elf32-cris.c \
elf32-d10v.c \
elf32-d30v.c \
elf32-fr30.c \
elf32-gen.c \
+ elf32-hppa.c \
elf32-i370.c \
elf32-i386.c \
elf32-i860.c \
elf32-i960.c \
elf32-m32r.c \
elf32-m68k.c \
+ elf32-m68hc11.c \
+ elf32-m68hc12.c \
elf32-m88k.c \
elf-m10200.c \
elf-m10300.c \
@@ -310,6 +339,7 @@
elf32-pj.c \
elf32-ppc.c \
elf32-sh.c \
+ elf32-sh-lin.c \
elf32-sparc.c \
elf32-v850.c \
elf32.c \
@@ -380,8 +410,13 @@
BFD64_BACKENDS = \
aout64.lo \
coff-alpha.lo \
+ coff64-rs6000.lo \
demo64.lo \
+ efi-app-ia64.lo \
+ elf64-x86-64.lo \
elf64-alpha.lo \
+ elf64-hppa.lo \
+ elf64-ia64.lo \
elf64-gen.lo \
elf64-mips.lo \
elf64-sparc.lo \
@@ -392,8 +427,13 @@
BFD64_BACKENDS_CFILES = \
aout64.c \
coff-alpha.c \
+ coff64-rs6000.c \
demo64.c \
+ efi-app-ia64.c \
+ elf64-x86-64.c \
elf64-alpha.c \
+ elf64-hppa.c \
+ elf64-ia64.c \
elf64-gen.c \
elf64-mips.c \
elf64-sparc.c \
@@ -440,12 +480,12 @@
## This is a list of all .h files which are in the source tree.
SOURCE_HFILES = \
- aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h \
- ecoffswap.h elf32-arm.h elfcode.h elfcore.h \
- elflink.h freebsd.h genlink.h go32stub.h libaout.h \
- libbfd.h libcoff.h libecoff.h elf-bfd.h libhppa.h libieee.h \
- libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h nlmcode.h \
- nlmswap.h ns32k.h peicode.h som.h vms.h
+ aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \
+ elf-bfd.h elf-hppa.h elf32-arm.h elf32-hppa.h elf64-hppa.h \
+ elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h \
+ libaout.h libbfd.h libcoff.h libecoff.h libhppa.h \
+ libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h \
+ nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h xcoff-target.h
HFILES = \
elf32-target.h elf64-target.h targmatch.h \
@@ -530,6 +570,16 @@
sed -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
mv -f elf64-target.new elf64-target.h
+elf32-ia64.c : elfxx-ia64.c
+ rm -f elf32-ia64.c
+ sed -e s/NN/32/g < $(srcdir)/elfxx-ia64.c > elf32-ia64.new
+ mv -f elf32-ia64.new elf32-ia64.c
+
+elf64-ia64.c : elfxx-ia64.c
+ rm -f elf64-ia64.c
+ sed -e s/NN/64/g < $(srcdir)/elfxx-ia64.c > elf64-ia64.new
+ mv -f elf64-ia64.new elf64-ia64.c
+
BFD_H_DEPS= $(INCDIR)/ansidecl.h
LOCAL_H_DEPS= libbfd.h sysdep.h config.h
$(BFD_LIBS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
@@ -540,17 +590,23 @@
# Install BFD include file, and others that it needs.
install-data-local: $(BFD_H)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(includedir)
- $(INSTALL_DATA) $(BFD_H) $(includedir)/bfd.h
- $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h
- $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(includedir)/bfdlink.h
+ $(mkinstalldirs) $(DESTDIR)$(includedir)
+ $(INSTALL_DATA) $(BFD_H) $(DESTDIR)$(includedir)/bfd.h
+ $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(DESTDIR)$(includedir)/ansidecl.h
+ $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(DESTDIR)$(includedir)/bfdlink.h
+
# Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES).
DEP: dep.sed $(CFILES) $(HFILES) bfd.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- sed -f dep.sed < DEP1 > $@
- echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@
+ sed -f dep.sed < DEP1 > DEPA
+ echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
+ if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+ echo 'make DEP failed!'; exit 1; \
+ else \
+ mv -f DEPA $@; \
+ fi
DEP1: $(CFILES)
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
@@ -639,7 +695,7 @@
MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \
targmatch.h
-CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEP1 DEP2 libbfd.a stamp-lib \
+CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \
stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
Home |
Main Index |
Thread Index |
Old Index